Changeset 5652 in vbox

Timestamp:

Nov 9, 2007 3:03:25 PM (17 years ago)

Author:

vboxsync

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

25990

Message:

Prototyping USB support for OS/2 hosts.

Location:

trunk/src/VBox/Main

Files:

• HostImpl.cpp (modified) (1 diff)
• Makefile.kmk (modified) (2 diffs)
• VirtualBoxImpl.cpp (modified) (1 diff)
• include/USBProxyService.h (modified) (1 diff)

trunk/src/VBox/Main/HostImpl.cpp

@@ -142 +142 @@
 #elif defined (RT_OS_LINUX) && defined (VBOX_WITH_USB)
     mUSBProxyService = new USBProxyServiceLinux (this);
+#elif defined (RT_OS_OS2) && defined (VBOX_WITH_USB)
+    mUSBProxyService = new USBProxyServiceOs2 (this);
 #elif defined (RT_OS_WINDOWS) && defined (VBOX_WITH_USB)
     mUSBProxyService = new USBProxyServiceWin32 (this);

trunk/src/VBox/Main/Makefile.kmk

@@ -138 +138 @@
         $(PATH_VBoxCOM) \
         $(PATH_CURRENT)
+ifdef VBOX_WITH_USB
+ VBoxSVC_INCS.os2 = \
+        $(PATH_ROOT)/src/VBox/HostDrivers/VBoxUSB/os2
+endif
+
 ifeq ($(BUILD_TARGET),win)
  VBoxSVC_LIBS += \
@@ -212 +217 @@
 VBoxSVC_SOURCES.darwin += darwin/USBProxyServiceDarwin.cpp
 VBoxSVC_SOURCES.linux += linux/USBProxyServiceLinux.cpp
+VBoxSVC_SOURCES.os2 += os2/USBProxyServiceOs2.cpp
 VBoxSVC_SOURCES.win   += win32/USBProxyServiceWin32.cpp
 endif

trunk/src/VBox/Main/VirtualBoxImpl.cpp

@@ -4590 +4590 @@
                                                         DCMW_WAIT_ANY);
                     AssertMsg (arc == NO_ERROR,
-                               ("DosCreateMuxWaitSem returned %d\n", arc));
+                               ("DosCreateMuxWaitSem returned %d\n", arc)); NOREF(arc);
                 }
             }

trunk/src/VBox/Main/include/USBProxyService.h

@@ -346 +346 @@
 
 
+# ifdef RT_OS_OS2
+#  include <usbcalls.h>
+
+/**
+ * The Linux hosted USB Proxy Service.
+ */
+class USBProxyServiceOs2 : public USBProxyService
+{
+public:
+    USBProxyServiceOs2 (Host *aHost);
+    ~USBProxyServiceOs2();
+
+    virtual int captureDevice (HostUSBDevice *aDevice);
+    virtual int releaseDevice (HostUSBDevice *aDevice);
+    virtual bool updateDeviceState (HostUSBDevice *aDevice, PUSBDEVICE aUSBDevice);
+
+protected:
+    virtual int wait (unsigned aMillies);
+    virtual int interruptWait (void);
+    virtual PUSBDEVICE getDevices (void);
+    int addDeviceToChain (PUSBDEVICE pDev, PUSBDEVICE *ppFirst, PUSBDEVICE **pppNext, int rc);
+
+private:
+    /** The notification event semaphore */
+    HEV mhev;
+    /** The notification id. */
+    USBNOTIFY mNotifyId;
+    /** The usbcalls.dll handle. */
+    HMODULE mhmod;
+    /** UsbRegisterChangeNotification */
+    APIRET (APIENTRY *mpfnUsbRegisterChangeNotification)(PUSBNOTIFY, HEV, HEV);
+    /** UsbDeregisterNotification */
+    APIRET (APIENTRY *mpfnUsbDeregisterNotification)(USBNOTIFY);
+    /** UsbQueryNumberDevices */
+    APIRET (APIENTRY *mpfnUsbQueryNumberDevices)(PULONG);
+    /** UsbQueryDeviceReport */
+    APIRET (APIENTRY *mpfnUsbQueryDeviceReport)(ULONG, PULONG, PVOID);
+};
+# endif /* RT_OS_LINUX */
+
+
 # ifdef RT_OS_WINDOWS
 /**