X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fvfs%2Fmain.c;h=c6525f49e2f389c4902c74c1d0ee03895fc86acc;hb=61cfad415a64c52ca253460231046f47fcb7fb15;hp=dc43fbf0f8cf42949f5e20908af23044d43bf0d1;hpb=4e949acb1c98bc071af2d5d9038b4a3e703bf33d;p=tpg%2Facess2.git

diff --git a/Kernel/vfs/main.c b/Kernel/vfs/main.c
index dc43fbf0..c6525f49 100644
--- a/Kernel/vfs/main.c
+++ b/Kernel/vfs/main.c
@@ -13,11 +13,13 @@ 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 ===
@@ -50,13 +52,14 @@ int VFS_Init(void)
 	giVFS_DriverFileID = SysFS_RegisterFile("VFS/Drivers", NULL, 0);
 	
 	if( VFS_Mount("root", "/", "rootfs", "") != 0 ) {
-		Panic("Unable to mount root (Where the **** is rootfs?)");
+		Log_KernelPanic("VFS", "Unable to mount root (Where the **** is rootfs?)");
 		return -1;
 	}
 	VFS_MkDir("/Devices");
 	VFS_MkDir("/Mount");
 	VFS_Mount("dev", "/Devices", "devfs", "");
-	
+		
+	Log_Debug("VFS", "Setting max files");
 	CFGINT(CFG_VFS_MAXFILES) = 32;
 	return 0;
 }
@@ -73,12 +76,12 @@ char *VFS_GetTruePath(const char *Path)
 	tmp = VFS_GetAbsPath(Path);
 	if(tmp == NULL)	return NULL;
 	//Log(" VFS_GetTruePath: tmp = '%s'", tmp);
-	node = VFS_ParsePath(tmp, &ret);
+	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;
 }