Committed.

Spen spotted a bug. This code was tested before it was moved out of target.c,
the only consequence would be a missing warning for the case where
a target needing srst_pulls_trst.

Index: C:/workspace/trunk/src/target/arm7_9_common.c
===================================================================
--- C:/workspace/trunk/src/target/arm7_9_common.c       (revision 713)
+++ C:/workspace/trunk/src/target/arm7_9_common.c       (working copy)
@@ -702,8 +702,6 @@
                if ((target->state == TARGET_RUNNING) || (target->state == 
TARGET_RESET))
                {
                        int check_pc=0;
-                       target->state = TARGET_HALTED;
-                       
                        if (target->state == TARGET_RESET)
                        {
                                if ((target->reset_mode == RESET_HALT) || 
(target->reset_mode ==
RESET_INIT))
@@ -715,6 +713,8 @@
                                }
                        }
                        
+                       target->state = TARGET_HALTED;
+                       
                        if ((retval = arm7_9_debug_entry(target)) != ERROR_OK)
                                return retval;
                        


-- 
Øyvind Harboe
http://www.zylin.com/zy1000.html
ARM7 ARM9 XScale Cortex
JTAG debugger and flash programmer
_______________________________________________
Openocd-development mailing list
[email protected]
https://lists.berlios.de/mailman/listinfo/openocd-development

Reply via email to