remove in_handler usage

git-svn-id: svn://svn.berlios.de/openocd/trunk@1647 b42882b7-edfa-0310-969c-e2dbd0fdcd60
__archive__
oharboe 2009-05-07 14:02:21 +00:00
parent cee9970c98
commit a229f21432
1 changed files with 47 additions and 51 deletions

View File

@ -339,24 +339,19 @@ int xscale_receive(target_t *target, u32 *buffer, int num_words)
fields[0].tap = xscale->jtag_info.tap; fields[0].tap = xscale->jtag_info.tap;
fields[0].num_bits = 3; fields[0].num_bits = 3;
fields[0].out_value = NULL; fields[0].out_value = NULL;
fields[0].in_value = NULL; fields[0].in_value = NULL;
jtag_set_check_value(fields+0, &field0_check_value, &field0_check_mask, NULL); jtag_set_check_value(fields+0, &field0_check_value, &field0_check_mask, NULL);
fields[1].tap = xscale->jtag_info.tap; fields[1].tap = xscale->jtag_info.tap;
fields[1].num_bits = 32; fields[1].num_bits = 32;
fields[1].out_value = NULL; fields[1].out_value = NULL;
u8 tmp[4];
fields[1].in_value = NULL; fields[1].in_value = tmp;
fields[1].in_handler = NULL; fields[1].in_handler = NULL;
fields[2].tap = xscale->jtag_info.tap; fields[2].tap = xscale->jtag_info.tap;
fields[2].num_bits = 1; fields[2].num_bits = 1;
fields[2].out_value = NULL; fields[2].out_value = NULL;
fields[2].in_value = NULL; fields[2].in_value = NULL;
jtag_set_check_value(fields+2, &field2_check_value, &field2_check_mask, NULL); jtag_set_check_value(fields+2, &field2_check_value, &field2_check_mask, NULL);
@ -373,11 +368,12 @@ int xscale_receive(target_t *target, u32 *buffer, int num_words)
for (i = words_done; i < num_words; i++) for (i = words_done; i < num_words; i++)
{ {
fields[0].in_value = &field0[i]; fields[0].in_value = &field0[i];
fields[1].in_handler = buf_to_u32_handler; /* deprecated! invoke this from user code! */
fields[1].in_handler_priv = (u8*)&field1[i];
jtag_add_pathmove(3, path); jtag_add_pathmove(3, path);
jtag_add_dr_scan(3, fields, TAP_IDLE); jtag_add_dr_scan_now(3, fields, TAP_IDLE);
field1[i]=buf_get_u32(tmp, 0, 32);
words_scheduled++; words_scheduled++;
} }