Changeset 57522 in vbox for trunk/src/VBox/Devices/USB

Timestamp:

Aug 25, 2015 9:52:33 AM (9 years ago)

Author:

vboxsync

Message:

USB/IP: Fixes and enable building it

File:

• trunk/src/VBox/Devices/USB/usbip/USBProxyDevice-usbip.cpp (modified) (6 diffs)

trunk/src/VBox/Devices/USB/usbip/USBProxyDevice-usbip.cpp

@@ -82 +82 @@
 /** Pipe stalled. */
 #define USBIP_STATUS_PIPE_STALLED            INT32_C(-32)
+/** Short read. */
+#define USBIP_STATUS_SHORT_READ              INT32_C(-121)
 /** @} */
 
@@ -560 +562 @@
 DECLINLINE(int) usbProxyUsbIpStatusConvertFromStatus(int32_t i32Status)
 {
-    if (RT_LIKELY(i32Status == USBIP_STATUS_SUCCESS))
+    if (RT_LIKELY(   i32Status == USBIP_STATUS_SUCCESS
+                  || i32Status == USBIP_STATUS_SHORT_READ))
         return VINF_SUCCESS;
 
@@ -582 +585 @@
 DECLINLINE(VUSBSTATUS) usbProxyUsbIpVUsbStatusConvertFromStatus(int32_t i32Status)
 {
-    if (RT_LIKELY(i32Status == USBIP_STATUS_SUCCESS))
+    if (RT_LIKELY(   i32Status == USBIP_STATUS_SUCCESS
+                  || i32Status == USBIP_STATUS_SHORT_READ))
         return VUSBSTATUS_OK;
 
@@ -1093 +1097 @@
 
     UsbIpReqSubmit ReqSubmit;
+
+    RT_ZERO(ReqSubmit);
     ReqSubmit.Hdr.u32ReqRet           = USBIP_CMD_SUBMIT;
     ReqSubmit.Hdr.u32SeqNum           = pUrbUsbIp->u32SeqNumUrb;
@@ -1120 +1126 @@
             if (pUrb->enmDir == VUSBDIRECTION_OUT)
             {
-                ReqSubmit.u32TransferBufferLength -= sizeof(VUSBSETUP);
                 aSegReq[cSegsUsed].cbSeg = pUrb->cbData - sizeof(VUSBSETUP);
                 aSegReq[cSegsUsed].pvSeg = pUrb->abData + sizeof(VUSBSETUP);
@@ -1275 +1280 @@
     pDevUsbIp->pszBusId      = NULL;
     usbProxyUsbIpResetRecvState(pDevUsbIp);
-
-    pProxyDev->iActiveCfg = 1; /** @todo that may not be always true. */
-    pProxyDev->cIgnoreSetConfigs = 1;
 
     rc = RTSemFastMutexCreate(&pDevUsbIp->hMtxLists);