Changeset 11098 in vbox for trunk/src/VBox

Timestamp:

Aug 4, 2008 12:46:44 PM (17 years ago)

Author:

vboxsync

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

34021

Message:

Main: Made the HIF enumeration a bit less strict on the MAC. Both CFBundleIdentifier and IOProviderClass is missing on the yukon driver on the iMac/7.1 here.

File:

• trunk/src/VBox/Main/darwin/iokit.cpp (modified) (1 diff)

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

@@ -1462 +1462 @@
                     {
                         /* Check if airport (a bit heuristical - it's com.apple.driver.AirPortBrcm43xx here). */
-                        AssertBreak(darwinDictGetString(PropsRef, CFSTR("CFBundleIdentifier"), szTmp, sizeof(szTmp)));
+                        darwinDictGetString(PropsRef, CFSTR("CFBundleIdentifier"), szTmp, sizeof(szTmp));
                         bool fWireless;
                         bool fAirPort = fWireless = strstr(szTmp, ".AirPort") != NULL;
 
                         /* Check if it's USB. */
-                        AssertBreak(darwinDictGetString(PropsRef, CFSTR("IOProviderClass"), szTmp, sizeof(szTmp)));
+                        darwinDictGetString(PropsRef, CFSTR("IOProviderClass"), szTmp, sizeof(szTmp));
                         bool fUSB = strstr(szTmp, "USB") != NULL;
+
+
+                        /* Is it builtin? */
+                        bool fBuiltin;
+                        darwinDictGetBool(IfPropsRef, CFSTR("IOBuiltin"), &fBuiltin);
+
+                        /* Is it the primary interface  */
+                        bool fPrimaryIf;
+                        darwinDictGetBool(IfPropsRef, CFSTR("IOPrimaryInterface"), &fPrimaryIf);
 
                         /* Get the MAC address. */
                         PDMMAC Mac;
                         AssertBreak(darwinDictGetData(PropsRef, CFSTR("IOMACAddress"), &Mac, sizeof(Mac)));
-
-                        /* Is it builtin? */
-                        bool fBuiltin;
-                        AssertBreak(darwinDictGetBool(IfPropsRef, CFSTR("IOBuiltin"), &fBuiltin));
-
-                        /* Is it the primary interface  */
-                        bool fPrimaryIf;
-                        AssertBreak(darwinDictGetBool(IfPropsRef, CFSTR("IOPrimaryInterface"), &fPrimaryIf));
 
                         /* The BSD Name from the interface dictionary. */