X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fjtag%2Fvsllink.c;h=cc3308f573c08daa97729e4f901dc84120d864e4;hb=f8a62fb9c62f165696cc34eeb23b2bc1f6a79000;hp=8ee62924d91432db028d3bab84a3e50e0073b16a;hpb=2ddeec9db5a8771c948294b7194778a95295b7a0;p=openocd.git

diff --git a/src/jtag/vsllink.c b/src/jtag/vsllink.c
index 8ee62924d9..cc3308f573 100644
--- a/src/jtag/vsllink.c
+++ b/src/jtag/vsllink.c
@@ -28,9 +28,7 @@
 
 #include "interface.h"
 #include "commands.h"
-
-#include <usb.h>
-
+#include "usb_common.h"
 
 //#define _VSLLINK_IN_DEBUG_MODE_
 
@@ -250,7 +248,7 @@ static void reset_command_pointer(void)
 
 static int vsllink_execute_queue(void)
 {
-	jtag_command_t *cmd = jtag_command_queue;
+	struct jtag_command *cmd = jtag_command_queue;
 	int scan_size;
 	enum scan_type type;
 	uint8_t *buffer;
@@ -1324,22 +1322,22 @@ static void vsllink_simple_command(uint8_t command)
 
 COMMAND_HANDLER(vsllink_handle_mode_command)
 {
-	if (argc != 1) {
+	if (CMD_ARGC != 1) {
 		LOG_ERROR("parameter error, should be one parameter for VID");
 		return ERROR_FAIL;
 	}
 
-	if (!strcmp(args[0], "normal"))
+	if (!strcmp(CMD_ARGV[0], "normal"))
 	{
 		vsllink_mode = VSLLINK_MODE_NORMAL;
 	}
-	else if (!strcmp(args[0], "dma"))
+	else if (!strcmp(CMD_ARGV[0], "dma"))
 	{
 		vsllink_mode = VSLLINK_MODE_DMA;
 	}
 	else
 	{
-		LOG_ERROR("invalid vsllink_mode: %s", args[0]);
+		LOG_ERROR("invalid vsllink_mode: %s", CMD_ARGV[0]);
 		return ERROR_FAIL;
 	}
 
@@ -1348,36 +1346,36 @@ COMMAND_HANDLER(vsllink_handle_mode_command)
 
 COMMAND_HANDLER(vsllink_handle_usb_vid_command)
 {
-	if (argc != 1)
+	if (CMD_ARGC != 1)
 	{
 		LOG_ERROR("parameter error, should be one parameter for VID");
 		return ERROR_OK;
 	}
 
-	COMMAND_PARSE_NUMBER(u16, args[0], vsllink_usb_vid);
+	COMMAND_PARSE_NUMBER(u16, CMD_ARGV[0], vsllink_usb_vid);
 	return ERROR_OK;
 }
 
 COMMAND_HANDLER(vsllink_handle_usb_pid_command)
 {
-	if (argc != 1)
+	if (CMD_ARGC != 1)
 	{
 		LOG_ERROR("parameter error, should be one parameter for PID");
 		return ERROR_OK;
 	}
-	COMMAND_PARSE_NUMBER(u16, args[0], vsllink_usb_pid);
+	COMMAND_PARSE_NUMBER(u16, CMD_ARGV[0], vsllink_usb_pid);
 	return ERROR_OK;
 }
 
 COMMAND_HANDLER(vsllink_handle_usb_bulkin_command)
 {
-	if (argc != 1)
+	if (CMD_ARGC != 1)
 	{
 		LOG_ERROR("parameter error, should be one parameter for BULKIN endpoint");
 		return ERROR_OK;
 	}
 
-	COMMAND_PARSE_NUMBER(u8, args[0], vsllink_usb_bulkin);
+	COMMAND_PARSE_NUMBER(u8, CMD_ARGV[0], vsllink_usb_bulkin);
 
 	vsllink_usb_bulkin |= 0x80;
 
@@ -1386,13 +1384,13 @@ COMMAND_HANDLER(vsllink_handle_usb_bulkin_command)
 
 COMMAND_HANDLER(vsllink_handle_usb_bulkout_command)
 {
-	if (argc != 1)
+	if (CMD_ARGC != 1)
 	{
 		LOG_ERROR("parameter error, should be one parameter for BULKOUT endpoint");
 		return ERROR_OK;
 	}
 
-	COMMAND_PARSE_NUMBER(u8, args[0], vsllink_usb_bulkout);
+	COMMAND_PARSE_NUMBER(u8, CMD_ARGV[0], vsllink_usb_bulkout);
 
 	vsllink_usb_bulkout &= ~0x80;
 
@@ -1401,13 +1399,13 @@ COMMAND_HANDLER(vsllink_handle_usb_bulkout_command)
 
 COMMAND_HANDLER(vsllink_handle_usb_interface_command)
 {
-	if (argc != 1)
+	if (CMD_ARGC != 1)
 	{
 		LOG_ERROR("parameter error, should be one parameter for interface number");
 		return ERROR_OK;
 	}
 
-	COMMAND_PARSE_NUMBER(u8, args[0], vsllink_usb_interface);
+	COMMAND_PARSE_NUMBER(u8, CMD_ARGV[0], vsllink_usb_interface);
 	return ERROR_OK;
 }
 
@@ -1703,64 +1701,42 @@ static int vsllink_tap_execute_dma(void)
 
 static struct vsllink* vsllink_usb_open(void)
 {
-	struct usb_bus *busses;
-	struct usb_bus *bus;
-	struct usb_device *dev;
-	int ret;
-
-	struct vsllink *result;
-
-	result = (struct vsllink*) malloc(sizeof(struct vsllink));
-
 	usb_init();
-	usb_find_busses();
-	usb_find_devices();
-
-	busses = usb_get_busses();
 
-	/* find vsllink device in usb bus */
+	const uint16_t vids[] = { vsllink_usb_vid, 0 };
+	const uint16_t pids[] = { vsllink_usb_pid, 0 };
+	struct usb_dev_handle *dev;
+	if (jtag_usb_open(vids, pids, &dev) != ERROR_OK)
+		return NULL;
 
-	for (bus = busses; bus; bus = bus->next)
+	/* usb_set_configuration required under win32 */
+	struct usb_device *udev = usb_device(dev);
+	int ret = usb_set_configuration(dev, udev->config[0].bConfigurationValue);
+	if (ret != 0)
 	{
-		for (dev = bus->devices; dev; dev = dev->next)
-		{
-			if ((dev->descriptor.idVendor == vsllink_usb_vid) && (dev->descriptor.idProduct == vsllink_usb_pid))
-			{
-				result->usb_handle = usb_open(dev);
-				if (NULL == result->usb_handle)
-				{
-					LOG_ERROR("failed to open %04X:%04X, not enough permissions?", vsllink_usb_vid, vsllink_usb_pid);
-					exit(-1);
-				}
-
-				/* usb_set_configuration required under win32 */
-				ret = usb_set_configuration(result->usb_handle, dev->config[0].bConfigurationValue);
-				if (ret != 0)
-				{
-					LOG_ERROR("fail to set configuration to %d, %d returned, not enough permissions?", dev->config[0].bConfigurationValue, ret);
-					exit(-1);
-				}
-				ret = usb_claim_interface(result->usb_handle, vsllink_usb_interface);
-				if (ret != 0)
-				{
-					LOG_ERROR("fail to claim interface %d, %d returned", vsllink_usb_interface, ret);
-					exit(-1);
-				}
-
+		LOG_ERROR("fail to set configuration to %d (error %d)."
+				"Not enough permissions for the device?",
+				udev->config[0].bConfigurationValue, ret);
+		return NULL;
+	}
+	ret = usb_claim_interface(dev, vsllink_usb_interface);
+	if (ret != 0)
+	{
+		LOG_ERROR("fail to claim interface %d, %d returned",
+				vsllink_usb_interface, ret);
+		return NULL;
+	}
 #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;
+	struct vsllink *result = malloc(sizeof(struct vsllink));
+	result->usb_handle = dev;
+	return result;
 }
 
 static void vsllink_usb_close(struct vsllink *vsllink)
@@ -1880,33 +1856,44 @@ static void vsllink_debug_buffer(uint8_t *buffer, int length)
 }
 #endif // _DEBUG_USB_COMMS_ || _DEBUG_JTAG_IO_
 
-static int vsllink_register_commands(struct command_context_s *cmd_ctx)
-{
-	register_command(cmd_ctx, NULL, "vsllink_usb_vid",
-			vsllink_handle_usb_vid_command, COMMAND_CONFIG,
-			NULL);
-	register_command(cmd_ctx, NULL, "vsllink_usb_pid",
-			vsllink_handle_usb_pid_command, COMMAND_CONFIG,
-			NULL);
-	register_command(cmd_ctx, NULL, "vsllink_usb_bulkin",
-			vsllink_handle_usb_bulkin_command, COMMAND_CONFIG,
-			NULL);
-	register_command(cmd_ctx, NULL, "vsllink_usb_bulkout",
-			vsllink_handle_usb_bulkout_command, COMMAND_CONFIG,
-			NULL);
-	register_command(cmd_ctx, NULL, "vsllink_usb_interface",
-			vsllink_handle_usb_interface_command, COMMAND_CONFIG,
-			NULL);
-	register_command(cmd_ctx, NULL, "vsllink_mode",
-			vsllink_handle_mode_command, COMMAND_CONFIG,
-			NULL);
-
-	return ERROR_OK;
-}
+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,
+	},
+	COMMAND_REGISTRATION_DONE
+};
 
 struct jtag_interface vsllink_interface = {
 		.name = "vsllink",
-		.register_commands = &vsllink_register_commands,
+		.commands = vsllink_command_handlers,
+
 		.init = &vsllink_init,
 		.quit = &vsllink_quit,
 		.khz = &vsllink_khz,