xnu-4903.241.1.tar.gz

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

diff --git a/iokit/Kernel/IOKitKernelInternal.h b/iokit/Kernel/IOKitKernelInternal.h
index 8aed5f2785553711b033f51177cdc5d620d53a09..4b0cf6ffc951993c4398c0e3485e5dc0198d6dd3 100644 (file)
--- a/iokit/Kernel/IOKitKernelInternal.h
+++ b/iokit/Kernel/IOKitKernelInternal.h
@@ -38,13 +38,14 @@ __BEGIN_DECLS
 #include <mach/memory_object_types.h>
 #include <device/device_port.h>
 #include <IOKit/IODMACommand.h>
+#include <IOKit/IOKitServer.h>
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #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)
@@ -97,16 +98,6 @@ IOMemoryMapTracking(IOTrackingUser * tracking, task_t * task,
 
 extern vm_size_t debug_iomallocpageable_size;
 
-// osfmk/device/iokit_rpc.c
-extern kern_return_t IOMapPages(vm_map_t map, mach_vm_address_t va, mach_vm_address_t pa,
-                                 mach_vm_size_t length, unsigned int mapFlags);
-extern kern_return_t IOUnmapPages(vm_map_t map, mach_vm_address_t va, mach_vm_size_t length);
-
-extern kern_return_t IOProtectCacheMode(vm_map_t map, mach_vm_address_t va,
-                                       mach_vm_size_t length, unsigned int mapFlags);
-
-extern ppnum_t IOGetLastPageNumber(void);
-
 extern ppnum_t gIOLastPage;
 
 extern IOSimpleLock * gIOPageAllocLock;
@@ -140,12 +131,10 @@ struct IODMACommandInternal
     UInt8  fPrepared;
     UInt8  fDoubleBuffer;
     UInt8  fNewMD;
-    UInt8  fLocalMapper;
-
-    vm_tag_t    fTag;
-#if IOTRACKING
-    IOTracking  fWireTracking;
-#endif /* IOTRACKING */
+    UInt8  fLocalMapperAllocValid;
+    UInt8  fIOVMAddrValid;
+    UInt8  fForceDoubleBuffer;
+    UInt8  fSetActiveNoMapper;
 
     vm_page_t fCopyPageAlloc;
     vm_page_t fCopyNext;
@@ -217,12 +206,17 @@ extern "C" struct timeval gIOLastWakeTime;
 
 extern clock_sec_t gIOConsoleLockTime;
 
+extern bool gCPUsRunning;
+
 extern OSSet * gIORemoveOnReadProperties;
 
 extern "C" void IOKitInitializeTime( void );
 
 extern "C" OSString * IOCopyLogNameForPID(int pid);
 
+extern "C" void IOKitKernelLogBuffer(const char * title, const void * buffer, size_t size,
+                          void (*output)(const char *format, ...));
+
 #if defined(__i386__) || defined(__x86_64__)
 #ifndef __cplusplus
 #error xx
@@ -230,6 +224,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;