remove ugly defines for 64bit support and solve the problem in a

better way

diff --git a/usb-driver.c b/usb-driver.c
index dc4cf8560b689f4f28a8dcf72d5ce2d353cfda1d..890e494287ffa87187a756f8a0e27a7ed12bcd09 100644 (file)
--- a/usb-driver.c
+++ b/usb-driver.c
@@ -240,7 +240,7 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
                return (*ioctl_func) (fd, request, wdioctl);
        }
 
-       switch(request) {
+       switch(request & ~(0xc0000000)) {
                case VERSION:
                        version = (struct version_struct*)(wdheader->data);
                        strcpy(version->version, "WinDriver no more");

diff --git a/usb-driver.h b/usb-driver.h
index 2563ffbcc5dc3afa57b08a34300320c327f2ef11..cca83a56198e772bb69cc67d89d1b2b84f050d45 100644 (file)
--- a/usb-driver.h
+++ b/usb-driver.h
@@ -1,4 +1,3 @@
-#if __WORDSIZE == 32
 #define VERSION                        0x910
 #define LICENSE                        0x952
 #define TRANSFER               0x98c
@@ -18,27 +17,6 @@
 #define USB_GET_DEVICE_DATA_OLD        0x980
 #define EVENT_REGISTER_OLD     0x986
 #define TRANSFER_OLD           0x903
-#else
-#define VERSION                        0xc0000910
-#define LICENSE                        0xc0000952
-#define TRANSFER               0xc000098c
-#define USB_TRANSFER           0xc0000983
-#define EVENT_UNREGISTER       0xc0000987
-#define INT_DISABLE            0xc000091f
-#define INT_WAIT               0xc000094b
-#define CARD_REGISTER          0xc00009a4
-#define EVENT_REGISTER         0xc00009a5
-#define CARD_UNREGISTER                0xc000092b
-#define USB_GET_DEVICE_DATA    0xc00009a7
-#define INT_ENABLE             0xc000098e
-#define EVENT_PULL             0xc0000988
-#define USB_SET_INTERFACE      0xc0000981
-#define CARD_REGISTER_OLD      0xc000097d
-#define INT_ENABLE_OLD         0xc000091e
-#define USB_GET_DEVICE_DATA_OLD        0xc0000980
-#define EVENT_REGISTER_OLD     0xc0000986
-#define TRANSFER_OLD           0xc0000903
-#endif
 
 #define MAGIC 0xa410b413UL