From: michael Date: Sun, 11 Mar 2007 12:52:26 +0000 (+0000) Subject: allow concurrent access to the cable X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/usb-driver/commitdiff_plain/010cbaa6cd3ee6d94eda3e5327b7218a4b86f28f?hp=7216ce6cb7163f83893a7dd01315a139a3993dba allow concurrent access to the cable --- diff --git a/usb-driver.c b/usb-driver.c index 5a5a147..8558c6a 100644 --- a/usb-driver.c +++ b/usb-driver.c @@ -47,6 +47,7 @@ static int modules_read = 0; static struct usb_bus *busses = NULL; static struct usb_device *usbdevice; static usb_dev_handle *usb_devhandle = NULL; +static int usbinterface = -1; static unsigned long card_type; static int ints_enabled = 0; static pthread_mutex_t int_wait = PTHREAD_MUTEX_INITIALIZER; @@ -382,6 +383,7 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) { ret = usb_claim_interface(usb_devhandle, usbdevice->config[0].interface[usi->dwInterfaceNum].altsetting[usi->dwAlternateSetting].bInterfaceNumber); if (!ret) { if(!ret) { + usbinterface = usbdevice->config[0].interface[usi->dwInterfaceNum].altsetting[usi->dwAlternateSetting].bInterfaceNumber; ret = usb_set_altinterface(usb_devhandle, usi->dwAlternateSetting); if (ret) fprintf(stderr, "usb_set_altinterface: %d\n", ret); @@ -712,6 +714,14 @@ int close(int fd) { if (fd == windrvrfd && windrvrfd >= 0) { DPRINTF("close windrvrfd\n"); + if (usbinterface >= 0) + usb_release_interface(usb_devhandle, usbinterface); + + if (usb_devhandle) + usb_close(usb_devhandle); + + usb_devhandle = NULL; + usbinterface = -1; windrvrfd = -1; }