Browse Source

target: hla correctly use target events

Because we were always running using target state TARGET_RUNNING target
algorithm's were a bit verbose compared to other targets.

This brings the hla target inline with the other targets.

Change-Id: I3a257fdc878b87660fac8b5eca22b421eee5b349
Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk>
Reviewed-on: http://openocd.zylin.com/1134
Tested-by: jenkins
tags/v0.7.0-rc1
Spencer Oliver 11 years ago
parent
commit
b00b9f2d7d
1 changed files with 16 additions and 5 deletions
  1. +16
    -5
      src/target/hla_target.c

+ 16
- 5
src/target/hla_target.c View File

@@ -381,6 +381,7 @@ static int adapter_poll(struct target *target)
enum target_state state;
struct hl_interface_s *adapter = target_to_adapter(target);
struct armv7m_common *armv7m = target_to_armv7m(target);
enum target_state prev_target_state = target->state;

state = adapter->layout->api->state(adapter->fd);

@@ -399,10 +400,15 @@ static int adapter_poll(struct target *target)
if (retval != ERROR_OK)
return retval;

if (arm_semihosting(target, &retval) != 0)
return retval;
if (prev_target_state == TARGET_DEBUG_RUNNING) {
target_call_event_callbacks(target, TARGET_EVENT_DEBUG_HALTED);
} else {
if (arm_semihosting(target, &retval) != 0)
return retval;

target_call_event_callbacks(target, TARGET_EVENT_HALTED);
}

target_call_event_callbacks(target, TARGET_EVENT_HALTED);
LOG_DEBUG("halted: PC: 0x%08x", buf_get_u32(armv7m->arm.pc->value, 0, 32));
}

@@ -603,10 +609,15 @@ static int adapter_resume(struct target *target, int current,
if (res != ERROR_OK)
return res;

target->state = TARGET_RUNNING;
target->debug_reason = DBG_REASON_NOTHALTED;

target_call_event_callbacks(target, TARGET_EVENT_RESUMED);
if (!debug_execution) {
target->state = TARGET_RUNNING;
target_call_event_callbacks(target, TARGET_EVENT_RESUMED);
} else {
target->state = TARGET_DEBUG_RUNNING;
target_call_event_callbacks(target, TARGET_EVENT_DEBUG_RESUMED);
}

return ERROR_OK;
}


Loading…
Cancel
Save