-int arm_jtag_set_instr_error_handler(u8 *in_value, void *priv)
-{
- ERROR("setting the new JTAG instruction failed, debugging is likely to be broken");
-
- return ERROR_OK;
-}
-
-int arm_jtag_set_instr(arm_jtag_t *jtag_info, u32 new_instr, error_handler_t *caller_error_handler)
-{
- jtag_device_t *device = jtag_get_device(jtag_info->chain_pos);
-
- if (buf_get_u32(device->cur_instr, 0, device->ir_length) != new_instr)
- {
- scan_field_t field;
-
- field.device = jtag_info->chain_pos;
- field.num_bits = device->ir_length;
- field.out_value = calloc(CEIL(field.num_bits, 8), 1);
- 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 = NULL;
- field.in_handler_priv = NULL;
-
- if (caller_error_handler)
- {
- jtag_add_ir_scan(1, &field, -1, caller_error_handler);
- }
- else
- {
- error_handler_t error_handler;
- error_handler.error_handler = arm_jtag_set_instr_error_handler;
- error_handler.error_handler_priv = NULL;
- jtag_add_ir_scan(1, &field, -1, &error_handler);
- }
-
-
- free(field.out_value);
- }
-
- return ERROR_OK;
-}
-
-int arm_jtag_scann(arm_jtag_t *jtag_info, u32 new_scan_chain)
-{
- if(jtag_info->cur_scan_chain != new_scan_chain)
- {
-#ifdef _ARM_JTAG_SCAN_N_CHECK_
- u8 scan_n_check_value = 0x10;
-#endif
- scan_field_t field;
-
- field.device = jtag_info->chain_pos;
- field.num_bits = jtag_info->scann_size;
- field.out_value = calloc(CEIL(field.num_bits, 8), 1);
- buf_set_u32(field.out_value, 0, field.num_bits, new_scan_chain);
- field.out_mask = NULL;
- field.in_value = NULL;
-#ifdef _ARM_JTAG_SCAN_N_CHECK_
- field.in_check_value = &scan_n_check_value;
-#else
- field.in_check_value = NULL;
-#endif
- field.in_check_mask = NULL;
- field.in_handler = NULL;
- field.in_handler_priv = NULL;
-
- arm_jtag_set_instr(jtag_info, jtag_info->scann_instr, NULL);
- jtag_add_dr_scan(1, &field, -1, NULL);
-
- jtag_info->cur_scan_chain = new_scan_chain;
-
- free(field.out_value);
- }
-
- return ERROR_OK;
-}
-
-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;
+int arm_jtag_set_instr_inner(struct arm_jtag *jtag_info,
+ uint32_t new_instr, void *no_verify_capture, tap_state_t end_state)
+{
+ struct jtag_tap *tap;
+ tap = jtag_info->tap;
+ struct scan_field field;
+ uint8_t t[4];
+
+ field.num_bits = tap->ir_length;
+ field.out_value = t;
+ buf_set_u32(t, 0, field.num_bits, new_instr);
+ field.in_value = NULL;
+
+ if (no_verify_capture == NULL)
+ jtag_add_ir_scan(tap, &field, end_state);
+ 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(tap, &field, end_state);