From: John Hodge <tpg@mutabah.net>
Date: Thu, 15 Mar 2012 14:27:44 +0000 (+0800)
Subject: Modules - x86_64 compile fix to ATA and LVM
X-Git-Tag: rel0.15~727
X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=8b6babbc124a30ac0de94e1cab2b6bca086f7436;p=tpg%2Facess2.git

Modules - x86_64 compile fix to ATA and LVM
---

diff --git a/KernelLand/Modules/Storage/ATA/main.c b/KernelLand/Modules/Storage/ATA/main.c
index a067430a..cc1fe62a 100644
--- a/KernelLand/Modules/Storage/ATA/main.c
+++ b/KernelLand/Modules/Storage/ATA/main.c
@@ -328,7 +328,7 @@ size_t ATA_ReadFS(tVFS_Node *Node, off_t Offset, size_t Length, void *Buffer)
 	{
 		int ret = DrvUtil_ReadBlock(
 			Offset, Length, Buffer,
-			ATA_ReadRaw, SECTOR_SIZE, (void*)disk
+			ATA_ReadRaw, SECTOR_SIZE, (void*)(Uint)disk
 			);
 		//Log("ATA_ReadFS: disk=%i, Offset=%lli, Length=%lli", disk, Offset, Length);
 		//Debug_HexDump("ATA_ReadFS", Buffer, Length);
@@ -367,7 +367,7 @@ size_t ATA_WriteFS(tVFS_Node *Node, off_t Offset, size_t Length, const void *Buf
 	Debug_HexDump("ATA_WriteFS", Buffer, Length);
 	return DrvUtil_WriteBlock(
 		Offset, Length, Buffer,
-		ATA_ReadRaw, ATA_WriteRaw, SECTOR_SIZE, (void*)disk
+		ATA_ReadRaw, ATA_WriteRaw, SECTOR_SIZE, (void*)(Uint)disk
 		);
 }
 
diff --git a/KernelLand/Modules/Storage/LVM/volumes.c b/KernelLand/Modules/Storage/LVM/volumes.c
index f8709bdb..558a7aa4 100644
--- a/KernelLand/Modules/Storage/LVM/volumes.c
+++ b/KernelLand/Modules/Storage/LVM/volumes.c
@@ -17,7 +17,7 @@
 // --------------------------------------------------------------------
 int LVM_AddVolumeVFS(const char *Name, int FD)
 {
-	return LVM_AddVolume(Name, (void*)FD, LVM_int_VFSReadEmul, LVM_int_VFSWriteEmul);
+	return LVM_AddVolume(Name, (void*)(Uint)FD, LVM_int_VFSReadEmul, LVM_int_VFSWriteEmul);
 }
 
 int LVM_AddVolume(const char *Name, void *Ptr, tLVM_ReadFcn Read, tLVM_WriteFcn Write)
@@ -97,7 +97,7 @@ int LVM_int_VFSReadEmul(void *Arg, Uint64 BlockStart, size_t BlockCount, void *D
 
 	blocksize = 512;	// TODO: Don't assume	
 
-	rv = VFS_ReadAt( (int)Arg, BlockStart * blocksize, BlockCount * blocksize, Dest );
+	rv = VFS_ReadAt( (int)(Uint)Arg, BlockStart * blocksize, BlockCount * blocksize, Dest );
 	rv /= blocksize;
 	return rv;
 }
@@ -109,7 +109,7 @@ int LVM_int_VFSWriteEmul(void *Arg, Uint64 BlockStart, size_t BlockCount, const
 
 	blocksize = 512;	// TODO: Don't assume	
 
-	rv = VFS_WriteAt( (int)Arg, BlockStart * blocksize, BlockCount * blocksize, Source );
+	rv = VFS_WriteAt( (int)(Uint)Arg, BlockStart * blocksize, BlockCount * blocksize, Source );
 	rv /= blocksize;
 	return rv;
 }