Loading...
iokit/Kernel/IODeviceTreeSupport.cpp xnu-344 xnu-1504.9.17
--- xnu/xnu-344/iokit/Kernel/IODeviceTreeSupport.cpp
+++ xnu/xnu-1504.9.17/iokit/Kernel/IODeviceTreeSupport.cpp
@@ -1,31 +1,29 @@
 /*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 1998-2006 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
- * 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 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.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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
  * 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.
+ * 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_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.
- *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 
 #include <IOKit/IODeviceTreeSupport.h>
@@ -37,7 +35,8 @@
 #include <IOKit/IOLib.h>
 #include <IOKit/IOKitKeys.h>
 
-#include <DeviceTree.h>
+#include <pexpert/device_tree.h>
+
 extern "C" {
     #include <machine/machine_routines.h>
     void DTInit( void * data );
@@ -74,29 +73,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;
-    vm_offset_t			*dtMap;
-    int					propSize;
-    bool				intMap;
-    bool				freeDT;
-
-    IOLog("IODeviceTreeSupport ");
+    DTEntry			dtChild;
+    DTEntry			mapEntry;
+    OSArray *			stack;
+    OSData *			prop;
+    OSDictionary *		allInts;
+    vm_offset_t *		dtMap;
+    unsigned int		propSize;
+    bool			intMap;
+    bool			freeDT;
 
     gIODTPlane = IORegistryEntry::makePlane( kIODeviceTreePlane );
 
@@ -144,11 +143,11 @@
     freeDT = (kSuccess == DTLookupEntry( 0, "/chosen/memory-map", &mapEntry ))
 	  && (kSuccess == DTGetProperty( mapEntry,
                 "DeviceTree", (void **) &dtMap, &propSize ))
-	  && ((2 * sizeof( vm_offset_t)) == propSize);
+	  && ((2 * sizeof(uint32_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 {
@@ -193,19 +192,25 @@
         // free original device tree
         DTInit(0);
         IODTFreeLoaderInfo( "DeviceTree",
-			(void *)dtMap[0], round_page(dtMap[1]) );
+			    (void *)dtMap[0], (int) round_page(dtMap[1]) );
     }
 
     // adjust tree
+
+    gIODTSharedInterrupts = OSDictionary::withCapacity(4);
+    allInts = OSDictionary::withCapacity(4);
     intMap = false;
     regIter = IORegistryIterator::iterateOver( gIODTPlane,
 						kIORegistryIterateRecursively );
-    assert( regIter );
-    if( regIter) {
+    assert( regIter && allInts && gIODTSharedInterrupts );
+    if( regIter && allInts && gIODTSharedInterrupts ) {
         while( (child = regIter->getNextObject())) {
-            IODTMapInterrupts( child );
+            IODTMapInterruptsSharing( child, allInts );
             if( !intMap && child->getProperty( gIODTInterruptParentKey))
                 intMap = true;
+
+#if __ppc__
+            OSObject * obj;
 
             // Look for a "driver,AAPL,MacOSX,PowerPC" property.
             if( (obj = child->getProperty( "driver,AAPL,MacOSX,PowerPC"))) {
@@ -219,20 +224,43 @@
             if( (obj = child->getProperty( "driver,AAPL,MacOS,PowerPC"))) {
 
                 if( (0 == (prop = (OSData *)child->getProperty( gIODTTypeKey )))
-                  || (strcmp( "display", (char *) prop->getBytesNoCopy())) ) {
+                  || (strncmp("display", (char *)prop->getBytesNoCopy(), sizeof("display"))) ) {
                     child->removeProperty( "driver,AAPL,MacOS,PowerPC");
                 }
             }
+#endif /* __ppc__ */
         }
         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);
 }
@@ -299,7 +327,7 @@
     const OSSymbol		*sym;
     DTPropertyIterator	dtIter;
     void				*prop;
-    int					propSize;
+    unsigned int		propSize;
     char				*name;
     char				location[ 32 ];
     bool				noLocation = true;
@@ -344,17 +372,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 && (0 == strcmp( name, "reg"))) {
+            } else if(noLocation && (!strncmp(name, "reg", sizeof("reg")))) {
                 // default location - override later
-                sprintf( location, "%lX", *((UInt32 *) prop) );
+                snprintf(location, sizeof(location), "%X", *((uint32_t *) prop));
                 regEntry->setLocation( location );
             }
         }
@@ -406,15 +434,21 @@
         return( false );
 }
 
-IORegistryEntry * IODTFindInterruptParent( IORegistryEntry * regEntry )
+static IORegistryEntry * IODTFindInterruptParent( IORegistryEntry * regEntry, IOItemCount index )
 {
     IORegistryEntry *	parent;
     UInt32		phandle;
-
-    if( GetUInt32( regEntry, gIODTInterruptParentKey, &phandle))
-        parent = FindPHandle( phandle );
-
-    else if( 0 == regEntry->getProperty( "interrupt-controller"))
+    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"))
         parent = regEntry->getParentEntry( gIODTPlane);
     else
         parent = 0;
@@ -433,7 +467,7 @@
     assert( ok );
 
     if( ok) {
-        sprintf( buf, "IOInterruptController%08lX", phandle);
+        snprintf(buf, sizeof(buf), "IOInterruptController%08X", (uint32_t)phandle);
         sym = OSSymbol::withCString( buf );
     } else
         sym = 0;
@@ -452,8 +486,8 @@
         *aCellCount = 0;
 }
 
-UInt32 IODTMapOneInterrupt( IORegistryEntry * regEntry, UInt32 * intSpec,
-				OSData ** spec, const OSSymbol ** controller )
+static UInt32 IODTMapOneInterrupt( IORegistryEntry * regEntry, UInt32 * intSpec, UInt32 index,
+				    OSData ** spec, const OSSymbol ** controller )
 {
     IORegistryEntry *parent = 0;
     OSData			*data;
@@ -465,12 +499,12 @@
     UInt32			i, original_icells;
     bool			cmp, ok = false;
 
-    parent = IODTFindInterruptParent( regEntry );    
+    parent = IODTFindInterruptParent( regEntry, index );    
     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;
@@ -491,7 +525,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,
@@ -500,7 +534,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;
@@ -568,19 +602,58 @@
     return( ok ? original_icells : 0 );
 }
 
-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;
+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;
 
     nw = (0 == (local = OSDynamicCast( OSData,
         regEntry->getProperty( gIODTAAPLInterruptsKey))));
@@ -598,7 +671,8 @@
     }
 
     localBits = (UInt32 *) local->getBytesNoCopy();
-    localEnd = localBits + (local->getLength() / sizeof( UInt32));
+    localEnd = localBits + (local->getLength() / sizeof(UInt32));
+    index = 0;
     mapped = OSArray::withCapacity( 1 );
     controllers = OSArray::withCapacity( 1 );
 
@@ -606,23 +680,63 @@
 
     if( ok) do {
         if( nw) {
-            skip = IODTMapOneInterrupt( regEntry, localBits, &map, &controller );
+            skip = IODTMapOneInterrupt( regEntry, localBits, index, &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);
@@ -641,6 +755,11 @@
         mapped->release();
 
     return( ok );
+}
+
+bool IODTMapInterrupts( IORegistryEntry * regEntry )
+{
+    return( IODTMapInterruptsSharing( regEntry, 0 ));
 }
 
 /*
@@ -725,7 +844,7 @@
         result = regEntry->compareNames( obj );
 		obj->release();
     }
-#ifdef DEBUG
+#if DEBUG
     else IOLog("Couldn't unserialize %s\n", keys );
 #endif
 
@@ -796,7 +915,7 @@
 
     persist.compareFunc = compareFunc;
     persist.locationFunc = locationFunc;
-    prop = OSData::withBytes( &persist, sizeof( persist));
+    prop = OSData::withBytes( &persist, sizeof(persist));
     if( !prop)
         return;
 
@@ -810,7 +929,6 @@
     cellCount--;
     return( left[ cellCount ] - right[ cellCount ] );
 }
-
 
 void IODTGetCellCounts( IORegistryEntry * regEntry,
 			    UInt32 * sizeCount, UInt32 * addressCount)
@@ -840,10 +958,13 @@
     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;
+    SInt32		diff, diff2, endDiff;
 
     IODTPersistent	*persist;
     IODTCompareAddressCellFunc	compare;
@@ -851,67 +972,93 @@
     IODTGetCellCounts( regEntry, &childSizeCells, &childAddressCells );
     childCells = childAddressCells + childSizeCells;
 
-    bcopy( cellsIn, cell, 4 * childCells );
+    bcopy( cellsIn, cell, sizeof(UInt32) * 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 = 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 */
+    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 / sizeof(UInt32));
+
+	    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 within range?
+		diff = (*compare)( childAddressCells, cell, range );
+
+		bcopy(range, endCell, childAddressCells * sizeof(UInt32));
+		endCell[childAddressCells - 1] += range[childCells + addressCells - 1];
+		diff2 = (*compare)( childAddressCells, cell, endCell );
+
+		if ((diff < 0) || (diff2 >= 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, sizeof(UInt32) * addressCells );
+	    bzero( cell + addressCells, sizeof(UInt32) * sizeCells );
+
+	} /* else zero length range => pass thru to parent */
 
 	regEntry		= parent;
 	childSizeCells		= sizeCells;
 	childAddressCells	= addressCells;
 	childCells		= childAddressCells + childSizeCells;
-
-    } while( ok && regEntry);
+    }
+    while( ok && regEntry);
 
     return( ok);
 }
@@ -953,7 +1100,7 @@
             range = 0;
             if( parent)
                 range = IODeviceMemory::withSubRange( parent,
-                        phys - parent->getPhysicalAddress(), len );
+                        phys - parent->getPhysicalSegment(0, 0, kIOMemoryMapperNone), len );
             if( 0 == range)
                 range = IODeviceMemory::withRange( phys, len );
             if( range)
@@ -1082,3 +1229,8 @@
 
     return( ret );
 }
+
+extern "C" IOReturn IONDRVLibrariesInitialize( IOService * provider )
+{
+    return( kIOReturnUnsupported );
+}