X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/8f6c56a50524aa785f7e596d52dddfb331e18961..15129b1c8dbb3650c63b70adb1cad9af601c6c17:/iokit/IOKit/IODeviceTreeSupport.h?ds=sidebyside

diff --git a/iokit/IOKit/IODeviceTreeSupport.h b/iokit/IOKit/IODeviceTreeSupport.h
index 6504ccf2c..9b39a2dc2 100644
--- a/iokit/IOKit/IODeviceTreeSupport.h
+++ b/iokit/IOKit/IODeviceTreeSupport.h
@@ -43,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;
@@ -70,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 );
@@ -78,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 );
@@ -86,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;
@@ -96,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 );