X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fdrv%2Fproc.c;h=73f4535437fe725f8ab92d2e0081ea7583395233;hb=ceae45d80582dcb433cd26dcd6aad1c17229779d;hp=75d9e1fe4d6dd2de5e889223ee2201b29e104499;hpb=cc9c4465db1c38904798f967019c863f5b552d5f;p=tpg%2Facess2.git

diff --git a/Kernel/drv/proc.c b/Kernel/drv/proc.c
index 75d9e1fe..73f45354 100644
--- a/Kernel/drv/proc.c
+++ b/Kernel/drv/proc.c
@@ -40,6 +40,15 @@ void	SysFS_Comm_CloseFile(tVFS_Node *Node);
 extern tSysFS_Ent	gSysFS_Version;	// Defined Later
 extern tSysFS_Ent	gSysFS_Root;	// Defined Later
 MODULE_DEFINE(0, VERSION, SysFS, SysFS_Install, NULL, NULL);
+tVFS_NodeType	gSysFS_FileNodeType = {
+	.TypeName = "SysFS File",
+	.Read = SysFS_Comm_ReadFile
+	};
+tVFS_NodeType	gSysFS_DirNodeType = {
+	.TypeName = "SysFS Dir",
+	.ReadDir = SysFS_Comm_ReadDir,
+	.FindDir = SysFS_Comm_FindDir
+	};
 tSysFS_Ent	gSysFS_Version_Kernel = {
 	NULL, NULL,	// Nexts
 	&gSysFS_Version,	// Parent
@@ -50,7 +59,7 @@ tSysFS_Ent	gSysFS_Version_Kernel = {
 		.Size = 0,
 		.NumACLs = 1,
 		.ACLs = &gVFS_ACL_EveryoneRO,
-		.Read = SysFS_Comm_ReadFile
+		.Type = &gSysFS_FileNodeType
 	},
 	"Kernel"
 };
@@ -64,8 +73,7 @@ tSysFS_Ent	gSysFS_Version = {
 		.NumACLs = 1,
 		.ACLs = &gVFS_ACL_EveryoneRX,
 		.Flags = VFS_FFLAG_DIRECTORY,
-		.ReadDir = SysFS_Comm_ReadDir,
-		.FindDir = SysFS_Comm_FindDir
+		.Type = &gSysFS_DirNodeType
 	},
 	"Version"
 };
@@ -88,9 +96,7 @@ tDevFS_Driver	gSysFS_DriverInfo = {
 	.Flags = VFS_FFLAG_DIRECTORY,
 	.ImplPtr = &gSysFS_Version,
 	.Size = sizeof(gSysFS_Root)/sizeof(tSysFS_Ent),
-	.ReadDir = SysFS_Comm_ReadDir,
-	.FindDir = SysFS_Comm_FindDir,
-	.IOCtl = NULL
+	.Type = &gSysFS_DirNodeType
 	}
 };
  int	giSysFS_NextFileID = 2;
@@ -104,7 +110,7 @@ tSysFS_Ent	*gSysFS_FileList;
 int SysFS_Install(char **Options)
 {
 	{
-		const char	*fmt = "Acess2 "EXPAND_STR(KERNEL_VERSION)" build %i, hash %s";
+		const char	*fmt = "Acess2 "EXPAND_STR(KERNEL_VERSION)" "EXPAND_STR(ARCHDIR)" build %i, hash %s";
 		gSysFS_Version_Kernel.Node.Size = sprintf(NULL, fmt, BUILD_NUM, gsGitHash);
 		gSysFS_Version_Kernel.Node.ImplPtr = malloc( gSysFS_Version_Kernel.Node.Size + 1 );
 		sprintf(gSysFS_Version_Kernel.Node.ImplPtr, fmt, BUILD_NUM, gsGitHash);
@@ -158,8 +164,7 @@ int SysFS_RegisterFile(const char *Path, const char *Data, int Length)
 			child->Node.NumACLs = 1;
 			child->Node.ACLs = &gVFS_ACL_EveryoneRX;
 			child->Node.Flags = VFS_FFLAG_DIRECTORY;
-			child->Node.ReadDir = SysFS_Comm_ReadDir;
-			child->Node.FindDir = SysFS_Comm_FindDir;
+			child->Node.Type = &gSysFS_DirNodeType;
 			if( !prev ) {
 				if(ent)
 					ent->Node.ImplPtr = child;
@@ -212,8 +217,7 @@ int SysFS_RegisterFile(const char *Path, const char *Data, int Length)
 	child->Node.Size = Length;
 	child->Node.NumACLs = 1;
 	child->Node.ACLs = &gVFS_ACL_EveryoneRO;
-	child->Node.Read = SysFS_Comm_ReadFile;
-	child->Node.Close = SysFS_Comm_CloseFile;
+	child->Node.Type = &gSysFS_FileNodeType;
 	
 	// Add to parent's child list
 	if(ent) {