* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
- * along with this program; if not, write to the *
- * Free Software Foundation, Inc., *
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>. *
***************************************************************************/
#ifdef HAVE_CONFIG_H
}
static const struct command_registration
-hl_transport_stlink_subcommand_handlers[] = {
+hl_swd_transport_subcommand_handlers[] = {
{
- .name = "newtap",
+ .name = "newdap",
.mode = COMMAND_CONFIG,
.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 "
- "['-expected_id' number] ",
+ .help = "declare a new SWD DAP",
},
+ COMMAND_REGISTRATION_DONE
+};
+static const struct command_registration hl_swd_transport_command_handlers[] = {
+ {
+ .name = "swd",
+ .mode = COMMAND_ANY,
+ .help = "SWD command group",
+ .usage = "",
+ .chain = hl_swd_transport_subcommand_handlers,
+ },
COMMAND_REGISTRATION_DONE
};
static const struct command_registration
hl_transport_jtag_subcommand_handlers[] = {
+ {
+ .name = "newtap",
+ .mode = COMMAND_CONFIG,
+ .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 "
+ "['-expected_id' number]",
+ },
{
.name = "init",
.mode = COMMAND_ANY,
COMMAND_REGISTRATION_DONE
};
-static const struct command_registration stlink_transport_command_handlers[] = {
-
+static const struct command_registration hl_jtag_transport_command_handlers[] = {
{
- .name = "stlink",
+ .name = "jtag",
.mode = COMMAND_ANY,
- .help = "perform stlink actions",
+ .help = "perform jtag tap actions",
.usage = "",
- .chain = hl_transport_stlink_subcommand_handlers,
+ .chain = hl_transport_jtag_subcommand_handlers,
},
{
- .name = "jtag",
+ .name = "jtag_ntrst_delay",
.mode = COMMAND_ANY,
+ .handler = hl_transport_jtag_command,
.usage = "",
- .chain = hl_transport_jtag_subcommand_handlers,
},
COMMAND_REGISTRATION_DONE
};
-static int hl_transport_register_commands(struct command_context *cmd_ctx)
-{
- return register_commands(cmd_ctx, NULL,
- stlink_transport_command_handlers);
-}
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;
int retval = hl_interface_open(tr);
return hl_interface_init_target(t);
}
-static int hl_transport_select(struct command_context *ctx)
+static int hl_jtag_transport_select(struct command_context *cmd_ctx)
{
- LOG_DEBUG("hl_transport_select");
-
- int retval;
+ LOG_DEBUG("hl_jtag_transport_select");
/* NOTE: interface init must already have been done.
* That works with only C code ... no Tcl glue required.
*/
- retval = hl_transport_register_commands(ctx);
-
- if (retval != ERROR_OK)
- return retval;
+ return register_commands(cmd_ctx, NULL,
+ hl_jtag_transport_command_handlers);
+}
- return ERROR_OK;
+static int hl_swd_transport_select(struct command_context *cmd_ctx)
+{
+ LOG_DEBUG("hl_swd_transport_select");
+ return register_commands(cmd_ctx, NULL,
+ hl_swd_transport_command_handlers);
}
static struct transport hl_swd_transport = {
- .name = "stlink_swd",
- .select = hl_transport_select,
+ .name = "hla_swd",
+ .select = hl_swd_transport_select,
.init = hl_transport_init,
+ .override_target = hl_interface_override_target,
};
static struct transport hl_jtag_transport = {
- .name = "stlink_jtag",
- .select = hl_transport_select,
- .init = hl_transport_init,
-};
-
-static struct transport hl_swim_transport = {
- .name = "stlink_swim",
- .select = hl_transport_select,
+ .name = "hla_jtag",
+ .select = hl_jtag_transport_select,
.init = hl_transport_init,
+ .override_target = hl_interface_override_target,
};
-const char *hl_transports[] = { "stlink_swd", "stlink_jtag", "stlink_swim", NULL };
+const char *hl_transports[] = { "hla_swd", "hla_jtag", 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);
+}
+
+bool transport_is_hla(void)
+{
+ struct transport *t;
+ t = get_current_transport();
+ return t == &hl_swd_transport || t == &hl_jtag_transport;
}