From 8d46720cda288f498787a706bb2518e6f852b9f1 Mon Sep 17 00:00:00 2001 From: Zachary T Welch Date: Fri, 20 Nov 2009 22:01:59 -0800 Subject: remove register_callbacks from jtag interface Changes the jtag_interface->register_callbacks field to a list of commands to be registered. Changes callback to invocation of register_commands() with that command registration list. Removes all JTAG interface driver register_command callback functions, which the previous commits had converted into identical calls. --- src/jtag/presto.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'src/jtag/presto.c') diff --git a/src/jtag/presto.c b/src/jtag/presto.c index dc40750d..f4e689c2 100644 --- a/src/jtag/presto.c +++ b/src/jtag/presto.c @@ -750,11 +750,6 @@ static const struct command_registration presto_command_handlers[] = { COMMAND_REGISTRATION_DONE }; -static int presto_jtag_register_commands(struct command_context *cmd_ctx) -{ - return register_commands(cmd_ctx, NULL, presto_command_handlers); -} - static int presto_jtag_init(void) { if (presto_open(presto_serial) != ERROR_OK) @@ -792,11 +787,14 @@ static int presto_jtag_quit(void) struct jtag_interface presto_interface = { .name = "presto", + + .commands = presto_command_handlers, + .execute_queue = &bitq_execute_queue, .speed = &presto_jtag_speed, .khz = &presto_jtag_khz, .speed_div = &presto_jtag_speed_div, - .register_commands = &presto_jtag_register_commands, + .init = &presto_jtag_init, .quit = &presto_jtag_quit, }; -- cgit v1.2.3