From b98e6cbb026e3560d42ecdc2dd3fe73ae823643e Mon Sep 17 00:00:00 2001
From: Corwin Kuiper <corwin@kuiper.dev>
Date: Wed, 23 Jun 2021 23:01:51 +0100
Subject: [PATCH] add all other interrupts

---
 agb/src/interrupt.rs | 74 ++++++++++++++++++++++++++++++++++++--------
 1 file changed, 61 insertions(+), 13 deletions(-)

diff --git a/agb/src/interrupt.rs b/agb/src/interrupt.rs
index e531e8c8..c8ffa02a 100644
--- a/agb/src/interrupt.rs
+++ b/agb/src/interrupt.rs
@@ -74,21 +74,55 @@ impl InterruptRoot {
     }
 }
 
-static mut INTERRUPT_TABLE: Interrupts = Interrupts {
-    vblank: InterruptRoot::new(),
-    hblank: InterruptRoot::new(),
-};
+static mut INTERRUPT_TABLE: Interrupts = Interrupts::new();
 
 #[no_mangle]
 pub extern "C" fn __RUST_INTERRUPT_HANDLER(interrupt: u16) {
-    if interrupt & 1 != 0 {
-        unsafe { INTERRUPT_TABLE.vblank.trigger_interrupts() };
-    };
+    for i in 0..=13_u8 {
+        if (1 << (i as u16)) & interrupt != 0 {
+            let interrupt = unsafe { core::mem::transmute(i) };
+            let root = interrupt_to_root(interrupt);
+            root.trigger_interrupts();
+        }
+    }
 }
 
 struct Interrupts {
     vblank: InterruptRoot,
     hblank: InterruptRoot,
+    vcounter: InterruptRoot,
+    timer0: InterruptRoot,
+    timer1: InterruptRoot,
+    timer2: InterruptRoot,
+    timer3: InterruptRoot,
+    serial: InterruptRoot,
+    dma0: InterruptRoot,
+    dma1: InterruptRoot,
+    dma2: InterruptRoot,
+    dma3: InterruptRoot,
+    keypad: InterruptRoot,
+    gamepak: InterruptRoot,
+}
+
+impl Interrupts {
+    const fn new() -> Self {
+        Interrupts {
+            vblank: InterruptRoot::new(),
+            hblank: InterruptRoot::new(),
+            vcounter: InterruptRoot::new(),
+            timer0: InterruptRoot::new(),
+            timer1: InterruptRoot::new(),
+            timer2: InterruptRoot::new(),
+            timer3: InterruptRoot::new(),
+            serial: InterruptRoot::new(),
+            dma0: InterruptRoot::new(),
+            dma1: InterruptRoot::new(),
+            dma2: InterruptRoot::new(),
+            dma3: InterruptRoot::new(),
+            keypad: InterruptRoot::new(),
+            gamepak: InterruptRoot::new(),
+        }
+    }
 }
 
 pub struct InterruptClosureBounded<'a> {
@@ -134,6 +168,25 @@ impl Drop for InterruptClosure {
     }
 }
 
+fn interrupt_to_root(interrupt: Interrupt) -> &'static InterruptRoot {
+    match interrupt {
+        Interrupt::VBlank => unsafe { &INTERRUPT_TABLE.vblank },
+        Interrupt::HBlank => unsafe { &INTERRUPT_TABLE.hblank },
+        Interrupt::VCounter => unsafe { &INTERRUPT_TABLE.vcounter },
+        Interrupt::Timer0 => unsafe { &INTERRUPT_TABLE.timer0 },
+        Interrupt::Timer1 => unsafe { &INTERRUPT_TABLE.timer1 },
+        Interrupt::Timer2 => unsafe { &INTERRUPT_TABLE.timer2 },
+        Interrupt::Timer3 => unsafe { &INTERRUPT_TABLE.timer3 },
+        Interrupt::Serial => unsafe { &INTERRUPT_TABLE.serial },
+        Interrupt::Dma0 => unsafe { &INTERRUPT_TABLE.dma0 },
+        Interrupt::Dma1 => unsafe { &INTERRUPT_TABLE.dma1 },
+        Interrupt::Dma2 => unsafe { &INTERRUPT_TABLE.dma2 },
+        Interrupt::Dma3 => unsafe { &INTERRUPT_TABLE.dma3 },
+        Interrupt::Keypad => unsafe { &INTERRUPT_TABLE.keypad },
+        Interrupt::Gamepak => unsafe { &INTERRUPT_TABLE.gamepak },
+    }
+}
+
 fn get_interrupt_handle_root<'a>(
     f: &'a mut dyn FnMut(),
     root: &InterruptRoot,
@@ -150,12 +203,7 @@ fn get_interrupt_handle_root<'a>(
 }
 
 pub fn get_interrupt_handle(f: &mut dyn FnMut(), interrupt: Interrupt) -> InterruptClosureBounded {
-    let root = match interrupt {
-        Interrupt::VBlank => unsafe { &INTERRUPT_TABLE.vblank },
-        _ => unimplemented!(
-            "sorry, I haven't yet added this interrupt. Please request it if you need it"
-        ),
-    };
+    let root = interrupt_to_root(interrupt);
 
     get_interrupt_handle_root(f, root)
 }