X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/bd504ef0e0b883cdd7917b73b3574eb9ce669905..a39ff7e25e19b3a8c3020042a3872ca9ec9659f1:/iokit/Kernel/IOHibernateInternal.h

diff --git a/iokit/Kernel/IOHibernateInternal.h b/iokit/Kernel/IOHibernateInternal.h
index 23f875d18..7fd0ec461 100644
--- a/iokit/Kernel/IOHibernateInternal.h
+++ b/iokit/Kernel/IOHibernateInternal.h
@@ -42,7 +42,6 @@ struct IOHibernateVars
     class IOBufferMemoryDescriptor *    handoffBuffer;
     class IOMemoryDescriptor *          previewBuffer;
     OSData *          			previewData;
-    OSData *		 		fileExtents;
     OSObject *				saveBootDevice;
 
     struct IOPolledFileIOVars *		fileVars;
@@ -54,43 +53,14 @@ struct IOHibernateVars
     uint8_t *				consoleMapping;
     uint8_t				haveFastBoot;
     uint8_t				saveBootAudioVolume;
+    uint8_t				hwEncrypt;
     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;
 
-
-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