aboutsummaryrefslogtreecommitdiff
path: root/src/platforms
diff options
context:
space:
mode:
authorUwe Bonnes2013-01-14 00:05:03 +0100
committerUwe Bonnes2013-01-21 11:02:43 +0100
commit1eb9bfc6509efdcd722d17b1fe3fe97efc93593c (patch)
treec19721612c745ef5a7315c2607b359999ad9179c /src/platforms
parent30d8aa1eb770592d0bb35520c6b9dd1739ea66b1 (diff)
platforms/stm32: Move more platform dependencies to platform.h
Diffstat (limited to 'src/platforms')
-rw-r--r--src/platforms/native/platform.h1
-rw-r--r--src/platforms/stlink/platform.h1
-rw-r--r--src/platforms/stm32/usbdfu.c12
-rw-r--r--src/platforms/stm32/usbuart.c4
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>