Merge branch 'generalizations' into efm32

libopencm3 · Oct 18, 2012 · becfbc7 · becfbc7
2 parents 47c6969 + 0548317
commit becfbc7
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/lib/cm3/vector.c b/lib/cm3/vector.c
@@ -21,7 +21,7 @@
 #include <libopencm3/cm3/vector.h>
 
 /* load optional platform dependent initialization routines */
-#include "../dispatch/vector.c"
+#include "../dispatch/vector_chipset.c"
 /* load the weak symbols for IRQ_HANDLERS */
 #include "../dispatch/vector_nvic.c"
 

diff --git a/lib/dispatch/vector.c → lib/dispatch/vector_chipset.c b/lib/dispatch/vector.c → lib/dispatch/vector_chipset.c
@@ -1,8 +1,8 @@
 #if defined(STM32F4)
-#	include "../stm32/f4/vector.c"
+#	include "../stm32/f4/vector_chipset.c"
 
 #elif defined(LPC43XX)
-#	include "../lpc43xx/vector.c"
+#	include "../lpc43xx/vector_chipset.c"
 
 #else
 

diff --git a/lib/lpc43xx/vector.c → lib/lpc43xx/vector_chipset.c b/lib/lpc43xx/vector.c → lib/lpc43xx/vector_chipset.c
diff --git a/lib/stm32/f4/vector.c → lib/stm32/f4/vector_chipset.c b/lib/stm32/f4/vector.c → lib/stm32/f4/vector_chipset.c