X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/99c3a10404e5d1ef94397ab4df5a8b74711fc4d3..04b8595b18b1b41ac7a206e4b3d51a635f8413d7:/iokit/Kernel/IODMACommand.cpp?ds=inline

diff --git a/iokit/Kernel/IODMACommand.cpp b/iokit/Kernel/IODMACommand.cpp
index 1ae4e61ae..3b3c0ee3a 100644
--- a/iokit/Kernel/IODMACommand.cpp
+++ b/iokit/Kernel/IODMACommand.cpp
@@ -463,7 +463,7 @@ IODMACommand::walkAll(UInt8 op)
 	{
 	    offset = 0;
 	    numSegments = 0-1;
-	    ret = genIOVMSegments(op, segmentOp, (void *) op, &offset, state, &numSegments);
+	    ret = genIOVMSegments(op, segmentOp, (void *)(uintptr_t) op, &offset, state, &numSegments);
 	}
 
 	op &= ~kWalkPreflight;
@@ -499,7 +499,7 @@ IODMACommand::walkAll(UInt8 op)
 		state->fCopyNext = state->fCopyPageAlloc;
 		offset = 0;
 		numSegments = 0-1;
-		ret = genIOVMSegments(op, segmentOp, (void *) op, &offset, state, &numSegments);
+		ret = genIOVMSegments(op, segmentOp, (void *)(uintptr_t) op, &offset, state, &numSegments);
 		state->fPrepared = true;
 		op &= ~(kWalkSyncIn | kWalkSyncOut);
 	    }
@@ -535,7 +535,7 @@ IODMACommand::walkAll(UInt8 op)
 		state->fCopyNext = state->fCopyPageAlloc;
 		offset = 0;
 		numSegments = 0-1;
-		ret = genIOVMSegments(op, segmentOp, (void *) op, &offset, state, &numSegments);
+		ret = genIOVMSegments(op, segmentOp, (void *)(uintptr_t) op, &offset, state, &numSegments);
 	    }
 	    else if (state->fCopyMD)
 	    {
@@ -769,7 +769,7 @@ IODMACommand::prepare(UInt64 offset, UInt64 length, bool flushCache, bool synchr
 		{
 		    state->fLocalMapperPageAlloc = mapArgs.fAlloc;
 		    state->fLocalMapperPageCount = mapArgs.fAllocCount;
-		    state->fMapContig = true;
+		    state->fMapContig = mapArgs.fMapContig;
 		}
 		ret = kIOReturnSuccess;
 	    }