summaryrefslogtreecommitdiff
path: root/src/target
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/target
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/target')
-rw-r--r--src/target/arm11.c8
-rw-r--r--src/target/armv4_5.c1
2 files changed, 5 insertions, 4 deletions
diff --git a/src/target/arm11.c b/src/target/arm11.c
index 7c947fc2..cc584c38 100644
--- a/src/target/arm11.c
+++ b/src/target/arm11.c
@@ -783,10 +783,10 @@ int arm11_resume(struct target_s *target, int current, u32 address, int handle_b
LOG_DEBUG("target->state: %s", target_state_strings[target->state]);
if (target->state != TARGET_HALTED)
- {
- LOG_WARNING("target was not halted");
- return ERROR_TARGET_NOT_HALTED;
- }
+ {
+ LOG_ERROR("Target not halted");
+ return ERROR_TARGET_NOT_HALTED;
+ }
if (!current)
R(PC) = address;
diff --git a/src/target/armv4_5.c b/src/target/armv4_5.c
index e546e404..ac73c567 100644
--- a/src/target/armv4_5.c
+++ b/src/target/armv4_5.c
@@ -181,6 +181,7 @@ int armv4_5_get_core_reg(reg_t *reg)
if (target->state != TARGET_HALTED)
{
+ LOG_ERROR("Target not halted");
return ERROR_TARGET_NOT_HALTED;
}