--- xnu/xnu-1504.9.26/iokit/Kernel/IODeviceTreeSupport.cpp
+++ xnu/xnu-1228/iokit/Kernel/IODeviceTreeSupport.cpp
@@ -91,6 +91,7 @@
     DTEntry			mapEntry;
     OSArray *			stack;
     OSData *			prop;
+    OSObject *			obj;
     OSDictionary *		allInts;
     vm_offset_t *		dtMap;
     unsigned int		propSize;
@@ -143,7 +144,7 @@
     freeDT = (kSuccess == DTLookupEntry( 0, "/chosen/memory-map", &mapEntry ))
 	  && (kSuccess == DTGetProperty( mapEntry,
                 "DeviceTree", (void **) &dtMap, &propSize ))
-	  && ((2 * sizeof(uint32_t)) == propSize);
+	  && ((2 * sizeof(vm_offset_t)) == propSize);
 
     parent = MakeReferenceTable( (DTEntry)dtTop, freeDT );
 
@@ -192,7 +193,7 @@
         // free original device tree
         DTInit(0);
         IODTFreeLoaderInfo( "DeviceTree",
-			    (void *)dtMap[0], (int) round_page(dtMap[1]) );
+			(void *)dtMap[0], round_page_32(dtMap[1]) );
     }
 
     // adjust tree
@@ -209,9 +210,6 @@
             if( !intMap && child->getProperty( gIODTInterruptParentKey))
                 intMap = true;
 
-#if __ppc__
-            OSObject * obj;
-
             // Look for a "driver,AAPL,MacOSX,PowerPC" property.
             if( (obj = child->getProperty( "driver,AAPL,MacOSX,PowerPC"))) {
                 gIOCatalogue->addExtensionsFromArchive((OSData *)obj);
@@ -228,7 +226,6 @@
                     child->removeProperty( "driver,AAPL,MacOS,PowerPC");
                 }
             }
-#endif /* __ppc__ */
         }
         regIter->release();
     }
@@ -311,7 +308,11 @@
 {
     vm_offset_t	virt;
 
+#if defined (__i386__)
+    virt = ml_boot_ptovirt( range[0] );
+#else
     virt = ml_static_ptovirt( range[0] );
+#endif
     if( virt) {
         ml_static_mfree( virt, range[1] );
     }
@@ -382,7 +383,7 @@
     
             } else if(noLocation && (!strncmp(name, "reg", sizeof("reg")))) {
                 // default location - override later
-                snprintf(location, sizeof(location), "%X", *((uint32_t *) prop));
+                snprintf(location, sizeof(location), "%lX", *((UInt32 *) prop));
                 regEntry->setLocation( location );
             }
         }
@@ -434,21 +435,15 @@
         return( false );
 }
 
-static IORegistryEntry * IODTFindInterruptParent( IORegistryEntry * regEntry, IOItemCount index )
+IORegistryEntry * IODTFindInterruptParent( IORegistryEntry * regEntry )
 {
     IORegistryEntry *	parent;
     UInt32		phandle;
-    OSData	    *	data;
-    unsigned int	len;
-
-    if( (data = OSDynamicCast( OSData, regEntry->getProperty( gIODTInterruptParentKey )))
-      && (sizeof(UInt32) <= (len = data->getLength()))) {
-	if (((index + 1) * sizeof(UInt32)) > len)
-	    index = 0;
-	phandle = ((UInt32 *) data->getBytesNoCopy())[index];
-	parent = FindPHandle( phandle );
-
-    } else if( 0 == regEntry->getProperty( "interrupt-controller"))
+
+    if( GetUInt32( regEntry, gIODTInterruptParentKey, &phandle))
+        parent = FindPHandle( phandle );
+
+    else if( 0 == regEntry->getProperty( "interrupt-controller"))
         parent = regEntry->getParentEntry( gIODTPlane);
     else
         parent = 0;
@@ -467,7 +462,7 @@
     assert( ok );
 
     if( ok) {
-        snprintf(buf, sizeof(buf), "IOInterruptController%08X", (uint32_t)phandle);
+        snprintf(buf, sizeof(buf), "IOInterruptController%08lX", phandle);
         sym = OSSymbol::withCString( buf );
     } else
         sym = 0;
@@ -486,8 +481,8 @@
         *aCellCount = 0;
 }
 
-static UInt32 IODTMapOneInterrupt( IORegistryEntry * regEntry, UInt32 * intSpec, UInt32 index,
-				    OSData ** spec, const OSSymbol ** controller )
+UInt32 IODTMapOneInterrupt( IORegistryEntry * regEntry, UInt32 * intSpec,
+				OSData ** spec, const OSSymbol ** controller )
 {
     IORegistryEntry *parent = 0;
     OSData			*data;
@@ -499,7 +494,7 @@
     UInt32			i, original_icells;
     bool			cmp, ok = false;
 
-    parent = IODTFindInterruptParent( regEntry, index );    
+    parent = IODTFindInterruptParent( regEntry );    
     IODTGetICellCounts( parent, &icells, &acells );
     addrCmp = 0;
     if( acells) {
@@ -645,12 +640,11 @@
     OSData *		local2;
     UInt32 *		localBits;
     UInt32 *		localEnd;
-    IOItemCount		index;
     OSData * 		map;
     OSObject *		oneMap;
     OSArray *		mapped;
     OSArray *		controllerInts;
-    const OSSymbol *	controller = 0;
+    const OSSymbol *	controller;
     OSArray *		controllers;
     UInt32		skip = 1;
     bool		ok, nw;
@@ -672,7 +666,6 @@
 
     localBits = (UInt32 *) local->getBytesNoCopy();
     localEnd = localBits + (local->getLength() / sizeof(UInt32));
-    index = 0;
     mapped = OSArray::withCapacity( 1 );
     controllers = OSArray::withCapacity( 1 );
 
@@ -680,7 +673,7 @@
 
     if( ok) do {
         if( nw) {
-            skip = IODTMapOneInterrupt( regEntry, localBits, index, &map, &controller );
+            skip = IODTMapOneInterrupt( regEntry, localBits, &map, &controller );
             if( 0 == skip) {
                 IOLog("%s: error mapping interrupt[%d]\n",
                         regEntry->getName(), mapped->getCount());
@@ -693,7 +686,6 @@
             controller->retain();
         }
 
-	index++;
         localBits += skip;
         mapped->setObject( map );
         controllers->setObject( controller );
@@ -844,7 +836,7 @@
         result = regEntry->compareNames( obj );
 		obj->release();
     }
-#if DEBUG
+#ifdef DEBUG
     else IOLog("Couldn't unserialize %s\n", keys );
 #endif
 
@@ -1100,7 +1092,7 @@
             range = 0;
             if( parent)
                 range = IODeviceMemory::withSubRange( parent,
-                        phys - parent->getPhysicalSegment(0, 0, kIOMemoryMapperNone), len );
+                        phys - parent->getPhysicalAddress(), len );
             if( 0 == range)
                 range = IODeviceMemory::withRange( phys, len );
             if( range)