Switch to initialization operations

1 files changed, 15 insertions, 5 deletions

diff --git a/kern/intr.h b/kern/intr.h
index 1cdab5ef..ac3f8cf2 100644
--- a/kern/intr.h
+++ b/kern/intr.h
@@ -21,6 +21,8 @@
 #ifndef _KERN_INTR_H
 #define _KERN_INTR_H
 
+#include <kern/init.h>
+
 /*
  * Type for interrupt handler functions.
  *
@@ -42,11 +44,6 @@ struct intr_ops {
 };
 
 /*
- * Initialize the intr module.
- */
-void intr_setup(void);
-
-/*
  * Register an interrupt controller.
  *
  * This function isn't thread-safe and can only be called during system
@@ -66,4 +63,17 @@ void intr_unregister(unsigned int intr, intr_handler_fn_t fn);
  */
 void intr_handle(unsigned int intr);
 
+/*
+ * This init operation provides :
+ *  - registration of interrupt controllers and handlers
+ */
+INIT_OP_DECLARE(intr_bootstrap);
+
+/*
+ * This init operation provides :
+ *  - all interrupt controllers have been registered
+ *  - module fully initialized
+ */
+INIT_OP_DECLARE(intr_setup);
+
 #endif /* _KERN_INTR_H */