switch to jtag_add_callback() - USB performance fix

git-svn-id: svn://svn.berlios.de/openocd/trunk@1731 b42882b7-edfa-0310-969c-e2dbd0fdcd60
This commit is contained in:
oharboe 2009-05-11 07:47:21 +00:00
parent 68cea6e952
commit 84ca1a9ef0
1 changed files with 4 additions and 40 deletions

View File

@ -241,21 +241,18 @@ int embeddedice_read_reg_w_check(reg_t *reg, u8* check_value, u8* check_mask)
fields[0].out_value = reg->value; fields[0].out_value = reg->value;
fields[0].in_value = NULL; fields[0].in_value = NULL;
fields[1].tap = ice_reg->jtag_info->tap; fields[1].tap = ice_reg->jtag_info->tap;
fields[1].num_bits = 5; fields[1].num_bits = 5;
fields[1].out_value = field1_out; fields[1].out_value = field1_out;
buf_set_u32(fields[1].out_value, 0, 5, reg_addr); buf_set_u32(fields[1].out_value, 0, 5, reg_addr);
fields[1].in_value = NULL; fields[1].in_value = NULL;
fields[2].tap = ice_reg->jtag_info->tap; fields[2].tap = ice_reg->jtag_info->tap;
fields[2].num_bits = 1; fields[2].num_bits = 1;
fields[2].out_value = field2_out; fields[2].out_value = field2_out;
buf_set_u32(fields[2].out_value, 0, 1, 0); buf_set_u32(fields[2].out_value, 0, 1, 0);
fields[2].in_value = NULL; fields[2].in_value = NULL;
jtag_add_dr_scan(3, fields, TAP_INVALID); jtag_add_dr_scan(3, fields, TAP_INVALID);
fields[0].in_value = reg->value; fields[0].in_value = reg->value;
@ -290,9 +287,7 @@ int embeddedice_receive(arm_jtag_t *jtag_info, u32 *data, u32 size)
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 = NULL; fields[0].out_value = NULL;
u8 tmp[4]; fields[0].in_value = NULL;
fields[0].in_value = tmp;
fields[1].tap = jtag_info->tap; fields[1].tap = jtag_info->tap;
fields[1].num_bits = 5; fields[1].num_bits = 5;
@ -300,14 +295,12 @@ int embeddedice_receive(arm_jtag_t *jtag_info, u32 *data, u32 size)
buf_set_u32(fields[1].out_value, 0, 5, embeddedice_reg_arch_info[EICE_COMMS_DATA]); buf_set_u32(fields[1].out_value, 0, 5, embeddedice_reg_arch_info[EICE_COMMS_DATA]);
fields[1].in_value = NULL; fields[1].in_value = NULL;
fields[2].tap = jtag_info->tap; fields[2].tap = jtag_info->tap;
fields[2].num_bits = 1; fields[2].num_bits = 1;
fields[2].out_value = field2_out; fields[2].out_value = field2_out;
buf_set_u32(fields[2].out_value, 0, 1, 0); buf_set_u32(fields[2].out_value, 0, 1, 0);
fields[2].in_value = NULL; fields[2].in_value = NULL;
jtag_add_dr_scan(3, fields, TAP_INVALID); jtag_add_dr_scan(3, fields, TAP_INVALID);
while (size > 0) while (size > 0)
@ -318,9 +311,9 @@ int embeddedice_receive(arm_jtag_t *jtag_info, u32 *data, u32 size)
if (size == 1) if (size == 1)
buf_set_u32(fields[1].out_value, 0, 5, embeddedice_reg_arch_info[EICE_COMMS_CTRL]); buf_set_u32(fields[1].out_value, 0, 5, embeddedice_reg_arch_info[EICE_COMMS_CTRL]);
jtag_add_dr_scan_now(3, fields, TAP_INVALID); fields[0].in_value = (u8 *)data;
jtag_add_dr_scan(3, fields, TAP_INVALID);
*data = le_to_h_u32(tmp); jtag_add_callback(arm_le_to_h_u32, (u8 *)data);
data++; data++;
size--; size--;
@ -396,24 +389,14 @@ int embeddedice_send(arm_jtag_t *jtag_info, u32 *data, u32 size)
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 = field0_out; fields[0].out_value = field0_out;
fields[0].in_value = NULL; fields[0].in_value = NULL;
fields[1].tap = jtag_info->tap; fields[1].tap = jtag_info->tap;
fields[1].num_bits = 5; fields[1].num_bits = 5;
fields[1].out_value = field1_out; fields[1].out_value = field1_out;
buf_set_u32(fields[1].out_value, 0, 5, embeddedice_reg_arch_info[EICE_COMMS_DATA]); buf_set_u32(fields[1].out_value, 0, 5, embeddedice_reg_arch_info[EICE_COMMS_DATA]);
fields[1].in_value = NULL; fields[1].in_value = NULL;
fields[2].tap = jtag_info->tap; fields[2].tap = jtag_info->tap;
fields[2].num_bits = 1; fields[2].num_bits = 1;
fields[2].out_value = field2_out; fields[2].out_value = field2_out;
@ -421,10 +404,6 @@ int embeddedice_send(arm_jtag_t *jtag_info, u32 *data, u32 size)
fields[2].in_value = NULL; fields[2].in_value = NULL;
while (size > 0) while (size > 0)
{ {
buf_set_u32(fields[0].out_value, 0, 32, *data); buf_set_u32(fields[0].out_value, 0, 32, *data);
@ -465,35 +444,20 @@ int embeddedice_handshake(arm_jtag_t *jtag_info, int hsbit, u32 timeout)
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 = NULL; fields[0].out_value = NULL;
fields[0].in_value = field0_in; fields[0].in_value = field0_in;
fields[1].tap = jtag_info->tap; fields[1].tap = jtag_info->tap;
fields[1].num_bits = 5; fields[1].num_bits = 5;
fields[1].out_value = field1_out; fields[1].out_value = field1_out;
buf_set_u32(fields[1].out_value, 0, 5, embeddedice_reg_arch_info[EICE_COMMS_CTRL]); buf_set_u32(fields[1].out_value, 0, 5, embeddedice_reg_arch_info[EICE_COMMS_CTRL]);
fields[1].in_value = NULL; fields[1].in_value = NULL;
fields[2].tap = jtag_info->tap; fields[2].tap = jtag_info->tap;
fields[2].num_bits = 1; fields[2].num_bits = 1;
fields[2].out_value = field2_out; fields[2].out_value = field2_out;
buf_set_u32(fields[2].out_value, 0, 1, 0); buf_set_u32(fields[2].out_value, 0, 1, 0);
fields[2].in_value = NULL; fields[2].in_value = NULL;
jtag_add_dr_scan(3, fields, TAP_INVALID); jtag_add_dr_scan(3, fields, TAP_INVALID);
gettimeofday(&lap, NULL); gettimeofday(&lap, NULL);
do do