Changeset 51578 in vbox for trunk/src/VBox

Timestamp:

Jun 9, 2014 9:45:16 AM (11 years ago)

Author:

vboxsync

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

94273

Message:

Mac OS X host: improve support for host optical drives; add support for CD and BlueRay drives.

Location:

trunk/src/VBox

Files:

• Devices/Storage/DrvHostBase.cpp (modified) (2 diffs)
• Main/src-server/darwin/iokit.cpp (modified) (3 diffs)

trunk/src/VBox/Devices/Storage/DrvHostBase.cpp

@@ -794 +794 @@
 
     /*
-     * Create a matching dictionary for searching for DVD services in the IOKit.
+     * Create a matching dictionary for searching for CD, DVD and BlueRay services in the IOKit.
      *
-     * [If I understand this correctly, plain CDROMs doesn't show up as
-     * IODVDServices. Too keep things simple, we will only support DVDs
-     * until somebody complains about it and we get hardware to test it on.
-     * (Unless I'm much mistaken, there aren't any (orignal) intel macs with
-     * plain cdroms.)]
-     */
-    CFMutableDictionaryRef RefMatchingDict = IOServiceMatching("IODVDServices");
+     * The idea is to find all the devices which are of class IOCDBlockStorageDevice.
+     * CD devices are represented by IOCDBlockStorageDevice class itself, while DVD and BlueRay ones
+     * have it as a parent class.
+     */
+    CFMutableDictionaryRef RefMatchingDict = IOServiceMatching("IOCDBlockStorageDevice");
     AssertReturn(RefMatchingDict, NULL);
 
@@ -814 +812 @@
 
     /*
-     * Enumerate the DVD drives (services).
-     * (This enumeration must be identical to the one performed in DrvHostBase.cpp.)
+     * Enumerate the matching drives (services).
+     * (This enumeration must be identical to the one performed in Main/src-server/darwin/iokit.cpp.)
      */
     int rc = VERR_FILE_NOT_FOUND;

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

@@ -1276 +1276 @@
 
 /**
- * Enumerate the DVD drives returning a FIFO of device name strings.
+ * Enumerate the CD, DVD and BlueRay drives returning a FIFO of device name strings.
  *
  * @returns Pointer to the head.
@@ -1286 +1286 @@
 
     /*
-     * Create a matching dictionary for searching for DVD services in the IOKit.
+     * Create a matching dictionary for searching for CD, DVD and BlueRay services in the IOKit.
      *
-     * [If I understand this correctly, plain CDROMs doesn't show up as
-     * IODVDServices. Too keep things simple, we will only support DVDs
-     * until somebody complains about it and we get hardware to test it on.
-     * (Unless I'm much mistaken, there aren't any (orignal) intel macs with
-     * plain cdroms.)]
+     * The idea is to find all the devices which are of class IOCDBlockStorageDevice.
+     * CD devices are represented by IOCDBlockStorageDevice class itself, while DVD and BlueRay ones
+     * have it as a parent class.
      */
-    CFMutableDictionaryRef RefMatchingDict = IOServiceMatching("IODVDServices");
+    CFMutableDictionaryRef RefMatchingDict = IOServiceMatching("IOCDBlockStorageDevice");
     AssertReturn(RefMatchingDict, NULL);
 
@@ -1306 +1304 @@
 
     /*
-     * Enumerate the DVD services.
+     * Enumerate the matching services.
      * (This enumeration must be identical to the one performed in DrvHostBase.cpp.)
      */