diff options
| author | Miguel <m.i@gmx.at> | 2018-09-19 01:52:14 +0200 |
|---|---|---|
| committer | Miguel <m.i@gmx.at> | 2018-09-19 01:52:14 +0200 |
| commit | 1e08b64b43bf9c50b644da3f76d5a8bcc73f62da (patch) | |
| tree | 53aca729b7faeb781b04b9c62a7b1b13efa21991 /kernel/kernel.c | |
| parent | 2d91384197847a7e8fe2c3f548918a8277d3086d (diff) | |
addding sysfs and pipes etc
Diffstat (limited to 'kernel/kernel.c')
| -rw-r--r-- | kernel/kernel.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/kernel/kernel.c b/kernel/kernel.c index 072cebb..20bfab6 100644 --- a/kernel/kernel.c +++ b/kernel/kernel.c @@ -13,6 +13,7 @@ //-- clean below headers --// #include "sysfs.h" +#include "pipe.h" #include "testing/testing.h" #include "ext2.h" #include "apic.h" @@ -62,8 +63,8 @@ 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,false); - elf_multiboot_read(cfg_multiboot); // just show kernel section headers + cfg_multiboot=multiboot_read(eax, ebx,true); // true-silent + // elf_multiboot_read(cfg_multiboot); // just show kernel section headers klog("Read Advanced Power Configuration Interface (ACPI) Structures ..."); acpi_information cfg_acpi; @@ -96,13 +97,12 @@ void kernel_main(uint32_t eax,uint32_t ebx) x86_set_page_directory(dir); x86_paging_enable(); - // -- EXT2 RAM IMAGE -- // - klog("Check ext2 ram image ... "); + // -- MOUNTS -- // + klog("Mounting ... "); ext2_dump_info(VMEM_EXT2_RAMIMAGE); ext2_mount("/"); - - // -- MOUNT SYSFS --// - sysfs_mount("/sys/"); + sysfs_mount("/sys"); + pipe_mount("/sys/pipes"); // -- APIC -- // klog("Advanced Programmable Interrupt Controller (APIC) config ..."); @@ -111,7 +111,7 @@ void kernel_main(uint32_t eax,uint32_t ebx) // -- VESA -- // fixme("tell terminal syscall somehow if we are vga or textmode"); - klog("Video Electronics Standards Association (VESA) init ... "); // TODO check if text or fb? + klog("Video Electronics Standards Association (VESA) init ... "); // binfont has to fit in ONE ext2 block // fixme("support binfonts spanning multiple blocks?"); @@ -121,7 +121,7 @@ void kernel_main(uint32_t eax,uint32_t ebx) // -- STDIN/STDOUT -- // fixme("do not force order"); // now needed since ids are allocated 0,1,2... - klog("stdin/stdout init ..."); + klog("Streams and Pipes init ..."); uint32_t sstderr = syscall_open("~stderr",0,0); // stderr 2 uint32_t sstdout; if(cfg_multiboot->framebuffer_type==2) // EGA-standard text mode |