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
Kernel/x86 - Separated timer and task switching
[tpg/acess2.git]
/
Kernel
/
arch
/
x86
/
main.c
diff --git
a/Kernel/arch/x86/main.c
b/Kernel/arch/x86/main.c
index
0557760
..
99c1020
100644
(file)
--- a/
Kernel/arch/x86/main.c
+++ b/
Kernel/arch/x86/main.c
@@
-19,16
+19,14
@@
extern void Heap_Install(void);
extern void Desctab_Install(void);
extern void MM_PreinitVirtual(void);
extern void MM_Install(tMBoot_Info *MBoot);
extern void Desctab_Install(void);
extern void MM_PreinitVirtual(void);
extern void MM_Install(tMBoot_Info *MBoot);
-extern void MM_InstallVirtual(void);
+extern void
MM_InstallVirtual(void);
extern void Threads_Init(void);
extern int Time_Setup(void);
extern void Threads_Init(void);
extern int Time_Setup(void);
-extern Uint Proc_Clone(Uint *Err, Uint Flags);
-extern void Threads_Sleep(void);
// --- Core ---
extern void System_Init(char *Commandline);
// === PROTOTYPES ===
// --- Core ---
extern void System_Init(char *Commandline);
// === PROTOTYPES ===
-
void Arch_LoadBootModules(void
);
+
int kmain(Uint MbMagic, void *MbInfoPtr
);
// === GLOBALS ===
char *gsBootCmdLine = NULL;
// === GLOBALS ===
char *gsBootCmdLine = NULL;
@@
-46,9
+44,11
@@
int kmain(Uint MbMagic, void *MbInfoPtr)
int i;
tMBoot_Module *mods;
tMBoot_Info *mbInfo;
int i;
tMBoot_Module *mods;
tMBoot_Info *mbInfo;
+
+ LogF("Acess2 x86_65 v"EXPAND_STR(KERNEL_VERSION)"\n");
+ LogF(" Build %i, Git Hash %s\n", BUILD_NUM, gsGitHash);
- Log("MbMagic = %08x", MbMagic);
- Log("MbInfoPtr = %p", MbInfoPtr);
+ Log("MbMagic = %08x, MbInfoPtr = %p", MbMagic, MbInfoPtr);
// Set up non-boot info dependent stuff
Desctab_Install(); // Set up GDT and IDT
// Set up non-boot info dependent stuff
Desctab_Install(); // Set up GDT and IDT
@@
-81,13
+81,13
@@
int kmain(Uint MbMagic, void *MbInfoPtr)
MM_InstallVirtual(); // Clean up virtual address space
Heap_Install(); // Create initial heap
MM_InstallVirtual(); // Clean up virtual address space
Heap_Install(); // Create initial heap
- // Start Timers
- Time_Setup();
-
//Log_Log("Arch", "Starting Multitasking...");
// Start Multitasking
Threads_Init();
//Log_Log("Arch", "Starting Multitasking...");
// Start Multitasking
Threads_Init();
+ // Start Timers
+ Time_Setup();
+
Log_Log("Arch", "Starting VFS...");
// Load Virtual Filesystem
VFS_Init();
Log_Log("Arch", "Starting VFS...");
// Load Virtual Filesystem
VFS_Init();
UCC
git Repository :: git.ucc.asn.au