From 5afa53f01abb3f19e1140d1a6407c43e8b3947cf Mon Sep 17 00:00:00 2001
From: chrysn <chrysn@fsfe.org>
Date: Thu, 18 Oct 2012 16:29:58 +0200
Subject: [PATCH] drop two-line vector.c dispatchers in favor of central
 dispatch

---
 lib/cm3/vector.c             |  6 ++++++
 lib/dispatch/vector.c        | 11 +++++++++++
 lib/efm32/tinygecko/vector.c |  2 --
 lib/lm3s/vector.c            |  2 --
 lib/lpc17xx/vector.c         |  2 --
 lib/lpc43xx/vector.c         |  8 +-------
 lib/stm32/f1/vector.c        |  2 --
 lib/stm32/f2/vector.c        |  2 --
 lib/stm32/f4/vector.c        |  8 +-------
 9 files changed, 19 insertions(+), 24 deletions(-)
 create mode 100644 lib/dispatch/vector.c
 delete mode 100644 lib/efm32/tinygecko/vector.c
 delete mode 100644 lib/lm3s/vector.c
 delete mode 100644 lib/lpc17xx/vector.c
 delete mode 100644 lib/stm32/f1/vector.c
 delete mode 100644 lib/stm32/f2/vector.c

diff --git a/lib/cm3/vector.c b/lib/cm3/vector.c
index 200e8e58..7b660f90 100644
--- a/lib/cm3/vector.c
+++ b/lib/cm3/vector.c
@@ -20,6 +20,9 @@
 
 #include <libopencm3/cm3/vector.h>
 
+/* load optional platform dependent initialization routines */
+#include "../dispatch/vector.c"
+
 #define WEAK __attribute__ ((weak))
 
 /* Symbols exported by the linker script(s): */
@@ -70,6 +73,9 @@ void WEAK reset_handler(void)
 	while (dest < &_ebss)
 		*dest++ = 0;
 
+	/* might be provided by platform specific vector.c */
+	pre_main();
+
 	/* Call the application's entry point. */
 	main();
 }
diff --git a/lib/dispatch/vector.c b/lib/dispatch/vector.c
new file mode 100644
index 00000000..baab436c
--- /dev/null
+++ b/lib/dispatch/vector.c
@@ -0,0 +1,11 @@
+#if defined(STM32F4)
+#	include "../stm32/f4/vector.c"
+
+#elif defined(LPC43XX)
+#	include "../lpc43xx/vector.c"
+
+#else
+
+static void pre_main(void) {}
+
+#endif
diff --git a/lib/efm32/tinygecko/vector.c b/lib/efm32/tinygecko/vector.c
deleted file mode 100644
index d6da5a2b..00000000
--- a/lib/efm32/tinygecko/vector.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <libopencm3/efm32/tinygecko/irq.h>
-#include "../../cm3/vector.c"
diff --git a/lib/lm3s/vector.c b/lib/lm3s/vector.c
deleted file mode 100644
index e9e7e064..00000000
--- a/lib/lm3s/vector.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <libopencm3/lm3s/irq.h>
-#include "../cm3/vector.c"
diff --git a/lib/lpc17xx/vector.c b/lib/lpc17xx/vector.c
deleted file mode 100644
index 61342f45..00000000
--- a/lib/lpc17xx/vector.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <libopencm3/lpc17xx/irq.h>
-#include "../cm3/vector.c"
diff --git a/lib/lpc43xx/vector.c b/lib/lpc43xx/vector.c
index 66e9b639..0463a65c 100644
--- a/lib/lpc43xx/vector.c
+++ b/lib/lpc43xx/vector.c
@@ -18,17 +18,13 @@
  * along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopencm3/lpc43xx/irq.h>
-#define reset_handler original_reset_handler
-#include "../cm3/vector.c"
-#undef reset_handler
 #include <libopencm3/cm3/common.h>
 
 extern unsigned _etext_ram, _text_ram, _etext_rom;
 
 #define CREG_M4MEMMAP   MMIO32( (0x40043000 + 0x100) )
 
-void WEAK reset_handler(void)
+static void pre_main(void)
 {
 	volatile unsigned *src, *dest;
 
@@ -49,6 +45,4 @@ void WEAK reset_handler(void)
 
 		/* Continue Execution in RAM */
 	}
-
-	original_reset_handler();
 }
diff --git a/lib/stm32/f1/vector.c b/lib/stm32/f1/vector.c
deleted file mode 100644
index 795773b1..00000000
--- a/lib/stm32/f1/vector.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <libopencm3/stm32/f1/irq.h>
-#include "../../cm3/vector.c"
diff --git a/lib/stm32/f2/vector.c b/lib/stm32/f2/vector.c
deleted file mode 100644
index 24d11851..00000000
--- a/lib/stm32/f2/vector.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <libopencm3/stm32/f2/irq.h>
-#include "../../cm3/vector.c"
diff --git a/lib/stm32/f4/vector.c b/lib/stm32/f4/vector.c
index a5017b36..53042992 100644
--- a/lib/stm32/f4/vector.c
+++ b/lib/stm32/f4/vector.c
@@ -18,16 +18,10 @@
  * along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopencm3/stm32/f4/irq.h>
-#define reset_handler original_reset_handler
-#include "../../cm3/vector.c"
-#undef reset_handler
 #include <libopencm3/stm32/f4/scb.h>
 
-void WEAK reset_handler(void)
+static void pre_main(void)
 {
 	/* Enable access to Floating-Point coprocessor. */
 	SCB_CPACR |= SCB_CPACR_FULL * (SCB_CPACR_CP10 | SCB_CPACR_CP11);
-
-	original_reset_handler();
 }