aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorUwe Hermann2010-12-31 18:18:39 +0100
committerUwe Hermann2010-12-31 18:18:39 +0100
commit8f251e8a9d46634be4741f7f1aef3d52fb1b7dba (patch)
treefb3c17756e0b18fe19ca28f0f67b2ae636cac807 /include
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 'include')
-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
35 files changed, 54 insertions, 54 deletions
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