Transferred: 180 (write)

[usb-driver] / usb-driver.c

diff --git a/usb-driver.c b/usb-driver.c
index 31495fff4a0fc85bfc64bd5c91c600e0f23c6dee..c4afaf5de309ac69d5503f1f82cf89631298370a 100644 (file)
--- 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);
@@ -263,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"));
@@ -280,7 +305,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 +341,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 +464,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