summaryrefslogtreecommitdiff
path: root/src/jtag
diff options
context:
space:
mode:
authorZachary T Welch <zw@superlucidity.net>2009-11-20 11:26:35 -0800
committerZachary T Welch <zw@superlucidity.net>2009-11-24 21:37:29 -0800
commit833e7f5248778bcb31b4db1a1b91160995415203 (patch)
tree7d5d5fa143b74f4989cc3226a0958e983cb1d2b5 /src/jtag
parentf7e1f2df74b599903a6fb2d2ace94c3f1ef06097 (diff)
downloadopenocd+libswd-833e7f5248778bcb31b4db1a1b91160995415203.tar.gz
openocd+libswd-833e7f5248778bcb31b4db1a1b91160995415203.tar.bz2
openocd+libswd-833e7f5248778bcb31b4db1a1b91160995415203.tar.xz
openocd+libswd-833e7f5248778bcb31b4db1a1b91160995415203.zip
use COMMAND_REGISTER macro
Replaces direct calls to register_command() with a macro, to allow its parameters to be changed and callers updated in phases.
Diffstat (limited to 'src/jtag')
-rw-r--r--src/jtag/amt_jtagaccel.c4
-rw-r--r--src/jtag/arm-jtag-ew.c2
-rw-r--r--src/jtag/at91rm9200.c2
-rw-r--r--src/jtag/ft2232.c10
-rw-r--r--src/jtag/gw16012.c2
-rw-r--r--src/jtag/jlink.c4
-rw-r--r--src/jtag/parport.c8
-rw-r--r--src/jtag/presto.c2
-rw-r--r--src/jtag/tcl.c32
-rw-r--r--src/jtag/vsllink.c12
-rw-r--r--src/jtag/zy1000/zy1000.c2
11 files changed, 40 insertions, 40 deletions
diff --git a/src/jtag/amt_jtagaccel.c b/src/jtag/amt_jtagaccel.c
index 4da2fa1f..0aabdc91 100644
--- a/src/jtag/amt_jtagaccel.c
+++ b/src/jtag/amt_jtagaccel.c
@@ -542,10 +542,10 @@ COMMAND_HANDLER(amt_jtagaccel_handle_rtck_command)
static int amt_jtagaccel_register_commands(struct command_context *cmd_ctx)
{
- register_command(cmd_ctx, NULL, "parport_port",
+ COMMAND_REGISTER(cmd_ctx, NULL, "parport_port",
amt_jtagaccel_handle_parport_port_command, COMMAND_CONFIG,
NULL);
- register_command(cmd_ctx, NULL, "rtck",
+ COMMAND_REGISTER(cmd_ctx, NULL, "rtck",
amt_jtagaccel_handle_rtck_command, COMMAND_CONFIG,
NULL);
diff --git a/src/jtag/arm-jtag-ew.c b/src/jtag/arm-jtag-ew.c
index 01c5559f..f2393713 100644
--- a/src/jtag/arm-jtag-ew.c
+++ b/src/jtag/arm-jtag-ew.c
@@ -504,7 +504,7 @@ COMMAND_HANDLER(armjtagew_handle_armjtagew_info_command)
static int armjtagew_register_commands(struct command_context *cmd_ctx)
{
- register_command(cmd_ctx, NULL, "armjtagew_info",
+ COMMAND_REGISTER(cmd_ctx, NULL, "armjtagew_info",
&armjtagew_handle_armjtagew_info_command, COMMAND_EXEC,
"query armjtagew info");
return ERROR_OK;
diff --git a/src/jtag/at91rm9200.c b/src/jtag/at91rm9200.c
index 8fbdf394..024dd6d7 100644
--- a/src/jtag/at91rm9200.c
+++ b/src/jtag/at91rm9200.c
@@ -202,7 +202,7 @@ static int at91rm9200_handle_device_command(struct command_context *cmd_ctx, cha
static int at91rm9200_register_commands(struct command_context *cmd_ctx)
{
- register_command(cmd_ctx, NULL, "at91rm9200_device", at91rm9200_handle_device_command,
+ COMMAND_REGISTER(cmd_ctx, NULL, "at91rm9200_device", at91rm9200_handle_device_command,
COMMAND_CONFIG, NULL);
return ERROR_OK;
}
diff --git a/src/jtag/ft2232.c b/src/jtag/ft2232.c
index 451da41c..e560b22e 100644
--- a/src/jtag/ft2232.c
+++ b/src/jtag/ft2232.c
@@ -3971,20 +3971,20 @@ static void ktlink_blink(void)
static int ft2232_register_commands(struct command_context* cmd_ctx)
{
- register_command(cmd_ctx, NULL, "ft2232_device_desc",
+ COMMAND_REGISTER(cmd_ctx, NULL, "ft2232_device_desc",
ft2232_handle_device_desc_command, COMMAND_CONFIG,
"the USB device description of the FTDI FT2232 device");
- register_command(cmd_ctx, NULL, "ft2232_serial",
+ COMMAND_REGISTER(cmd_ctx, NULL, "ft2232_serial",
ft2232_handle_serial_command, COMMAND_CONFIG,
"the serial number of the FTDI FT2232 device");
- register_command(cmd_ctx, NULL, "ft2232_layout",
+ COMMAND_REGISTER(cmd_ctx, NULL, "ft2232_layout",
ft2232_handle_layout_command, COMMAND_CONFIG,
"the layout of the FT2232 GPIO signals used "
"to control output-enables and reset signals");
- register_command(cmd_ctx, NULL, "ft2232_vid_pid",
+ COMMAND_REGISTER(cmd_ctx, NULL, "ft2232_vid_pid",
ft2232_handle_vid_pid_command, COMMAND_CONFIG,
"the vendor ID and product ID of the FTDI FT2232 device");
- register_command(cmd_ctx, NULL, "ft2232_latency",
+ COMMAND_REGISTER(cmd_ctx, NULL, "ft2232_latency",
ft2232_handle_latency_command, COMMAND_CONFIG,
"set the FT2232 latency timer to a new value");
diff --git a/src/jtag/gw16012.c b/src/jtag/gw16012.c
index 2d7b453b..bc0e4724 100644
--- a/src/jtag/gw16012.c
+++ b/src/jtag/gw16012.c
@@ -564,7 +564,7 @@ COMMAND_HANDLER(gw16012_handle_parport_port_command)
static int gw16012_register_commands(struct command_context *cmd_ctx)
{
- register_command(cmd_ctx, NULL, "parport_port",
+ COMMAND_REGISTER(cmd_ctx, NULL, "parport_port",
gw16012_handle_parport_port_command, COMMAND_CONFIG,
NULL);
diff --git a/src/jtag/jlink.c b/src/jtag/jlink.c
index f173ed78..1ca9c390 100644
--- a/src/jtag/jlink.c
+++ b/src/jtag/jlink.c
@@ -630,10 +630,10 @@ COMMAND_HANDLER(jlink_handle_jlink_hw_jtag_command)
static int jlink_register_commands(struct command_context *cmd_ctx)
{
- register_command(cmd_ctx, NULL, "jlink_info",
+ COMMAND_REGISTER(cmd_ctx, NULL, "jlink_info",
&jlink_handle_jlink_info_command, COMMAND_EXEC,
"query jlink info");
- register_command(cmd_ctx, NULL, "jlink_hw_jtag",
+ COMMAND_REGISTER(cmd_ctx, NULL, "jlink_hw_jtag",
&jlink_handle_jlink_hw_jtag_command, COMMAND_EXEC,
"set/get jlink hw jtag command version [2 | 3]");
return ERROR_OK;
diff --git a/src/jtag/parport.c b/src/jtag/parport.c
index b80626f5..4b4df090 100644
--- a/src/jtag/parport.c
+++ b/src/jtag/parport.c
@@ -484,22 +484,22 @@ COMMAND_HANDLER(parport_handle_parport_toggling_time_command)
static int parport_register_commands(struct command_context *cmd_ctx)
{
- register_command(cmd_ctx, NULL, "parport_port",
+ COMMAND_REGISTER(cmd_ctx, NULL, "parport_port",
parport_handle_parport_port_command, COMMAND_CONFIG,
"either the address of the I/O port "
"or the number of the '/dev/parport' device");
- register_command(cmd_ctx, NULL, "parport_cable",
+ COMMAND_REGISTER(cmd_ctx, NULL, "parport_cable",
parport_handle_parport_cable_command, COMMAND_CONFIG,
"the layout of the parallel port cable "
"used to connect to the target");
- register_command(cmd_ctx, NULL, "parport_write_on_exit",
+ COMMAND_REGISTER(cmd_ctx, NULL, "parport_write_on_exit",
parport_handle_write_on_exit_command, COMMAND_CONFIG,
"configure the parallel driver to write "
"a known value to the parallel interface");
- register_command(cmd_ctx, NULL, "parport_toggling_time",
+ COMMAND_REGISTER(cmd_ctx, NULL, "parport_toggling_time",
parport_handle_parport_toggling_time_command, COMMAND_ANY,
"time <ns> it takes for the hardware to toggle TCK");
diff --git a/src/jtag/presto.c b/src/jtag/presto.c
index 437e2c08..f22bd9eb 100644
--- a/src/jtag/presto.c
+++ b/src/jtag/presto.c
@@ -741,7 +741,7 @@ COMMAND_HANDLER(presto_handle_serial_command)
static int presto_jtag_register_commands(struct command_context *cmd_ctx)
{
- register_command(cmd_ctx, NULL, "presto_serial", presto_handle_serial_command,
+ COMMAND_REGISTER(cmd_ctx, NULL, "presto_serial", presto_handle_serial_command,
COMMAND_CONFIG, NULL);
return ERROR_OK;
}
diff --git a/src/jtag/tcl.c b/src/jtag/tcl.c
index 7307f64e..bd672b6f 100644
--- a/src/jtag/tcl.c
+++ b/src/jtag/tcl.c
@@ -1418,21 +1418,21 @@ int jtag_register_commands(struct command_context *cmd_ctx)
register_jim(cmd_ctx, "jtag", jim_jtag_command,
"perform jtag tap actions");
- register_command(cmd_ctx, NULL, "interface",
+ COMMAND_REGISTER(cmd_ctx, NULL, "interface",
handle_interface_command, COMMAND_CONFIG,
"try to configure interface");
- register_command(cmd_ctx, NULL, "interface_list",
+ COMMAND_REGISTER(cmd_ctx, NULL, "interface_list",
&handle_interface_list_command, COMMAND_ANY,
"list all built-in interfaces");
- register_command(cmd_ctx, NULL, "jtag_khz",
+ COMMAND_REGISTER(cmd_ctx, NULL, "jtag_khz",
handle_jtag_khz_command, COMMAND_ANY,
"set maximum jtag speed (if supported); "
"parameter is maximum khz, or 0 for adaptive clocking (RTCK).");
- register_command(cmd_ctx, NULL, "jtag_rclk",
+ COMMAND_REGISTER(cmd_ctx, NULL, "jtag_rclk",
handle_jtag_rclk_command, COMMAND_ANY,
"fallback_speed_khz - set JTAG speed to RCLK or use fallback speed");
- register_command(cmd_ctx, NULL, "reset_config",
+ COMMAND_REGISTER(cmd_ctx, NULL, "reset_config",
handle_reset_config_command, COMMAND_ANY,
"reset_config "
"[none|trst_only|srst_only|trst_and_srst] "
@@ -1441,35 +1441,35 @@ int jtag_register_commands(struct command_context *cmd_ctx)
"[trst_push_pull|trst_open_drain] "
"[srst_push_pull|srst_open_drain]");
- register_command(cmd_ctx, NULL, "jtag_nsrst_delay",
+ COMMAND_REGISTER(cmd_ctx, NULL, "jtag_nsrst_delay",
handle_jtag_nsrst_delay_command, COMMAND_ANY,
"jtag_nsrst_delay <ms> "
"- delay after deasserting srst in ms");
- register_command(cmd_ctx, NULL, "jtag_ntrst_delay",
+ COMMAND_REGISTER(cmd_ctx, NULL, "jtag_ntrst_delay",
handle_jtag_ntrst_delay_command, COMMAND_ANY,
"jtag_ntrst_delay <ms> "
"- delay after deasserting trst in ms");
- register_command(cmd_ctx, NULL, "jtag_nsrst_assert_width",
+ COMMAND_REGISTER(cmd_ctx, NULL, "jtag_nsrst_assert_width",
handle_jtag_nsrst_assert_width_command, COMMAND_ANY,
"jtag_nsrst_assert_width <ms> "
"- delay after asserting srst in ms");
- register_command(cmd_ctx, NULL, "jtag_ntrst_assert_width",
+ COMMAND_REGISTER(cmd_ctx, NULL, "jtag_ntrst_assert_width",
handle_jtag_ntrst_assert_width_command, COMMAND_ANY,
"jtag_ntrst_assert_width <ms> "
"- delay after asserting trst in ms");
- register_command(cmd_ctx, NULL, "scan_chain",
+ COMMAND_REGISTER(cmd_ctx, NULL, "scan_chain",
handle_scan_chain_command, COMMAND_EXEC,
"print current scan chain configuration");
- register_command(cmd_ctx, NULL, "jtag_reset",
+ COMMAND_REGISTER(cmd_ctx, NULL, "jtag_reset",
handle_jtag_reset_command, COMMAND_EXEC,
"toggle reset lines <trst> <srst>");
- register_command(cmd_ctx, NULL, "runtest",
+ COMMAND_REGISTER(cmd_ctx, NULL, "runtest",
handle_runtest_command, COMMAND_EXEC,
"move to Run-Test/Idle, and execute <num_cycles>");
- register_command(cmd_ctx, NULL, "irscan",
+ COMMAND_REGISTER(cmd_ctx, NULL, "irscan",
handle_irscan_command, COMMAND_EXEC,
"execute IR scan <device> <instr> [dev2] [instr2] ...");
@@ -1484,14 +1484,14 @@ int jtag_register_commands(struct command_context *cmd_ctx)
"<state1>,<state2>,<state3>... "
"- move JTAG to state1 then to state2, state3, etc.");
- register_command(cmd_ctx, NULL, "verify_ircapture",
+ COMMAND_REGISTER(cmd_ctx, NULL, "verify_ircapture",
handle_verify_ircapture_command, COMMAND_ANY,
"verify value captured during Capture-IR <enable | disable>");
- register_command(cmd_ctx, NULL, "verify_jtag",
+ COMMAND_REGISTER(cmd_ctx, NULL, "verify_jtag",
handle_verify_jtag_command, COMMAND_ANY,
"verify value capture <enable | disable>");
- register_command(cmd_ctx, NULL, "tms_sequence",
+ COMMAND_REGISTER(cmd_ctx, NULL, "tms_sequence",
handle_tms_sequence_command, COMMAND_ANY,
"choose short(default) or long tms_sequence <short | long>");
diff --git a/src/jtag/vsllink.c b/src/jtag/vsllink.c
index d28854d8..3526198e 100644
--- a/src/jtag/vsllink.c
+++ b/src/jtag/vsllink.c
@@ -1858,22 +1858,22 @@ static void vsllink_debug_buffer(uint8_t *buffer, int length)
static int vsllink_register_commands(struct command_context *cmd_ctx)
{
- register_command(cmd_ctx, NULL, "vsllink_usb_vid",
+ COMMAND_REGISTER(cmd_ctx, NULL, "vsllink_usb_vid",
vsllink_handle_usb_vid_command, COMMAND_CONFIG,
NULL);
- register_command(cmd_ctx, NULL, "vsllink_usb_pid",
+ COMMAND_REGISTER(cmd_ctx, NULL, "vsllink_usb_pid",
vsllink_handle_usb_pid_command, COMMAND_CONFIG,
NULL);
- register_command(cmd_ctx, NULL, "vsllink_usb_bulkin",
+ COMMAND_REGISTER(cmd_ctx, NULL, "vsllink_usb_bulkin",
vsllink_handle_usb_bulkin_command, COMMAND_CONFIG,
NULL);
- register_command(cmd_ctx, NULL, "vsllink_usb_bulkout",
+ COMMAND_REGISTER(cmd_ctx, NULL, "vsllink_usb_bulkout",
vsllink_handle_usb_bulkout_command, COMMAND_CONFIG,
NULL);
- register_command(cmd_ctx, NULL, "vsllink_usb_interface",
+ COMMAND_REGISTER(cmd_ctx, NULL, "vsllink_usb_interface",
vsllink_handle_usb_interface_command, COMMAND_CONFIG,
NULL);
- register_command(cmd_ctx, NULL, "vsllink_mode",
+ COMMAND_REGISTER(cmd_ctx, NULL, "vsllink_mode",
vsllink_handle_mode_command, COMMAND_CONFIG,
NULL);
diff --git a/src/jtag/zy1000/zy1000.c b/src/jtag/zy1000/zy1000.c
index 8b5b753a..5ea72a76 100644
--- a/src/jtag/zy1000/zy1000.c
+++ b/src/jtag/zy1000/zy1000.c
@@ -372,7 +372,7 @@ zylinjtag_Jim_Command_powerstatus(Jim_Interp *interp,
int zy1000_register_commands(struct command_context *cmd_ctx)
{
- register_command(cmd_ctx, NULL, "power", handle_power_command, COMMAND_ANY,
+ COMMAND_REGISTER(cmd_ctx, NULL, "power", handle_power_command, COMMAND_ANY,
"power <on/off> - turn power switch to target on/off. No arguments - print status.");
Jim_CreateCommand(interp, "zy1000_version", jim_zy1000_version, NULL, NULL);