in_handler in_check_mask and in_check_value now removed from field. Last big patch...

[openocd.git] / src / target / arm_jtag.c

diff --git a/src/target/arm_jtag.c b/src/target/arm_jtag.c
index 1e2683c18643e7cc4e56356b8a2ce573d14c7e47..ad57cef940198a5e9fd8c28cf8ff4037054ec4c2 100644 (file)
--- a/src/target/arm_jtag.c
+++ b/src/target/arm_jtag.c
@@ -36,63 +36,78 @@
 #define _ARM_JTAG_SCAN_N_CHECK_
 #endif
 
-int arm_jtag_set_instr(arm_jtag_t *jtag_info, u32 new_instr,  in_handler_t handler)
+int arm_jtag_set_instr(arm_jtag_t *jtag_info, u32 new_instr,  void *no_verify_capture)
 {
-       jtag_device_t *device = jtag_get_device(jtag_info->chain_pos);
-       
-       if (buf_get_u32(device->cur_instr, 0, device->ir_length) != new_instr)
+       jtag_tap_t *tap;
+       tap = jtag_info->tap;
+       if (tap==NULL)
+               return ERROR_FAIL;
+
+       if (buf_get_u32(tap->cur_instr, 0, tap->ir_length) != new_instr)
        {
                scan_field_t field;
                u8 t[4];
-       
-               field.device = jtag_info->chain_pos;
-               field.num_bits = device->ir_length;
+
+               field.tap = tap;
+               field.num_bits = tap->ir_length;
                field.out_value = t;
                buf_set_u32(field.out_value, 0, field.num_bits, new_instr);
-               field.out_mask = NULL;
                field.in_value = NULL;
-               field.in_check_value = NULL;
-               field.in_check_mask = NULL;
-               field.in_handler = handler;
-               field.in_handler_priv = NULL;
-               jtag_add_ir_scan(1, &field, -1);
+               
+
+
+               if (no_verify_capture==NULL)
+               {
+                       jtag_add_ir_scan(1, &field, TAP_INVALID);
+               } else
+               {
+                       /* FIX!!!! this is a kludge!!! arm926ejs.c should reimplement this arm_jtag_set_instr to
+                        * have special verification code.
+                        */
+                       jtag_add_ir_scan_noverify(1, &field, TAP_INVALID);
+               }
        }
-       
+
        return ERROR_OK;
 }
 
 int arm_jtag_scann(arm_jtag_t *jtag_info, u32 new_scan_chain)
 {
+       int retval = ERROR_OK;
        if(jtag_info->cur_scan_chain != new_scan_chain)
        {
                u32 values[1];
                int num_bits[1];
-               
+
                values[0]=new_scan_chain;
                num_bits[0]=jtag_info->scann_size;
-               
-               arm_jtag_set_instr(jtag_info, jtag_info->scann_instr, NULL);
-               jtag_add_dr_out(jtag_info->chain_pos, 
+
+               if((retval = arm_jtag_set_instr(jtag_info, jtag_info->scann_instr, NULL)) != ERROR_OK)
+               {
+                       return retval;
+               }
+
+               jtag_add_dr_out(jtag_info->tap,
                                1,
                                num_bits,
                                values,
-                               -1);
-               
+                               TAP_INVALID);
+
                jtag_info->cur_scan_chain = new_scan_chain;
        }
-       
-       return ERROR_OK;
+
+       return retval;
 }
 
 int arm_jtag_reset_callback(enum jtag_event event, void *priv)
 {
        arm_jtag_t *jtag_info = priv;
-       
+
        if (event == JTAG_TRST_ASSERTED)
        {
                jtag_info->cur_scan_chain = 0;
        }
-       
+
        return ERROR_OK;
 }
 
@@ -102,9 +117,7 @@ int arm_jtag_setup_connection(arm_jtag_t *jtag_info)
        jtag_info->cur_scan_chain = 0;
        jtag_info->intest_instr = 0xc;
 
-       jtag_register_event_callback(arm_jtag_reset_callback, jtag_info);
-       
-       return ERROR_OK;
+       return jtag_register_event_callback(arm_jtag_reset_callback, jtag_info);
 }
 
 /* read JTAG buffer into host-endian u32, flipping bit-order */