Changeset 2755 in vbox for trunk/src

Timestamp:

May 22, 2007 4:15:09 AM (18 years ago)

Author:

vboxsync

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

21358

Message:

Added a little hack to make sure we catch newly attached devices.

Location:

trunk/src/VBox/Main

Files:

• darwin/iokit.cpp (modified) (5 diffs)
• include/USBProxyService.h (modified) (1 diff)

trunk/src/VBox/Main/darwin/iokit.cpp

@@ -201 +201 @@
     /** The attach notification iterator. */
     io_iterator_t AttachIterator;
+    /** The 2nd attach notification iterator. */
+    io_iterator_t AttachIterator2;
     /** The detach notificaiton iterator. */
     io_iterator_t DetachIterator;
-
 } DARWINUSBNOTIFY, *PDARWINUSBNOTIFY;
 
@@ -225 +226 @@
 
 /**
- * Callback for the attach notifications.
+ * Callback for the two attach notifications.
  *
  * @param   pvNotify        Our data.
@@ -283 +284 @@
 
             /*
-             * Create the notifcation callback.
+             * Create the notifcation callbacks.
              */
             kern_return_t rc = IOServiceAddMatchingNotification(pNotify->NotifyPort,
@@ -295 +296 @@
                 darwinDrainIterator(pNotify->AttachIterator);
                 rc = IOServiceAddMatchingNotification(pNotify->NotifyPort,
-                                                      kIOTerminatedNotification,
+                                                      kIOMatchedNotification,
                                                       IOServiceMatching(kIOUSBDeviceClassName),
-                                                      darwinUSBDetachNotification,
+                                                      darwinUSBAttachNotification,
                                                       pNotify,
-                                                      &pNotify->DetachIterator);
+                                                      &pNotify->AttachIterator2);
                 if (rc == KERN_SUCCESS)
                 {
-                    darwinDrainIterator(pNotify->DetachIterator);
-                    return pNotify;
+                    darwinDrainIterator(pNotify->AttachIterator2);
+                    rc = IOServiceAddMatchingNotification(pNotify->NotifyPort,
+                                                          kIOTerminatedNotification,
+                                                          IOServiceMatching(kIOUSBDeviceClassName),
+                                                          darwinUSBDetachNotification,
+                                                          pNotify,
+                                                          &pNotify->DetachIterator);
+                    {
+                        darwinDrainIterator(pNotify->DetachIterator);
+                        return pNotify;
+                    }
+                    IOObjectRelease(pNotify->AttachIterator2);
                 }
                 IOObjectRelease(pNotify->AttachIterator);
@@ -331 +342 @@
     IOObjectRelease(pNotify->AttachIterator);
     pNotify->AttachIterator = NULL;
+    IOObjectRelease(pNotify->AttachIterator2);
+    pNotify->AttachIterator2 = NULL;
     IOObjectRelease(pNotify->DetachIterator);
     pNotify->DetachIterator = NULL;

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

@@ -237 +237 @@
     /** The opaque value returned by DarwinSubscribeUSBNotifications. */
     void *mNotifyOpaque;
+    /** A hack to work around the problem with the usb device enumration 
+     * not including newly attached devices. */
+    bool mWaitABitNextTime;
 };
 # endif /* __DARWIN__ */