diff options
| author | oharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2008-02-25 06:44:46 +0000 |
|---|---|---|
| committer | oharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2008-02-25 06:44:46 +0000 |
| commit | d8456e48260519a7e1d5d4b4efee51f985e981c6 (patch) | |
| tree | 8517c881fa3881e54cd3824b5fc62590f3ef5a97 | |
| parent | 8529e7c21e9976425a335693b19494783e1945e0 (diff) | |
| download | openocd+libswd-d8456e48260519a7e1d5d4b4efee51f985e981c6.tar.gz openocd+libswd-d8456e48260519a7e1d5d4b4efee51f985e981c6.tar.bz2 openocd+libswd-d8456e48260519a7e1d5d4b4efee51f985e981c6.tar.xz openocd+libswd-d8456e48260519a7e1d5d4b4efee51f985e981c6.zip | |
Michael Bruck spotted an omission in svn 322
git-svn-id: svn://svn.berlios.de/openocd/trunk@336 b42882b7-edfa-0310-969c-e2dbd0fdcd60
| -rw-r--r-- | src/target/armv7m.c | 5 | ||||
| -rw-r--r-- | src/target/armv7m.h | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/target/armv7m.c b/src/target/armv7m.c index 8b4fd44b..bed39485 100644 --- a/src/target/armv7m.c +++ b/src/target/armv7m.c @@ -471,13 +471,12 @@ int armv7m_run_algorithm(struct target_s *target, int num_mem_params, mem_param_ return retval; } -int armv7m_arch_state(struct target_s *target, char *buf, int buf_size) +int armv7m_arch_state(struct target_s *target) { /* get pointers to arch-specific information */ armv7m_common_t *armv7m = target->arch_info; - snprintf(buf, buf_size, - "target halted in %s state due to %s, current mode: %s %s\nxPSR: 0x%8.8x pc: 0x%8.8x", + USER("target halted in %s state due to %s, current mode: %s %s\nxPSR: 0x%8.8x pc: 0x%8.8x", armv7m_state_strings[armv7m->core_state], target_debug_reason_strings[target->debug_reason], armv7m_mode_strings[armv7m->core_mode], diff --git a/src/target/armv7m.h b/src/target/armv7m.h index 64689f0b..0059b18d 100644 --- a/src/target/armv7m.h +++ b/src/target/armv7m.h @@ -152,7 +152,7 @@ extern reg_cache_t *armv7m_build_reg_cache(target_t *target); extern enum armv7m_mode armv7m_number_to_mode(int number); extern int armv7m_mode_to_number(enum armv7m_mode mode); -extern int armv7m_arch_state(struct target_s *target, char *buf, int buf_size); +extern int armv7m_arch_state(struct target_s *target); extern int armv7m_get_gdb_reg_list(target_t *target, reg_t **reg_list[], int *reg_list_size); extern int armv7m_invalidate_core_regs(target_t *target); |