X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/usb-driver/blobdiff_plain/d0676964410af2cfc01a121df39943be62d93fa8..a70f4f388bbe08fbc80c4b587da4c0a781f475da:/usb-driver.c

diff --git a/usb-driver.c b/usb-driver.c
index 109f01d..c4afaf5 100644
--- a/usb-driver.c
+++ b/usb-driver.c
@@ -262,6 +262,32 @@ 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 */
+				if (ut->dwPipeNum == 0) { /* control pipe */
+					int requesttype, request, value, index, size;
+					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);
+				} else {
+					if (ut->fRead) {
+						ret = usb_bulk_read(usb_devhandle, ut->dwPipeNum, ut->pBuffer, ut->dwBufferSize, ut->dwTimeout);
+
+					} else {
+						ret = usb_bulk_write(usb_devhandle, ut->dwPipeNum, ut->pBuffer, ut->dwBufferSize, ut->dwTimeout);
+					}
+				}
+
+				if (ret < 0) {
+					fprintf(stderr, "usb_transfer: %d (%s)\n", ret, usb_strerror());
+				} else {
+					ut->dwBytesTransferred = ret;
+					ret = 0;
+				}
 #endif
 
 				fprintf(stderr,"Transferred: %lu (%s)\n",ut->dwBytesTransferred, (ut->fRead?"read":"write"));
@@ -321,9 +347,14 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
 					/* 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_altinterface(usb_devhandle, usi->dwAlternateSetting);
-						if (ret)
-							fprintf(stderr, "usb_set_altinterface: %d\n", 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());
 					}