Changeset 58158 in vbox for trunk/src

Timestamp:

Oct 9, 2015 5:25:13 PM (9 years ago)

Author:

vboxsync

Message:

USBPROXYDEV: nits.

Location:

trunk/src/VBox

Files:

• Devices/USB/USBProxyDevice.h (modified) (4 diffs)
• RDP/client-1.8.3/vrdp/rdpusb.c (modified) (3 diffs)

trunk/src/VBox/Devices/USB/USBProxyDevice.h

@@ -188 +188 @@
 typedef struct USBPROXYDEV
 {
-#ifdef RDESKTOP
-    /** The VUSB device structure - must be the first structure member. */
-    VUSBDEV             Dev;
-    /** The next device in rdesktop-vrdp's linked list */
-    PUSBPROXYDEV        pNext;
-    /** The previous device in rdesktop-vrdp's linked list */
-    PUSBPROXYDEV        pPrev;
-    /** The vrdp device ID */
-    uint32_t            devid;
-    /** Linked list of in-flight URBs */
-    PVUSBURB            pUrbs;
-#endif
     /** The device descriptor. */
     VUSBDESCDEVICE      DevDesc;
@@ -235 +223 @@
     bool                fDetached;
     /** Backend specific data, the size is stored in pOps::cbBackend. */
-    void                *pvInstanceDataR3;
+    void               *pvInstanceDataR3;
+
+#ifdef RDESKTOP
+    /** @name VRDP client (rdesktop) related members.
+     * @{ */
+    /** The vrdp device ID. */
+    uint32_t            idVrdp;
+    /** The VUSB device structure - must be the first structure member. */
+    VUSBDEV             Dev;
+    /** The next device in rdesktop-vrdp's linked list. */
+    PUSBPROXYDEV        pNext;
+    /** The previous device in rdesktop-vrdp's linked list. */
+    PUSBPROXYDEV        pPrev;
+    /** Linked list of in-flight URBs */
+    PVUSBURB            pUrbs;
+    /** @} */
+#endif
 } USBPROXYDEV;
 
@@ -243 +247 @@
 #define USBPROXYDEV_2_DATA(a_pProxyDev, a_Type)   ( (a_Type)(a_pProxyDev)->pvInstanceDataR3 )
 
-static inline char *usbProxyGetName(PUSBPROXYDEV pProxyDev)
+
+DECLINLINE(const char *) usbProxyGetName(PUSBPROXYDEV pProxyDev)
 {
 #ifndef RDESKTOP
@@ -253 +258 @@
 
 #ifdef RDESKTOP
-static inline PUSBPROXYDEV usbProxyFromVusbDev(PVUSBDEV pDev)
-{
-    return (PUSBPROXYDEV)pDev;
+DECLINLINE(PUSBPROXYDEV) usbProxyFromVusbDev(PVUSBDEV pDev)
+{
+    return RT_FROM_MEMBER(pDev, USBPROXYDEV, Dev);
 }
 #endif

trunk/src/VBox/RDP/client-1.8.3/vrdp/rdpusb.c

@@ -376 +376 @@
         PUSBPROXYDEV proxy = g_proxies;
 
-        while (proxy && proxy->devid != devid)
+        while (proxy && proxy->idVrdp != devid)
         {
                 proxy = proxy->pNext;
@@ -409 +409 @@
 
                         s = rdpusb_init_packet(14 + datalen, RDPUSB_REQ_REAP_URB);
-                        out_uint32_le(s, proxy->devid);
+                        out_uint32_le(s, proxy->idVrdp);
                         out_uint8(s, VRDP_USB_REAP_FLAG_LAST);
                         out_uint8(s, pUrb->enmStatus);
@@ -509 +509 @@
 
                         proxy->Dev.pszName = "Remote device";
-                        proxy->devid = devid;
+                        proxy->idVrdp = devid;
 
                         for (pDevice = g_pUsbDevices; pDevice; pDevice = pDevice->pNext)