--- xnu/xnu-1228.0.2/iokit/bsddev/IOKitBSDInit.cpp
+++ xnu/xnu-792.22.5/iokit/bsddev/IOKitBSDInit.cpp
@@ -36,7 +36,6 @@
 
 #include <pexpert/pexpert.h>
 #include <kern/clock.h>
-#include <uuid/uuid.h>
 
 // how long to wait for matching root device, secs
 #define ROOTDEVICETIMEOUT	60
@@ -168,8 +167,7 @@
     OSDictionary *	 matching;
     OSDictionary *   propDict = 0;
     const OSSymbol * str      = 0;
-	char networkType[128];
-	
+
     do {
         matching = IOService::serviceMatching( "IONetworkInterface" );
         if ( matching == 0 )
@@ -186,18 +184,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 )
@@ -454,7 +440,7 @@
     UInt32		*ramdParms = 0;
 
     UInt32		flags = 0;
-    int			mnr, mjr;
+    int			minor, major;
     bool		findHFSChild = false;
     char *              mediaProperty = 0;
     char *		rdBootVar;
@@ -479,8 +465,8 @@
 	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 {
@@ -619,7 +605,7 @@
             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 );
@@ -638,9 +624,8 @@
     }
 
     if( !matching) {
-	OSString * astring;
-	// Match any HFS media
-	
+        OSString * astring;
+	// any HFS
         matching = IOService::serviceMatching( "IOMedia" );
         astring = OSString::withCStringNoCopy("Apple_HFS");
         if ( astring ) {
@@ -703,8 +688,8 @@
         service = (IOService *)service->getProperty(mediaProperty);
     }
 
-    mjr = 0;
-    mnr = 0;
+    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
@@ -728,10 +713,10 @@
 	    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;
@@ -744,12 +729,12 @@
     }
 
     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 );
@@ -773,20 +758,6 @@
     return( kIOReturnSuccess );
 }
 
-void IOSecureBSDRoot(const char * rootName)
-{
-#if CONFIG_EMBEDDED
-    IOPlatformExpert *pe;
-    const OSSymbol *functionName = OSSymbol::withCStringNoCopy("SecureRootName");
-    
-    while ((pe = IOService::getPlatform()) == 0) IOSleep(1 * 1000);
-    
-    pe->callPlatformFunction(functionName, false, (void *)rootName, (void *)0, (void *)0, (void *)0);
-    
-    functionName->release();
-#endif
-}
-
 void *
 IOBSDRegistryEntryForDeviceTree(char * path)
 {
@@ -818,20 +789,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 );
-    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;
-}
-
 } /* extern "C" */