xnu-517.tar.gz

[apple/xnu.git] / iokit / Kernel / IODeviceTreeSupport.cpp

diff --git a/iokit/Kernel/IODeviceTreeSupport.cpp b/iokit/Kernel/IODeviceTreeSupport.cpp
index 437dc4e58d6dc9c9a855cb20dc8d71fb9c9bc149..e5b1a21727685ae59be0f4bf490d4b8a796de011 100644 (file)
--- a/iokit/Kernel/IODeviceTreeSupport.cpp
+++ b/iokit/Kernel/IODeviceTreeSupport.cpp
@@ -24,6 +24,11 @@
  */
 /*
  * Copyright (c) 1998 Apple Computer, Inc.  All rights reserved. 
  */
 /*
  * 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 <IOKit/IODeviceTreeSupport.h>


@@ -35,7 +40,8 @@
 #include <IOKit/IOLib.h>
 #include <IOKit/IOKitKeys.h>
 
 #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 );
 extern "C" {
     #include <machine/machine_routines.h>
     void DTInit( void * data );


@@ -94,8 +100,6 @@ IODeviceTreeAlloc( void * dtTop )
     bool                               intMap;
     bool                               freeDT;
 
     bool                               intMap;
     bool                               freeDT;
 

-    IOLog("IODeviceTreeSupport ");
-

     gIODTPlane = IORegistryEntry::makePlane( kIODeviceTreePlane );
 
     gIODTNameKey               = OSSymbol::withCStringNoCopy( "name" );
     gIODTPlane = IORegistryEntry::makePlane( kIODeviceTreePlane );
 
     gIODTNameKey               = OSSymbol::withCStringNoCopy( "name" );


@@ -146,7 +150,7 @@ IODeviceTreeAlloc( void * dtTop )
 
     parent = MakeReferenceTable( (DTEntry)dtTop, freeDT );
 
 
     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 {
     DTCreateEntryIterator( (DTEntry)dtTop, &iter );
 
     do {


@@ -191,7 +195,7 @@ IODeviceTreeAlloc( void * dtTop )
         // free original device tree
         DTInit(0);
         IODTFreeLoaderInfo( "DeviceTree",
         // free original device tree
         DTInit(0);
         IODTFreeLoaderInfo( "DeviceTree",

-                       (void *)dtMap[0], round_page(dtMap[1]) );
+                       (void *)dtMap[0], round_page_32(dtMap[1]) );

     }
 
     // adjust tree
     }
 
     // adjust tree


@@ -230,8 +234,6 @@ IODeviceTreeAlloc( void * dtTop )
         parent->setProperty( gIODTNWInterruptMappingKey,
                 (OSObject *) gIODTNWInterruptMappingKey );
 
         parent->setProperty( gIODTNWInterruptMappingKey,
                 (OSObject *) gIODTNWInterruptMappingKey );
 

-    IOLog("done\n");
-

     return( parent);
 }
 
     return( parent);
 }