diff options
| author | Michal Idziorek <m.i@gmx.at> | 2014-10-20 18:54:18 +0200 |
|---|---|---|
| committer | Michal Idziorek <m.i@gmx.at> | 2014-10-20 18:54:18 +0200 |
| commit | 813272cd88cc6c0a1dfbb121d2130fc849042c8a (patch) | |
| tree | 61b8ede4a5c191c491621f0185d3a442ff5407dd /kernel/kernel.c | |
| parent | 2f6fe94d436347c4d886407dbfd44b6ac1aa41fa (diff) | |
1st userspace programm and partial newlib support!
Diffstat (limited to 'kernel/kernel.c')
| -rw-r--r-- | kernel/kernel.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/kernel/kernel.c b/kernel/kernel.c index 811f4c1..3372b75 100644 --- a/kernel/kernel.c +++ b/kernel/kernel.c @@ -18,9 +18,6 @@ uint32_t c1,c2,c3; volatile uint8_t proc; uint32_t cpu_counter[SMP_MAX_PROC]; -volatile int16_t mouse_x; -volatile int16_t mouse_y; - void kernel_ap() { proc++; @@ -35,12 +32,16 @@ void kernel_ap() } } + +volatile int16_t mouse_x; +volatile int16_t mouse_y; + + // // KERNEL MAIN // this is the very heart of our operating system! // - void kernel_main(uint32_t initial_stack, int mp) { @@ -60,7 +61,7 @@ void kernel_main(uint32_t initial_stack, int mp) proc=c1=c2=c3=0; for(int i=0;i<SMP_MAX_PROC;i++)cpu_counter[i]=0; - + /////////////////// BULLSHIT ABOVE THIS LINE: TODO: CLEANUP // @@ -149,8 +150,8 @@ void kernel_main(uint32_t initial_stack, int mp) // // Start the other Processors (also before paging for some reason!) // - smp_log_procdata(&procdata); - smp_start_aps(&procdata,0x80000); // starts at 0x80000 + //smp_log_procdata(&procdata); + //smp_start_aps(&procdata,0x80000); // starts at 0x80000 // but it will be copied over mbr @@ -192,7 +193,7 @@ void kernel_main(uint32_t initial_stack, int mp) // For now this starts three "tasks" which are scheduled // round robin style. // - task_init(); + //task_init(); // |