Changeset 50234 in vbox for trunk/src/VBox/Devices/USB/solaris

Timestamp:

Jan 24, 2014 10:48:13 PM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

91835

Message:

USB/Proxy: More code cleanup and finish a few todos, also some new ones so it doesn't get boring

File:

• trunk/src/VBox/Devices/USB/solaris/USBProxyDevice-solaris.cpp (modified) (11 diffs)

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

@@ -494 +494 @@
     SetConfigReq.bConfigValue = iCfg;
     int rc = usbProxySolarisIOCtl(pDevSol, VBOXUSB_IOCTL_SET_CONFIG, &SetConfigReq, sizeof(SetConfigReq));
-    if (RT_SUCCESS(rc))
-        return true;
-
-    if (rc != VERR_VUSB_DEVICE_NOT_ATTACHED)
+    if (   RT_FAILURE(rc)
+        && rc != VERR_VUSB_DEVICE_NOT_ATTACHED)
         LogRel((USBPROXY ":usbProxySolarisSetConfig failed to switch configuration. rc=%Rrc\n", rc));
 
-    return false;
+    return rc;
 }
 
@@ -514 +512 @@
 static DECLCALLBACK(int) usbProxySolarisClaimInterface(PUSBPROXYDEV pProxyDev, int iIf)
 {
-    return true;
+    return VINF_SUCCESS;
 }
 
@@ -528 +526 @@
 static DECLCALLBACK(int) usbProxySolarisReleaseInterface(PUSBPROXYDEV pProxyDev, int iIf)
 {
-    return true;
+    return VINF_SUCCESS;
 }
 
@@ -548 +546 @@
     SetInterfaceReq.bAlternate = iAlt;
     int rc = usbProxySolarisIOCtl(pDevSol, VBOXUSB_IOCTL_SET_INTERFACE, &SetInterfaceReq, sizeof(SetInterfaceReq));
-    if (RT_SUCCESS(rc))
-        return true;
-
-    if (rc != VERR_VUSB_DEVICE_NOT_ATTACHED)
+    if (   RT_FAILURE(rc)
+        && rc != VERR_VUSB_DEVICE_NOT_ATTACHED)
         LogRel((USBPROXY ":usbProxySolarisSetInterface failed to set interface. rc=%Rrc\n", rc));
 
-    return false;
+    return rc;
 }
 
@@ -561 +557 @@
  * Clears the halted endpoint 'EndPt'.
  */
-static DECLCALLBACK(bool) usbProxySolarisClearHaltedEp(PUSBPROXYDEV pProxyDev, unsigned int EndPt)
+static DECLCALLBACK(int) usbProxySolarisClearHaltedEp(PUSBPROXYDEV pProxyDev, unsigned int EndPt)
 {
     LogFlowFunc((USBPROXY ":usbProxySolarisClearHaltedEp pProxyDev=%p EndPt=%#x\n", pProxyDev, EndPt));
@@ -571 +567 @@
     ClearEpReq.bEndpoint = EndPt;
     int rc = usbProxySolarisIOCtl(pDevSol, VBOXUSB_IOCTL_CLEAR_EP, &ClearEpReq, sizeof(ClearEpReq));
-    if (RT_SUCCESS(rc))
-        return true;
-
-    if (rc != VERR_VUSB_DEVICE_NOT_ATTACHED)
+    if (   RT_FAILURE(rc)
+        && rc != VERR_VUSB_DEVICE_NOT_ATTACHED)
         LogRel((USBPROXY ":usbProxySolarisClearHaltedEp failed! rc=%Rrc\n", rc));
 
-    return false;
+    return rc;
 }
 
@@ -596 +590 @@
     {
         LogRel((USBPROXY ":usbProxySolarisUrbQueue: Failed to allocate URB.\n"));
-        return false;
+        return VERR_NO_MEMORY;
     }
 
@@ -632 +626 @@
             LogFlow((USBPROXY ":usbProxySolarisUrbQueue success cbData=%d.\n", pUrb->cbData));
         pUrb->Dev.pvPrivate = pUrbSol;
-        return true;
+        return VINF_SUCCESS;
     }
 
@@ -639 +633 @@
              pProxyDev->pUsbIns->pszName, pUrb, pUrb->EndPt, UrbReq.bEndpoint, pUrb->enmType, pUrb->enmDir, pUrb->cbData, rc));
 
-    return false;
+    return rc;
 }
 
@@ -650 +644 @@
  *          on Solaris. So we just abort pending URBs on the pipe.
  */
-static DECLCALLBACK(void) usbProxySolarisUrbCancel(PVUSBURB pUrb)
+static DECLCALLBACK(int) usbProxySolarisUrbCancel(PUSBPROXYDEV pProxyDev, PVUSBURB pUrb)
 {
     PUSBPROXYURBSOL pUrbSol = (PUSBPROXYURBSOL)pUrb->Dev.pvPrivate;
-
-    PUSBPROXYDEV pProxyDev = PDMINS_2_DATA(pUrb->pUsbIns, PUSBPROXYDEV);
     PUSBPROXYDEVSOL pDevSol = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVSOL);
     AssertPtrReturnVoid(pDevSol);
@@ -662 +654 @@
     /* Aborting the control pipe isn't supported, pretend success. */
     if (!pUrb->EndPt)
-        return;
+        return VINF_SUCCESS;
 
     VBOXUSBREQ_ABORT_PIPE AbortPipeReq;
     AbortPipeReq.bEndpoint = pUrb->EndPt | (pUrb->enmDir == VUSBDIRECTION_IN ? VUSB_DIR_TO_HOST : VUSB_DIR_TO_DEVICE);
     int rc = usbProxySolarisIOCtl(pDevSol, VBOXUSB_IOCTL_ABORT_PIPE, &AbortPipeReq, sizeof(AbortPipeReq));
-    if (RT_FAILURE(rc))
-    {
-        if (rc != VERR_VUSB_DEVICE_NOT_ATTACHED)
-            LogRel((USBPROXY ":usbProxySolarisUrbCancel failed to abort pipe. rc=%Rrc\n", rc));
-        return;
-    }
-
-    LogFlow((USBPROXY ":usbProxySolarisUrbCancel success.\n", rc));
+    if (   RT_FAILURE(rc)
+        && rc != VERR_VUSB_DEVICE_NOT_ATTACHED)
+        LogRel((USBPROXY ":usbProxySolarisUrbCancel failed to abort pipe. rc=%Rrc\n", rc));
+
+    LogFlow((USBPROXY ":usbProxySolarisUrbCancel: rc=%Rrc.\n", rc));
+    return rc;
 }