Merge branch 'generalizations' into efm32

2012-10-19 19:29:32 +02:00
parent 1210738845 f62eee7644
commit a433217c5d
14 changed files with 30 additions and 23 deletions
--- a/include/libopencm3/dispatch/nvic.h
+++ b/include/libopencm3/dispatch/nvic.h
@@ -17,8 +17,11 @@
 #elif defined(LPC43XX)
 #	include <libopencm3/lpc43xx/nvic.h>

+#elif defined(LM3S)
+#	include <libopencm3/lm3s/nvic.h>
+
 #else
-#	warning"no chipset defined; user interrupts are disabled"
+#	warning"no interrupts defined for chipset; NVIC_IRQ_COUNT = 0"

 #define NVIC_IRQ_COUNT 0