Cleaning up code, and separating a little to allow native code to share

[tpg/acess2.git] / Kernel / vfs / open.c

diff --git a/Kernel/vfs/open.c b/Kernel/vfs/open.c
index 5420b33..b0de784 100644 (file)
--- a/Kernel/vfs/open.c
+++ b/Kernel/vfs/open.c
@@ -4,23 +4,20 @@
  */
 #define DEBUG  0
 #include <acess.h>
-#include <mm_virt.h>
 #include "vfs.h"
 #include "vfs_int.h"
 #include "vfs_ext.h"
 
 // === CONSTANTS ===
 #define        OPEN_MOUNT_ROOT 1
-#define MAX_KERNEL_FILES       128
 #define MAX_PATH_SLASHES       256
 
 // === IMPORTS ===
 extern tVFS_Node       gVFS_MemRoot;
 extern tVFS_Mount      *gVFS_RootMount;
 
-// === GLOBALS ===
-tVFS_Handle    *gaUserHandles = (void*)MM_PPD_VFS;
-tVFS_Handle    *gaKernelHandles = (void*)MM_KERNEL_VFS;
+extern tVFS_Handle     *VFS_GetHandle(int FD);
+extern int     VFS_AllocHandle(int bIsUser, tVFS_Node *Node, int Mode);
 
 // === CODE ===
 /**
@@ -512,50 +509,10 @@ int VFS_Open(char *Path, Uint Mode)
                return -1;
        }
        
-       // Check for a user open
-       if(Mode & VFS_OPENFLAG_USER)
-       {
-               // Allocate Buffer
-               if( MM_GetPhysAddr( (Uint)gaUserHandles ) == 0 )
-               {
-                       Uint    addr, size;
-                       size = CFGINT(CFG_VFS_MAXFILES) * sizeof(tVFS_Handle);
-                       for(addr = 0; addr < size; addr += 0x1000)
-                               MM_Allocate( (Uint)gaUserHandles + addr );
-                       memset( gaUserHandles, 0, size );
-               }
-               // Get a handle
-               for(i=0;i<CFGINT(CFG_VFS_MAXFILES);i++)
-               {
-                       if(gaUserHandles[i].Node)       continue;
-                       gaUserHandles[i].Node = node;
-                       gaUserHandles[i].Position = 0;
-                       gaUserHandles[i].Mode = Mode;
-                       LEAVE('i', i);
-                       return i;
-               }
-       }
-       else
-       {
-               // Allocate space if not already
-               if( MM_GetPhysAddr( (Uint)gaKernelHandles ) == 0 )
-               {
-                       Uint    addr, size;
-                       size = MAX_KERNEL_FILES * sizeof(tVFS_Handle);
-                       for(addr = 0; addr < size; addr += 0x1000)
-                               MM_Allocate( (Uint)gaKernelHandles + addr );
-                       memset( gaKernelHandles, 0, size );
-               }
-               // Get a handle
-               for(i=0;i<MAX_KERNEL_FILES;i++)
-               {
-                       if(gaKernelHandles[i].Node)     continue;
-                       gaKernelHandles[i].Node = node;
-                       gaKernelHandles[i].Position = 0;
-                       gaKernelHandles[i].Mode = Mode;
-                       LEAVE('x', i|VFS_KERNEL_FLAG);
-                       return i|VFS_KERNEL_FLAG;
-               }
+       i = VFS_AllocHandle( !!(Mode & VFS_OPENFLAG_USER), node, Mode );
+       if( i > 0 ) {
+               LEAVE('x', i);
+               return i;
        }
        
        Log("VFS_Open: Out of handles");
@@ -612,50 +569,10 @@ int VFS_OpenChild(Uint *Errno, int FD, char *Name, Uint Mode)
                return -1;
        }
        
-       // Check for a user open
-       if(Mode & VFS_OPENFLAG_USER)
-       {
-               // Allocate Buffer
-               if( MM_GetPhysAddr( (Uint)gaUserHandles ) == 0 )
-               {
-                       Uint    addr, size;
-                       size = CFGINT(CFG_VFS_MAXFILES) * sizeof(tVFS_Handle);
-                       for(addr = 0; addr < size; addr += 0x1000)
-                               MM_Allocate( (Uint)gaUserHandles + addr );
-                       memset( gaUserHandles, 0, size );
-               }
-               // Get a handle
-               for(i=0;i<CFGINT(CFG_VFS_MAXFILES);i++)
-               {
-                       if(gaUserHandles[i].Node)       continue;
-                       gaUserHandles[i].Node = node;
-                       gaUserHandles[i].Position = 0;
-                       gaUserHandles[i].Mode = Mode;
-                       LEAVE('i', i);
-                       return i;
-               }
-       }
-       else
-       {
-               // Allocate space if not already
-               if( MM_GetPhysAddr( (Uint)gaKernelHandles ) == 0 )
-               {
-                       Uint    addr, size;
-                       size = MAX_KERNEL_FILES * sizeof(tVFS_Handle);
-                       for(addr = 0; addr < size; addr += 0x1000)
-                               MM_Allocate( (Uint)gaKernelHandles + addr );
-                       memset( gaKernelHandles, 0, size );
-               }
-               // Get a handle
-               for(i=0;i<MAX_KERNEL_FILES;i++)
-               {
-                       if(gaKernelHandles[i].Node)     continue;
-                       gaKernelHandles[i].Node = node;
-                       gaKernelHandles[i].Position = 0;
-                       gaKernelHandles[i].Mode = Mode;
-                       LEAVE('x', i|VFS_KERNEL_FLAG);
-                       return i|VFS_KERNEL_FLAG;
-               }
+       i = VFS_AllocHandle( !!(Mode & VFS_OPENFLAG_USER), node, Mode );
+       if( i > 0 ) {
+               LEAVE('x', i);
+               return i;
        }
        
        Log_Error("VFS", "VFS_OpenChild - Out of handles");
@@ -787,32 +704,6 @@ int VFS_ChRoot(char *New)
        return 1;
 }
 
-/**
- * \fn tVFS_Handle *VFS_GetHandle(int FD)
- * \brief Gets a pointer to the handle information structure
- */
-tVFS_Handle *VFS_GetHandle(int FD)
-{
-       tVFS_Handle     *h;
-       
-       //Log_Debug("VFS", "VFS_GetHandle: (FD=0x%x)", FD);
-       
-       if(FD < 0)      return NULL;
-       
-       if(FD & VFS_KERNEL_FLAG) {
-               FD &= (VFS_KERNEL_FLAG - 1);
-               if(FD >= MAX_KERNEL_FILES)      return NULL;
-               h = &gaKernelHandles[ FD ];
-       } else {
-               if(FD >= CFGINT(CFG_VFS_MAXFILES))      return NULL;
-               h = &gaUserHandles[ FD ];
-       }
-       
-       if(h->Node == NULL)     return NULL;
-       //Log_Debug("VFS", "VFS_GetHandle: RETURN %p", h);
-       return h;
-}
-
 // === EXPORTS ===
 EXPORT(VFS_Open);
 EXPORT(VFS_Close);