Debug code to see remote kmsgs
[akaros.git] / kern / src / init.c
index 6167d53..d744b11 100644 (file)
@@ -8,7 +8,7 @@
 #error "Yeah, it's not possible to build ROS with BSD on Core 0, sorry......"
 #else
 
-#include <ros/timer.h>
+#include <ros/time.h>
 #include <arch/arch.h>
 #include <arch/console.h>
 #include <multiboot.h>
 #include <frontend.h>
 
 #include <arch/init.h>
-#include <arch/bitmask.h>
+#include <bitmask.h>
 #include <slab.h>
 #include <kfs.h>
 #include <vfs.h>
 #include <devfs.h>
 #include <blockdev.h>
 #include <ext2fs.h>
+#include <kthread.h>
+#include <net.h>
+#include <eth_audio.h>
+#include <console.h>
 
 // zra: flag for Ivy
 int booting = 1;
@@ -80,6 +84,7 @@ void kernel_init(multiboot_info_t *mboot_info)
        radix_init();
        cache_color_alloc_init();       // Inits data structs
        colored_page_alloc_init();      // Allocates colors for agnostic processes
+       kthread_init();                                 /* might need to tweak when this happens */
        vmr_init();
        file_init();
        page_check();
@@ -90,14 +95,18 @@ void kernel_init(multiboot_info_t *mboot_info)
        sysenter_init();
        timer_init();
        train_timing();
+       kb_buf_init(&cons_buf);
        
        arch_init();
        block_init();
        enable_irq();
 #ifdef __CONFIG_EXT2FS__
        mount_fs(&ext2_fs_type, "/dev/ramdisk", "/mnt", 0);
-#endif
-               
+#endif /* __CONFIG_EXT2FS__ */
+#ifdef __CONFIG_ETH_AUDIO__
+       eth_audio_init();
+#endif /* __CONFIG_ETH_AUDIO__ */
+
        // zra: let's Ivy know we're done booting
        booting = 0;