X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/usb-driver/blobdiff_plain/81cf365889e2aa7101b89967263762ae56a0df10..a2a952c0da4b337ffcb3d26ba473761c48a6eb65:/usb-driver.c

diff --git a/usb-driver.c b/usb-driver.c
index d909522..27a9580 100644
--- a/usb-driver.c
+++ b/usb-driver.c
@@ -466,6 +466,8 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
 			{
 				struct event *e = (struct event*)(wdheader->data);
 				struct usb_bus *bus;
+				char* devpos;
+				int busnum = -1, devnum = -1;
 				int i;
 
 				DPRINTF("handle: %lu, action: %lu, status: %lu, eventid: %lu, cardtype: %lu, kplug: %lu, options: %lu, dev: %lx:%lx, unique: %lu, ver: %lu, nummatch: %lu\n",
@@ -477,6 +479,37 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
 				e->u.Usb.dwUniqueID, e->dwEventVer,
 				e->dwNumMatchTables);
 
+				devpos = getenv("XILINX_USB_DEV");
+				if (devpos != NULL) {
+					int j;
+					char *devstr = NULL, *remainder;
+
+					DPRINTF("XILINX_USB_DEV=%s\n", devpos);
+
+					for (j = 0; j < strlen(devpos) && devpos[j] != 0; j++) {
+						if (devpos[j] == ':') {
+							devpos[j] = 0;
+							devstr = &(devpos[j+1]);
+						}
+					}
+
+					if (devstr && strlen(devstr) > 0) {
+						busnum = strtol(devpos, &remainder, 10);
+						if (devpos == remainder) {
+							busnum = -1;
+						} else {
+							devnum = strtol(devstr, &remainder, 10);
+							if (devstr == remainder) {
+								busnum = -1;
+								devnum = -1;
+							} else {
+								fprintf(stderr,"Using XILINX platform cable USB at %03d:%03d\n",
+								busnum, devnum);
+							}
+						}
+					}
+				}
+
 				for (i = 0; i < e->dwNumMatchTables; i++) {
 
 					DPRINTF("match: dev: %04x:%04x, class: %x, subclass: %x, intclass: %x, intsubclass: %x, intproto: %x\n",
@@ -491,13 +524,17 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
 					for (bus = busses; bus; bus = bus->next) {
 						struct usb_device *dev;
 
+						if ((devnum != -1) && (strtol(bus->dirname, NULL, 10) != busnum))
+							continue;
+
 						for (dev = bus->devices; dev; dev = dev->next) {
 							struct usb_device_descriptor *desc = &(dev->descriptor);
 
 							if((desc->idVendor == e->matchTables[i].VendorId) &&
 							   (desc->idProduct == e->matchTables[i].ProductId) &&
 							   (desc->bDeviceClass == e->matchTables[i].bDeviceClass) &&
-							   (desc->bDeviceSubClass == e->matchTables[i].bDeviceSubClass)) {
+							   (desc->bDeviceSubClass == e->matchTables[i].bDeviceSubClass) &&
+							   ((devnum == -1) || (strtol(dev->filename, NULL, 10) == devnum)) ) {
 								   int ac;
 								   for (ac = 0; ac < desc->bNumConfigurations; ac++) {
 									   struct usb_interface *interface = dev->config[ac].interface;
@@ -636,7 +673,10 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
 #ifndef NO_WINDRVR
 				ret = (*ioctl_func) (fd, request, wdioctl);
 #else
-				pport->close(cr->hCard);
+				if (pport)
+					pport->close(cr->hCard);
+
+				pport = NULL;
 #endif
 			}
 			break;
@@ -890,8 +930,8 @@ int access(const char *pathname, int mode) {
 
 	if (!func)
 		func = (int (*) (const char*, int)) dlsym(RTLD_NEXT, "access");
-	
-	if (!strcmp(pathname, "/dev/windrvr6")) {
+
+	if (pathname && !strcmp(pathname, "/dev/windrvr6")) {
 		return 0;
 	} else {
 		return (*func)(pathname, mode);