X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fcpu%2Fcortex-m3%2Fdrv%2Firq_lm3s.c;h=98112cad5a2e8bd9f01c2dd3400c06f46cf2848a;hb=3b1451f6e3161b0f1b16e9be49dd46649b03a9d9;hp=2ff83575fd699c2f8fb31e81e34149e8c297cb7a;hpb=34a467fa89d01c8248fabc52bc5a4f5edf67570a;p=bertos.git

diff --git a/bertos/cpu/cortex-m3/drv/irq_lm3s.c b/bertos/cpu/cortex-m3/drv/irq_lm3s.c
index 2ff83575..98112cad 100644
--- a/bertos/cpu/cortex-m3/drv/irq_lm3s.c
+++ b/bertos/cpu/cortex-m3/drv/irq_lm3s.c
@@ -38,22 +38,45 @@
 #include <cfg/debug.h> /* ASSERT() */
 #include <cfg/log.h> /* LOG_ERR() */
 #include <cpu/irq.h>
-#include "io/lm3s.h"
+#include <io/lm3s.h>
 #include "irq_lm3s.h"
 
 static void (*irq_table[NUM_INTERRUPTS])(void)
 			__attribute__((section("vtable")));
 
 /* Unhandled IRQ */
-static NORETURN NAKED void unhandled_isr(void)
+static NAKED NORETURN void unhandled_isr(void)
 {
-	reg32_t reg;
+	register uint32_t reg;
 
 	asm volatile ("mrs %0, ipsr" : "=r"(reg));
 	LOG_ERR("unhandled IRQ %lu\n", reg);
-	PAUSE;
-	UNREACHABLE();
-	ASSERT(0);
+	while (1)
+		PAUSE;
+}
+
+void sysirq_setPriority(sysirq_t irq, int prio)
+{
+	uint32_t pos = (irq & 3) * 8;
+	reg32_t reg;
+
+	switch (irq >> 2)
+	{
+	case 1:
+		reg = NVIC_SYS_PRI1;
+		break;
+	case 2:
+		reg = NVIC_SYS_PRI2;
+		break;
+	case 3:
+		reg = NVIC_SYS_PRI3;
+		break;
+	default:
+		ASSERT(0);
+		return;
+	}
+	HWREG(reg) &= ~(0xff << pos);
+	HWREG(reg) |= prio << pos;
 }
 
 void sysirq_setHandler(sysirq_t irq, sysirq_handler_t handler)
@@ -64,6 +87,7 @@ void sysirq_setHandler(sysirq_t irq, sysirq_handler_t handler)
 
 	IRQ_SAVE_DISABLE(flags);
 	irq_table[irq] = handler;
+	sysirq_setPriority(irq, IRQ_PRIO);
 	IRQ_RESTORE(flags);
 }