rewrite the device subsystem interfaces (#48)

[lunaix-os.git] / lunaix-os / kernel / kinit.c

diff --git a/lunaix-os/kernel/kinit.c b/lunaix-os/kernel/kinit.c
index 16c7976867e7da0252ec6fe3890a3d6245a3c95b..38804f2f58d0d63dfe665fc04d3989a93bdfbbe8 100644 (file)
--- a/lunaix-os/kernel/kinit.c
+++ b/lunaix-os/kernel/kinit.c
@@ -123,7 +123,6 @@ kernel_bootstrap(struct boot_handoff* bhctx)
     /* Setup kernel memory layout and services */
     kmem_init(bhctx);
 
     /* Setup kernel memory layout and services */
     kmem_init(bhctx);
 

-    __remap_and_load_dtb(bhctx);

 
     boot_parse_cmdline(bhctx);
 
 
     boot_parse_cmdline(bhctx);
 


@@ -132,19 +131,19 @@ kernel_bootstrap(struct boot_handoff* bhctx)
 
     device_scan_drivers();
 
 
     device_scan_drivers();
 

+    initfn_invoke_sysconf();
+    
+    __remap_and_load_dtb(bhctx);

     device_sysconf_load();
 
     device_sysconf_load();
 

-    invoke_init_function(on_earlyboot);
+    // TODO register devtree hooks
+    // TODO re-scan devtree to bind devices.

 
     clock_init();
     timer_init();
 
 
     clock_init();
     timer_init();
 

-    /*
-        TODO autoload these init function that do not have dependency between
-       them
-    */
+    initfn_invoke_earlyboot();

 
 

-    /* Let's get fs online as soon as possible, as things rely on them */

     vfs_init();
     fsm_init();
     input_init();
     vfs_init();
     fsm_init();
     input_init();


@@ -158,7 +157,7 @@ kernel_bootstrap(struct boot_handoff* bhctx)
     must_success(vfs_mount_root("ramfs", NULL));
     must_success(vfs_mount("/dev", "devfs", NULL, 0));
     
     must_success(vfs_mount_root("ramfs", NULL));
     must_success(vfs_mount("/dev", "devfs", NULL, 0));
     

-    invoke_init_function(on_boot);
+    initfn_invoke_boot();

 
     /* Finish up bootstrapping sequence, we are ready to spawn the root process
      * and start geting into uspace
 
     /* Finish up bootstrapping sequence, we are ready to spawn the root process
      * and start geting into uspace