fields[0].tap = arm7_9->jtag_info.tap;
fields[0].num_bits = 32;
fields[0].out_value = NULL;
-
fields[0].in_value = databus;
-
- fields[0].in_handler = 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_handler = 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_handler = NULL;
-
-
- if((retval = arm_jtag_scann(&arm7_9->jtag_info, 0x1)) != ERROR_OK)
+ if ((retval = arm_jtag_scann(&arm7_9->jtag_info, 0x1)) != ERROR_OK)
{
return retval;
}
arm_jtag_set_instr(&arm7_9->jtag_info, arm7_9->jtag_info.intest_instr, NULL);
jtag_add_dr_scan(3, fields, TAP_DRPAUSE);
- if((retval = jtag_execute_queue()) != ERROR_OK)
+ if ((retval = jtag_execute_queue()) != ERROR_OK)
{
return retval;
}
buf_set_u32(&sysspeed_buf, 2, 1, 1);
jtag_add_end_state(TAP_DRPAUSE);
- if((retval = arm_jtag_scann(jtag_info, 0x1)) != ERROR_OK)
+ if ((retval = arm_jtag_scann(jtag_info, 0x1)) != ERROR_OK)
{
return retval;
}
fields[0].num_bits = 32;
fields[0].out_value = out_buf;
fields[0].in_value = NULL;
- fields[0].in_handler = 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_handler = 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_handler = NULL;
if (in)
{
fields[0].in_value=tmp;
jtag_add_dr_scan_now(3, fields, TAP_INVALID);
- *in=flip_u32(le_to_h_u32(tmp), 32);
+ *in=le_to_h_u32(tmp);
}
else
{
#ifdef _DEBUG_INSTRUCTION_EXECUTION_
{
- if((retval = jtag_execute_queue()) != ERROR_OK)
+ if ((retval = jtag_execute_queue()) != ERROR_OK)
{
return retval;
}
scan_field_t fields[3];
jtag_add_end_state(TAP_DRPAUSE);
- if((retval = arm_jtag_scann(jtag_info, 0x1)) != ERROR_OK)
+ if ((retval = arm_jtag_scann(jtag_info, 0x1)) != ERROR_OK)
{
return retval;
}
fields[0].tap = jtag_info->tap;
fields[0].num_bits = 32;
fields[0].out_value = NULL;
-
- 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;
-
-
+ u8 tmp[4];
+ fields[0].in_value = tmp;
fields[1].tap = jtag_info->tap;
fields[1].num_bits = 3;
fields[1].out_value = NULL;
-
fields[1].in_value = NULL;
- fields[1].in_handler = NULL;
-
-
-
fields[2].tap = jtag_info->tap;
fields[2].num_bits = 32;
fields[2].out_value = NULL;
-
fields[2].in_value = NULL;
+ jtag_add_dr_scan_now(3, fields, TAP_INVALID);
- fields[2].in_handler = NULL;
-
-
- jtag_add_dr_scan(3, fields, TAP_INVALID);
+ *in=le_to_h_u32(tmp);
jtag_add_runtest(0, TAP_INVALID);
#ifdef _DEBUG_INSTRUCTION_EXECUTION_
{
- if((retval = jtag_execute_queue()) != ERROR_OK)
+ if ((retval = jtag_execute_queue()) != ERROR_OK)
{
return retval;
}
return ERROR_OK;
}
+extern void arm_endianness(u8 *tmp, void *in, int size, int be, int flip);
+
/* clock the target, and read the databus
* the *in pointer points to a buffer where elements of 'size' bytes
* are stored in big (be==1) or little (be==0) endianness
scan_field_t fields[3];
jtag_add_end_state(TAP_DRPAUSE);
- if((retval = arm_jtag_scann(jtag_info, 0x1)) != ERROR_OK)
+ if ((retval = arm_jtag_scann(jtag_info, 0x1)) != ERROR_OK)
{
return retval;
}
fields[0].tap = jtag_info->tap;
fields[0].num_bits = 32;
fields[0].out_value = NULL;
-
- fields[0].in_value = NULL;
- switch (size)
- {
- case 4:
- fields[0].in_handler = (be) ? arm_jtag_buf_to_be32 : arm_jtag_buf_to_le32; /* deprecated! invoke this from user code! */
- break;
- case 2:
- fields[0].in_handler = (be) ? arm_jtag_buf_to_be16 : arm_jtag_buf_to_le16; /* deprecated! invoke this from user code! */
- break;
- case 1:
- fields[0].in_handler = arm_jtag_buf_to_8; /* deprecated! invoke this from user code! */
- break;
- }
- fields[0].in_handler_priv = in;
-
-
+ u8 tmp[4];
+ fields[0].in_value = tmp;
fields[1].tap = jtag_info->tap;
fields[1].num_bits = 3;
fields[1].out_value = NULL;
-
fields[1].in_value = NULL;
- fields[1].in_handler = NULL;
-
-
-
fields[2].tap = jtag_info->tap;
fields[2].num_bits = 32;
fields[2].out_value = NULL;
-
fields[2].in_value = NULL;
+ jtag_add_dr_scan_now(3, fields, TAP_INVALID);
- fields[2].in_handler = NULL;
-
+ arm_endianness(tmp, in, size, be, 0);
- jtag_add_dr_scan(3, fields, TAP_INVALID);
jtag_add_runtest(0, TAP_INVALID);
#ifdef _DEBUG_INSTRUCTION_EXECUTION_
{
- if((retval = jtag_execute_queue()) != ERROR_OK)
+ if ((retval = jtag_execute_queue()) != ERROR_OK)
{
return retval;
}
/* NOP fetched, BX in Execute (1) */
arm9tdmi_clock_out(jtag_info, ARMV4_5_T_NOP, 0, NULL, 0);
- if((retval = jtag_execute_queue()) != ERROR_OK)
+ if ((retval = jtag_execute_queue()) != ERROR_OK)
{
return;
}
for (i = 0; i < argc; i++)
{
/* go through list of vectors */
- for(j = 0; arm9tdmi_vectors[j].name; j++)
+ for (j = 0; arm9tdmi_vectors[j].name; j++)
{
if (strcmp(args[i], arm9tdmi_vectors[j].name) == 0)
{