Changeset 32472 in vbox for trunk/src/VBox/Devices

Timestamp:

Sep 14, 2010 10:26:19 AM (14 years ago)

Author:

vboxsync

Message:

RDP/client: use sysfs for USB device enumeration and switch to using real iprt

Location:

trunk/src/VBox/Devices/USB

Files:

• USBProxyDevice.h (modified) (1 diff)
• linux/USBProxyDevice-linux.cpp (modified) (2 diffs)

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

@@ -19 +19 @@
 #define ___USBProxyDevice_h
 
-#ifndef RDESKTOP
-# include <VBox/cdefs.h>
-# include <VBox/vusb.h>
-#else
-# include "runtime.h"
-# include "vusb.h"
-#endif
+#include <VBox/cdefs.h>
+#include <VBox/vusb.h>
 
 RT_C_DECLS_BEGIN

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

@@ -30 +30 @@
 *******************************************************************************/
 #define LOG_GROUP LOG_GROUP_DRV_USBPROXY
-#ifndef RDESKTOP
-# include <iprt/stdint.h>
-# include <iprt/err.h>
-#endif
+
+#include <iprt/stdint.h>
+#include <iprt/err.h>
+
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -72 +72 @@
 #ifndef RDESKTOP
 # include <VBox/pdm.h>
-# include <VBox/err.h>
-# include <VBox/log.h>
-# include <iprt/alloc.h>
-# include <iprt/assert.h>
-# include <iprt/asm.h>
-# include <iprt/ctype.h>
-# include <iprt/file.h>
-# include <iprt/linux/sysfs.h>
-# include <iprt/stream.h>
-# include <iprt/string.h>
+#else
+# define RTCRITSECT          void *
+static inline int rtcsNoop() { return VINF_SUCCESS; }
+# define RTCritSectInit(a)   rtcsNoop()
+# define RTCritSectDelete(a) rtcsNoop()
+# define RTCritSectEnter(a)  rtcsNoop()
+# define RTCritSectLeave(a)  rtcsNoop()
+#endif
+#include <VBox/err.h>
+#include <VBox/log.h>
+#include <iprt/alloc.h>
+#include <iprt/assert.h>
+#include <iprt/asm.h>
+#include <iprt/ctype.h>
+#include <iprt/file.h>
+#include <iprt/linux/sysfs.h>
+#include <iprt/stream.h>
+#include <iprt/string.h>
+#if defined(NO_PORT_RESET) && !defined(NO_LOGICAL_RECONNECT)
 # include <iprt/thread.h>
-# include <iprt/time.h>
-# include "../USBProxyDevice.h"
-#else
-
-# include "../rdesktop.h"
-# include "runtime.h"
-# include "USBProxyDevice.h"
-# ifdef VBOX_USB_WITH_SYSFS
-#  include "sysfs.h"
-# endif
 #endif
-
+#include <iprt/time.h>
+#include "../USBProxyDevice.h"
 
 /*******************************************************************************