summaryrefslogtreecommitdiff
path: root/src/flash/cfi.c
diff options
context:
space:
mode:
authoroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2008-08-17 19:40:17 +0000
committeroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2008-08-17 19:40:17 +0000
commit330cf5a6bb23063947d9cff661b61a82d3221c7a (patch)
tree3743176cd90c2e41791a79cf20a11db748e11dda /src/flash/cfi.c
parentc1683a55bc6cce7cb54a30789b9d15443b557b69 (diff)
downloadopenocd+libswd-330cf5a6bb23063947d9cff661b61a82d3221c7a.tar.gz
openocd+libswd-330cf5a6bb23063947d9cff661b61a82d3221c7a.tar.bz2
openocd+libswd-330cf5a6bb23063947d9cff661b61a82d3221c7a.tar.xz
openocd+libswd-330cf5a6bb23063947d9cff661b61a82d3221c7a.zip
fixed not halted error messages
git-svn-id: svn://svn.berlios.de/openocd/trunk@925 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/flash/cfi.c')
-rw-r--r--src/flash/cfi.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/flash/cfi.c b/src/flash/cfi.c
index 5f64e116..68f9a0ad 100644
--- a/src/flash/cfi.c
+++ b/src/flash/cfi.c
@@ -747,6 +747,7 @@ int cfi_erase(struct flash_bank_s *bank, int first, int last)
if (bank->target->state != TARGET_HALTED)
{
+ LOG_ERROR("Target not halted");
return ERROR_TARGET_NOT_HALTED;
}
@@ -878,6 +879,7 @@ int cfi_protect(struct flash_bank_s *bank, int set, int first, int last)
if (bank->target->state != TARGET_HALTED)
{
+ LOG_ERROR("Target not halted");
return ERROR_TARGET_NOT_HALTED;
}
@@ -1649,7 +1651,10 @@ int cfi_write(struct flash_bank_s *bank, u8 *buffer, u32 offset, u32 count)
int retval;
if (bank->target->state != TARGET_HALTED)
+ {
+ LOG_ERROR("Target not halted");
return ERROR_TARGET_NOT_HALTED;
+ }
if (offset + count > bank->size)
return ERROR_FLASH_DST_OUT_OF_BANK;
@@ -1877,6 +1882,7 @@ int cfi_probe(struct flash_bank_s *bank)
if (bank->target->state != TARGET_HALTED)
{
+ LOG_ERROR("Target not halted");
return ERROR_TARGET_NOT_HALTED;
}
@@ -2175,6 +2181,7 @@ int cfi_protect_check(struct flash_bank_s *bank)
if (bank->target->state != TARGET_HALTED)
{
+ LOG_ERROR("Target not halted");
return ERROR_TARGET_NOT_HALTED;
}