diff options
| author | Michal Idziorek <m.i@gmx.at> | 2014-09-04 00:46:44 +0200 |
|---|---|---|
| committer | Michal Idziorek <m.i@gmx.at> | 2014-09-04 00:46:44 +0200 |
| commit | 29758cec073a963e985d209cf3820c1efc730cef (patch) | |
| tree | bef1933528a13a7772375f5c74f6628b29e6b756 /kernel/kernel.c | |
| parent | e7648669694806b366824c0dc0c8b80c8d167d35 (diff) | |
Fixed "floppy" driver (for emulators)
Diffstat (limited to 'kernel/kernel.c')
| -rw-r--r-- | kernel/kernel.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/kernel/kernel.c b/kernel/kernel.c index 85c3da1..a6322f0 100644 --- a/kernel/kernel.c +++ b/kernel/kernel.c @@ -139,7 +139,6 @@ void kernel_main(uint32_t initial_stack, int mp) // now we can enable interrupts back again x86_int_enable(); - // // Memory Init // @@ -160,7 +159,7 @@ void kernel_main(uint32_t initial_stack, int mp) panic(FOOLOS_MODULE_NAME,"ACPI and MP search failed! I do not want to continue!"); // Start the other Processors (also before paging !) - // smp_start_aps(&procdata); + smp_start_aps(&procdata); ///////////////////// @@ -177,7 +176,8 @@ void kernel_main(uint32_t initial_stack, int mp) // Its driver will be hopefully implemented one day ;) // - //pci_init(); + pci_init(); + // // Initialize Floppy Disk @@ -195,6 +195,7 @@ void kernel_main(uint32_t initial_stack, int mp) shell_init(); + // // Initialize Multitasking // |