X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86_64%2Fmain.c;h=7d69368095a210e9dbdd07df657c17a5260942ac;hb=18b264927674c480481466c40368554fb72f560f;hp=6388d1bf8e308bb80f4ce25995c81e0027176e67;hpb=d8b11d2074b48f17f999d44c75b1f76fdffd970b;p=tpg%2Facess2.git diff --git a/Kernel/arch/x86_64/main.c b/Kernel/arch/x86_64/main.c index 6388d1bf..7d693680 100644 --- a/Kernel/arch/x86_64/main.c +++ b/Kernel/arch/x86_64/main.c @@ -35,7 +35,8 @@ void kmain(Uint MbMagic, void *MbInfoPtr) case MULTIBOOT_MAGIC: // Adjust Multiboot structure address mbInfo = (void*)( (Uint)MbInfoPtr + KERNEL_BASE ); - gsBootCmdLine = (char*)(mbInfo->CommandLine + KERNEL_BASE); + gsBootCmdLine = (char*)( (Uint)mbInfo->CommandLine + KERNEL_BASE); + Log("gsBootCmdLine = '%s'", gsBootCmdLine); MM_InitPhys_Multiboot( mbInfo ); // Set up physical memory manager break; @@ -45,6 +46,8 @@ void kmain(Uint MbMagic, void *MbInfoPtr) return ; } + Log("gsBootCmdLine = '%s'", gsBootCmdLine); + *(Uint16*)(0xB8000) = 0x1F00|'D'; Heap_Install(); @@ -59,7 +62,10 @@ void kmain(Uint MbMagic, void *MbInfoPtr) // Load Virtual Filesystem VFS_Init(); - *(Uint16*)(0xB8000) = 0x1F00|'G'; + *(Uint16*)(0xB8000) = 0x1F00|'Z'; + *(Uint16*)(0xB8002) = 0x1F00|'Z'; + *(Uint16*)(0xB8004) = 0x1F00|'Z'; + *(Uint16*)(0xB8006) = 0x1F00|'Z'; // Pass on to Independent Loader Log_Log("Arch", "Starting system");