diff options
Diffstat (limited to 'kernel/kernel.c')
| -rw-r--r-- | kernel/kernel.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/kernel/kernel.c b/kernel/kernel.c index e4d7eba..f926139 100644 --- a/kernel/kernel.c +++ b/kernel/kernel.c @@ -1,7 +1,8 @@ #include "kernel.h" -#include "log.h" +#include "log.h" #include "serial.h" + #include "asm_pic.h" #include "multiboot.h" #include "acpi.h" @@ -53,10 +54,6 @@ void kernel_main(uint32_t eax,uint32_t ebx) klog("Version: git-commit: %s",GIT_REVISION); klog("======================================"); - // -- UNIT TESTING -- // - testing_kmalloc(); - testing_mount(); - // -- DISABLE LEGACY PIC -- // klog("Remapping & Disabling Programmable Interrupt Controller (PIC) ..."); fixme("io_wait & spurious interrupts"); @@ -65,7 +62,7 @@ void kernel_main(uint32_t eax,uint32_t ebx) // -- GET CONFIGS -- // klog("Read Multiboot Structures ..."); multiboot_information *cfg_multiboot; - cfg_multiboot=multiboot_read(eax, ebx,true); // true-silent + cfg_multiboot=multiboot_read(eax, ebx,true); // true for silent // elf_multiboot_read(cfg_multiboot); // just show kernel section headers klog("Read Advanced Power Configuration Interface (ACPI) Structures ..."); @@ -84,7 +81,6 @@ void kernel_main(uint32_t eax,uint32_t ebx) interrupts_install(); fixme("register interrupt callback funcs (instead hardcoded dispatcher)"); - // -- PCI SCAN --/ klog("PCI init ..."); uint32_t e1000_addr=pci_init(); @@ -109,8 +105,7 @@ void kernel_main(uint32_t eax,uint32_t ebx) klog("Mounting ... "); ext2_dump_info(VMEM_EXT2_RAMIMAGE); ext2_mount("/"); - sysfs_mount("/sys"); - pipe_mount("/pipes"); + sysfs_mount("/sys/"); // -- APIC -- // klog("Advanced Programmable Interrupt Controller (APIC) config ..."); @@ -145,6 +140,9 @@ void kernel_main(uint32_t eax,uint32_t ebx) uint64_t unixtime=timer_init(); klog("Unix Time = %u seconds",unixtime); + // -- E1000 INIT (TODO: only if present!) --/ + klog("E1000 init ..."); + fixme("do not hardcode address and allow paging somehwere else"); e1000_init(e1000_addr); klog("Symmetric Multi Processing (SMP) start ... "); |