diff options
| -rw-r--r-- | src/jtag/drivers/at91rm9200.c | 30 | ||||
| -rw-r--r-- | src/jtag/drivers/ep93xx.c | 8 |
2 files changed, 12 insertions, 26 deletions
diff --git a/src/jtag/drivers/at91rm9200.c b/src/jtag/drivers/at91rm9200.c index 89d7000c..f7494fe3 100644 --- a/src/jtag/drivers/at91rm9200.c +++ b/src/jtag/drivers/at91rm9200.c @@ -118,23 +118,9 @@ static void at91rm9200_write(int tck, int tms, int tdi); static void at91rm9200_reset(int trst, int srst); static int at91rm9200_speed(int speed); -static int at91rm9200_register_commands(struct command_context *cmd_ctx); static int at91rm9200_init(void); static int at91rm9200_quit(void); -struct jtag_interface at91rm9200_interface = -{ - .name = "at91rm9200", - - .supported = DEBUG_CAP_TMS_SEQ, - .execute_queue = bitbang_execute_queue, - - .speed = at91rm9200_speed, - .register_commands = at91rm9200_register_commands, - .init = at91rm9200_init, - .quit = at91rm9200_quit, -}; - static struct bitbang_interface at91rm9200_bitbang = { .read = at91rm9200_read, @@ -186,7 +172,7 @@ static int at91rm9200_speed(int speed) return ERROR_OK; } -static int at91rm9200_handle_device_command(struct command_context *cmd_ctx, char *cmd, char **CMD_ARGV, int argc) +COMMAND_HANDLER(at91rm9200_handle_device_command) { if (CMD_ARGC == 0) return ERROR_OK; @@ -208,12 +194,20 @@ static const struct command_registration at91rm9200_command_handlers[] = { .mode = COMMAND_CONFIG, .help = "query armjtagew info", }, + COMMAND_REGISTRATION_DONE }; -static int at91rm9200_register_commands(struct command_context *cmd_ctx) +struct jtag_interface at91rm9200_interface = { - return register_commands(cmd_ctx, NULL, at91rm9200_command_handlers); -} + .name = "at91rm9200", + + .execute_queue = bitbang_execute_queue, + + .speed = at91rm9200_speed, + .commands = at91rm9200_command_handlers, + .init = at91rm9200_init, + .quit = at91rm9200_quit, +}; static int at91rm9200_init(void) { diff --git a/src/jtag/drivers/ep93xx.c b/src/jtag/drivers/ep93xx.c index 0959a569..09312c5f 100644 --- a/src/jtag/drivers/ep93xx.c +++ b/src/jtag/drivers/ep93xx.c @@ -47,7 +47,6 @@ static void ep93xx_write(int tck, int tms, int tdi); static void ep93xx_reset(int trst, int srst); static int ep93xx_speed(int speed); -static int ep93xx_register_commands(struct command_context *cmd_ctx); static int ep93xx_init(void); static int ep93xx_quit(void); @@ -61,7 +60,6 @@ struct jtag_interface ep93xx_interface = .execute_queue = bitbang_execute_queue, .speed = ep93xx_speed, - .register_commands = ep93xx_register_commands, .init = ep93xx_init, .quit = ep93xx_quit, }; @@ -123,12 +121,6 @@ static int ep93xx_speed(int speed) return ERROR_OK; } -static int ep93xx_register_commands(struct command_context *cmd_ctx) -{ - - return ERROR_OK; -} - static int set_gonk_mode(void) { void *syscon; |