X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/usb-driver/blobdiff_plain/da3ba95aeee227cd7d1e805c4d55776ca6363ca6..53f639f29205155c5090ca1965cd8b095c2ab9d4:/usb-driver.c

diff --git a/usb-driver.c b/usb-driver.c
index 3ec8457..89269b6 100644
--- a/usb-driver.c
+++ b/usb-driver.c
@@ -20,207 +20,181 @@
 #include <stdio.h>
 #include "xilinx.h"
 
-#define SNIFFLEN 4096
-static unsigned char lastbuf[4096];
+static int (*ioctl_func) (int, int, void *) = NULL;
+static int windrvrfd = 0;
 
 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,"!!!ERROR: magic header does not match!!!\n");
+		return (*ioctl_func) (fd, request, wdioctl);
 	}
 
-	fprintf(stderr, "Request: ");
 	switch(request) {
 		case VERSION:
-			fprintf(stderr,"VERSION");
+			version = (struct version_struct*)(wdheader->data);
+			strcpy(version->version, "WinDriver no more");
+			version->versionul = 999;
+			fprintf(stderr,"faking VERSION\n");
 			break;
+
 		case LICENSE:
-			fprintf(stderr,"LICENSE");
-			fprintf(stderr," \"%s\" (XX,XX)", ((struct license_struct*)(wdheader->data))->cLicense);
+			fprintf(stderr,"faking LICENSE\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," unique: %lu, pipe: %lu, read: %lu, options: %lx, size: %lu, timeout: %lx\n", ut->dwUniqueID, ut->dwPipeNum, ut->fRead, ut->dwOptions, ut->dwBufferSize, ut->dwTimeout);
+				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: %lu (%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);
-	}
+				struct interrupt *it = (struct interrupt*)(wdheader->data);
 
-	fprintf(stderr, ", size: %d\n", wdheader->size);
-}
+				fprintf(stderr,"Handle: %lu, Options: %lx, ncmds: %lu, enableok: %lu, count: %lu, lost: %lu, stopped: %lu\n", it->hInterrupt, it->dwOptions, it->dwCmds, it->fEnableOk, it->dwCounter, it->dwLost, it->fStopped);
 
-void parse_wdioctlans(unsigned char *wdioctl, unsigned int request, int result) {
-	struct header_struct* wdheader = (struct header_struct*)wdioctl;
-
-	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:
-		#if 0
+			fprintf(stderr,"INT_DISABLE\n");
 			{
-				struct usb_transfer *ut = (struct usb_transfer*)(wdheader->data);
+				struct interrupt *it = (struct interrupt*)(wdheader->data);
 
-				fprintf(stderr,"\n");
-				hexdump(ut->pBuffer, ut->dwBufferSize);
-				fprintf(stderr,"\n");
-				diff(lastbuf, ut->pBuffer, ut->dwBufferSize);
+				fprintf(stderr,"Handle: %lu, Options: %lx, ncmds: %lu, enableok: %lu, count: %lu, lost: %lu, stopped: %lu\n", it->hInterrupt, it->dwOptions, it->dwCmds, it->fEnableOk, it->dwCounter, it->dwLost, it->fStopped);
+				//it->dwCounter = 0;
+				//it->fStopped = 1;
+				ret = (*ioctl_func) (fd, request, wdioctl);
+				fprintf(stderr,"Handle: %lu, Options: %lx, ncmds: %lu, enableok: %lu, count: %lu, lost: %lu, stopped: %lu\n", it->hInterrupt, it->dwOptions, it->dwCmds, it->fEnableOk, it->dwCounter, it->dwLost, it->fStopped);
 			}
-		#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;
-	}
+		case USB_SET_INTERFACE:
+			fprintf(stderr,"USB_SET_INTERFACE\n");
+			{
+				struct usb_set_interface *usi = (struct usb_set_interface*)(wdheader->data);
 
-	switch(request) {
-		case VERSION:
-			version = (struct version_struct*)(wdheader->data);
-			strcpy(version->version, "WinDriver no more");
-			version->versionul = 999;
-			fprintf(stderr,"faking VERSION\n");
+				fprintf(stderr,"unique: %lu, interfacenum: %lu, alternatesetting: %lu, options: %lx\n", usi->dwUniqueID, usi->dwInterfaceNum, usi->dwAlternateSetting, usi->dwOptions);
+				ret = (*ioctl_func) (fd, request, wdioctl);
+			}
 			break;
-		case CARD_REGISTER:
+
+		case USB_GET_DEVICE_DATA:
+			fprintf(stderr,"USB_GET_DEVICE_DATA\n");
 			{
-				struct card_register* cr = (struct card_register*)(wdheader->data);
-				/* Todo: LPT-Port already in use */
+				struct usb_get_device_data *ugdd = (struct usb_get_device_data*)(wdheader->data);
+				int pSize;
+
+				fprintf(stderr, "uniqe: %lu, bytes: %lu, options: %lx\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");
+				}
 			}
-			fprintf(stderr,"faking CARD_REGISTER\n");
 			break;
-		case USB_TRANSFER:
-			fprintf(stderr,"in USB_TRANSFER");
+
+		case EVENT_REGISTER:
+			fprintf(stderr,"EVENT_REGISTER\n");
 			{
-				struct usb_transfer *ut = (struct usb_transfer*)(wdheader->data);
+				struct event *e = (struct event*)(wdheader->data);
+				int i;
 
-				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");
-				}
+				fprintf(stderr,"handle: %lu, action: %lu, status: %lu, eventid: %lu, cardtype: %lu, kplug: %lu, options: %lu, dev: %lx:%lx, unique: %lu, ver: %lu, nummatch: %lu\n", e->handle, e->dwAction, e->dwStatus, e->dwEventId, e->dwCardType, e->hKernelPlugIn, e->dwOptions, e->u.Usb.deviceId.dwVendorId, e->u.Usb.deviceId.dwProductId, e->u.Usb.dwUniqueID, e->dwEventVer, e->dwNumMatchTables);
+				for (i = 0; i < e->dwNumMatchTables; i++)
+					fprintf(stderr,"match: dev: %x:%x, class: %x, subclass: %x, intclass: %x, intsubclass: %x, intproto: %x\n", e->matchTables[i].VendorId, e->matchTables[i].ProductId, e->matchTables[i].bDeviceClass, e->matchTables[i].bDeviceSubClass, e->matchTables[i].bInterfaceClass, e->matchTables[i].bInterfaceSubClass, e->matchTables[i].bInterfaceProtocol);
+
+				ret = (*ioctl_func) (fd, request, wdioctl);
+
+				fprintf(stderr,"handle: %lu, action: %lu, status: %lu, eventid: %lu, cardtype: %lu, kplug: %lu, options: %lu, dev: %lx:%lx, unique: %lu, ver: %lu, nummatch: %lu\n", e->handle, e->dwAction, e->dwStatus, e->dwEventId, e->dwCardType, e->hKernelPlugIn, e->dwOptions, e->u.Usb.deviceId.dwVendorId, e->u.Usb.deviceId.dwProductId, e->u.Usb.dwUniqueID, e->dwEventVer, e->dwNumMatchTables);
+				for (i = 0; i < e->dwNumMatchTables; i++)
+					fprintf(stderr,"match: dev: %x:%x, class: %x, subclass: %x, intclass: %x, intsubclass: %x, intproto: %x\n", e->matchTables[i].VendorId, e->matchTables[i].ProductId, e->matchTables[i].bDeviceClass, e->matchTables[i].bDeviceSubClass, e->matchTables[i].bInterfaceClass, e->matchTables[i].bInterfaceSubClass, e->matchTables[i].bInterfaceProtocol);
 			}
-		case LICENSE:
+			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");
+			{
+				struct interrupt *it = (struct interrupt*)(wdheader->data);
+
+				fprintf(stderr,"Handle: %lu, Options: %lx, ncmds: %lu, enableok: %lu, count: %lu, lost: %lu, stopped: %lu\n", it->hInterrupt, it->dwOptions, it->dwCmds, it->fEnableOk, it->dwCounter, it->dwLost, it->fStopped);
+
+				ret = (*ioctl_func) (fd, request, wdioctl);
+				fprintf(stderr,"Handle: %lu, Options: %lx, ncmds: %lu, enableok: %lu, count: %lu, lost: %lu, stopped: %lu\n", it->hInterrupt, it->dwOptions, it->dwCmds, it->fEnableOk, it->dwCounter, it->dwLost, it->fStopped);
+			}
+			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:
-		case EVENT_REGISTER:
+			fprintf(stderr,"EVENT_PULL\n");
+			ret = (*ioctl_func) (fd, request, wdioctl);
+			break;
+
 		default:
-			return -1;
+			ret = (*ioctl_func) (fd, request, wdioctl);
 	}
 
-	return 0;
+	return ret;
 }
 
 
 typedef int (*open_funcptr_t) (const char *, int, mode_t);
 
-static windrvrfd = 0;
-static void* mmapped = NULL;
-static size_t mmapplen = 0;
-
 int open (const char *pathname, int flags, ...)
 {
 	static open_funcptr_t func = NULL;
@@ -269,30 +243,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;
 }