summaryrefslogtreecommitdiff
path: root/kernel/kernel.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/kernel.c')
-rw-r--r--kernel/kernel.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/kernel/kernel.c b/kernel/kernel.c
index 208d1cd..4452e3e 100644
--- a/kernel/kernel.c
+++ b/kernel/kernel.c
@@ -8,6 +8,8 @@
#include "smp.h"
#include "time.h"
+#include "fs/fs.h"
+
#ifdef FOOLOS_COMPILE_FLOPPY
#include "floppy.h"
#endif
@@ -46,8 +48,6 @@ volatile int16_t mouse_y;
void kernel_main(uint32_t initial_stack, int mp)
{
-
-
/// TODO
/////// SYMMETRIC MULTIPROCESSING, APS get caought here, move it away ///
// catch the APs (Application Processors)
@@ -94,7 +94,7 @@ void kernel_main(uint32_t initial_stack, int mp)
// this function returns the physical base address of
// our video memory
//
- uint32_t vesa_physbase=vesa_init(0x8300,0x8400,0x80000+0x200);
+ uint32_t vesa_physbase=vesa_init(0x8300,0x8400,0x168000+512);//0x80000+0x200);
// self-log message of logger :P
log_log();
@@ -196,8 +196,8 @@ void kernel_main(uint32_t initial_stack, int mp)
//
//vesa_init_doublebuff();
- ext2_check(0x80800);
- syscall_execve(15,0,0);
+ ext2_check(EXT2_RAM_ADDRESS);
+ //syscall_execve(15,0,0);
// Just hang around here, if its reached.
// we do our tasks anyway. on the next clock tick.