xnu-1699.22.73.tar.gz

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

diff --git a/iokit/Kernel/IOKitKernelInternal.h b/iokit/Kernel/IOKitKernelInternal.h
index ea74e3bd9594cb5dc945e4f58a5f1f0cf4b635eb..5a74159a4a31886a6f4e05273a71a990d7cc7376 100644 (file)
--- a/iokit/Kernel/IOKitKernelInternal.h
+++ b/iokit/Kernel/IOKitKernelInternal.h
@@ -34,10 +34,33 @@
 
 __BEGIN_DECLS
 
-#include <vm/pmap.h>
+#include <vm/vm_pageout.h>
 #include <mach/memory_object_types.h>
 #include <device/device_port.h>
 
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#if !defined(NO_KDEBUG)
+
+#define IOServiceTrace(csc, a, b, c, d) do {                           \
+    if(kIOTraceIOService & gIOKitDebug) {                              \
+       KERNEL_DEBUG_CONSTANT(IODBG_IOSERVICE(csc), a, b, c, d, 0);     \
+    }                                                                  \
+} while(0)
+
+#else /* NO_KDEBUG */
+
+#define IOServiceTrace(csc, a, b, c, d) do {   \
+  (void)a;                                     \
+  (void)b;                                     \
+  (void)c;                                     \
+  (void)d;                                     \
+} while (0)
+
+#endif /* NO_KDEBUG */
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
 typedef kern_return_t (*IOIteratePageableMapsCallback)(vm_map_t map, void * ref);
 
 void IOLibInit(void);
@@ -46,21 +69,20 @@ kern_return_t IOIteratePageableMaps(vm_size_t size,
 vm_map_t IOPageableMapForAddress(uintptr_t address);
 
 kern_return_t 
-IOMemoryDescriptorMapMemEntry(vm_map_t map, ipc_port_t entry, IOOptionBits options, bool pageable,
+IOMemoryDescriptorMapMemEntry(vm_map_t * map, ipc_port_t entry, IOOptionBits options, bool pageable,
                                mach_vm_size_t offset, mach_vm_address_t * address, mach_vm_size_t length);
 kern_return_t 
-IOMemoryDescriptorMapCopy(vm_map_t map, 
-                               vm_map_t src_map, 
-                               mach_vm_offset_t src_address,
+IOMemoryDescriptorMapCopy(vm_map_t * map, 
                                IOOptionBits options,
                                mach_vm_size_t offset, 
                                mach_vm_address_t * address, mach_vm_size_t length);
 
 mach_vm_address_t
-IOKernelAllocateContiguous(mach_vm_size_t size,
-                           mach_vm_address_t maxPhys, mach_vm_size_t alignment);
+IOKernelAllocateWithPhysicalRestrict(mach_vm_size_t size, mach_vm_address_t maxPhys, 
+                                       mach_vm_size_t alignment, bool contiguous);
 void
-IOKernelFreeContiguous(mach_vm_address_t address, mach_vm_size_t size);
+IOKernelFreePhysical(mach_vm_address_t address, mach_vm_size_t size);
+
 
 extern vm_size_t debug_iomallocpageable_size;
 
@@ -114,7 +136,7 @@ struct IODMACommandInternal
     UInt64 fPreparedOffset;
     UInt64 fPreparedLength;
 
-       UInt32 fSourceAlignMask;
+    UInt32 fSourceAlignMask;
        
     UInt8  fCursor;
     UInt8  fCheckAddressing;
@@ -126,12 +148,13 @@ struct IODMACommandInternal
     UInt8  fNewMD;
     UInt8  fLocalMapper;
        
-       ppnum_t  fCopyMapperPageAlloc;
+    vm_page_t fCopyPageAlloc;
+    vm_page_t fCopyNext;
+    vm_page_t fNextRemapPage;
+
     ppnum_t  fCopyPageCount;
-    ppnum_t  fNextRemapIndex;
-    addr64_t fCopyNext;
 
-       ppnum_t  fLocalMapperPageAlloc;
+    ppnum_t  fLocalMapperPageAlloc;
     ppnum_t  fLocalMapperPageCount;
 
     class IOBufferMemoryDescriptor * fCopyMD;
@@ -149,4 +172,8 @@ extern "C" void IOKitInitializeTime( void );
 
 extern "C" OSString * IOCopyLogNameForPID(int pid);
 
+#if defined(__i386__) || defined(__x86_64__)
+extern "C" void IOSetKeyStoreData(IOMemoryDescriptor * data);
+#endif
+
 #endif /* ! _IOKIT_KERNELINTERNAL_H */