X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fjtag%2Farm-jtag-ew.c;h=46c3107056d6950fb91149a4658ef8daaa9e216f;hb=6ce3a299f395ef7f778661ae3f79d63659d133f7;hp=46dacc6dccd25373897373a1d0f2e6b8b12f25de;hpb=b58239e4c03c440ac89b36c9de917224a8439332;p=openocd.git

diff --git a/src/jtag/arm-jtag-ew.c b/src/jtag/arm-jtag-ew.c
index 46dacc6dcc..46c3107056 100644
--- a/src/jtag/arm-jtag-ew.c
+++ b/src/jtag/arm-jtag-ew.c
@@ -25,6 +25,7 @@
 #include "interface.h"
 #include "commands.h"
 #include <usb.h>
+#include "usb_common.h"
 
 
 #define USB_VID						0x15ba
@@ -501,20 +502,25 @@ COMMAND_HANDLER(armjtagew_handle_armjtagew_info_command)
 	return ERROR_OK;
 }
 
-static int armjtagew_register_commands(struct command_context *cmd_ctx)
-{
-	register_command(cmd_ctx, NULL, "armjtagew_info", 
-			&armjtagew_handle_armjtagew_info_command, COMMAND_EXEC,
-			"query armjtagew info");
-	return ERROR_OK;
-}
+static const struct command_registration armjtagew_command_handlers[] = {
+	{
+		.name = "armjtagew_info",
+		.handler = &armjtagew_handle_armjtagew_info_command,
+		.mode = COMMAND_EXEC,
+		.help = "query armjtagew info",
+	},
+	COMMAND_REGISTRATION_DONE
+};
 
 struct jtag_interface armjtagew_interface = {
 		.name = "arm-jtag-ew",
+
+		.commands = armjtagew_command_handlers,
+
 		.execute_queue = &armjtagew_execute_queue,
 		.speed = &armjtagew_speed,
 		.khz = &armjtagew_khz,
-		.register_commands = &armjtagew_register_commands,
+
 		.init = &armjtagew_init,
 		.quit = &armjtagew_quit,
 	};
@@ -714,50 +720,30 @@ static int armjtagew_tap_execute(void)
 
 static struct armjtagew* armjtagew_usb_open()
 {
-	struct usb_bus *busses;
-	struct usb_bus *bus;
-	struct usb_device *dev;
-
-	struct armjtagew *result;
-
-	result = (struct armjtagew*) malloc(sizeof(struct armjtagew));
-
 	usb_init();
-	usb_find_busses();
-	usb_find_devices();
 
-	busses = usb_get_busses();
+	const uint16_t vids[] = { USB_VID, 0 };
+	const uint16_t pids[] = { USB_PID, 0 };
+	struct usb_dev_handle *dev;
+	if (jtag_usb_open(vids, pids, &dev) != ERROR_OK)
+		return NULL;
 
-	/* find armjtagew device in usb bus */
-
-	for (bus = busses; bus; bus = bus->next)
-	{
-		for (dev = bus->devices; dev; dev = dev->next)
-		{
-			if ((dev->descriptor.idVendor == USB_VID) && (dev->descriptor.idProduct == USB_PID))
-			{
-				result->usb_handle = usb_open(dev);
+	struct armjtagew *result = malloc(sizeof(struct armjtagew));
+	result->usb_handle = dev;
 
 #if 0
-				/* usb_set_configuration required under win32 */
-				usb_set_configuration(result->usb_handle, dev->config[0].bConfigurationValue);
+	/* usb_set_configuration required under win32 */
+	usb_set_configuration(dev, dev->config[0].bConfigurationValue);
 #endif
-				usb_claim_interface(result->usb_handle, 0);
-
+	usb_claim_interface(dev, 0);
 #if 0
-				/*
-				 * This makes problems under Mac OS X. And is not needed
-				 * under Windows. Hopefully this will not break a linux build
-				 */
-				usb_set_altinterface(result->usb_handle, 0);
+	/*
+	 * This makes problems under Mac OS X. And is not needed
+	 * under Windows. Hopefully this will not break a linux build
+	 */
+	usb_set_altinterface(dev, 0);
 #endif
-				return result;
-			}
-		}
-	}
-
-	free(result);
-	return NULL;
+	return result;
 }
 
 static void armjtagew_usb_close(struct armjtagew *armjtagew)