X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/3e170ce000f1506b7b5d2c5c7faec85ceabb573d..5ba3f43ea354af8ad55bea84372a2bc834d8757c:/iokit/Kernel/IOKitKernelInternal.h

diff --git a/iokit/Kernel/IOKitKernelInternal.h b/iokit/Kernel/IOKitKernelInternal.h
index 37e6f9416..85507aa65 100644
--- a/iokit/Kernel/IOKitKernelInternal.h
+++ b/iokit/Kernel/IOKitKernelInternal.h
@@ -44,7 +44,7 @@ __BEGIN_DECLS
 #if (KDEBUG_LEVEL >= KDEBUG_LEVEL_STANDARD)
 
 #define IOServiceTrace(csc, a, b, c, d) do {				\
-    if(kIOTraceIOService & gIOKitDebug) {				\
+    if(kIOTraceIOService & gIOKitTrace) {				\
 	KERNEL_DEBUG_CONSTANT(IODBG_IOSERVICE(csc), a, b, c, d, 0);	\
     }									\
 } while(0)
@@ -89,6 +89,12 @@ IOKernelAllocateWithPhysicalRestrict(mach_vm_size_t size, mach_vm_address_t maxP
 void
 IOKernelFreePhysical(mach_vm_address_t address, mach_vm_size_t size);
 
+#if IOTRACKING
+IOReturn
+IOMemoryMapTracking(IOTrackingUser * tracking, task_t * task,
+		    mach_vm_address_t * address, mach_vm_size_t * size);
+#endif /* IOTRACKING */
+
 extern vm_size_t debug_iomallocpageable_size;
 
 // osfmk/device/iokit_rpc.c
@@ -135,7 +141,10 @@ struct IODMACommandInternal
     UInt8  fDoubleBuffer;
     UInt8  fNewMD;
     UInt8  fLocalMapper;
-	
+    UInt8  fLocalMapperAllocValid;
+    UInt8  fIOVMAddrValid;
+    UInt8  fForceDoubleBuffer;
+
     vm_page_t fCopyPageAlloc;
     vm_page_t fCopyNext;
     vm_page_t fNextRemapPage;
@@ -167,6 +176,8 @@ struct IOMemoryDescriptorReserved {
     uint64_t                      preparationID;
     // for kernel IOMD subclasses... they have no expansion
     uint64_t                      kernReserved[4];
+    vm_tag_t                      kernelTag;
+    vm_tag_t                      userTag;
 };
 
 struct iopa_t
@@ -204,6 +215,8 @@ extern "C" struct timeval gIOLastWakeTime;
 
 extern clock_sec_t gIOConsoleLockTime;
 
+extern bool gCPUsRunning;
+
 extern OSSet * gIORemoveOnReadProperties;
 
 extern "C" void IOKitInitializeTime( void );
@@ -217,6 +230,7 @@ extern "C" OSString * IOCopyLogNameForPID(int pid);
 
 extern const OSSymbol * gIOCreateEFIDevicePathSymbol;
 extern "C" void IOSetKeyStoreData(IOMemoryDescriptor * data);
+extern "C" void IOSetAPFSKeyStoreData(IOMemoryDescriptor* data);
 #endif
 extern const  OSSymbol * gAKSGetKey;