Committed part #2 of this fix.

TAP_INVALID is no longer a legal argument to jtag_add_xxx() fn's.


### Eclipse Workspace Patch 1.0
#P openocd
Index: src/jtag/jtag.c
===================================================================
--- src/jtag/jtag.c     (revision 2042)
+++ src/jtag/jtag.c     (working copy)
@@ -394,8 +394,9 @@
 {
        jtag_checks();

-       if (state != TAP_INVALID)
-               jtag_add_end_state(state);
+       assert(state!=TAP_INVALID);
+
+       jtag_add_end_state(state);

        cmd_queue_cur_state = cmd_queue_end_state;
 }
@@ -575,8 +576,9 @@
                int num_fields, const int* num_bits, const u32* value,
                tap_state_t end_state)
 {
-       if (end_state != TAP_INVALID)
-               cmd_queue_end_state = end_state;
+       assert(end_state != TAP_INVALID);
+
+       cmd_queue_end_state = end_state;

        cmd_queue_cur_state = cmd_queue_end_state;




-- 
Øyvind Harboe
Embedded software and hardware consulting services
http://consulting.zylin.com
_______________________________________________
Openocd-development mailing list
[email protected]
https://lists.berlios.de/mailman/listinfo/openocd-development

Reply via email to