int jtag_flush_queue_count; /* count # of flushes for profiling / debugging purposes */
-static void jtag_add_scan_check(void (*jtag_add_scan)(int num_fields, scan_field_t *fields, tap_state_t state),
- int num_fields, scan_field_t *fields, tap_state_t state);
+static void jtag_add_scan_check(void (*jtag_add_scan)(int in_num_fields, scan_field_t *in_fields, tap_state_t state),
+ int in_num_fields, scan_field_t *in_fields, tap_state_t state);
/* note that this is not marked as static as it must be available from outside jtag.c for those
that implement the jtag_xxx() minidriver layer
static int handle_verify_ircapture_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
static int handle_verify_jtag_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
+static int handle_tms_sequence_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
jtag_tap_t *jtag_AllTaps(void)
{
cmd_queue_cur_state = cmd_queue_end_state;
}
-void jtag_add_ir_scan_noverify(int num_fields, scan_field_t *fields, tap_state_t state)
+void jtag_add_ir_scan_noverify(int in_num_fields, scan_field_t *in_fields, tap_state_t state)
{
int retval;
jtag_prelude(state);
- retval=interface_jtag_add_ir_scan(num_fields, fields, cmd_queue_end_state);
+ retval=interface_jtag_add_ir_scan(in_num_fields, in_fields, cmd_queue_end_state);
if (retval!=ERROR_OK)
jtag_error=retval;
}
-void jtag_add_ir_scan(int num_fields, scan_field_t *fields, tap_state_t state)
+void jtag_add_ir_scan(int in_num_fields, scan_field_t *in_fields, tap_state_t state)
{
if (jtag_verify&&jtag_verify_capture_ir)
{
/* 8 x 32 bit id's is enough for all invoations */
- int j;
- for (j = 0; j < num_fields; j++)
+
+ for (int j = 0; j < in_num_fields; j++)
{
- fields[j].check_value=NULL;
- fields[j].check_mask=NULL;
+ in_fields[j].check_value=NULL;
+ in_fields[j].check_mask=NULL;
/* if we are to run a verification of the ir scan, we need to get the input back.
* We may have to allocate space if the caller didn't ask for the input back.
*/
- fields[j].check_value=fields[j].tap->expected;
- fields[j].check_mask=fields[j].tap->expected_mask;
+ in_fields[j].check_value=in_fields[j].tap->expected;
+ in_fields[j].check_mask=in_fields[j].tap->expected_mask;
}
- jtag_add_scan_check(jtag_add_ir_scan_noverify, num_fields, fields, state);
+ jtag_add_scan_check(jtag_add_ir_scan_noverify, in_num_fields, in_fields, state);
} else
{
- jtag_add_ir_scan_noverify(num_fields, fields, state);
+ jtag_add_ir_scan_noverify(in_num_fields, in_fields, state);
}
}
-int MINIDRIVER(interface_jtag_add_ir_scan)(int num_fields, scan_field_t *fields, tap_state_t state)
+/**
+ * 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)
{
jtag_tap_t *tap;
- int j;
- int x;
int nth_tap;
int scan_size = 0;
- /* allocate memory for a new list member */
- jtag_command_t * cmd = cmd_queue_alloc(sizeof(jtag_command_t));
-
+ 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_queue_command(cmd);
-
- cmd->type = JTAG_SCAN;
- /* allocate memory for ir scan command */
- cmd->cmd.scan = cmd_queue_alloc(sizeof(scan_command_t));
- cmd->cmd.scan->ir_scan = true;
- x = jtag_NumEnabledTaps();
- cmd->cmd.scan->num_fields = x; /* one field per device */
- cmd->cmd.scan->fields = cmd_queue_alloc(x * sizeof(scan_field_t));
- cmd->cmd.scan->end_state = state;
+ cmd->type = JTAG_SCAN;
+ cmd->cmd.scan = scan;
+
+ 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->end_state = state;
nth_tap = -1;
tap = NULL;
}
nth_tap++;
- assert(nth_tap < x );
+ assert(nth_tap < num_taps);
- scan_size = tap->ir_length;
- cmd->cmd.scan->fields[nth_tap].tap = tap;
- cmd->cmd.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_size = tap->ir_length;
+ scan->fields[nth_tap].tap = tap;
+ scan->fields[nth_tap].num_bits = scan_size;
+ scan->fields[nth_tap].in_value = NULL; /* do not collect input for tap's in bypass */
/* search the list */
- for (j = 0; j < num_fields; j++)
+ for (int j = 0; j < in_num_fields; j++)
{
- if (tap == fields[j].tap)
+ if (tap == in_fields[j].tap)
{
found = 1;
- cmd->cmd.scan->fields[nth_tap].in_value = fields[j].in_value;
- cmd->cmd.scan->fields[nth_tap].out_value = buf_cpy(fields[j].out_value, cmd_queue_alloc(CEIL(scan_size, 8)), scan_size);
+ scan->fields[nth_tap].in_value = in_fields[j].in_value;
+ 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;
break;
if (!found)
{
/* 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;
}
/* 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 == (x-1));
+
+ assert(nth_tap == (num_taps - 1));
return ERROR_OK;
}
-void jtag_add_plain_ir_scan(int num_fields, scan_field_t *fields, tap_state_t state)
+void jtag_add_plain_ir_scan(int in_num_fields, scan_field_t *in_fields, tap_state_t state)
{
int retval;
jtag_prelude(state);
- retval=interface_jtag_add_plain_ir_scan(num_fields, fields, cmd_queue_end_state);
+ retval=interface_jtag_add_plain_ir_scan(in_num_fields, in_fields, cmd_queue_end_state);
if (retval!=ERROR_OK)
jtag_error=retval;
}
-int MINIDRIVER(interface_jtag_add_plain_ir_scan)(int num_fields, scan_field_t *fields, tap_state_t state)
+int MINIDRIVER(interface_jtag_add_plain_ir_scan)(int in_num_fields, scan_field_t *in_fields, tap_state_t state)
{
/* allocate memory for a new list member */
/* allocate memory for ir scan command */
cmd->cmd.scan = cmd_queue_alloc(sizeof(scan_command_t));
cmd->cmd.scan->ir_scan = true;
- cmd->cmd.scan->num_fields = num_fields;
- cmd->cmd.scan->fields = cmd_queue_alloc(num_fields * sizeof(scan_field_t));
+ cmd->cmd.scan->num_fields = in_num_fields;
+ cmd->cmd.scan->fields = cmd_queue_alloc(in_num_fields * sizeof(scan_field_t));
cmd->cmd.scan->end_state = state;
- for (int i = 0; i < num_fields; i++)
+ for (int i = 0; i < in_num_fields; i++)
{
- int num_bits = fields[i].num_bits;
- int num_bytes = CEIL(fields[i].num_bits, 8);
- cmd->cmd.scan->fields[i].tap = fields[i].tap;
+ int num_bits = in_fields[i].num_bits;
+ int num_bytes = CEIL(in_fields[i].num_bits, 8);
+ cmd->cmd.scan->fields[i].tap = in_fields[i].tap;
cmd->cmd.scan->fields[i].num_bits = num_bits;
- cmd->cmd.scan->fields[i].out_value = buf_cpy(fields[i].out_value, cmd_queue_alloc(num_bytes), num_bits);
- cmd->cmd.scan->fields[i].in_value = fields[i].in_value;
+ cmd->cmd.scan->fields[i].out_value = buf_cpy(in_fields[i].out_value, cmd_queue_alloc(num_bytes), num_bits);
+ cmd->cmd.scan->fields[i].in_value = in_fields[i].in_value;
}
return ERROR_OK;
}
-void jtag_add_dr_scan(int num_fields, scan_field_t *fields, tap_state_t state)
+void jtag_add_dr_scan(int in_num_fields, scan_field_t *in_fields, tap_state_t state)
{
int retval;
jtag_prelude(state);
- retval=interface_jtag_add_dr_scan(num_fields, fields, cmd_queue_end_state);
+ retval=interface_jtag_add_dr_scan(in_num_fields, in_fields, cmd_queue_end_state);
if (retval!=ERROR_OK)
jtag_error=retval;
}
return jtag_check_value_inner(in, (u8 *)data1, (u8 *)data2, (int)data3);
}
-static void jtag_add_scan_check(void (*jtag_add_scan)(int num_fields, scan_field_t *fields, tap_state_t state),
- int num_fields, scan_field_t *fields, tap_state_t state)
+static void jtag_add_scan_check(void (*jtag_add_scan)(int in_num_fields, scan_field_t *in_fields, tap_state_t state),
+ int in_num_fields, scan_field_t *in_fields, tap_state_t state)
{
- for (int i=0; i<num_fields; i++)
+ for (int i = 0; i < in_num_fields; i++)
{
- fields[i].allocated=0;
- fields[i].modified=0;
- if ((fields[i].check_value!=NULL)&&(fields[i].in_value==NULL))
+ in_fields[i].allocated = 0;
+ in_fields[i].modified = 0;
+ if ((in_fields[i].check_value != NULL) && (in_fields[i].in_value == NULL))
{
- fields[i].modified=1;
+ in_fields[i].modified = 1;
/* we need storage space... */
#ifdef HAVE_JTAG_MINIDRIVER_H
- if (fields[i].num_bits<=32)
+ if (in_fields[i].num_bits <= 32)
{
/* This is enough space and we're executing this synchronously */
- fields[i].in_value=fields[i].intmp;
+ in_fields[i].in_value = in_fields[i].intmp;
} else
{
- fields[i].in_value=(u8 *)malloc(CEIL(fields[i].num_bits, 8));
- fields[i].allocated=1;
+ in_fields[i].in_value = (u8 *)malloc(CEIL(in_fields[i].num_bits, 8));
+ in_fields[i].allocated = 1;
}
#else
- fields[i].in_value=(u8 *)cmd_queue_alloc(CEIL(fields[i].num_bits, 8));
+ in_fields[i].in_value = (u8 *)cmd_queue_alloc(CEIL(in_fields[i].num_bits, 8));
#endif
}
}
- jtag_add_scan(num_fields, fields, state);
+ jtag_add_scan(in_num_fields, in_fields, state);
- for (int i=0; i<num_fields; i++)
+ for (int i = 0; i < in_num_fields; i++)
{
- if ((fields[i].check_value!=NULL)&&(fields[i].in_value!=NULL))
+ if ((in_fields[i].check_value != NULL) && (in_fields[i].in_value != NULL))
{
/* this is synchronous for a minidriver */
- jtag_add_callback4(jtag_check_value_mask_callback, fields[i].in_value, (jtag_callback_data_t)fields[i].check_value, (jtag_callback_data_t)fields[i].check_mask, (jtag_callback_data_t)fields[i].num_bits);
+ jtag_add_callback4(jtag_check_value_mask_callback, in_fields[i].in_value,
+ (jtag_callback_data_t)in_fields[i].check_value,
+ (jtag_callback_data_t)in_fields[i].check_mask,
+ (jtag_callback_data_t)in_fields[i].num_bits);
}
- if (fields[i].allocated)
+ if (in_fields[i].allocated)
{
- free(fields[i].in_value);
+ free(in_fields[i].in_value);
}
- if (fields[i].modified)
+ if (in_fields[i].modified)
{
- fields[i].in_value=NULL;
+ in_fields[i].in_value = NULL;
}
}
}
-void jtag_add_dr_scan_check(int num_fields, scan_field_t *fields, tap_state_t state)
+void jtag_add_dr_scan_check(int in_num_fields, scan_field_t *in_fields, tap_state_t state)
{
if (jtag_verify)
{
- jtag_add_scan_check(jtag_add_dr_scan, num_fields, fields, state);
+ jtag_add_scan_check(jtag_add_dr_scan, in_num_fields, in_fields, state);
} else
{
- jtag_add_dr_scan(num_fields, fields, state);
+ jtag_add_dr_scan(in_num_fields, in_fields, state);
}
}
-int MINIDRIVER(interface_jtag_add_dr_scan)(int num_fields, scan_field_t *fields, tap_state_t state)
+int MINIDRIVER(interface_jtag_add_dr_scan)(int in_num_fields, scan_field_t *in_fields, tap_state_t state)
{
int j;
int nth_tap;
/* allocate memory for dr scan command */
cmd->cmd.scan = cmd_queue_alloc(sizeof(scan_command_t));
cmd->cmd.scan->ir_scan = false;
- cmd->cmd.scan->num_fields = num_fields + bypass_devices;
- cmd->cmd.scan->fields = cmd_queue_alloc((num_fields + bypass_devices) * sizeof(scan_field_t));
+ cmd->cmd.scan->num_fields = in_num_fields + bypass_devices;
+ cmd->cmd.scan->fields = cmd_queue_alloc((in_num_fields + bypass_devices) * sizeof(scan_field_t));
cmd->cmd.scan->end_state = state;
tap = NULL;
int found = 0;
cmd->cmd.scan->fields[field_count].tap = tap;
- for (j = 0; j < num_fields; j++)
+ for (j = 0; j < in_num_fields; j++)
{
- if (tap == fields[j].tap)
+ if (tap == in_fields[j].tap)
{
found = 1;
- scan_size = fields[j].num_bits;
+ scan_size = in_fields[j].num_bits;
cmd->cmd.scan->fields[field_count].num_bits = scan_size;
- cmd->cmd.scan->fields[field_count].out_value = buf_cpy(fields[j].out_value, cmd_queue_alloc(CEIL(scan_size, 8)), scan_size);
- cmd->cmd.scan->fields[field_count].in_value = fields[j].in_value;
+ cmd->cmd.scan->fields[field_count].out_value = buf_cpy(in_fields[j].out_value, cmd_queue_alloc(CEIL(scan_size, 8)), scan_size);
+ cmd->cmd.scan->fields[field_count].in_value = in_fields[j].in_value;
field_count++;
}
}
}
void MINIDRIVER(interface_jtag_add_dr_out)(jtag_tap_t *target_tap,
- int num_fields,
+ int in_num_fields,
const int *num_bits,
const u32 *value,
tap_state_t end_state)
/* allocate memory for dr scan command */
cmd->cmd.scan = cmd_queue_alloc(sizeof(scan_command_t));
cmd->cmd.scan->ir_scan = false;
- cmd->cmd.scan->num_fields = num_fields + bypass_devices;
- cmd->cmd.scan->fields = cmd_queue_alloc((num_fields + bypass_devices) * sizeof(scan_field_t));
+ cmd->cmd.scan->num_fields = in_num_fields + bypass_devices;
+ cmd->cmd.scan->fields = cmd_queue_alloc((in_num_fields + bypass_devices) * sizeof(scan_field_t));
cmd->cmd.scan->end_state = end_state;
tap = NULL;
exit(-1);
}
#endif
- for (j = 0; j < num_fields; j++)
+ for (j = 0; j < in_num_fields; j++)
{
u8 out_value[4];
scan_size = num_bits[j];
}
}
-void jtag_add_plain_dr_scan(int num_fields, scan_field_t *fields, tap_state_t state)
+void jtag_add_plain_dr_scan(int in_num_fields, scan_field_t *in_fields, tap_state_t state)
{
int retval;
jtag_prelude(state);
- retval=interface_jtag_add_plain_dr_scan(num_fields, fields, cmd_queue_end_state);
+ retval=interface_jtag_add_plain_dr_scan(in_num_fields, in_fields, cmd_queue_end_state);
if (retval!=ERROR_OK)
jtag_error=retval;
}
-int MINIDRIVER(interface_jtag_add_plain_dr_scan)(int num_fields, scan_field_t *fields, tap_state_t state)
+int MINIDRIVER(interface_jtag_add_plain_dr_scan)(int in_num_fields, scan_field_t *in_fields, tap_state_t state)
{
/* allocate memory for a new list member */
jtag_command_t * cmd = cmd_queue_alloc(sizeof(jtag_command_t));
/* allocate memory for scan command */
cmd->cmd.scan = cmd_queue_alloc(sizeof(scan_command_t));
cmd->cmd.scan->ir_scan = false;
- cmd->cmd.scan->num_fields = num_fields;
- cmd->cmd.scan->fields = cmd_queue_alloc(num_fields * sizeof(scan_field_t));
+ cmd->cmd.scan->num_fields = in_num_fields;
+ cmd->cmd.scan->fields = cmd_queue_alloc(in_num_fields * sizeof(scan_field_t));
cmd->cmd.scan->end_state = state;
- for (int i = 0; i < num_fields; i++)
+ for (int i = 0; i < in_num_fields; i++)
{
- int num_bits = fields[i].num_bits;
- int num_bytes = CEIL(fields[i].num_bits, 8);
- cmd->cmd.scan->fields[i].tap = fields[i].tap;
+ int num_bits = in_fields[i].num_bits;
+ int num_bytes = CEIL(in_fields[i].num_bits, 8);
+ cmd->cmd.scan->fields[i].tap = in_fields[i].tap;
cmd->cmd.scan->fields[i].num_bits = num_bits;
- cmd->cmd.scan->fields[i].out_value = buf_cpy(fields[i].out_value, cmd_queue_alloc(num_bytes), num_bits);
- cmd->cmd.scan->fields[i].in_value = fields[i].in_value;
+ cmd->cmd.scan->fields[i].out_value = buf_cpy(in_fields[i].out_value, cmd_queue_alloc(num_bytes), num_bits);
+ cmd->cmd.scan->fields[i].in_value = in_fields[i].in_value;
}
return ERROR_OK;
COMMAND_ANY, "verify value captured during Capture-IR <enable|disable>");
register_command(cmd_ctx, NULL, "verify_jtag", handle_verify_jtag_command,
COMMAND_ANY, "verify value capture <enable|disable>");
+ register_command(cmd_ctx, NULL, "tms_sequence", handle_tms_sequence_command,
+ COMMAND_ANY, "choose short(default) or long tms_sequence <short|long>");
return ERROR_OK;
}
return ERROR_OK;
}
+
int jtag_power_dropout(int *dropout)
{
return jtag->power_dropout(dropout);
*
* DRSHIFT->DRSHIFT and IRSHIFT->IRSHIFT have to be caught in interface specific code
*/
-static struct
+struct tms_sequences
{
u8 bits;
u8 bit_count;
-} tms_seqs[6][6] = /* [from_state_ndx][to_state_ndx] */
-{
- /* value clocked to TMS to move from one of six stable states to another.
- * N.B. OOCD clocks TMS from LSB first, so read these right-to-left.
- * N.B. These values are tightly bound to the table in tap_get_tms_path_len().
- * N.B. Reset only needs to be 0b11111, but in JLink an even byte of 1's is more stable.
- * These extra ones cause no TAP state problem, because we go into reset and stay in reset.
- */
+};
/*
* These macros allow us to specify TMS state transitions by bits rather than hex bytes.
#define B8(bits,count) { ((u8)B8__(HEX__(bits))), (count) }
-#if 0 && ((BUILD_FT2232_FTD2XX==1) || (BUILD_FT2232_LIBFTDI==1) || (BUILD_JLINK==1))
+static const struct tms_sequences old_tms_seqs[6][6] = /* [from_state_ndx][to_state_ndx] */
+{
+ /* value clocked to TMS to move from one of six stable states to another.
+ * N.B. OOCD clocks TMS from LSB first, so read these right-to-left.
+ * N.B. These values are tightly bound to the table in tap_get_tms_path_len().
+ * N.B. Reset only needs to be 0b11111, but in JLink an even byte of 1's is more stable.
+ * These extra ones cause no TAP state problem, because we go into reset and stay in reset.
+ */
+
+
+
+ /* to state: */
+ /* RESET IDLE DRSHIFT DRPAUSE IRSHIFT IRPAUSE */ /* from state: */
+ { B8(1111111,7), B8(0000000,7), B8(0010111,7), B8(0001010,7), B8(0011011,7), B8(0010110,7) }, /* RESET */
+ { B8(1111111,7), B8(0000000,7), B8(0100101,7), B8(0000101,7), B8(0101011,7), B8(0001011,7) }, /* IDLE */
+ { B8(1111111,7), B8(0110001,7), B8(0000000,7), B8(0000001,7), B8(0001111,7), B8(0101111,7) }, /* DRSHIFT */
+ { B8(1111111,7), B8(0110000,7), B8(0100000,7), B8(0010111,7), B8(0011110,7), B8(0101111,7) }, /* DRPAUSE */
+ { B8(1111111,7), B8(0110001,7), B8(0000111,7), B8(0010111,7), B8(0000000,7), B8(0000001,7) }, /* IRSHIFT */
+ { B8(1111111,7), B8(0110000,7), B8(0011100,7), B8(0010111,7), B8(0011110,7), B8(0101111,7) }, /* IRPAUSE */
+};
+
+
+
+static const struct tms_sequences short_tms_seqs[6][6] = /* [from_state_ndx][to_state_ndx] */
+{
/* this is the table submitted by Jeff Williams on 3/30/2009 with this comment:
OK, I added Peter's version of the state table, and it works OK for
{ B8(1111111,7), B8(011,3), B8(00111,5), B8(010111,6), B8(001111,6), B8(01,2) }, /* IRSHIFT */
{ B8(1111111,7), B8(011,3), B8(00111,5), B8(010111,6), B8(01,2), B8(0,1) } /* IRPAUSE */
-#else /* this is the old table, converted from hex and with the bit_count set to 7 for each combo, like before */
-
- /* to state: */
- /* RESET IDLE DRSHIFT DRPAUSE IRSHIFT IRPAUSE */ /* from state: */
- { B8(1111111,7), B8(0000000,7), B8(0010111,7), B8(0001010,7), B8(0011011,7), B8(0010110,7) }, /* RESET */
- { B8(1111111,7), B8(0000000,7), B8(0100101,7), B8(0000101,7), B8(0101011,7), B8(0001011,7) }, /* IDLE */
- { B8(1111111,7), B8(0110001,7), B8(0000000,7), B8(0000001,7), B8(0001111,7), B8(0101111,7) }, /* DRSHIFT */
- { B8(1111111,7), B8(0110000,7), B8(0100000,7), B8(0010111,7), B8(0011110,7), B8(0101111,7) }, /* DRPAUSE */
- { B8(1111111,7), B8(0110001,7), B8(0000111,7), B8(0010111,7), B8(0000000,7), B8(0000001,7) }, /* IRSHIFT */
- { B8(1111111,7), B8(0110000,7), B8(0011100,7), B8(0010111,7), B8(0011110,7), B8(0101111,7) }, /* IRPAUSE */
-
-#endif
-
-#if 0 /* keeping old hex stuff for awhile, for reference */
- /* RESET IDLE DRSHIFT DRPAUSE IRSHIFT IRPAUSE */
- { 0x7f, 0x00, 0x17, 0x0a, 0x1b, 0x16 }, /* RESET */
- { 0x7f, 0x00, 0x25, 0x05, 0x2b, 0x0b }, /* IDLE */
- { 0x7f, 0x31, 0x00, 0x01, 0x0f, 0x2f }, /* DRSHIFT */
- { 0x7f, 0x30, 0x20, 0x17, 0x1e, 0x2f }, /* DRPAUSE */
- { 0x7f, 0x31, 0x07, 0x17, 0x00, 0x01 }, /* IRSHIFT */
- { 0x7f, 0x30, 0x1c, 0x17, 0x20, 0x2f } /* IRPAUSE */
-#endif
};
+typedef const struct tms_sequences tms_table[6][6];
+
+static tms_table *tms_seqs=&short_tms_seqs;
int tap_get_tms_path( tap_state_t from, tap_state_t to )
{
- return tms_seqs[tap_move_ndx(from)][tap_move_ndx(to)].bits;
+ return (*tms_seqs)[tap_move_ndx(from)][tap_move_ndx(to)].bits;
}
int tap_get_tms_path_len( tap_state_t from, tap_state_t to )
{
- return tms_seqs[tap_move_ndx(from)][tap_move_ndx(to)].bit_count;
+ return (*tms_seqs)[tap_move_ndx(from)][tap_move_ndx(to)].bit_count;
}
}
#endif
+static int handle_tms_sequence_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+{
+ if (argc == 1)
+ {
+ if (strcmp(args[0], "short") == 0)
+ {
+ tms_seqs=&short_tms_seqs;
+ }
+ else if (strcmp(args[0], "long") == 0)
+ {
+ tms_seqs=&old_tms_seqs;
+ } else
+ {
+ return ERROR_COMMAND_SYNTAX_ERROR;
+ }
+ } else if (argc != 0)
+ {
+ return ERROR_COMMAND_SYNTAX_ERROR;
+ }
+
+ command_print(cmd_ctx, "tms sequence is %s", (tms_seqs==&short_tms_seqs) ? "short": "long");
+
+ return ERROR_OK;
+}
/*-----</Cable Helper API>--------------------------------------*/