From 04b10ec9d26122069ed497cc0035e3a5f20f9197 Mon Sep 17 00:00:00 2001 From: John Hodge Date: Tue, 6 Apr 2010 23:42:40 +0800 Subject: [PATCH] Cleaning up more Log( calls with Log_*( - TODO: Move the module load messages to Log_Notice instead of Log_Log --- Kernel/Makefile.BuildNum | 2 +- Kernel/arch/x86/main.c | 14 +++++++------- Kernel/system.c | 1 + 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Kernel/Makefile.BuildNum b/Kernel/Makefile.BuildNum index 093dcc68..2453f866 100644 --- a/Kernel/Makefile.BuildNum +++ b/Kernel/Makefile.BuildNum @@ -1 +1 @@ -BUILD_NUM = 1800 +BUILD_NUM = 1802 diff --git a/Kernel/arch/x86/main.c b/Kernel/arch/x86/main.c index 8660343c..fa3cb454 100644 --- a/Kernel/arch/x86/main.c +++ b/Kernel/arch/x86/main.c @@ -70,22 +70,22 @@ int kmain(Uint MbMagic, void *MbInfoPtr) MM_InstallVirtual(); // Clean up virtual address space Heap_Install(); // Create initial heap - Log("Starting Multitasking..."); + //Log_Log("Arch", "Starting Multitasking..."); // Start Multitasking Threads_Init(); // Start Timers Time_Setup(); - Log("Starting VFS..."); + Log_Log("Arch", "Starting VFS..."); // Load Virtual Filesystem VFS_Init(); // Initialise builtin modules - Log("Initialising builtin modules..."); + Log_Log("Arch", "Initialising builtin modules..."); Modules_LoadBuiltins(); - Log("Loading %i Modules...", mbInfo->ModuleCount); + Log_Log("Arch", "Loading %i Modules...", mbInfo->ModuleCount); // Load initial modules mods = (void*)( mbInfo->Modules + KERNEL_BASE ); @@ -96,16 +96,16 @@ int kmain(Uint MbMagic, void *MbInfoPtr) mods[i].End += KERNEL_BASE; mods[i].String += KERNEL_BASE; - Log("Loading '%s'", mods[i].String); + Log_Log("Arch", "Loading '%s'", mods[i].String); if( !Module_LoadMem( (void *)mods[i].Start, mods[i].End-mods[i].Start, (char *)mods[i].String ) ) { - Log_Warning("ARCH", "Unable to load module\n"); + Log_Warning("Arch", "Unable to load module\n"); } } // Pass on to Independent Loader - Log("Loading Configuration..."); + Log_Log("Arch", "Starting system"); System_Init( gsBootCmdLine ); // Sleep forever (sleeping beauty) diff --git a/Kernel/system.c b/Kernel/system.c index f9139185..a720addf 100644 --- a/Kernel/system.c +++ b/Kernel/system.c @@ -533,6 +533,7 @@ tConfigFile *System_Int_ParseFile(char *FileData) // Quoted if( *ptr == '"' ) { ptr ++; + ret->Lines[i].Parts[j] = ptr; while( *ptr && !(*ptr == '"' && ptr[-1] == '\\') && *ptr != '\n' ) ptr++; } -- 2.20.1