remove in_handler usage

git-svn-id: svn://svn.berlios.de/openocd/trunk@1643 b42882b7-edfa-0310-969c-e2dbd0fdcd60
This commit is contained in:
oharboe 2009-05-07 13:40:11 +00:00
parent b1364c5f9c
commit dbe008302a
1 changed files with 50 additions and 58 deletions

View File

@ -216,42 +216,34 @@ int arm9tdmi_clock_out(arm_jtag_t *jtag_info, u32 instr, u32 out, u32 *in, int s
fields[0].tap = jtag_info->tap; fields[0].tap = jtag_info->tap;
fields[0].num_bits = 32; fields[0].num_bits = 32;
fields[0].out_value = out_buf; fields[0].out_value = out_buf;
fields[0].in_value = NULL; fields[0].in_value = NULL;
if (in) fields[0].in_handler = NULL;
{
fields[0].in_handler = arm_jtag_buf_to_u32; /* deprecated! invoke this from user code! */
fields[0].in_handler_priv = in;
}
else
{
fields[0].in_handler = NULL;
}
fields[1].tap = jtag_info->tap; fields[1].tap = jtag_info->tap;
fields[1].num_bits = 3; fields[1].num_bits = 3;
fields[1].out_value = &sysspeed_buf; fields[1].out_value = &sysspeed_buf;
fields[1].in_value = NULL; fields[1].in_value = NULL;
fields[1].in_handler = NULL; fields[1].in_handler = NULL;
fields[2].tap = jtag_info->tap; fields[2].tap = jtag_info->tap;
fields[2].num_bits = 32; fields[2].num_bits = 32;
fields[2].out_value = instr_buf; fields[2].out_value = instr_buf;
fields[2].in_value = NULL; fields[2].in_value = NULL;
fields[2].in_handler = NULL; fields[2].in_handler = NULL;
if (in)
{
u8 tmp[4];
fields[0].in_value=tmp;
jtag_add_dr_scan_now(3, fields, TAP_INVALID);
jtag_add_dr_scan(3, fields, TAP_INVALID); *in=flip_u32(le_to_h_u32(tmp), 32);
}
else
{
jtag_add_dr_scan(3, fields, TAP_INVALID);
}
jtag_add_runtest(0, TAP_INVALID); jtag_add_runtest(0, TAP_INVALID);