Kernel - Slight reworks to timer code

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

diff --git a/Kernel/vfs/main.c b/Kernel/vfs/main.c
index bfa1fc1..5ff0e7c 100644 (file)
--- a/Kernel/vfs/main.c
+++ b/Kernel/vfs/main.c
@@ -2,82 +2,115 @@
  * Acess 2
  * Virtual File System
  */
-#include <common.h>
-#include "vfs.h"
-#include "vfs_int.h"
-#include "vfs_ext.h"
+#include <acess.h>
+#include <fs_sysfs.h>
+#include <threads.h>
+#include <vfs.h>
+#include <vfs_int.h>
+#include <vfs_ext.h>
 
 // === IMPORTS ===
 extern tVFS_Driver     gRootFS_Info;
 extern tVFS_Driver     gDevFS_Info;
 
+// === PROTOTYPES ===
+#if 0
+ int   VFS_Init(void);
+char   *VFS_GetTruePath(const char *Path);
+void   VFS_GetMemPath(char *Dest, void *Base, Uint Length);
+tVFS_Driver    *VFS_GetFSByName(const char *Name);
+ int   VFS_AddDriver(tVFS_Driver *Info);
+#endif
+void   VFS_UpdateDriverFile(void);
+
+// === EXPORTS ===
+EXPORT(VFS_AddDriver);
+
 // === GLOBALS ===
 tVFS_Node      NULLNode = {0};
-static int     siDriverListLock = 0;
+tShortSpinlock slDriverListLock;
 tVFS_Driver    *gVFS_Drivers = NULL;
+char   *gsVFS_DriverFile = NULL;
+ int   giVFS_DriverFileID = 0;
+
+char   *gsVFS_MountFile = NULL;
+ int   giVFS_MountFileID = 0;
 
 // === CODE ===
 /**
- * \fn int VFS_Init()
+ * \fn int VFS_Init(void)
  * \brief Initialises the VFS for use by the kernel and user
  */
-int VFS_Init()
+int VFS_Init(void)
 {
        // Core Drivers
        gVFS_Drivers = &gRootFS_Info;
        gVFS_Drivers->Next = &gDevFS_Info;
+       VFS_UpdateDriverFile();
        
-       VFS_Mount("root", "/", "rootfs", "");
+       // Register with SysFS
+       giVFS_MountFileID = SysFS_RegisterFile("VFS/Mounts", NULL, 0);
+       giVFS_DriverFileID = SysFS_RegisterFile("VFS/Drivers", NULL, 0);
+       
+       if( VFS_Mount("root", "/", "rootfs", "") != 0 ) {
+               Log_KernelPanic("VFS", "Unable to mount root (Where the **** is rootfs?)");
+               return -1;
+       }
        VFS_MkDir("/Devices");
        VFS_MkDir("/Mount");
        VFS_Mount("dev", "/Devices", "devfs", "");
-       
-       CFGINT(CFG_VFS_MAXFILES) = 32;
+               
+       Log_Debug("VFS", "Setting max files");
+       *Threads_GetMaxFD() = 32;
        return 0;
 }
 
 /**
- * \fn char *VFS_GetTruePath(char *Path)
+ * \fn char *VFS_GetTruePath(const char *Path)
  * \brief Gets the true path (non-symlink) of a file
  */
-char *VFS_GetTruePath(char *Path)
+char *VFS_GetTruePath(const char *Path)
 {
        tVFS_Node       *node;
-       char    *ret;
+       char    *ret, *tmp;
        
-       node = VFS_ParsePath(Path, &ret);
+       tmp = VFS_GetAbsPath(Path);
+       if(tmp == NULL) return NULL;
+       //Log(" VFS_GetTruePath: tmp = '%s'", tmp);
+       node = VFS_ParsePath(tmp, &ret, NULL);
+       free(tmp);
+       //Log(" VFS_GetTruePath: node=%p, ret='%s'", node, ret);
        
        if(!node)       return NULL;
-       if(node->Close) node->Close(node);
+       if(node->Type->Close)   node->Type->Close(node);
        
        return ret;
 }
 
 /**
- * \fn void VFS_GetMemPath(void *Base, Uint Length, char *Dest)
+ * \fn void VFS_GetMemPath(char *Dest, void *Base, Uint Length)
  * \brief Create a VFS memory pointer path
  */
-void VFS_GetMemPath(void *Base, Uint Length, char *Dest)
+void VFS_GetMemPath(char *Dest, void *Base, Uint Length)
 {
-       Log("VFS_GetMemPath: (Base=%p, Length=0x%x, Dest=%p)", Base, Length, Dest);
        Dest[0] = '$';
-       itoa( &Dest[1], (Uint)Base, 16, BITS/4, '0' );
+       itoa( &Dest[1], (tVAddr)Base, 16, BITS/4, '0' );
        Dest[BITS/4+1] = ':';
        itoa( &Dest[BITS/4+2], Length, 16, BITS/4, '0' );
-       
-       Log("VFS_GetMemPath: Dest = \"%s\"", Dest);
+       Dest[BITS/2+2] = '\0';
 }
 
 /**
- * \fn tVFS_Driver *VFS_GetFSByName(char *Name)
+ * \fn tVFS_Driver *VFS_GetFSByName(const char *Name)
  * \brief Gets a filesystem structure given a name
  */
-tVFS_Driver *VFS_GetFSByName(char *Name)
+tVFS_Driver *VFS_GetFSByName(const char *Name)
 {
        tVFS_Driver     *drv = gVFS_Drivers;
        
        for(;drv;drv=drv->Next)
        {
+//             Log("strcmp('%s' (%p), '%s') == 0?", drv->Name, drv->Name, Name);
                if(strcmp(drv->Name, Name) == 0)
                        return drv;
        }
@@ -91,10 +124,43 @@ int VFS_AddDriver(tVFS_Driver *Info)
 {
        if(!Info)       return  -1;
        
-       LOCK( &siDriverListLock );
+       SHORTLOCK( &slDriverListLock );
        Info->Next = gVFS_Drivers;
        gVFS_Drivers = Info;
-       RELEASE( &siDriverListLock );
+       SHORTREL( &slDriverListLock );
+       
+       VFS_UpdateDriverFile();
        
        return 0;
 }
+
+/**
+ * \fn void VFS_UpdateDriverFile(void)
+ * \brief Updates the driver list file
+ */
+void VFS_UpdateDriverFile(void)
+{
+       tVFS_Driver     *drv;
+        int    len = 0;
+       char    *buf;
+       
+       // Format:
+       // <name>\n
+       for( drv = gVFS_Drivers; drv; drv = drv->Next )
+       {
+               len += 1 + strlen(drv->Name);
+       }
+       buf = malloc(len+1);
+       len = 0;
+       for( drv = gVFS_Drivers; drv; drv = drv->Next )
+       {
+               strcpy( &buf[len], drv->Name );
+               len += strlen(drv->Name);
+               buf[len++] = '\n';
+       }
+       buf[len] = '\0';
+       
+       SysFS_UpdateFile( giVFS_DriverFileID, buf, len );
+       if(gsVFS_DriverFile)    free(gsVFS_DriverFile);
+       gsVFS_DriverFile = buf;
+}