1 files changed, 50 insertions, 2 deletions
diff --git a/sys/include/arch/amd64/intr.h b/sys/include/arch/amd64/intr.h
index c643945..c848b6f 100644
--- a/sys/include/arch/amd64/intr.h
+++ b/sys/include/arch/amd64/intr.h
@@ -47,11 +47,59 @@
 #define IPL_CLOCK   2   /* Clock */
 #define IPL_HIGH    3   /* Defer everything */
 
-struct intr_entry {
+struct intr_hand;
+
+/*
+ * Contains information passed to driver
+ *
+ * @ihp: Interrupt handler
+ * @data: Driver specific data
+ */
+struct intr_data {
+    struct intr_hand *ihp;
+    union {
+        void *data;
+        uint64_t data_u64;
+    };
+};
+
+/*
+ * Interrupt handler
+ *
+ * [r]: Required for intr_register()
+ * [o]: Not required for intr_register()
+ * [v]: Returned by intr_register()
+ *
+ * @func: The actual handler        [r]
+ * @data: Interrupt data            [o/v]
+ * @name: Interrupt name            [v]
+ * @priority: Interrupt priority    [r]
+ * @irq: Interrupt request number   [o]
+ * @vector: Interrupt vector        [v]
+ *
+ * XXX: `name' must be null terminated ('\0')
+ *
+ * XXX: `irq` can be set to -1 for MSI/MSI-X
+ *      interrupts.
+ *
+ * XXX: `func` must be the first field in this
+ *      structure so that it may be called through
+ *      assembly.
+ *
+ * XXX: `ist' should usually be set to -1 but can be
+ *      used if an interrupt requires its own stack.
+ */
+struct intr_hand {
+    int(*func)(void *);
+    struct intr_data data;
+    char *name;
     int priority;
+    int irq;
+    int vector;
 };
 
-int intr_alloc_vector(const char *name, uint8_t priority);
+void *intr_register(const char *name, const struct intr_hand *ih);
+
 int splraise(uint8_t s);
 void splx(uint8_t s);