X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fjtag%2Fhla%2Fhla_transport.c;fp=src%2Fjtag%2Fstlink%2Fstlink_transport.c;h=177459bd3e92ac776fdc7f010683cb85f7a6f357;hp=d83496afad9ccc9efde3e4531c2b43f1014657f2;hb=549d9bc72cbca3ba352e6b4bcd6e31d9fd9a0bc7;hpb=1bba393e3cf6ae36bf056f99761a0571811dc28a diff --git a/src/jtag/stlink/stlink_transport.c b/src/jtag/hla/hla_transport.c similarity index 65% rename from src/jtag/stlink/stlink_transport.c rename to src/jtag/hla/hla_transport.c index d83496afad..177459bd3e 100644 --- a/src/jtag/stlink/stlink_transport.c +++ b/src/jtag/hla/hla_transport.c @@ -2,6 +2,9 @@ * Copyright (C) 2011 by Mathias Kuester * * Mathias Kuester * * * + * Copyright (C) 2012 by Spencer Oliver * + * spen@spen-soft.co.uk * + * * * 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 * * the Free Software Foundation; either version 2 of the License, or * @@ -28,28 +31,28 @@ #include #include #include -#include -#include -#include +#include +#include +#include -COMMAND_HANDLER(stlink_transport_jtag_command) +COMMAND_HANDLER(hl_transport_jtag_command) { - LOG_DEBUG("stlink_transport_jtag_command"); + LOG_DEBUG("hl_transport_jtag_command"); return ERROR_OK; } -COMMAND_HANDLER(stlink_transport_reset_command) +COMMAND_HANDLER(hl_transport_reset_command) { - return stlink_interface_init_reset(); + return hl_interface_init_reset(); } static const struct command_registration -stlink_transport_stlink_subcommand_handlers[] = { +hl_transport_stlink_subcommand_handlers[] = { { .name = "newtap", .mode = COMMAND_CONFIG, - .jim_handler = jim_stlink_newtap, + .jim_handler = jim_hl_newtap, .help = "Create a new TAP instance named basename.tap_type, " "and appends it to the scan chain.", .usage = "basename tap_type '-irlen' count " @@ -60,23 +63,23 @@ stlink_transport_stlink_subcommand_handlers[] = { }; static const struct command_registration -stlink_transport_jtag_subcommand_handlers[] = { +hl_transport_jtag_subcommand_handlers[] = { { .name = "init", .mode = COMMAND_ANY, - .handler = stlink_transport_jtag_command, + .handler = hl_transport_jtag_command, .usage = "" }, { .name = "arp_init", .mode = COMMAND_ANY, - .handler = stlink_transport_jtag_command, + .handler = hl_transport_jtag_command, .usage = "" }, { .name = "arp_init-reset", .mode = COMMAND_ANY, - .handler = stlink_transport_reset_command, + .handler = hl_transport_reset_command, .usage = "" }, { @@ -92,13 +95,13 @@ stlink_transport_jtag_subcommand_handlers[] = { { .name = "tapdisable", .mode = COMMAND_EXEC, - .handler = stlink_transport_jtag_command, + .handler = hl_transport_jtag_command, .usage = "", }, { .name = "configure", .mode = COMMAND_EXEC, - .handler = stlink_transport_jtag_command, + .handler = hl_transport_jtag_command, .usage = "", }, { @@ -109,7 +112,7 @@ stlink_transport_jtag_subcommand_handlers[] = { { .name = "names", .mode = COMMAND_ANY, - .handler = stlink_transport_jtag_command, + .handler = hl_transport_jtag_command, .usage = "", }, @@ -123,29 +126,29 @@ static const struct command_registration stlink_transport_command_handlers[] = { .mode = COMMAND_ANY, .help = "perform stlink actions", .usage = "", - .chain = stlink_transport_stlink_subcommand_handlers, + .chain = hl_transport_stlink_subcommand_handlers, }, { .name = "jtag", .mode = COMMAND_ANY, .usage = "", - .chain = stlink_transport_jtag_subcommand_handlers, + .chain = hl_transport_jtag_subcommand_handlers, }, COMMAND_REGISTRATION_DONE }; -static int stlink_transport_register_commands(struct command_context *cmd_ctx) +static int hl_transport_register_commands(struct command_context *cmd_ctx) { return register_commands(cmd_ctx, NULL, stlink_transport_command_handlers); } -static int stlink_transport_init(struct command_context *cmd_ctx) +static int hl_transport_init(struct command_context *cmd_ctx) { - LOG_DEBUG("stlink_transport_init"); + LOG_DEBUG("hl_transport_init"); struct target *t = get_current_target(cmd_ctx); struct transport *transport; - enum stlink_transports tr; + enum hl_transports tr; if (!t) { LOG_ERROR("no current target"); @@ -162,26 +165,26 @@ static int stlink_transport_init(struct command_context *cmd_ctx) LOG_DEBUG("current transport %s", transport->name); /* get selected transport as enum */ - tr = STLINK_TRANSPORT_UNKNOWN; + tr = HL_TRANSPORT_UNKNOWN; if (strcmp(transport->name, "stlink_swd") == 0) - tr = STLINK_TRANSPORT_SWD; + tr = HL_TRANSPORT_SWD; else if (strcmp(transport->name, "stlink_jtag") == 0) - tr = STLINK_TRANSPORT_JTAG; + tr = HL_TRANSPORT_JTAG; else if (strcmp(transport->name, "stlink_swim") == 0) - tr = STLINK_TRANSPORT_SWIM; + tr = HL_TRANSPORT_SWIM; - int retval = stlink_interface_open(tr); + int retval = hl_interface_open(tr); if (retval != ERROR_OK) return retval; - return stlink_interface_init_target(t); + return hl_interface_init_target(t); } -static int stlink_transport_select(struct command_context *ctx) +static int hl_transport_select(struct command_context *ctx) { - LOG_DEBUG("stlink_transport_select"); + LOG_DEBUG("hl_transport_select"); int retval; @@ -189,7 +192,7 @@ static int stlink_transport_select(struct command_context *ctx) * That works with only C code ... no Tcl glue required. */ - retval = stlink_transport_register_commands(ctx); + retval = hl_transport_register_commands(ctx); if (retval != ERROR_OK) return retval; @@ -197,35 +200,30 @@ static int stlink_transport_select(struct command_context *ctx) return ERROR_OK; } -static struct transport stlink_swd_transport = { +static struct transport hl_swd_transport = { .name = "stlink_swd", - .select = stlink_transport_select, - .init = stlink_transport_init, + .select = hl_transport_select, + .init = hl_transport_init, }; -static struct transport stlink_jtag_transport = { +static struct transport hl_jtag_transport = { .name = "stlink_jtag", - .select = stlink_transport_select, - .init = stlink_transport_init, + .select = hl_transport_select, + .init = hl_transport_init, }; -static struct transport stlink_swim_transport = { +static struct transport hl_swim_transport = { .name = "stlink_swim", - .select = stlink_transport_select, - .init = stlink_transport_init, + .select = hl_transport_select, + .init = hl_transport_init, }; -const char *stlink_transports[] = { "stlink_swd", "stlink_jtag", "stlink_swim", NULL }; - -static void stlink_constructor(void) __attribute__ ((constructor)); -static void stlink_constructor(void) -{ - transport_register(&stlink_swd_transport); - transport_register(&stlink_jtag_transport); - transport_register(&stlink_swim_transport); -} +const char *hl_transports[] = { "stlink_swd", "stlink_jtag", "stlink_swim", NULL }; -bool transport_is_stlink(void) +static void hl_constructor(void) __attribute__ ((constructor)); +static void hl_constructor(void) { - return get_current_transport() == &stlink_swd_transport; + transport_register(&hl_swd_transport); + transport_register(&hl_jtag_transport); + transport_register(&hl_swim_transport); }