xnu-4570.51.1.tar.gz

[apple/xnu.git] / iokit / Kernel / IOHibernateInternal.h

diff --git a/iokit/Kernel/IOHibernateInternal.h b/iokit/Kernel/IOHibernateInternal.h
index 23f875d18e5428b467ef326ec3205f67f3eb1074..7fd0ec46139e9cdfd37178a6de7f56e5dd93659f 100644 (file)
--- a/iokit/Kernel/IOHibernateInternal.h
+++ b/iokit/Kernel/IOHibernateInternal.h
@@ -42,7 +42,6 @@ struct IOHibernateVars
     class IOBufferMemoryDescriptor *    handoffBuffer;
     class IOMemoryDescriptor *          previewBuffer;
     OSData *                           previewData;
     class IOBufferMemoryDescriptor *    handoffBuffer;
     class IOMemoryDescriptor *          previewBuffer;
     OSData *                           previewData;

-    OSData *                           fileExtents;

     OSObject *                         saveBootDevice;
 
     struct IOPolledFileIOVars *                fileVars;
     OSObject *                         saveBootDevice;
 
     struct IOPolledFileIOVars *                fileVars;


@@ -54,43 +53,14 @@ struct IOHibernateVars
     uint8_t *                          consoleMapping;
     uint8_t                            haveFastBoot;
     uint8_t                            saveBootAudioVolume;
     uint8_t *                          consoleMapping;
     uint8_t                            haveFastBoot;
     uint8_t                            saveBootAudioVolume;

+    uint8_t                            hwEncrypt;

     uint8_t                            wiredCryptKey[kIOHibernateAESKeySize / 8];
     uint8_t                            cryptKey[kIOHibernateAESKeySize / 8];
     uint8_t                            wiredCryptKey[kIOHibernateAESKeySize / 8];
     uint8_t                            cryptKey[kIOHibernateAESKeySize / 8];

-    uint8_t                            volumeCryptKey[kIOHibernateAESKeySize / 8];
+    size_t                             volumeCryptKeySize;
+    uint8_t                            volumeCryptKey[64];

 };
 typedef struct IOHibernateVars IOHibernateVars;
 
 };
 typedef struct IOHibernateVars IOHibernateVars;
 

-
-struct IOPolledFileIOVars
-{
-    struct kern_direct_file_io_ref_t * fileRef;
-    IORegistryEntry *                   media;
-    class OSArray *                    pollers;
-    IOByteCount                                blockSize;
-    uint8_t *                                  buffer;
-    IOByteCount                        bufferSize;
-    IOByteCount                        bufferLimit;
-    IOByteCount                        bufferOffset;
-    IOByteCount                        bufferHalf;
-    IOByteCount                                extentRemaining;
-    IOByteCount                                lastRead;
-    IOByteCount                                readEnd;
-    uint32_t                            flags;
-    uint64_t                           fileSize;
-    uint64_t                           block0;
-    uint64_t                           position;
-    uint64_t                           extentPosition;
-    uint64_t                           encryptStart;
-    uint64_t                           encryptEnd;
-    uint64_t                            cryptBytes;
-    AbsoluteTime                        cryptTime;
-    IOPolledFileExtent *               extentMap;
-    IOPolledFileExtent *               currentExtent;
-    bool                               io;
-    IOReturn                           ioStatus;
-};
-typedef struct IOPolledFileIOVars IOPolledFileIOVars;
-

 #endif         /* __cplusplus */
 
 enum
 #endif         /* __cplusplus */
 
 enum