Changeset 47497 in vbox for trunk/src/VBox/HostDrivers/VBoxUSB/solaris/VBoxUSB-solaris.c

Timestamp:

Jul 31, 2013 4:43:28 PM (11 years ago)

Author:

vboxsync

Message:

Solaris/USB: Fix short-transfers-okay flag.

File:

• trunk/src/VBox/HostDrivers/VBoxUSB/solaris/VBoxUSB-solaris.c (modified) (15 diffs)

trunk/src/VBox/HostDrivers/VBoxUSB/solaris/VBoxUSB-solaris.c

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2008-2012 Oracle Corporation
+ * Copyright (C) 2008-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -96 +96 @@
 /** -=-=-=-=-=-=- Tunable Parameters -=-=-=-=-=-=- */
 /** Time to wait while draining inflight UBRs on suspend, in seconds. */
-#define VBOXUSB_DRAIN_TIME                              30
+#define VBOXUSB_DRAIN_TIME                              20
 /** Ctrl Xfer timeout in seconds. */
 #define VBOXUSB_CTRL_XFER_TIMEOUT                       10
@@ -1868 +1868 @@
                      * Paranoia: we should have a single message block almost always.
                      */
-                    if (RT_LIKELY(!pUrb->pMsg->b_cont && cbData > 0))
+                    if (RT_LIKELY(   !pUrb->pMsg->b_cont
+                                  && cbData))
                     {
                         rc = ddi_copyout(pUrb->pMsg->b_rptr, (void *)pUrbReq->pvData, cbData, Mode);
-                        if (RT_UNLIKELY(rc != 0))
+                        if (RT_UNLIKELY(rc))
                         {
                             LogRel((DEVICE_NAME ":vboxUSBSolarisReapUrb ddi_copyout failed! rc=%d\n", rc));
@@ -1944 +1945 @@
                 AssertCompile(sizeof(pUrbReq->aIsocPkts) == sizeof(pUrb->aIsocPkts));
                 pUrbReq->cIsocPkts = pUrb->cIsocPkts;
-#if 0
+
                 for (unsigned i = 0; i < pUrb->cIsocPkts; i++)
                 {
-                    pUrbReq->aIsocPkts[i].cbPkt = pUrb->aIsocPkts[i].cbPkt;
-                    pUrbReq->aIsocPkts[i].cbActPkt = pUrb->aIsocPkts[i].cbActPkt;
+                    pUrbReq->aIsocPkts[i].cbPkt     = pUrb->aIsocPkts[i].cbPkt;
+                    pUrbReq->aIsocPkts[i].cbActPkt  = pUrb->aIsocPkts[i].cbActPkt;
                     pUrbReq->aIsocPkts[i].enmStatus = pUrb->aIsocPkts[i].enmStatus;
                 }
-#else
-                bcopy(pUrb->aIsocPkts, pUrbReq->aIsocPkts, pUrb->cIsocPkts * sizeof(VUSBISOC_PKT_DESC));
-#endif
 
                 if (pUrb->enmDir == VUSBDIRECTION_IN)
@@ -1981 +1979 @@
         mutex_exit(&pState->Mtx);
 
-    Log((DEVICE_NAME ":vboxUSBSolarisReapUrb returns %d\n", rc));
     return rc;
 }
@@ -2234 +2231 @@
     int rc = vboxUSBSolarisDeviceState(pState->DevState);
 
-    if (enmReset == VBOXUSB_RESET_LEVEL_NONE)
+    if (enmReset == VBOXUSB_RESET_LEVEL_CLOSE)
     {
         vboxUSBSolarisCloseAllPipes(pState, true /* ControlPipe */);
@@ -2663 +2660 @@
 LOCAL int vboxUSBSolarisOpenPipe(vboxusb_state_t *pState, vboxusb_ep_t *pEp)
 {
-//    LogFunc((DEVICE_NAME ":vboxUSBSolarisOpenPipe pState=%p pEp=%p\n", pState, pEp));
-
     Assert(mutex_owned(&pState->Mtx));
 
@@ -2672 +2667 @@
     if (pEp->pPipe)
         return VINF_SUCCESS;
+
 
     /*
@@ -2692 +2688 @@
     if (rc == USB_SUCCESS)
     {
+        LogFunc((DEVICE_NAME ":vboxUSBSolarisOpenPipe: Opened pipe. pState=%p pEp=%p\n", pState, pEp));
         usb_pipe_set_private(pEp->pPipe, (usb_opaque_t)pEp);
 
@@ -2927 +2924 @@
     if (RT_LIKELY(pUrbReq))
     {
-        pUrb->pvUrbR3 = pUrbReq->pvUrbR3;
+        pUrb->pvUrbR3   = pUrbReq->pvUrbR3;
         pUrb->bEndpoint = pUrbReq->bEndpoint;
-        pUrb->enmType = pUrbReq->enmType;
-        pUrb->enmDir = pUrbReq->enmDir;
+        pUrb->enmType   = pUrbReq->enmType;
+        pUrb->enmDir    = pUrbReq->enmDir;
         pUrb->enmStatus = pUrbReq->enmStatus;
-        pUrb->cbDataR3 = pUrbReq->cbData;
-        pUrb->pvDataR3 = (RTR3PTR)pUrbReq->pvData;
+        pUrb->fShortOk  = pUrbReq->fShortOk;
+        pUrb->pvDataR3  = (RTR3PTR)pUrbReq->pvData;
+        pUrb->cbDataR3  = pUrbReq->cbData;
         pUrb->cIsocPkts = pUrbReq->cIsocPkts;
+
         if (pUrbReq->enmType == VUSBXFERTYPE_ISOC)
         {
@@ -3069 +3068 @@
     AssertPtrReturn(pUrb->pMsg, VERR_INVALID_PARAMETER);
     uchar_t *pSetupData = pUrb->pMsg->b_rptr;
-    size_t cbData = pUrb->cbDataR3 - VBOXUSB_CTRL_XFER_SIZE;
-
-    /*
-     * Solaris USBA gives us garbage and incorrect message lengths making it impossible to use
-     * pre-allocated control messages. The allocation of "ctrl_data" is not documented well.
-     */
+    size_t cbData = pUrb->cbDataR3 > VBOXUSB_CTRL_XFER_SIZE ? pUrb->cbDataR3 - VBOXUSB_CTRL_XFER_SIZE : 0;
 
     /*
@@ -3093 +3087 @@
 
         if (   pUrb->enmDir == VUSBDIRECTION_OUT
-            && cbData > 0)
+            && cbData)
         {
             pUrb->pMsg->b_rptr += VBOXUSB_CTRL_XFER_SIZE;
@@ -3119 +3113 @@
         pReq->ctrl_client_private = (usb_opaque_t)pUrb;
 
+        LogFunc((DEVICE_NAME ":vboxUSBSolarisCtrlXfer ctrl_wLength=%#RX16 cbData=%#zx fShortOk=%RTbool\n", pReq->ctrl_wLength,
+                 cbData, !!(fAttributes & USB_ATTRS_SHORT_XFER_OK)));
         Log((DEVICE_NAME ":vboxUSBSolarisCtrlXfer %.*Rhxd\n", VBOXUSB_CTRL_XFER_SIZE, pSetupData));
 
@@ -3185 +3181 @@
             vboxUSBSolarisConcatMsg(pUrb);
 
-#if defined(DEBUG_ramshankar)
+#ifdef DEBUG_ramshankar
             if (   pUrb->pMsg
                 && pUrb->pMsg->b_cont == NULL)  /* Concat succeeded */
@@ -3199 +3195 @@
              */
             vboxUSBSolarisDeQueueURB(pUrb, pReq->ctrl_completion_reason);
-            usb_free_ctrl_req(pReq);
-            return;
         }
         else