Loading...
--- xnu/xnu-792.2.4/iokit/Kernel/IODeviceTreeSupport.cpp
+++ xnu/xnu-344/iokit/Kernel/IODeviceTreeSupport.cpp
@@ -19,6 +19,14 @@
*
* @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>
#include <libkern/c++/OSContainers.h>
@@ -29,8 +37,7 @@
#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 );
@@ -67,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 );
@@ -142,7 +148,7 @@
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 {
@@ -187,20 +193,17 @@
// 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 ) {
+ assert( regIter );
+ if( regIter) {
while( (child = regIter->getNextObject())) {
- IODTMapInterruptsSharing( child, allInts );
+ IODTMapInterrupts( child );
if( !intMap && child->getProperty( gIODTInterruptParentKey))
intMap = true;
@@ -224,34 +227,12 @@
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);
}
@@ -587,57 +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;
- 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))));
@@ -678,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);
@@ -737,11 +641,6 @@
mapped->release();
return( ok );
-}
-
-bool IODTMapInterrupts( IORegistryEntry * regEntry )
-{
- return( IODTMapInterruptsSharing( regEntry, 0 ));
}
/*
@@ -1183,8 +1082,3 @@
return( ret );
}
-
-extern "C" IOReturn IONDRVLibrariesInitialize( IOService * provider )
-{
- return( kIOReturnUnsupported );
-}