- jtag.c: consolidate all memory allocations in scan functions in one block, add out_fields pointer to set stage for further changes
git-svn-id: svn://svn.berlios.de/openocd/trunk@1861
b42882b7-edfa-0310-969c-
e2dbd0fdcd60
int num_taps = jtag_NumEnabledTaps();
int num_taps = jtag_NumEnabledTaps();
- jtag_command_t * cmd = cmd_queue_alloc(sizeof(jtag_command_t));
- scan_command_t * scan = cmd_queue_alloc(sizeof(scan_command_t));
+ jtag_command_t * cmd = cmd_queue_alloc(sizeof(jtag_command_t));
+ scan_command_t * scan = cmd_queue_alloc(sizeof(scan_command_t));
+ scan_field_t * out_fields = cmd_queue_alloc(num_taps * sizeof(scan_field_t));
scan->ir_scan = true;
scan->num_fields = num_taps; /* one field per device */
scan->ir_scan = true;
scan->num_fields = num_taps; /* one field per device */
- scan->fields = cmd_queue_alloc(num_taps * sizeof(scan_field_t));
+ scan->fields = out_fields;
scan->end_state = state;
nth_tap = -1;
scan->end_state = state;
nth_tap = -1;
int MINIDRIVER(interface_jtag_add_plain_ir_scan)(int in_num_fields, const scan_field_t *in_fields, tap_state_t state)
{
int MINIDRIVER(interface_jtag_add_plain_ir_scan)(int in_num_fields, const scan_field_t *in_fields, tap_state_t state)
{
- jtag_command_t * cmd = cmd_queue_alloc(sizeof(jtag_command_t));
- scan_command_t * scan = cmd_queue_alloc(sizeof(scan_command_t));
+ jtag_command_t * cmd = cmd_queue_alloc(sizeof(jtag_command_t));
+ scan_command_t * scan = cmd_queue_alloc(sizeof(scan_command_t));
+ scan_field_t * out_fields = cmd_queue_alloc(in_num_fields * sizeof(scan_field_t));
scan->ir_scan = true;
scan->num_fields = in_num_fields;
scan->ir_scan = true;
scan->num_fields = in_num_fields;
- scan->fields = cmd_queue_alloc(in_num_fields * sizeof(scan_field_t));
+ scan->fields = out_fields;
scan->end_state = state;
for (int i = 0; i < in_num_fields; i++)
scan->end_state = state;
for (int i = 0; i < in_num_fields; i++)
- jtag_command_t * cmd = cmd_queue_alloc(sizeof(jtag_command_t));
- scan_command_t * scan = cmd_queue_alloc(sizeof(scan_command_t));
+ jtag_command_t * cmd = cmd_queue_alloc(sizeof(jtag_command_t));
+ scan_command_t * scan = cmd_queue_alloc(sizeof(scan_command_t));
+ scan_field_t * out_fields = cmd_queue_alloc((in_num_fields + bypass_devices) * sizeof(scan_field_t));
scan->ir_scan = false;
scan->num_fields = in_num_fields + bypass_devices;
scan->ir_scan = false;
scan->num_fields = in_num_fields + bypass_devices;
- scan->fields = cmd_queue_alloc((in_num_fields + bypass_devices) * sizeof(scan_field_t));
+ scan->fields = out_fields;
scan->end_state = state;
tap = NULL;
scan->end_state = state;
tap = NULL;
- jtag_command_t * cmd = cmd_queue_alloc(sizeof(jtag_command_t));
- scan_command_t * scan = cmd_queue_alloc(sizeof(scan_command_t));
+ jtag_command_t * cmd = cmd_queue_alloc(sizeof(jtag_command_t));
+ scan_command_t * scan = cmd_queue_alloc(sizeof(scan_command_t));
+ scan_field_t * out_fields = cmd_queue_alloc((in_num_fields + bypass_devices) * sizeof(scan_field_t));
scan->ir_scan = false;
scan->num_fields = in_num_fields + bypass_devices;
scan->ir_scan = false;
scan->num_fields = in_num_fields + bypass_devices;
- scan->fields = cmd_queue_alloc((in_num_fields + bypass_devices) * sizeof(scan_field_t));
+ scan->fields = out_fields;
scan->end_state = end_state;
tap = NULL;
scan->end_state = end_state;
tap = NULL;
*/
int MINIDRIVER(interface_jtag_add_plain_dr_scan)(int in_num_fields, const scan_field_t *in_fields, tap_state_t state)
{
*/
int MINIDRIVER(interface_jtag_add_plain_dr_scan)(int in_num_fields, const scan_field_t *in_fields, tap_state_t state)
{
- jtag_command_t * cmd = cmd_queue_alloc(sizeof(jtag_command_t));
- scan_command_t * scan = cmd_queue_alloc(sizeof(scan_command_t));
+ jtag_command_t * cmd = cmd_queue_alloc(sizeof(jtag_command_t));
+ scan_command_t * scan = cmd_queue_alloc(sizeof(scan_command_t));
+ scan_field_t * out_fields = cmd_queue_alloc(in_num_fields * sizeof(scan_field_t));
scan->ir_scan = false;
scan->num_fields = in_num_fields;
scan->ir_scan = false;
scan->num_fields = in_num_fields;
- scan->fields = cmd_queue_alloc(in_num_fields * sizeof(scan_field_t));
+ scan->fields = out_fields;
scan->end_state = state;
for (int i = 0; i < in_num_fields; i++)
scan->end_state = state;
for (int i = 0; i < in_num_fields; i++)