diff options
Diffstat (limited to 'src/jtag')
-rw-r--r-- | src/jtag/hla/hla_interface.c | 14 | ||||
-rw-r--r-- | src/jtag/hla/hla_transport.c | 18 | ||||
-rw-r--r-- | src/jtag/startup.tcl | 26 |
3 files changed, 42 insertions, 16 deletions
diff --git a/src/jtag/hla/hla_interface.c b/src/jtag/hla/hla_interface.c index 397eeeae..eb9b43dc 100644 --- a/src/jtag/hla/hla_interface.c +++ b/src/jtag/hla/hla_interface.c @@ -218,7 +218,7 @@ COMMAND_HANDLER(hl_interface_handle_vid_pid_command) return ERROR_OK; } -COMMAND_HANDLER(hl_interface_handle_api_command) +COMMAND_HANDLER(stlink_interface_handle_api_command) { if (CMD_ARGC != 1) return ERROR_COMMAND_SYNTAX_ERROR; @@ -235,28 +235,28 @@ COMMAND_HANDLER(hl_interface_handle_api_command) static const struct command_registration hl_interface_command_handlers[] = { { - .name = "stlink_device_desc", + .name = "hla_device_desc", .handler = &hl_interface_handle_device_desc_command, .mode = COMMAND_CONFIG, .help = "set the a device description of the adapter", .usage = "description_string", }, { - .name = "stlink_serial", + .name = "hla_serial", .handler = &hl_interface_handle_serial_command, .mode = COMMAND_CONFIG, .help = "set the serial number of the adapter", .usage = "serial_string", }, { - .name = "stlink_layout", + .name = "hla_layout", .handler = &hl_interface_handle_layout_command, .mode = COMMAND_CONFIG, .help = "set the layout of the adapter", .usage = "layout_name", }, { - .name = "stlink_vid_pid", + .name = "hla_vid_pid", .handler = &hl_interface_handle_vid_pid_command, .mode = COMMAND_CONFIG, .help = "the vendor and product ID of the adapter", @@ -264,7 +264,7 @@ static const struct command_registration hl_interface_command_handlers[] = { }, { .name = "stlink_api", - .handler = &hl_interface_handle_api_command, + .handler = &stlink_interface_handle_api_command, .mode = COMMAND_CONFIG, .help = "set the desired stlink api level", .usage = "api version 1 or 2", @@ -273,7 +273,7 @@ static const struct command_registration hl_interface_command_handlers[] = { }; struct jtag_interface hl_interface = { - .name = "stlink", + .name = "hla", .supported = 0, .commands = hl_interface_command_handlers, .transports = hl_transports, diff --git a/src/jtag/hla/hla_transport.c b/src/jtag/hla/hla_transport.c index 177459bd..7d626d10 100644 --- a/src/jtag/hla/hla_transport.c +++ b/src/jtag/hla/hla_transport.c @@ -122,9 +122,9 @@ hl_transport_jtag_subcommand_handlers[] = { static const struct command_registration stlink_transport_command_handlers[] = { { - .name = "stlink", + .name = "hla", .mode = COMMAND_ANY, - .help = "perform stlink actions", + .help = "perform hl adapter actions", .usage = "", .chain = hl_transport_stlink_subcommand_handlers, }, @@ -167,9 +167,9 @@ static int hl_transport_init(struct command_context *cmd_ctx) /* get selected transport as enum */ tr = HL_TRANSPORT_UNKNOWN; - if (strcmp(transport->name, "stlink_swd") == 0) + if (strcmp(transport->name, "hla_swd") == 0) tr = HL_TRANSPORT_SWD; - else if (strcmp(transport->name, "stlink_jtag") == 0) + else if (strcmp(transport->name, "hla_jtag") == 0) tr = HL_TRANSPORT_JTAG; else if (strcmp(transport->name, "stlink_swim") == 0) tr = HL_TRANSPORT_SWIM; @@ -201,29 +201,29 @@ static int hl_transport_select(struct command_context *ctx) } static struct transport hl_swd_transport = { - .name = "stlink_swd", + .name = "hla_swd", .select = hl_transport_select, .init = hl_transport_init, }; static struct transport hl_jtag_transport = { - .name = "stlink_jtag", + .name = "hla_jtag", .select = hl_transport_select, .init = hl_transport_init, }; -static struct transport hl_swim_transport = { +static struct transport stlink_swim_transport = { .name = "stlink_swim", .select = hl_transport_select, .init = hl_transport_init, }; -const char *hl_transports[] = { "stlink_swd", "stlink_jtag", "stlink_swim", NULL }; +const char *hl_transports[] = { "hla_swd", "hla_jtag", "stlink_swim", NULL }; static void hl_constructor(void) __attribute__ ((constructor)); static void hl_constructor(void) { transport_register(&hl_swd_transport); transport_register(&hl_jtag_transport); - transport_register(&hl_swim_transport); + transport_register(&stlink_swim_transport); } diff --git a/src/jtag/startup.tcl b/src/jtag/startup.tcl index 11a79779..4153118c 100644 --- a/src/jtag/startup.tcl +++ b/src/jtag/startup.tcl @@ -106,4 +106,30 @@ proc jtag_nsrst_assert_width args { eval adapter_nsrst_assert_width $args } +# stlink migration helpers +proc stlink_device_desc args { + echo "DEPRECATED! use 'hla_device_desc' not 'stlink_device_desc'" + eval hla_device_desc $args +} + +proc stlink_serial args { + echo "DEPRECATED! use 'hla_serial' not 'stlink_serial'" + eval hla_serial $args +} + +proc stlink_layout args { + echo "DEPRECATED! use 'hla_layout' not 'stlink_layout'" + eval hla_layout $args +} + +proc stlink_vid_pid args { + echo "DEPRECATED! use 'hla_vid_pid' not 'stlink_vid_pid'" + eval hla_vid_pid $args +} + +proc stlink args { + echo "DEPRECATED! use 'hla' not 'stlink'" + eval hla $args +} + # END MIGRATION AIDS |