Changeset 3662 in vbox for trunk/src/VBox/Main/darwin

Timestamp:

Jul 17, 2007 1:22:40 AM (17 years ago)

Author:

vboxsync

Message:

Fixed memory leak (hubs).

Location:

trunk/src/VBox/Main/darwin

Files:

• iokit.cpp (modified) (6 diffs, 1 prop)
• iokit.h (modified) (4 diffs, 1 prop)

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

@@ -1 @@
-/** $Id: $ */
+/* $Id$ */
 /** @file
  * Main - Darwin IOKit Routines.
@@ -548 +548 @@
 
 /**
+ * Worker function for DarwinGetUSBDevices() that tries to figure out
+ * what state the device is in.
+ *
+ * This is mostly a matter of distinguishing between devices that nobody
+ * uses, devices that can be seized and devices that cannot be grabbed.
+ *
+ * @param   pCur        The USB device data.
+ * @param   USBDevice   The USB device object.
+ * @param   PropsRef    The USB device properties.
+ */
+static void darwinDeterminUSBDeviceState(PUSBDEVICE pCur, io_object_t USBDevice, CFMutableDictionaryRef PropsRef)
+{
+    ///@todo
+}
+
+
+/**
  * Enumerate the USB devices returning a FIFO of them.
  *
@@ -604 +621 @@
                  */
                 pCur->bcdUSB = 0;                                           /* we've no idea. */
-                pCur->enmState = USBDEVICESTATE_USED_BY_HOST_CAPTURABLE;    /* ditto. */
+                pCur->enmState = USBDEVICESTATE_USED_BY_HOST_CAPTURABLE;    /* just a default, we'll try harder in a bit. */
 
                 AssertBreak(darwinDictGetU8(PropsRef,  CFSTR(kUSBDeviceClass),           &pCur->bDeviceClass),);
@@ -667 +684 @@
                 }
 #endif
+                /*
+                 * Try determin the state.
+                 */
+                darwinDeterminUSBDeviceState(pCur, USBDevice, PropsRef);
 
                 /*
@@ -681 +702 @@
             /* cleanup on failure / skipped device. */
             if (!fOk && pCur)
-            {
-                /** @todo */
-            }
+                DarwinFreeUSBDeviceFromIOKit(pCur);
 
             CFRelease(PropsRef);
@@ -704 +723 @@
      * take the first one from another vendor.
      */
+    /* As it turns out, the HID service will take all keyboards and mice
+       and we're not currently able to seize them. */
     PUSBDEVICE pMouse = NULL;
     PUSBDEVICE pKeyboard = NULL;

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

@@ -1 @@
-/** $Id: $ */
+/* $Id$ */
 /** @file
  * Main - Darwin IOKit Routines.
@@ -27 +27 @@
 #ifdef VBOX_WITH_USB
 # include <VBox/usb.h>
-#endif 
+#endif
 
 /**
@@ -40 +40 @@
 } DARWINDVD, *PDARWINDVD;
 
-/** The run loop mode string used by iokit.cpp when it registers 
+/** The run loop mode string used by iokit.cpp when it registers
  * notifications events. */
 #define VBOX_IOKIT_MODE_STRING "VBoxIOKitMode"
@@ -50 +50 @@
 void        DarwinUnsubscribeUSBNotifications(void *pvOpaque);
 PUSBDEVICE  DarwinGetUSBDevices(void);
+void        DarwinFreeUSBDeviceFromIOKit(PUSBDEVICE pCur);
 #endif
 __END_DECLS