From: michael <michael>
Date: Thu, 22 Feb 2007 13:13:30 +0000 (+0000)
Subject: a bit more
X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/usb-driver/commitdiff_plain/9c9fd67cec6a89fb5fb05b16af00d05a7573c2eb

a bit more
---

diff --git a/usb-driver.c b/usb-driver.c
index 3bf37e9..02b4106 100644
--- a/usb-driver.c
+++ b/usb-driver.c
@@ -22,201 +22,156 @@
 
 #define SNIFFLEN 4096
 static unsigned char lastbuf[4096];
+static int (*ioctl_func) (int, int, void *) = NULL;
 
 void hexdump(unsigned char *buf, int len);
 void diff(unsigned char *buf1, unsigned char *buf2, int len);
 
-void parse_wdioctlreq(unsigned char *wdioctl, unsigned int request) {
+int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
 	struct header_struct* wdheader = (struct header_struct*)wdioctl;
+	struct version_struct *version;
+	int ret = 0;
 
 	if (wdheader->magic != MAGIC) {
 		fprintf(stderr,"!!!ERROR: Header does not match!!!\n");
 		return;
 	}
 
-	fprintf(stderr, "Request: ");
 	switch(request) {
 		case VERSION:
-			fprintf(stderr,"VERSION");
-			break;
-		case LICENSE:
-			fprintf(stderr,"LICENSE");
-			fprintf(stderr," \"%s\" (XX,XX)", ((struct license_struct*)(wdheader->data))->cLicense);
+			version = (struct version_struct*)(wdheader->data);
+			strcpy(version->version, "WinDriver no more");
+			version->versionul = 999;
+			fprintf(stderr,"faking VERSION\n");
 			break;
-		case TRANSFER:
-			fprintf(stderr,"TRANSFER");
+		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,"USB_TRANSFER");
-		#if 0
+			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);
-				memcpy(lastbuf, ut->pBuffer, ut->dwBufferSize);
-				hexdump(ut->pBuffer, ut->dwBufferSize);
+				fprintf(stderr,"setup packet: ");
+				hexdump(ut->SetupPacket, 8);
+				fprintf(stderr,"\n");
+				if (!ut->fRead && ut->dwBufferSize)
+				{
+					hexdump(ut->pBuffer, ut->dwBufferSize);
+					fprintf(stderr,"\n");
+				}
+
+				ret = (*ioctl_func) (fd, request, wdioctl);
+
+				fprintf(stderr,"Transferred: %d (%s)\n",ut->dwBytesTransferred, (ut->fRead?"read":"write"));
+				if (ut->fRead && ut->dwBytesTransferred)
+				{
+					fprintf(stderr,"Read: ");
+					hexdump(ut->pBuffer, ut->dwBytesTransferred);
+				}
 				fprintf(stderr,"\n");
 			}
-			fprintf(stderr,"\n");
-#endif
-			break;
-		case EVENT_UNREGISTER:
-			fprintf(stderr,"EVENT_UNREGISTER");
-			break;
-		case INT_DISABLE:
-			fprintf(stderr,"INT_DISABLE");
-			break;
-		case INT_WAIT:
-			fprintf(stderr,"INT_WAIT");
-			break;
-		case CARD_UNREGISTER:
-			fprintf(stderr,"CARD_UNREGISTER");
-			break;
-		case USB_GET_DEVICE_DATA:
-			fprintf(stderr,"USB_GET_DEVICE_DATA");
 			break;
 		case INT_ENABLE:
-			fprintf(stderr,"INT_ENABLE");
-			break;
-		case EVENT_PULL:
-			fprintf(stderr,"EVENT_PULL");
-			break;
-		case USB_SET_INTERFACE:
-			fprintf(stderr,"USB_SET_INTERFACE");
-			break;
-		case EVENT_REGISTER:
+			fprintf(stderr,"faking INT_ENABLE");
 			{
-				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 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->size);
-}
+				struct interrupt *it = (struct interrupt*)(wdheader->data);
 
-void parse_wdioctlans(unsigned char *wdioctl, unsigned int request, int result) {
-	struct header_struct* wdheader = (struct header_struct*)wdioctl;
+				fprintf(stderr," Handle: %d, Options: %x, ncmds: %d\n", it->hInterrupt, it->dwOptions, it->dwCmds);
 
-	if (wdheader->magic != MAGIC) {
-		fprintf(stderr,"!!!ERROR: Header does not match!!!\n");
-		return;
-	}
+				it->fEnableOk = 1;
+				//ret = (*ioctl_func) (fd, request, wdioctl);
+			}
 
-	fprintf(stderr, "Answer: %d ", result);
-	switch(request) {
-		case VERSION:
-			fprintf(stderr,"\"%s\" (%d)", ((struct version_struct*)(wdheader->data))->version, ((struct version_struct*)(wdheader->data))->versionul);
-			break;
-		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:
+			fprintf(stderr,"INT_DISABLE\n");
 			{
-				struct usb_transfer *ut = (struct usb_transfer*)(wdheader->data);
+				struct interrupt *it = (struct interrupt*)(wdheader->data);
 
-				fprintf(stderr,"\nTransferred: %d (%s)",ut->dwBytesTransferred, (ut->fRead?"read":"write"));
-				if (ut->fRead && ut->dwBytesTransferred)
-				{
-					fprintf(stderr,"\nRead: ");
-					hexdump(ut->pBuffer, ut->dwBytesTransferred);
-				}
-				#if 0
-				hexdump(ut->pBuffer, ut->dwBufferSize);
+				fprintf(stderr," Handle: %d, Options: %x, ncmds: %d\n", it->hInterrupt, it->dwOptions, it->dwCmds);
+
+				hexdump(wdheader->data, wdheader->size);
+				//it->dwCounter = 0;
+				//it->fStopped = 1;
+				ret = (*ioctl_func) (fd, request, wdioctl);
+				fprintf(stderr,"\n\n");
+				hexdump(wdheader->data, wdheader->size);
 				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, "\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:
+		case USB_SET_INTERFACE:
+			fprintf(stderr,"USB_SET_INTERFACE\n");
 			{
-				struct card_register* cr = (struct card_register*)(wdheader->data);
-				/* Todo: LPT-Port already in use */
+				struct usb_set_interface *usi = (struct usb_set_interface*)(wdheader->data);
+
+				fprintf(stderr,"unique: %d, interfacenum: %d, alternatesetting: %d, options: %x\n", usi->dwUniqueID, usi->dwInterfaceNum, usi->dwAlternateSetting, usi->dwOptions);
+				ret = (*ioctl_func) (fd, request, wdioctl);
 			}
-			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 USB_GET_DEVICE_DATA:
+			fprintf(stderr,"USB_GET_DEVICE_DATA\n");
+			{
+				struct usb_get_device_data *ugdd = (struct usb_get_device_data*)(wdheader->data);
+				int pSize;
+
+				fprintf(stderr, "uniqe: %d, bytes: %d, options: %x\n", ugdd->dwUniqueID, ugdd->dwBytes, ugdd->dwOptions);
+				pSize = ugdd->dwBytes;
+				ret = (*ioctl_func) (fd, request, wdioctl);
+				if (pSize) {
+					hexdump(ugdd->pBuf, pSize);
+					fprintf(stderr, "\n");
 				}
 			}
+			break;
+
 		case LICENSE:
+			fprintf(stderr,"faking LICENSE\n");
+			break;
+
 		case TRANSFER:
+			fprintf(stderr,"TRANSFER\n");
+			ret = (*ioctl_func) (fd, request, wdioctl);
+			break;
+
 		case EVENT_UNREGISTER:
-		case INT_DISABLE:
+			fprintf(stderr,"EVENT_UNREGISTER\n");
+			ret = (*ioctl_func) (fd, request, wdioctl);
+			break;
+
 		case INT_WAIT:
+			fprintf(stderr,"INT_WAIT\n");
+			ret = (*ioctl_func) (fd, request, wdioctl);
+			break;
+
 		case CARD_UNREGISTER:
-		case USB_GET_DEVICE_DATA:
-		case INT_ENABLE:
+			fprintf(stderr,"CARD_UNREGISTER\n");
+			ret = (*ioctl_func) (fd, request, wdioctl);
+			break;
+
 		case EVENT_PULL:
-		case USB_SET_INTERFACE:
+			fprintf(stderr,"EVENT_PULL\n");
+			ret = (*ioctl_func) (fd, request, wdioctl);
+			break;
+
 		case EVENT_REGISTER:
+			fprintf(stderr,"EVENT_REGISTER\n");
+			ret = (*ioctl_func) (fd, request, wdioctl);
+			break;
+
 		default:
-			return -1;
+			ret = (*ioctl_func) (fd, request, wdioctl);
 	}
 
-	return 0;
+	return ret;
 }
 
 
@@ -274,30 +229,22 @@ void hexdump(unsigned char *buf, int len) {
 
 int ioctl(int fd, int request, ...)
 {
-	static int (*func) (int, int, void *) = NULL;
 	va_list args;
 	void *argp;
 	int ret;
 
-	if (!func)                                                                    
-		func = (int (*) (int, int, void *)) dlsym (REAL_LIBC, "ioctl");             
+	if (!ioctl_func)                                                                    
+		ioctl_func = (int (*) (int, int, void *)) dlsym (REAL_LIBC, "ioctl");             
 
 	va_start (args, request);
 	argp = va_arg (args, void *);
 	va_end (args);
 
-	if (fd == windrvrfd) {
-		parse_wdioctlreq(argp, request);
-
-		if ((ret = do_wdioctl(request, argp)))
-			ret = (*func) (fd, request, argp);
-	} else {
-		ret = (*func) (fd, request, argp);
-	}
+	if (fd == windrvrfd)
+		ret = do_wdioctl(fd, request, argp);
+	else
+		ret = (*ioctl_func) (fd, request, argp);
 
-	if (fd == windrvrfd) {
-		parse_wdioctlans(argp, request, ret);
-	}
 	return ret;
 }
 
diff --git a/usb-driver.h b/usb-driver.h
index 9ff9cbd..51e4b6e 100644
--- a/usb-driver.h
+++ b/usb-driver.h
@@ -15,6 +15,8 @@
 
 #define MAGIC 0xa410b413UL
 
+/* http://www.jungo.com/support/documentation/windriver/811/wdusb_man_mhtml/node78.html#SECTION001734000000000000000 */
+
 struct header_struct {
 	unsigned long magic;
 	void* data;
@@ -200,3 +202,152 @@ struct card_register
 	char cName[32];         // Name of card.
 	char cDescription[100]; // Description.
 };
+
+typedef struct
+{
+	void* dwPort;       // IO port for transfer or kernel memory address.
+	unsigned long cmdTrans;    // Transfer command WD_TRANSFER_CMD.
+
+	// Parameters used for string transfers:
+	unsigned long dwBytes;     // For string transfer.
+	unsigned long fAutoinc;    // Transfer from one port/address
+	// or use incremental range of addresses.
+	unsigned long dwOptions;   // Must be 0.
+	union
+	{
+		unsigned char Byte;     // Use for 8 bit transfer.
+		unsigned short Word;     // Use for 16 bit transfer.
+		unsigned int Dword;   // Use for 32 bit transfer.
+		unsigned long long Qword;  // Use for 64 bit transfer.
+		void* pBuffer; // Use for string transfer.
+	} Data;
+} WD_TRANSFER, WD_TRANSFER_V61;
+
+typedef struct
+{
+	unsigned long hKernelPlugIn;
+	unsigned long dwMessage;
+	void* pData;
+	unsigned long dwResult;
+} WD_KERNEL_PLUGIN_CALL, WD_KERNEL_PLUGIN_CALL_V40;
+
+
+struct interrupt
+{
+	unsigned long hInterrupt;    // Handle of interrupt.
+	unsigned long dwOptions;     // Interrupt options: can be INTERRUPT_CMD_COPY
+
+	WD_TRANSFER *Cmd;    // Commands to do on interrupt.
+	unsigned long dwCmds;        // Number of commands.
+
+	// For WD_IntEnable():
+	WD_KERNEL_PLUGIN_CALL kpCall; // Kernel PlugIn call.
+	unsigned long fEnableOk;     // TRUE if interrupt was enabled (WD_IntEnable() succeed).
+
+	// For WD_IntWait() and WD_IntCount():
+	unsigned long dwCounter;     // Number of interrupts received.
+	unsigned long dwLost;        // Number of interrupts not yet dealt with.
+	unsigned long fStopped;      // Was interrupt disabled during wait.
+};
+
+struct usb_set_interface
+{
+	unsigned long dwUniqueID;
+	unsigned long dwInterfaceNum;
+	unsigned long dwAlternateSetting;
+	unsigned long dwOptions;
+};
+
+struct usb_get_device_data
+{
+	unsigned long dwUniqueID;
+	void* pBuf;
+	unsigned long dwBytes;
+	unsigned long dwOptions;
+};
+
+#define WD_USB_MAX_INTERFACES 30
+
+typedef struct
+{
+	unsigned char bLength;
+	unsigned char bDescriptorType;
+	unsigned char bInterfaceNumber;
+	unsigned char bAlternateSetting;
+	unsigned char bNumEndpoints;
+	unsigned char bInterfaceClass;
+	unsigned char bInterfaceSubClass;
+	unsigned char bInterfaceProtocol;
+	unsigned char iInterface;
+} WDU_INTERFACE_DESCRIPTOR;
+
+typedef struct
+{
+	unsigned char bLength;
+	unsigned char bDescriptorType;
+	unsigned char bEndpointAddress;
+	unsigned char bmAttributes;
+	unsigned short wMaxPacketSize;
+	unsigned char bInterval;
+} WDU_ENDPOINT_DESCRIPTOR;
+
+typedef struct
+{
+	unsigned char bLength;
+	unsigned char bDescriptorType;
+	unsigned short wTotalLength;
+	unsigned char bNumInterfaces;
+	unsigned char bConfigurationValue;
+	unsigned char iConfiguration;
+	unsigned char bmAttributes;
+	unsigned char MaxPower;
+} WDU_CONFIGURATION_DESCRIPTOR;
+
+typedef struct
+{
+	unsigned char bLength;
+	unsigned char bDescriptorType;
+	unsigned short bcdUSB;
+	unsigned char bDeviceClass;
+	unsigned char bDeviceSubClass;
+	unsigned char bDeviceProtocol;
+	unsigned char bMaxPacketSize0;
+
+	unsigned short idVendor;
+	unsigned short idProduct;
+	unsigned short bcdDevice;
+	unsigned char iManufacturer;
+	unsigned char iProduct;
+	unsigned char iSerialNumber;
+	unsigned char bNumConfigurations;
+} WDU_DEVICE_DESCRIPTOR;
+
+typedef struct
+{
+	WDU_INTERFACE_DESCRIPTOR Descriptor;
+	WDU_ENDPOINT_DESCRIPTOR *pEndpointDescriptors;
+	WDU_PIPE_INFO *pPipes;
+} WDU_ALTERNATE_SETTING;
+
+typedef struct
+{
+	WDU_ALTERNATE_SETTING *pAlternateSettings;
+	unsigned long dwNumAltSettings;
+	WDU_ALTERNATE_SETTING *pActiveAltSetting;
+} WDU_INTERFACE;
+
+typedef struct
+{
+	WDU_CONFIGURATION_DESCRIPTOR Descriptor;
+	unsigned long dwNumInterfaces;
+	WDU_INTERFACE *pInterfaces;
+} WDU_CONFIGURATION;
+
+struct wdu_device_info {
+	WDU_DEVICE_DESCRIPTOR Descriptor;
+	WDU_PIPE_INFO Pipe0;
+	WDU_CONFIGURATION *pConfigs;
+	WDU_CONFIGURATION *pActiveConfig;
+	WDU_INTERFACE *pActiveInterface[WD_USB_MAX_INTERFACES];
+};
+