Changeset 3764 in vbox for trunk/src/VBox/Main/include

Timestamp:

Jul 22, 2007 1:19:02 PM (18 years ago)

Author:

vboxsync

Message:

Drop holdDevice(). darwin changes.

Location:

trunk/src/VBox/Main/include

Files:

• HostUSBDeviceImpl.h (modified) (3 diffs)
• USBProxyService.h (modified) (6 diffs)

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

@@ -84 +84 @@
 
     /** Additional internal states.
-     * The async detach stuff for Darwin is a two stage journey with a variation 
+     * The async detach stuff for Darwin is a two stage journey with a variation
      * (filters) depending on who won the race to lock the Host object.
-     * 
-     * @remark Trying out mac os x style enum naming convention here. nice or what? 
+     *
+     * @remark Trying out mac os x style enum naming convention here. nice or what?
      */
     typedef enum
-    { 
+    {
         /** Nothing is pending here, check mPendingState. */
-        kNothingPending, 
+        kNothingPending,
         /** 1st stage of the detch, waiting for the logical detach notification. */
-        kDetachingPendingDetach, 
-        /** 1st stage of the detch, waiting for the logical detach notification - re-run filters. 
+        kDetachingPendingDetach,
+        /** 1st stage of the detch, waiting for the logical detach notification - re-run filters.
          * Prev: kDetachingPendingDetach */
-        kDetachingPendingDetachFilters, 
-        /** 2nd stage of the detach, waiting for the logical attach notification. 
+        kDetachingPendingDetachFilters,
+        /** 2nd stage of the detach, waiting for the logical attach notification.
          * Prev: kDetachingPendingDetach */
         kDetachingPendingAttach,
-        /** 2nd stage of the detach, waiting for the logical attach notification - re-run filters. 
+        /** 2nd stage of the detach, waiting for the logical attach notification - re-run filters.
          * Prev: kDetachingPendingDetachFilters */
         kDetachingPendingAttachFilters
@@ -163 +163 @@
     /** Same as mPendingState but for the internal states. */
     InternalState mPendingStateEx;
-    /** RTTimeNanoTS() of when mIsStatePending was set or mDetaching changed 
+    /** RTTimeNanoTS() of when mIsStatePending was set or mDetaching changed
      * from kNotDetaching. For operations that cannot be cancelled it's 0. */
     uint64_t mPendingSince;
@@ -179 +179 @@
 #ifdef RT_OS_LINUX
     friend class USBProxyServiceLinux;
+#endif
+#ifdef RT_OS_DARWIN
+    /** One-shot filter id. */
+    void *mOneShotId;
+
+    friend class USBProxyServiceDarwin;
 #endif
 };

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

@@ -64 +64 @@
 
     /**
-     * The device is to be held so that the host OS will not start using it.
-     *
-     * @returns VBox status code.
-     * @param   aDevice     The device in question.
-     */
-    virtual int holdDevice (HostUSBDevice *aDevice);
-
-    /**
      * The device is going to be detached from a VM.
      *
@@ -137 +129 @@
      */
     static uint64_t calcSerialHash (const char *aSerial);
+
+#ifdef VBOX_WITH_USBFILTER
+    /**
+     * Initializes a filter with the data from the specified device.
+     *
+     * @param   aFilter     The filter to fill.
+     * @param   aDevice     The device to fill it with.
+     */
+    static void initFilterFromDevice (PUSBFILTER aFilter, HostUSBDevice *aDevice);
+#endif
 
 protected:
@@ -270 +272 @@
 
     virtual int captureDevice (HostUSBDevice *aDevice);
-    virtual int holdDevice (HostUSBDevice *aDevice);
     virtual void detachingDevice (HostUSBDevice *aDevice);
     virtual int releaseDevice (HostUSBDevice *aDevice);
@@ -291 +292 @@
      * not including newly attached devices. */
     bool mWaitABitNextTime;
+#ifndef VBOX_WITH_USBFILTER
     /** Whether we've got a fake async event and should return without entering the runloop. */
     bool volatile mFakeAsync;
+#endif
     /** Whether we've successfully initialized the USBLib and should call USBLibTerm in the destructor. */
     bool mUSBLibInitialized;
@@ -312 +315 @@
 
     virtual int captureDevice (HostUSBDevice *aDevice);
-    virtual int holdDevice (HostUSBDevice *aDevice);
     virtual int releaseDevice (HostUSBDevice *aDevice);
     virtual bool updateDeviceState (HostUSBDevice *aDevice, PUSBDEVICE aUSBDevice);
@@ -354 +356 @@
 
     virtual int captureDevice (HostUSBDevice *aDevice);
-    virtual int holdDevice (HostUSBDevice *aDevice);
     virtual int releaseDevice (HostUSBDevice *aDevice);
     virtual bool updateDeviceState (HostUSBDevice *aDevice, PUSBDEVICE aUSBDevice);