diff --git a/src/jtag/jtag.c b/src/jtag/jtag.c index 33330a09adaed2095dbeef9bee772d966a3a5e4e..8695fb575daa59d6bb986a4ac1cb88b1be7c9846 100644 --- a/src/jtag/jtag.c +++ b/src/jtag/jtag.c @@ -273,7 +273,7 @@ static void jtag_tap_add(struct jtag_tap_s *t) *tap = t; } -jtag_tap_t *jtag_TapByString( const char *s ) +jtag_tap_t *jtag_tap_by_string( const char *s ) { jtag_tap_t *t; char *cp; @@ -310,7 +310,7 @@ jtag_tap_t * jtag_TapByJimObj( Jim_Interp *interp, Jim_Obj *o ) cp = "(unknown)"; t = NULL; } else { - t = jtag_TapByString( cp ); + t = jtag_tap_by_string( cp ); } if( t == NULL ){ Jim_SetResult_sprintf(interp,"Tap: %s is unknown", cp ); @@ -2326,7 +2326,7 @@ static int handle_irscan_command(struct command_context_s *cmd_ctx, char *cmd, c for (i = 0; i < num_fields; i++) { - tap = jtag_TapByString( args[i*2] ); + tap = jtag_tap_by_string( args[i*2] ); if (tap==NULL) { command_print( cmd_ctx, "Tap: %s unknown", args[i*2] ); diff --git a/src/jtag/jtag.h b/src/jtag/jtag.h index d41115546cf245db6591f41ce7e8f2981c45dce8..0e2b28a98e971dc3730074dc15d90c8b6335ad8b 100644 --- a/src/jtag/jtag.h +++ b/src/jtag/jtag.h @@ -178,7 +178,7 @@ struct jtag_tap_s extern jtag_tap_t* jtag_all_taps(void); extern const char *jtag_tap_name(const jtag_tap_t *tap); extern jtag_tap_t* jtag_tap_by_position(int n); -extern jtag_tap_t* jtag_TapByString(const char* dotted_name); +extern jtag_tap_t* jtag_tap_by_string(const char* dotted_name); extern jtag_tap_t* jtag_TapByJimObj(Jim_Interp* interp, Jim_Obj* obj); extern jtag_tap_t* jtag_tap_by_abs_position(int abs_position); extern int jtag_NumEnabledTaps(void); diff --git a/src/pld/virtex2.c b/src/pld/virtex2.c index f8e13df602d430f59fbaa808ebf63dfd680b0fe7..821699ac95b34d1e8e9b3c42e438f19d6fe5aa4d 100644 --- a/src/pld/virtex2.c +++ b/src/pld/virtex2.c @@ -247,7 +247,7 @@ int virtex2_pld_device_command(struct command_context_s *cmd_ctx, char *cmd, cha return ERROR_PLD_DEVICE_INVALID; } - tap = jtag_TapByString( args[1] ); + tap = jtag_tap_by_string( args[1] ); if( tap == NULL ){ command_print( cmd_ctx, "Tap: %s does not exist", args[1] ); return ERROR_OK; diff --git a/src/target/arm11.c b/src/target/arm11.c index e4f53f1a7fc533e502efd7d5902e380c5b86e317..c55392f4097227bf6422997206a1e48ff9c336db 100644 --- a/src/target/arm11.c +++ b/src/target/arm11.c @@ -1837,7 +1837,7 @@ arm11_common_t * arm11_find_target(const char * arg) jtag_tap_t * tap; target_t * t; - tap = jtag_TapByString(arg); + tap = jtag_tap_by_string(arg); if (!tap) return 0; diff --git a/src/target/etb.c b/src/target/etb.c index d1c60a744777c33cadd3d8b55f320d0b0cb8168f..5791e578720b795f24ae10283abb4bafc6b5bfe8 100644 --- a/src/target/etb.c +++ b/src/target/etb.c @@ -386,7 +386,7 @@ static int handle_etb_config_command(struct command_context_s *cmd_ctx, char *cm return ERROR_FAIL; } - tap = jtag_TapByString( args[1] ); + tap = jtag_tap_by_string( args[1] ); if (tap == NULL) { command_print(cmd_ctx, "Tap: %s does not exist", args[1] ); diff --git a/src/xsvf/xsvf.c b/src/xsvf/xsvf.c index f11ca6771c7f88906f48bf699149429013f248c6..4ede9fc94cddab567e405cf3a77d47dbbc592347 100644 --- a/src/xsvf/xsvf.c +++ b/src/xsvf/xsvf.c @@ -232,7 +232,7 @@ static int handle_xsvf_command(struct command_context_s *cmd_ctx, char *cmd, cha if (strcmp(args[0], "plain") != 0) { - tap = jtag_TapByString( args[0] ); + tap = jtag_tap_by_string( args[0] ); if (!tap ) { command_print( cmd_ctx, "Tap: %s unknown", args[0] );