Loading...
--- xnu/xnu-792.12.6/iokit/Kernel/IODeviceTreeSupport.cpp
+++ xnu/xnu-201.19/iokit/Kernel/IODeviceTreeSupport.cpp
@@ -1,31 +1,31 @@
/*
* Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
*
- * @APPLE_LICENSE_OSREFERENCE_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.
+ *
+ * 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 OR NON-INFRINGEMENT. Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * @APPLE_LICENSE_HEADER_END@
+ */
+/*
+ * Copyright (c) 1998 Apple Computer, Inc. All rights reserved.
*
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * HISTORY
+ * 23 Nov 98 sdouglas, created from IODeviceTreeBus.m, & MacOS exp mgr.
+ * 05 Apr 99 sdouglas, add interrupt mapping.
*
- * The 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.
- *
- * @APPLE_LICENSE_OSREFERENCE_HEADER_END@
*/
#include <IOKit/IODeviceTreeSupport.h>
@@ -37,14 +37,13 @@
#include <IOKit/IOLib.h>
#include <IOKit/IOKitKeys.h>
-#include <pexpert/device_tree.h>
-
+#include <DeviceTree.h>
extern "C" {
- #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 <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>
@@ -75,30 +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;
- OSObject * obj;
- OSDictionary * allInts;
- vm_offset_t * dtMap;
- 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 );
@@ -150,12 +148,12 @@
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 {
parent = (IORegistryEntry *)stack->getObject( stack->getCount() - 1);
- //parent->release();
+ //parent->release();
stack->removeObject( stack->getCount() - 1);
while( kSuccess == DTIterateEntries( iter, &dtChild) ) {
@@ -163,14 +161,14 @@
child = MakeReferenceTable( dtChild, freeDT );
child->attachToParent( parent, gIODTPlane);
- AddPHandle( child );
+ AddPHandle( child );
if( kSuccess == DTEnterEntry( iter, dtChild)) {
stack->setObject( parent);
parent = child;
}
- // only registry holds retain
- child->release();
+ // only registry holds retain
+ child->release();
}
} while( stack->getCount()
@@ -183,8 +181,8 @@
// make root name first compatible entry (purely cosmetic)
if( (prop = (OSData *) parent->getProperty( gIODTCompatibleKey))) {
- parent->setName( parent->getName(), gIODTPlane );
- parent->setName( (const char *) prop->getBytesNoCopy() );
+ parent->setName( parent->getName(), gIODTPlane );
+ parent->setName( (const char *) prop->getBytesNoCopy() );
}
// attach tree to meta root
@@ -192,74 +190,50 @@
parent->release();
if( freeDT ) {
- // free original device tree
+ // free original device tree
DTInit(0);
IODTFreeLoaderInfo( "DeviceTree",
- (void *)dtMap[0], round_page_32(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 ) {
- while( (child = regIter->getNextObject())) {
- IODTMapInterruptsSharing( child, allInts );
- 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();
+ assert( regIter );
+ if( regIter) {
+ while( (child = regIter->getNextObject())) {
+ 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( intMap)
- // set a key in the root to indicate we found NW interrupt mapping
- parent->setProperty( gIODTNWInterruptMappingKey,
- (OSObject *) gIODTNWInterruptMappingKey );
+ // set a key in the root to indicate we found NW interrupt mapping
+ parent->setProperty( gIODTNWInterruptMappingKey,
+ (OSObject *) gIODTNWInterruptMappingKey );
+
+ IOLog("done\n");
return( parent);
}
@@ -334,58 +308,57 @@
regEntry = new IOService;
if( regEntry && (false == regEntry->init())) {
- regEntry->release();
- regEntry = 0;
+ regEntry->release();
+ regEntry = 0;
}
if( regEntry &&
- (kSuccess == DTCreatePropertyIterator( dtEntry, &dtIter))) {
+ (kSuccess == DTCreatePropertyIterator( dtEntry, &dtIter))) {
propTable = regEntry->getPropertyTable();
- while( kSuccess == DTIterateProperties( dtIter, &name)) {
-
- if( kSuccess != DTGetProperty( dtEntry, name, &prop, &propSize ))
- continue;
-
- if( copy) {
- nameKey = OSSymbol::withCString(name);
- data = OSData::withBytes(prop, propSize);
- } else {
- nameKey = OSSymbol::withCStringNoCopy(name);
- data = OSData::withBytesNoCopy(prop, propSize);
- }
- assert( nameKey && data );
-
- propTable->setObject( nameKey, data);
- data->release();
- nameKey->release();
-
- if( nameKey == gIODTNameKey ) {
- if( copy)
- sym = OSSymbol::withCString( (const char *) prop);
- else
- sym = OSSymbol::withCStringNoCopy( (const char *) prop);
- regEntry->setName( sym );
- sym->release();
-
- } else if( nameKey == gIODTUnitKey ) {
- // all OF strings are null terminated... except this one
- 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 && (0 == strcmp( name, "reg"))) {
- // default location - override later
- sprintf( location, "%lX", *((UInt32 *) prop) );
- regEntry->setLocation( location );
- }
- }
- DTDisposePropertyIterator( dtIter);
+ while( kSuccess == DTIterateProperties( dtIter, &name)) {
+
+ if( kSuccess != DTGetProperty( dtEntry, name, &prop, &propSize ))
+ continue;
+
+ if( copy) {
+ nameKey = OSSymbol::withCString(name);
+ data = OSData::withBytes(prop, propSize);
+ } else {
+ nameKey = OSSymbol::withCStringNoCopy(name);
+ data = OSData::withBytesNoCopy(prop, propSize);
+ }
+ assert( nameKey && data );
+
+ propTable->setObject( nameKey, data);
+ data->release();
+ nameKey->release();
+
+ if( nameKey == gIODTNameKey ) {
+ if( copy)
+ sym = OSSymbol::withCString( (const char *) prop);
+ else
+ sym = OSSymbol::withCStringNoCopy( (const char *) prop);
+ regEntry->setName( sym );
+ sym->release();
+ } else if( nameKey == gIODTUnitKey ) {
+ // all OF strings are null terminated... except this one
+ 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 && (0 == strcmp( name, "reg"))) {
+ // default location - override later
+ sprintf( location, "%lX", *((UInt32 *) prop) );
+ regEntry->setLocation( location );
+ }
+ }
+ DTDisposePropertyIterator( dtIter);
}
return( regEntry);
@@ -396,10 +369,10 @@
OSData * data;
if( regEntry->getProperty( gIODTInterruptCellKey)
- && (data = OSDynamicCast( OSData, regEntry->getProperty( gIODTPHandleKey )))) {
- // a possible interrupt-parent
- gIODTPHandles->setObject( data );
- gIODTPHandleMap->setObject( regEntry );
+ && (data = OSDynamicCast( OSData, regEntry->getProperty( gIODTPHandleKey )))) {
+ // a possible interrupt-parent
+ gIODTPHandles->setObject( data );
+ gIODTPHandleMap->setObject( regEntry );
}
}
@@ -410,10 +383,10 @@
int i;
for( i = 0; (data = (OSData *)gIODTPHandles->getObject( i )); i++ ) {
- if( phandle == *((UInt32 *)data->getBytesNoCopy())) {
- regEntry = (IORegistryEntry *)
- gIODTPHandleMap->getObject( i );
- break;
+ if( phandle == *((UInt32 *)data->getBytesNoCopy())) {
+ regEntry = (IORegistryEntry *)
+ gIODTPHandleMap->getObject( i );
+ break;
}
}
@@ -426,11 +399,11 @@
OSData *data;
if( (data = OSDynamicCast( OSData, regEntry->getProperty( name )))
- && (4 == data->getLength())) {
+ && (4 == data->getLength())) {
*value = *((UInt32 *) data->getBytesNoCopy());
- return( true );
+ return( true );
} else
- return( false );
+ return( false );
}
IORegistryEntry * IODTFindInterruptParent( IORegistryEntry * regEntry )
@@ -439,12 +412,12 @@
UInt32 phandle;
if( GetUInt32( regEntry, gIODTInterruptParentKey, &phandle))
- parent = FindPHandle( phandle );
+ parent = FindPHandle( phandle );
else if( 0 == regEntry->getProperty( "interrupt-controller"))
- parent = regEntry->getParentEntry( gIODTPlane);
+ parent = regEntry->getParentEntry( gIODTPlane);
else
- parent = 0;
+ parent = 0;
return( parent );
}
@@ -452,9 +425,9 @@
const OSSymbol * IODTInterruptControllerName( IORegistryEntry * regEntry )
{
const OSSymbol *sym;
- UInt32 phandle;
- bool ok;
- char buf[48];
+ UInt32 phandle;
+ bool ok;
+ char buf[48];
ok = GetUInt32( regEntry, gIODTPHandleKey, &phandle);
assert( ok );
@@ -463,7 +436,7 @@
sprintf( buf, "IOInterruptController%08lX", phandle);
sym = OSSymbol::withCString( buf );
} else
- sym = 0;
+ sym = 0;
return( sym );
}
@@ -492,76 +465,77 @@
UInt32 i, original_icells;
bool cmp, ok = false;
+
parent = IODTFindInterruptParent( regEntry );
IODTGetICellCounts( parent, &icells, &acells );
addrCmp = 0;
if( acells) {
- data = OSDynamicCast( OSData, regEntry->getProperty( "reg" ));
- if( data && (data->getLength() >= (acells * sizeof( UInt32))))
- addrCmp = (UInt32 *) data->getBytesNoCopy();
+ data = OSDynamicCast( OSData, regEntry->getProperty( "reg" ));
+ if( data && (data->getLength() >= (acells * sizeof( UInt32))))
+ addrCmp = (UInt32 *) data->getBytesNoCopy();
}
original_icells = icells;
regEntry = parent;
- do {
+ do {
#if IODTSUPPORTDEBUG
- kprintf ("IODTMapOneInterrupt: current regEntry name %s\n", regEntry->getName());
- kprintf ("acells - icells: ");
- for (i = 0; i < acells; i++) kprintf ("0x%08X ", addrCmp[i]);
- kprintf ("- ");
- for (i = 0; i < icells; i++) kprintf ("0x%08X ", intSpec[i]);
- kprintf ("\n");
+ kprintf ("IODTMapOneInterrupt: current regEntry name %s\n", regEntry->getName());
+ kprintf ("acells - icells: ");
+ for (i = 0; i < acells; i++) kprintf ("0x%08X ", addrCmp[i]);
+ kprintf ("- ");
+ for (i = 0; i < icells; i++) kprintf ("0x%08X ", intSpec[i]);
+ kprintf ("\n");
#endif
- if( parent && (data = OSDynamicCast( OSData,
- regEntry->getProperty( "interrupt-controller")))) {
- // found a controller - don't want to follow cascaded controllers
+ if( parent && (data = OSDynamicCast( OSData,
+ regEntry->getProperty( "interrupt-controller")))) {
+ // found a controller - don't want to follow cascaded controllers
parent = 0;
*spec = OSData::withBytesNoCopy( (void *) intSpec,
icells * sizeof( UInt32));
*controller = IODTInterruptControllerName( regEntry );
- ok = (*spec && *controller);
- } else if( parent && (data = OSDynamicCast( OSData,
- regEntry->getProperty( "interrupt-map")))) {
+ ok = (*spec && *controller);
+ } else if( parent && (data = OSDynamicCast( OSData,
+ regEntry->getProperty( "interrupt-map")))) {
// interrupt-map
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))))
maskCmp = (UInt32 *) data->getBytesNoCopy();
- else
- maskCmp = 0;
+ else
+ maskCmp = 0;
#if IODTSUPPORTDEBUG
- if (maskCmp) {
- kprintf (" maskCmp: ");
- for (i = 0; i < acells + icells; i++) {
- if (i == acells)
- kprintf ("- ");
- kprintf ("0x%08X ", maskCmp[i]);
- }
- kprintf ("\n");
- kprintf (" masked: ");
- for (i = 0; i < acells + icells; i++) {
- if (i == acells)
- kprintf ("- ");
- kprintf ("0x%08X ", ((i < acells) ? addrCmp[i] : intSpec[i-acells]) & maskCmp[i]);
- }
- kprintf ("\n");
- } else
- kprintf ("no maskCmp\n");
+ if (maskCmp) {
+ kprintf (" maskCmp: ");
+ for (i = 0; i < acells + icells; i++) {
+ if (i == acells)
+ kprintf ("- ");
+ kprintf ("0x%08X ", maskCmp[i]);
+ }
+ kprintf ("\n");
+ kprintf (" masked: ");
+ for (i = 0; i < acells + icells; i++) {
+ if (i == acells)
+ kprintf ("- ");
+ kprintf ("0x%08X ", ((i < acells) ? addrCmp[i] : intSpec[i-acells]) & maskCmp[i]);
+ }
+ kprintf ("\n");
+ } else
+ kprintf ("no maskCmp\n");
#endif
- do {
+ do {
#if IODTSUPPORTDEBUG
- kprintf (" map: ");
- for (i = 0; i < acells + icells; i++) {
- if (i == acells)
- kprintf ("- ");
- kprintf ("0x%08X ", map[i]);
- }
- kprintf ("\n");
+ kprintf (" map: ");
+ for (i = 0; i < acells + icells; i++) {
+ if (i == acells)
+ kprintf ("- ");
+ kprintf ("0x%08X ", map[i]);
+ }
+ kprintf ("\n");
#endif
- for( i = 0, cmp = true; cmp && (i < (acells + icells)); i++) {
+ for( i = 0, cmp = true; cmp && (i < (acells + icells)); i++) {
cell = (i < acells) ? addrCmp[i] : intSpec[ i - acells ];
if( maskCmp)
cell &= maskCmp[i];
@@ -572,94 +546,55 @@
if( 0 == (parent = FindPHandle( *(map++) )))
unexpected(break);
- IODTGetICellCounts( parent, &picells, &pacells );
+ IODTGetICellCounts( parent, &picells, &pacells );
if( cmp) {
addrCmp = map;
intSpec = map + pacells;
regEntry = parent;
- } else {
+ } else {
map += pacells + picells;
- }
+ }
} while( !cmp && (map < endMap) );
if (!cmp)
- parent = 0;
- }
-
- if( parent) {
+ parent = 0;
+ }
+
+ if( parent) {
IODTGetICellCounts( parent, &icells, &acells );
- regEntry = parent;
- }
-
- } while( parent);
+ regEntry = parent;
+ }
+ } while( parent);
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;
- OSData * map;
- OSObject * oneMap;
- OSArray * mapped;
- OSArray * controllerInts;
- const OSSymbol * controller;
- 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))));
+ regEntry->getProperty( gIODTAAPLInterruptsKey))));
if( nw && (0 == (local = OSDynamicCast( OSData,
- regEntry->getProperty( "interrupts")))))
- return( true ); // nothing to see here
+ regEntry->getProperty( "interrupts")))))
+ return( true ); // nothing to see here
if( nw && (parent = regEntry->getParentEntry( gIODTPlane))) {
- // check for bridges on old world
- if( (local2 = OSDynamicCast( OSData,
- parent->getProperty( gIODTAAPLInterruptsKey)))) {
- local = local2;
- nw = false;
- }
+ // check for bridges on old world
+ if( (local2 = OSDynamicCast( OSData,
+ parent->getProperty( gIODTAAPLInterruptsKey)))) {
+ local = local2;
+ nw = false;
+ }
}
localBits = (UInt32 *) local->getBytesNoCopy();
@@ -674,7 +609,7 @@
skip = IODTMapOneInterrupt( regEntry, localBits, &map, &controller );
if( 0 == skip) {
IOLog("%s: error mapping interrupt[%d]\n",
- regEntry->getName(), mapped->getCount());
+ regEntry->getName(), mapped->getCount());
break;
}
} else {
@@ -686,47 +621,8 @@
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);
@@ -734,7 +630,7 @@
ok &= (localBits == localEnd);
if( ok ) {
- // store results
+ // store results
ok = regEntry->setProperty( gIOInterruptControllersKey, controllers);
ok &= regEntry->setProperty( gIOInterruptSpecifiersKey, mapped);
}
@@ -745,11 +641,6 @@
mapped->release();
return( ok );
-}
-
-bool IODTMapInterrupts( IORegistryEntry * regEntry )
-{
- return( IODTMapInterruptsSharing( regEntry, 0 ));
}
/*
@@ -835,7 +726,7 @@
obj->release();
}
#ifdef DEBUG
- else IOLog("Couldn't unserialize %s\n", keys );
+ else IOLog("Couldn't unserialize %s\n", keys );
#endif
return( result );
@@ -855,7 +746,6 @@
iter = IORegistryIterator::iterateOver( from, gIODTPlane,
(options & kIODTRecursive) ? kIORegistryIterateRecursively : 0 );
if( iter) {
-
do {
if( result)
@@ -869,18 +759,17 @@
// Look for existence of a debug property to skip
if( next->getProperty("AAPL,ignore"))
- continue;
+ continue;
- if( keys) {
+ if( keys) {
cmp = IODTMatchNubWithKeys( next, keys );
if( (minus && (false == cmp))
|| ((false == minus) && (false != cmp)) )
result->setObject( next);
- } else
+ } else
result->setObject( next);
}
} while( !iter->isValid());
-
iter->release();
}
@@ -907,7 +796,7 @@
persist.locationFunc = locationFunc;
prop = OSData::withBytes( &persist, sizeof( persist));
if( !prop)
- return;
+ return;
regEntry->setProperty( gIODTPersistKey, prop);
prop->release();
@@ -919,6 +808,7 @@
cellCount--;
return( left[ cellCount ] - right[ cellCount ] );
}
+
void IODTGetCellCounts( IORegistryEntry * regEntry,
UInt32 * sizeCount, UInt32 * addressCount)
@@ -927,7 +817,7 @@
*sizeCount = 1;
if( !GetUInt32( regEntry, gIODTAddressCellKey, addressCount))
*addressCount = 2;
- return;
+ return;
}
// Given addr & len cells from our child, find it in our ranges property, then
@@ -940,23 +830,20 @@
UInt32 cellsIn[],
IOPhysicalAddress * phys, IOPhysicalLength * len )
{
- IORegistryEntry *parent;
- OSData *prop;
+ IORegistryEntry *parent;
+ OSData *prop;
// cells in addresses at regEntry
- UInt32 sizeCells, addressCells;
+ UInt32 sizeCells, addressCells;
// cells in addresses below regEntry
- UInt32 childSizeCells, childAddressCells;
- UInt32 childCells;
- UInt32 cell[ 5 ], offset = 0, length;
- UInt32 endCell[ 5 ];
- UInt32 *range;
- UInt32 *lookRange;
- UInt32 *startRange;
- UInt32 *endRanges;
- bool ok = true;
- SInt32 diff, endDiff;
-
- IODTPersistent *persist;
+ UInt32 childSizeCells, childAddressCells;
+ UInt32 childCells;
+ UInt32 cell[ 5 ], offset = 0, length;
+ UInt32 *range;
+ UInt32 *endRanges;
+ bool ok = true;
+ SInt32 diff;
+
+ IODTPersistent *persist;
IODTCompareAddressCellFunc compare;
IODTGetCellCounts( regEntry, &childSizeCells, &childAddressCells );
@@ -965,85 +852,64 @@
bcopy( cellsIn, cell, 4 * childCells );
if( childSizeCells > 1)
*len = IOPhysical32( cellsIn[ childAddressCells ],
- cellsIn[ childAddressCells + 1 ] );
+ cellsIn[ childAddressCells + 1 ] );
else
*len = IOPhysical32( 0, cellsIn[ childAddressCells ] );
- do
- {
- prop = OSDynamicCast( OSData, regEntry->getProperty( gIODTRangeKey ));
- if( 0 == prop) {
- /* end of the road */
- *phys = IOPhysical32( 0, cell[ childAddressCells - 1 ] + offset);
- break;
- }
-
- parent = regEntry->getParentEntry( gIODTPlane );
- IODTGetCellCounts( parent, &sizeCells, &addressCells );
-
- if( (length = prop->getLength())) {
- // search
- startRange = (UInt32 *) prop->getBytesNoCopy();
- range = startRange;
- endRanges = range + (length / 4);
-
- prop = (OSData *) regEntry->getProperty( gIODTPersistKey );
- if( prop) {
- persist = (IODTPersistent *) prop->getBytesNoCopy();
- compare = persist->compareFunc;
- } else
- compare = DefaultCompare;
-
- for( ok = false;
- range < endRanges;
- range += (childCells + addressCells) ) {
-
- // is cell start >= range start?
- diff = (*compare)( childAddressCells, cell, range );
- if( diff < 0)
- continue;
-
- ok = (0 == cell[childCells - 1]);
- if (!ok)
- {
- // search for cell end
- bcopy(cell, endCell, childAddressCells * sizeof(UInt32));
- endCell[childAddressCells - 1] += cell[childCells - 1] - 1;
- lookRange = startRange;
- for( ;
- lookRange < endRanges;
- lookRange += (childCells + addressCells) )
- {
- // is cell >= range start?
- endDiff = (*compare)( childAddressCells, endCell, lookRange );
- if( endDiff < 0)
- continue;
- if ((endDiff - cell[childCells - 1] + 1 + lookRange[childAddressCells + addressCells - 1])
- == (diff + range[childAddressCells + addressCells - 1]))
- {
- ok = true;
- break;
- }
- }
- if (!ok)
- continue;
- }
- offset += diff;
- break;
- }
-
- // Get the physical start of the range from our parent
- bcopy( range + childAddressCells, cell, 4 * addressCells );
- bzero( cell + addressCells, 4 * sizeCells );
-
- } /* else zero length range => pass thru to parent */
-
- regEntry = parent;
+ do {
+ prop = OSDynamicCast( OSData, regEntry->getProperty( gIODTRangeKey ));
+ if( 0 == prop) {
+ /* end of the road */
+ *phys = IOPhysical32( 0, cell[ childAddressCells - 1 ] + offset);
+ break;
+ }
+
+ parent = regEntry->getParentEntry( gIODTPlane );
+ IODTGetCellCounts( parent, &sizeCells, &addressCells );
+
+ if( (length = prop->getLength())) {
+ // search
+ range = (UInt32 *) prop->getBytesNoCopy();
+ endRanges = range + (length / 4);
+
+ prop = (OSData *) regEntry->getProperty( gIODTPersistKey );
+ if( prop) {
+ persist = (IODTPersistent *) prop->getBytesNoCopy();
+ compare = persist->compareFunc;
+ } else
+ compare = DefaultCompare;
+
+ for( ok = false;
+ range < endRanges;
+ range += (childCells + addressCells) ) {
+
+ // is cell >= range start?
+ diff = (*compare)( childAddressCells, cell, range );
+ if( diff < 0)
+ continue;
+
+ // is cell + size <= range end?
+ if( (diff + cell[ childCells - 1 ])
+ > range[ childCells + addressCells - 1 ])
+ continue;
+
+ offset += diff;
+ ok = true;
+ break;
+ }
+
+ // Get the physical start of the range from our parent
+ 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);
+ childCells = childAddressCells + childSizeCells;
+
+ } while( ok && regEntry);
return( ok);
}
@@ -1066,11 +932,11 @@
parentEntry = regEntry->getParentEntry( gIODTPlane );
addressProperty = (OSData *) regEntry->getProperty( addressPropertyName );
if( (0 == addressProperty) || (0 == parentEntry))
- return( 0);
+ return( 0);
IODTGetCellCounts( parentEntry, &sizeCells, &addressCells );
if( 0 == sizeCells)
- return( 0);
+ return( 0);
cells = sizeCells + addressCells;
reg = (UInt32 *) addressProperty->getBytesNoCopy();
@@ -1078,20 +944,20 @@
array = OSArray::withCapacity( 1 );
if( 0 == array)
- return( 0);
+ return( 0);
for( i = 0; i < num; i++) {
- if( IODTResolveAddressCell( parentEntry, reg, &phys, &len )) {
- range = 0;
- if( parent)
- range = IODeviceMemory::withSubRange( parent,
- phys - parent->getPhysicalAddress(), len );
- if( 0 == range)
- range = IODeviceMemory::withRange( phys, len );
- if( range)
- array->setObject( range );
- }
- reg += cells;
+ if( IODTResolveAddressCell( parentEntry, reg, &phys, &len )) {
+ range = 0;
+ if( parent)
+ range = IODeviceMemory::withSubRange( parent,
+ phys - parent->getPhysicalAddress(), len );
+ if( 0 == range)
+ range = IODeviceMemory::withRange( phys, len );
+ if( range)
+ array->setObject( range );
+ }
+ reg += cells;
}
regEntry->setProperty( gIODeviceMemoryKey, array);
@@ -1113,7 +979,7 @@
prop = (OSData *) parent->getProperty( gIODTPersistKey );
if( prop) {
persist = (IODTPersistent *) prop->getBytesNoCopy();
- (*persist->locationFunc)( regEntry, busNum, deviceNum, functionNum );
+ (*persist->locationFunc)( regEntry, busNum, deviceNum, functionNum );
} else {
prop = (OSData *) regEntry->getProperty( "reg" );
*functionNum = 0;
@@ -1124,7 +990,7 @@
} else {
*busNum = 0;
*deviceNum = 0;
- }
+ }
}
return;
}
@@ -1151,14 +1017,14 @@
IODTGetNVLocation( parent, regEntry,
&busNum, &deviceNum, &functionNum );
- if( level)
- bridgeDevices |= ((deviceNum & 0x1f) << ((level - 1) * 5));
- else {
+ if( level)
+ bridgeDevices |= ((deviceNum & 0x1f) << ((level - 1) * 5));
+ else {
hdr->busNum = busNum;
hdr->deviceNum = deviceNum;
hdr->functionNum = functionNum;
- }
- regEntry = parent;
+ }
+ regEntry = parent;
}
hdr->bridgeCount = level - 2;
hdr->bridgeDevices = bridgeDevices;
@@ -1179,43 +1045,38 @@
data = (OSData *) regEntry->getProperty("AAPL,slot-name");
if( data)
- return( data);
+ return( data);
parent = regEntry->getParentEntry( gIODTPlane );
if( !parent)
- return( 0 );
+ return( 0 );
data = OSDynamicCast( OSData, parent->getProperty("slot-names"));
if( !data)
- return( 0 );
+ return( 0 );
if( data->getLength() <= 4)
- return( 0 );
+ return( 0 );
bits = (UInt32 *) data->getBytesNoCopy();
mask = *bits;
if( (0 == (mask & (1 << deviceNumber))))
- return( 0 );
+ return( 0 );
names = (char *)(bits + 1);
lastName = names + (data->getLength() - 4);
for( i = 0; (i <= deviceNumber) && (names < lastName); i++ ) {
- if( mask & (1 << i)) {
+ if( mask & (1 << i)) {
if( i == deviceNumber) {
- data = OSData::withBytesNoCopy( names, 1 + strlen( names));
- if( data) {
- regEntry->setProperty("AAPL,slot-name", data);
- ret = data;
- data->release();
- }
+ data = OSData::withBytesNoCopy( names, 1 + strlen( names));
+ if( data) {
+ regEntry->setProperty("AAPL,slot-name", data);
+ ret = data;
+ data->release();
+ }
} else
- names += 1 + strlen( names);
+ names += 1 + strlen( names);
}
}
return( ret );
}
-
-extern "C" IOReturn IONDRVLibrariesInitialize( IOService * provider )
-{
- return( kIOReturnUnsupported );
-}