* Copyright (C) 2005 by Dominic Rath *
* Dominic.Rath@gmx.de *
* *
- * Copyright (C) 2007,2008 Øyvind Harboe *
+ * Copyright (C) 2007,2008 Øyvind Harboe *
* oyvind.harboe@zylin.com *
* *
* Copyright (C) 2009 SoftPLC Corporation *
#include "jtag.h"
#include "minidriver.h"
#include "interface.h"
+#include "interfaces.h"
#ifdef HAVE_STRINGS_H
#include <strings.h>
{ .name = NULL, .value = -1 }
};
-/* jtag interfaces (parport, FTDI-USB, TI-USB, ...)
- */
-
-#if BUILD_ZY1000 == 1
- extern jtag_interface_t zy1000_interface;
-#elif defined(BUILD_MINIDRIVER_DUMMY)
- extern jtag_interface_t minidummy_interface;
-#else // standard drivers
-#if BUILD_PARPORT == 1
- extern jtag_interface_t parport_interface;
-#endif
-
-#if BUILD_DUMMY == 1
- extern jtag_interface_t dummy_interface;
-#endif
-
-#if BUILD_FT2232_FTD2XX == 1
- extern jtag_interface_t ft2232_interface;
-#endif
-
-#if BUILD_FT2232_LIBFTDI == 1
- extern jtag_interface_t ft2232_interface;
-#endif
-
-#if BUILD_AMTJTAGACCEL == 1
- extern jtag_interface_t amt_jtagaccel_interface;
-#endif
-
-#if BUILD_EP93XX == 1
- extern jtag_interface_t ep93xx_interface;
-#endif
-
-#if BUILD_AT91RM9200 == 1
- extern jtag_interface_t at91rm9200_interface;
-#endif
-
-#if BUILD_GW16012 == 1
- extern jtag_interface_t gw16012_interface;
-#endif
-
-#if BUILD_PRESTO_LIBFTDI == 1 || BUILD_PRESTO_FTD2XX == 1
- extern jtag_interface_t presto_interface;
-#endif
-
-#if BUILD_USBPROG == 1
- extern jtag_interface_t usbprog_interface;
-#endif
-
-#if BUILD_JLINK == 1
- extern jtag_interface_t jlink_interface;
-#endif
-
-#if BUILD_VSLLINK == 1
- extern jtag_interface_t vsllink_interface;
-#endif
-
-#if BUILD_RLINK == 1
- extern jtag_interface_t rlink_interface;
-#endif
-
-#if BUILD_ARMJTAGEW == 1
- extern jtag_interface_t armjtagew_interface;
-#endif
-#endif // standard drivers
-
-/**
- * The list of built-in JTAG interfaces, containing entries for those
- * drivers that were enabled by the @c configure script.
- *
- * The list should be defined to contain either one minidriver interface
- * or some number of standard driver interfaces, never both.
- */
-jtag_interface_t *jtag_interfaces[] = {
-#if BUILD_ZY1000 == 1
- &zy1000_interface,
-#elif defined(BUILD_MINIDRIVER_DUMMY)
- &minidummy_interface,
-#else // standard drivers
-#if BUILD_PARPORT == 1
- &parport_interface,
-#endif
-#if BUILD_DUMMY == 1
- &dummy_interface,
-#endif
-#if BUILD_FT2232_FTD2XX == 1
- &ft2232_interface,
-#endif
-#if BUILD_FT2232_LIBFTDI == 1
- &ft2232_interface,
-#endif
-#if BUILD_AMTJTAGACCEL == 1
- &amt_jtagaccel_interface,
-#endif
-#if BUILD_EP93XX == 1
- &ep93xx_interface,
-#endif
-#if BUILD_AT91RM9200 == 1
- &at91rm9200_interface,
-#endif
-#if BUILD_GW16012 == 1
- &gw16012_interface,
-#endif
-#if BUILD_PRESTO_LIBFTDI == 1 || BUILD_PRESTO_FTD2XX == 1
- &presto_interface,
-#endif
-#if BUILD_USBPROG == 1
- &usbprog_interface,
-#endif
-#if BUILD_JLINK == 1
- &jlink_interface,
-#endif
-#if BUILD_VSLLINK == 1
- &vsllink_interface,
-#endif
-#if BUILD_RLINK == 1
- &rlink_interface,
-#endif
-#if BUILD_ARMJTAGEW == 1
- &armjtagew_interface,
-#endif
-#endif // standard drivers
- NULL,
-};
-
extern jtag_interface_t *jtag_interface;
/* jtag commands */
static int handle_interface_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
static int handle_jtag_speed_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
static int handle_jtag_khz_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
+static int handle_jtag_rclk_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
static int handle_jtag_device_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
static int handle_reset_config_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
static int handle_jtag_nsrst_delay_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
{ .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;
switch (n->value) {
case JCFG_EVENT:
if (goi->argc == 0) {
- Jim_WrongNumArgs( goi->interp, goi->argc, goi->argv, "-event ?event-name? ..." );
+ Jim_WrongNumArgs(goi->interp, goi->argc, goi->argv, "-event ?event-name? ...");
return JIM_ERR;
}
- e = Jim_GetOpt_Nvp( goi, nvp_jtag_tap_event, &n );
+ e = Jim_GetOpt_Nvp(goi, nvp_jtag_tap_event, &n);
if (e != JIM_OK) {
Jim_GetOpt_NvpUnknown(goi, nvp_jtag_tap_event, 1);
return e;
}
if (goi->isconfigure) {
+ bool replace = true;
if (jteap == NULL) {
/* create new */
jteap = calloc(1, sizeof (*jteap));
+ replace = false;
}
jteap->event = n->value;
- Jim_GetOpt_Obj( goi, &o);
+ Jim_GetOpt_Obj(goi, &o);
if (jteap->body) {
Jim_DecrRefCount(interp, jteap->body);
}
jteap->body = Jim_DuplicateObj(goi->interp, o);
Jim_IncrRefCount(jteap->body);
- /* add to head of event list */
- jteap->next = tap->event_action;
- tap->event_action = jteap;
+ if (!replace)
+ {
+ /* add to head of event list */
+ jteap->next = tap->event_action;
+ tap->event_action = jteap;
+ }
Jim_SetEmptyResult(goi->interp);
} else {
/* get */
return (w & v) != 0;
}
-static int jim_newtap_cmd( Jim_GetOptInfo *goi )
+static int jim_newtap_cmd(Jim_GetOptInfo *goi)
{
jtag_tap_t *pTap;
jim_wide w;
/*
* we expect CHIP + TAP + OPTIONS
* */
- if ( goi->argc < 3 ){
+ if (goi->argc < 3) {
Jim_SetResult_sprintf(goi->interp, "Missing CHIP TAP OPTIONS ....");
+ free(pTap);
return JIM_ERR;
}
- Jim_GetOpt_String( goi, &cp, NULL );
+ Jim_GetOpt_String(goi, &cp, NULL);
pTap->chip = strdup(cp);
- Jim_GetOpt_String( goi, &cp, NULL );
+ Jim_GetOpt_String(goi, &cp, NULL);
pTap->tapname = strdup(cp);
/* name + dot + name + null */
x = strlen(pTap->chip) + 1 + strlen(pTap->tapname) + 1;
- cp = malloc( x );
- sprintf( cp, "%s.%s", pTap->chip, pTap->tapname );
+ cp = malloc(x);
+ sprintf(cp, "%s.%s", pTap->chip, pTap->tapname);
pTap->dotted_name = cp;
LOG_DEBUG("Creating New Tap, Chip: %s, Tap: %s, Dotted: %s, %d params",
/* clear them as we find them */
reqbits = (NTREQ_IRLEN | NTREQ_IRCAPTURE | NTREQ_IRMASK);
- while( goi->argc ){
- e = Jim_GetOpt_Nvp( goi, opts, &n );
- if ( e != JIM_OK ){
- Jim_GetOpt_NvpUnknown( goi, opts, 0 );
+ while (goi->argc) {
+ e = Jim_GetOpt_Nvp(goi, opts, &n);
+ if (e != JIM_OK) {
+ Jim_GetOpt_NvpUnknown(goi, opts, 0);
+ free((void *)pTap->dotted_name);
+ free(pTap);
return e;
}
- LOG_DEBUG("Processing option: %s", n->name );
- switch( n->value ){
+ LOG_DEBUG("Processing option: %s", n->name);
+ switch (n->value) {
case NTAP_OPT_ENABLED:
pTap->disabled_after_reset = false;
break;
{
uint32_t *new_expected_ids;
- e = Jim_GetOpt_Wide( goi, &w );
- if ( e != JIM_OK) {
+ e = Jim_GetOpt_Wide(goi, &w);
+ if (e != JIM_OK) {
Jim_SetResult_sprintf(goi->interp, "option: %s bad parameter", n->name);
+ free((void *)pTap->dotted_name);
+ free(pTap);
return e;
}
new_expected_ids = malloc(sizeof(uint32_t) * (pTap->expected_ids_cnt + 1));
if (new_expected_ids == NULL) {
- Jim_SetResult_sprintf( goi->interp, "no memory");
+ Jim_SetResult_sprintf(goi->interp, "no memory");
+ free((void *)pTap->dotted_name);
+ free(pTap);
return JIM_ERR;
}
case NTAP_OPT_IRLEN:
case NTAP_OPT_IRMASK:
case NTAP_OPT_IRCAPTURE:
- e = Jim_GetOpt_Wide( goi, &w );
- if ( e != JIM_OK ){
- Jim_SetResult_sprintf( goi->interp, "option: %s bad parameter", n->name );
+ e = Jim_GetOpt_Wide(goi, &w);
+ if (e != JIM_OK) {
+ Jim_SetResult_sprintf(goi->interp, "option: %s bad parameter", n->name);
+ free((void *)pTap->dotted_name);
+ free(pTap);
return e;
}
- switch(n->value){
+ switch (n->value) {
case NTAP_OPT_IRLEN:
if (w > (jim_wide) (8 * sizeof(pTap->ir_capture_value)))
LOG_WARNING("huge IR length %d", (int) w);
if (is_bad_irval(pTap->ir_length, w)) {
LOG_ERROR("IR mask %x too big",
(int) w);
+ free((void *)pTap->dotted_name);
+ free(pTap);
return ERROR_FAIL;
}
pTap->ir_capture_mask = w;
if (is_bad_irval(pTap->ir_length, w)) {
LOG_ERROR("IR capture %x too big",
(int) w);
+ free((void *)pTap->dotted_name);
+ free(pTap);
return ERROR_FAIL;
}
pTap->ir_capture_value = w;
reqbits &= (~(NTREQ_IRCAPTURE));
break;
}
- } /* switch(n->value) */
- } /* while( goi->argc ) */
+ } /* switch (n->value) */
+ } /* while (goi->argc) */
/* default is enabled-after-reset */
pTap->enabled = !pTap->disabled_after_reset;
while (jteap) {
if (jteap->event == e) {
done = 1;
- LOG_DEBUG( "JTAG tap: %s event: %d (%s) action: %s\n",
+ LOG_DEBUG("JTAG tap: %s event: %d (%s) action: %s\n",
tap->dotted_name,
e,
Jim_Nvp_value2name_simple(nvp_jtag_tap_event, e)->name,
- Jim_GetString(jteap->body, NULL) );
+ Jim_GetString(jteap->body, NULL));
if (Jim_EvalObj(interp, jteap->body) != JIM_OK) {
Jim_PrintErrorMessage(interp);
} else {
* can't fail. That presumes later code
* will be verifying the scan chains ...
*/
- tap->enabled = (e == JTAG_TAP_EVENT_ENABLE);
+ if (e == JTAG_TAP_EVENT_ENABLE)
+ tap->enabled = true;
}
}
}
if (!done) {
- LOG_DEBUG( "event %d %s - no action",
+ LOG_DEBUG("event %d %s - no action",
e,
- Jim_Nvp_value2name_simple( nvp_jtag_tap_event, e)->name);
+ Jim_Nvp_value2name_simple(nvp_jtag_tap_event, e)->name);
}
}
-static int jim_jtag_command( Jim_Interp *interp, int argc, Jim_Obj *const *argv )
+static int jim_jtag_command(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
{
Jim_GetOptInfo goi;
int e;
JTAG_CMD_TAPDISABLE,
JTAG_CMD_TAPISENABLED,
JTAG_CMD_CONFIGURE,
- JTAG_CMD_CGET
+ JTAG_CMD_CGET,
+ JTAG_CMD_NAMES,
};
const Jim_Nvp jtag_cmds[] = {
{ .name = "tapdisable" , .value = JTAG_CMD_TAPDISABLE },
{ .name = "configure" , .value = JTAG_CMD_CONFIGURE },
{ .name = "cget" , .value = JTAG_CMD_CGET },
+ { .name = "names" , .value = JTAG_CMD_NAMES },
{ .name = NULL, .value = -1 },
};
context = Jim_GetAssocData(interp, "context");
/* go past the command */
- Jim_GetOpt_Setup( &goi, interp, argc-1, argv+1 );
+ Jim_GetOpt_Setup(&goi, interp, argc-1, argv + 1);
- e = Jim_GetOpt_Nvp( &goi, jtag_cmds, &n );
- if ( e != JIM_OK ){
- Jim_GetOpt_NvpUnknown( &goi, jtag_cmds, 0 );
+ e = Jim_GetOpt_Nvp(&goi, jtag_cmds, &n);
+ if (e != JIM_OK) {
+ Jim_GetOpt_NvpUnknown(&goi, jtag_cmds, 0);
return e;
}
- Jim_SetEmptyResult( goi.interp );
- switch( n->value ){
+ Jim_SetEmptyResult(goi.interp);
+ switch (n->value) {
case JTAG_CMD_INTERFACE:
/* return the name of the interface */
/* TCL code might need to know the exact type... */
/* FUTURE: we allow this as a means to "set" the interface. */
- if ( goi.argc != 0 ){
- Jim_WrongNumArgs( goi.interp, 1, goi.argv-1, "(no params)");
+ if (goi.argc != 0) {
+ Jim_WrongNumArgs(goi.interp, 1, goi.argv-1, "(no params)");
return JIM_ERR;
}
- Jim_SetResultString( goi.interp, jtag_interface->name, -1 );
+ Jim_SetResultString(goi.interp, jtag_interface->name, -1);
return JIM_OK;
case JTAG_CMD_INIT_RESET:
- if ( goi.argc != 0 ){
- Jim_WrongNumArgs( goi.interp, 1, goi.argv-1, "(no params)");
+ if (goi.argc != 0) {
+ Jim_WrongNumArgs(goi.interp, 1, goi.argv-1, "(no params)");
return JIM_ERR;
}
e = jtag_init_reset(context);
- if ( e != ERROR_OK ){
- Jim_SetResult_sprintf( goi.interp, "error: %d", e);
+ if (e != ERROR_OK) {
+ Jim_SetResult_sprintf(goi.interp, "error: %d", e);
return JIM_ERR;
}
return JIM_OK;
case JTAG_CMD_NEWTAP:
- return jim_newtap_cmd( &goi );
+ return jim_newtap_cmd(&goi);
break;
case JTAG_CMD_TAPISENABLED:
case JTAG_CMD_TAPENABLE:
case JTAG_CMD_TAPDISABLE:
- if ( goi.argc != 1 ){
- Jim_SetResultString( goi.interp, "Too many parameters",-1 );
+ if (goi.argc != 1) {
+ Jim_SetResultString(goi.interp, "Too many parameters",-1);
return JIM_ERR;
}
break;
case JTAG_CMD_CGET:
- if ( goi.argc < 2 ){
- Jim_WrongNumArgs( goi.interp, 0, NULL, "?tap-name? -option ...");
+ if (goi.argc < 2) {
+ Jim_WrongNumArgs(goi.interp, 0, NULL,
+ "cget tap_name queryparm");
return JIM_ERR;
}
jtag_tap_t *t;
Jim_GetOpt_Obj(&goi, &o);
- t = jtag_tap_by_jim_obj( goi.interp, o );
- if ( t == NULL ){
+ t = jtag_tap_by_jim_obj(goi.interp, o);
+ if (t == NULL) {
return JIM_ERR;
}
goi.isconfigure = 0;
- return jtag_tap_configure_cmd( &goi, t);
+ return jtag_tap_configure_cmd(&goi, t);
}
break;
case JTAG_CMD_CONFIGURE:
- if ( goi.argc < 3 ){
- Jim_WrongNumArgs( goi.interp, 0, NULL, "?tap-name? -option ?VALUE? ...");
+ if (goi.argc < 3) {
+ Jim_WrongNumArgs(goi.interp, 0, NULL,
+ "configure tap_name attribute value ...");
return JIM_ERR;
}
jtag_tap_t *t;
Jim_GetOpt_Obj(&goi, &o);
- t = jtag_tap_by_jim_obj( goi.interp, o );
- if ( t == NULL ){
+ t = jtag_tap_by_jim_obj(goi.interp, o);
+ if (t == NULL) {
return JIM_ERR;
}
goi.isconfigure = 1;
- return jtag_tap_configure_cmd( &goi, t);
+ return jtag_tap_configure_cmd(&goi, t);
+ }
+ break;
+
+ case JTAG_CMD_NAMES:
+ if (goi.argc != 0) {
+ Jim_WrongNumArgs(goi.interp, 1, goi.argv, "Too many parameters");
+ return JIM_ERR;
+ }
+ Jim_SetResult(goi.interp, Jim_NewListObj(goi.interp, NULL, 0));
+ {
+ jtag_tap_t *tap;
+
+ for (tap = jtag_all_taps(); tap; tap = tap->next_tap) {
+ Jim_ListAppendElement(goi.interp,
+ Jim_GetResult(goi.interp),
+ Jim_NewStringObj(goi.interp,
+ tap->dotted_name, -1));
+ }
+ return JIM_OK;
}
+ break;
+
}
return JIM_ERR;
int jtag_register_commands(struct command_context_s *cmd_ctx)
{
- register_jim( cmd_ctx, "jtag", jim_jtag_command, "perform jtag tap actions");
+ register_jim(cmd_ctx, "jtag", jim_jtag_command, "perform jtag tap actions");
register_command(cmd_ctx, NULL, "interface", handle_interface_command,
COMMAND_CONFIG, "try to configure interface");
register_command(cmd_ctx, NULL, "jtag_khz", handle_jtag_khz_command,
COMMAND_ANY, "set maximum jtag speed (if supported); "
"parameter is maximum khz, or 0 for adaptive clocking (RTCK).");
+ register_command(cmd_ctx, NULL, "jtag_rclk", handle_jtag_rclk_command,
+ COMMAND_ANY, "fallback_speed_khz - set JTAG speed to RCLK or use fallback speed");
register_command(cmd_ctx, NULL, "jtag_device", handle_jtag_device_command,
COMMAND_CONFIG, "(DEPRECATED) jtag_device <ir_length> <ir_expected> <ir_mask>");
register_command(cmd_ctx, NULL, "reset_config", handle_reset_config_command,
register_jim(cmd_ctx, "pathmove", Jim_Command_pathmove, "move JTAG to state1 then to state2, state3, etc. <state1>,<state2>,<stat3>...");
register_command(cmd_ctx, NULL, "verify_ircapture", handle_verify_ircapture_command,
- COMMAND_ANY, "verify value captured during Capture-IR <enable|disable>");
+ 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>");
+ 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>");
+ COMMAND_ANY, "choose short(default) or long tms_sequence <short | long>");
return ERROR_OK;
}
static int default_power_dropout(int *dropout)
{
- *dropout=0; /* by default we can't detect power dropout */
+ *dropout = 0; /* by default we can't detect power dropout */
return ERROR_OK;
}
static int default_srst_asserted(int *srst_asserted)
{
- *srst_asserted=0; /* by default we can't detect srst asserted */
+ *srst_asserted = 0; /* by default we can't detect srst asserted */
return ERROR_OK;
}
* argv[ 3] = not actually used by anything but in the docs
*/
- if ( argc < 4 ){
- command_print( cmd_ctx, "OLD DEPRECATED SYNTAX: Please use the NEW syntax");
+ if (argc < 4) {
+ command_print(cmd_ctx, "OLD DEPRECATED SYNTAX: Please use the NEW syntax");
return ERROR_OK;
}
- command_print( cmd_ctx, "OLD SYNTAX: DEPRECATED - translating to new syntax");
- command_print( cmd_ctx, "jtag newtap CHIP TAP -irlen %s -ircapture %s -irvalue %s",
+ command_print(cmd_ctx, "OLD SYNTAX: DEPRECATED - translating to new syntax");
+ command_print(cmd_ctx, "jtag newtap CHIP TAP -irlen %s -ircapture %s -irvalue %s",
args[0],
args[1],
- args[2] );
- 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 );
- newargs[1] = Jim_NewStringObj( interp, "newtap", -1 );
- sprintf( buf, "chip%d", jtag_tap_count() );
- newargs[2] = Jim_NewStringObj( interp, buf, -1 );
- sprintf( buf, "tap%d", jtag_tap_count() );
- newargs[3] = Jim_NewStringObj( interp, buf, -1 );
- newargs[4] = Jim_NewStringObj( interp, "-irlen", -1 );
- newargs[5] = Jim_NewStringObj( interp, args[0], -1 );
- newargs[6] = Jim_NewStringObj( interp, "-ircapture", -1 );
- newargs[7] = Jim_NewStringObj( interp, args[1], -1 );
- newargs[8] = Jim_NewStringObj( interp, "-irmask", -1 );
- newargs[9] = Jim_NewStringObj( interp, args[2], -1 );
-
- command_print( cmd_ctx, "NEW COMMAND:");
- sprintf( buf, "%s %s %s %s %s %s %s %s %s %s",
- Jim_GetString( newargs[0], NULL ),
- Jim_GetString( newargs[1], NULL ),
- Jim_GetString( newargs[2], NULL ),
- Jim_GetString( newargs[3], NULL ),
- Jim_GetString( newargs[4], NULL ),
- Jim_GetString( newargs[5], NULL ),
- Jim_GetString( newargs[6], NULL ),
- Jim_GetString( newargs[7], NULL ),
- Jim_GetString( newargs[8], NULL ),
- Jim_GetString( newargs[9], NULL ) );
-
- e = jim_jtag_command( interp, 10, newargs );
- if ( e != JIM_OK ){
- command_print( cmd_ctx, "%s", Jim_GetString( Jim_GetResult(interp), NULL ) );
+ args[2]);
+ 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);
+ newargs[1] = Jim_NewStringObj(interp, "newtap", -1);
+ sprintf(buf, "chip%d", jtag_tap_count());
+ newargs[2] = Jim_NewStringObj(interp, buf, -1);
+ sprintf(buf, "tap%d", jtag_tap_count());
+ newargs[3] = Jim_NewStringObj(interp, buf, -1);
+ newargs[4] = Jim_NewStringObj(interp, "-irlen", -1);
+ newargs[5] = Jim_NewStringObj(interp, args[0], -1);
+ newargs[6] = Jim_NewStringObj(interp, "-ircapture", -1);
+ newargs[7] = Jim_NewStringObj(interp, args[1], -1);
+ newargs[8] = Jim_NewStringObj(interp, "-irmask", -1);
+ newargs[9] = Jim_NewStringObj(interp, args[2], -1);
+
+ command_print(cmd_ctx, "NEW COMMAND:");
+ sprintf(buf, "%s %s %s %s %s %s %s %s %s %s",
+ Jim_GetString(newargs[0], NULL),
+ Jim_GetString(newargs[1], NULL),
+ Jim_GetString(newargs[2], NULL),
+ Jim_GetString(newargs[3], NULL),
+ Jim_GetString(newargs[4], NULL),
+ Jim_GetString(newargs[5], NULL),
+ Jim_GetString(newargs[6], NULL),
+ Jim_GetString(newargs[7], NULL),
+ Jim_GetString(newargs[8], NULL),
+ Jim_GetString(newargs[9], NULL));
+
+ e = jim_jtag_command(interp, 10, newargs);
+ if (e != JIM_OK) {
+ command_print(cmd_ctx, "%s", Jim_GetString(Jim_GetResult(interp), NULL));
}
return e;
}
command_print(cmd_ctx, " TapName | Enabled | IdCode Expected IrLen IrCap IrMask Instr ");
command_print(cmd_ctx, "---|--------------------|---------|------------|------------|------|------|------|---------");
- while( tap ){
+ while (tap) {
uint32_t expected, expected_mask, cur_instr, ii;
expected = buf_get_u32(tap->expected, 0, tap->ir_length);
expected_mask = buf_get_u32(tap->expected_mask, 0, tap->ir_length);
{
int retval = ERROR_OK;
+ command_print(cmd_ctx, "OLD SYNTAX: DEPRECATED - "
+ "use jtag_khz, not jtag_speed");
+
if (argc > 1)
return ERROR_COMMAND_SYNTAX_ERROR;
if (argc == 1)
int retval = parse_uint(args[0], &cur_speed);
if (ERROR_OK != retval)
return retval;
- retval = jtag_set_speed(cur_speed);
+ retval = jtag_config_speed(cur_speed);
}
command_print(cmd_ctx, "jtag_speed: %d", jtag_get_speed());
return retval;
}
+static int handle_jtag_rclk_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+{
+ if (argc > 1)
+ return ERROR_COMMAND_SYNTAX_ERROR;
+
+ int retval = ERROR_OK;
+ if (argc == 1)
+ {
+ unsigned khz = 0;
+ int retval = parse_uint(args[0], &khz);
+ if (ERROR_OK != retval)
+ return retval;
+ retval = jtag_config_rclk(khz);
+ if (ERROR_OK != retval)
+ return retval;
+ }
+
+ int cur_khz = jtag_get_speed_khz();
+ retval = jtag_get_speed_readable(&cur_khz);
+ if (ERROR_OK != retval)
+ return retval;
+
+ if (cur_khz)
+ command_print(cmd_ctx, "RCLK not supported - fallback to %d kHz", cur_khz);
+ else
+ command_print(cmd_ctx, "RCLK - adaptive");
+
+ return retval;
+}
+
static int handle_jtag_reset_command(struct command_context_s *cmd_ctx,
char *cmd, char **args, int argc)
{
return ERROR_JTAG_INIT_FAILED;
jtag_add_reset(trst, srst);
- jtag_execute_queue();
-
- return ERROR_OK;
+ return jtag_execute_queue();
}
static int handle_runtest_command(struct command_context_s *cmd_ctx,
return retval;
jtag_add_runtest(num_clocks, TAP_IDLE);
- jtag_execute_queue();
-
- return ERROR_OK;
+ return jtag_execute_queue();
}
/*
*/
endstate = TAP_IDLE;
- if ( argc >= 4 ){
+ if (argc >= 4) {
/* have at least one pair of numbers. */
/* is last pair the magic text? */
- if ( 0 == strcmp( "-endstate", args[ argc - 2 ] ) ){
+ if (0 == strcmp("-endstate", args[ argc - 2 ])) {
const char *cpA;
const char *cpS;
cpA = args[ argc-1 ];
- for( endstate = 0 ; endstate < TAP_NUM_STATES ; endstate++ ){
- cpS = tap_state_name( endstate );
- if ( 0 == strcmp( cpA, cpS ) ){
+ for (endstate = 0 ; endstate < TAP_NUM_STATES ; endstate++) {
+ cpS = tap_state_name(endstate);
+ if (0 == strcmp(cpA, cpS)) {
break;
}
}
- if ( endstate >= TAP_NUM_STATES ){
+ if (endstate >= TAP_NUM_STATES) {
return ERROR_COMMAND_SYNTAX_ERROR;
} else {
if (!scan_is_safe(endstate))
int retval;
for (i = 0; i < num_fields; i++)
{
- tap = jtag_tap_by_string( args[i*2] );
- if (tap==NULL)
+ tap = jtag_tap_by_string(args[i*2]);
+ if (tap == NULL)
{
- command_print( cmd_ctx, "Tap: %s unknown", args[i*2] );
+ int j;
+ for (j = 0; j < i; j++)
+ free(fields[j].out_value);
+ free(fields);
+ command_print(cmd_ctx, "Tap: %s unknown", args[i*2]);
+
return ERROR_FAIL;
}
int field_size = tap->ir_length;
* args[N-2] = "-endstate"
* args[N-1] = statename
*/
- if ((argc < 4) || ((argc % 2)!=0))
+ if ((argc < 4) || ((argc % 2) != 0))
{
Jim_WrongNumArgs(interp, 1, args, "wrong arguments");
return JIM_ERR;
/* validate arguments as numbers */
e = JIM_OK;
- for (i = 2; i < argc; i+=2)
+ for (i = 2; i < argc; i += 2)
{
long bits;
const char *cp;
e = Jim_GetLong(interp, args[i], &bits);
/* If valid - try next arg */
- if ( e == JIM_OK ){
+ if (e == JIM_OK) {
continue;
}
/* Not valid.. are we at the end? */
- if ( ((i+2) != argc) ){
+ if (((i + 2) != argc)) {
/* nope, then error */
return e;
}
*/
/* get arg as a string. */
- cp = Jim_GetString( args[i], NULL );
+ cp = Jim_GetString(args[i], NULL);
/* is it the magic? */
- if ( 0 == strcmp( "-endstate", cp ) ){
+ if (0 == strcmp("-endstate", cp)) {
/* is the statename valid? */
- cp = Jim_GetString( args[i+1], NULL );
+ cp = Jim_GetString(args[i + 1], NULL);
/* see if it is a valid state name */
endstate = tap_state_by_name(cp);
- if ( endstate < 0 ){
+ if (endstate < 0) {
/* update the error message */
- Jim_SetResult_sprintf(interp,"endstate: %s invalid", cp );
+ Jim_SetResult_sprintf(interp,"endstate: %s invalid", cp);
} else {
if (!scan_is_safe(endstate))
LOG_WARNING("drscan with unsafe "
}
/* Still an error? */
- if ( e != JIM_OK ){
+ if (e != JIM_OK) {
return e; /* too bad */
}
} /* validate args */
- tap = jtag_tap_by_jim_obj( interp, args[1] );
- if ( tap == NULL ){
+ tap = jtag_tap_by_jim_obj(interp, args[1]);
+ if (tap == NULL) {
return JIM_ERR;
}
- num_fields=(argc-2)/2;
+ num_fields = (argc-2)/2;
fields = malloc(sizeof(scan_field_t) * num_fields);
- for (i = 2; i < argc; i+=2)
+ for (i = 2; i < argc; i += 2)
{
long bits;
int len;
const char *str;
Jim_GetLong(interp, args[i], &bits);
- str = Jim_GetString(args[i+1], &len);
+ str = Jim_GetString(args[i + 1], &len);
fields[field_count].tap = tap;
fields[field_count].num_bits = bits;
return JIM_ERR;
}
- field_count=0;
+ field_count = 0;
Jim_Obj *list = Jim_NewListObj(interp, NULL, 0);
- for (i = 2; i < argc; i+=2)
+ for (i = 2; i < argc; i += 2)
{
long bits;
char *str;
{
tap_state_t states[8];
- if ((argc < 2) || ((size_t)argc > (sizeof(states)/sizeof(*states)+1)))
+ if ((argc < 2) || ((size_t)argc > (sizeof(states)/sizeof(*states) + 1)))
{
Jim_WrongNumArgs(interp, 1, args, "wrong arguments");
return JIM_ERR;
script_debug(interp, "pathmove", argc, args);
int i;
- for (i=0; i<argc-1; i++)
+ for (i = 0; i < argc-1; i++)
{
const char *cp;
- cp = Jim_GetString( args[i+1], NULL );
+ cp = Jim_GetString(args[i + 1], NULL);
states[i] = tap_state_by_name(cp);
- if ( states[i] < 0 )
+ if (states[i] < 0)
{
/* update the error message */
- Jim_SetResult_sprintf(interp,"endstate: %s invalid", cp );
+ Jim_SetResult_sprintf(interp,"endstate: %s invalid", cp);
return JIM_ERR;
}
}
- if ((jtag_add_statemove(states[0]) != ERROR_OK) || ( jtag_execute_queue()!= ERROR_OK))
+ if ((jtag_add_statemove(states[0]) != ERROR_OK) || (jtag_execute_queue()!= ERROR_OK))
{
Jim_SetResultString(interp, "pathmove: jtag execute failed",-1);
return JIM_ERR;
}
- jtag_add_pathmove(argc-2, states+1);
+ jtag_add_pathmove(argc-2, states + 1);
if (jtag_execute_queue()!= ERROR_OK)
{
Code Review / openocd.git / blobdiff