xnu-792.10.96.tar.gz

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

diff --git a/iokit/IOKit/IONVRAM.h b/iokit/IOKit/IONVRAM.h
index e3e1772488d14528c5e46217b1e449582be43340..6114b011219fa37d1001a31b523984dfaf7860f4 100644 (file)
--- a/iokit/IOKit/IONVRAM.h
+++ b/iokit/IOKit/IONVRAM.h
@@ -3,22 +3,19 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * 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. 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
+ * This 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, 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 OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
@@ -26,6 +23,7 @@
 #ifndef _IOKIT_IONVRAM_H
 #define _IOKIT_IONVRAM_H
 
+#include <IOKit/IOKitKeys.h>
 #include <IOKit/IOService.h>
 #include <IOKit/IODeviceTreeSupport.h>
 #include <IOKit/nvram/IONVRAMController.h>
@@ -36,8 +34,6 @@
 #define kIODTNVRAMPanicInfoPartitonName "APL,OSXPanic"
 #define kIODTNVRAMFreePartitionName     "wwwwwwwwwwww"
 
-#define kIODTNVRAMPanicInfoKey "aapl,panic-info"
-
 enum {
   kIODTNVRAMImageSize        = 0x2000,
   kIODTNVRAMXPRAMSize        = 0x0100,
@@ -86,7 +82,9 @@ private:
   
   virtual UInt8 calculatePartitionChecksum(UInt8 *partitionHeader);
   virtual IOReturn initOFVariables(void);
+public:
   virtual IOReturn syncOFVariables(void);
+private:
   virtual UInt32 getOFVariableType(const OSSymbol *propSymbol) const;
   virtual UInt32 getOFVariablePerm(const OSSymbol *propSymbol) const;
   virtual bool getOWVariableInfo(UInt32 variableNumber, const OSSymbol **propSymbol,
@@ -110,7 +108,7 @@ private:
                                           const OSSymbol *name,
                                           OSData * value);
   
-  virtual OSData *unescapeBytesToData(UInt8 *bytes, UInt32 length);
+  virtual OSData *unescapeBytesToData(const UInt8 *bytes, UInt32 length);
   virtual OSData *escapeDataToData(OSData * value);
 
   virtual IOReturn readNVRAMPropertyType1(IORegistryEntry *entry,
@@ -127,10 +125,11 @@ public:
   
   virtual void sync(void);
   
-  virtual bool serializeProperties(OSSerialize * serialize) const;
+  virtual bool serializeProperties(OSSerialize *s) const;
   virtual OSObject *getProperty(const OSSymbol *aKey) const;
   virtual OSObject *getProperty(const char *aKey) const;
   virtual bool setProperty(const OSSymbol *aKey, OSObject *anObject);
+  virtual void removeProperty(const OSSymbol *aKey);
   virtual IOReturn setProperties(OSObject *properties);
   
   virtual IOReturn readXPRAM(IOByteCount offset, UInt8 *buffer,