X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fsystem.c;h=8fc2a1ccea4f8e7348f0a44d9c9bb909452da3fd;hb=4ad6151eb6d3138c9070cb376f5ba9fa3ec511e8;hp=b30f4d044e628da050ee8b026027b5a6d2da8fc0;hpb=1e25b20fd5d119d3b5673d6a31f60b2da676de98;p=tpg%2Facess2.git

diff --git a/Kernel/system.c b/Kernel/system.c
index b30f4d04..8fc2a1cc 100644
--- a/Kernel/system.c
+++ b/Kernel/system.c
@@ -1,63 +1,51 @@
 /*
- * Acess 2
- * Architecture Independent System Init
+ * Acess 2 Kernel
+ * - By John Hodge (thePowersGang)
  * system.c
+ * - Architecture Independent System Init
  */
 #define DEBUG	0
 #include <acess.h>
 
-// === TYPES ===
-typedef struct
-{
-	 int	TrueLine;
-	 int	nParts;
-	char	**Parts;
-}	tConfigLine;
-typedef struct
-{
-	 int	nLines;
-	tConfigLine	Lines[];
-}	tConfigFile;
-
 // === IMPORTS ===
-extern int	Modules_LoadBuiltins();
-//extern int	PCI_Install();
-extern void	DMA_Install();
-extern void	Debug_SetKTerminal(char *File);
-extern void	StartupPrint(char *Str);
+extern void	Arch_LoadBootModules(void);
+extern int	Modules_LoadBuiltins(void);
+extern void	Modules_SetBuiltinParams(char *Name, char *ArgString);
+extern void	Debug_SetKTerminal(const char *File);
 
 // === PROTOTYPES ===
-void	System_Init(char *ArgString);
+void	System_Init(char *Commandline);
 void	System_ParseCommandLine(char *ArgString);
+void	System_ExecuteCommandLine(void);
 void	System_ParseVFS(char *Arg);
+void	System_ParseModuleArgs(char *Arg);
 void	System_ParseSetting(char *Arg);
-void	System_ExecuteScript();
-tConfigFile	*System_Int_ParseFile(char *File);
 
 // === GLOBALS ===
-char	*gsConfigScript = "/Acess/Conf/BootConf.cfg";
+const char	*gsInitBinary = "/Acess/SBin/init";
+char	*argv[32];
+ int	argc;
 
 // === CODE ===
-void System_Init(char *ArgString)
+void System_Init(char *CommandLine)
 {
-	// - Start Builtin Drivers & Filesystems
-	//StartupPrint("Scanning PCI Bus...");
-	//PCI_Install();
-	StartupPrint("Loading DMA...");
-	DMA_Install();
-	StartupPrint("Loading staticly compiled modules...");
-	Modules_LoadBuiltins();
+	// Parse Kernel's Command Line
+	System_ParseCommandLine(CommandLine);
 	
-	// Set the debug to be echoed to the terminal
-	StartupPrint("Kernel now echoes to VT6 (Ctrl-Alt-F7)");
-	Debug_SetKTerminal("/Devices/VTerm/6");
+	// Initialise modules
+	Log_Log("Config", "Initialising builtin modules...");
+	Modules_LoadBuiltins();
+	Arch_LoadBootModules();
 	
-	// - Parse Kernel's Command Line
-	System_ParseCommandLine(ArgString);
+	System_ExecuteCommandLine();
 	
 	// - Execute the Config Script
-	Log("Executing config script...");
-	System_ExecuteScript();
+	Log_Log("Config", "Spawning init '%s'", gsInitBinary);
+	Proc_Spawn(gsInitBinary);
+	
+	// Set the debug to be echoed to the terminal
+	Log_Log("Config", "Kernel now echoes to VT7 (Ctrl-Alt-F8)");
+	Debug_SetKTerminal("/Devices/VTerm/7");
 }
 
 /**
@@ -66,42 +54,76 @@ void System_Init(char *ArgString)
  */
 void System_ParseCommandLine(char *ArgString)
 {
-	char	*argv[32];
-	 int	argc;
 	 int	i;
 	char	*str;
 	
-	Log("Kernel Command Line: \"%s\"", ArgString);
+	Log_Log("Config", "Kernel Invocation (%p) \"%s\"", ArgString, ArgString);
 	
 	// --- Get Arguments ---
 	str = ArgString;
 	for( argc = 0; argc < 32; argc++ )
 	{
-		while(*str == ' ')	str++;	// Eat Whitespace
-		if(*str == '\0') {	argc--;	break;}	// End of string
+		// Eat Whitespace
+		while(*str == ' ')	str++;
+		// Check for the end of the string
+		if(*str == '\0') {	argc--;	break;}	
 		argv[argc] = str;
-		while(*str && *str != ' ')
-		{
-			/*if(*str == '"') {
-				while(*str && !(*str == '"' && str[-1] != '\\'))
-					str ++;
-			}*/
-			str++;
+		if(*str == '"') {
+			while(*str && !(*str == '"' && str[-1] != '\\'))
+				str ++;
 		}
-		if(*str == '\0')	break;	// End of string
+		else {
+			while(*str && *str != ' ')
+				str++;
+		}
+		if(*str == '\0')	break;	// Check for EOS
 		*str = '\0';	// Cap off argument string
 		str ++;	// and increment the string pointer
 	}
 	if(argc < 32)
 		argc ++;	// Count last argument
 	
-	// --- Parse Arguments ---
+	// --- Parse Arguments (Pass 1) ---
 	for( i = 1; i < argc; i++ )
 	{
-		if( argv[i][0] == '/' )
-			System_ParseVFS( argv[i] );
-		else
+		switch(argv[i][0])
+		{
+		// --- VFS ---
+		// Ignored on this pass
+		case '/':
+			break;
+		
+		// --- Module Paramaters ---
+		// -VTerm:Width=640,Height=480,Scrollback=2
+		case '-':
+			System_ParseModuleArgs( argv[i] );
+			break;
+		// --- Config Options ---
+		// SCRIPT=/Acess/Conf/BootConf.cfg
+		default:
 			System_ParseSetting( argv[i] );
+			break;
+		}
+	}
+}
+
+void System_ExecuteCommandLine(void)
+{
+	 int	i;
+	if(argc > 0)
+		LOG("Invocation '%s'", argv[0]);
+	for( i = 1; i < argc; i++ )
+	{
+		LOG("argv[%i] = '%s'", i, argv[i]);
+		switch(argv[i][0])
+		{
+		// --- VFS ---
+		// Mount    /System=ext2:/Devices/ATA/A1
+		// Symlink  /Acess=/System/Acess2
+		case '/':
+			System_ParseVFS( argv[i] );
+			break;
+		}
 	}
 }
 
@@ -120,7 +142,7 @@ void System_ParseVFS(char *Arg)
 	
 	// Check if the equals was found
 	if( *value == '\0' ) {
-		Warning("Expected '=' in the string '%s'", Arg);
+		Log_Warning("Config", "Expected '=' in the string '%s'", Arg);
 		return ;
 	}
 	
@@ -131,7 +153,7 @@ void System_ParseVFS(char *Arg)
 	// - Symbolic Link <link>=<destination>
 	if(value[0] == '/')
 	{
-		Log("Symbolic link '%s' pointing to '%s'", Arg, value);
+		Log_Log("Config", "Symbolic link '%s' pointing to '%s'", Arg, value);
 		VFS_Symlink(Arg, value);
 	}
 	// - Mount <mountpoint>=<fs>:<device>
@@ -146,17 +168,49 @@ void System_ParseVFS(char *Arg)
 		}
 		// Create Mountpoint
 		if( (fd = VFS_Open(Arg, 0)) == -1 ) {
-			Log("Creating directory '%s'", Arg, value);
+			Log_Log("Config", "Creating directory '%s'", Arg, value);
 			VFS_MkDir( Arg );
 		} else {
 			VFS_Close(fd);
 		}
 		// Mount
-		Log("Mounting '%s' to '%s' ('%s')", dev, Arg, value);
+		Log_Log("Config", "Mounting '%s' to '%s' ('%s')", dev, Arg, value);
 		VFS_Mount(dev, Arg, value, "");
 	}
 }
 
+/**
+ * \brief Parse a module argument string
+ * \param Arg	Argument string
+ */
+void System_ParseModuleArgs(char *Arg)
+{
+	char	*name, *args;
+	 int	i;
+	
+	// Remove '-'	
+	name = Arg + 1;
+	
+	// Find the start of the args
+	i = strpos(name, ':');
+	if( i == -1 ) {
+		Log_Warning("Config", "Module spec with no arguments");
+		#if 1
+		return ;
+		#else
+		i = strlen(name);
+		args = name + i;
+		#endif
+	}
+	else {
+		name[i] = '\0';
+		args = name + i + 1;
+	}
+	
+	Log_Log("Config", "Setting boot parameters for '%s' to '%s'", name, args);
+	Modules_SetBuiltinParams(name, args);
+}
+
 /**
  * \fn void System_ParseSetting(char *Arg)
  */
@@ -172,297 +226,27 @@ void System_ParseSetting(char *Arg)
 	// Check for boolean/flag (no '=')
 	if(*value == '\0')
 	{
-		if(strcmp(Arg, "") == 0) {
-		} else {
-			Warning("Kernel flag '%s' is not recognised", Arg);
-		}
+		//if(strcmp(Arg, "") == 0) {
+		//} else {
+			Log_Warning("Config", "Kernel flag '%s' is not recognised", Arg);
+		//}
 	}
 	else
 	{
 		*value = '\0';	// Remove '='
 		value ++;	// and eat it's position
 		
-		if(strcmp(Arg, "SCRIPT") == 0) {
-			Log("Config Script: '%s'", value);
-			gsConfigScript = value;
-		} else {
-			Warning("Kernel config setting '%s' is not recognised", Arg);
-		}
-		
-	}
-}
-
-/**
- * \fn void System_ExecuteScript()
- */
-void System_ExecuteScript()
-{
-	 int	fp;
-	 int	fLen = 0;
-	 int	i;
-	char	*fData;
-	tConfigFile	*file;
-	tConfigLine	*line;
-	
-	// Open Script
-	fp = VFS_Open(gsConfigScript, VFS_OPENFLAG_READ);
-	if(fp == -1) {
-		Warning("[CFG] Passed script '%s' does not exist", gsConfigScript);
-		return;
-	}
-	
-	// Read into memory buffer
-	VFS_Seek(fp, 0, SEEK_END);
-	fLen = VFS_Tell(fp);
-	VFS_Seek(fp, 0, SEEK_SET);
-	fData = malloc(fLen+1);
-	VFS_Read(fp, fLen, fData);
-	fData[fLen] = '\0';
-	VFS_Close(fp);
-	
-	
-	
-	// Parse File
-	file = System_Int_ParseFile(fData);
-	
-	// Loop lines
-	for( i = 0; i < file->nLines; i++ )
-	{
-		line = &file->Lines[i];
-		if( line->nParts == 0 )	continue;	// Skip blank
-		
-		// Mount
-		if( strcmp(line->Parts[0], "mount") == 0 ) {
-			if( line->nParts != 4 ) {
-				Warning("Configuration command 'mount' requires 3 arguments, %i given",
-					line->nParts-1);
-				continue;
-			}
-			//Log("[CFG ] Mount '%s' to '%s' (%s)",
-			//	line->Parts[1], line->Parts[2], line->Parts[3]);
-			//! \todo Use an optional 4th argument for the options string
-			VFS_Mount(line->Parts[1], line->Parts[2], line->Parts[3], "");
-		}
-		// Module
-		else if(strcmp(line->Parts[0], "module") == 0) {
-			if( line->nParts < 2 || line->nParts > 3 ) {
-				Warning("Configuration command 'module' requires 1 or 2 arguments, %i given",
-					line->nParts-1);
-				continue;
-			}
-			if( line->nParts == 3 )
-				Module_LoadFile(line->Parts[1], line->Parts[2]);
+		if(strcmp(Arg, "INIT") == 0) {
+			Log_Log("Config", "Init binary: '%s'", value);
+			if(strlen(value) == 0)
+				gsInitBinary = NULL;
 			else
-				Module_LoadFile(line->Parts[1], "");
-		}
-		// UDI Module
-		else if(strcmp(line->Parts[0], "udimod") == 0) {
-			if( line->nParts != 2 ) {
-				Warning("Configuration command 'udimod' requires 1 argument, %i given",
-					line->nParts-1);
-				continue;
-			}
-			Log("[CFG  ] Load UDI Module '%s'", line->Parts[1]);
-			Module_LoadFile(line->Parts[1], "");
-		}
-		// EDI Module
-		else if(strcmp(line->Parts[0], "edimod") == 0) {
-			if( line->nParts != 2 ) {
-				Warning("Configuration command 'edimod' requires 1 argument, %i given",
-					line->nParts-1);
-				continue;
-			}
-			Log("[CFG  ] Load EDI Module '%s'", line->Parts[1]);
-			Module_LoadFile(line->Parts[1], "");
-		}
-		// Symbolic Link
-		else if(strcmp(line->Parts[0], "symlink") == 0) {
-			if( line->nParts != 3 ) {
-				Warning("Configuration command 'symlink' requires 2 arguments, %i given",
-					line->nParts-1);
-				continue;
-			}
-			Log("[CFG  ] Symlink '%s' pointing to '%s'",
-				line->Parts[1], line->Parts[2]);
-			VFS_Symlink(line->Parts[1], line->Parts[2]);
-		}
-		// Create Directory
-		else if(strcmp(line->Parts[0], "mkdir") == 0) {
-			if( line->nParts != 2 ) {
-				Warning("Configuration command 'mkdir' requires 1 argument, %i given",
-					line->nParts-1);
-				continue;
-			}
-			Log("[CFG  ] New Directory '%s'", line->Parts[1]);
-			VFS_MkDir(line->Parts[1]);
-		}
-		// Spawn a process
-		else if(strcmp(line->Parts[0], "spawn") == 0) {
-			if( line->nParts != 2 ) {
-				Warning("Configuration command 'spawn' requires 1 argument, %i given",
-					line->nParts-1);
-				continue;
-			}
-			Log("[CFG  ] Starting '%s' as a new task", line->Parts[1]);
-			Proc_Spawn(line->Parts[1]);
+				gsInitBinary = value;
 		}
 		else {
-			Warning("Unknown configuration command '%s' on line %i",
-				line->Parts[0],
-				line->TrueLine
-				);
-		}
-	}
-	
-	// Clean up after ourselves
-	for( i = 0; i < file->nLines; i++ ) {
-		if( file->Lines[i].nParts == 0 )	continue;	// Skip blank
-		free( file->Lines[i].Parts );
-	}
-	free( file );
-	free( fData );
-}
-
-/**
- * \brief Parses a config file
- * \param FileData	Read/Write buffer containing the config file data
- *                  (will be modified)
- * \return ::tConfigFile structure that represents the original contents
- *         of \a FileData
- */
-tConfigFile	*System_Int_ParseFile(char *FileData)
-{
-	char	*ptr;
-	char	*start;
-	 int	nLines = 1;
-	 int	i, j;
-	tConfigFile	*ret;
-	
-	ENTER("pFileData", FileData);
-	
-	// Prescan and count the number of lines
-	for(ptr = FileData; *ptr; ptr++)
-	{		
-		if(*ptr != '\n')	continue;
-		
-		if(ptr == FileData) {
-			nLines ++;
-			continue;
-		}
-		
-		// Escaped EOL
-		if(ptr[-1] == '\\')	continue;
-		
-		nLines ++;
-	}
-	
-	LOG("nLines = %i", nLines);
-	
-	// Ok so we have `nLines` lines, now to allocate our return
-	ret = malloc( sizeof(tConfigFile) + sizeof(tConfigLine)*nLines );
-	ret->nLines = nLines;
-	
-	// Read the file for real
-	for(
-		ptr = FileData, i = 0;
-		*ptr;
-		i++
-		)
-	{
-		start = ptr;
-		
-		ret->Lines[i].nParts = 0;
-		
-		// Count parts
-		for(;;)
-		{
-			// Read leading whitespace
-			while( *ptr == '\t' || *ptr == ' ' )	ptr++;
-			
-			// End of line/file
-			if( *ptr == '\0' || *ptr == '\n' ) {
-				if(*ptr == '\n')	ptr ++;
-				break;
-			}
-			// Comment
-			if( *ptr == '#' || *ptr == ';' ) {
-				while( *ptr && *ptr != '\n' )	ptr ++;
-				if(*ptr == '\n')	ptr ++;
-				break;
-			}
-			
-			ret->Lines[i].nParts ++;
-			// Quoted
-			if( *ptr == '"' ) {
-				ptr ++;
-				while( *ptr && !(*ptr == '"' && ptr[-1] == '\\') && *ptr != '\n' )
-					ptr++;
-				continue;
-			}
-			// Unquoted
-			while( *ptr && !(*ptr == '\t' || *ptr == ' ') && *ptr != '\n' )
-				ptr++;
-		}
-		
-		LOG("ret->Lines[%i].nParts = %i", i, ret->Lines[i].nParts);
-		
-		if( ret->Lines[i].nParts == 0 ) {
-			ret->Lines[i].Parts = NULL;
-			continue;
+			Log_Warning("Config", "Kernel config setting '%s' is not recognised", Arg);
 		}
 		
-		// Allocate part list
-		ret->Lines[i].Parts = malloc( sizeof(char*) * ret->Lines[i].nParts );
-		
-		// Fill list
-		for( ptr = start, j = 0; ; j++ )
-		{
-			// Read leading whitespace
-			while( *ptr == '\t' || *ptr == ' ' )	ptr++;
-			
-			// End of line/file
-			if( *ptr == '\0' || *ptr == '\n' ) {
-				if(*ptr == '\n')	ptr ++;
-				break;
-			}
-			// Comment
-			if( *ptr == '#' || *ptr == ';' ) {
-				while( *ptr && *ptr != '\n' )	ptr ++;
-				if(*ptr == '\n')	ptr ++;
-				break;
-			}
-			
-			ret->Lines[i].Parts[j] = ptr;
-			
-			// Quoted
-			if( *ptr == '"' ) {
-				ptr ++;
-				while( *ptr && !(*ptr == '"' && ptr[-1] == '\\') && *ptr != '\n' )
-					ptr++;
-			}
-			// Unquoted
-			else {
-				while( *ptr != '\t' && *ptr != ' ' && *ptr != '\n' )
-					ptr++;
-			}
-			
-			// Break if we have reached NULL
-			if( *ptr == '\0' ) {
-				LOG("ret->Lines[%i].Parts[%i] = '%s'", i, j, ret->Lines[i].Parts[j]);
-				break;
-			}
-			if( *ptr == '\n' ) {
-				*ptr = '\0';
-				LOG("ret->Lines[%i].Parts[%i] = '%s'", i, j, ret->Lines[i].Parts[j]);
-				ptr ++;
-				break;
-			}
-			*ptr = '\0';	// Cap off string
-			LOG("ret->Lines[%i].Parts[%i] = '%s'", i, j, ret->Lines[i].Parts[j]);
-			ptr ++;	// And increment for the next round
-		}
 	}
-	
-	LEAVE('p', ret);
-	return ret;
 }
+