Cleaning up debug (and set modules to build with debug)

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

diff --git a/Kernel/vfs/main.c b/Kernel/vfs/main.c
index c8636b1..4fe8cf9 100644 (file)
--- a/Kernel/vfs/main.c
+++ b/Kernel/vfs/main.c
@@ -13,16 +13,19 @@ extern tVFS_Driver  gRootFS_Info;
 extern tVFS_Driver     gDevFS_Info;
 
 // === PROTOTYPES ===
- int   VFS_Init();
+ int   VFS_Init(void);
 char   *VFS_GetTruePath(char *Path);
 void   VFS_GetMemPath(char *Dest, void *Base, Uint Length);
 tVFS_Driver    *VFS_GetFSByName(char *Name);
  int   VFS_AddDriver(tVFS_Driver *Info);
-void   VFS_UpdateDriverFile();
+void   VFS_UpdateDriverFile(void);
+
+// === EXPORTS ===
+EXPORT(VFS_AddDriver);
 
 // === GLOBALS ===
 tVFS_Node      NULLNode = {0};
-tSpinlock      siDriverListLock = 0;
+tShortSpinlock slDriverListLock;
 tVFS_Driver    *gVFS_Drivers = NULL;
 char   *gsVFS_DriverFile = NULL;
  int   giVFS_DriverFileID = 0;
@@ -32,10 +35,10 @@ char        *gsVFS_MountFile = NULL;
 
 // === 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;
@@ -46,7 +49,10 @@ int VFS_Init()
        giVFS_MountFileID = SysFS_RegisterFile("VFS/Mounts", NULL, 0);
        giVFS_DriverFileID = SysFS_RegisterFile("VFS/Drivers", NULL, 0);
        
-       VFS_Mount("root", "/", "rootfs", "");
+       if( VFS_Mount("root", "/", "rootfs", "") != 0 ) {
+               Panic("Unable to mount root (Where the **** is rootfs?)");
+               return -1;
+       }
        VFS_MkDir("/Devices");
        VFS_MkDir("/Mount");
        VFS_Mount("dev", "/Devices", "devfs", "");
@@ -66,8 +72,10 @@ char *VFS_GetTruePath(char *Path)
        
        tmp = VFS_GetAbsPath(Path);
        if(tmp == NULL) return NULL;
+       //Log(" VFS_GetTruePath: tmp = '%s'", tmp);
        node = VFS_ParsePath(tmp, &ret);
        free(tmp);
+       //Log(" VFS_GetTruePath: node=%p, ret='%s'", node, ret);
        
        if(!node)       return NULL;
        if(node->Close) node->Close(node);
@@ -81,13 +89,11 @@ char *VFS_GetTruePath(char *Path)
  */
 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' );
        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';
 }
 
 /**
@@ -100,6 +106,7 @@ tVFS_Driver *VFS_GetFSByName(char *Name)
        
        for(;drv;drv=drv->Next)
        {
+//             Log("strcmp('%s' (%p), '%s') == 0?", drv->Name, drv->Name, Name);
                if(strcmp(drv->Name, Name) == 0)
                        return drv;
        }
@@ -113,10 +120,10 @@ 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();
        
@@ -124,10 +131,10 @@ int VFS_AddDriver(tVFS_Driver *Info)
 }
 
 /**
- * \fn void VFS_UpdateDriverFile()
+ * \fn void VFS_UpdateDriverFile(void)
  * \brief Updates the driver list file
  */
-void VFS_UpdateDriverFile()
+void VFS_UpdateDriverFile(void)
 {
        tVFS_Driver     *drv;
         int    len = 0;