Use register_commands() with command registration array.

Signed-off-by: Zachary T Welch <z...@superlucidity.net>
---
 src/jtag/vsllink.c |   56 +++++++++++++++++++++++++++++++++------------------
 1 files changed, 36 insertions(+), 20 deletions(-)

diff --git a/src/jtag/vsllink.c b/src/jtag/vsllink.c
index 538ae0b..d6a2ec8 100644
--- a/src/jtag/vsllink.c
+++ b/src/jtag/vsllink.c
@@ -1880,28 +1880,44 @@ static void vsllink_debug_buffer(uint8_t *buffer, int 
length)
 }
 #endif // _DEBUG_USB_COMMS_ || _DEBUG_JTAG_IO_
 
+static const struct command_registration vsllink_command_handlers[] = {
+               {
+                       .name = "vsllink_usb_vid",
+                       .handler = &vsllink_handle_usb_vid_command,
+                       .mode = COMMAND_CONFIG,
+               },
+               {
+                       .name = "vsllink_usb_pid",
+                       .handler = &vsllink_handle_usb_pid_command,
+                       .mode = COMMAND_CONFIG,
+               },
+               {
+                       .name = "vsllink_usb_bulkin",
+                       .handler = &vsllink_handle_usb_bulkin_command,
+                       .mode = COMMAND_CONFIG,
+               },
+               {
+                       .name = "vsllink_usb_bulkout",
+                       .handler = &vsllink_handle_usb_bulkout_command,
+                       .mode = COMMAND_CONFIG,
+               },
+               {
+                       .name = "vsllink_usb_interface",
+                       .handler = &vsllink_handle_usb_interface_command,
+                       .mode = COMMAND_CONFIG,
+               },
+               {
+                       .name = "vsllink_mode",
+                       .handler = &vsllink_handle_mode_command,
+                       .mode = COMMAND_CONFIG,
+               },
+       };
+
 static int vsllink_register_commands(struct command_context *cmd_ctx)
 {
-       COMMAND_REGISTER(cmd_ctx, NULL, "vsllink_usb_vid",
-                       vsllink_handle_usb_vid_command, COMMAND_CONFIG,
-                       NULL);
-       COMMAND_REGISTER(cmd_ctx, NULL, "vsllink_usb_pid",
-                       vsllink_handle_usb_pid_command, COMMAND_CONFIG,
-                       NULL);
-       COMMAND_REGISTER(cmd_ctx, NULL, "vsllink_usb_bulkin",
-                       vsllink_handle_usb_bulkin_command, COMMAND_CONFIG,
-                       NULL);
-       COMMAND_REGISTER(cmd_ctx, NULL, "vsllink_usb_bulkout",
-                       vsllink_handle_usb_bulkout_command, COMMAND_CONFIG,
-                       NULL);
-       COMMAND_REGISTER(cmd_ctx, NULL, "vsllink_usb_interface",
-                       vsllink_handle_usb_interface_command, COMMAND_CONFIG,
-                       NULL);
-       COMMAND_REGISTER(cmd_ctx, NULL, "vsllink_mode",
-                       vsllink_handle_mode_command, COMMAND_CONFIG,
-                       NULL);
-
-       return ERROR_OK;
+       return register_commands(cmd_ctx, NULL,
+                       ARRAY_SIZE(vsllink_command_handlers),
+                       vsllink_command_handlers);
 }
 
 struct jtag_interface vsllink_interface = {
-- 
1.6.4.4

_______________________________________________
Openocd-development mailing list
Openocd-development@lists.berlios.de
https://lists.berlios.de/mailman/listinfo/openocd-development

Reply via email to