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
This commit is contained in:
Uwe Hermann
2010-12-31 18:18:39 +01:00
parent 95793aa6ce
commit 8f251e8a9d
119 changed files with 249 additions and 252 deletions

View File

@@ -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 -------------------------------------------------- */

View File

@@ -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 ----------------------------- */

View File

@@ -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 -------------------------------------------------- */

View File

@@ -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 ------------------------------------------------------- */

View File

@@ -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 -------------------------------------------------- */

View File

@@ -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 ------------------------------------------------------- */

View File

@@ -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 -------------------------------------------------- */

View File

@@ -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)

View File

@@ -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 ------------------------------------------------------ */

View File

@@ -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 ----------------------------------------------------- */

View File

@@ -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 -------------------------------------------------- */

View File

@@ -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 -------------------------------------------------- */

View File

@@ -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 -------------------------------------------------- */

View File

@@ -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 ------------------------------------------------------ */

View File

@@ -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 ------------------------------- */

View File

@@ -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 ------------------------------------------------------ */

View File

@@ -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 ------------------------------------------------------- */

View File

@@ -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. */

View File

@@ -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 ------------------------------------------------------- */

View File

@@ -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 ------------------------------------------------------ */

View File

@@ -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. */

View File

@@ -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 --------------------------------------------------- */

View File

@@ -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 -------------------------------------------------- */

View File

@@ -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 -------------------------------------------------- */

View File

@@ -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 -------------------------------------------------- */

View File

@@ -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 ------------------------------------------------------ */

View File

@@ -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

View File

@@ -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