Merge branch 'master' of git://localhost/acess2

[tpg/acess2.git] / KernelLand / Kernel / vfs / io.c

diff --git a/KernelLand/Kernel/vfs/io.c b/KernelLand/Kernel/vfs/io.c
index 7379e3d..1df3403 100644 (file)
--- a/KernelLand/Kernel/vfs/io.c
+++ b/KernelLand/Kernel/vfs/io.c
@@ -4,20 +4,21 @@
  */
 #define DEBUG  0
 #include <acess.h>
-#include "vfs.h"
-#include "vfs_int.h"
+#include <vfs.h>
+#include <vfs_ext.h>
+#include <vfs_int.h>
 
 // === CODE ===
 /**
  * \fn Uint64 VFS_Read(int FD, Uint64 Length, void *Buffer)
  * \brief Read data from a node (file)
  */
-Uint64 VFS_Read(int FD, Uint64 Length, void *Buffer)
+size_t VFS_Read(int FD, size_t Length, void *Buffer)
 {
        tVFS_Handle     *h;
-       Uint64  ret;
+       size_t  ret;
        
-       ENTER("iFD XLength pBuffer", FD, Length, Buffer);
+       ENTER("xFD xLength pBuffer", FD, Length, Buffer);
        
        h = VFS_GetHandle(FD);
        if(!h) {
@@ -45,11 +46,12 @@ Uint64 VFS_Read(int FD, Uint64 Length, void *Buffer)
                LEAVE_RET('i', -1);
        }
        
+       LOG("Position=%llx", h->Position);
        ret = h->Node->Type->Read(h->Node, h->Position, Length, Buffer);
-       if(ret == -1)   LEAVE_RET('i', -1);
+       if(ret == (size_t)-1)   LEAVE_RET('i', -1);
        
        h->Position += ret;
-       LEAVE('X', ret);
+       LEAVE('x', ret);
        return ret;
 }
 
@@ -57,10 +59,10 @@ Uint64 VFS_Read(int FD, Uint64 Length, void *Buffer)
  * \fn Uint64 VFS_ReadAt(int FD, Uint64 Offset, Uint64 Length, void *Buffer)
  * \brief Read data from a given offset (atomic)
  */
-Uint64 VFS_ReadAt(int FD, Uint64 Offset, Uint64 Length, void *Buffer)
+size_t VFS_ReadAt(int FD, Uint64 Offset, size_t Length, void *Buffer)
 {
        tVFS_Handle     *h;
-       Uint64  ret;
+       size_t  ret;
        
        h = VFS_GetHandle(FD);
        if(!h)  return -1;
@@ -80,7 +82,7 @@ Uint64 VFS_ReadAt(int FD, Uint64 Offset, Uint64 Length, void *Buffer)
        }
        
        ret = h->Node->Type->Read(h->Node, Offset, Length, Buffer);
-       if(ret == -1)   return -1;
+       if(ret == (size_t)-1)   return -1;
        return ret;
 }
 
@@ -88,10 +90,10 @@ Uint64 VFS_ReadAt(int FD, Uint64 Offset, Uint64 Length, void *Buffer)
  * \fn Uint64 VFS_Write(int FD, Uint64 Length, const void *Buffer)
  * \brief Read data from a node (file)
  */
-Uint64 VFS_Write(int FD, Uint64 Length, const void *Buffer)
+size_t VFS_Write(int FD, size_t Length, const void *Buffer)
 {
        tVFS_Handle     *h;
-       Uint64  ret;
+       size_t  ret;
        
        h = VFS_GetHandle(FD);
        if(!h)  return -1;
@@ -108,7 +110,7 @@ Uint64 VFS_Write(int FD, Uint64 Length, const void *Buffer)
        }
        
        ret = h->Node->Type->Write(h->Node, h->Position, Length, Buffer);
-       if(ret == -1)   return -1;
+       if(ret == (size_t)-1)   return -1;
 
        h->Position += ret;
        return ret;
@@ -118,10 +120,10 @@ Uint64 VFS_Write(int FD, Uint64 Length, const void *Buffer)
  * \fn Uint64 VFS_WriteAt(int FD, Uint64 Offset, Uint64 Length, const void *Buffer)
  * \brief Write data to a file at a given offset
  */
-Uint64 VFS_WriteAt(int FD, Uint64 Offset, Uint64 Length, const void *Buffer)
+size_t VFS_WriteAt(int FD, Uint64 Offset, size_t Length, const void *Buffer)
 {
        tVFS_Handle     *h;
-       Uint64  ret;
+       size_t  ret;
        
        h = VFS_GetHandle(FD);
        if(!h)  return -1;
@@ -137,7 +139,7 @@ Uint64 VFS_WriteAt(int FD, Uint64 Offset, Uint64 Length, const void *Buffer)
                return -1;
        }
        ret = h->Node->Type->Write(h->Node, Offset, Length, Buffer);
-       if(ret == -1)   return -1;
+       if(ret == (size_t)-1)   return -1;
        return ret;
 }
 
@@ -169,24 +171,24 @@ int VFS_Seek(int FD, Sint64 Offset, int Whence)
        h = VFS_GetHandle(FD);
        if(!h)  return -1;
        
-       //Log_Debug("VFS", "VFS_Seek: (fd=0x%x, Offset=0x%llx, Whence=%i)",
-       //      FD, Offset, Whence);
-       
        // Set relative to current position
        if(Whence == 0) {
+               LOG("(FD%x)->Position += %lli", FD, Offset);
                h->Position += Offset;
                return 0;
        }
        
        // Set relative to end of file
        if(Whence < 0) {
-               if( h->Node->Size == -1 )       return -1;
+               if( h->Node->Size == (Uint64)-1 )       return -1;
 
+               LOG("(FD%x)->Position = %llx - %llx", FD, h->Node->Size, Offset);
                h->Position = h->Node->Size - Offset;
                return 0;
        }
        
        // Set relative to start of file
+       LOG("(FD%x)->Position = %llx", FD, Offset);
        h->Position = Offset;
        return 0;
 }