xnu-1699.24.23.tar.gz

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

diff --git a/iokit/IOKit/IODeviceTreeSupport.h b/iokit/IOKit/IODeviceTreeSupport.h
index 6504ccf2c5cdfb5d37b53de6ffb36a0292e49951..15b5aa4b410cc37e1d67c64b2e76ae0471bcb2ac 100644 (file)
--- 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;
@@ -86,8 +88,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 +96,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 );