X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Modules%2FFilesystems%2FInitRD%2Fmain.c;h=fa9ded6284bb5d667f46945d3dfa8882d8e9ec0a;hb=9bd0feb2cd61d6071a2c3e039b35560e608ab627;hp=cc54f27d0f6c1086bc710e3da5cb731e20ccd5a6;hpb=c3d486ba13c6cd12558d4c0cf01d3fd93e797d64;p=tpg%2Facess2.git

diff --git a/Modules/Filesystems/InitRD/main.c b/Modules/Filesystems/InitRD/main.c
index cc54f27d..fa9ded62 100644
--- a/Modules/Filesystems/InitRD/main.c
+++ b/Modules/Filesystems/InitRD/main.c
@@ -5,21 +5,27 @@
 #include "initrd.h"
 #include <modules.h>
 
+#define DUMP_ON_MOUNT	1
+
 // === IMPORTS ==
 extern tVFS_Node	gInitRD_RootNode;
+extern const int	giInitRD_NumFiles;
+extern tVFS_Node * const	gInitRD_FileList[];
 
 // === PROTOTYPES ===
  int	InitRD_Install(char **Arguments);
-tVFS_Node	*InitRD_InitDevice(char *Device, char **Arguments);
+tVFS_Node	*InitRD_InitDevice(const char *Device, const char **Arguments);
 void	InitRD_Unmount(tVFS_Node *Node);
+tVFS_Node	*InitRD_GetNodeFromINode(tVFS_Node *Root, Uint64 Inode);
 Uint64	InitRD_ReadFile(tVFS_Node *Node, Uint64 Offset, Uint64 Size, void *Buffer);
 char	*InitRD_ReadDir(tVFS_Node *Node, int ID);
-tVFS_Node	*InitRD_FindDir(tVFS_Node *Node, char *Name);
+tVFS_Node	*InitRD_FindDir(tVFS_Node *Node, const char *Name);
+void	InitRD_DumpDir(tVFS_Node *Node, int Indent);
 
 // === GLOBALS ===
 MODULE_DEFINE(0, 0x0A, FS_InitRD, InitRD_Install, NULL);
 tVFS_Driver	gInitRD_FSInfo = {
-	"initrd", 0, InitRD_InitDevice, InitRD_Unmount, NULL
+	"initrd", 0, InitRD_InitDevice, InitRD_Unmount, InitRD_GetNodeFromINode
 	};
 
 /**
@@ -27,15 +33,21 @@ tVFS_Driver	gInitRD_FSInfo = {
  */
 int InitRD_Install(char **Arguments)
 {
+	Log_Notice("InitRD", "Installed");
 	VFS_AddDriver( &gInitRD_FSInfo );
+	
 	return MODULE_ERR_OK;
 }
 
 /**
  * \brief Mount the InitRD
  */
-tVFS_Node *InitRD_InitDevice(char *Device, char **Arguments)
+tVFS_Node *InitRD_InitDevice(const char *Device, const char **Arguments)
 {
+	#if DUMP_ON_MOUNT
+	InitRD_DumpDir( &gInitRD_RootNode, 0 );
+	#endif
+	Log_Notice("InitRD", "Mounted");
 	return &gInitRD_RootNode;
 }
 
@@ -46,6 +58,14 @@ void InitRD_Unmount(tVFS_Node *Node)
 {
 }
 
+/**
+ */
+tVFS_Node *InitRD_GetNodeFromINode(tVFS_Node *Root, Uint64 Inode)
+{
+	if( Inode >= giInitRD_NumFiles )	return NULL;
+	return gInitRD_FileList[Inode];
+}
+
 /**
  * \brief Read from a file
  */
@@ -77,12 +97,12 @@ char *InitRD_ReadDir(tVFS_Node *Node, int ID)
 /**
  * \brief Find an element in a directory
  */
-tVFS_Node *InitRD_FindDir(tVFS_Node *Node, char *Name)
+tVFS_Node *InitRD_FindDir(tVFS_Node *Node, const char *Name)
 {
 	 int	i;
 	tInitRD_File	*dir = Node->ImplPtr;
 	
-	Log("InirRD_FindDir: Name = '%s'", Name);
+	LOG("Name = '%s'", Name);
 	
 	for( i = 0; i < Node->Size; i++ )
 	{
@@ -92,3 +112,20 @@ tVFS_Node *InitRD_FindDir(tVFS_Node *Node, char *Name)
 	
 	return NULL;
 }
+
+void InitRD_DumpDir(tVFS_Node *Node, int Indent)
+{
+	 int	i;
+	char	indent[Indent+1];
+	tInitRD_File	*dir = Node->ImplPtr;
+	
+	for( i = 0; i < Indent;	i++ )	indent[i] = ' ';
+	indent[i] = '\0';
+	
+	for( i = 0; i < Node->Size; i++ )
+	{
+		Log_Debug("InitRD", "%s- %p %s", indent, dir[i].Node, dir[i].Name);
+		if(dir[i].Node->Flags & VFS_FFLAG_DIRECTORY)
+			InitRD_DumpDir(dir[i].Node, Indent+1);
+	}
+}