added template for removing in_handler

[openocd.git] / src / jtag / jtag.c

diff --git a/src/jtag/jtag.c b/src/jtag/jtag.c
index a75c9c54a6609aa89479ea38b7aba5026d408a59..242eb56bf6b3fd0d6a12ab78eef3688b0253c406 100644 (file)
--- a/src/jtag/jtag.c
+++ b/src/jtag/jtag.c
@@ -42,6 +42,8 @@
 #include <strings.h>
 #endif
 
+static void jtag_execute_queue_noclear(void);
+
 /* note that this is not marked as static as it must be available from outside jtag.c for those
    that implement the jtag_xxx() minidriver layer
 */
@@ -670,6 +672,12 @@ void jtag_add_dr_scan(int num_fields, scan_field_t *fields, tap_state_t state)
                jtag_error=retval;
 }
 
+void jtag_add_dr_scan_now(int num_fields, scan_field_t *fields, tap_state_t state)
+{
+       jtag_add_dr_scan(num_fields, fields, state);
+       jtag_execute_queue_noclear();
+}
+
 int MINIDRIVER(interface_jtag_add_dr_scan)(int num_fields, scan_field_t *fields, tap_state_t state)
 {
        int j;
@@ -1438,13 +1446,21 @@ int MINIDRIVER(interface_jtag_execute_queue)(void)
        return retval;
 }
 
-int jtag_execute_queue(void)
+static void jtag_execute_queue_noclear(void)
 {
        int retval=interface_jtag_execute_queue();
-       if (retval==ERROR_OK)
+       /* we keep the first error */
+       if ((jtag_error==ERROR_OK)&&(retval!=ERROR_OK))
        {
-               retval=jtag_error;
+               jtag_error=retval;
        }
+}
+
+int jtag_execute_queue(void)
+{
+       int retval;
+       jtag_execute_queue_noclear();
+       retval=jtag_error;
        jtag_error=ERROR_OK;
        return retval;
 }
@@ -1485,10 +1501,10 @@ int jtag_examine_chain(void)
        field.tap = NULL;
        field.num_bits = sizeof(idcode_buffer) * 8;
        field.out_value = idcode_buffer;
-       
+
        field.in_value = idcode_buffer;
-       
-       
+
+
        field.in_handler = NULL;
 
        for (i = 0; i < JTAG_MAX_CHAIN_SIZE; i++)
@@ -1662,10 +1678,7 @@ int jtag_validate_chain(void)
        field.tap = NULL;
        field.num_bits = total_ir_length;
        field.out_value = ir_test;
-       
        field.in_value = ir_test;
-       
-       
        field.in_handler = NULL;
 
        jtag_add_plain_ir_scan(1, &field, TAP_RESET);
@@ -3116,7 +3129,7 @@ static struct
 
 #define B8(bits,count)         { ((u8)B8__(HEX__(bits))), (count) }
 
-#if 0 && ((BUILD_FT2232_FTD2XX==1) || (BUILD_FT2232_LIBFTDI==1))
+#if 0 && ((BUILD_FT2232_FTD2XX==1) || (BUILD_FT2232_LIBFTDI==1) || (BUILD_JLINK==1))
        /*      this is the table submitted by Jeff Williams on 3/30/2009 with this comment:
 
                OK, I added Peter's version of the state table, and it works OK for