jackcartersmith/blackmagic
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Restructuring stm32 include directories.

Browse Source
This commit is contained in:
Fergus Noble 2011-09-14 13:47:33 -07:00
parent 87d4045c22
commit af64b76bd6
34 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/libopencm3/stm32_common/can.h → include/libopencm3/stm32/can.h
View File

@ -20,7 +20,7 @@
#ifndef LIBOPENCM3_CAN_H #ifndef LIBOPENCM3_CAN_H
#define LIBOPENCM3_CAN_H #define LIBOPENCM3_CAN_H
#include <libopencm3/stm32_common/memorymap.h> #include <libopencm3/stm32/memorymap.h>
#include <libopencm3/cm3/common.h> #include <libopencm3/cm3/common.h>
/* --- Convenience macros -------------------------------------------------- */ /* --- Convenience macros -------------------------------------------------- */

2
include/libopencm3/stm32_common/crc.h → include/libopencm3/stm32/crc.h
View File

@ -20,7 +20,7 @@
#ifndef LIBOPENCM3_CRC_H #ifndef LIBOPENCM3_CRC_H
#define LIBOPENCM3_CRC_H #define LIBOPENCM3_CRC_H
#include <libopencm3/stm32_common/memorymap.h> #include <libopencm3/stm32/memorymap.h>
#include <libopencm3/cm3/common.h> #include <libopencm3/cm3/common.h>
/* --- CRC registers ------------------------------------------------------- */ /* --- CRC registers ------------------------------------------------------- */

2
include/libopencm3/stm32_common/dbgmcu.h → include/libopencm3/stm32/dbgmcu.h
View File

@ -20,7 +20,7 @@
#ifndef LIBOPENCM3_STM32_DBGMCU_H #ifndef LIBOPENCM3_STM32_DBGMCU_H
#define LIBOPENCM3_STM32_DBGMCU_H #define LIBOPENCM3_STM32_DBGMCU_H
#include <libopencm3/stm32_common/memorymap.h> #include <libopencm3/stm32/memorymap.h>
#include <libopencm3/cm3/common.h> #include <libopencm3/cm3/common.h>
/* --- DBGMCU registers ---------------------------------------------------- */ /* --- DBGMCU registers ---------------------------------------------------- */

2
include/libopencm3/stm32_common/exti.h → include/libopencm3/stm32/exti.h
View File

@ -20,7 +20,7 @@
#ifndef LIBOPENCM3_EXTI_H #ifndef LIBOPENCM3_EXTI_H
#define LIBOPENCM3_EXTI_H #define LIBOPENCM3_EXTI_H
#include <libopencm3/stm32_common/memorymap.h> #include <libopencm3/stm32/memorymap.h>
#include <libopencm3/cm3/common.h> #include <libopencm3/cm3/common.h>
/* --- EXTI registers ------------------------------------------------------ */ /* --- EXTI registers ------------------------------------------------------ */

0
include/libopencm3/stm32f1/adc.h → include/libopencm3/stm32/f1/adc.h
View File

0
include/libopencm3/stm32f1/bkp.h → include/libopencm3/stm32/f1/bkp.h
View File

0
include/libopencm3/stm32f1/dma.h → include/libopencm3/stm32/f1/dma.h
View File

0
include/libopencm3/stm32f1/ethernet.h → include/libopencm3/stm32/f1/ethernet.h
View File

0
include/libopencm3/stm32f1/flash.h → include/libopencm3/stm32/f1/flash.h
View File

0
include/libopencm3/stm32f1/gpio.h → include/libopencm3/stm32/f1/gpio.h
View File

0
include/libopencm3/stm32f1/memorymap.h → include/libopencm3/stm32/f1/memorymap.h
View File

0
include/libopencm3/stm32f1/nvic.h → include/libopencm3/stm32/f1/nvic.h
View File

0
include/libopencm3/stm32f1/otg_fs.h → include/libopencm3/stm32/f1/otg_fs.h
View File

0
include/libopencm3/stm32f1/rcc.h → include/libopencm3/stm32/f1/rcc.h
View File

0
include/libopencm3/stm32f1/rtc.h → include/libopencm3/stm32/f1/rtc.h
View File

0
include/libopencm3/stm32f1/scb.h → include/libopencm3/stm32/f1/scb.h
View File

0
include/libopencm3/stm32f1/systick.h → include/libopencm3/stm32/f1/systick.h
View File

0
include/libopencm3/stm32f1/tools.h → include/libopencm3/stm32/f1/tools.h
View File

0
include/libopencm3/stm32f1/usb.h → include/libopencm3/stm32/f1/usb.h
View File

0
include/libopencm3/stm32f1/usb_desc.h → include/libopencm3/stm32/f1/usb_desc.h
View File

0
include/libopencm3/stm32f2/memorymap.h → include/libopencm3/stm32/f2/memorymap.h
View File

2
include/libopencm3/stm32f2/pwr.h → include/libopencm3/stm32/f2/pwr.h
View File

@ -20,7 +20,7 @@
#ifndef LIBOPENCM3_PWR_F2_H #ifndef LIBOPENCM3_PWR_F2_H
#define LIBOPENCM3_PWR_F2_H #define LIBOPENCM3_PWR_F2_H
#include <libopencm3/stm32_common/pwr.h> #include <libopencm3/stm32/pwr.h>
/* /*
* This file extends the version in stm_common with definitions only * This file extends the version in stm_common with definitions only

2
include/libopencm3/stm32f2/spi.h → include/libopencm3/stm32/f2/spi.h
View File

@ -20,7 +20,7 @@
#ifndef LIBOPENCM3_SPI_F2_H #ifndef LIBOPENCM3_SPI_F2_H
#define LIBOPENCM3_SPI_F2_H #define LIBOPENCM3_SPI_F2_H
#include <libopencm3/stm32_common/spi.h> #include <libopencm3/stm32/spi.h>
/* /*
* This file extends the version in stm_common with definitions only * This file extends the version in stm_common with definitions only

0
include/libopencm3/stm32f2/timer.h → include/libopencm3/stm32/f2/timer.h
View File

2
include/libopencm3/stm32f2/usart.h → include/libopencm3/stm32/f2/usart.h
View File

@ -20,7 +20,7 @@
#ifndef LIBOPENCM3_USART_F2_H #ifndef LIBOPENCM3_USART_F2_H
#define LIBOPENCM3_USART_F2_H #define LIBOPENCM3_USART_F2_H
#include <libopencm3/stm32_common/usart.h> #include <libopencm3/stm32/usart.h>
/* --- USART_CR1 values ---------------------------------------------------- */ /* --- USART_CR1 values ---------------------------------------------------- */

2
include/libopencm3/stm32_common/fsmc.h → include/libopencm3/stm32/fsmc.h
View File

@ -20,7 +20,7 @@
#ifndef LIBOPENCM3_FSMC_H #ifndef LIBOPENCM3_FSMC_H
#define LIBOPENCM3_FSMC_H #define LIBOPENCM3_FSMC_H
#include <libopencm3/stm32_common/memorymap.h> #include <libopencm3/stm32/memorymap.h>
#include <libopencm3/cm3/common.h> #include <libopencm3/cm3/common.h>
/* --- Convenience macros -------------------------------------------------- */ /* --- Convenience macros -------------------------------------------------- */

2
include/libopencm3/stm32_common/i2c.h → include/libopencm3/stm32/i2c.h
View File

@ -20,7 +20,7 @@
#ifndef LIBOPENCM3_I2C_H #ifndef LIBOPENCM3_I2C_H
#define LIBOPENCM3_I2C_H #define LIBOPENCM3_I2C_H
#include <libopencm3/stm32_common/memorymap.h> #include <libopencm3/stm32/memorymap.h>
#include <libopencm3/cm3/common.h> #include <libopencm3/cm3/common.h>
/* --- Convenience macros -------------------------------------------------- */ /* --- Convenience macros -------------------------------------------------- */

2
include/libopencm3/stm32_common/iwdg.h → include/libopencm3/stm32/iwdg.h
View File

@ -20,7 +20,7 @@
#ifndef LIBOPENCM3_IWDG_H #ifndef LIBOPENCM3_IWDG_H
#define LIBOPENCM3_IWDG_H #define LIBOPENCM3_IWDG_H
#include <libopencm3/stm32_common/memorymap.h> #include <libopencm3/stm32/memorymap.h>
#include <libopencm3/cm3/common.h> #include <libopencm3/cm3/common.h>
/* --- IWDG registers ------------------------------------------------------ */ /* --- IWDG registers ------------------------------------------------------ */

2
include/libopencm3/stm32_common/memorymap.h → include/libopencm3/stm32/memorymap.h
View File

@ -20,8 +20,6 @@
#ifndef LIBOPENCM3_MEMORYMAP_COMMON_H #ifndef LIBOPENCM3_MEMORYMAP_COMMON_H
#define LIBOPENCM3_MEMORYMAP_COMMON_H #define LIBOPENCM3_MEMORYMAP_COMMON_H
#include <libopencm3/cm3/memorymap.h>
#ifdef STM32F1 #ifdef STM32F1
#include <libopencm3/stm32f1/memorymap.h> #include <libopencm3/stm32f1/memorymap.h>
#else #else

2
include/libopencm3/stm32_common/pwr.h → include/libopencm3/stm32/pwr.h
View File

@ -20,7 +20,7 @@
#ifndef LIBOPENCM3_PWR_H #ifndef LIBOPENCM3_PWR_H
#define LIBOPENCM3_PWR_H #define LIBOPENCM3_PWR_H
#include <libopencm3/stm32_common/memorymap.h> #include <libopencm3/stm32/memorymap.h>
#include <libopencm3/cm3/common.h> #include <libopencm3/cm3/common.h>
/* --- PWR registers ------------------------------------------------------- */ /* --- PWR registers ------------------------------------------------------- */

2
include/libopencm3/stm32_common/spi.h → include/libopencm3/stm32/spi.h
View File

@ -20,7 +20,7 @@
#ifndef LIBOPENCM3_SPI_H #ifndef LIBOPENCM3_SPI_H
#define LIBOPENCM3_SPI_H #define LIBOPENCM3_SPI_H
#include <libopencm3/stm32_common/memorymap.h> #include <libopencm3/stm32/memorymap.h>
#include <libopencm3/cm3/common.h> #include <libopencm3/cm3/common.h>
/* Registers can be accessed as 16bit or 32bit values. */ /* Registers can be accessed as 16bit or 32bit values. */

2
include/libopencm3/stm32_common/timer.h → include/libopencm3/stm32/timer.h
View File

@ -20,7 +20,7 @@
#ifndef LIBOPENCM3_TIMER_H #ifndef LIBOPENCM3_TIMER_H
#define LIBOPENCM3_TIMER_H #define LIBOPENCM3_TIMER_H
#include <libopencm3/stm32_common/memorymap.h> #include <libopencm3/stm32/memorymap.h>
#include <libopencm3/cm3/common.h> #include <libopencm3/cm3/common.h>
/* --- Convenience macros -------------------------------------------------- */ /* --- Convenience macros -------------------------------------------------- */

2
include/libopencm3/stm32_common/usart.h → include/libopencm3/stm32/usart.h
View File

@ -20,7 +20,7 @@
#ifndef LIBOPENCM3_USART_H #ifndef LIBOPENCM3_USART_H
#define LIBOPENCM3_USART_H #define LIBOPENCM3_USART_H
#include <libopencm3/stm32_common/memorymap.h> #include <libopencm3/stm32/memorymap.h>
#include <libopencm3/cm3/common.h> #include <libopencm3/cm3/common.h>
/* --- Convenience macros -------------------------------------------------- */ /* --- Convenience macros -------------------------------------------------- */

2
include/libopencm3/stm32_common/wwdg.h → include/libopencm3/stm32/wwdg.h
View File

@ -20,7 +20,7 @@
#ifndef LIBOPENCM3_WWDG_H #ifndef LIBOPENCM3_WWDG_H
#define LIBOPENCM3_WWDG_H #define LIBOPENCM3_WWDG_H
#include <libopencm3/stm32_common/memorymap.h> #include <libopencm3/stm32/memorymap.h>
#include <libopencm3/cm3/common.h> #include <libopencm3/cm3/common.h>
/* --- WWDG registers ------------------------------------------------------ */ /* --- WWDG registers ------------------------------------------------------ */