add support for ise 8.1i

[usb-driver] / usb-driver.c

diff --git a/usb-driver.c b/usb-driver.c
index a6d64ce824c9c8136155da5fab61dc5d4d4f1709..dc4cf8560b689f4f28a8dcf72d5ce2d353cfda1d 100644 (file)
--- a/usb-driver.c
+++ b/usb-driver.c
@@ -37,6 +37,7 @@
 #include <signal.h>
 #include <pthread.h>
 #include <errno.h>
 #include <signal.h>
 #include <pthread.h>
 #include <errno.h>

+#include <inttypes.h>

 #include "usb-driver.h"
 
 static int (*ioctl_func) (int, int, void *) = NULL;
 #include "usb-driver.h"
 
 static int (*ioctl_func) (int, int, void *) = NULL;


@@ -46,12 +47,12 @@ static int modules_read = 0;
 static struct usb_bus *busses = NULL;
 static struct usb_device *usbdevice;
 static usb_dev_handle *usb_devhandle = NULL;
 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;
 
 #define NO_WINDRVR 1
 static unsigned long card_type;
 static int ints_enabled = 0;
 static pthread_mutex_t int_wait = PTHREAD_MUTEX_INITIALIZER;
 
 #define NO_WINDRVR 1

-#undef DEBUG

 
 #ifdef DEBUG
 #define DPRINTF(format, args...) fprintf(stderr, format, ##args)
 
 #ifdef DEBUG
 #define DPRINTF(format, args...) fprintf(stderr, format, ##args)


@@ -251,6 +252,7 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
                        DPRINTF("LICENSE\n");
                        break;
 
                        DPRINTF("LICENSE\n");
                        break;
 

+               case CARD_REGISTER_OLD:

                case CARD_REGISTER:
                        /* TODO: Implement for LPT-support */
 #if 0
                case CARD_REGISTER:
                        /* TODO: Implement for LPT-support */
 #if 0


@@ -320,6 +322,7 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
                        }
                        break;
 
                        }
                        break;
 

+               case INT_ENABLE_OLD:

                case INT_ENABLE:
                        DPRINTF("INT_ENABLE\n");
                        {
                case INT_ENABLE:
                        DPRINTF("INT_ENABLE\n");
                        {


@@ -382,6 +385,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) {
                                        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);
                                                        ret = usb_set_altinterface(usb_devhandle, usi->dwAlternateSetting);
                                                        if (ret)
                                                                fprintf(stderr, "usb_set_altinterface: %d\n", ret);


@@ -401,6 +405,7 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
                        }
                        break;
 
                        }
                        break;
 

+               case USB_GET_DEVICE_DATA_OLD:

                case USB_GET_DEVICE_DATA:
                        DPRINTF("USB_GET_DEVICE_DATA\n");
                        {
                case USB_GET_DEVICE_DATA:
                        DPRINTF("USB_GET_DEVICE_DATA\n");
                        {


@@ -422,6 +427,7 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
                        }
                        break;
 
                        }
                        break;
 

+               case EVENT_REGISTER_OLD:

                case EVENT_REGISTER:
                        DPRINTF("EVENT_REGISTER\n");
                        {
                case EVENT_REGISTER:
                        DPRINTF("EVENT_REGISTER\n");
                        {


@@ -514,6 +520,7 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
                        }
                        break;
 
                        }
                        break;
 

+               case TRANSFER_OLD:

                case TRANSFER:
                        DPRINTF("TRANSFER\n");
 #ifndef NO_WINDRVR
                case TRANSFER:
                        DPRINTF("TRANSFER\n");
 #ifndef NO_WINDRVR


@@ -710,8 +717,16 @@ int close(int fd) {
        if (!func)
                func = (int (*) (int)) dlsym(RTLD_NEXT, "close");
        
        if (!func)
                func = (int (*) (int)) dlsym(RTLD_NEXT, "close");
        

-       if (fd == windrvrfd) {
+       if (fd == windrvrfd && windrvrfd >= 0) {

                DPRINTF("close windrvrfd\n");
                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;
        }
 
                windrvrfd = -1;
        }