zcy
/
tinyriscv-openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Author: Michael Bruck <mbruck@digenius.de> 

- simplify code in interface_jtag_add_ir_scan() by adding a local variable 'scan' to hold the scan_command_t




git-svn-id: svn://svn.berlios.de/openocd/trunk@1842 b42882b7-edfa-0310-969c-e2dbd0fdcd60
__archive__
kc8apf 2009-05-20 04:49:53 +00:00
parent 98e3541333
commit 8632901e7d
1 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/jtag/jtag.c
View File

@ -589,6 +589,13 @@ void jtag_add_ir_scan(int in_num_fields, scan_field_t *in_fields, tap_state_t st
} }
} }
/**
* Generate a list of scan fields with one entry for each TAP.
*
* If the input field list contains an instruction value for a TAP then that is used
* otherwise the TAP is set to bypass.
*
*/
int MINIDRIVER(interface_jtag_add_ir_scan)(int in_num_fields, scan_field_t *in_fields, tap_state_t state) int MINIDRIVER(interface_jtag_add_ir_scan)(int in_num_fields, scan_field_t *in_fields, tap_state_t state)
{ {
jtag_tap_t *tap; jtag_tap_t *tap;
@ -597,19 +604,18 @@ int MINIDRIVER(interface_jtag_add_ir_scan)(int in_num_fields, scan_field_t *in_f
int num_taps = jtag_NumEnabledTaps(); int num_taps = jtag_NumEnabledTaps();
/* allocate memory for a new list member */ jtag_command_t * cmd = cmd_queue_alloc(sizeof(jtag_command_t));
jtag_command_t * cmd = cmd_queue_alloc(sizeof(jtag_command_t)); scan_command_t * scan = cmd_queue_alloc(sizeof(scan_command_t));
jtag_queue_command(cmd); jtag_queue_command(cmd);
cmd->type = JTAG_SCAN; cmd->type = JTAG_SCAN;
cmd->cmd.scan = scan;
/* allocate memory for ir scan command */ scan->ir_scan = true;
cmd->cmd.scan = cmd_queue_alloc(sizeof(scan_command_t)); scan->num_fields = num_taps; /* one field per device */
cmd->cmd.scan->ir_scan = true; scan->fields = cmd_queue_alloc(num_taps * sizeof(scan_field_t));
cmd->cmd.scan->num_fields = num_taps; /* one field per device */ scan->end_state = state;
cmd->cmd.scan->fields = cmd_queue_alloc(num_taps * sizeof(scan_field_t));
cmd->cmd.scan->end_state = state;
nth_tap = -1; nth_tap = -1;
tap = NULL; tap = NULL;
@ -625,10 +631,10 @@ int MINIDRIVER(interface_jtag_add_ir_scan)(int in_num_fields, scan_field_t *in_f
assert(nth_tap < num_taps); assert(nth_tap < num_taps);
scan_size = tap->ir_length; scan_size = tap->ir_length;
cmd->cmd.scan->fields[nth_tap].tap = tap; scan->fields[nth_tap].tap = tap;
cmd->cmd.scan->fields[nth_tap].num_bits = scan_size; scan->fields[nth_tap].num_bits = scan_size;
cmd->cmd.scan->fields[nth_tap].in_value = NULL; /* do not collect input for tap's in bypass */ scan->fields[nth_tap].in_value = NULL; /* do not collect input for tap's in bypass */
/* search the list */ /* search the list */
for (int j = 0; j < in_num_fields; j++) for (int j = 0; j < in_num_fields; j++)
@ -636,8 +642,8 @@ int MINIDRIVER(interface_jtag_add_ir_scan)(int in_num_fields, scan_field_t *in_f
if (tap == in_fields[j].tap) if (tap == in_fields[j].tap)
{ {
found = 1; found = 1;
cmd->cmd.scan->fields[nth_tap].in_value = in_fields[j].in_value; scan->fields[nth_tap].in_value = in_fields[j].in_value;
cmd->cmd.scan->fields[nth_tap].out_value = buf_cpy(in_fields[j].out_value, cmd_queue_alloc(CEIL(scan_size, 8)), scan_size); scan->fields[nth_tap].out_value = buf_cpy(in_fields[j].out_value, cmd_queue_alloc(CEIL(scan_size, 8)), scan_size);
tap->bypass = 0; tap->bypass = 0;
break; break;
@ -647,12 +653,12 @@ int MINIDRIVER(interface_jtag_add_ir_scan)(int in_num_fields, scan_field_t *in_f
if (!found) if (!found)
{ {
/* if a tap isn't listed, set it to BYPASS */ /* if a tap isn't listed, set it to BYPASS */
cmd->cmd.scan->fields[nth_tap].out_value = buf_set_ones(cmd_queue_alloc(CEIL(scan_size, 8)), scan_size); scan->fields[nth_tap].out_value = buf_set_ones(cmd_queue_alloc(CEIL(scan_size, 8)), scan_size);
tap->bypass = 1; tap->bypass = 1;
} }
/* update device information */ /* update device information */
buf_cpy(cmd->cmd.scan->fields[nth_tap].out_value, tap->cur_instr, scan_size); buf_cpy(scan->fields[nth_tap].out_value, tap->cur_instr, scan_size);
} }
assert(nth_tap == (num_taps - 1)); assert(nth_tap == (num_taps - 1));