Changeset 30653 in vbox for trunk

Timestamp:

Jul 6, 2010 10:53:54 AM (15 years ago)

Author:

vboxsync

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

63402

Message:

vusb: header updates

File:

• trunk/include/VBox/vusb.h (modified) (7 diffs)

trunk/include/VBox/vusb.h

@@ -27 +27 @@
 #define ___VBox_vusb_h
 
-#include <VBox/cdefs.h>
-#include <VBox/types.h>
+#ifndef RDESKTOP
+# include <VBox/cdefs.h>
+# include <VBox/types.h>
+#else
+# include "runtime.h"
+#endif
 
 RT_C_DECLS_BEGIN
@@ -354 +358 @@
 typedef VUSBPORTBITMAP *PVUSBPORTBITMAP;
 
+#ifndef RDESKTOP
 
 /**
@@ -611 +616 @@
 #endif /* IN_RING3 */
 
+#endif /* ! RDESKTOP */
 
 
@@ -652 +658 @@
 } VUSBDEVICESTATE;
 
+#ifndef RDESKTOP
 
 /**
@@ -781 +788 @@
 #endif /* IN_RING3 */
 
+#endif /* ! RDESKTOP */
 
 /** @name URB
@@ -909 +917 @@
     /** URB description, can be null. intended for logging. */
     char           *pszDesc;
+
+#ifdef RDESKTOP
+    /** The next URB in rdesktop-vrdp's linked list */
+    PVUSBURB        pNext;
+    /** The previous URB in rdesktop-vrdp's linked list */
+    PVUSBURB        pPrev;
+    /** The vrdp handle for the URB */
+    uint32_t        handle;
+    /** Pointer used to find the usb proxy device */
+    struct VUSBDEV *pDev;
+#endif
 
     /** The VUSB data. */
@@ -972 +991 @@
     } Dev;
 
+#ifndef RDESKTOP
     /** The USB device instance this belongs to.
      * This is NULL if the device address is invalid, in which case this belongs to the hub. */
     PPDMUSBINS      pUsbIns;
+#endif
     /** The device address.
      * This is set at allocation time. */