summaryrefslogtreecommitdiff
path: root/src/target/oocd_trace.c
diff options
context:
space:
mode:
authorZachary T Welch <zw@superlucidity.net>2009-11-23 08:24:02 -0800
committerZachary T Welch <zw@superlucidity.net>2009-11-24 21:37:36 -0800
commitf74e2e033a2ad082e5bef67d0ddedd1db3f58300 (patch)
tree8f0e521332a6685085a38cd70660bf8f308060a4 /src/target/oocd_trace.c
parent66ee303456910f684244a20a0ac2e958d40b78cb (diff)
downloadopenocd+libswd-f74e2e033a2ad082e5bef67d0ddedd1db3f58300.tar.gz
openocd+libswd-f74e2e033a2ad082e5bef67d0ddedd1db3f58300.tar.bz2
openocd+libswd-f74e2e033a2ad082e5bef67d0ddedd1db3f58300.tar.xz
openocd+libswd-f74e2e033a2ad082e5bef67d0ddedd1db3f58300.zip
remove register_commands from etm_capture_driver
Converts callback to an array of command_registration records. Moves oocd_trace driver definition to end of file to eliminate useless forward declaration.
Diffstat (limited to 'src/target/oocd_trace.c')
-rw-r--r--src/target/oocd_trace.c27
1 files changed, 11 insertions, 16 deletions
diff --git a/src/target/oocd_trace.c b/src/target/oocd_trace.c
index a34c63c6..ac79f18d 100644
--- a/src/target/oocd_trace.c
+++ b/src/target/oocd_trace.c
@@ -30,8 +30,6 @@
*/
-static int oocd_trace_register_commands(struct command_context *cmd_ctx);
-
static int oocd_trace_read_reg(struct oocd_trace *oocd_trace, int reg, uint32_t *value)
{
size_t bytes_written, bytes_read, bytes_to_read;
@@ -278,17 +276,6 @@ static int oocd_trace_stop_capture(struct etm_context *etm_ctx)
return ERROR_OK;
}
-struct etm_capture_driver oocd_trace_capture_driver =
-{
- .name = "oocd_trace",
- .register_commands = oocd_trace_register_commands,
- .init = oocd_trace_init,
- .status = oocd_trace_status,
- .start_capture = oocd_trace_start_capture,
- .stop_capture = oocd_trace_stop_capture,
- .read_trace = oocd_trace_read_trace,
-};
-
COMMAND_HANDLER(handle_oocd_trace_config_command)
{
struct target *target;
@@ -438,7 +425,15 @@ static const struct command_registration oocd_trace_command_handlers[] = {
COMMAND_REGISTRATION_DONE
};
-int oocd_trace_register_commands(struct command_context *cmd_ctx)
+struct etm_capture_driver oocd_trace_capture_driver =
{
- return register_commands(cmd_ctx, NULL, oocd_trace_command_handlers);
-}
+ .name = "oocd_trace",
+ .commands = oocd_trace_command_handlers,
+ .init = oocd_trace_init,
+ .status = oocd_trace_status,
+ .start_capture = oocd_trace_start_capture,
+ .stop_capture = oocd_trace_stop_capture,
+ .read_trace = oocd_trace_read_trace,
+};
+
+