From 20f6a749d14f53a7e93b7e6d77d22fdebbf50091 Mon Sep 17 00:00:00 2001
From: Mariano Alvira <mar@devl.org>
Date: Thu, 4 Mar 2010 18:52:04 -0500
Subject: [PATCH] isr updates

---
 src/isr.c        | 31 ++++++++++++++++++++++++++++---
 tests/tmr-ints.c |  7 ++++---
 2 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/src/isr.c b/src/isr.c
index 1ee196328..2cedfd59a 100644
--- a/src/isr.c
+++ b/src/isr.c
@@ -5,7 +5,32 @@ __attribute__ ((section (".irq")))
 __attribute__ ((interrupt("IRQ"))) 
 void irq(void)
 {
-	if(tmr_isr != 0) {
-		tmr_isr(); 
-	}
+	uint32_t pending;
+
+	while (pending = *NIPEND) {
+		
+	 	if(bit_is_set(pending, INT_NUM_TMR)) { 
+			/* dispatch to individual timer isrs if they exist */
+			/* timer isrs are responsible for determining if they
+			 * caused an interrupt */
+			/* and clearing their own interrupt flags */
+	 		if(tmr0_isr != 0) { tmr0_isr(); } 
+	 		if(tmr1_isr != 0) { tmr1_isr(); } 
+	 		if(tmr2_isr != 0) { tmr2_isr(); } 
+	 		if(tmr3_isr != 0) { tmr3_isr(); } 
+	 	}
+		if(bit_is_set(pending, INT_NUM_MACA)) {
+	 		if(maca_isr != 0) { maca_isr(); } 
+		}
+		if(bit_is_set(pending, INT_NUM_UART1)) {
+	 		if(uart1_isr != 0) { uart1_isr(); } 
+		}
+		if(bit_is_set(pending, INT_NUM_CRM)) {
+			if(rtc_wu_evt() && (rtc_isr != 0)) { rtc_isr(); }
+			if(kbi_evnt(4) && (kbi4_isr != 0)) { kbi4_isr(); }
+			if(kbi_evnt(5) && (kbi5_isr != 0)) { kbi5_isr(); }
+			if(kbi_evnt(6) && (kbi6_isr != 0)) { kbi6_isr(); }
+			if(kbi_evnt(7) && (kbi7_isr != 0)) { kbi7_isr(); }
+		}
+	}	
 }
diff --git a/tests/tmr-ints.c b/tests/tmr-ints.c
index d33d82d4d..29d5b406d 100644
--- a/tests/tmr-ints.c
+++ b/tests/tmr-ints.c
@@ -21,7 +21,7 @@ void toggle_led(void) {
 	}
 }
 
-void tmr_isr(void) {
+void tmr0_isr(void) {
 
 	toggle_led();
 	*TMR0_SCTRL = 0;
@@ -58,9 +58,10 @@ void main(void) {
 
 	led_on();
 
-	enable_tmr_irq();
+	enable_irq(TMR);
 
-	while(1) {
+	while(1) {		
 		/* sit here and let the interrupts do the work */
+		continue;
 	};
 }