X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Farm9tdmi.c;h=e8e1991c6ad2e5ad854342c25f3504401731578a;hp=7e30bc0821ed7a410e40e2cdf463dace899ea729;hb=e86dee32004d750e8654fe449bfcdffaed7339fa;hpb=4d88c124b1262a738b4a9f107ef62404a45bf323 diff --git a/src/target/arm9tdmi.c b/src/target/arm9tdmi.c index 7e30bc0821..e8e1991c6a 100644 --- a/src/target/arm9tdmi.c +++ b/src/target/arm9tdmi.c @@ -130,30 +130,30 @@ int arm9tdmi_examine_debug_reason(target_t *target) fields[0].out_value = NULL; fields[0].in_value = databus; - fields[0].in_check_value = NULL; - fields[0].in_check_mask = NULL; + + fields[0].in_handler = NULL; - fields[0].in_handler_priv = NULL; + fields[1].tap = arm7_9->jtag_info.tap; fields[1].num_bits = 3; fields[1].out_value = NULL; fields[1].in_value = &debug_reason; - fields[1].in_check_value = NULL; - fields[1].in_check_mask = NULL; + + fields[1].in_handler = NULL; - fields[1].in_handler_priv = NULL; + fields[2].tap = arm7_9->jtag_info.tap; fields[2].num_bits = 32; fields[2].out_value = NULL; fields[2].in_value = instructionbus; - fields[2].in_check_value = NULL; - fields[2].in_check_mask = NULL; + + fields[2].in_handler = NULL; - fields[2].in_handler_priv = NULL; + if((retval = arm_jtag_scann(&arm7_9->jtag_info, 0x1)) != ERROR_OK) { @@ -226,30 +226,30 @@ int arm9tdmi_clock_out(arm_jtag_t *jtag_info, u32 instr, u32 out, u32 *in, int s else { fields[0].in_handler = NULL; - fields[0].in_handler_priv = NULL; + } - fields[0].in_check_value = NULL; - fields[0].in_check_mask = NULL; + + fields[1].tap = jtag_info->tap; fields[1].num_bits = 3; fields[1].out_value = &sysspeed_buf; fields[1].in_value = NULL; - fields[1].in_check_value = NULL; - fields[1].in_check_mask = NULL; + + fields[1].in_handler = NULL; - fields[1].in_handler_priv = NULL; + fields[2].tap = jtag_info->tap; fields[2].num_bits = 32; fields[2].out_value = instr_buf; fields[2].in_value = NULL; - fields[2].in_check_value = NULL; - fields[2].in_check_mask = NULL; + + fields[2].in_handler = NULL; - fields[2].in_handler_priv = NULL; + jtag_add_dr_scan(3, fields, TAP_INVALID); @@ -295,8 +295,8 @@ int arm9tdmi_clock_data_in(arm_jtag_t *jtag_info, u32 *in) fields[0].in_value = NULL; fields[0].in_handler = arm_jtag_buf_to_u32; /* deprecated! invoke this from user code! */ fields[0].in_handler_priv = in; - fields[0].in_check_value = NULL; - fields[0].in_check_mask = NULL; + + fields[1].tap = jtag_info->tap; fields[1].num_bits = 3; @@ -304,19 +304,19 @@ int arm9tdmi_clock_data_in(arm_jtag_t *jtag_info, u32 *in) fields[1].in_value = NULL; fields[1].in_handler = NULL; - fields[1].in_handler_priv = NULL; - fields[1].in_check_value = NULL; - fields[1].in_check_mask = NULL; + + + fields[2].tap = jtag_info->tap; fields[2].num_bits = 32; fields[2].out_value = NULL; fields[2].in_value = NULL; - fields[2].in_check_value = NULL; - fields[2].in_check_mask = NULL; + + fields[2].in_handler = NULL; - fields[2].in_handler_priv = NULL; + jtag_add_dr_scan(3, fields, TAP_INVALID); @@ -378,8 +378,8 @@ int arm9tdmi_clock_data_in_endianness(arm_jtag_t *jtag_info, void *in, int size, break; } fields[0].in_handler_priv = in; - fields[0].in_check_value = NULL; - fields[0].in_check_mask = NULL; + + fields[1].tap = jtag_info->tap; fields[1].num_bits = 3; @@ -387,19 +387,19 @@ int arm9tdmi_clock_data_in_endianness(arm_jtag_t *jtag_info, void *in, int size, fields[1].in_value = NULL; fields[1].in_handler = NULL; - fields[1].in_handler_priv = NULL; - fields[1].in_check_value = NULL; - fields[1].in_check_mask = NULL; + + + fields[2].tap = jtag_info->tap; fields[2].num_bits = 32; fields[2].out_value = NULL; fields[2].in_value = NULL; - fields[2].in_check_value = NULL; - fields[2].in_check_mask = NULL; + + fields[2].in_handler = NULL; - fields[2].in_handler_priv = NULL; + jtag_add_dr_scan(3, fields, TAP_INVALID);