aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUwe Hermann2010-12-31 18:18:39 +0100
committerUwe Hermann2010-12-31 18:18:39 +0100
commit8f251e8a9d46634be4741f7f1aef3d52fb1b7dba (patch)
treefb3c17756e0b18fe19ca28f0f67b2ae636cac807
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
-rw-r--r--Makefile8
-rw-r--r--examples/lpc13xx/Makefile.include3
-rw-r--r--examples/lpc13xx/lpc-p1343/miniblink/miniblink.c4
-rw-r--r--examples/lpc13xx/lpc-p1343/miniblink/miniblink.ld2
-rw-r--r--examples/stm32/Makefile.include6
-rw-r--r--examples/stm32/lisa-m/usb_dfu/usbdfu.c12
-rw-r--r--examples/stm32/lisa-m/usb_dfu/usbdfu.ld2
-rw-r--r--examples/stm32/lisa-m/usb_hid/usbhid.c14
-rw-r--r--examples/stm32/lisa-m/usb_hid/usbhid.ld2
-rw-r--r--examples/stm32/mb525/fancyblink/fancyblink.c4
-rw-r--r--examples/stm32/mb525/fancyblink/fancyblink.ld2
-rw-r--r--examples/stm32/mb525/pwmleds/pwmleds.c6
-rw-r--r--examples/stm32/mb525/pwmleds/pwmleds.ld2
-rw-r--r--examples/stm32/obldc/can/can.c12
-rw-r--r--examples/stm32/obldc/can/can.ld2
-rw-r--r--examples/stm32/obldc/led/led.c4
-rw-r--r--examples/stm32/obldc/led/led.ld2
-rw-r--r--examples/stm32/obldc/systick/systick.c10
-rw-r--r--examples/stm32/obldc/systick/systick.ld2
-rw-r--r--examples/stm32/obldc/usart/usart.c6
-rw-r--r--examples/stm32/obldc/usart/usart.ld2
-rw-r--r--examples/stm32/obldc/usart_irq/usart_irq.c8
-rw-r--r--examples/stm32/obldc/usart_irq/usart_irq.ld2
-rw-r--r--examples/stm32/other/adc_temperature_sensor/adc.c10
-rw-r--r--examples/stm32/other/adc_temperature_sensor/adc.ld2
-rw-r--r--examples/stm32/other/dma_mem2mem/dma.c10
-rw-r--r--examples/stm32/other/dma_mem2mem/dma.ld2
-rw-r--r--examples/stm32/other/dogm128/dogm128.h6
-rw-r--r--examples/stm32/other/dogm128/main.c14
-rw-r--r--examples/stm32/other/dogm128/main.ld2
-rw-r--r--examples/stm32/other/i2c_stts75_sensor/i2c_stts75_sensor.c10
-rw-r--r--examples/stm32/other/i2c_stts75_sensor/i2c_stts75_sensor.ld2
-rw-r--r--examples/stm32/other/i2c_stts75_sensor/stts75.c2
-rw-r--r--examples/stm32/other/rtc/rtc.c12
-rw-r--r--examples/stm32/other/rtc/rtc.ld2
-rw-r--r--examples/stm32/other/systick/systick.c10
-rw-r--r--examples/stm32/other/systick/systick.ld2
-rw-r--r--examples/stm32/other/timer_interrupt/timer.c10
-rw-r--r--examples/stm32/other/timer_interrupt/timer.ld2
-rw-r--r--examples/stm32/other/usb_cdcacm/cdcacm.c8
-rw-r--r--examples/stm32/other/usb_cdcacm/cdcacm.ld2
-rw-r--r--examples/stm32/other/usb_dfu/usbdfu.c12
-rw-r--r--examples/stm32/other/usb_dfu/usbdfu.ld2
-rw-r--r--examples/stm32/other/usb_hid/usbhid.c14
-rw-r--r--examples/stm32/other/usb_hid/usbhid.ld2
-rw-r--r--examples/stm32/stm32-h103/fancyblink/fancyblink.c4
-rw-r--r--examples/stm32/stm32-h103/fancyblink/fancyblink.ld2
-rw-r--r--examples/stm32/stm32-h103/miniblink/miniblink.c4
-rw-r--r--examples/stm32/stm32-h103/miniblink/miniblink.ld2
-rw-r--r--examples/stm32/stm32-h103/spi/spi.c4
-rw-r--r--examples/stm32/stm32-h103/spi/spi.ld2
-rw-r--r--examples/stm32/stm32-h103/usart/usart.c6
-rw-r--r--examples/stm32/stm32-h103/usart/usart.ld2
-rw-r--r--examples/stm32/stm32-h103/usb_cdcacm/cdcacm.c8
-rw-r--r--examples/stm32/stm32-h103/usb_cdcacm/cdcacm.ld2
-rw-r--r--examples/stm32/stm32-h103/usb_dfu/usbdfu.c12
-rw-r--r--examples/stm32/stm32-h103/usb_dfu/usbdfu.ld2
-rw-r--r--examples/stm32/stm32-h103/usb_hid/usbhid.c14
-rw-r--r--examples/stm32/stm32-h103/usb_hid/usbhid.ld2
-rw-r--r--examples/stm32/stm32-h103/usb_iap/usbiap.c12
-rw-r--r--examples/stm32/stm32-h103/usb_iap/usbiap.ld2
-rw-r--r--include/libopencm3/cm3/common.h (renamed from include/cm3/common.h)0
-rw-r--r--include/libopencm3/cm3/memorymap.h (renamed from include/cm3/memorymap.h)0
-rw-r--r--include/libopencm3/lpc13xx/gpio.h (renamed from include/lpc13xx/gpio.h)4
-rw-r--r--include/libopencm3/lpc13xx/memorymap.h (renamed from include/lpc13xx/memorymap.h)2
-rw-r--r--include/libopencm3/stm32/adc.h (renamed from include/stm32/adc.h)4
-rw-r--r--include/libopencm3/stm32/bkp.h (renamed from include/stm32/bkp.h)4
-rw-r--r--include/libopencm3/stm32/can.h (renamed from include/stm32/can.h)4
-rw-r--r--include/libopencm3/stm32/crc.h (renamed from include/stm32/crc.h)4
-rw-r--r--include/libopencm3/stm32/dma.h (renamed from include/stm32/dma.h)4
-rw-r--r--include/libopencm3/stm32/ethernet.h (renamed from include/stm32/ethernet.h)4
-rw-r--r--include/libopencm3/stm32/exti.h (renamed from include/stm32/exti.h)4
-rw-r--r--include/libopencm3/stm32/flash.h (renamed from include/stm32/flash.h)4
-rw-r--r--include/libopencm3/stm32/fsmc.h (renamed from include/stm32/fsmc.h)4
-rw-r--r--include/libopencm3/stm32/gpio.h (renamed from include/stm32/gpio.h)4
-rw-r--r--include/libopencm3/stm32/i2c.h (renamed from include/stm32/i2c.h)4
-rw-r--r--include/libopencm3/stm32/iwdg.h (renamed from include/stm32/iwdg.h)4
-rw-r--r--include/libopencm3/stm32/memorymap.h (renamed from include/stm32/memorymap.h)2
-rw-r--r--include/libopencm3/stm32/nvic.h (renamed from include/stm32/nvic.h)4
-rw-r--r--include/libopencm3/stm32/pwr.h (renamed from include/stm32/pwr.h)4
-rw-r--r--include/libopencm3/stm32/rcc.h (renamed from include/stm32/rcc.h)4
-rw-r--r--include/libopencm3/stm32/rtc.h (renamed from include/stm32/rtc.h)6
-rw-r--r--include/libopencm3/stm32/scb.h (renamed from include/stm32/scb.h)4
-rw-r--r--include/libopencm3/stm32/spi.h (renamed from include/stm32/spi.h)4
-rw-r--r--include/libopencm3/stm32/systick.h (renamed from include/stm32/systick.h)4
-rw-r--r--include/libopencm3/stm32/timer.h (renamed from include/stm32/timer.h)4
-rw-r--r--include/libopencm3/stm32/tools.h (renamed from include/stm32/tools.h)0
-rw-r--r--include/libopencm3/stm32/usart.h (renamed from include/stm32/usart.h)4
-rw-r--r--include/libopencm3/stm32/usb.h (renamed from include/stm32/usb.h)6
-rw-r--r--include/libopencm3/stm32/usb_desc.h (renamed from include/stm32/usb_desc.h)0
-rw-r--r--include/libopencm3/stm32/wwdg.h (renamed from include/stm32/wwdg.h)4
-rw-r--r--include/libopencm3/usb/cdc.h (renamed from include/usb/cdc.h)0
-rw-r--r--include/libopencm3/usb/dfu.h (renamed from include/usb/dfu.h)0
-rw-r--r--include/libopencm3/usb/hid.h (renamed from include/usb/hid.h)0
-rw-r--r--include/libopencm3/usb/usbd.h (renamed from include/usb/usbd.h)2
-rw-r--r--include/libopencm3/usb/usbstd.h (renamed from include/usb/usbstd.h)2
-rw-r--r--lib/lpc13xx/gpio.c2
-rw-r--r--lib/lpc13xx/libopencm3_lpc13xx.ld (renamed from lib/lpc13xx/lpc13xx.ld)0
-rw-r--r--lib/stm32/adc.c2
-rw-r--r--lib/stm32/can.c4
-rw-r--r--lib/stm32/dma.c2
-rw-r--r--lib/stm32/ethernet.c2
-rw-r--r--lib/stm32/exti.c4
-rw-r--r--lib/stm32/flash.c2
-rw-r--r--lib/stm32/gpio.c2
-rw-r--r--lib/stm32/i2c.c2
-rw-r--r--lib/stm32/libopencm3_stm32.ld (renamed from lib/stm32/stm32.ld)0
-rw-r--r--lib/stm32/nvic.c2
-rw-r--r--lib/stm32/rcc.c4
-rw-r--r--lib/stm32/rtc.c6
-rw-r--r--lib/stm32/scb.c2
-rw-r--r--lib/stm32/spi.c2
-rw-r--r--lib/stm32/systick.c2
-rw-r--r--lib/stm32/timer.c2
-rw-r--r--lib/stm32/usart.c2
-rw-r--r--lib/usb/usb.c2
-rw-r--r--lib/usb/usb_control.c2
-rw-r--r--lib/usb/usb_f103.c8
-rw-r--r--lib/usb/usb_standard.c2
119 files changed, 249 insertions, 252 deletions
diff --git a/Makefile b/Makefile
index 401f3a0..9b7fc55 100644
--- a/Makefile
+++ b/Makefile
@@ -50,12 +50,12 @@ examples: lib
install: build
@printf " INSTALL headers\n"
$(Q)$(INSTALL) -d $(INCDIR)/libopencm3
- $(Q)$(INSTALL) -d $(LIBDIR)/libopencm3
- $(Q)cp -r include/* $(INCDIR)/libopencm3
+ $(Q)$(INSTALL) -d $(LIBDIR)
+ $(Q)cp -r include/libopencm3/* $(INCDIR)/libopencm3
@printf " INSTALL libs\n"
- $(Q)$(INSTALL) -m 0644 lib/*/*.a $(LIBDIR)/libopencm3
+ $(Q)$(INSTALL) -m 0644 lib/*/*.a $(LIBDIR)
@printf " INSTALL ldscripts\n"
- $(Q)$(INSTALL) -m 0644 lib/*/*.ld $(LIBDIR)/libopencm3
+ $(Q)$(INSTALL) -m 0644 lib/*/*.ld $(LIBDIR)
clean:
$(Q)$(MAKE) -C examples/stm32 clean
diff --git a/examples/lpc13xx/Makefile.include b/examples/lpc13xx/Makefile.include
index 58d2925..6e80fd5 100644
--- a/examples/lpc13xx/Makefile.include
+++ b/examples/lpc13xx/Makefile.include
@@ -30,8 +30,7 @@ TOOLCHAIN_DIR = ../../../..
CFLAGS += -Os -g -Wall -Wextra -I$(TOOLCHAIN_DIR)/include -fno-common \
-mcpu=cortex-m3 -mthumb
LDSCRIPT = $(BINARY).ld
-LDFLAGS += -L$(TOOLCHAIN_DIR)/lib -L$(TOOLCHAIN_DIR)/lib/libopencm3 \
- -L$(TOOLCHAIN_DIR)/lib/lpc13xx \
+LDFLAGS += -L$(TOOLCHAIN_DIR)/lib -L$(TOOLCHAIN_DIR)/lib/lpc13xx \
-T$(LDSCRIPT) -nostartfiles -Wl,--gc-sections
OBJS += $(BINARY).o
diff --git a/examples/lpc13xx/lpc-p1343/miniblink/miniblink.c b/examples/lpc13xx/lpc-p1343/miniblink/miniblink.c
index 530da21..505b604 100644
--- a/examples/lpc13xx/lpc-p1343/miniblink/miniblink.c
+++ b/examples/lpc13xx/lpc-p1343/miniblink/miniblink.c
@@ -17,8 +17,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-// #include <lpc13xx/rcc.h>
-#include <lpc13xx/gpio.h>
+// #include <libopencm3/lpc13xx/rcc.h>
+#include <libopencm3/lpc13xx/gpio.h>
void gpio_setup(void)
{
diff --git a/examples/lpc13xx/lpc-p1343/miniblink/miniblink.ld b/examples/lpc13xx/lpc-p1343/miniblink/miniblink.ld
index d0fdd36..0bffae1 100644
--- a/examples/lpc13xx/lpc-p1343/miniblink/miniblink.ld
+++ b/examples/lpc13xx/lpc-p1343/miniblink/miniblink.ld
@@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script. */
-INCLUDE lpc13xx.ld
+INCLUDE libopencm3_lpc13xx.ld
diff --git a/examples/stm32/Makefile.include b/examples/stm32/Makefile.include
index 6594fb9..af6d02f 100644
--- a/examples/stm32/Makefile.include
+++ b/examples/stm32/Makefile.include
@@ -28,11 +28,9 @@ OBJDUMP = $(PREFIX)-objdump
# TOOLCHAIN_DIR = `dirname \`which $(CC)\``/../$(PREFIX)
TOOLCHAIN_DIR = ../../../..
CFLAGS += -Os -g -Wall -Wextra -I$(TOOLCHAIN_DIR)/include \
- -I$(TOOLCHAIN_DIR)/include/libopencm3 -fno-common \
- -mcpu=cortex-m3 -mthumb
+ -fno-common -mcpu=cortex-m3 -mthumb
LDSCRIPT = $(BINARY).ld
-LDFLAGS += -L$(TOOLCHAIN_DIR)/lib -L$(TOOLCHAIN_DIR)/lib/libopencm3 \
- -L$(TOOLCHAIN_DIR)/lib/stm32 \
+LDFLAGS += -L$(TOOLCHAIN_DIR)/lib -L$(TOOLCHAIN_DIR)/lib/stm32 \
-T$(LDSCRIPT) -nostartfiles -Wl,--gc-sections
OBJS += $(BINARY).o
diff --git a/examples/stm32/lisa-m/usb_dfu/usbdfu.c b/examples/stm32/lisa-m/usb_dfu/usbdfu.c
index 2320628..2ae8374 100644
--- a/examples/stm32/lisa-m/usb_dfu/usbdfu.c
+++ b/examples/stm32/lisa-m/usb_dfu/usbdfu.c
@@ -18,12 +18,12 @@
*/
#include <string.h>
-#include <stm32/rcc.h>
-#include <stm32/gpio.h>
-#include <stm32/flash.h>
-#include <stm32/scb.h>
-#include <usb/usbd.h>
-#include <usb/dfu.h>
+#include <libopencm3/stm32/rcc.h>
+#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/flash.h>
+#include <libopencm3/stm32/scb.h>
+#include <libopencm3/usb/usbd.h>
+#include <libopencm3/usb/dfu.h>
#define APP_ADDRESS 0x08002000
diff --git a/examples/stm32/lisa-m/usb_dfu/usbdfu.ld b/examples/stm32/lisa-m/usb_dfu/usbdfu.ld
index 1d24b18..0841476 100644
--- a/examples/stm32/lisa-m/usb_dfu/usbdfu.ld
+++ b/examples/stm32/lisa-m/usb_dfu/usbdfu.ld
@@ -25,5 +25,5 @@ MEMORY
}
/* Include the common ld script. */
-INCLUDE stm32.ld
+INCLUDE libopencm3_stm32.ld
diff --git a/examples/stm32/lisa-m/usb_hid/usbhid.c b/examples/stm32/lisa-m/usb_hid/usbhid.c
index aadfeaf..ffd21ac 100644
--- a/examples/stm32/lisa-m/usb_hid/usbhid.c
+++ b/examples/stm32/lisa-m/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/lisa-m/usb_hid/usbhid.ld b/examples/stm32/lisa-m/usb_hid/usbhid.ld
index f70ddee..b3483ac 100644
--- a/examples/stm32/lisa-m/usb_hid/usbhid.ld
+++ b/examples/stm32/lisa-m/usb_hid/usbhid.ld
@@ -28,5 +28,5 @@ MEMORY
/* Include the common ld script. */
-INCLUDE stm32.ld
+INCLUDE libopencm3_stm32.ld
diff --git a/examples/stm32/mb525/fancyblink/fancyblink.c b/examples/stm32/mb525/fancyblink/fancyblink.c
index 53bf785..65e1728 100644
--- a/examples/stm32/mb525/fancyblink/fancyblink.c
+++ b/examples/stm32/mb525/fancyblink/fancyblink.c
@@ -18,8 +18,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <stm32/rcc.h>
-#include <stm32/gpio.h>
+#include <libopencm3/stm32/rcc.h>
+#include <libopencm3/stm32/gpio.h>
void clock_setup(void)
{
diff --git a/examples/stm32/mb525/fancyblink/fancyblink.ld b/examples/stm32/mb525/fancyblink/fancyblink.ld
index abe9cea..7ea2b92 100644
--- a/examples/stm32/mb525/fancyblink/fancyblink.ld
+++ b/examples/stm32/mb525/fancyblink/fancyblink.ld
@@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script. */
-INCLUDE stm32.ld
+INCLUDE libopencm3_stm32.ld
diff --git a/examples/stm32/mb525/pwmleds/pwmleds.c b/examples/stm32/mb525/pwmleds/pwmleds.c
index dc98760..db7c9ca 100644
--- a/examples/stm32/mb525/pwmleds/pwmleds.c
+++ b/examples/stm32/mb525/pwmleds/pwmleds.c
@@ -17,9 +17,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <stm32/rcc.h>
-#include <stm32/gpio.h>
-#include <stm32/timer.h>
+#include <libopencm3/stm32/rcc.h>
+#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/timer.h>
// #define COMPARE
// #define MOVING_FADE
diff --git a/examples/stm32/mb525/pwmleds/pwmleds.ld b/examples/stm32/mb525/pwmleds/pwmleds.ld
index abe9cea..7ea2b92 100644
--- a/examples/stm32/mb525/pwmleds/pwmleds.ld
+++ b/examples/stm32/mb525/pwmleds/pwmleds.ld
@@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script. */
-INCLUDE stm32.ld
+INCLUDE libopencm3_stm32.ld
diff --git a/examples/stm32/obldc/can/can.c b/examples/stm32/obldc/can/can.c
index ba53b2d..6c63c48 100644
--- a/examples/stm32/obldc/can/can.c
+++ b/examples/stm32/obldc/can/can.c
@@ -18,12 +18,12 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <stm32/rcc.h>
-#include <stm32/flash.h>
-#include <stm32/gpio.h>
-#include <stm32/nvic.h>
-#include <stm32/systick.h>
-#include <stm32/can.h>
+#include <libopencm3/stm32/rcc.h>
+#include <libopencm3/stm32/flash.h>
+#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/nvic.h>
+#include <libopencm3/stm32/systick.h>
+#include <libopencm3/stm32/can.h>
struct can_tx_msg {
u32 std_id;
diff --git a/examples/stm32/obldc/can/can.ld b/examples/stm32/obldc/can/can.ld
index 3303f26..c076521 100644
--- a/examples/stm32/obldc/can/can.ld
+++ b/examples/stm32/obldc/can/can.ld
@@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script. */
-INCLUDE stm32.ld
+INCLUDE libopencm3_stm32.ld
diff --git a/examples/stm32/obldc/led/led.c b/examples/stm32/obldc/led/led.c
index 9295d02..aad055b 100644
--- a/examples/stm32/obldc/led/led.c
+++ b/examples/stm32/obldc/led/led.c
@@ -18,8 +18,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <stm32/rcc.h>
-#include <stm32/gpio.h>
+#include <libopencm3/stm32/rcc.h>
+#include <libopencm3/stm32/gpio.h>
/* Set STM32 to 72 MHz. */
void clock_setup(void)
diff --git a/examples/stm32/obldc/led/led.ld b/examples/stm32/obldc/led/led.ld
index 4ca199e..7899773 100644
--- a/examples/stm32/obldc/led/led.ld
+++ b/examples/stm32/obldc/led/led.ld
@@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script. */
-INCLUDE stm32.ld
+INCLUDE libopencm3_stm32.ld
diff --git a/examples/stm32/obldc/systick/systick.c b/examples/stm32/obldc/systick/systick.c
index 17d35d1..3d75c4a 100644
--- a/examples/stm32/obldc/systick/systick.c
+++ b/examples/stm32/obldc/systick/systick.c
@@ -18,11 +18,11 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <stm32/rcc.h>
-#include <stm32/flash.h>
-#include <stm32/gpio.h>
-#include <stm32/nvic.h>
-#include <stm32/systick.h>
+#include <libopencm3/stm32/rcc.h>
+#include <libopencm3/stm32/flash.h>
+#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/nvic.h>
+#include <libopencm3/stm32/systick.h>
u32 temp32;
diff --git a/examples/stm32/obldc/systick/systick.ld b/examples/stm32/obldc/systick/systick.ld
index e0057d9..da4f2b3 100644
--- a/examples/stm32/obldc/systick/systick.ld
+++ b/examples/stm32/obldc/systick/systick.ld
@@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script. */
-INCLUDE stm32.ld
+INCLUDE libopencm3_stm32.ld
diff --git a/examples/stm32/obldc/usart/usart.c b/examples/stm32/obldc/usart/usart.c
index 0f55c26..1605a06 100644
--- a/examples/stm32/obldc/usart/usart.c
+++ b/examples/stm32/obldc/usart/usart.c
@@ -17,9 +17,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <stm32/rcc.h>
-#include <stm32/gpio.h>
-#include <stm32/usart.h>
+#include <libopencm3/stm32/rcc.h>
+#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/usart.h>
void clock_setup(void)
{
diff --git a/examples/stm32/obldc/usart/usart.ld b/examples/stm32/obldc/usart/usart.ld
index 4ca199e..7899773 100644
--- a/examples/stm32/obldc/usart/usart.ld
+++ b/examples/stm32/obldc/usart/usart.ld
@@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script. */
-INCLUDE stm32.ld
+INCLUDE libopencm3_stm32.ld
diff --git a/examples/stm32/obldc/usart_irq/usart_irq.c b/examples/stm32/obldc/usart_irq/usart_irq.c
index 0a8464f..ca8d390 100644
--- a/examples/stm32/obldc/usart_irq/usart_irq.c
+++ b/examples/stm32/obldc/usart_irq/usart_irq.c
@@ -17,10 +17,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <stm32/rcc.h>
-#include <stm32/gpio.h>
-#include <stm32/usart.h>
-#include <stm32/nvic.h>
+#include <libopencm3/stm32/rcc.h>
+#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/usart.h>
+#include <libopencm3/stm32/nvic.h>
void clock_setup(void)
{
diff --git a/examples/stm32/obldc/usart_irq/usart_irq.ld b/examples/stm32/obldc/usart_irq/usart_irq.ld
index 4ca199e..7899773 100644
--- a/examples/stm32/obldc/usart_irq/usart_irq.ld
+++ b/examples/stm32/obldc/usart_irq/usart_irq.ld
@@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script. */
-INCLUDE stm32.ld
+INCLUDE libopencm3_stm32.ld
diff --git a/examples/stm32/other/adc_temperature_sensor/adc.c b/examples/stm32/other/adc_temperature_sensor/adc.c
index 8f59767..5170bbb 100644
--- a/examples/stm32/other/adc_temperature_sensor/adc.c
+++ b/examples/stm32/other/adc_temperature_sensor/adc.c
@@ -17,11 +17,11 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <stm32/rcc.h>
-#include <stm32/flash.h>
-#include <stm32/gpio.h>
-#include <stm32/usart.h>
-#include <stm32/adc.h>
+#include <libopencm3/stm32/rcc.h>
+#include <libopencm3/stm32/flash.h>
+#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/usart.h>
+#include <libopencm3/stm32/adc.h>
void usart_setup(void)
{
diff --git a/examples/stm32/other/adc_temperature_sensor/adc.ld b/examples/stm32/other/adc_temperature_sensor/adc.ld
index 3303f26..c076521 100644
--- a/examples/stm32/other/adc_temperature_sensor/adc.ld
+++ b/examples/stm32/other/adc_temperature_sensor/adc.ld
@@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script. */
-INCLUDE stm32.ld
+INCLUDE libopencm3_stm32.ld
diff --git a/examples/stm32/other/dma_mem2mem/dma.c b/examples/stm32/other/dma_mem2mem/dma.c
index 37b0a3f..e43fe0d 100644
--- a/examples/stm32/other/dma_mem2mem/dma.c
+++ b/examples/stm32/other/dma_mem2mem/dma.c
@@ -17,11 +17,11 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <stm32/rcc.h>
-#include <stm32/flash.h>
-#include <stm32/gpio.h>
-#include <stm32/usart.h>
-#include <stm32/dma.h>
+#include <libopencm3/stm32/rcc.h>
+#include <libopencm3/stm32/flash.h>
+#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/usart.h>
+#include <libopencm3/stm32/dma.h>
void usart_setup(void)
{
diff --git a/examples/stm32/other/dma_mem2mem/dma.ld b/examples/stm32/other/dma_mem2mem/dma.ld
index 3303f26..c076521 100644
--- a/examples/stm32/other/dma_mem2mem/dma.ld
+++ b/examples/stm32/other/dma_mem2mem/dma.ld
@@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script. */
-INCLUDE stm32.ld
+INCLUDE libopencm3_stm32.ld
diff --git a/examples/stm32/other/dogm128/dogm128.h b/examples/stm32/other/dogm128/dogm128.h
index f40f4c8..ed514ab 100644
--- a/examples/stm32/other/dogm128/dogm128.h
+++ b/examples/stm32/other/dogm128/dogm128.h
@@ -20,9 +20,9 @@
#ifndef DOGM128_H
#define DOGM128_H
-#include <cm3/common.h>
-#include <stm32/gpio.h>
-#include <stm32/spi.h>
+#include <libopencm3/cm3/common.h>
+#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/spi.h>
/* PB10 GPIO - ~RESET
* PB12 SPI2_NSS - ~CS1
diff --git a/examples/stm32/other/dogm128/main.c b/examples/stm32/other/dogm128/main.c
index 8d3c241..b12a36d 100644
--- a/examples/stm32/other/dogm128/main.c
+++ b/examples/stm32/other/dogm128/main.c
@@ -17,13 +17,13 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <stm32/rcc.h>
-#include <stm32/flash.h>
-#include <stm32/gpio.h>
-#include <stm32/usart.h>
-#include <stm32/timer.h>
-#include <stm32/nvic.h>
-#include <stm32/spi.h>
+#include <libopencm3/stm32/rcc.h>
+#include <libopencm3/stm32/flash.h>
+#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/usart.h>
+#include <libopencm3/stm32/timer.h>
+#include <libopencm3/stm32/nvic.h>
+#include <libopencm3/stm32/spi.h>
#include "./dogm128.h"
void gpio_setup(void)
diff --git a/examples/stm32/other/dogm128/main.ld b/examples/stm32/other/dogm128/main.ld
index 3303f26..c076521 100644
--- a/examples/stm32/other/dogm128/main.ld
+++ b/examples/stm32/other/dogm128/main.ld
@@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script. */
-INCLUDE stm32.ld
+INCLUDE libopencm3_stm32.ld
diff --git a/examples/stm32/other/i2c_stts75_sensor/i2c_stts75_sensor.c b/examples/stm32/other/i2c_stts75_sensor/i2c_stts75_sensor.c
index a1ba378..f70c80d 100644
--- a/examples/stm32/other/i2c_stts75_sensor/i2c_stts75_sensor.c
+++ b/examples/stm32/other/i2c_stts75_sensor/i2c_stts75_sensor.c
@@ -17,11 +17,11 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <stm32/rcc.h>
-#include <stm32/flash.h>
-#include <stm32/gpio.h>
-#include <stm32/usart.h>
-#include <stm32/i2c.h>
+#include <libopencm3/stm32/rcc.h>
+#include <libopencm3/stm32/flash.h>
+#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/usart.h>
+#include <libopencm3/stm32/i2c.h>
#include "stts75.h"
void usart_setup(void)
diff --git a/examples/stm32/other/i2c_stts75_sensor/i2c_stts75_sensor.ld b/examples/stm32/other/i2c_stts75_sensor/i2c_stts75_sensor.ld
index 3303f26..c076521 100644
--- a/examples/stm32/other/i2c_stts75_sensor/i2c_stts75_sensor.ld
+++ b/examples/stm32/other/i2c_stts75_sensor/i2c_stts75_sensor.ld
@@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script. */
-INCLUDE stm32.ld
+INCLUDE libopencm3_stm32.ld
diff --git a/examples/stm32/other/i2c_stts75_sensor/stts75.c b/examples/stm32/other/i2c_stts75_sensor/stts75.c
index ec51932..f28019c 100644
--- a/examples/stm32/other/i2c_stts75_sensor/stts75.c
+++ b/examples/stm32/other/i2c_stts75_sensor/stts75.c
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <stm32/i2c.h>
+#include <libopencm3/stm32/i2c.h>
#include "stts75.h"
void stts75_write_config(u32 i2c, u8 sensor)
diff --git a/examples/stm32/other/rtc/rtc.c b/examples/stm32/other/rtc/rtc.c
index f762dbe..c447534 100644
--- a/examples/stm32/other/rtc/rtc.c
+++ b/examples/stm32/other/rtc/rtc.c
@@ -17,12 +17,12 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <stm32/rcc.h>
-#include <stm32/gpio.h>
-#include <stm32/usart.h>
-#include <stm32/rtc.h>
-#include <stm32/pwr.h>
-#include <stm32/nvic.h>
+#include <libopencm3/stm32/rcc.h>
+#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/usart.h>
+#include <libopencm3/stm32/rtc.h>
+#include <libopencm3/stm32/pwr.h>
+#include <libopencm3/stm32/nvic.h>
void clock_setup(void)
{
diff --git a/examples/stm32/other/rtc/rtc.ld b/examples/stm32/other/rtc/rtc.ld
index abe9cea..7ea2b92 100644
--- a/examples/stm32/other/rtc/rtc.ld
+++ b/examples/stm32/other/rtc/rtc.ld
@@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script. */
-INCLUDE stm32.ld
+INCLUDE libopencm3_stm32.ld
diff --git a/examples/stm32/other/systick/systick.c b/examples/stm32/other/systick/systick.c
index 44c6b7c..c05aff7 100644
--- a/examples/stm32/other/systick/systick.c
+++ b/examples/stm32/other/systick/systick.c
@@ -17,11 +17,11 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <stm32/rcc.h>
-#include <stm32/flash.h>
-#include <stm32/gpio.h>
-#include <stm32/nvic.h>
-#include <stm32/systick.h>
+#include <libopencm3/stm32/rcc.h>
+#include <libopencm3/stm32/flash.h>
+#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/nvic.h>
+#include <libopencm3/stm32/systick.h>
u32 temp32;
diff --git a/examples/stm32/other/systick/systick.ld b/examples/stm32/other/systick/systick.ld
index 3303f26..c076521 100644
--- a/examples/stm32/other/systick/systick.ld
+++ b/examples/stm32/other/systick/systick.ld
@@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script. */
-INCLUDE stm32.ld
+INCLUDE libopencm3_stm32.ld
diff --git a/examples/stm32/other/timer_interrupt/timer.c b/examples/stm32/other/timer_interrupt/timer.c
index 8a6eac6..aa2cdb6 100644
--- a/examples/stm32/other/timer_interrupt/timer.c
+++ b/examples/stm32/other/timer_interrupt/timer.c
@@ -17,11 +17,11 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <stm32/rcc.h>
-#include <stm32/flash.h>
-#include <stm32/gpio.h>
-#include <stm32/timer.h>
-#include <stm32/nvic.h>
+#include <libopencm3/stm32/rcc.h>
+#include <libopencm3/stm32/flash.h>
+#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/timer.h>
+#include <libopencm3/stm32/nvic.h>
void gpio_setup(void)
{
diff --git a/examples/stm32/other/timer_interrupt/timer.ld b/examples/stm32/other/timer_interrupt/timer.ld
index 3303f26..c076521 100644
--- a/examples/stm32/other/timer_interrupt/timer.ld
+++ b/examples/stm32/other/timer_interrupt/timer.ld
@@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script. */
-INCLUDE stm32.ld
+INCLUDE libopencm3_stm32.ld
diff --git a/examples/stm32/other/usb_cdcacm/cdcacm.c b/examples/stm32/other/usb_cdcacm/cdcacm.c
index b885788..7748c71 100644
--- a/examples/stm32/other/usb_cdcacm/cdcacm.c
+++ b/examples/stm32/other/usb_cdcacm/cdcacm.c
@@ -18,10 +18,10 @@
*/
#include <stdlib.h>
-#include <stm32/rcc.h>
-#include <stm32/gpio.h>
-#include <usb/usbd.h>
-#include <usb/cdc.h>
+#include <libopencm3/stm32/rcc.h>
+#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/usb/usbd.h>
+#include <libopencm3/usb/cdc.h>
static const struct usb_device_descriptor dev = {
.bLength = USB_DT_DEVICE_SIZE,
diff --git a/examples/stm32/other/usb_cdcacm/cdcacm.ld b/examples/stm32/other/usb_cdcacm/cdcacm.ld
index 0b2918e..4930394 100644
--- a/examples/stm32/other/usb_cdcacm/cdcacm.ld
+++ b/examples/stm32/other/usb_cdcacm/cdcacm.ld
@@ -25,5 +25,5 @@ MEMORY
}
/* Include the common ld script. */
-INCLUDE stm32.ld
+INCLUDE libopencm3_stm32.ld
diff --git a/examples/stm32/other/usb_dfu/usbdfu.c b/examples/stm32/other/usb_dfu/usbdfu.c
index 167f316..7933377 100644
--- a/examples/stm32/other/usb_dfu/usbdfu.c
+++ b/examples/stm32/other/usb_dfu/usbdfu.c
@@ -18,12 +18,12 @@
*/
#include <string.h>
-#include <stm32/rcc.h>
-#include <stm32/gpio.h>
-#include <stm32/flash.h>
-#include <stm32/scb.h>
-#include <usb/usbd.h>
-#include <usb/dfu.h>
+#include <libopencm3/stm32/rcc.h>
+#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/flash.h>
+#include <libopencm3/stm32/scb.h>
+#include <libopencm3/usb/usbd.h>
+#include <libopencm3/usb/dfu.h>
#define APP_ADDRESS 0x08002000
diff --git a/examples/stm32/other/usb_dfu/usbdfu.ld b/examples/stm32/other/usb_dfu/usbdfu.ld
index 1d24b18..0841476 100644
--- a/examples/stm32/other/usb_dfu/usbdfu.ld
+++ b/examples/stm32/other/usb_dfu/usbdfu.ld
@@ -25,5 +25,5 @@ MEMORY
}
/* Include the common ld script. */
-INCLUDE stm32.ld
+INCLUDE libopencm3_stm32.ld
diff --git a/examples/stm32/other/usb_hid/usbhid.c b/examples/stm32/other/usb_hid/usbhid.c
index 1cd27d0..87ae10d 100644
--- a/examples/stm32/other/usb_hid/usbhid.c
+++ b/examples/stm32/other/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/other/usb_hid/usbhid.ld b/examples/stm32/other/usb_hid/usbhid.ld
index 0b2918e..4930394 100644
--- a/examples/stm32/other/usb_hid/usbhid.ld
+++ b/examples/stm32/other/usb_hid/usbhid.ld
@@ -25,5 +25,5 @@ MEMORY
}
/* Include the common ld script. */
-INCLUDE stm32.ld
+INCLUDE libopencm3_stm32.ld
diff --git a/examples/stm32/stm32-h103/fancyblink/fancyblink.c b/examples/stm32/stm32-h103/fancyblink/fancyblink.c
index 4291b7e..876fb2d 100644
--- a/examples/stm32/stm32-h103/fancyblink/fancyblink.c
+++ b/examples/stm32/stm32-h103/fancyblink/fancyblink.c
@@ -17,8 +17,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <stm32/rcc.h>
-#include <stm32/gpio.h>
+#include <libopencm3/stm32/rcc.h>
+#include <libopencm3/stm32/gpio.h>
/* Set STM32 to 72 MHz. */
void clock_setup(void)
diff --git a/examples/stm32/stm32-h103/fancyblink/fancyblink.ld b/examples/stm32/stm32-h103/fancyblink/fancyblink.ld
index abe9cea..7ea2b92 100644
--- a/examples/stm32/stm32-h103/fancyblink/fancyblink.ld
+++ b/examples/stm32/stm32-h103/fancyblink/fancyblink.ld
@@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script. */
-INCLUDE stm32.ld
+INCLUDE libopencm3_stm32.ld
diff --git a/examples/stm32/stm32-h103/miniblink/miniblink.c b/examples/stm32/stm32-h103/miniblink/miniblink.c
index 6582b17..4bc781b 100644
--- a/examples/stm32/stm32-h103/miniblink/miniblink.c
+++ b/examples/stm32/stm32-h103/miniblink/miniblink.c
@@ -17,8 +17,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <stm32/rcc.h>
-#include <stm32/gpio.h>
+#include <libopencm3/stm32/rcc.h>
+#include <libopencm3/stm32/gpio.h>
void gpio_setup(void)
{
diff --git a/examples/stm32/stm32-h103/miniblink/miniblink.ld b/examples/stm32/stm32-h103/miniblink/miniblink.ld
index abe9cea..7ea2b92 100644
--- a/examples/stm32/stm32-h103/miniblink/miniblink.ld
+++ b/examples/stm32/stm32-h103/miniblink/miniblink.ld
@@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script. */
-INCLUDE stm32.ld
+INCLUDE libopencm3_stm32.ld
diff --git a/examples/stm32/stm32-h103/spi/spi.c b/examples/stm32/stm32-h103/spi/spi.c
index 749b756..5a36bb8 100644
--- a/examples/stm32/stm32-h103/spi/spi.c
+++ b/examples/stm32/stm32-h103/spi/spi.c
@@ -17,8 +17,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <stm32/rcc.h>
-#include <stm32/spi.h>
+#include <libopencm3/stm32/rcc.h>
+#include <libopencm3/stm32/spi.h>
void clock_setup(void)
{
diff --git a/examples/stm32/stm32-h103/spi/spi.ld b/examples/stm32/stm32-h103/spi/spi.ld
index b06cbed..25806f8 100644
--- a/examples/stm32/stm32-h103/spi/spi.ld
+++ b/examples/stm32/stm32-h103/spi/spi.ld
@@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script. */
-INCLUDE stm32.ld
+INCLUDE libopencm3_stm32.ld
diff --git a/examples/stm32/stm32-h103/usart/usart.c b/examples/stm32/stm32-h103/usart/usart.c
index b356fdb..c3d24ca 100644
--- a/examples/stm32/stm32-h103/usart/usart.c
+++ b/examples/stm32/stm32-h103/usart/usart.c
@@ -17,9 +17,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <stm32/rcc.h>
-#include <stm32/gpio.h>
-#include <stm32/usart.h>
+#include <libopencm3/stm32/rcc.h>
+#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/usart.h>
void clock_setup(void)
{
diff --git a/examples/stm32/stm32-h103/usart/usart.ld b/examples/stm32/stm32-h103/usart/usart.ld
index abe9cea..7ea2b92 100644
--- a/examples/stm32/stm32-h103/usart/usart.ld
+++ b/examples/stm32/stm32-h103/usart/usart.ld
@@ -27,5 +27,5 @@ MEMORY
}
/* Include the common ld script. */
-INCLUDE stm32.ld
+INCLUDE libopencm3_stm32.ld
diff --git a/examples/stm32/stm32-h103/usb_cdcacm/cdcacm.c b/examples/stm32/stm32-h103/usb_cdcacm/cdcacm.c
index 7b12186..fa545a7 100644
--- a/examples/stm32/stm32-h103/usb_cdcacm/cdcacm.c
+++ b/examples/stm32/stm32-h103/usb_cdcacm/cdcacm.c
@@ -18,10 +18,10 @@
*/
#include <stdlib.h>
-#include <stm32/rcc.h>
-#include <stm32/gpio.h>
-#include <usb/usbd.h>
-#include <usb/cdc.h>
+#include <libopencm3/stm32/rcc.h>
+#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/usb/usbd.h>
+#include <libopencm3/usb/cdc.h>
static const struct usb_device_descriptor dev = {
.bLength = USB_DT_DEVICE_SIZE,
diff --git a/examples/stm32/stm32-h103/usb_cdcacm/cdcacm.ld b/examples/stm32/stm32-h103/usb_cdcacm/cdcacm.ld
index f70ddee..b3483ac 100644
--- a/examples/stm32/stm32-h103/usb_cdcacm/cdcacm.ld
+++ b/examples/stm32/stm32-h103/usb_cdcacm/cdcacm.ld
@@ -28,5 +28,5 @@ MEMORY
/* Include the common ld script. */
-INCLUDE stm32.ld
+INCLUDE libopencm3_stm32.ld
diff --git a/examples/stm32/stm32-h103/usb_dfu/usbdfu.c b/examples/stm32/stm32-h103/usb_dfu/usbdfu.c
index 2320628..2ae8374 100644
--- a/examples/stm32/stm32-h103/usb_dfu/usbdfu.c
+++ b/examples/stm32/stm32-h103/usb_dfu/usbdfu.c
@@ -18,12 +18,12 @@
*/
#include <string.h>
-#include <stm32/rcc.h>
-#include <stm32/gpio.h>
-#include <stm32/flash.h>
-#include <stm32/scb.h>
-#include <usb/usbd.h>
-#include <usb/dfu.h>
+#include <libopencm3/stm32/rcc.h>
+#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/flash.h>
+#include <libopencm3/stm32/scb.h>
+#include <libopencm3/usb/usbd.h>
+#include <libopencm3/usb/dfu.h>
#define APP_ADDRESS 0x08002000
diff --git a/examples/stm32/stm32-h103/usb_dfu/usbdfu.ld b/examples/stm32/stm32-h103/usb_dfu/usbdfu.ld
index 1d24b18..0841476 100644
--- a/examples/stm32/stm32-h103/usb_dfu/usbdfu.ld
+++ b/examples/stm32/stm32-h103/usb_dfu/usbdfu.ld
@@ -25,5 +25,5 @@ MEMORY
}
/* Include the common ld script. */
-INCLUDE stm32.ld
+INCLUDE libopencm3_stm32.ld
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
diff --git a/examples/stm32/stm32-h103/usb_iap/usbiap.c b/examples/stm32/stm32-h103/usb_iap/usbiap.c
index 2320628..2ae8374 100644
--- a/examples/stm32/stm32-h103/usb_iap/usbiap.c
+++ b/examples/stm32/stm32-h103/usb_iap/usbiap.c
@@ -18,12 +18,12 @@
*/
#include <string.h>
-#include <stm32/rcc.h>
-#include <stm32/gpio.h>
-#include <stm32/flash.h>
-#include <stm32/scb.h>
-#include <usb/usbd.h>
-#include <usb/dfu.h>
+#include <libopencm3/stm32/rcc.h>
+#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/flash.h>
+#include <libopencm3/stm32/scb.h>
+#include <libopencm3/usb/usbd.h>
+#include <libopencm3/usb/dfu.h>
#define APP_ADDRESS 0x08002000
diff --git a/examples/stm32/stm32-h103/usb_iap/usbiap.ld b/examples/stm32/stm32-h103/usb_iap/usbiap.ld
index f70ddee..b3483ac 100644
--- a/examples/stm32/stm32-h103/usb_iap/usbiap.ld
+++ b/examples/stm32/stm32-h103/usb_iap/usbiap.ld
@@ -28,5 +28,5 @@ MEMORY
/* Include the common ld script. */
-INCLUDE stm32.ld
+INCLUDE libopencm3_stm32.ld
diff --git a/include/cm3/common.h b/include/libopencm3/cm3/common.h
index a6cfb22..a6cfb22 100644
--- a/include/cm3/common.h
+++ b/include/libopencm3/cm3/common.h
diff --git a/include/cm3/memorymap.h b/include/libopencm3/cm3/memorymap.h
index 6f8b49d..6f8b49d 100644
--- a/include/cm3/memorymap.h
+++ b/include/libopencm3/cm3/memorymap.h
diff --git a/include/lpc13xx/gpio.h b/include/libopencm3/lpc13xx/gpio.h
index 9dca1bd..21f8294 100644
--- a/include/lpc13xx/gpio.h
+++ b/include/libopencm3/lpc13xx/gpio.h
@@ -20,8 +20,8 @@
#ifndef LPC13XX_GPIO_H
#define LPC13XX_GPIO_H
-#include <cm3/common.h>
-#include <lpc13xx/memorymap.h>
+#include <libopencm3/cm3/common.h>
+#include <libopencm3/lpc13xx/memorymap.h>
/* --- Convenience macros -------------------------------------------------- */
diff --git a/include/lpc13xx/memorymap.h b/include/libopencm3/lpc13xx/memorymap.h
index d4e1390..1977882 100644
--- a/include/lpc13xx/memorymap.h
+++ b/include/libopencm3/lpc13xx/memorymap.h
@@ -20,7 +20,7 @@
#ifndef LPC13XX_MEMORYMAP_H
#define LPC13XX_MEMORYMAP_H
-#include <cm3/common.h>
+#include <libopencm3/cm3/common.h>
/* --- LPC13XX specific peripheral definitions ----------------------------- */
diff --git a/include/stm32/adc.h b/include/libopencm3/stm32/adc.h
index c3a34cf..6e35d59 100644
--- a/include/stm32/adc.h
+++ b/include/libopencm3/stm32/adc.h
@@ -20,8 +20,8 @@
#ifndef LIBOPENCM3_ADC_H
#define LIBOPENCM3_ADC_H
-#include <stm32/memorymap.h>
-#include <cm3/common.h>
+#include <libopencm3/stm32/memorymap.h>
+#include <libopencm3/cm3/common.h>
/* --- Convenience macros -------------------------------------------------- */
diff --git a/include/stm32/bkp.h b/include/libopencm3/stm32/bkp.h
index d782141..d700f9b 100644
--- a/include/stm32/bkp.h
+++ b/include/libopencm3/stm32/bkp.h
@@ -20,8 +20,8 @@
#ifndef LIBOPENCM3_BKP_H
#define LIBOPENCM3_BKP_H
-#include <stm32/memorymap.h>
-#include <cm3/common.h>
+#include <libopencm3/stm32/memorymap.h>
+#include <libopencm3/cm3/common.h>
/* --- BKP registers ------------------------------------------------------- */
diff --git a/include/stm32/can.h b/include/libopencm3/stm32/can.h
index e48f336..1aa95a1 100644
--- a/include/stm32/can.h
+++ b/include/libopencm3/stm32/can.h
@@ -20,8 +20,8 @@
#ifndef LIBOPENCM3_CAN_H
#define LIBOPENCM3_CAN_H
-#include <stm32/memorymap.h>
-#include <cm3/common.h>
+#include <libopencm3/stm32/memorymap.h>
+#include <libopencm3/cm3/common.h>
/* --- Convenience macros -------------------------------------------------- */
diff --git a/include/stm32/crc.h b/include/libopencm3/stm32/crc.h
index 46644a1..5ad866e 100644
--- a/include/stm32/crc.h
+++ b/include/libopencm3/stm32/crc.h
@@ -20,8 +20,8 @@
#ifndef LIBOPENCM3_CRC_H
#define LIBOPENCM3_CRC_H
-#include <stm32/memorymap.h>
-#include <cm3/common.h>
+#include <libopencm3/stm32/memorymap.h>
+#include <libopencm3/cm3/common.h>
/* --- CRC registers ------------------------------------------------------- */
diff --git a/include/stm32/dma.h b/include/libopencm3/stm32/dma.h
index d82dc65..7d0a856 100644
--- a/include/stm32/dma.h
+++ b/include/libopencm3/stm32/dma.h
@@ -20,8 +20,8 @@
#ifndef LIBOPENCM3_DMA_H
#define LIBOPENCM3_DMA_H
-#include <stm32/memorymap.h>
-#include <cm3/common.h>
+#include <libopencm3/stm32/memorymap.h>
+#include <libopencm3/cm3/common.h>
/* --- Convenience macros -------------------------------------------------- */
diff --git a/include/stm32/ethernet.h b/include/libopencm3/stm32/ethernet.h
index f331278..3d7f1ee 100644
--- a/include/stm32/ethernet.h
+++ b/include/libopencm3/stm32/ethernet.h
@@ -20,8 +20,8 @@
#ifndef LIBOPENCM3_ETHERNET_H
#define LIBOPENCM3_ETHERNET_H
-#include <stm32/memorymap.h>
-#include <cm3/common.h>
+#include <libopencm3/stm32/memorymap.h>
+#include <libopencm3/cm3/common.h>
/* Ethernet MAC registers */
#define ETH_MACCR MMIO32(ETHERNET_BASE + 0x00)
diff --git a/include/stm32/exti.h b/include/libopencm3/stm32/exti.h
index a0e3eb2..19ab547 100644
--- a/include/stm32/exti.h
+++ b/include/libopencm3/stm32/exti.h
@@ -20,8 +20,8 @@
#ifndef LIBOPENCM3_EXTI_H
#define LIBOPENCM3_EXTI_H
-#include <stm32/memorymap.h>
-#include <cm3/common.h>
+#include <libopencm3/stm32/memorymap.h>
+#include <libopencm3/cm3/common.h>
/* --- EXTI registers ------------------------------------------------------ */
diff --git a/include/stm32/flash.h b/include/libopencm3/stm32/flash.h
index 31ae1ee..f9b2aa9 100644
--- a/include/stm32/flash.h
+++ b/include/libopencm3/stm32/flash.h
@@ -28,8 +28,8 @@
#ifndef LIBOPENCM3_FLASH_H
#define LIBOPENCM3_FLASH_H
-#include <stm32/memorymap.h>
-#include <cm3/common.h>
+#include <libopencm3/stm32/memorymap.h>
+#include <libopencm3/cm3/common.h>
/* --- FLASH registers ----------------------------------------------------- */
diff --git a/include/stm32/fsmc.h b/include/libopencm3/stm32/fsmc.h
index 545de97..1d318e3 100644
--- a/include/stm32/fsmc.h
+++ b/include/libopencm3/stm32/fsmc.h
@@ -20,8 +20,8 @@
#ifndef LIBOPENCM3_FSMC_H
#define LIBOPENCM3_FSMC_H
-#include <stm32/memorymap.h>
-#include <cm3/common.h>
+#include <libopencm3/stm32/memorymap.h>
+#include <libopencm3/cm3/common.h>
/* --- Convenience macros -------------------------------------------------- */
diff --git a/include/stm32/gpio.h b/include/libopencm3/stm32/gpio.h
index 0febee0..f1463a3 100644
--- a/include/stm32/gpio.h
+++ b/include/libopencm3/stm32/gpio.h
@@ -20,8 +20,8 @@
#ifndef LIBOPENCM3_GPIO_H
#define LIBOPENCM3_GPIO_H
-#include <stm32/memorymap.h>
-#include <cm3/common.h>
+#include <libopencm3/stm32/memorymap.h>
+#include <libopencm3/cm3/common.h>
/* --- Convenience macros -------------------------------------------------- */
diff --git a/include/stm32/i2c.h b/include/libopencm3/stm32/i2c.h
index e02eb90..1b837b8 100644
--- a/include/stm32/i2c.h
+++ b/include/libopencm3/stm32/i2c.h
@@ -20,8 +20,8 @@
#ifndef LIBOPENCM3_I2C_H
#define LIBOPENCM3_I2C_H
-#include <stm32/memorymap.h>
-#include <cm3/common.h>
+#include <libopencm3/stm32/memorymap.h>
+#include <libopencm3/cm3/common.h>
/* --- Convenience macros -------------------------------------------------- */
diff --git a/include/stm32/iwdg.h b/include/libopencm3/stm32/iwdg.h
index 1162c34..bf2784a 100644
--- a/include/stm32/iwdg.h
+++ b/include/libopencm3/stm32/iwdg.h
@@ -20,8 +20,8 @@
#ifndef LIBOPENCM3_IWDG_H
#define LIBOPENCM3_IWDG_H
-#include <stm32/memorymap.h>
-#include <cm3/common.h>
+#include <libopencm3/stm32/memorymap.h>
+#include <libopencm3/cm3/common.h>
/* --- IWDG registers ------------------------------------------------------ */
diff --git a/include/stm32/memorymap.h b/include/libopencm3/stm32/memorymap.h
index db3677b..52fe6d4 100644
--- a/include/stm32/memorymap.h
+++ b/include/libopencm3/stm32/memorymap.h
@@ -20,7 +20,7 @@
#ifndef LIBOPENCM3_MEMORYMAP_H
#define LIBOPENCM3_MEMORYMAP_H
-#include <cm3/memorymap.h>
+#include <libopencm3/cm3/memorymap.h>
/* --- STM32 specific peripheral definitions ------------------------------- */
diff --git a/include/stm32/nvic.h b/include/libopencm3/stm32/nvic.h
index 23dab7d..ce8132f 100644
--- a/include/stm32/nvic.h
+++ b/include/libopencm3/stm32/nvic.h
@@ -20,8 +20,8 @@
#ifndef LIBOPENCM3_NVIC_H
#define LIBOPENCM3_NVIC_H
-#include <stm32/memorymap.h>
-#include <cm3/common.h>
+#include <libopencm3/stm32/memorymap.h>
+#include <libopencm3/cm3/common.h>
/* --- NVIC Registers ------------------------------------------------------ */
diff --git a/include/stm32/pwr.h b/include/libopencm3/stm32/pwr.h
index 9be68ef..e5b9804 100644
--- a/include/stm32/pwr.h
+++ b/include/libopencm3/stm32/pwr.h
@@ -20,8 +20,8 @@
#ifndef LIBOPENCM3_PWR_H
#define LIBOPENCM3_PWR_H
-#include <stm32/memorymap.h>
-#include <cm3/common.h>
+#include <libopencm3/stm32/memorymap.h>
+#include <libopencm3/cm3/common.h>
/* --- PWR registers ------------------------------------------------------- */
diff --git a/include/stm32/rcc.h b/include/libopencm3/stm32/rcc.h
index 81cd50d..7215f2b 100644
--- a/include/stm32/rcc.h
+++ b/include/libopencm3/stm32/rcc.h
@@ -21,8 +21,8 @@
#ifndef LIBOPENCM3_RCC_H
#define LIBOPENCM3_RCC_H
-#include <stm32/memorymap.h>
-#include <cm3/common.h>
+#include <libopencm3/stm32/memorymap.h>
+#include <libopencm3/cm3/common.h>
/* Note: Regs/bits marked (**) only exist in "connectivity line" STM32s. */
/* Note: Regs/bits marked (XX) do NOT exist in "connectivity line" STM32s. */
diff --git a/include/stm32/rtc.h b/include/libopencm3/stm32/rtc.h
index dad9f95..b71525e 100644
--- a/include/stm32/rtc.h
+++ b/include/libopencm3/stm32/rtc.h
@@ -20,9 +20,9 @@
#ifndef LIBOPENCM3_RTC_H
#define LIBOPENCM3_RTC_H
-#include <stm32/memorymap.h>
-#include <cm3/common.h>
-#include <stm32/pwr.h>
+#include <libopencm3/stm32/memorymap.h>
+#include <libopencm3/cm3/common.h>
+#include <libopencm3/stm32/pwr.h>
/* --- RTC registers ------------------------------------------------------- */
diff --git a/include/stm32/scb.h b/include/libopencm3/stm32/scb.h
index 42f5588..9594cf1 100644
--- a/include/stm32/scb.h
+++ b/include/libopencm3/stm32/scb.h
@@ -21,8 +21,8 @@
#ifndef LIBOPENCM3_SCB_H
#define LIBOPENCM3_SCB_H
-#include <stm32/memorymap.h>
-#include <cm3/common.h>
+#include <libopencm3/stm32/memorymap.h>
+#include <libopencm3/cm3/common.h>
/* --- SCB: Registers ------------------------------------------------------ */
diff --git a/include/stm32/spi.h b/include/libopencm3/stm32/spi.h
index 8efccc8..726310a 100644
--- a/include/stm32/spi.h
+++ b/include/libopencm3/stm32/spi.h
@@ -20,8 +20,8 @@
#ifndef LIBOPENCM3_SPI_H
#define LIBOPENCM3_SPI_H
-#include <stm32/memorymap.h>
-#include <cm3/common.h>
+#include <libopencm3/stm32/memorymap.h>
+#include <libopencm3/cm3/common.h>
/* Registers can be accessed as 16bit or 32bit values. */
diff --git a/include/stm32/systick.h b/include/libopencm3/stm32/systick.h
index 094db69..7c2c9a3 100644
--- a/include/stm32/systick.h
+++ b/include/libopencm3/stm32/systick.h
@@ -20,8 +20,8 @@
#ifndef LIBOPENCM3_SYSTICK_H
#define LIBOPENCM3_SYSTICK_H
-#include <stm32/memorymap.h>
-#include <cm3/common.h>
+#include <libopencm3/stm32/memorymap.h>
+#include <libopencm3/cm3/common.h>
/* --- SYSTICK registers --------------------------------------------------- */
diff --git a/include/stm32/timer.h b/include/libopencm3/stm32/timer.h
index ed5a693..dabf732 100644
--- a/include/stm32/timer.h
+++ b/include/libopencm3/stm32/timer.h
@@ -20,8 +20,8 @@
#ifndef LIBOPENCM3_TIMER_H
#define LIBOPENCM3_TIMER_H
-#include <stm32/memorymap.h>
-#include <cm3/common.h>
+#include <libopencm3/stm32/memorymap.h>
+#include <libopencm3/cm3/common.h>
/* --- Convenience macros -------------------------------------------------- */
diff --git a/include/stm32/tools.h b/include/libopencm3/stm32/tools.h
index ac7f0bf..ac7f0bf 100644
--- a/include/stm32/tools.h
+++ b/include/libopencm3/stm32/tools.h
diff --git a/include/stm32/usart.h b/include/libopencm3/stm32/usart.h
index e1c3b0d..df6bc08 100644
--- a/include/stm32/usart.h
+++ b/include/libopencm3/stm32/usart.h
@@ -20,8 +20,8 @@
#ifndef LIBOPENCM3_USART_H
#define LIBOPENCM3_USART_H
-#include <stm32/memorymap.h>
-#include <cm3/common.h>
+#include <libopencm3/stm32/memorymap.h>
+#include <libopencm3/cm3/common.h>
/* --- Convenience macros -------------------------------------------------- */
diff --git a/include/stm32/usb.h b/include/libopencm3/stm32/usb.h
index cf7a261..e35075d 100644
--- a/include/stm32/usb.h
+++ b/include/libopencm3/stm32/usb.h
@@ -20,9 +20,9 @@
#ifndef LIBOPENCM3_USB_H
#define LIBOPENCM3_USB_H
-#include <stm32/memorymap.h>
-#include <cm3/common.h>
-#include <stm32/tools.h>
+#include <libopencm3/stm32/memorymap.h>
+#include <libopencm3/cm3/common.h>
+#include <libopencm3/stm32/tools.h>
/* --- USB base addresses -------------------------------------------------- */
diff --git a/include/stm32/usb_desc.h b/include/libopencm3/stm32/usb_desc.h
index da99bb0..da99bb0 100644
--- a/include/stm32/usb_desc.h
+++ b/include/libopencm3/stm32/usb_desc.h
diff --git a/include/stm32/wwdg.h b/include/libopencm3/stm32/wwdg.h
index 81daf8b..552d02e 100644
--- a/include/stm32/wwdg.h
+++ b/include/libopencm3/stm32/wwdg.h
@@ -20,8 +20,8 @@
#ifndef LIBOPENCM3_WWDG_H
#define LIBOPENCM3_WWDG_H
-#include <stm32/memorymap.h>
-#include <cm3/common.h>
+#include <libopencm3/stm32/memorymap.h>
+#include <libopencm3/cm3/common.h>
/* --- WWDG registers ------------------------------------------------------ */
diff --git a/include/usb/cdc.h b/include/libopencm3/usb/cdc.h
index 2bdc18b..2bdc18b 100644
--- a/include/usb/cdc.h
+++ b/include/libopencm3/usb/cdc.h
diff --git a/include/usb/dfu.h b/include/libopencm3/usb/dfu.h
index 0f4c090..0f4c090 100644
--- a/include/usb/dfu.h
+++ b/include/libopencm3/usb/dfu.h
diff --git a/include/usb/hid.h b/include/libopencm3/usb/hid.h
index e1d9835..e1d9835 100644
--- a/include/usb/hid.h
+++ b/include/libopencm3/usb/hid.h
diff --git a/include/usb/usbd.h b/include/libopencm3/usb/usbd.h
index d861c17..95e6509 100644
--- a/include/usb/usbd.h
+++ b/include/libopencm3/usb/usbd.h
@@ -20,7 +20,7 @@
#ifndef __USBD_H
#define __USBD_H
-#include <usb/usbstd.h>
+#include <libopencm3/usb/usbstd.h>
/* Static buffer for control transactions:
* This is defined as weak in the library, applicaiton
diff --git a/include/usb/usbstd.h b/include/libopencm3/usb/usbstd.h
index f018289..ee65b70 100644
--- a/include/usb/usbstd.h
+++ b/include/libopencm3/usb/usbstd.h
@@ -21,7 +21,7 @@
#define __USBSTD_H
#include <stdint.h>
-#include <cm3/common.h>
+#include <libopencm3/cm3/common.h>
/*
* This file contains structure definitions for the USB control structures
diff --git a/lib/lpc13xx/gpio.c b/lib/lpc13xx/gpio.c
index 5fe4ea7..9eb057e 100644
--- a/lib/lpc13xx/gpio.c
+++ b/lib/lpc13xx/gpio.c
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <lpc13xx/gpio.h>
+#include <libopencm3/lpc13xx/gpio.h>
void gpio_set(u32 gpioport, u16 gpios)
{
diff --git a/lib/lpc13xx/lpc13xx.ld b/lib/lpc13xx/libopencm3_lpc13xx.ld
index c709a8c..c709a8c 100644
--- a/lib/lpc13xx/lpc13xx.ld
+++ b/lib/lpc13xx/libopencm3_lpc13xx.ld
diff --git a/lib/stm32/adc.c b/lib/stm32/adc.c
index fa32b25..058837c 100644
--- a/lib/stm32/adc.c
+++ b/lib/stm32/adc.c
@@ -31,7 +31,7 @@
* reg16 = adc_read(ADC1, ADC_CH_0);
*/
-#include <stm32/adc.h>
+#include <libopencm3/stm32/adc.h>
void rcc_set_adc_clk(u32 prescaler)
{
diff --git a/lib/stm32/can.c b/lib/stm32/can.c
index 73f102f..3266133 100644
--- a/lib/stm32/can.c
+++ b/lib/stm32/can.c
@@ -17,8 +17,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <stm32/can.h>
-#include <stm32/rcc.h>
+#include <libopencm3/stm32/can.h>
+#include <libopencm3/stm32/rcc.h>
void can_reset(u32 canport)
{
diff --git a/lib/stm32/dma.c b/lib/stm32/dma.c
index 84a10c7..8feb2c9 100644
--- a/lib/stm32/dma.c
+++ b/lib/stm32/dma.c
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <stm32/dma.h>
+#include <libopencm3/stm32/dma.h>
void dma_enable_mem2mem_mode(u32 dma, u8 channel)
{
diff --git a/lib/stm32/ethernet.c b/lib/stm32/ethernet.c
index 980b941..4a4d080 100644
--- a/lib/stm32/ethernet.c
+++ b/lib/stm32/ethernet.c
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <stm32/ethernet.h>
+#include <libopencm3/stm32/ethernet.h>
void eth_smi_write(u8 phy, u8 reg, u16 data)
{
diff --git a/lib/stm32/exti.c b/lib/stm32/exti.c
index 4961eab..cdc2347 100644
--- a/lib/stm32/exti.c
+++ b/lib/stm32/exti.c
@@ -17,8 +17,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <stm32/exti.h>
-#include <stm32/gpio.h>
+#include <libopencm3/stm32/exti.h>
+#include <libopencm3/stm32/gpio.h>
void exti_set_trigger(u32 extis, exti_trigger_type trig)
{
diff --git a/lib/stm32/flash.c b/lib/stm32/flash.c
index b623fc7..98f7777 100644
--- a/lib/stm32/flash.c
+++ b/lib/stm32/flash.c
@@ -18,7 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <stm32/flash.h>
+#include <libopencm3/stm32/flash.h>
void flash_prefetch_buffer_enable(void)
{
diff --git a/lib/stm32/gpio.c b/lib/stm32/gpio.c
index 4811b54..333fcaf 100644
--- a/lib/stm32/gpio.c
+++ b/lib/stm32/gpio.c
@@ -34,7 +34,7 @@
* - GPIO remapping support
*/
-#include <stm32/gpio.h>
+#include <libopencm3/stm32/gpio.h>
void gpio_set_mode(u32 gpioport, u8 mode, u8 cnf, u16 gpios)
{
diff --git a/lib/stm32/i2c.c b/lib/stm32/i2c.c
index e16b824..e1a3b84 100644
--- a/lib/stm32/i2c.c
+++ b/lib/stm32/i2c.c
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <stm32/i2c.h>
+#include <libopencm3/stm32/i2c.h>
void i2c_peripheral_enable(u32 i2c)
{
diff --git a/lib/stm32/stm32.ld b/lib/stm32/libopencm3_stm32.ld
index b0e202e..b0e202e 100644
--- a/lib/stm32/stm32.ld
+++ b/lib/stm32/libopencm3_stm32.ld
diff --git a/lib/stm32/nvic.c b/lib/stm32/nvic.c
index c9dcf3c..cf77cc3 100644
--- a/lib/stm32/nvic.c
+++ b/lib/stm32/nvic.c
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <stm32/nvic.h>
+#include <libopencm3/stm32/nvic.h>
void nvic_enable_irq(u8 irqn)
{
diff --git a/lib/stm32/rcc.c b/lib/stm32/rcc.c
index eddc667..997163a 100644
--- a/lib/stm32/rcc.c
+++ b/lib/stm32/rcc.c
@@ -19,8 +19,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <stm32/rcc.h>
-#include <stm32/flash.h>
+#include <libopencm3/stm32/rcc.h>
+#include <libopencm3/stm32/flash.h>
void rcc_osc_ready_int_clear(osc_t osc)
{
diff --git a/lib/stm32/rtc.c b/lib/stm32/rtc.c
index 1396559..4495641 100644
--- a/lib/stm32/rtc.c
+++ b/lib/stm32/rtc.c
@@ -18,9 +18,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <stm32/rcc.h>
-#include <stm32/rtc.h>
-#include <stm32/pwr.h>
+#include <libopencm3/stm32/rcc.h>
+#include <libopencm3/stm32/rtc.h>
+#include <libopencm3/stm32/pwr.h>
void rtc_awake_from_off(osc_t clock_source)
{
diff --git a/lib/stm32/scb.c b/lib/stm32/scb.c
index cd95bca..dfee6c3 100644
--- a/lib/stm32/scb.c
+++ b/lib/stm32/scb.c
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <stm32/scb.h>
+#include <libopencm3/stm32/scb.h>
void scb_reset_core(void)
{
diff --git a/lib/stm32/spi.c b/lib/stm32/spi.c
index 918617a..733a1bc 100644
--- a/lib/stm32/spi.c
+++ b/lib/stm32/spi.c
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <stm32/spi.h>
+#include <libopencm3/stm32/spi.h>
/*
* SPI and I2S code.
diff --git a/lib/stm32/systick.c b/lib/stm32/systick.c
index 998c0ed..882601d 100644
--- a/lib/stm32/systick.c
+++ b/lib/stm32/systick.c
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <stm32/systick.h>
+#include <libopencm3/stm32/systick.h>
void systick_set_reload(u32 value)
{
diff --git a/lib/stm32/timer.c b/lib/stm32/timer.c
index be90d06..ae51f1e 100644
--- a/lib/stm32/timer.c
+++ b/lib/stm32/timer.c
@@ -25,7 +25,7 @@
* TIM_CR1_CMS_CENTRE_3, TIM_CR1_DIR_UP);
*/
-#include <stm32/timer.h>
+#include <libopencm3/stm32/timer.h>
void timer_set_mode(u32 timer_peripheral, u8 clock_div, u8 alignment,
u8 direction)
diff --git a/lib/stm32/usart.c b/lib/stm32/usart.c
index a16e45a..f644776 100644
--- a/lib/stm32/usart.c
+++ b/lib/stm32/usart.c
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <stm32/usart.h>
+#include <libopencm3/stm32/usart.h>
void usart_set_baudrate(u32 usart, u32 baud)
{
diff --git a/lib/usb/usb.c b/lib/usb/usb.c
index 1e8ad44..c88de55 100644
--- a/lib/usb/usb.c
+++ b/lib/usb/usb.c
@@ -18,7 +18,7 @@
*/
#include <string.h>
-#include <usb/usbd.h>
+#include <libopencm3/usb/usbd.h>
#include "usb_private.h"
struct _usbd_device _usbd_device;
diff --git a/lib/usb/usb_control.c b/lib/usb/usb_control.c
index ff46732..cd3fe0f 100644
--- a/lib/usb/usb_control.c
+++ b/lib/usb/usb_control.c
@@ -18,7 +18,7 @@
*/
#include <stdlib.h>
-#include <usb/usbd.h>
+#include <libopencm3/usb/usbd.h>
#include "usb_private.h"
static struct usb_control_state {
diff --git a/lib/usb/usb_f103.c b/lib/usb/usb_f103.c
index dab046d..1f82def 100644
--- a/lib/usb/usb_f103.c
+++ b/lib/usb/usb_f103.c
@@ -17,10 +17,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <cm3/common.h>
-#include <stm32/tools.h>
-#include <stm32/usb.h>
-#include <usb/usbd.h>
+#include <libopencm3/cm3/common.h>
+#include <libopencm3/stm32/tools.h>
+#include <libopencm3/stm32/usb.h>
+#include <libopencm3/usb/usbd.h>
#include "usb_private.h"
/** Initialize the USB device controller hardware of the STM32. */
diff --git a/lib/usb/usb_standard.c b/lib/usb/usb_standard.c
index 81616e5..efaea27 100644
--- a/lib/usb/usb_standard.c
+++ b/lib/usb/usb_standard.c
@@ -18,7 +18,7 @@
*/
#include <string.h>
-#include <usb/usbd.h>
+#include <libopencm3/usb/usbd.h>
#include "usb_private.h"
void usbd_register_set_config_callback(void (*callback)(u16 wValue))