remove in_handler usage

git-svn-id: svn://svn.berlios.de/openocd/trunk@1637 b42882b7-edfa-0310-969c-e2dbd0fdcd60
This commit is contained in:
oharboe 2009-05-07 12:33:26 +00:00
parent a1777c6bcf
commit 146b6462a3
1 changed files with 37 additions and 41 deletions

View File

@ -113,10 +113,7 @@ int adi_jtag_dp_scan_u32(arm_jtag_t *jtag_info, u8 instr, u8 reg_addr, u8 RnW, u
fields[0].num_bits = 3;
buf_set_u32(&out_addr_buf, 0, 3, ((reg_addr >> 1) & 0x6) | (RnW & 0x1));
fields[0].out_value = &out_addr_buf;
fields[0].in_value = ack;
fields[0].in_handler = NULL;
@ -124,23 +121,22 @@ int adi_jtag_dp_scan_u32(arm_jtag_t *jtag_info, u8 instr, u8 reg_addr, u8 RnW, u
fields[1].num_bits = 32;
buf_set_u32(out_value_buf, 0, 32, outvalue);
fields[1].out_value = out_value_buf;
fields[1].in_value = NULL;
fields[1].in_handler = NULL;
if (invalue)
{
fields[1].in_handler = arm_jtag_buf_to_u32; /* deprecated! invoke this from user code! */
fields[1].in_handler_priv = invalue;
}
else
u8 tmp[4];
fields[1].in_value = tmp;
jtag_add_dr_scan_now(2, fields, TAP_INVALID);
*invalue=flip_u32(le_to_h_u32(tmp), 32);
} else
{
fields[1].in_handler = NULL;
jtag_add_dr_scan(2, fields, TAP_INVALID);
}
jtag_add_dr_scan(2, fields, TAP_INVALID);
return ERROR_OK;
}