Michael Bruck spotted an omission in svn 322

git-svn-id: svn://svn.berlios.de/openocd/trunk@336 b42882b7-edfa-0310-969c-e2dbd0fdcd60

diff --git a/src/target/armv7m.c b/src/target/armv7m.c
index 8b4fd44ba1eadbbb5a948032a82cb22cb5fb97bd..bed394854702a430af70d5a60c667b9728676a30 100644 (file)
--- 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;
 }
 
        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;
        
 {
        /* 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],
                 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 64689f0b74f79082eca912c7f46e576b454916e7..0059b18d0de6f4f5f26d0000ef5599ffcdfc765b 100644 (file)
--- 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 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);
 
 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);