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

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/vrdp/USBProxyDevice-vrdp.cpp (modified) (9 diffs)

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

@@ -118 +118 @@
     }
 
-    return RT_SUCCESS(rc);
+    return rc;
 }
 
@@ -135 +135 @@
     }
 
-    return RT_SUCCESS(rc);
+    return rc;
 }
 
@@ -152 +152 @@
     }
 
-    return RT_SUCCESS(rc);
+    return rc;
 }
 
@@ -169 +169 @@
     }
 
-    return RT_SUCCESS(rc);
-}
-
-static DECLCALLBACK(bool) usbProxyVrdpClearHaltedEp(PUSBPROXYDEV pProxyDev, unsigned int ep)
+    return rc;
+}
+
+static DECLCALLBACK(int) usbProxyVrdpClearHaltedEp(PUSBPROXYDEV pProxyDev, unsigned int ep)
 {
     LogFlow(("usbProxyVrdpClearHaltedEp: pProxyDev=%s ep=%u\n", pProxyDev->pUsbIns->pszName, ep));
@@ -186 +186 @@
     }
 
-    return RT_SUCCESS(rc);
-}
-
-static DECLCALLBACK(int) usbProxyVrdpUrbQueue(PVUSBURB pUrb)
+    return rc;
+}
+
+static DECLCALLBACK(int) usbProxyVrdpUrbQueue(PUSBPROXYDEV pProxyDev, PVUSBURB pUrb)
 {
     LogFlow(("usbProxyVrdpUrbQueue: pUrb=%p\n", pUrb));
@@ -197 +197 @@
     {
         Log(("usbproxy: isochronous transfers aren't implemented yet.\n"));
-        return false;
-    }
-
-    PUSBPROXYDEV pProxyDev = PDMINS_2_DATA(pUrb->pUsbIns, PUSBPROXYDEV);
-    PUSBPROXYDEVVRDP pDevVrdp = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVVRDP);
-
+        return VERR_NOT_IMPLEMENTED;
+    }
+
+    PUSBPROXYDEVVRDP pDevVrdp = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVVRDP);
     int rc = pDevVrdp->pCallback->pfnQueueURB (pDevVrdp->pDevice, pUrb->enmType, pUrb->EndPt, pUrb->enmDir, pUrb->cbData,
                                                pUrb->abData, pUrb, (PREMOTEUSBQURB *)&pUrb->Dev.pvPrivate);
@@ -212 +210 @@
     }
 
-    return RT_SUCCESS(rc);
+    return rc;
 }
 
@@ -245 +243 @@
 }
 
-static DECLCALLBACK(void) usbProxyVrdpUrbCancel(PVUSBURB pUrb)
+static DECLCALLBACK(int) usbProxyVrdpUrbCancel(PUSBPROXYDEV pProxyDev, PVUSBURB pUrb)
 {
     LogFlow(("usbProxyVrdpUrbCancel: pUrb=%p\n", pUrb));
 
-    PUSBPROXYDEV pProxyDev = PDMINS_2_DATA(pUrb->pUsbIns, PUSBPROXYDEV);
-    PUSBPROXYDEVVRDP pDevVrdp = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVVRDP);
-
+    PUSBPROXYDEVVRDP pDevVrdp = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVVRDP);
     pDevVrdp->pCallback->pfnCancelURB (pDevVrdp->pDevice, (PREMOTEUSBQURB)pUrb->Dev.pvPrivate);
+    return VINF_SUCCESS; /** @todo: Enhance remote interface to pass a status code. */
 }
 
@@ -260 +257 @@
 
     PUSBPROXYDEVVRDP pDevVrdp = USBPROXYDEV_2_DATA(pProxyDev, PUSBPROXYDEVVRDP);
-
     return pDevVrdp->pCallback->pfnWakeup (pDevVrdp->pDevice);
 }