a bit more tracing code
authormichael <michael>
Thu, 22 Feb 2007 11:03:04 +0000 (11:03 +0000)
committermichael <michael>
Thu, 22 Feb 2007 11:03:04 +0000 (11:03 +0000)
Makefile
usb-driver.c
usb-driver.h [new file with mode: 0644]

index 784b1ac7f115a9ba6012b5a568d74320eba29255..59bf33cfb07f4dc25948ca6a9f92466a1be851b4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-xilinx.so: xilinx.c
+xilinx.so: xilinx.c xilinx.h
        gcc $< -o $@ -ldl -shared
 
 clean:
index cae2ab12a5aeb09b5446cfa39700f5dbbbebffec..3ec84578f66f28ba0a5cc3bde547044c0a7cd1bc 100644 (file)
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <stdio.h>
+#include "xilinx.h"
 
 #define SNIFFLEN 4096
+static unsigned char lastbuf[4096];
 
 void hexdump(unsigned char *buf, int len);
-
-struct header_struct {
-       unsigned long dwHeader;
-       void* data;
-       unsigned long dwSize;
-};
-
-struct version_struct {
-       unsigned long versionul;
-       char version[128];
-};
-
-struct license_struct {
-    char cLicense[128]; // Buffer with license string to put.
-                      // If empty string then get current license setting
-                      // into dwLicense.
-    unsigned long dwLicense;  // Returns license settings: LICENSE_DEMO, LICENSE_WD
-                      // etc..., or 0 for invalid license.
-    unsigned long dwLicense2; // Returns additional license settings, if dwLicense
-                      // could not hold all the information.
-                      // Then dwLicense will return 0.
-};
-
-#define WD_IOCTL_HEADER_CODE 0xa410b413UL
+void diff(unsigned char *buf1, unsigned char *buf2, int len);
 
 void parse_wdioctlreq(unsigned char *wdioctl, unsigned int request) {
        struct header_struct* wdheader = (struct header_struct*)wdioctl;
 
-       if (wdheader->dwHeader != WD_IOCTL_HEADER_CODE) {
+       if (wdheader->magic != MAGIC) {
                fprintf(stderr,"!!!ERROR: Header does not match!!!\n");
                return;
        }
 
        fprintf(stderr, "Request: ");
        switch(request) {
-               case 0x910:
-                       fprintf(stderr,"IOCTL_WD_VERSION");
-                       //fprintf(stderr," %s(%d)", ((struct version_struct*)(wdheader->data))->version, ((struct version_struct*)(wdheader->data))->versionul);
+               case VERSION:
+                       fprintf(stderr,"VERSION");
+                       break;
+               case LICENSE:
+                       fprintf(stderr,"LICENSE");
+                       fprintf(stderr," \"%s\" (XX,XX)", ((struct license_struct*)(wdheader->data))->cLicense);
                        break;
-               case 0x952:
-                       fprintf(stderr,"IOCTL_WD_LICENSE");
+               case TRANSFER:
+                       fprintf(stderr,"TRANSFER");
+                       break;
+               case USB_TRANSFER:
+                       fprintf(stderr,"USB_TRANSFER");
+               #if 0
+                       {
+                               struct usb_transfer *ut = (struct usb_transfer*)(wdheader->data);
+
+                               fprintf(stderr," unique: %d, pipe: %d, read: %d, options: %x, size: %d, timeout: %x\n", ut->dwUniqueID, ut->dwPipeNum, ut->fRead, ut->dwOptions, ut->dwBufferSize, ut->dwTimeout);
+                               memcpy(lastbuf, ut->pBuffer, ut->dwBufferSize);
+                               hexdump(ut->pBuffer, ut->dwBufferSize);
+                               fprintf(stderr,"\n");
+                       }
+                       fprintf(stderr,"\n");
+#endif
                        break;
-               case 0x98c:
-                       fprintf(stderr,"IOCTL_WD_TRANSFER");
+               case EVENT_UNREGISTER:
+                       fprintf(stderr,"EVENT_UNREGISTER");
                        break;
-               case 0x983:
-                       fprintf(stderr,"IOCTL_WDU_TRANSFER");
+               case INT_DISABLE:
+                       fprintf(stderr,"INT_DISABLE");
                        break;
-               case 0x987:
-                       fprintf(stderr,"IOCTL_WD_EVENT_UNREGISTER");
+               case INT_WAIT:
+                       fprintf(stderr,"INT_WAIT");
                        break;
-               case 0x91f:
-                       fprintf(stderr,"IOCTL_WD_INT_DISABLE");
+               case CARD_UNREGISTER:
+                       fprintf(stderr,"CARD_UNREGISTER");
                        break;
-               case 0x94b:
-                       fprintf(stderr,"IOCTL_WD_INT_WAIT");
+               case USB_GET_DEVICE_DATA:
+                       fprintf(stderr,"USB_GET_DEVICE_DATA");
                        break;
-               case 0x92b:
-                       fprintf(stderr,"IOCTL_WD_CARD_UNREGISTER");
+               case INT_ENABLE:
+                       fprintf(stderr,"INT_ENABLE");
                        break;
-               case 0x9a7:
-                       fprintf(stderr,"IOCTL_WDU_GET_DEVICE_DATA");
+               case EVENT_PULL:
+                       fprintf(stderr,"EVENT_PULL");
                        break;
-               case 0x98e:
-                       fprintf(stderr,"IOCTL_WD_INT_ENABLE");
+               case USB_SET_INTERFACE:
+                       fprintf(stderr,"USB_SET_INTERFACE");
                        break;
-               case 0x988:
-                       fprintf(stderr,"IOCTL_WD_EVENT_PULL");
+               case EVENT_REGISTER:
+                       {
+                               struct event *e = (struct event*)(wdheader->data);
+                               fprintf(stderr,"%x:%x ", e->u.Usb.deviceId.dwVendorId, e->u.Usb.deviceId.dwProductId);
+                               fprintf(stderr,"match: %04x:%04x\n", e->matchTables[0].VendorId, e->matchTables[0].ProductId);
+                       }
+                       memcpy(lastbuf, wdheader->data, wdheader->size);
+                       fprintf(stderr,"EVENT_REGISTER");
                        break;
-               case 0x981:
-                       fprintf(stderr,"IOCTL_WDU_SET_INTERFACE");
+               case CARD_REGISTER:
                        break;
                default:
+                       memcpy(lastbuf, wdheader->data, wdheader->size);
+                       fprintf(stderr,"\n");
+                       hexdump(wdheader->data, wdheader->size);
+                       fprintf(stderr,"\n");
                        fprintf(stderr,"Unknown(%x)",request);
        }
 
-       fprintf(stderr, ", size: %d\n", wdheader->dwSize);
+       fprintf(stderr, ", size: %d\n", wdheader->size);
 }
 
 void parse_wdioctlans(unsigned char *wdioctl, unsigned int request, int result) {
        struct header_struct* wdheader = (struct header_struct*)wdioctl;
 
-       if (wdheader->dwHeader != WD_IOCTL_HEADER_CODE) {
+       if (wdheader->magic != MAGIC) {
                fprintf(stderr,"!!!ERROR: Header does not match!!!\n");
                return;
        }
 
        fprintf(stderr, "Answer: %d ", result);
        switch(request) {
-               case 0x910:
+               case VERSION:
                        fprintf(stderr,"\"%s\" (%d)", ((struct version_struct*)(wdheader->data))->version, ((struct version_struct*)(wdheader->data))->versionul);
                        break;
-               case 0x952:
+               case LICENSE:
                        fprintf(stderr,"\"%s\" (XX,XX)", ((struct license_struct*)(wdheader->data))->cLicense);
                        break;
+               case TRANSFER:
+               case EVENT_UNREGISTER:
+               case INT_DISABLE:
+               case INT_WAIT:
+               case CARD_UNREGISTER:
+               case USB_GET_DEVICE_DATA:
+               case INT_ENABLE:
+               case EVENT_PULL:
+               case USB_SET_INTERFACE:
+               case CARD_REGISTER:
+                       break;
+               case EVENT_REGISTER:
+                       fprintf(stderr,"\n");
+                       diff(lastbuf, wdheader->data, wdheader->size);
+                       break;
+               case USB_TRANSFER:
+               #if 0
+                       {
+                               struct usb_transfer *ut = (struct usb_transfer*)(wdheader->data);
+
+                               fprintf(stderr,"\n");
+                               hexdump(ut->pBuffer, ut->dwBufferSize);
+                               fprintf(stderr,"\n");
+                               diff(lastbuf, ut->pBuffer, ut->dwBufferSize);
+                       }
+               #endif
+                       break;
                default:
+                       fprintf(stderr,"\n");
+                       hexdump(wdheader->data, wdheader->size);
+                       fprintf(stderr,"\n");
+                       diff(lastbuf, wdheader->data, wdheader->size);
+                       break;
+       }
+       fprintf(stderr, ", size: %d\n", wdheader->size);
+}
+
+int do_wdioctl(unsigned int request, unsigned char *wdioctl) {
+       struct header_struct* wdheader = (struct header_struct*)wdioctl;
+       struct version_struct *version;
+
+       if (wdheader->magic != MAGIC) {
+               fprintf(stderr,"!!!ERROR: Header does not match!!!\n");
+               return;
+       }
+
+       switch(request) {
+               case VERSION:
+                       version = (struct version_struct*)(wdheader->data);
+                       strcpy(version->version, "WinDriver no more");
+                       version->versionul = 999;
+                       fprintf(stderr,"faking VERSION\n");
+                       break;
+               case CARD_REGISTER:
+                       {
+                               struct card_register* cr = (struct card_register*)(wdheader->data);
+                               /* Todo: LPT-Port already in use */
+                       }
+                       fprintf(stderr,"faking CARD_REGISTER\n");
                        break;
+               case USB_TRANSFER:
+                       fprintf(stderr,"in USB_TRANSFER");
+                       {
+                               struct usb_transfer *ut = (struct usb_transfer*)(wdheader->data);
+
+                               fprintf(stderr," unique: %d, pipe: %d, read: %d, options: %x, size: %d, timeout: %x\n", ut->dwUniqueID, ut->dwPipeNum, ut->fRead, ut->dwOptions, ut->dwBufferSize, ut->dwTimeout);
+                               fprintf(stderr,"setup packet: ");
+                               hexdump(ut->SetupPacket, 8);
+                               if (!ut->fRead && ut->dwBufferSize)
+                               {
+                                       hexdump(ut->pBuffer, ut->dwBufferSize);
+                                       fprintf(stderr,"\n");
+                               }
+                       }
+               case LICENSE:
+               case TRANSFER:
+               case EVENT_UNREGISTER:
+               case INT_DISABLE:
+               case INT_WAIT:
+               case CARD_UNREGISTER:
+               case USB_GET_DEVICE_DATA:
+               case INT_ENABLE:
+               case EVENT_PULL:
+               case USB_SET_INTERFACE:
+               case EVENT_REGISTER:
+               default:
+                       return -1;
        }
-       fprintf(stderr, "\n");
+
+       return 0;
 }
 
 
@@ -181,7 +272,6 @@ int ioctl(int fd, int request, ...)
        static int (*func) (int, int, void *) = NULL;
        va_list args;
        void *argp;
-       unsigned char prebuf[SNIFFLEN];
        int ret;
 
        if (!func)                                                                    
@@ -192,11 +282,13 @@ int ioctl(int fd, int request, ...)
        va_end (args);
 
        if (fd == windrvrfd) {
-               memcpy(prebuf, argp, SNIFFLEN);
                parse_wdioctlreq(argp, request);
-       }
 
-       ret = (*func) (fd, request, argp);
+               if ((ret = do_wdioctl(request, argp)))
+                       ret = (*func) (fd, request, argp);
+       } else {
+               ret = (*func) (fd, request, argp);
+       }
 
        if (fd == windrvrfd) {
                parse_wdioctlans(argp, request, ret);
@@ -204,6 +296,7 @@ int ioctl(int fd, int request, ...)
        return ret;
 }
 
+#if 0
 void *mmap(void *start, size_t length, int prot, int flags, int fd, off_t offset)
 {
        static void* (*func) (void *, size_t, int, int, int, off_t) = NULL;
@@ -266,6 +359,7 @@ void *malloc(size_t size)
 
        return ret;
 }
+#endif
 
 
 #endif
diff --git a/usb-driver.h b/usb-driver.h
new file mode 100644 (file)
index 0000000..9ff9cbd
--- /dev/null
@@ -0,0 +1,202 @@
+#define VERSION                        0x910
+#define LICENSE                        0x952
+#define TRANSFER               0x98c
+#define USB_TRANSFER           0x983
+#define EVENT_UNREGISTER       0x987
+#define INT_DISABLE            0x91f
+#define INT_WAIT               0x94b
+#define CARD_REGISTER          0x9a4
+#define EVENT_REGISTER         0x9a5
+#define CARD_UNREGISTER                0x92b
+#define USB_GET_DEVICE_DATA    0x9a7
+#define INT_ENABLE             0x98e
+#define EVENT_PULL             0x988
+#define USB_SET_INTERFACE      0x981
+
+#define MAGIC 0xa410b413UL
+
+struct header_struct {
+       unsigned long magic;
+       void* data;
+       unsigned long size;
+};
+
+struct version_struct {
+       unsigned long versionul;
+       char version[128];
+};
+
+struct license_struct {
+       char cLicense[128]; // Buffer with license string to put.
+       // If empty string then get current license setting
+       // into dwLicense.
+       unsigned long dwLicense;  // Returns license settings: LICENSE_DEMO, LICENSE_WD
+       // etc..., or 0 for invalid license.
+       unsigned long dwLicense2; // Returns additional license settings, if dwLicense
+       // could not hold all the information.
+       // Then dwLicense will return 0.
+};
+
+typedef struct
+{
+       unsigned long dwVendorId;
+       unsigned long dwDeviceId;
+} WD_PCI_ID;
+
+typedef struct
+{
+       unsigned long dwBus;
+       unsigned long dwSlot;
+       unsigned long dwFunction;
+} WD_PCI_SLOT;
+
+typedef struct
+{
+       unsigned long dwVendorId;
+       unsigned long dwProductId;
+} WD_USB_ID;
+
+typedef struct
+{
+       unsigned short VendorId;
+       unsigned short ProductId;
+       unsigned char bDeviceClass;
+       unsigned char bDeviceSubClass;
+       unsigned char bInterfaceClass;
+       unsigned char bInterfaceSubClass;
+       unsigned char bInterfaceProtocol;
+} WDU_MATCH_TABLE;
+
+typedef struct
+{
+       unsigned long dwNumber;        // Pipe 0 is the default pipe
+       unsigned long dwMaximumPacketSize;
+       unsigned long type;            // USB_PIPE_TYPE
+       unsigned long direction;       // WDU_DIR
+       // Isochronous, Bulk, Interrupt are either USB_DIR_IN or USB_DIR_OUT
+       // Control are USB_DIR_IN_OUT
+       unsigned long dwInterval;      // interval in ms relevant to Interrupt pipes
+} WD_USB_PIPE_INFO, WD_USB_PIPE_INFO_V43, WDU_PIPE_INFO;
+
+#define WD_USB_MAX_PIPE_NUMBER 32
+
+typedef struct
+{
+       unsigned long dwPipes;
+       WD_USB_PIPE_INFO Pipe[WD_USB_MAX_PIPE_NUMBER];
+} WD_USB_DEVICE_INFO, WD_USB_DEVICE_INFO_V43;
+
+struct usb_transfer
+{
+       unsigned long dwUniqueID;
+       unsigned long dwPipeNum;    // Pipe number on device.
+       unsigned long fRead;        // TRUE for read (IN) transfers; FALSE for write (OUT) transfers.
+       unsigned long dwOptions;    // USB_TRANSFER options:
+       // USB_ISOCH_FULL_PACKETS_ONLY - For isochronous
+       // transfers only. If set, only full packets will be
+       // transmitted and the transfer function will return
+       // when the amount of bytes left to transfer is less
+       // than the maximum packet size for the pipe (the
+       // function will return without transmitting the
+       // remaining bytes).
+       void* pBuffer;    // Pointer to buffer to read/write.
+       unsigned long dwBufferSize; // Amount of bytes to transfer.
+       unsigned long dwBytesTransferred; // Returns the number of bytes actually read/written
+       unsigned char SetupPacket[8];          // Setup packet for control pipe transfer.
+       unsigned long dwTimeout;    // Timeout for the transfer in milliseconds. Set to 0 for infinite wait.
+};
+
+
+
+
+struct event {
+       unsigned long handle;
+       unsigned long dwAction; // WD_EVENT_ACTION
+       unsigned long dwStatus; // EVENT_STATUS
+       unsigned long dwEventId;
+       unsigned long dwCardType; //WD_BUS_PCI, WD_BUS_USB, WD_BUS_PCMCIA
+       unsigned long hKernelPlugIn;
+       unsigned long dwOptions; // WD_EVENT_OPTION
+       union
+       {
+               struct
+               {
+                       WD_PCI_ID cardId;
+                       WD_PCI_SLOT pciSlot;
+               } Pci;
+               struct
+               {
+                       WD_USB_ID deviceId;
+                       unsigned long dwUniqueID;
+               } Usb;
+       } u;
+       unsigned long dwEventVer;
+       unsigned long dwNumMatchTables;
+       WDU_MATCH_TABLE matchTables[1];
+};
+
+typedef struct
+{
+       unsigned long dwBusType;        // Bus Type: ISA, EISA, PCI, PCMCIA.
+       unsigned long dwBusNum;         // Bus number.
+       unsigned long dwSlotFunc;       // Slot number on Bus.
+} WD_BUS, WD_BUS_V30;
+
+typedef struct
+{
+       unsigned long item; // ITEM_TYPE
+       unsigned long fNotSharable;
+       unsigned long dwReserved; // Reserved for internal use
+       unsigned long dwOptions; // WD_ITEM_OPTIONS
+       union
+       {
+               struct
+               { // ITEM_MEMORY
+                       unsigned long dwPhysicalAddr;     // Physical address on card.
+                       unsigned long dwBytes;            // Address range.
+                       void* dwTransAddr;         // Returns the address to pass on to transfer commands.
+                       void* dwUserDirectAddr;   // Returns the address for direct user read/write.
+                       unsigned long dwCpuPhysicalAddr;  // Returns the CPU physical address
+                       unsigned long dwBar;              // Base Address Register number of PCI card.
+               } Mem;
+               struct
+               { // ITEM_IO
+                       void* dwAddr;          // Beginning of io address.
+                       unsigned long dwBytes;        // IO range.
+                       unsigned long dwBar;          // Base Address Register number of PCI card.
+               } IO;
+               struct
+               { // ITEM_INTERRUPT
+                       unsigned long dwInterrupt; // Number of interrupt to install.
+                       unsigned long dwOptions;   // Interrupt options. For level sensitive
+                       // interrupts - set to: INTERRUPT_LEVEL_SENSITIVE.
+                       unsigned long hInterrupt;  // Returns the handle of the interrupt installed.
+               } Int;
+               WD_BUS Bus; // ITEM_BUS
+               struct
+               {
+                       unsigned long dw1, dw2, dw3, dw4; // Reserved for internal use
+                       void* dw5; // Reserved for internal use
+               } Val;
+       } I;
+} WD_ITEMS, WD_ITEMS_V30;
+
+#define WD_CARD_ITEMS  20
+
+typedef struct
+{
+       unsigned long dwItems;
+       WD_ITEMS Item[WD_CARD_ITEMS];
+} WD_CARD, WD_CARD_V30;
+
+enum { CARD_VX_NO_MMU_INIT = 0x4000000 };
+
+struct card_register
+{
+       WD_CARD Card;           // Card to register.
+       unsigned long fCheckLockOnly;   // Only check if card is lockable, return hCard=1 if OK.
+       unsigned long hCard;            // Handle of card.
+       unsigned long dwOptions;        // Should be zero.
+       char cName[32];         // Name of card.
+       char cDescription[100]; // Description.
+};
Impressum, Datenschutz