From 1eb9bfc6509efdcd722d17b1fe3fe97efc93593c Mon Sep 17 00:00:00 2001
From: Uwe Bonnes <bon@elektron.ikp.physik.tu-darmstadt.de>
Date: Mon, 14 Jan 2013 00:05:03 +0100
Subject: [PATCH] platforms/stm32: Move more platform dependencies to
 platform.h

---
 src/platforms/native/platform.h |  1 +
 src/platforms/stlink/platform.h |  1 +
 src/platforms/stm32/usbdfu.c    | 12 ++++++++++--
 src/platforms/stm32/usbuart.c   |  4 ++--
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/platforms/native/platform.h b/src/platforms/native/platform.h
index 538d29c..d9721dc 100644
--- a/src/platforms/native/platform.h
+++ b/src/platforms/native/platform.h
@@ -95,6 +95,7 @@ extern usbd_device *usbdev;
 #define LED_IDLE_RUN	GPIO10
 #define LED_ERROR	GPIO11
 
+#define USB_DRIVER      stm32f103_usb_driver
 #define USB_IRQ         NVIC_USB_LP_CAN_RX0_IRQ
 #define USB_ISR         usb_lp_can_rx0_isr
 /* Interrupt priorities.  Low numbers are high priority.
diff --git a/src/platforms/stlink/platform.h b/src/platforms/stlink/platform.h
index 0ef1bd6..ffea676 100644
--- a/src/platforms/stlink/platform.h
+++ b/src/platforms/stlink/platform.h
@@ -81,6 +81,7 @@ extern usbd_device *usbdev;
 #define LED_UART	GPIO14
 #define LED_IDLE_RUN	GPIO8
 
+#define USB_DRIVER      stm32f103_usb_driver
 #define USB_IRQ         NVIC_USB_LP_CAN_RX0_IRQ
 #define USB_ISR          usb_lp_can_rx0_isr
 /* Interrupt priorities.  Low numbers are high priority.
diff --git a/src/platforms/stm32/usbdfu.c b/src/platforms/stm32/usbdfu.c
index 6aea11a..12bb26c 100644
--- a/src/platforms/stm32/usbdfu.c
+++ b/src/platforms/stm32/usbdfu.c
@@ -19,9 +19,17 @@
 
 #include <string.h>
 #include <libopencm3/cm3/systick.h>
-#include <libopencm3/stm32/f1/rcc.h>
-#include <libopencm3/stm32/f1/gpio.h>
+#include <libopencm3/stm32/rcc.h>
+#include <libopencm3/stm32/gpio.h>
+#if defined(STM32F1)
 #include <libopencm3/stm32/f1/flash.h>
+#elif defined(STM32F2)
+#include <libopencm3/stm32/f2/flash.h>
+#elif defined(STM32F4)
+#include <libopencm3/stm32/f4/flash.h>
+#else
+#warning "Unhandled STM32 family"
+#endif
 #include <libopencm3/cm3/scb.h>
 #include <libopencm3/usb/usbd.h>
 #include <libopencm3/usb/dfu.h>
diff --git a/src/platforms/stm32/usbuart.c b/src/platforms/stm32/usbuart.c
index 27dbaa2..68dac60 100644
--- a/src/platforms/stm32/usbuart.c
+++ b/src/platforms/stm32/usbuart.c
@@ -18,8 +18,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopencm3/stm32/f1/rcc.h>
-#include <libopencm3/stm32/f1/gpio.h>
+#include <libopencm3/stm32/rcc.h>
+#include <libopencm3/stm32/gpio.h>
 #include <libopencm3/stm32/usart.h>
 #include <libopencm3/cm3/nvic.h>
 #include <libopencm3/cm3/scs.h>