aboutsummaryrefslogtreecommitdiff
path: root/examples/stm32/stm32-h103/usb_hid
diff options
context:
space:
mode:
authorUwe Hermann2010-12-31 18:18:39 +0100
committerUwe Hermann2010-12-31 18:18:39 +0100
commit8f251e8a9d46634be4741f7f1aef3d52fb1b7dba (patch)
treefb3c17756e0b18fe19ca28f0f67b2ae636cac807 /examples/stm32/stm32-h103/usb_hid
parent95793aa6cedeef06db9592602ecf3dc00edec610 (diff)
Some more file/path restructuring.
All #includes now explicitly use the "<libopencm3/stm32/rcc.h>" format. If you want to get rid of the "libopencm3" prefix in your local project you can add a respective -I entry in your Makefile (not recommended though). All .ld files and .a libs are installed in $(TOOLCHAIN_DIR)/lib directly (as before), but are now renamed to avoid potential conflicts now or in the future. Examples: libopencm3_lpc13xx.a libopencm3_lpc13xx.ld libopencm3_stm32.a libopencm3_stm32.ld
Diffstat (limited to 'examples/stm32/stm32-h103/usb_hid')
-rw-r--r--examples/stm32/stm32-h103/usb_hid/usbhid.c14
-rw-r--r--examples/stm32/stm32-h103/usb_hid/usbhid.ld2
2 files changed, 8 insertions, 8 deletions
diff --git a/examples/stm32/stm32-h103/usb_hid/usbhid.c b/examples/stm32/stm32-h103/usb_hid/usbhid.c
index 7c6068f..d11e16b 100644
--- a/examples/stm32/stm32-h103/usb_hid/usbhid.c
+++ b/examples/stm32/stm32-h103/usb_hid/usbhid.c
@@ -18,18 +18,18 @@
*/
#include <stdlib.h>
-#include <stm32/rcc.h>
-#include <stm32/gpio.h>
-#include <stm32/systick.h>
-#include <usb/usbd.h>
-#include <usb/hid.h>
+#include <libopencm3/stm32/rcc.h>
+#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/systick.h>
+#include <libopencm3/usb/usbd.h>
+#include <libopencm3/usb/hid.h>
/* Define this to include the DFU APP interface. */
#define INCLUDE_DFU_INTERFACE
#ifdef INCLUDE_DFU_INTERFACE
-#include <stm32/scb.h>
-#include <usb/dfu.h>
+#include <libopencm3/stm32/scb.h>
+#include <libopencm3/usb/dfu.h>
#endif
const struct usb_device_descriptor dev = {
diff --git a/examples/stm32/stm32-h103/usb_hid/usbhid.ld b/examples/stm32/stm32-h103/usb_hid/usbhid.ld
index f70ddee..b3483ac 100644
--- a/examples/stm32/stm32-h103/usb_hid/usbhid.ld
+++ b/examples/stm32/stm32-h103/usb_hid/usbhid.ld
@@ -28,5 +28,5 @@ MEMORY
/* Include the common ld script. */
-INCLUDE stm32.ld
+INCLUDE libopencm3_stm32.ld