summaryrefslogtreecommitdiff
path: root/src/jtag/jlink.c
diff options
context:
space:
mode:
authorZachary T Welch <zw@superlucidity.net>2009-11-20 22:01:59 -0800
committerZachary T Welch <zw@superlucidity.net>2009-11-24 21:37:33 -0800
commit8d46720cda288f498787a706bb2518e6f852b9f1 (patch)
treeeab7c9b46857d882666e9e97127194a2c14fd6cc /src/jtag/jlink.c
parentfc2d9f87615b7a5562cb9cd58fb95953e5d89818 (diff)
downloadopenocd+libswd-8d46720cda288f498787a706bb2518e6f852b9f1.tar.gz
openocd+libswd-8d46720cda288f498787a706bb2518e6f852b9f1.tar.bz2
openocd+libswd-8d46720cda288f498787a706bb2518e6f852b9f1.tar.xz
openocd+libswd-8d46720cda288f498787a706bb2518e6f852b9f1.zip
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.
Diffstat (limited to 'src/jtag/jlink.c')
-rw-r--r--src/jtag/jlink.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/jtag/jlink.c b/src/jtag/jlink.c
index 24fb0e89..9b2326bd 100644
--- a/src/jtag/jlink.c
+++ b/src/jtag/jlink.c
@@ -644,18 +644,16 @@ static const struct command_registration jlink_command_handlers[] = {
COMMAND_REGISTRATION_DONE
};
-static int jlink_register_commands(struct command_context *cmd_ctx)
-{
- return register_commands(cmd_ctx, NULL, jlink_command_handlers);
-}
-
struct jtag_interface jlink_interface = {
.name = "jlink",
+
+ .commands = jlink_command_handlers,
+
.execute_queue = &jlink_execute_queue,
.speed = &jlink_speed,
.speed_div = &jlink_speed_div,
.khz = &jlink_khz,
- .register_commands = &jlink_register_commands,
+
.init = &jlink_init,
.quit = &jlink_quit,
};