xnu-4903.270.47.tar.gz

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

diff --git a/iokit/IOKit/IOPlatformExpert.h b/iokit/IOKit/IOPlatformExpert.h
index 4ed12a6a8809b87d41cc9718bb3ed5bf600f8969..7f47bc62c3e0180c6c1beec5a5c2b87f935b9112 100644 (file)
--- a/iokit/IOKit/IOPlatformExpert.h
+++ b/iokit/IOKit/IOPlatformExpert.h
@@ -1,15 +1,20 @@
 /*
  * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
  *
 /*
  * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
  *

- * @APPLE_LICENSE_HEADER_START@
- * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ *

  * 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
  * 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. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
+ * 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.
+ *
+ * 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,
  * 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,


@@ -17,11 +22,11 @@
  * 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.
  * 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. 
+ * Copyright (c) 1998 Apple Computer, Inc.  All rights reserved.

  *
  * HISTORY
  *
  *
  * HISTORY
  *


@@ -40,30 +45,85 @@
 extern "C" {
 #endif
 
 extern "C" {
 #endif
 

+#include <libkern/OSTypes.h>
+
+typedef enum {
+       kCoprocessorVersionNone    =   0x00000000,
+       kCoprocessorVersion1       =   0x00010000,
+       kCoprocessorVersion2       =   0x00020000,
+} coprocessor_type_t;
+
+

 extern boolean_t PEGetMachineName( char * name, int maxLength );
 extern boolean_t PEGetModelName( char * name, int maxLength );
 extern int PEGetPlatformEpoch( void );
 
 enum {
 extern boolean_t PEGetMachineName( char * name, int maxLength );
 extern boolean_t PEGetModelName( char * name, int maxLength );
 extern int PEGetPlatformEpoch( void );
 
 enum {

-  kPEHaltCPU,
-  kPERestartCPU,
-  kPEHangCPU
+       kPEHaltCPU,
+       kPERestartCPU,
+       kPEHangCPU,
+       kPEUPSDelayHaltCPU,
+       kPEPanicRestartCPU,
+       kPEPanicSync,
+       kPEPagingOff,
+       kPEPanicBegin,
+       kPEPanicEnd,
+       kPEPanicDiskShutdown

 };
 extern int (*PE_halt_restart)(unsigned int type);
 extern int PEHaltRestart(unsigned int type);
 
 };
 extern int (*PE_halt_restart)(unsigned int type);
 extern int PEHaltRestart(unsigned int type);
 

+#ifdef XNU_KERNEL_PRIVATE
+enum {
+       kIOSystemShutdownNotificationStageProcessExit = 0,
+       kIOSystemShutdownNotificationStageRootUnmount = 1,
+};
+extern void IOSystemShutdownNotification(int stage);
+#endif /* XNU_KERNEL_PRIVATE */
+

 // Save the Panic Info.  Returns the number of bytes saved.
 // Save the Panic Info.  Returns the number of bytes saved.

-extern unsigned long PESavePanicInfo(unsigned char *buffer, unsigned long  length);
+extern UInt32 PESavePanicInfo(UInt8 *buffer, UInt32 length);
+extern void PESavePanicInfoAction(void *buffer, UInt32 offset, UInt32 length);
+
+/*
+ * SMC requires that all data is flushed in multiples of 16 bytes at 16 byte
+ * boundaries.
+ */
+#define PANIC_FLUSH_BOUNDARY 16

 
 extern long PEGetGMTTimeOfDay( void );
 extern void PESetGMTTimeOfDay( long secs );
 
 extern long PEGetGMTTimeOfDay( void );
 extern void PESetGMTTimeOfDay( long secs );

-  
+extern void PEGetUTCTimeOfDay( clock_sec_t * secs, clock_usec_t * usecs );
+extern void PESetUTCTimeOfDay( clock_sec_t secs, clock_usec_t usecs );
+
+/* unless it's a "well-known" property, these will read/write out the value as raw data */
+
+extern boolean_t PEWriteNVRAMBooleanProperty(const char *symbol, boolean_t value);
+extern boolean_t PEWriteNVRAMProperty(const char *symbol, const void *value, const unsigned int len);
+extern boolean_t PEWriteNVRAMPropertyWithCopy(const char *symbol, const void *value, const unsigned int len);
+
+extern boolean_t PEReadNVRAMProperty(const char *symbol, void *value, unsigned int *len);
+
+extern boolean_t PERemoveNVRAMProperty(const char *symbol);
+
+extern coprocessor_type_t PEGetCoprocessorVersion( void );
+

 #ifdef __cplusplus
 } /* extern "C" */
 
 #define kIOPlatformMapperPresentKey "IOPlatformMapperPresent"
 
 #ifdef __cplusplus
 } /* extern "C" */
 
 #define kIOPlatformMapperPresentKey "IOPlatformMapperPresent"
 

-extern OSSymbol * gPlatformInterruptControllerName;
+
+
+
+extern OSSymbol *               gPlatformInterruptControllerName;
+
+extern const OSSymbol *         gIOPlatformSleepActionKey;
+extern const OSSymbol *         gIOPlatformWakeActionKey;
+extern const OSSymbol *         gIOPlatformQuiesceActionKey;
+extern const OSSymbol *         gIOPlatformActiveActionKey;
+extern const OSSymbol *         gIOPlatformHaltRestartActionKey;
+extern const OSSymbol *         gIOPlatformPanicActionKey;

 
 class IORangeAllocator;
 class IONVRAMController;
 
 class IORangeAllocator;
 class IONVRAMController;


@@ -71,101 +131,108 @@ class IOPMrootDomain;
 
 class IOPlatformExpert : public IOService
 {
 
 class IOPlatformExpert : public IOService
 {

-    OSDeclareDefaultStructors(IOPlatformExpert);
+       OSDeclareDefaultStructors(IOPlatformExpert);

 
 private:
 
 private:

-    long _peBootROMType;
-    long _peChipSetType;
-    long _peMachineType;
+       long _peBootROMType;
+       long _peChipSetType;
+       long _peMachineType;

 
 protected:
 
 protected:

-    IOPMrootDomain * root;
-    int _pePMFeatures;
-    int _pePrivPMFeatures;
-    int _peNumBatteriesSupported;
-    OSArray  * thePowerTree;
+       IOPMrootDomain * root;
+       int _pePMFeatures;
+       int _pePrivPMFeatures;
+       int _peNumBatteriesSupported;
+       OSArray  * thePowerTree;

 
 

-    bool       searchingForAdditionalParents;
-    OSNumber * multipleParentKeyValue;
-    int        numInstancesRegistered;
+       bool       searchingForAdditionalParents;
+       OSNumber * multipleParentKeyValue;
+       int        numInstancesRegistered;

 
 

-    struct ExpansionData { };
-    ExpansionData *reserved;
+       struct ExpansionData { };
+       ExpansionData *iope_reserved __unused;

 
 

-    virtual void setBootROMType(long peBootROMType);
-    virtual void setChipSetType(long peChipSetType);
-    virtual void setMachineType(long peMachineType);
+       virtual void setBootROMType(long peBootROMType);
+       virtual void setChipSetType(long peChipSetType);
+       virtual void setMachineType(long peMachineType);

 
 

-    virtual bool CheckSubTree (OSArray * inSubTree, IOService * theNub, IOService * theDevice, OSDictionary * theParent);
-    virtual bool RegisterServiceInTree (IOService * theService, OSDictionary * theTreeNode, OSDictionary * theTreeParentNode, IOService * theProvider);
+       virtual bool CheckSubTree(OSArray * inSubTree, IOService * theNub, IOService * theDevice, OSDictionary * theParent);
+       virtual bool RegisterServiceInTree(IOService * theService, OSDictionary * theTreeNode, OSDictionary * theTreeParentNode, IOService * theProvider);

 
 

-    virtual void PMInstantiatePowerDomains ( void );
+       virtual void PMInstantiatePowerDomains( void );

 
 public:
 
 public:

-    virtual bool attach( IOService * provider );
-    virtual bool start( IOService * provider );
-    virtual bool configure( IOService * provider );
-    virtual IOService * createNub( OSDictionary * from );
-
-    virtual bool compareNubName( const IOService * nub, OSString * name,
-                                OSString ** matched = 0 ) const;
-    virtual IOReturn getNubResources( IOService * nub );
-
-    virtual long getBootROMType(void);
-    virtual long getChipSetType(void);
-    virtual long getMachineType(void);
-
-    virtual bool getModelName( char * name, int maxLength );
-    virtual bool getMachineName( char * name, int maxLength );
-
-    virtual int haltRestart(unsigned int type);
-    virtual void sleepKernel(void);
-
-    virtual long getGMTTimeOfDay( void );
-    virtual void setGMTTimeOfDay( long secs );
-
-    virtual IOReturn getConsoleInfo( PE_Video * consoleInfo );
-    virtual IOReturn setConsoleInfo( PE_Video * consoleInfo, unsigned int op );
-
-    virtual void registerNVRAMController( IONVRAMController * nvram );
-
-    virtual IOReturn registerInterruptController(OSSymbol *name, IOInterruptController *interruptController);
-    virtual IOInterruptController *lookUpInterruptController(OSSymbol *name);
-    virtual void setCPUInterruptProperties(IOService *service);
-    virtual bool atInterruptLevel(void);
-
-    virtual IOReturn callPlatformFunction(const OSSymbol *functionName,
-                                         bool waitForFunction,
-                                         void *param1, void *param2,
-                                         void *param3, void *param4);
-
-    virtual IORangeAllocator * getPhysicalRangeAllocator(void);
-
-    virtual bool platformAdjustService(IOService *service);
-
-    virtual void PMRegisterDevice(IOService * theNub, IOService * theDevice);
-    virtual void PMLog ( const char *,unsigned long, unsigned long, unsigned long );
-
-    virtual bool hasPMFeature (unsigned long featureMask);
-    virtual bool hasPrivPMFeature (unsigned long privFeatureMask);
-    virtual int  numBatteriesSupported (void);
-
-    virtual IOByteCount savePanicInfo(UInt8 *buffer, IOByteCount length);
-
-    virtual OSString* createSystemSerialNumberString(OSData* myProperty);
-    
-    OSMetaClassDeclareReservedUsed(IOPlatformExpert,  0);
-    OSMetaClassDeclareReservedUsed(IOPlatformExpert,  1);
-    OSMetaClassDeclareReservedUnused(IOPlatformExpert,  2);
-    OSMetaClassDeclareReservedUnused(IOPlatformExpert,  3);
-    OSMetaClassDeclareReservedUnused(IOPlatformExpert,  4);
-    OSMetaClassDeclareReservedUnused(IOPlatformExpert,  5);
-    OSMetaClassDeclareReservedUnused(IOPlatformExpert,  6);
-    OSMetaClassDeclareReservedUnused(IOPlatformExpert,  7);
-    OSMetaClassDeclareReservedUnused(IOPlatformExpert,  8);
-    OSMetaClassDeclareReservedUnused(IOPlatformExpert,  9);
-    OSMetaClassDeclareReservedUnused(IOPlatformExpert, 10);
-    OSMetaClassDeclareReservedUnused(IOPlatformExpert, 11);
+       virtual bool attach( IOService * provider ) APPLE_KEXT_OVERRIDE;
+       virtual bool start( IOService * provider ) APPLE_KEXT_OVERRIDE;
+       virtual bool configure( IOService * provider );
+       virtual IOService * createNub( OSDictionary * from );
+
+       virtual bool compareNubName( const IOService * nub, OSString * name,
+           OSString ** matched = 0 ) const;
+       virtual IOReturn getNubResources( IOService * nub );
+
+       virtual long getBootROMType(void);
+       virtual long getChipSetType(void);
+       virtual long getMachineType(void);
+
+       virtual bool getModelName( char * name, int maxLength );
+       virtual bool getMachineName( char * name, int maxLength );
+
+       virtual int haltRestart(unsigned int type);
+       virtual void sleepKernel(void);
+
+       virtual long getGMTTimeOfDay( void );
+       virtual void setGMTTimeOfDay( long secs );
+
+       virtual IOReturn getConsoleInfo( PE_Video * consoleInfo );
+       virtual IOReturn setConsoleInfo( PE_Video * consoleInfo, unsigned int op );
+
+       virtual void registerNVRAMController( IONVRAMController * nvram );
+
+       virtual IOReturn registerInterruptController(OSSymbol *name, IOInterruptController *interruptController);
+       virtual LIBKERN_RETURNS_NOT_RETAINED IOInterruptController *
+       lookUpInterruptController(OSSymbol *name);
+
+       virtual void setCPUInterruptProperties(IOService *service);
+       virtual bool atInterruptLevel(void);
+
+       virtual IOReturn callPlatformFunction(const OSSymbol *functionName,
+           bool waitForFunction,
+           void *param1, void *param2,
+           void *param3, void *param4) APPLE_KEXT_OVERRIDE;
+
+       virtual IORangeAllocator * getPhysicalRangeAllocator(void);
+
+       virtual bool platformAdjustService(IOService *service);
+
+       virtual void PMRegisterDevice(IOService * theNub, IOService * theDevice);
+       virtual void PMLog( const char *, unsigned long, unsigned long, unsigned long );
+
+       virtual bool hasPMFeature(unsigned long featureMask);
+       virtual bool hasPrivPMFeature(unsigned long privFeatureMask);
+       virtual int  numBatteriesSupported(void);
+
+       virtual IOByteCount savePanicInfo(UInt8 *buffer, IOByteCount length);
+
+       virtual OSString* createSystemSerialNumberString(OSData* myProperty);
+
+       virtual IOReturn deregisterInterruptController(OSSymbol *name);
+
+       virtual void getUTCTimeOfDay( clock_sec_t * secs, clock_nsec_t * nsecs );
+       virtual void setUTCTimeOfDay( clock_sec_t secs, clock_nsec_t nsecs );
+
+       OSMetaClassDeclareReservedUsed(IOPlatformExpert, 0);
+       OSMetaClassDeclareReservedUsed(IOPlatformExpert, 1);
+       OSMetaClassDeclareReservedUsed(IOPlatformExpert, 2);
+       OSMetaClassDeclareReservedUsed(IOPlatformExpert, 3);
+       OSMetaClassDeclareReservedUsed(IOPlatformExpert, 4);
+       OSMetaClassDeclareReservedUnused(IOPlatformExpert, 5);
+       OSMetaClassDeclareReservedUnused(IOPlatformExpert, 6);
+       OSMetaClassDeclareReservedUnused(IOPlatformExpert, 7);
+       OSMetaClassDeclareReservedUnused(IOPlatformExpert, 8);
+       OSMetaClassDeclareReservedUnused(IOPlatformExpert, 9);
+       OSMetaClassDeclareReservedUnused(IOPlatformExpert, 10);
+       OSMetaClassDeclareReservedUnused(IOPlatformExpert, 11);

 };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */


@@ -174,75 +241,75 @@ class IODTNVRAM;
 
 class IODTPlatformExpert : public IOPlatformExpert
 {
 
 class IODTPlatformExpert : public IOPlatformExpert
 {

-    OSDeclareAbstractStructors(IODTPlatformExpert);
+       OSDeclareAbstractStructors(IODTPlatformExpert);

 
 private:
 
 private:

-    IODTNVRAM *dtNVRAM;
+       IODTNVRAM *dtNVRAM;

 
 

-    struct ExpansionData { };
-    ExpansionData *reserved;
+       struct ExpansionData { };
+       ExpansionData *iodtpe_reserved;

 
 public:
 
 public:

-    virtual IOService * probe( IOService *     provider,
-                               SInt32    *     score );
-    virtual bool configure( IOService * provider );
-
-    virtual void processTopLevel( IORegistryEntry * root );
-    virtual const char * deleteList( void ) = 0;
-    virtual const char * excludeList( void ) = 0;
-    virtual IOService * createNub( IORegistryEntry * from );
-    virtual bool createNubs( IOService * parent, OSIterator * iter );
-
-    virtual bool compareNubName( const IOService * nub, OSString * name,
-                                OSString ** matched = 0 ) const;
-
-    virtual IOReturn getNubResources( IOService * nub );
-
-    virtual bool getModelName( char * name, int maxLength );
-    virtual bool getMachineName( char * name, int maxLength );
-    
-    virtual void registerNVRAMController( IONVRAMController * nvram );
-
-    virtual int haltRestart(unsigned int type);
-
-    /* virtual */ IOReturn readXPRAM(IOByteCount offset, UInt8 * buffer,
-                                    IOByteCount length);
-
-    /* virtual */ IOReturn writeXPRAM(IOByteCount offset, UInt8 * buffer,
-                                     IOByteCount length);
-
-    virtual IOReturn readNVRAMProperty(
-       IORegistryEntry * entry,
-       const OSSymbol ** name, OSData ** value );
-
-    virtual IOReturn writeNVRAMProperty(
-       IORegistryEntry * entry,
-       const OSSymbol * name, OSData * value );
-
-    // This returns a dictionary describing all the NVRAM partitions.
-    // The keys will be the partitionIDs of the form "0x52,nvram".
-    // The values will be OSNumbers of the partition's byte count.
-    /* virtual */ OSDictionary *getNVRAMPartitions(void);
-
-    /* virtual */ IOReturn readNVRAMPartition(const OSSymbol * partitionID,
-                                             IOByteCount offset, UInt8 * buffer,
-                                             IOByteCount length);
-
-    /* virtual */ IOReturn writeNVRAMPartition(const OSSymbol * partitionID,
-                                              IOByteCount offset, UInt8 * buffer,
-                                              IOByteCount length);
-
-    virtual IOByteCount savePanicInfo(UInt8 *buffer, IOByteCount length);
-    virtual OSString* createSystemSerialNumberString(OSData* myProperty);
-
-    OSMetaClassDeclareReservedUnused(IODTPlatformExpert,  0);
-    OSMetaClassDeclareReservedUnused(IODTPlatformExpert,  1);
-    OSMetaClassDeclareReservedUnused(IODTPlatformExpert,  2);
-    OSMetaClassDeclareReservedUnused(IODTPlatformExpert,  3);
-    OSMetaClassDeclareReservedUnused(IODTPlatformExpert,  4);
-    OSMetaClassDeclareReservedUnused(IODTPlatformExpert,  5);
-    OSMetaClassDeclareReservedUnused(IODTPlatformExpert,  6);
-    OSMetaClassDeclareReservedUnused(IODTPlatformExpert,  7);
+       virtual IOService * probe(  IOService *     provider,
+           SInt32    *     score ) APPLE_KEXT_OVERRIDE;
+       virtual bool configure( IOService * provider ) APPLE_KEXT_OVERRIDE;
+
+       virtual void processTopLevel( IORegistryEntry * root );
+       virtual const char * deleteList( void ) = 0;
+       virtual const char * excludeList( void ) = 0;
+       virtual IOService * createNub( IORegistryEntry * from );
+       virtual bool createNubs( IOService * parent, LIBKERN_CONSUMED OSIterator * iter );
+
+       virtual bool compareNubName( const IOService * nub, OSString * name,
+           OSString ** matched = 0 ) const APPLE_KEXT_OVERRIDE;
+
+       virtual IOReturn getNubResources( IOService * nub ) APPLE_KEXT_OVERRIDE;
+
+       virtual bool getModelName( char * name, int maxLength ) APPLE_KEXT_OVERRIDE;
+       virtual bool getMachineName( char * name, int maxLength ) APPLE_KEXT_OVERRIDE;
+
+       virtual void registerNVRAMController( IONVRAMController * nvram ) APPLE_KEXT_OVERRIDE;
+
+       virtual int haltRestart(unsigned int type) APPLE_KEXT_OVERRIDE;
+
+/* virtual */ IOReturn readXPRAM(IOByteCount offset, UInt8 * buffer,
+           IOByteCount length);
+
+/* virtual */ IOReturn writeXPRAM(IOByteCount offset, UInt8 * buffer,
+           IOByteCount length);
+
+       virtual IOReturn readNVRAMProperty(
+               IORegistryEntry * entry,
+               const OSSymbol ** name, OSData ** value );
+
+       virtual IOReturn writeNVRAMProperty(
+               IORegistryEntry * entry,
+               const OSSymbol * name, OSData * value );
+
+// This returns a dictionary describing all the NVRAM partitions.
+// The keys will be the partitionIDs of the form "0x52,nvram".
+// The values will be OSNumbers of the partition's byte count.
+/* virtual */ OSDictionary *getNVRAMPartitions(void);
+
+/* virtual */ IOReturn readNVRAMPartition(const OSSymbol * partitionID,
+           IOByteCount offset, UInt8 * buffer,
+           IOByteCount length);
+
+/* virtual */ IOReturn writeNVRAMPartition(const OSSymbol * partitionID,
+           IOByteCount offset, UInt8 * buffer,
+           IOByteCount length);
+
+       virtual IOByteCount savePanicInfo(UInt8 *buffer, IOByteCount length) APPLE_KEXT_OVERRIDE;
+       virtual OSString* createSystemSerialNumberString(OSData* myProperty) APPLE_KEXT_OVERRIDE;
+
+       OSMetaClassDeclareReservedUnused(IODTPlatformExpert, 0);
+       OSMetaClassDeclareReservedUnused(IODTPlatformExpert, 1);
+       OSMetaClassDeclareReservedUnused(IODTPlatformExpert, 2);
+       OSMetaClassDeclareReservedUnused(IODTPlatformExpert, 3);
+       OSMetaClassDeclareReservedUnused(IODTPlatformExpert, 4);
+       OSMetaClassDeclareReservedUnused(IODTPlatformExpert, 5);
+       OSMetaClassDeclareReservedUnused(IODTPlatformExpert, 6);
+       OSMetaClassDeclareReservedUnused(IODTPlatformExpert, 7);

 };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */


@@ -251,27 +318,33 @@ public:
 
 class IOPlatformExpertDevice : public IOService
 {
 
 class IOPlatformExpertDevice : public IOService
 {

-    OSDeclareDefaultStructors(IOPlatformExpertDevice)
+       OSDeclareDefaultStructors(IOPlatformExpertDevice)

 
 private:
 
 private:

-    IOWorkLoop *workLoop;
+       IOWorkLoop *workLoop;

 
 

-    struct ExpansionData { };
-    ExpansionData *reserved;
+       struct ExpansionData { };
+       ExpansionData *ioped_reserved __unused;

 
 public:
 
 public:

-    virtual bool initWithArgs( void * p1, void * p2,
-                                       void * p3, void *p4 );
-    virtual bool compareName( OSString * name, OSString ** matched = 0 ) const;
+       virtual bool initWithArgs( void * p1, void * p2,
+           void * p3, void *p4 );
+       virtual bool compareName( OSString * name, OSString ** matched = 0 ) const APPLE_KEXT_OVERRIDE;
+
+       virtual IOWorkLoop *getWorkLoop() const APPLE_KEXT_OVERRIDE;
+       virtual IOReturn setProperties( OSObject * properties ) APPLE_KEXT_OVERRIDE;
+
+       virtual void free() APPLE_KEXT_OVERRIDE;

 
 

-    virtual IOWorkLoop *getWorkLoop() const;
+       virtual IOReturn newUserClient( task_t owningTask, void * securityID,
+           UInt32 type, OSDictionary * properties,
+           IOUserClient ** handler) APPLE_KEXT_OVERRIDE;

 
 

-    virtual void free();

 
 

-    OSMetaClassDeclareReservedUnused(IOPlatformExpertDevice,  0);
-    OSMetaClassDeclareReservedUnused(IOPlatformExpertDevice,  1);
-    OSMetaClassDeclareReservedUnused(IOPlatformExpertDevice,  2);
-    OSMetaClassDeclareReservedUnused(IOPlatformExpertDevice,  3);
+       OSMetaClassDeclareReservedUnused(IOPlatformExpertDevice, 0);
+       OSMetaClassDeclareReservedUnused(IOPlatformExpertDevice, 1);
+       OSMetaClassDeclareReservedUnused(IOPlatformExpertDevice, 2);
+       OSMetaClassDeclareReservedUnused(IOPlatformExpertDevice, 3);

 };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */


@@ -280,20 +353,20 @@ public:
 
 class IOPlatformDevice : public IOService
 {
 
 class IOPlatformDevice : public IOService
 {

-    OSDeclareDefaultStructors(IOPlatformDevice)
+       OSDeclareDefaultStructors(IOPlatformDevice)

 
 

-    struct ExpansionData { };
-    ExpansionData *reserved;
+       struct ExpansionData { };
+       ExpansionData *iopd_reserved;

 
 public:
 
 public:

-    virtual bool compareName( OSString * name, OSString ** matched = 0 ) const;
-    virtual IOService * matchLocation( IOService * client );
-    virtual IOReturn getResources( void );
-
-    OSMetaClassDeclareReservedUnused(IOPlatformDevice,  0);
-    OSMetaClassDeclareReservedUnused(IOPlatformDevice,  1);
-    OSMetaClassDeclareReservedUnused(IOPlatformDevice,  2);
-    OSMetaClassDeclareReservedUnused(IOPlatformDevice,  3);
+       virtual bool compareName( OSString * name, OSString ** matched = 0 ) const APPLE_KEXT_OVERRIDE;
+       virtual IOService * matchLocation( IOService * client ) APPLE_KEXT_OVERRIDE;
+       virtual IOReturn getResources( void ) APPLE_KEXT_OVERRIDE;
+
+       OSMetaClassDeclareReservedUnused(IOPlatformDevice, 0);
+       OSMetaClassDeclareReservedUnused(IOPlatformDevice, 1);
+       OSMetaClassDeclareReservedUnused(IOPlatformDevice, 2);
+       OSMetaClassDeclareReservedUnused(IOPlatformDevice, 3);

 };
 
 #endif /* __cplusplus */
 };
 
 #endif /* __cplusplus */