Loading...
--- xnu/xnu-3789.1.32/iokit/Kernel/IODeviceTreeSupport.cpp
+++ xnu/xnu-344/iokit/Kernel/IODeviceTreeSupport.cpp
@@ -1,29 +1,31 @@
/*
- * Copyright (c) 1998-2006 Apple Computer, 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@
+ */
+/*
+ * Copyright (c) 1998 Apple Computer, Inc. All rights reserved.
+ *
+ * HISTORY
+ * 23 Nov 98 sdouglas, created from IODeviceTreeBus.m, & MacOS exp mgr.
+ * 05 Apr 99 sdouglas, add interrupt mapping.
+ *
*/
#include <IOKit/IODeviceTreeSupport.h>
@@ -35,18 +37,13 @@
#include <IOKit/IOLib.h>
#include <IOKit/IOKitKeys.h>
-#include <pexpert/device_tree.h>
-
-typedef UInt32 dtptr_t;
-
-#include <machine/machine_routines.h>
-
+#include <DeviceTree.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>
@@ -63,7 +60,6 @@
const OSSymbol * gIODTCompatibleKey;
const OSSymbol * gIODTTypeKey;
const OSSymbol * gIODTModelKey;
-const OSSymbol * gIODTTargetTypeKey;
const OSSymbol * gIODTSizeCellKey;
const OSSymbol * gIODTAddressCellKey;
@@ -78,29 +74,29 @@
const OSSymbol * gIODTInterruptParentKey;
const OSSymbol * gIODTNWInterruptMappingKey;
-OSDictionary * gIODTSharedInterrupts;
static IORegistryEntry * MakeReferenceTable( DTEntry dtEntry, bool copy );
static void AddPHandle( IORegistryEntry * regEntry );
static void FreePhysicalMemory( vm_offset_t * range );
-static bool IODTMapInterruptsSharing( IORegistryEntry * regEntry, OSDictionary * allInts );
IORegistryEntry *
IODeviceTreeAlloc( void * dtTop )
{
- IORegistryEntry * parent;
- IORegistryEntry * child;
- IORegistryIterator * regIter;
+ IORegistryEntry *parent;
+ IORegistryEntry *child;
+ IORegistryIterator *regIter;
DTEntryIterator iter;
- DTEntry dtChild;
- DTEntry mapEntry;
- OSArray * stack;
- OSData * prop;
- OSDictionary * allInts;
- vm_offset_t * dtMap;
- unsigned int propSize;
- bool intMap;
- bool freeDT;
+ DTEntry dtChild;
+ DTEntry mapEntry;
+ OSArray *stack;
+ OSData *prop;
+ OSObject *obj;
+ vm_offset_t *dtMap;
+ int propSize;
+ bool intMap;
+ bool freeDT;
+
+ IOLog("IODeviceTreeSupport ");
gIODTPlane = IORegistryEntry::makePlane( kIODeviceTreePlane );
@@ -109,7 +105,6 @@
gIODTCompatibleKey = OSSymbol::withCStringNoCopy( "compatible" );
gIODTTypeKey = OSSymbol::withCStringNoCopy( "device_type" );
gIODTModelKey = OSSymbol::withCStringNoCopy( "model" );
- gIODTTargetTypeKey = OSSymbol::withCStringNoCopy( "target-type" );
gIODTSizeCellKey = OSSymbol::withCStringNoCopy( "#size-cells" );
gIODTAddressCellKey = OSSymbol::withCStringNoCopy( "#address-cells" );
gIODTRangeKey = OSSymbol::withCStringNoCopy( "ranges" );
@@ -149,11 +144,11 @@
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 );
- stack = OSArray::withObjects( (const OSObject **) &parent, 1, 10 );
+ stack = OSArray::withObjects( & (const OSObject *) parent, 1, 10 );
DTCreateEntryIterator( (DTEntry)dtTop, &iter );
do {
@@ -198,64 +193,55 @@
// free original device tree
DTInit(0);
IODTFreeLoaderInfo( "DeviceTree",
- (void *)dtMap[0], (int) round_page(dtMap[1]) );
+ (void *)dtMap[0], round_page(dtMap[1]) );
}
// adjust tree
-
- gIODTSharedInterrupts = OSDictionary::withCapacity(4);
- allInts = OSDictionary::withCapacity(4);
intMap = false;
regIter = IORegistryIterator::iterateOver( gIODTPlane,
kIORegistryIterateRecursively );
- assert( regIter && allInts && gIODTSharedInterrupts );
- if( regIter && allInts && gIODTSharedInterrupts ) {
+ assert( regIter );
+ if( regIter) {
while( (child = regIter->getNextObject())) {
- IODTMapInterruptsSharing( child, allInts );
+ IODTMapInterrupts( child );
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 )))
+ || (strcmp( "display", (char *) prop->getBytesNoCopy())) ) {
+ child->removeProperty( "driver,AAPL,MacOS,PowerPC");
+ }
+ }
}
regIter->release();
}
-
-#if IODTSUPPORTDEBUG
- parent->setProperty("allInts", allInts);
- parent->setProperty("sharedInts", gIODTSharedInterrupts);
-
- regIter = IORegistryIterator::iterateOver( gIODTPlane,
- kIORegistryIterateRecursively );
- if (regIter) {
- while( (child = regIter->getNextObject())) {
- OSArray *
- array = OSDynamicCast(OSArray, child->getProperty( gIOInterruptSpecifiersKey ));
- for( UInt32 i = 0; array && (i < array->getCount()); i++)
- {
- IOOptionBits options;
- IOReturn ret = IODTGetInterruptOptions( child, i, &options );
- if( (ret != kIOReturnSuccess) || options)
- IOLog("%s[%ld] %ld (%x)\n", child->getName(), i, options, ret);
- }
- }
- regIter->release();
- }
-#endif
-
- allInts->release();
if( intMap)
// set a key in the root to indicate we found NW interrupt mapping
parent->setProperty( gIODTNWInterruptMappingKey,
(OSObject *) gIODTNWInterruptMappingKey );
+ IOLog("done\n");
+
return( parent);
}
-int IODTGetLoaderInfo( const char *key, void **infoAddr, int *infoSize )
+int IODTGetLoaderInfo( char *key, void **infoAddr, int *infoSize )
{
IORegistryEntry *chosen;
OSData *propObj;
- dtptr_t *propPtr;
+ unsigned int *propPtr;
unsigned int propSize;
chosen = IORegistryEntry::fromPath( "/chosen/memory-map", gIODTPlane );
@@ -265,18 +251,18 @@
if ( propObj == 0 ) return -1;
propSize = propObj->getLength();
- if ( propSize != (2 * sizeof(dtptr_t)) ) return -1;
+ if ( propSize != (2 * sizeof(UInt32)) ) return -1;
- propPtr = (dtptr_t *)propObj->getBytesNoCopy();
+ propPtr = (unsigned int *)propObj->getBytesNoCopy();
if ( propPtr == 0 ) return -1;
- *infoAddr = (void *)(uintptr_t) (propPtr[0]);
- *infoSize = (int) (propPtr[1]);
+ *infoAddr = (void *)propPtr[0] ;
+ *infoSize = (int) propPtr[1];
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;
@@ -291,26 +277,6 @@
chosen->removeProperty(key);
}
}
-}
-
-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 )
@@ -333,7 +299,7 @@
const OSSymbol *sym;
DTPropertyIterator dtIter;
void *prop;
- unsigned int propSize;
+ int propSize;
char *name;
char location[ 32 ];
bool noLocation = true;
@@ -378,17 +344,17 @@
} else if( nameKey == gIODTUnitKey ) {
// all OF strings are null terminated... except this one
- if( propSize >= (int) sizeof(location))
- propSize = sizeof(location) - 1;
+ if( propSize >= (int) sizeof( location))
+ propSize = sizeof( location) - 1;
strncpy( location, (const char *) prop, propSize );
location[ propSize ] = 0;
regEntry->setLocation( location );
propTable->removeObject( gIODTUnitKey );
noLocation = false;
- } else if(noLocation && (!strncmp(name, "reg", sizeof("reg")))) {
+ } else if( noLocation && (0 == strcmp( name, "reg"))) {
// default location - override later
- snprintf(location, sizeof(location), "%X", *((uint32_t *) prop));
+ sprintf( location, "%lX", *((UInt32 *) prop) );
regEntry->setLocation( location );
}
}
@@ -430,34 +396,25 @@
static bool GetUInt32( IORegistryEntry * regEntry, const OSSymbol * name,
UInt32 * value )
{
- OSObject * obj;
- OSData * data;
- bool result;
-
- if (!(obj = regEntry->copyProperty(name))) return (false);
-
- result = ((data = OSDynamicCast(OSData, obj)) && (sizeof(UInt32) == data->getLength()));
- if (result) *value = *((UInt32 *) data->getBytesNoCopy());
-
- obj->release();
- return(result);
-}
-
-static IORegistryEntry * IODTFindInterruptParent( IORegistryEntry * regEntry, IOItemCount index )
+ OSData *data;
+
+ if( (data = OSDynamicCast( OSData, regEntry->getProperty( name )))
+ && (4 == data->getLength())) {
+ *value = *((UInt32 *) data->getBytesNoCopy());
+ return( true );
+ } else
+ return( false );
+}
+
+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;
@@ -476,7 +433,7 @@
assert( ok );
if( ok) {
- snprintf(buf, sizeof(buf), "IOInterruptController%08X", (uint32_t)phandle);
+ sprintf( buf, "IOInterruptController%08lX", phandle);
sym = OSSymbol::withCString( buf );
} else
sym = 0;
@@ -495,8 +452,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;
@@ -508,12 +465,12 @@
UInt32 i, original_icells;
bool cmp, ok = false;
- parent = IODTFindInterruptParent( regEntry, index );
+ parent = IODTFindInterruptParent( regEntry );
IODTGetICellCounts( parent, &icells, &acells );
addrCmp = 0;
if( acells) {
data = OSDynamicCast( OSData, regEntry->getProperty( "reg" ));
- if( data && (data->getLength() >= (acells * sizeof(UInt32))))
+ if( data && (data->getLength() >= (acells * sizeof( UInt32))))
addrCmp = (UInt32 *) data->getBytesNoCopy();
}
original_icells = icells;
@@ -534,7 +491,7 @@
// found a controller - don't want to follow cascaded controllers
parent = 0;
*spec = OSData::withBytesNoCopy( (void *) intSpec,
- icells * sizeof(UInt32));
+ icells * sizeof( UInt32));
*controller = IODTInterruptControllerName( regEntry );
ok = (*spec && *controller);
} else if( parent && (data = OSDynamicCast( OSData,
@@ -543,7 +500,7 @@
map = (UInt32 *) data->getBytesNoCopy();
endMap = map + (data->getLength() / sizeof(UInt32));
data = OSDynamicCast( OSData, regEntry->getProperty( "interrupt-map-mask" ));
- if( data && (data->getLength() >= ((acells + icells) * sizeof(UInt32))))
+ if( data && (data->getLength() >= ((acells + icells) * sizeof( UInt32))))
maskCmp = (UInt32 *) data->getBytesNoCopy();
else
maskCmp = 0;
@@ -611,58 +568,19 @@
return( ok ? original_icells : 0 );
}
-IOReturn IODTGetInterruptOptions( IORegistryEntry * regEntry, int source, IOOptionBits * options )
-{
- OSArray * controllers;
- OSArray * specifiers;
- OSArray * shared;
- OSObject * spec;
- OSObject * oneSpec;
-
- *options = 0;
-
- controllers = OSDynamicCast(OSArray, regEntry->getProperty(gIOInterruptControllersKey));
- specifiers = OSDynamicCast(OSArray, regEntry->getProperty(gIOInterruptSpecifiersKey));
-
- if( !controllers || !specifiers)
- return (kIOReturnNoInterrupt);
-
- shared = (OSArray *) gIODTSharedInterrupts->getObject(
- (const OSSymbol *) controllers->getObject(source) );
- if (!shared)
- return (kIOReturnSuccess);
-
- spec = specifiers->getObject(source);
- if (!spec)
- return (kIOReturnNoInterrupt);
-
- for (unsigned int i = 0;
- (oneSpec = shared->getObject(i))
- && (!oneSpec->isEqualTo(spec));
- i++ ) {}
-
- if (oneSpec)
- *options = kIODTInterruptShared;
-
- return (kIOReturnSuccess);
-}
-
-static bool IODTMapInterruptsSharing( IORegistryEntry * regEntry, OSDictionary * allInts )
-{
- IORegistryEntry * parent;
- OSData * local;
- OSData * local2;
- UInt32 * localBits;
- UInt32 * localEnd;
- IOItemCount index;
- OSData * map;
- OSObject * oneMap;
- OSArray * mapped;
- OSArray * controllerInts;
- const OSSymbol * controller = 0;
- OSArray * controllers;
- UInt32 skip = 1;
- bool ok, nw;
+bool IODTMapInterrupts( IORegistryEntry * regEntry )
+{
+ IORegistryEntry *parent;
+ OSData *local;
+ OSData *local2;
+ UInt32 *localBits;
+ UInt32 *localEnd;
+ OSData *map;
+ OSArray *mapped;
+ const OSSymbol *controller;
+ OSArray *controllers;
+ UInt32 skip = 1;
+ bool ok, nw;
nw = (0 == (local = OSDynamicCast( OSData,
regEntry->getProperty( gIODTAAPLInterruptsKey))));
@@ -680,8 +598,7 @@
}
localBits = (UInt32 *) local->getBytesNoCopy();
- localEnd = localBits + (local->getLength() / sizeof(UInt32));
- index = 0;
+ localEnd = localBits + (local->getLength() / sizeof( UInt32));
mapped = OSArray::withCapacity( 1 );
controllers = OSArray::withCapacity( 1 );
@@ -689,63 +606,23 @@
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());
break;
}
} else {
- map = OSData::withData( local, mapped->getCount() * sizeof(UInt32),
- sizeof(UInt32));
+ map = OSData::withData( local, mapped->getCount() * sizeof( UInt32),
+ sizeof( UInt32));
controller = gIODTDefaultInterruptController;
controller->retain();
}
- index++;
localBits += skip;
mapped->setObject( map );
- controllers->setObject( controller );
-
- if (allInts)
- {
- controllerInts = (OSArray *) allInts->getObject( controller );
- if (controllerInts)
- {
- for (unsigned int i = 0; (oneMap = controllerInts->getObject(i)); i++)
- {
- if (map->isEqualTo(oneMap))
- {
- controllerInts = (OSArray *) gIODTSharedInterrupts->getObject( controller );
- if (controllerInts)
- controllerInts->setObject(map);
- else
- {
- controllerInts = OSArray::withObjects( (const OSObject **) &map, 1, 4 );
- if (controllerInts)
- {
- gIODTSharedInterrupts->setObject( controller, controllerInts );
- controllerInts->release();
- }
- }
- break;
- }
- }
- if (!oneMap)
- controllerInts->setObject(map);
- }
- else
- {
- controllerInts = OSArray::withObjects( (const OSObject **) &map, 1, 16 );
- if (controllerInts)
- {
- allInts->setObject( controller, controllerInts );
- controllerInts->release();
- }
- }
- }
-
map->release();
+ controllers->setObject( (OSObject *) controller );
controller->release();
} while( localBits < localEnd);
@@ -766,32 +643,26 @@
return( ok );
}
-bool IODTMapInterrupts( IORegistryEntry * regEntry )
-{
- return( IODTMapInterruptsSharing( regEntry, 0 ));
-}
-
/*
*/
-static bool
+static const char *
CompareKey( OSString * key,
- const IORegistryEntry * table, const OSSymbol * propName,
- OSString ** matchingName )
+ const IORegistryEntry * table, const OSSymbol * propName )
{
OSObject *prop;
OSData *data;
OSString *string;
const char *ckey;
UInt32 keyLen;
- UInt32 nlen;
const char *names;
const char *lastName;
bool wild;
bool matched;
const char *result = 0;
- if( 0 == (prop = table->copyProperty( propName ))) return( 0 );
+ if( 0 == (prop = table->getProperty( propName )))
+ return( 0 );
if( (data = OSDynamicCast( OSData, prop ))) {
names = (const char *) data->getBytesNoCopy();
@@ -799,48 +670,47 @@
} else if( (string = OSDynamicCast( OSString, prop ))) {
names = string->getCStringNoCopy();
lastName = names + string->getLength() + 1;
- } else names = 0;
-
- if (names) {
- ckey = key->getCStringNoCopy();
- keyLen = key->getLength();
- wild = ('*' == key->getChar( keyLen - 1 ));
-
- do {
- // for each name in the property
- nlen = strnlen(names, lastName - names);
- if( wild)
- matched = ((nlen >= (keyLen - 1)) && (0 == strncmp(ckey, names, keyLen - 1)));
- else
- matched = (keyLen == nlen) && (0 == strncmp(ckey, names, keyLen));
-
- if( matched)
- result = names;
-
- names = names + nlen + 1;
-
- } while( (names < lastName) && (false == matched));
- }
-
- if (result && matchingName) *matchingName = OSString::withCString( result );
-
- if (prop) prop->release();
-
- return (result != 0);
+ } else
+ return( 0 );
+
+ ckey = key->getCStringNoCopy();
+ keyLen = key->getLength();
+ wild = ('*' == key->getChar( keyLen - 1 ));
+
+ do {
+ // for each name in the property
+ if( wild)
+ matched = (0 == strncmp( ckey, names, keyLen - 1 ));
+ else
+ matched = (keyLen == strlen( names ))
+ && (0 == strncmp( ckey, names, keyLen ));
+
+ if( matched)
+ result = names;
+
+ names = names + strlen( names) + 1;
+
+ } while( (names < lastName) && (false == matched));
+
+ return( result);
}
bool IODTCompareNubName( const IORegistryEntry * regEntry,
OSString * name, OSString ** matchingName )
{
- bool matched;
-
- matched = CompareKey( name, regEntry, gIODTNameKey, matchingName)
- || CompareKey( name, regEntry, gIODTCompatibleKey, matchingName)
- || CompareKey( name, regEntry, gIODTTypeKey, matchingName)
- || CompareKey( name, regEntry, gIODTModelKey, matchingName);
-
- return (matched);
+ const char *result;
+ bool matched;
+
+ matched = (0 != (result = CompareKey( name, regEntry, gIODTNameKey)))
+ || (0 != (result = CompareKey( name, regEntry, gIODTCompatibleKey)))
+ || (0 != (result = CompareKey( name, regEntry, gIODTTypeKey)))
+ || (0 != (result = CompareKey( name, regEntry, gIODTModelKey)));
+
+ if( result && matchingName)
+ *matchingName = OSString::withCString( result );
+
+ return( result != 0 );
}
bool IODTMatchNubWithKeys( IORegistryEntry * regEntry,
@@ -855,7 +725,7 @@
result = regEntry->compareNames( obj );
obj->release();
}
-#if DEBUG
+#ifdef DEBUG
else IOLog("Couldn't unserialize %s\n", keys );
#endif
@@ -906,7 +776,7 @@
}
cIter = OSCollectionIterator::withCollection( result);
- if (result) result->release();
+ result->release();
return( cIter);
}
@@ -926,49 +796,21 @@
persist.compareFunc = compareFunc;
persist.locationFunc = locationFunc;
- prop = OSData::withBytes( &persist, sizeof(persist));
+ prop = OSData::withBytes( &persist, sizeof( persist));
if( !prop)
return;
- prop->setSerializable(false);
regEntry->setProperty( gIODTPersistKey, prop);
prop->release();
return;
}
-#if defined(__arm__) || defined(__i386__) || defined(__x86_64__)
static SInt32 DefaultCompare( UInt32 cellCount, UInt32 left[], UInt32 right[] )
{
- cellCount--;
- return( left[ cellCount ] - right[ cellCount ] );
-}
-#else
-#error Unknown architecture.
-#endif
-
-static void AddLengthToCells( UInt32 numCells, UInt32 *cells, UInt64 offset)
-{
- if (numCells == 1)
- {
- cells[0] += (UInt32)offset;
- }
- else {
- UInt64 sum = cells[numCells - 1] + offset;
- cells[numCells - 1] = (UInt32)sum;
- if (sum > UINT32_MAX) {
- cells[numCells - 2] += (UInt32)(sum >> 32);
- }
- }
-}
-
-static IOPhysicalAddress CellsValue( UInt32 numCells, UInt32 *cells)
-{
- if (numCells == 1) {
- return IOPhysical32( 0, cells[0] );
- } else {
- return IOPhysical32( cells[numCells - 2], cells[numCells - 1] );
- }
-}
+ cellCount--;
+ return( left[ cellCount ] - right[ cellCount ] );
+}
+
void IODTGetCellCounts( IORegistryEntry * regEntry,
UInt32 * sizeCount, UInt32 * addressCount)
@@ -988,7 +830,7 @@
bool IODTResolveAddressCell( IORegistryEntry * regEntry,
UInt32 cellsIn[],
- IOPhysicalAddress * phys, IOPhysicalLength * lenOut )
+ IOPhysicalAddress * phys, IOPhysicalLength * len )
{
IORegistryEntry *parent;
OSData *prop;
@@ -997,16 +839,11 @@
// cells in addresses below regEntry
UInt32 childSizeCells, childAddressCells;
UInt32 childCells;
- UInt32 cell[ 8 ], propLen;
- UInt64 offset = 0;
- UInt32 endCell[ 8 ];
+ UInt32 cell[ 5 ], offset = 0, length;
UInt32 *range;
- UInt32 *lookRange;
- UInt32 *startRange;
UInt32 *endRanges;
bool ok = true;
- SInt64 diff, diff2, endDiff;
- UInt64 len, rangeLen;
+ SInt32 diff;
IODTPersistent *persist;
IODTCompareAddressCellFunc compare;
@@ -1014,111 +851,67 @@
IODTGetCellCounts( regEntry, &childSizeCells, &childAddressCells );
childCells = childAddressCells + childSizeCells;
- if (childCells > sizeof(cell)/sizeof(cell[0]))
- panic("IODTResolveAddressCell: Invalid device tree (%u,%u)", (uint32_t)childAddressCells, (uint32_t)childSizeCells);
-
- bcopy( cellsIn, cell, sizeof(UInt32) * childCells );
- *lenOut = CellsValue( childSizeCells, cellsIn + childAddressCells );
-
- do
- {
+ bcopy( cellsIn, cell, 4 * childCells );
+ if( childSizeCells > 1)
+ *len = IOPhysical32( cellsIn[ childAddressCells ],
+ cellsIn[ childAddressCells + 1 ] );
+ else
+ *len = IOPhysical32( 0, cellsIn[ childAddressCells ] );
+
+ do {
prop = OSDynamicCast( OSData, regEntry->getProperty( gIODTRangeKey ));
if( 0 == prop) {
/* end of the road */
- *phys = CellsValue( childAddressCells, cell );
- *phys += offset;
+ *phys = IOPhysical32( 0, cell[ childAddressCells - 1 ] + offset);
break;
}
parent = regEntry->getParentEntry( gIODTPlane );
IODTGetCellCounts( parent, &sizeCells, &addressCells );
- if( (propLen = prop->getLength())) {
+ if( (length = prop->getLength())) {
// search
- startRange = (UInt32 *) prop->getBytesNoCopy();
- range = startRange;
- endRanges = range + (propLen / sizeof(UInt32));
+ range = (UInt32 *) prop->getBytesNoCopy();
+ endRanges = range + (length / 4);
prop = (OSData *) regEntry->getProperty( gIODTPersistKey );
if( prop) {
persist = (IODTPersistent *) prop->getBytesNoCopy();
compare = persist->compareFunc;
- } else if (addressCells == childAddressCells) {
+ } else
compare = DefaultCompare;
- } else {
- panic("There is no mixed comparison function yet...");
- }
for( ok = false;
- range < endRanges;
- range += (childCells + addressCells) ) {
-
- // is cell start within range?
+ range < endRanges;
+ range += (childCells + addressCells) ) {
+
+ // is cell >= range start?
diff = (*compare)( childAddressCells, cell, range );
-
- if (childAddressCells > sizeof(endCell)/sizeof(endCell[0]))
- panic("IODTResolveAddressCell: Invalid device tree (%u)", (uint32_t)childAddressCells);
-
- bcopy(range, endCell, childAddressCells * sizeof(UInt32));
-
- rangeLen = CellsValue(childSizeCells, range + childAddressCells + addressCells);
- AddLengthToCells(childAddressCells, endCell, rangeLen);
-
- diff2 = (*compare)( childAddressCells, cell, endCell );
-
- // if start of cell < start of range, or end of range >= start of cell, skip
- if ((diff < 0) || (diff2 >= 0))
+ if( diff < 0)
continue;
-
- len = CellsValue(childSizeCells, cell + childAddressCells);
- ok = (0 == len);
-
- if (!ok)
- {
- // search for cell end
- bcopy(cell, endCell, childAddressCells * sizeof(UInt32));
-
- AddLengthToCells(childAddressCells, endCell, len - 1);
-
- for( lookRange = startRange;
- lookRange < endRanges;
- lookRange += (childCells + addressCells) )
- {
- // make sure end of cell >= range start
- endDiff = (*compare)( childAddressCells, endCell, lookRange );
- if( endDiff < 0)
- continue;
-
- UInt64 rangeStart = CellsValue(addressCells, range + childAddressCells);
- UInt64 lookRangeStart = CellsValue(addressCells, lookRange + childAddressCells);
- if ((endDiff - len + 1 + lookRangeStart) == (diff + rangeStart))
- {
- ok = true;
- break;
- }
- }
- if (!ok)
- continue;
- }
+
+ // is cell + size <= range end?
+ if( (diff + cell[ childCells - 1 ])
+ > range[ childCells + addressCells - 1 ])
+ continue;
+
offset += diff;
+ ok = true;
break;
}
- if (addressCells + sizeCells > sizeof(cell)/sizeof(cell[0]))
- panic("IODTResolveAddressCell: Invalid device tree (%u, %u)", (uint32_t)addressCells, (uint32_t)sizeCells);
-
// Get the physical start of the range from our parent
- bcopy( range + childAddressCells, cell, sizeof(UInt32) * addressCells );
- bzero( cell + addressCells, sizeof(UInt32) * sizeCells );
+ bcopy( range + childAddressCells, cell, 4 * addressCells );
+ bzero( cell + addressCells, 4 * sizeCells );
} /* else zero length range => pass thru to parent */
- regEntry = parent;
- childSizeCells = sizeCells;
- childAddressCells = addressCells;
- childCells = childAddressCells + childSizeCells;
- }
- while( ok && regEntry);
+ regEntry = parent;
+ childSizeCells = sizeCells;
+ childAddressCells = addressCells;
+ childCells = childAddressCells + childSizeCells;
+
+ } while( ok && regEntry);
return( ok);
}
@@ -1160,7 +953,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)
@@ -1248,7 +1041,6 @@
OSData *ret = 0;
UInt32 *bits;
UInt32 i;
- size_t nlen;
char *names;
char *lastName;
UInt32 mask;
@@ -1276,23 +1068,17 @@
for( i = 0; (i <= deviceNumber) && (names < lastName); i++ ) {
if( mask & (1 << i)) {
- nlen = 1 + strnlen(names, lastName - names);
if( i == deviceNumber) {
- data = OSData::withBytesNoCopy(names, nlen);
+ data = OSData::withBytesNoCopy( names, 1 + strlen( names));
if( data) {
regEntry->setProperty("AAPL,slot-name", data);
ret = data;
data->release();
}
} else
- names += nlen;
+ names += 1 + strlen( names);
}
}
return( ret );
}
-
-extern "C" IOReturn IONDRVLibrariesInitialize( IOService * provider )
-{
- return( kIOReturnUnsupported );
-}