* *
* Copyright (C) 2007,2008 Øyvind Harboe *
* oyvind.harboe@zylin.com *
- *
- * Copyright (C) 2009 SoftPLC Corporation
- * http://softplc.com
- * dick@softplc.com
+ * *
+ * Copyright (C) 2009 SoftPLC Corporation *
+ * http://softplc.com *
+ * dick@softplc.com *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
*/
int jtag_error=ERROR_OK;
-
typedef struct cmd_queue_page_s
{
void *address;
void jtag_add_end_state(tap_state_t endstate);
void jtag_add_sleep(u32 us);
int jtag_execute_queue(void);
-
+tap_state_t tap_state_by_name(const char *name);
/* jtag commands */
int handle_interface_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
return n;
}
-
jtag_tap_t *jtag_TapByString( const char *s )
{
jtag_tap_t *t;
char *cp;
t = jtag_AllTaps();
- // try name first
+ /* try name first */
while(t){
if( 0 == strcmp( t->dotted_name, s ) ){
break;
t = t->next_tap;
}
}
- // backup plan is by number
+ /* backup plan is by number */
if( t == NULL ){
/* ok - is "s" a number? */
int n;
{
jtag_prelude1();
- if (state != -1)
+ if (state != TAP_INVALID)
jtag_add_end_state(state);
cmd_queue_cur_state = cmd_queue_end_state;
int nth_tap;
int scan_size = 0;
-
last_cmd = jtag_get_last_command_p();
/* allocate memory for a new list member */
for(;;){
int found = 0;
- // do this here so it is not forgotten
+ /* do this here so it is not forgotten */
tap = jtag_NextEnabledTap(tap);
if( tap == NULL ){
break;
return ERROR_JTAG_INIT_FAILED;
}
- // point at the 1st tap
+ /* point at the 1st tap */
tap = jtag_NextEnabledTap(NULL);
if( tap == NULL ){
LOG_ERROR("JTAG: No taps enabled?");
{ .name = NULL, .value = -1 }
};
-static int
-jtag_tap_configure_cmd( Jim_GetOptInfo *goi,
- jtag_tap_t * tap)
+static int jtag_tap_configure_cmd( Jim_GetOptInfo *goi, jtag_tap_t * tap)
{
Jim_Nvp *n;
Jim_Obj *o;
args[0],
args[1],
args[2] );
- command_print( cmd_ctx, "Example: STM32 has 2 taps, the cortexM3(len4) + boundryscan(len5)");
- command_print( cmd_ctx, "jtag newtap stm32 cortexm3 ....., thus creating the tap: \"stm32.cortexm3\"");
- command_print( cmd_ctx, "jtag newtap stm32 boundry ....., and the tap: \"stm32.boundery\"");
+ command_print( cmd_ctx, "Example: STM32 has 2 taps, the cortexM3(len4) + boundaryscan(len5)");
+ command_print( cmd_ctx, "jtag newtap stm32 cortexm3 ....., thus creating the tap: \"stm32.cortexm3\"");
+ command_print( cmd_ctx, "jtag newtap stm32 boundary ....., and the tap: \"stm32.boundary\"");
command_print( cmd_ctx, "And then refer to the taps by the dotted name.");
newargs[0] = Jim_NewStringObj( interp, "jtag", -1 );
int handle_endstate_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
{
- int state;
+ tap_state_t state;
if (argc < 1)
{
command_print( cmd_ctx, "Invalid state name: %s\n", args[0] );
return ERROR_COMMAND_SYNTAX_ERROR;
}
- jtag_add_end_state( (tap_state_t)(state));
+ jtag_add_end_state(state);
jtag_execute_queue();
}
command_print(cmd_ctx, "current endstate: %s", tap_state_name(cmd_queue_end_state));
return ERROR_COMMAND_SYNTAX_ERROR;
}
- jtag_add_runtest(strtol(args[0], NULL, 0), -1);
+ jtag_add_runtest(strtol(args[0], NULL, 0), TAP_INVALID);
jtag_execute_queue();
return ERROR_OK;
int i;
scan_field_t *fields;
jtag_tap_t *tap;
- int endstate;
+ tap_state_t endstate;
if ((argc < 2) || (argc % 2))
{
return ERROR_COMMAND_SYNTAX_ERROR;
}
- // optional "-endstate"
- // "statename"
- // at the end of the arguments.
- // assume none.
- endstate = -1;
+ /* optional "-endstate" */
+ /* "statename" */
+ /* at the end of the arguments. */
+ /* assume none. */
+ endstate = TAP_INVALID;
if( argc >= 4 ){
- // have at least one pair of numbers.
- // is last pair the magic text?
+ /* have at least one pair of numbers. */
+ /* is last pair the magic text? */
if( 0 == strcmp( "-endstate", args[ argc - 2 ] ) ){
const char *cpA;
const char *cpS;
cpA = args[ argc-1 ];
- for( endstate = 0 ; endstate < 16 ; endstate++ ){
+ for( endstate = 0 ; endstate < TAP_NUM_STATES ; endstate++ ){
cpS = tap_state_name( endstate );
if( 0 == strcmp( cpA, cpS ) ){
break;
}
}
- if( endstate >= 16 ){
+ if( endstate >= TAP_NUM_STATES ){
return ERROR_COMMAND_SYNTAX_ERROR;
} else {
- // found - remove the last 2 args
+ /* found - remove the last 2 args */
argc -= 2;
}
}
}
-
fields = malloc(sizeof(scan_field_t) * argc / 2);
for (i = 0; i < argc / 2; i++)
fields[i].in_handler_priv = NULL;
}
- jtag_add_ir_scan(argc / 2, fields, -1);
- // did we have an endstate?
- if( endstate >= 0 ){
+ jtag_add_ir_scan(argc / 2, fields, TAP_INVALID);
+ /* did we have an endstate? */
+ if (endstate != TAP_INVALID)
jtag_add_end_state(endstate);
- }
+
jtag_execute_queue();
for (i = 0; i < argc / 2; i++)
int field_count = 0;
int i, e;
jtag_tap_t *tap;
- int endstate;
+ tap_state_t endstate;
/* args[1] = device
* args[2] = num_bits
* args[3] = hex string
* ... repeat num bits and hex string ...
- *
+ *
* .. optionally:
- * args[N-2] = "-endstate"
+ * args[N-2] = "-endstate"
* args[N-1] = statename
*/
if ((argc < 4) || ((argc % 2)!=0))
}
/* assume no endstate */
- endstate = -1;
- // validate arguments as numbers
+ endstate = TAP_INVALID;
+ /* validate arguments as numbers */
e = JIM_OK;
for (i = 2; i < argc; i+=2)
{
long bits;
const char *cp;
-
e = Jim_GetLong(interp, args[i], &bits);
/* If valid - try next arg */
/* Still an error? */
if( e != JIM_OK ){
return e; /* too bad */
- }
+ }
} /* validate args */
tap = jtag_TapByJimObj( interp, args[1] );
fields[field_count].in_handler = NULL;
fields[field_count++].in_handler_priv = NULL;
}
-
- jtag_add_dr_scan(num_fields, fields, -1);
- // did we get an end state?
- if( endstate >= 0 ){
- jtag_add_end_state( (tap_state_t)endstate );
- }
+
+ jtag_add_dr_scan(num_fields, fields, TAP_INVALID);
+ /* did we get an end state? */
+ if (endstate != TAP_INVALID)
+ jtag_add_end_state(endstate);
+
retval = jtag_execute_queue();
if (retval != ERROR_OK)
{
}
}
-
/*-----<Cable Helper API>---------------------------------------*/
/* these Cable Helper API functions are all documented in the jtag.h header file,
return ndx;
}
-
int tap_get_tms_path( tap_state_t from, tap_state_t to )
{
/* tap_move[i][j]: tap movement command to go from state i to state j
*
* DRSHIFT->DRSHIFT and IRSHIFT->IRSHIFT have to be caught in interface specific code
*/
- const static u8 tms_seqs[6][6] =
+ static const u8 tms_seqs[6][6] =
{
/* value clocked to TMS to move from one of six stable states to another */
return ret;
}
-int
-tap_state_by_name( const char *name )
+tap_state_t tap_state_by_name( const char *name )
{
- int x;
-
- for( x = 0 ; x < 16 ; x++ ){
+ tap_state_t x;
+
+ for( x = 0 ; x < TAP_NUM_STATES ; x++ ){
/* be nice to the human */
if( 0 == strcasecmp( name, tap_state_name(x) ) ){
return x;
}
}
/* not found */
- return -1;
+ return TAP_INVALID;
}
/*-----</Cable Helper API>--------------------------------------*/