Loading...
iokit/Kernel/IODeviceTreeSupport.cpp xnu-792.2.4 xnu-124.13
--- xnu/xnu-792.2.4/iokit/Kernel/IODeviceTreeSupport.cpp
+++ xnu/xnu-124.13/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,19 +37,17 @@
 #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>
 
-#define IODTSUPPORTDEBUG 0
 
 const IORegistryPlane * gIODTPlane;
 
@@ -67,42 +73,42 @@
 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;
-    DTEntryIterator		iter;
-    DTEntry			dtChild;
-    DTEntry			mapEntry;
-    OSArray *			stack;
-    OSData *			prop;
-    OSObject *			obj;
-    OSDictionary *		allInts;
-    vm_offset_t *		dtMap;
-    int				propSize;
-    bool			intMap;
-    bool			freeDT;
+    IORegistryEntry *	parent;
+    IORegistryEntry *	child;
+    IORegistryIterator * regIter;
+    DTEntryIterator 	iter;
+    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 );
 
-    gIODTNameKey 		= OSSymbol::withCStringNoCopy( "name" );
-    gIODTUnitKey 		= OSSymbol::withCStringNoCopy( "AAPL,unit-string" );
+    gIODTNameKey 	= OSSymbol::withCStringNoCopy( "name" );
+    gIODTUnitKey 	= OSSymbol::withCStringNoCopy( "AAPL,unit-string" );
     gIODTCompatibleKey 	= OSSymbol::withCStringNoCopy( "compatible" );
-    gIODTTypeKey 		= OSSymbol::withCStringNoCopy( "device_type" );
-    gIODTModelKey 		= OSSymbol::withCStringNoCopy( "model" );
+    gIODTTypeKey 	= OSSymbol::withCStringNoCopy( "device_type" );
+    gIODTModelKey 	= OSSymbol::withCStringNoCopy( "model" );
     gIODTSizeCellKey 	= OSSymbol::withCStringNoCopy( "#size-cells" );
     gIODTAddressCellKey = OSSymbol::withCStringNoCopy( "#address-cells" );
-    gIODTRangeKey 		= OSSymbol::withCStringNoCopy( "ranges" );
-    gIODTPersistKey		= OSSymbol::withCStringNoCopy( "IODTPersist" );
+    gIODTRangeKey 	= OSSymbol::withCStringNoCopy( "ranges" );
+
+    gIODTPersistKey = OSSymbol::withCStringNoCopy( "IODTPersist" );
 
     assert(    gIODTPlane && gIODTCompatibleKey
             && gIODTTypeKey && gIODTModelKey
@@ -110,23 +116,23 @@
             && gIODTPersistKey );
 
     gIODTDefaultInterruptController
-		= OSSymbol::withCStringNoCopy("IOPrimaryInterruptController");
+	= OSSymbol::withCStringNoCopy("IOPrimaryInterruptController");
     gIODTNWInterruptMappingKey
-		= OSSymbol::withCStringNoCopy("IONWInterrupts");
+	= OSSymbol::withCStringNoCopy("IONWInterrupts");
 
     gIODTAAPLInterruptsKey
-		= OSSymbol::withCStringNoCopy("AAPL,interrupts");
+	= OSSymbol::withCStringNoCopy("AAPL,interrupts");
     gIODTPHandleKey
-		= OSSymbol::withCStringNoCopy("AAPL,phandle");
+	= OSSymbol::withCStringNoCopy("AAPL,phandle");
 
     gIODTInterruptParentKey
-		= OSSymbol::withCStringNoCopy("interrupt-parent");
+	= OSSymbol::withCStringNoCopy("interrupt-parent");
 
     gIODTPHandles	= OSArray::withCapacity( 1 );
     gIODTPHandleMap	= OSArray::withCapacity( 1 );
 
     gIODTInterruptCellKey
-		= OSSymbol::withCStringNoCopy("#interrupt-cells");
+	= OSSymbol::withCStringNoCopy("#interrupt-cells");
 
     assert(    gIODTDefaultInterruptController && gIODTNWInterruptMappingKey 
 	    && gIODTAAPLInterruptsKey
@@ -142,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) ) {
@@ -155,18 +161,18 @@
             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()
-		&& (kSuccess == DTExitEntry( iter, &dtChild)));
+	  && (kSuccess == DTExitEntry( iter, &dtChild)));
 
     stack->release();
     DTDisposeEntryIterator( iter);
@@ -175,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
@@ -187,71 +193,48 @@
         // 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
+    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())) ) {
+	    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();
+	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);
 }
@@ -259,7 +242,7 @@
 int IODTGetLoaderInfo( char *key, void **infoAddr, int *infoSize )
 {
     IORegistryEntry		*chosen;
-    OSData				*propObj;
+    OSData			*propObj;
     unsigned int		*propPtr;
     unsigned int		propSize;
 
@@ -311,73 +294,73 @@
 static IORegistryEntry *
 MakeReferenceTable( DTEntry dtEntry, bool copy )
 {
-    IORegistryEntry		*regEntry;
-    OSDictionary		*propTable;
-    const OSSymbol		*nameKey;
-    OSData				*data;
-    const OSSymbol		*sym;
+    IORegistryEntry *	regEntry;
+    OSDictionary *	propTable;
+    const OSSymbol *	nameKey;
+    OSData *		data;
+    const OSSymbol *	sym;
     DTPropertyIterator	dtIter;
-    void				*prop;
-    int					propSize;
-    char				*name;
-    char				location[ 32 ];
-    bool				noLocation = true;
+    void *		prop;
+    int			propSize;
+    char *		name;
+    char		location[ 32 ];
+    bool		noLocation = true;
 
     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) {
+	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 {
+	    } else {
                 nameKey = OSSymbol::withCStringNoCopy(name);
                 data = OSData::withBytesNoCopy(prop, propSize);
-            }
-            assert( nameKey && data );
+	    }
+	    assert( nameKey && data );
 
             propTable->setObject( nameKey, data);
-            data->release();
+	    data->release();
             nameKey->release();
 
-            if( nameKey == gIODTNameKey ) {
-                if( copy)
+	    if( nameKey == gIODTNameKey ) {
+		if( copy)
                     sym = OSSymbol::withCString( (const char *) prop);
-                else
+		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;
+		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
+		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);
+	    }
+	}
+	DTDisposePropertyIterator( dtIter);
     }
 
     return( regEntry);
@@ -388,24 +371,26 @@
     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 );
     }
 }
 
 static IORegistryEntry * FindPHandle( UInt32 phandle )
 {
-    OSData			*data;
-    IORegistryEntry *regEntry = 0;
-    int				i;
-
-    for( i = 0; (data = (OSData *)gIODTPHandles->getObject( i )); i++ ) {
-        if( phandle == *((UInt32 *)data->getBytesNoCopy())) {
-            regEntry = (IORegistryEntry *)
-            gIODTPHandleMap->getObject( i );
-            break;
+    OSData *		data;
+    IORegistryEntry *	regEntry = 0;
+    int			i;
+
+    for( i = 0;
+       (data = (OSData *)gIODTPHandles->getObject( i ));
+       i++ ) {
+            if( phandle == *((UInt32 *)data->getBytesNoCopy())) {
+		regEntry = (IORegistryEntry *)
+				gIODTPHandleMap->getObject( i );
+		break;
         }
     }
 
@@ -415,14 +400,14 @@
 static bool GetUInt32( IORegistryEntry * regEntry, const OSSymbol * name,
 			UInt32 * value )
 {
-    OSData	*data;
+    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 )
@@ -431,19 +416,19 @@
     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 );
 }
 
 const OSSymbol * IODTInterruptControllerName( IORegistryEntry * regEntry )
 {
-    const OSSymbol	*sym;
+    const OSSymbol *	sym;
     UInt32		phandle;
     bool		ok;
     char 		buf[48];
@@ -455,7 +440,7 @@
         sprintf( buf, "IOInterruptController%08lX", phandle);
         sym = OSSymbol::withCString( buf );
     } else
-        sym = 0;
+	sym = 0;
 
     return( sym );
 }
@@ -474,86 +459,41 @@
 UInt32 IODTMapOneInterrupt( IORegistryEntry * regEntry, UInt32 * intSpec,
 				OSData ** spec, const OSSymbol ** controller )
 {
-    IORegistryEntry *parent = 0;
-    OSData			*data;
-    UInt32			*addrCmp;
-    UInt32			*maskCmp;
-    UInt32			*map;
-    UInt32			*endMap;
-    UInt32			acells, icells, pacells, picells, cell;
-    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();
-    }
-    original_icells = icells;
-    regEntry = parent;
-    
+    IORegistryEntry *	parent = 0;
+    OSData *		data;
+    UInt32 *		addrCmp;
+    UInt32 *		maskCmp;
+    UInt32 *		map;
+    UInt32 *		endMap;
+    UInt32		acells, icells, pacells, picells, cell;
+    UInt32		i, skip = 0;
+    bool		cmp, ok = false;
+
     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");
-#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;
-
-#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");
-#endif
+	    else
+		maskCmp = 0;
+
             do {
-#if IODTSUPPORTDEBUG
-                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];
@@ -564,94 +504,67 @@
                 if( 0 == (parent = FindPHandle( *(map++) )))
                     unexpected(break);
 
-                IODTGetICellCounts( parent, &picells, &pacells );
-                if( cmp) {
-                    addrCmp = map;
-                    intSpec = map + pacells;
-                    regEntry = parent;
-                } else {
+                if( cmp)
+                    intSpec = map;
+		else {
+		    IODTGetICellCounts( parent, &picells, &pacells );
                     map += pacells + picells;
-                }
+                    parent = 0;
+		}
             } while( !cmp && (map < endMap) );
-            if (!cmp)
-                parent = 0;
-        } 
-
-        if( parent) {
+
+	} else
+            // first time (usually)
+            parent = IODTFindInterruptParent( regEntry );
+
+	if( parent) {
             IODTGetICellCounts( parent, &icells, &acells );
-            regEntry = parent;
-        }
-
+	    addrCmp = 0;
+	    if( acells) {
+                data = OSDynamicCast( OSData, regEntry->getProperty( "reg" ));
+                if( data && (data->getLength() >= (acells * sizeof( UInt32))))
+                    addrCmp = (UInt32 *) data->getBytesNoCopy();
+	    }
+	    regEntry = parent;
+	    if( !skip)
+		skip = icells;
+	}
     } 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 )
+    if( ok)
+        return( skip );
+    else
+        return( 0 );
+}
+
+bool IODTMapInterrupts( IORegistryEntry * regEntry )
 {
     IORegistryEntry *	parent;
     OSData *		local;
     OSData *		local2;
     UInt32 *		localBits;
     UInt32 *		localEnd;
-    OSData * 		map;
-    OSObject *		oneMap;
+    OSData *		map;
     OSArray *		mapped;
-    OSArray *		controllerInts;
     const OSSymbol *	controller;
     OSArray *		controllers;
     UInt32		skip = 1;
     bool		ok, nw;
 
     nw = (0 == (local = OSDynamicCast( OSData,
-        regEntry->getProperty( gIODTAAPLInterruptsKey))));
-    if( nw && (0 == (local = OSDynamicCast( OSData,
-        regEntry->getProperty( "interrupts")))))
-        return( true );		// nothing to see here
+                              regEntry->getProperty( gIODTAAPLInterruptsKey))));
+    if( nw
+      && (0 == (local = OSDynamicCast( OSData,
+                              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();
@@ -671,54 +584,14 @@
             }
         } else {
             map = OSData::withData( local, mapped->getCount() * sizeof( UInt32),
-				sizeof( UInt32));
+                                    sizeof( UInt32));
             controller = gIODTDefaultInterruptController;
-            controller->retain();
         }
 
         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);
@@ -726,7 +599,7 @@
     ok &= (localBits == localEnd);
 
     if( ok ) {
-        // store results
+	// store results
         ok  = regEntry->setProperty( gIOInterruptControllersKey, controllers);
         ok &= regEntry->setProperty( gIOInterruptSpecifiersKey, mapped);
     }
@@ -739,11 +612,6 @@
     return( ok );
 }
 
-bool IODTMapInterrupts( IORegistryEntry * regEntry )
-{
-    return( IODTMapInterruptsSharing( regEntry, 0 ));
-}
-
 /*
  */
 
@@ -751,16 +619,16 @@
 CompareKey( OSString * key,
 		const IORegistryEntry * table, const OSSymbol * propName )
 {
-    OSObject		*prop;
-    OSData			*data;
-    OSString		*string;
-    const char		*ckey;
-    UInt32			keyLen;
-    const char		*names;
-    const char		*lastName;
-    bool			wild;
-    bool			matched;
-    const char		*result = 0;
+    OSObject *		prop;
+    OSData *		data;
+    OSString *		string;
+    const char *	ckey;
+    UInt32		keyLen;
+    const char *	names;
+    const char *	lastName;
+    bool		wild;
+    bool		matched;
+    const char *	result = 0;
 
     if( 0 == (prop = table->getProperty( propName )))
 	return( 0 );
@@ -768,11 +636,13 @@
     if( (data = OSDynamicCast( OSData, prop ))) {
         names = (const char *) data->getBytesNoCopy();
         lastName = names + data->getLength();
+
     } else if( (string = OSDynamicCast( OSString, prop ))) {
         names = string->getCStringNoCopy();
         lastName = names + string->getLength() + 1;
+
     } else
-		return( 0 );
+	return( 0 );
 
     ckey = key->getCStringNoCopy();
     keyLen = key->getLength();
@@ -800,8 +670,8 @@
 bool IODTCompareNubName( const IORegistryEntry * regEntry,
 			 OSString * name, OSString ** matchingName )
 {
-    const char		*result;
-    bool			matched;
+    const char *	result;
+    bool		matched;
 
     matched =  (0 != (result = CompareKey( name, regEntry, gIODTNameKey)))
 	    || (0 != (result = CompareKey( name, regEntry, gIODTCompatibleKey)))
@@ -817,14 +687,14 @@
 bool IODTMatchNubWithKeys( IORegistryEntry * regEntry,
                                     const char * keys )
 {
-    OSObject	*obj;
+    OSObject *		obj;
     bool		result = false;
 
     obj = OSUnserialize( keys, 0 );
 
     if( obj) {
         result = regEntry->compareNames( obj );
-		obj->release();
+	obj->release();
     }
 #ifdef DEBUG
     else IOLog("Couldn't unserialize %s\n", keys );
@@ -836,43 +706,34 @@
 OSCollectionIterator * IODTFindMatchingEntries( IORegistryEntry * from,
 			IOOptionBits options, const char * keys )
 {
-    OSSet					*result = 0;
-    IORegistryEntry			*next;
-    IORegistryIterator		*iter;
-    OSCollectionIterator	*cIter;
-    bool					cmp;
-    bool					minus = options & kIODTExclusive;
-
+    OSSet *			result;
+    IORegistryEntry *		next;
+    IORegistryIterator *	iter;
+    OSCollectionIterator *	cIter;
+    bool			cmp;
+    bool			minus = options & kIODTExclusive;
+
+    result = OSSet::withCapacity( 3 );
+    if( !result)
+	return( 0);
 
     iter = IORegistryIterator::iterateOver( from, gIODTPlane,
-		(options & kIODTRecursive) ? kIORegistryIterateRecursively : 0 );
+	(options & kIODTRecursive) ? kIORegistryIterateRecursively : 0 );
     if( iter) {
-
-        do {
-
-            if( result)
-                result->release();
-            result = OSSet::withCapacity( 3 );
-            if( !result)
-                break;
-
-            iter->reset();
-            while( (next = iter->getNextObject())) {
-    
-                // Look for existence of a debug property to skip
-                if( next->getProperty("AAPL,ignore"))
-                    continue;
-    
-                if( keys) {
-                    cmp = IODTMatchNubWithKeys( next, keys );
-                    if( (minus && (false == cmp))
-                            || ((false == minus) && (false != cmp)) )
-                        result->setObject( next);
-                } else
+        while( (next = iter->getNextObject())) {
+
+            // Look for existence of a debug property to skip
+            if( next->getProperty("AAPL,ignore"))
+		continue;
+
+	    if( keys) {
+                cmp = IODTMatchNubWithKeys( next, keys );
+                if( (minus && (false == cmp))
+                || ((false == minus) && (false != cmp)) )
                     result->setObject( next);
-            }
-        } while( !iter->isValid());
-
+	    } else
+                result->setObject( next);
+        }
         iter->release();
     }
 
@@ -893,17 +754,16 @@
 		IODTNVLocationFunc		locationFunc )
 {
     IODTPersistent	persist;
-    OSData			*prop;
+    OSData	*	prop;
 
     persist.compareFunc = compareFunc;
     persist.locationFunc = locationFunc;
     prop = OSData::withBytes( &persist, sizeof( persist));
     if( !prop)
-        return;
+	return;
 
     regEntry->setProperty( gIODTPersistKey, prop);
     prop->release();
-    return;
 }
 
 static SInt32 DefaultCompare( UInt32 cellCount, UInt32 left[], UInt32 right[] )
@@ -920,7 +780,6 @@
         *sizeCount = 1;
     if( !GetUInt32( regEntry, gIODTAddressCellKey, addressCount))
         *addressCount = 2;
-    return;
 }
 
 // Given addr & len cells from our child, find it in our ranges property, then
@@ -933,20 +792,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		*range;
-    UInt32		*endRanges;
-    bool		ok = true;
-    SInt32		diff;
-
-    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 );
@@ -955,20 +814,20 @@
     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 */
+	    /* end of the road */
             *phys = IOPhysical32( 0,  cell[ childAddressCells - 1 ] + offset);
             break;
         }
 
         parent = regEntry->getParentEntry( gIODTPlane );
-        IODTGetCellCounts( parent, &sizeCells, &addressCells );
+	IODTGetCellCounts( parent, &sizeCells, &addressCells );
 
         if( (length = prop->getLength())) {
             // search
@@ -990,7 +849,6 @@
                 diff = (*compare)( childAddressCells, cell, range );
                 if( diff < 0)
                     continue;
-                    
                 // is cell + size <= range end?
                 if( (diff + cell[ childCells - 1 ])
                         > range[ childCells + addressCells - 1 ])
@@ -1022,24 +880,24 @@
 			const char * addressPropertyName,
 			IODeviceMemory * parent )
 {
-    IORegistryEntry		*parentEntry;
-    OSData				*addressProperty;
-    UInt32				sizeCells, addressCells, cells;
-    int					i, num;
-    UInt32				*reg;
+    IORegistryEntry *	parentEntry;
+    OSData *		addressProperty;
+    UInt32		sizeCells, addressCells, cells;
+    int			i, num;
+    UInt32 *		reg;
     IOPhysicalAddress	phys;
     IOPhysicalLength	len;
-    OSArray				*array;
-    IODeviceMemory		*range;
+    OSArray *		array;
+    IODeviceMemory *	range;
 
     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();
@@ -1047,19 +905,21 @@
 
     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)
+
+	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;
     }
 
@@ -1075,27 +935,33 @@
 	UInt8 * busNum, UInt8 * deviceNum, UInt8 * functionNum )
 {
 
-    OSData			*prop;
-    IODTPersistent	*persist;
-    UInt32			*cell;
+    OSData	*	prop;
+    IODTPersistent *	persist;
+    UInt32	*	cell;
 
     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;
         if( prop) {
             cell = (UInt32 *) prop->getBytesNoCopy();
+#if 0
+            if( (regHi & 0xf0000000) != 0xf0000000) {
+                *bus 		= 0x03 & (regHi >> 16);
+                *function 	= 0x07 & (regHi >> 8);
+                *device 	= 0x1f & (regHi >> 11);
+#endif
             *busNum 	= 3;
             *deviceNum 	= 0x1f & (cell[ 0 ] >> 24);
         } else {
             *busNum 	= 0;
             *deviceNum 	= 0;
-        }
-    }
-    return;
+	}
+    }
 }
 
 /*
@@ -1105,29 +971,32 @@
 IOReturn IODTMakeNVDescriptor( IORegistryEntry * regEntry,
 				IONVRAMDescriptor * hdr )
 {
-    IORegistryEntry		*parent;
-    UInt32				level;
-    UInt32				bridgeDevices;
-    UInt8				busNum;
-    UInt8				deviceNum;
-    UInt8				functionNum;
+    IORegistryEntry *	parent;
+    UInt32		level;
+    UInt32		bridgeDevices;
+    UInt8		busNum;
+    UInt8		deviceNum;
+    UInt8		functionNum;
 
     hdr->format 	= 1;
     hdr->marker 	= 0;
 
-    for(level = 0, bridgeDevices = 0; 
-    	(parent = regEntry->getParentEntry( gIODTPlane )) && (level < 7); level++ ) {
+    for(
+	level = 0, bridgeDevices = 0;
+	(parent = regEntry->getParentEntry( gIODTPlane ))
+	&& (level < 7);
+	level++ ) {
 
         IODTGetNVLocation( parent, regEntry,
-			&busNum, &deviceNum, &functionNum );
-        if( level)
-            bridgeDevices |= ((deviceNum & 0x1f) << ((level - 1) * 5));
-        else {
+                            &busNum, &deviceNum, &functionNum );
+	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;
@@ -1137,45 +1006,47 @@
 
 OSData * IODTFindSlotName( IORegistryEntry * regEntry, UInt32 deviceNumber )
 {
-    IORegistryEntry		*parent;
-    OSData				*data;
-    OSData				*ret = 0;
-    UInt32				*bits;
-    UInt32				i;
-    char				*names;
-    char				*lastName;
-    UInt32				mask;
+    IORegistryEntry *	parent;
+    OSData *		data;
+    OSData *		ret = 0;
+    UInt32 *		bits;
+    UInt32		i;
+    char *		names;
+    char *		lastName;
+    UInt32		mask;
 
     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)) {
+    for( i = 0;
+        (i <= deviceNumber) && (names < lastName);
+        i++ ) {
+
+	if( mask & (1 << i)) {
             if( i == deviceNumber) {
-                data = OSData::withBytesNoCopy( names, 1 + strlen( names));
-                if( data) {
+		data = OSData::withBytesNoCopy( names, 1 + strlen( names));
+		if( data) {
                     regEntry->setProperty("AAPL,slot-name", data);
                     ret = data;
-                    data->release();
-                }
+		    data->release();
+		}
             } else
                 names += 1 + strlen( names);
         }
@@ -1183,8 +1054,3 @@
 
     return( ret );
 }
-
-extern "C" IOReturn IONDRVLibrariesInitialize( IOService * provider )
-{
-    return( kIOReturnUnsupported );
-}