Loading...
iokit/bsddev/IOKitBSDInit.cpp xnu-2050.9.2 xnu-792
--- xnu/xnu-2050.9.2/iokit/bsddev/IOKitBSDInit.cpp
+++ xnu/xnu-792/iokit/bsddev/IOKitBSDInit.cpp
@@ -1,34 +1,27 @@
 /*
- * Copyright (c) 1998-2011 Apple Inc. All rights reserved.
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * @APPLE_LICENSE_HEADER_START@
  * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
  * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
  * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ * @APPLE_LICENSE_HEADER_END@
  */
 #include <IOKit/IOBSD.h>
 #include <IOKit/IOLib.h>
 #include <IOKit/IOService.h>
-#include <IOKit/IOCatalogue.h>
 #include <IOKit/IODeviceTreeSupport.h>
 #include <IOKit/IOKitKeys.h>
 #include <IOKit/IOPlatformExpert.h>
@@ -37,89 +30,19 @@
 
 #include <pexpert/pexpert.h>
 #include <kern/clock.h>
-#include <uuid/uuid.h>
 
 // how long to wait for matching root device, secs
-#if DEBUG
-#define ROOTDEVICETIMEOUT       120
-#else
-#define ROOTDEVICETIMEOUT       60
-#endif
-
-extern dev_t mdevadd(int devid, uint64_t base, unsigned int size, int phys);
+#define ROOTDEVICETIMEOUT	60
+
+extern dev_t mdevadd(int devid, ppnum_t base, unsigned int size, int phys);
 extern dev_t mdevlookup(int devid);
-extern void mdevremoveall(void);
-extern void di_root_ramfile(IORegistryEntry * entry);
 
 kern_return_t
 IOKitBSDInit( void )
 {
     IOService::publishResource("IOBSD");
-
+ 
     return( kIOReturnSuccess );
-}
-
-void
-IOServicePublishResource( const char * property, boolean_t value )
-{
-    if ( value)
-        IOService::publishResource( property, kOSBooleanTrue );
-    else
-        IOService::getResourceService()->removeProperty( property );
-}
-
-boolean_t
-IOServiceWaitForMatchingResource( const char * property, uint64_t timeout )
-{
-    OSDictionary *	dict = 0;
-    IOService *         match = 0;
-    boolean_t		found = false;
-    
-    do {
-        
-        dict = IOService::resourceMatching( property );
-        if( !dict)
-            continue;
-        match = IOService::waitForMatchingService( dict, timeout );
-        if ( match)
-            found = true;
-        
-    } while( false );
-    
-    if( dict)
-        dict->release();
-    if( match)
-        match->release();
-    
-    return( found );
-}
-
-boolean_t
-IOCatalogueMatchingDriversPresent( const char * property )
-{
-    OSDictionary *	dict = 0;
-    OSOrderedSet *	set = 0;
-    SInt32		generationCount = 0;
-    boolean_t		found = false;
-    
-    do {
-        
-        dict = OSDictionary::withCapacity(1);
-        if( !dict)
-            continue;
-        dict->setObject( property, kOSBooleanTrue );
-        set = gIOCatalogue->findDrivers( dict, &generationCount );
-        if ( set && (set->getCount() > 0))
-            found = true;
-        
-    } while( false );
-    
-    if( dict)
-        dict->release();
-    if( set)
-        set->release();
-    
-    return( found );
 }
 
 OSDictionary * IOBSDNameMatching( const char * name )
@@ -155,13 +78,90 @@
     return IOService::resourceMatching( "boot-uuid-media" );
 }
 
+
+OSDictionary * IOCDMatching( void )
+{
+    OSDictionary *	dict;
+    const OSSymbol *	str;
+    
+    dict = IOService::serviceMatching( "IOMedia" );
+    if( dict == 0 ) {
+        IOLog("Unable to find IOMedia\n");
+        return 0;
+    }
+    
+    str = OSSymbol::withCString( "CD_ROM_Mode_1" );
+    if( str == 0 ) {
+        dict->release();
+        return 0;
+    }
+    
+    dict->setObject( "Content Hint", (OSObject *)str );
+    str->release();        
+    return( dict );
+}
+
+OSDictionary * IONetworkMatching(  const char * path,
+				   char * buf, int maxLen )
+{
+    OSDictionary *	matching = 0;
+    OSDictionary *	dict;
+    OSString *		str;
+    char *		comp;
+    const char *	skip;
+    int			len;
+
+    do {
+
+	len = strlen( kIODeviceTreePlane ":" );
+	maxLen -= len;
+	if( maxLen < 0)
+	    continue;
+
+	strcpy( buf, kIODeviceTreePlane ":" );
+	comp = buf + len;
+
+        // remove parameters following ':' from the path
+        skip = strchr( path, ':');
+	if( !skip)
+	    continue;
+
+        len = skip - path;
+	maxLen -= len;
+	if( maxLen < 0)
+	    continue;
+        strncpy( comp, path, len );
+        comp[ len ] = 0;
+
+	matching = IOService::serviceMatching( "IONetworkInterface" );
+	if( !matching)
+	    continue;
+	dict = IOService::addLocation( matching );
+	if( !dict)
+	    continue;
+
+	str = OSString::withCString( buf );
+	if( !str)
+	    continue;
+        dict->setObject( kIOPathMatchKey, str );
+	str->release();
+
+	return( matching );
+
+    } while( false );
+
+    if( matching)
+        matching->release();
+
+    return( 0 );
+}
+
 OSDictionary * IONetworkNamePrefixMatching( const char * prefix )
 {
     OSDictionary *	 matching;
     OSDictionary *   propDict = 0;
     const OSSymbol * str      = 0;
-	char networkType[128];
-	
+
     do {
         matching = IOService::serviceMatching( "IONetworkInterface" );
         if ( matching == 0 )
@@ -178,18 +178,6 @@
         propDict->setObject( "IOInterfaceNamePrefix", (OSObject *) str );
         str->release();
         str = 0;
-
-		// see if we're contrained to netroot off of specific network type
-		if(PE_parse_boot_argn( "network-type", networkType, 128 ))
-		{
-			str = OSSymbol::withCString( networkType );
-			if(str)
-			{
-				propDict->setObject( "IONetworkRootType", str);
-				str->release();
-				str = 0;
-			}
-		}
 
         if ( matching->setObject( gIOPropertyMatchKey,
                                   (OSObject *) propDict ) != true )
@@ -262,6 +250,88 @@
 	return ( netif->getProperty( kIOBSDNameKey ) != 0 );
 }
 
+OSDictionary * IODiskMatching( const char * path, char * buf, int maxLen )
+{
+    const char * look;
+    const char * alias;
+    char *       comp;
+    long         unit = -1;
+    long         partition = -1;
+    long		 lun = -1;
+    char         c;
+
+    // scan the tail of the path for "@unit:partition"
+    do {
+        // Have to get the full path to the controller - an alias may
+        // tell us next to nothing, like "hd:8"
+        alias = IORegistryEntry::dealiasPath( &path, gIODTPlane );
+		
+        look = path + strlen( path);
+        c = ':';
+        while( look != path) {
+            if( *(--look) == c) {
+                if( c == ':') {
+                    partition = strtol( look + 1, 0, 0 );
+                    c = '@';
+                } else if( c == '@') {
+                    unit = strtol( look + 1, &comp, 16 );
+
+                    if( *comp == ',') {
+                        lun = strtol( comp + 1, 0, 16 );
+                    }
+                    
+                    c = '/';
+                } else if( c == '/') {
+                    c = 0;
+                    break;
+                }
+            }
+
+	        if( alias && (look == path)) {
+                path = alias;
+                look = path + strlen( path);
+                alias = 0;
+            }
+        }
+        if( c || unit == -1 || partition == -1)
+            continue;
+		
+        maxLen -= strlen( "{" kIOPathMatchKey "='" kIODeviceTreePlane ":" );
+        maxLen -= ( alias ? strlen( alias ) : 0 ) + (look - path);
+        maxLen -= strlen( "/@hhhhhhhh,hhhhhhhh:dddddddddd';}" );
+
+        if( maxLen > 0) {
+            sprintf( buf, "{" kIOPathMatchKey "='" kIODeviceTreePlane ":" );
+            comp = buf + strlen( buf );
+			
+            if( alias) {
+                strcpy( comp, alias );
+                comp += strlen( alias );
+            }
+			
+            if ( (look - path)) {
+                strncpy( comp, path, look - path);
+                comp += look - path;
+            }
+			
+			if ( lun != -1 )
+			{
+				sprintf ( comp, "/@%lx,%lx:%ld';}", unit, lun, partition );
+			}
+			else
+			{
+            	sprintf( comp, "/@%lx:%ld';}", unit, partition );
+            }
+        } else
+            continue;
+		
+        return( OSDynamicCast(OSDictionary, OSUnserialize( buf, 0 )) );
+
+    } while( false );
+
+    return( 0 );
+}
+
 OSDictionary * IOOFPathMatching( const char * path, char * buf, int maxLen )
 {
     OSDictionary *	matching;
@@ -269,21 +339,29 @@
     char *		comp;
     int			len;
 
+    /* need to look up path, get device type,
+        call matching help based on device type */
+
+    matching = IODiskMatching( path, buf, maxLen );
+    if( matching)
+	return( matching );
+
     do {
 
 	len = strlen( kIODeviceTreePlane ":" );
 	maxLen -= len;
-	if( maxLen <= 0)
-	    continue;
-
-	strlcpy( buf, kIODeviceTreePlane ":", len + 1 );
+	if( maxLen < 0)
+	    continue;
+
+	strcpy( buf, kIODeviceTreePlane ":" );
 	comp = buf + len;
 
 	len = strlen( path );
 	maxLen -= len;
-	if( maxLen <= 0)
-	    continue;
-	strlcpy( comp, path, len + 1 );
+	if( maxLen < 0)
+	    continue;
+        strncpy( comp, path, len );
+        comp[ len ] = 0;
 
 	matching = OSDictionary::withCapacity( 1 );
 	if( !matching)
@@ -305,9 +383,45 @@
     return( 0 );
 }
 
+IOService * IOFindMatchingChild( IOService * service )
+{
+    // find a matching child service
+    IOService * child = 0;
+    OSIterator * iter = service->getClientIterator();
+    if ( iter ) {
+        while( ( child = (IOService *) iter->getNextObject() ) ) {
+            OSDictionary * dict = OSDictionary::withCapacity( 1 );
+            if( dict == 0 ) {
+                iter->release();
+                return 0;
+            }
+            const OSSymbol * str = OSSymbol::withCString( "Apple_HFS" );
+            if( str == 0 ) {
+                dict->release();
+                iter->release();
+                return 0;
+            }
+            dict->setObject( "Content", (OSObject *)str );
+            str->release();
+            if ( child->compareProperty( dict, "Content" ) ) {
+                dict->release();
+                break;
+            }
+            dict->release();
+            IOService * subchild = IOFindMatchingChild( child );
+            if ( subchild ) {
+                child = subchild;
+                break;
+            }
+        }
+        iter->release();
+    }
+    return child;
+}
+
 static int didRam = 0;
 
-kern_return_t IOFindBSDRoot( char * rootName, unsigned int rootNameSize,
+kern_return_t IOFindBSDRoot( char * rootName,
 				dev_t * root, u_int32_t * oflags )
 {
     mach_timespec_t	t;
@@ -317,15 +431,18 @@
     OSString *		iostr;
     OSNumber *		off;
     OSData *		data = 0;
+    UInt32		*ramdParms = 0;
 
     UInt32		flags = 0;
-    int			mnr, mjr;
-    const char *        mediaProperty = 0;
+    int			minor, major;
+    bool		findHFSChild = false;
+    char *              mediaProperty = 0;
     char *		rdBootVar;
     enum {		kMaxPathBuf = 512, kMaxBootVar = 128 };
     char *		str;
     const char *	look = 0;
     int			len;
+    bool		forceNet = false;
     bool		debugInfoPrintedOnce = false;
     const char * 	uuidStr = NULL;
 
@@ -342,21 +459,12 @@
 	return( kIOReturnNoMemory );
     rdBootVar = str + kMaxPathBuf;
 
-    if (!PE_parse_boot_argn("rd", rdBootVar, kMaxBootVar )
-     && !PE_parse_boot_argn("rootdev", rdBootVar, kMaxBootVar ))
+    if (!PE_parse_boot_arg("rd", rdBootVar )
+     && !PE_parse_boot_arg("rootdev", rdBootVar ))
 	rdBootVar[0] = 0;
 
     do {
 	if( (regEntry = IORegistryEntry::fromPath( "/chosen", gIODTPlane ))) {
-	    di_root_ramfile(regEntry);
-            data = OSDynamicCast(OSData, regEntry->getProperty( "root-matching" ));
-            if (data) {
-               matching = OSDynamicCast(OSDictionary, OSUnserializeXML((char *)data->getBytesNoCopy()));
-                if (matching) {
-                    continue;
-                }
-            }
-
 	    data = (OSData *) regEntry->getProperty( "boot-uuid" );
 	    if( data) {
 		uuidStr = (const char*)data->getBytesNoCopy();
@@ -375,9 +483,33 @@
 		    uuidStr = NULL;
 		}
 	    }
+
+	    // else try for an OF Path
+	    data = (OSData *) regEntry->getProperty( "rootpath" );
 	    regEntry->release();
+	    if( data) continue;
+	}
+        if( (regEntry = IORegistryEntry::fromPath( "/options", gIODTPlane ))) {
+	    data = (OSData *) regEntry->getProperty( "boot-file" );
+	    regEntry->release();
+	    if( data) continue;
 	}
     } while( false );
+
+    if( data && !uuidStr)
+        look = (const char *) data->getBytesNoCopy();
+
+    if( rdBootVar[0] == '*') {
+        look = rdBootVar + 1;
+		forceNet = false;
+    } else {
+        if( (regEntry = IORegistryEntry::fromPath( "/", gIODTPlane ))) {
+            forceNet = (0 != regEntry->getProperty( "net-boot" ));
+	    	regEntry->release();
+		}
+    }
+
+
 
 //
 //	See if we have a RAMDisk property in /chosen/memory-map.  If so, make it into a device.
@@ -389,9 +521,9 @@
 		if((regEntry = IORegistryEntry::fromPath( "/chosen/memory-map", gIODTPlane ))) {	/* Find the map node */
 			data = (OSData *)regEntry->getProperty("RAMDisk");	/* Find the ram disk, if there */
 			if(data) {											/* We found one */
-				UInt32		*ramdParms = 0;
+
 				ramdParms = (UInt32 *)data->getBytesNoCopy();	/* Point to the ram disk base and size */
-				(void)mdevadd(-1, ml_static_ptovirt(ramdParms[0]) >> 12, ramdParms[1] >> 12, 0);	/* Initialize it and pass back the device number */
+				(void)mdevadd(-1, ramdParms[0] >> 12, ramdParms[1] >> 12, 0);	/* Initialize it and pass back the device number */
 			}
 			regEntry->release();								/* Toss the entry */
 		}
@@ -428,6 +560,17 @@
 		}
 	}
 
+    if( look) {
+	// from OpenFirmware path
+	IOLog("From path: \"%s\", ", look);
+
+	if( forceNet || (0 == strncmp( look, "enet", strlen( "enet" ))) ) {
+            matching = IONetworkMatching( look, str, kMaxPathBuf );
+        } else {
+            matching = IODiskMatching( look, str, kMaxPathBuf );
+        }
+    }
+    
       if( (!matching) && rdBootVar[0] ) {
 	// by BSD name
 	look = rdBootVar;
@@ -436,14 +579,17 @@
     
 	if ( strncmp( look, "en", strlen( "en" )) == 0 ) {
 	    matching = IONetworkNamePrefixMatching( "en" );
-	} else if ( strncmp( look, "uuid", strlen( "uuid" )) == 0 ) {
+	} else if ( strncmp( look, "cdrom", strlen( "cdrom" )) == 0 ) {
+            matching = IOCDMatching();
+            findHFSChild = true;
+        } else if ( strncmp( look, "uuid", strlen( "uuid" )) == 0 ) {
             char *uuid;
             OSString *uuidString;
 
             uuid = (char *)IOMalloc( kMaxBootVar );
                   
             if ( uuid ) {
-                if (!PE_parse_boot_argn( "boot-uuid", uuid, kMaxBootVar )) {
+                if (!PE_parse_boot_arg( "boot-uuid", uuid )) {
                     panic( "rd=uuid but no boot-uuid=<value> specified" ); 
                 } 
                 uuidString = OSString::withCString( uuid );
@@ -462,9 +608,8 @@
     }
 
     if( !matching) {
-	OSString * astring;
-	// Match any HFS media
-	
+        OSString * astring;
+	// any HFS
         matching = IOService::serviceMatching( "IOMedia" );
         astring = OSString::withCStringNoCopy("Apple_HFS");
         if ( astring ) {
@@ -508,12 +653,27 @@
     } while( !service);
     matching->release();
 
-    if ( service && mediaProperty ) {
-        service = (IOService *)service->getProperty(mediaProperty);
-    }
-
-    mjr = 0;
-    mnr = 0;
+    if ( service && findHFSChild ) {
+        bool waiting = true;
+        // wait for children services to finish registering
+        while ( waiting ) {
+            t.tv_sec = ROOTDEVICETIMEOUT;
+            t.tv_nsec = 0;
+            if ( service->waitQuiet( &t ) == kIOReturnSuccess ) {
+                waiting = false;
+            } else {
+                IOLog( "Waiting for child registration\n" );
+            }
+        }
+        // look for a subservice with an Apple_HFS child
+        IOService * subservice = IOFindMatchingChild( service );
+        if ( subservice ) service = subservice;
+    } else if ( service && mediaProperty ) {
+        service = service->getProperty(mediaProperty);
+    }
+
+    major = 0;
+    minor = 0;
 
     // If the IOService we matched to is a subclass of IONetworkInterface,
     // then make sure it has been registered with BSD and has a BSD name
@@ -534,13 +694,13 @@
 
 	iostr = (OSString *) service->getProperty( kIOBSDNameKey );
 	if( iostr)
-	    strlcpy( rootName, iostr->getCStringNoCopy(), rootNameSize );
+	    strcpy( rootName, iostr->getCStringNoCopy() );
 	off = (OSNumber *) service->getProperty( kIOBSDMajorKey );
 	if( off)
-	    mjr = off->unsigned32BitValue();
+	    major = off->unsigned32BitValue();
 	off = (OSNumber *) service->getProperty( kIOBSDMinorKey );
 	if( off)
-	    mnr = off->unsigned32BitValue();
+	    minor = off->unsigned32BitValue();
 
 	if( service->metaCast( "IONetworkInterface" ))
 	    flags |= 1;
@@ -548,17 +708,17 @@
     } else {
 
 	IOLog( "Wait for root failed\n" );
-        strlcpy( rootName, "en0", rootNameSize );
+        strcpy( rootName, "en0");
         flags |= 1;
     }
 
     IOLog( "BSD root: %s", rootName );
-    if( mjr)
-	IOLog(", major %d, minor %d\n", mjr, mnr );
+    if( major)
+	IOLog(", major %d, minor %d\n", major, minor );
     else
 	IOLog("\n");
 
-    *root = makedev( mjr, mnr );
+    *root = makedev( major, minor );
     *oflags = flags;
 
     IOFree( str,  kMaxPathBuf + kMaxBootVar );
@@ -582,25 +742,6 @@
     return( kIOReturnSuccess );
 }
 
-void IOSecureBSDRoot(const char * rootName)
-{
-#if CONFIG_EMBEDDED
-    IOReturn         result;
-    IOPlatformExpert *pe;
-    const OSSymbol   *functionName = OSSymbol::withCStringNoCopy("SecureRootName");
-    
-    while ((pe = IOService::getPlatform()) == 0) IOSleep(1 * 1000);
-    
-    // Returns kIOReturnNotPrivileged is the root device is not secure.
-    // Returns kIOReturnUnsupported if "SecureRootName" is not implemented.
-    result = pe->callPlatformFunction(functionName, false, (void *)rootName, (void *)0, (void *)0, (void *)0);
-    
-    functionName->release();
-    
-    if (result == kIOReturnNotPrivileged) mdevremoveall();
-#endif
-}
-
 void *
 IOBSDRegistryEntryForDeviceTree(char * path)
 {
@@ -632,172 +773,4 @@
     return (NULL);
 }
 
-kern_return_t IOBSDGetPlatformUUID( uuid_t uuid, mach_timespec_t timeout )
-{
-    IOService * resources;
-    OSString *  string;
-
-    resources = IOService::waitForService( IOService::resourceMatching( kIOPlatformUUIDKey ), ( timeout.tv_sec || timeout.tv_nsec ) ? &timeout : 0 );
-    if ( resources == 0 ) return KERN_OPERATION_TIMED_OUT;
-
-    string = ( OSString * ) IOService::getPlatform( )->getProvider( )->getProperty( kIOPlatformUUIDKey );
-    if ( string == 0 ) return KERN_NOT_SUPPORTED;
-
-    uuid_parse( string->getCStringNoCopy( ), uuid );
-
-    return KERN_SUCCESS;
-}
-
-kern_return_t IOBSDGetPlatformSerialNumber( char *serial_number_str, u_int32_t len )
-{
-    OSDictionary * platform_dict;
-    IOService *platform;
-    OSString *  string;
-
-    if (len < 1) {
-	    return 0;
-    }
-    serial_number_str[0] = '\0';
-
-    platform_dict = IOService::serviceMatching( "IOPlatformExpertDevice" );
-    if (platform_dict == NULL) {
-	    return KERN_NOT_SUPPORTED;
-    }
-
-    platform = IOService::waitForService( platform_dict );
-    if (platform) {
-	    string = ( OSString * ) platform->getProperty( kIOPlatformSerialNumberKey );
-	    if ( string == 0 ) {
-		    return KERN_NOT_SUPPORTED;
-	    } else {
-		    strlcpy( serial_number_str, string->getCStringNoCopy( ), len );
-	    }
-    }
-    
-    return KERN_SUCCESS;
-}
-
-dev_t IOBSDGetMediaWithUUID( const char *uuid_cstring, char *bsd_name, int bsd_name_len, int timeout)
-{
-    dev_t dev = 0;
-    OSDictionary *dictionary;
-    OSString *uuid_string;
-
-    if (bsd_name_len < 1) {
-	return 0;
-    }
-    bsd_name[0] = '\0';
-    
-    dictionary = IOService::serviceMatching( "IOMedia" );
-    if( dictionary ) {
-	uuid_string = OSString::withCString( uuid_cstring );
-	if( uuid_string ) {
-	    IOService *service;
-	    mach_timespec_t tv = { timeout, 0 };    // wait up to "timeout" seconds for the device
-
-	    dictionary->setObject( "UUID", uuid_string );
-	    dictionary->retain();
-	    service = IOService::waitForService( dictionary, &tv );
-	    if( service ) {
-		OSNumber *dev_major = (OSNumber *) service->getProperty( kIOBSDMajorKey );
-		OSNumber *dev_minor = (OSNumber *) service->getProperty( kIOBSDMinorKey );
-		OSString *iostr = (OSString *) service->getProperty( kIOBSDNameKey );
-
-		if( iostr)
-		    strlcpy( bsd_name, iostr->getCStringNoCopy(), bsd_name_len );
-
-		if ( dev_major && dev_minor )
-		    dev = makedev( dev_major->unsigned32BitValue(), dev_minor->unsigned32BitValue() );
-	    }
-	    uuid_string->release();
-	}
-	dictionary->release();
-    }
-
-    return dev;
-}
-
-
-void IOBSDIterateMediaWithContent(const char *content_uuid_cstring, int (*func)(const char *bsd_dev_name, const char *uuid_str, void *arg), void *arg)
-{
-    OSDictionary *dictionary;
-    OSString *content_uuid_string;
-
-    dictionary = IOService::serviceMatching( "IOMedia" );
-    if( dictionary ) {
-	content_uuid_string = OSString::withCString( content_uuid_cstring );
-	if( content_uuid_string ) {
-	    IOService *service;
-	    OSIterator *iter;
-
-	    dictionary->setObject( "Content", content_uuid_string );
-	    dictionary->retain();
-
-	    iter = IOService::getMatchingServices(dictionary);
-	    while (iter && (service = (IOService *)iter->getNextObject())) {
-		    if( service ) {
-			    OSString *iostr = (OSString *) service->getProperty( kIOBSDNameKey );
-			    OSString *uuidstr = (OSString *) service->getProperty( "UUID" );
-			    const char *uuid;
-
-			    if( iostr) {
-				    if (uuidstr) {
-					    uuid = uuidstr->getCStringNoCopy();
-				    } else {
-					    uuid = "00000000-0000-0000-0000-000000000000";
-				    }
-
-				    // call the callback
-				    if (func && func(iostr->getCStringNoCopy(), uuid, arg) == 0) {
-					    break;
-				    }
-			    }
-		    }
-	    }
-	    if (iter)
-		    iter->release();
-	    
-	    content_uuid_string->release();
-	}
-	dictionary->release();
-    }
-}
-
-
-int IOBSDIsMediaEjectable( const char *cdev_name )
-{
-    int ret = 0;
-    OSDictionary *dictionary;
-    OSString *dev_name;
-
-    if (strncmp(cdev_name, "/dev/", 5) == 0) {
-	    cdev_name += 5;
-    }
-
-    dictionary = IOService::serviceMatching( "IOMedia" );
-    if( dictionary ) {
-	dev_name = OSString::withCString( cdev_name );
-	if( dev_name ) {
-	    IOService *service;
-	    mach_timespec_t tv = { 5, 0 };    // wait up to "timeout" seconds for the device
-
-	    dictionary->setObject( kIOBSDNameKey, dev_name );
-	    dictionary->retain();
-	    service = IOService::waitForService( dictionary, &tv );
-	    if( service ) {
-		OSBoolean *ejectable = (OSBoolean *) service->getProperty( "Ejectable" );
-
-		if( ejectable ) {
-			ret = (int)ejectable->getValue();
-		}
-
-	    }
-	    dev_name->release();
-	}
-	dictionary->release();
-    }
-
-    return ret;
-}
-
 } /* extern "C" */