xnu-2422.115.4.tar.gz

[apple/xnu.git] / iokit / IOKit / IODeviceTreeSupport.h

diff --git a/iokit/IOKit/IODeviceTreeSupport.h b/iokit/IOKit/IODeviceTreeSupport.h
index 46e3da7b6a2bb7ec249594acc2405c88fe195252..9b39a2dc2b85e9dae454023666a716bf8c561f75 100644 (file)
--- a/iokit/IOKit/IODeviceTreeSupport.h
+++ b/iokit/IOKit/IODeviceTreeSupport.h
@@ -1,23 +1,29 @@
 /*
  * Copyright (c) 1998-2000 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@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * Copyright (c) 1998 Apple Computer, Inc.  All rights reserved. 
@@ -37,6 +43,8 @@ class IOService;
 
 extern const IORegistryPlane * gIODTPlane;
 
+extern const OSSymbol *                gIODTPHandleKey;
+
 extern const OSSymbol *                gIODTCompatibleKey;
 extern const OSSymbol *        gIODTTypeKey;
 extern const OSSymbol *        gIODTModelKey;
@@ -64,6 +72,7 @@ OSCollectionIterator * IODTFindMatchingEntries( IORegistryEntry * from,
 
 typedef SInt32 (*IODTCompareAddressCellFunc)
        (UInt32 cellCount, UInt32 left[], UInt32 right[]);
+
 typedef void (*IODTNVLocationFunc)
        (IORegistryEntry * entry,
        UInt8 * busNum, UInt8 * deviceNum, UInt8 * functionNum );
@@ -72,6 +81,9 @@ void IODTSetResolving( IORegistryEntry *      regEntry,
                IODTCompareAddressCellFunc      compareFunc,
                IODTNVLocationFunc              locationFunc );
 
+void IODTGetCellCounts( IORegistryEntry * regEntry,
+                                           UInt32 * sizeCount, UInt32 * addressCount);
+
 bool IODTResolveAddressCell( IORegistryEntry * regEntry,
                              UInt32 cellsIn[],
                              IOPhysicalAddress * phys, IOPhysicalLength * len );
@@ -80,8 +92,6 @@ OSArray * IODTResolveAddressing( IORegistryEntry * regEntry,
                        const char * addressPropertyName,
                        IODeviceMemory * parent );
 
-#pragma options align=mac68k
-
 struct IONVRAMDescriptor {
     unsigned int format:4;
     unsigned int marker:1;
@@ -90,9 +100,7 @@ struct IONVRAMDescriptor {
     unsigned int bridgeDevices:6 * 5;
     unsigned int functionNum:3;
     unsigned int deviceNum:5;
-};
-
-#pragma options align=reset
+} __attribute__((aligned(2), packed));
 
 IOReturn IODTMakeNVDescriptor( IORegistryEntry * regEntry,
                                IONVRAMDescriptor * hdr );