Push userlevel init into the same module.

Keeps the namespace in kernel.c clean

diff --git a/platform/baremetal/include/bmk/app.h b/platform/baremetal/include/bmk/app.h
index f715d1217874461b1dc058dec4c675c329db59ec..120f34d7977924b442eec30ac8e7cdd2642ec77c 100644 (file)
--- a/platform/baremetal/include/bmk/app.h
+++ b/platform/baremetal/include/bmk/app.h
@@ -1,2 +1,2 @@
-void bmk_beforemain(void);
+void bmk_mainthread(void *);
 int main(int, char **);

diff --git a/platform/baremetal/init.c b/platform/baremetal/init.c
index cad73fa41b86b80bf900295e3a9c8eeddf82acaa..fd3ba6cf302afb67c04499d0c98336729a6e0770 100644 (file)
--- a/platform/baremetal/init.c
+++ b/platform/baremetal/init.c
@@ -32,6 +32,8 @@
 
 #include <bmk/app.h>
 
+#include <rumprun-base/netbsd_initfini.h>
+
 int bmk_havenet;
 
 /*
@@ -53,16 +55,17 @@ rumpkern_config(void)
 }
 
 void
-bmk_beforemain(void)
+bmk_mainthread(void *notused)
 {
         char *argv[] = {"bmk_main", 0};
        int rv;
 
+       _netbsd_init();
        rumpkern_config();
 
        printf("=== calling main() ===\n\n");
         rv = main(1, argv);
        printf("=== main() returned %d ===\n\n", rv);
 
-       /* XXX: just fall somewhere */
+       _netbsd_fini();
 }

diff --git a/platform/baremetal/kernel.c b/platform/baremetal/kernel.c
index ef8802d33312988e5eef5c3ca02555c2e3ce9243..9e84a08b0e34bf160f71e1c6f06259b1b8a3359c 100644 (file)
--- a/platform/baremetal/kernel.c
+++ b/platform/baremetal/kernel.c
@@ -36,8 +36,6 @@
 #include <bmk-core/printf.h>
 #include <bmk-core/queue.h>
 
-#include <rumprun-base/netbsd_initfini.h>
-
 unsigned long bmk_membase;
 unsigned long bmk_memsize;
 
@@ -186,15 +184,6 @@ parsemem(uint32_t addr, uint32_t len)
        return 0;
 }
 
-static void
-bmk_mainthread(void *notused)
-{
-
-       _netbsd_init();
-       bmk_beforemain();
-       _netbsd_fini();
-}
-
 void
 bmk_main(struct multiboot_info *mbi)
 {
@@ -212,7 +201,7 @@ bmk_main(struct multiboot_info *mbi)
        bmk_cpu_init();
        bmk_isr_init();
 
-       /* enough already, jump to main thread */
+       /* enough bootstrap already, jump to main thread */
        bmk_sched_init(bmk_mainthread, NULL);
 }