git.ucc.asn.au
/
tpg
/
acess2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of ssh.ucc.asn.au:tpg/acess2
[tpg/acess2.git]
/
Kernel
/
arch
/
x86_64
/
main.c
diff --git
a/Kernel/arch/x86_64/main.c
b/Kernel/arch/x86_64/main.c
index
d3b79c6
..
3532c80
100644
(file)
--- a/
Kernel/arch/x86_64/main.c
+++ b/
Kernel/arch/x86_64/main.c
@@
-26,7
+26,7
@@
void kmain(Uint MbMagic, void *MbInfoPtr)
{
tMBoot_Info *mbInfo;
- LogF("Acess2 x86_6
5
v"EXPAND_STR(KERNEL_VERSION)"\n");
+ LogF("Acess2 x86_6
4
v"EXPAND_STR(KERNEL_VERSION)"\n");
LogF(" Build %i, Git Hash %s\n", BUILD_NUM, gsGitHash);
Desctab_Init();
@@
-41,8
+41,6
@@
void kmain(Uint MbMagic, void *MbInfoPtr)
// Adjust Multiboot structure address
mbInfo = (void*)( (Uint)MbInfoPtr + KERNEL_BASE );
gsBootCmdLine = (char*)( (Uint)mbInfo->CommandLine + KERNEL_BASE);
- Log("gsBootCmdLine = '%s'", gsBootCmdLine);
-
MM_InitPhys_Multiboot( mbInfo ); // Set up physical memory manager
break;
default:
@@
-57,14
+55,13
@@
void kmain(Uint MbMagic, void *MbInfoPtr)
Heap_Install();
*(Uint16*)(KERNEL_BASE|0xB8000) = 0x1F00|'E';
- Log_Log("Arch", "Starting threading...");
Threads_Init();
Time_Setup();
*(Uint16*)(KERNEL_BASE|0xB8000) = 0x1F00|'F';
- Log_Log("Arch", "Starting VFS...");
// Load Virtual Filesystem
+ Log_Log("Arch", "Starting VFS...");
VFS_Init();
*(Uint16*)(KERNEL_BASE|0xB8000) = 0x1F00|'Z';
UCC
git Repository :: git.ucc.asn.au