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
Working on x86_64 build
[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
f2a9229
..
4e6001d
100644
(file)
--- a/
Kernel/arch/x86_64/main.c
+++ b/
Kernel/arch/x86_64/main.c
@@
-9,7
+9,7
@@
extern void Desctab_Init(void);
extern void MM_InitVirt(void);
extern void Heap_Install(void);
extern void Threads_Init(void);
extern void MM_InitVirt(void);
extern void Heap_Install(void);
extern void Threads_Init(void);
-
//extern void
Time_Setup(void);
+
extern int
Time_Setup(void);
extern void System_Init(char *Commandline);
extern void MM_InitPhys_Multiboot(tMBoot_Info *MBoot);
extern void System_Init(char *Commandline);
extern void MM_InitPhys_Multiboot(tMBoot_Info *MBoot);
@@
-35,7
+35,8
@@
void kmain(Uint MbMagic, void *MbInfoPtr)
case MULTIBOOT_MAGIC:
// Adjust Multiboot structure address
mbInfo = (void*)( (Uint)MbInfoPtr + KERNEL_BASE );
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;
MM_InitPhys_Multiboot( mbInfo ); // Set up physical memory manager
break;
@@
-45,6
+46,8
@@
void kmain(Uint MbMagic, void *MbInfoPtr)
return ;
}
return ;
}
+ Log("gsBootCmdLine = '%s'", gsBootCmdLine);
+
*(Uint16*)(0xB8000) = 0x1F00|'D';
Heap_Install();
*(Uint16*)(0xB8000) = 0x1F00|'D';
Heap_Install();
@@
-52,7
+55,7
@@
void kmain(Uint MbMagic, void *MbInfoPtr)
Log_Log("Arch", "Starting threading...");
Threads_Init();
Log_Log("Arch", "Starting threading...");
Threads_Init();
-
//
Time_Setup();
+ Time_Setup();
*(Uint16*)(0xB8000) = 0x1F00|'F';
Log_Log("Arch", "Starting VFS...");
*(Uint16*)(0xB8000) = 0x1F00|'F';
Log_Log("Arch", "Starting VFS...");
UCC
git Repository :: git.ucc.asn.au