Loading...
--- xnu/xnu-1699.32.7/iokit/Kernel/IODeviceTreeSupport.cpp
+++ xnu/xnu-1228/iokit/Kernel/IODeviceTreeSupport.cpp
@@ -37,14 +37,12 @@
#include <pexpert/device_tree.h>
-#include <machine/machine_routines.h>
-
extern "C" {
-
-int IODTGetLoaderInfo( const char *key, void **infoAddr, int *infosize );
-void IODTFreeLoaderInfo( const char *key, void *infoAddr, int infoSize );
-int IODTGetDefault(const char *key, void *infoAddr, unsigned int infoSize );
-
+ #include <machine/machine_routines.h>
+ void DTInit( void * data );
+
+ int IODTGetLoaderInfo( char *key, void **infoAddr, int *infosize );
+ void IODTFreeLoaderInfo( char *key, void *infoAddr, int infoSize );
}
#include <IOKit/assert.h>
@@ -93,6 +91,7 @@
DTEntry mapEntry;
OSArray * stack;
OSData * prop;
+ OSObject * obj;
OSDictionary * allInts;
vm_offset_t * dtMap;
unsigned int propSize;
@@ -145,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 );
@@ -194,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
@@ -211,6 +210,22 @@
if( !intMap && child->getProperty( gIODTInterruptParentKey))
intMap = true;
+ // Look for a "driver,AAPL,MacOSX,PowerPC" property.
+ if( (obj = child->getProperty( "driver,AAPL,MacOSX,PowerPC"))) {
+ gIOCatalogue->addExtensionsFromArchive((OSData *)obj);
+ child->removeProperty( "driver,AAPL,MacOSX,PowerPC");
+ }
+
+ // some gross pruning
+ child->removeProperty( "lanLib,AAPL,MacOS,PowerPC");
+
+ if( (obj = child->getProperty( "driver,AAPL,MacOS,PowerPC"))) {
+
+ if( (0 == (prop = (OSData *)child->getProperty( gIODTTypeKey )))
+ || (strncmp("display", (char *)prop->getBytesNoCopy(), sizeof("display"))) ) {
+ child->removeProperty( "driver,AAPL,MacOS,PowerPC");
+ }
+ }
}
regIter->release();
}
@@ -247,7 +262,7 @@
return( parent);
}
-int IODTGetLoaderInfo( const char *key, void **infoAddr, int *infoSize )
+int IODTGetLoaderInfo( char *key, void **infoAddr, int *infoSize )
{
IORegistryEntry *chosen;
OSData *propObj;
@@ -272,7 +287,7 @@
return 0;
}
-void IODTFreeLoaderInfo( const char *key, void *infoAddr, int infoSize )
+void IODTFreeLoaderInfo( char *key, void *infoAddr, int infoSize )
{
vm_offset_t range[2];
IORegistryEntry *chosen;
@@ -289,31 +304,15 @@
}
}
-int IODTGetDefault(const char *key, void *infoAddr, unsigned int infoSize )
-{
- IORegistryEntry *defaults;
- OSData *defaultObj;
- unsigned int defaultSize;
-
- defaults = IORegistryEntry::fromPath( "/defaults", gIODTPlane );
- if ( defaults == 0 ) return -1;
-
- defaultObj = OSDynamicCast( OSData, defaults->getProperty(key) );
- if ( defaultObj == 0 ) return -1;
-
- defaultSize = defaultObj->getLength();
- if ( defaultSize > infoSize) return -1;
-
- memcpy( infoAddr, defaultObj->getBytesNoCopy(), defaultSize );
-
- return 0;
-}
-
static void FreePhysicalMemory( vm_offset_t * range )
{
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] );
}
@@ -384,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 );
}
}
@@ -436,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;
@@ -469,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;
@@ -488,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;
@@ -501,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) {
@@ -647,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;
@@ -674,7 +666,6 @@
localBits = (UInt32 *) local->getBytesNoCopy();
localEnd = localBits + (local->getLength() / sizeof(UInt32));
- index = 0;
mapped = OSArray::withCapacity( 1 );
controllers = OSArray::withCapacity( 1 );
@@ -682,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());
@@ -695,7 +686,6 @@
controller->retain();
}
- index++;
localBits += skip;
mapped->setObject( map );
controllers->setObject( controller );
@@ -846,7 +836,7 @@
result = regEntry->compareNames( obj );
obj->release();
}
-#if DEBUG
+#ifdef DEBUG
else IOLog("Couldn't unserialize %s\n", keys );
#endif
@@ -1102,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)