X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/usb-driver/blobdiff_plain/ca18111bc12032c9fa7ea97574562fac4f02e788..411af37385755fe5a4ace68138372dd7e6feddf7:/usb-driver.c

diff --git a/usb-driver.c b/usb-driver.c
index 31495ff..e92467f 100644
--- a/usb-driver.c
+++ b/usb-driver.c
@@ -225,7 +225,6 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
 		return (*ioctl_func) (fd, request, wdioctl);
 	}
 
-	fprintf(stderr,"PID %d: ",getpid());
 	switch(request) {
 		case VERSION:
 			version = (struct version_struct*)(wdheader->data);
@@ -250,6 +249,7 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
 			fprintf(stderr,"in USB_TRANSFER");
 			{
 				struct usb_transfer *ut = (struct usb_transfer*)(wdheader->data);
+				int requesttype, request, value, index, size;
 
 				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: ");
@@ -263,6 +263,22 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
 
 #ifndef NO_WINDRVR
 				ret = (*ioctl_func) (fd, request, wdioctl);
+#else
+				/* http://www.jungo.com/support/documentation/windriver/802/wdusb_man_mhtml/node55.html#SECTION001213000000000000000 */
+				requesttype = ut->SetupPacket[0];
+				request = ut->SetupPacket[1];
+				value = ut->SetupPacket[2] | (ut->SetupPacket[3] << 8);
+				index = ut->SetupPacket[4] | (ut->SetupPacket[5] << 8);
+				size = ut->SetupPacket[6] | (ut->SetupPacket[7] << 8);
+				fprintf(stderr, "requesttype: %x, request: %x, value: %u, index: %u, size: %u\n", requesttype, request, value, index, size);
+				ret = usb_control_msg(usb_devhandle, requesttype, request, value, index, ut->pBuffer, size, ut->dwTimeout);
+				if (ret < 0) {
+					fprintf(stderr, "usb_control_msg: %d\n", ret);
+				} else {
+					ut->dwBytesTransferred = ret;
+					ret = 0;
+				}
+					
 #endif
 
 				fprintf(stderr,"Transferred: %lu (%s)\n",ut->dwBytesTransferred, (ut->fRead?"read":"write"));
@@ -280,7 +296,6 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
 			{
 				struct interrupt *it = (struct interrupt*)(wdheader->data);
 
-				hexdump(wdheader->data, 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);
 
 				it->fEnableOk = 1;
@@ -317,12 +332,23 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
 				ret = (*ioctl_func) (fd, request, wdioctl);
 #else
 				if (usbdevice) {
-					int iface;
-
 					if (!usb_devhandle)
 						usb_devhandle = usb_open(usbdevice);
-//MGMG
-					ret = usb_claim_interface(usb_devhandle, iface);
+
+					/* FIXME: Select right interface! */
+					ret = usb_claim_interface(usb_devhandle, usbdevice->config[0].interface[usi->dwInterfaceNum].altsetting[usi->dwAlternateSetting].bInterfaceNumber);
+					if (!ret) {
+						//ret = usb_set_configuration(usb_devhandle, usbdevice->config[0].bConfigurationValue);
+						if(!ret) {
+							ret = usb_set_altinterface(usb_devhandle, usi->dwAlternateSetting);
+							if (ret)
+								fprintf(stderr, "usb_set_altinterface: %d\n", ret);
+						} else {
+							fprintf(stderr, "usb_set_configuration: %d (%s)\n", ret, usb_strerror());
+						}
+					} else {
+						fprintf(stderr, "usb_claim_interface: %d -> %d (%s)\n", usbdevice->config[0].interface[usi->dwInterfaceNum].altsetting[usi->dwAlternateSetting].bInterfaceNumber, ret, usb_strerror());
+					}
 				}
 #endif
 				fprintf(stderr,"unique: %lu, interfacenum: %lu, alternatesetting: %lu, options: %lx\n", usi->dwUniqueID, usi->dwInterfaceNum, usi->dwAlternateSetting, usi->dwOptions);
@@ -429,7 +455,6 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
 			{
 				struct interrupt *it = (struct interrupt*)(wdheader->data);
 
-				hexdump(wdheader->data, 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);
 
 #ifndef NO_WINDRVR