Switch to initialization operations

1 files changed, 18 insertions, 2 deletions

diff --git a/kern/console.c b/kern/console.c
index e026ffd5..1f9a8a9c 100644
--- a/kern/console.c
+++ b/kern/console.c
@@ -29,6 +29,7 @@
 #include <kern/mutex.h>
 #include <kern/spinlock.h>
 #include <kern/thread.h>
+#include <machine/boot.h>
 #include <machine/cpu.h>
 
 /*
@@ -129,13 +130,28 @@ out:
     return c;
 }
 
-void __init
-console_setup(void)
+static int __init
+console_bootstrap(void)
 {
     list_init(&console_devs);
     console_name = arg_value("console");
+    return 0;
+}
+
+INIT_OP_DEFINE(console_bootstrap,
+               INIT_OP_DEP(arg_setup, true),
+               INIT_OP_DEP(log_setup, true));
+
+static int __init
+console_setup(void)
+{
+    return 0;
 }
 
+INIT_OP_DEFINE(console_setup,
+               INIT_OP_DEP(boot_setup_console, true),
+               INIT_OP_DEP(thread_setup, true));
+
 void __init
 console_register(struct console *console)
 {