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

Timestamp:

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

Author:

vboxsync

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

103266

Message:

USBPROXYDEV: nits.

File:

• trunk/src/VBox/Devices/USB/USBProxyDevice.h (modified) (4 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