From be2ac142d9f08f0a6632043f99abf3bc6abd743e Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Thu, 30 Dec 2010 02:23:51 +0100 Subject: [PATCH] Rename include/libopenstm32 to include/stm32. --- examples/stm32/lisa-m/usb_dfu/usbdfu.c | 8 ++-- examples/stm32/lisa-m/usb_hid/usbhid.c | 8 ++-- examples/stm32/mb525/fancyblink/fancyblink.c | 4 +- examples/stm32/mb525/pwmleds/pwmleds.c | 6 +-- examples/stm32/obldc/can/can.c | 12 ++--- examples/stm32/obldc/led/led.c | 4 +- examples/stm32/obldc/systick/systick.c | 10 ++-- examples/stm32/obldc/usart/usart.c | 6 +-- examples/stm32/obldc/usart_irq/usart_irq.c | 8 ++-- .../stm32/other/adc_temperature_sensor/adc.c | 10 ++-- examples/stm32/other/dma_mem2mem/dma.c | 10 ++-- examples/stm32/other/dogm128/dogm128.h | 4 +- examples/stm32/other/dogm128/main.c | 14 +++--- .../i2c_stts75_sensor/i2c_stts75_sensor.c | 10 ++-- .../stm32/other/i2c_stts75_sensor/stts75.c | 2 +- examples/stm32/other/rtc/rtc.c | 12 ++--- examples/stm32/other/systick/systick.c | 10 ++-- examples/stm32/other/timer_interrupt/timer.c | 10 ++-- examples/stm32/other/usb_cdcacm/cdcacm.c | 4 +- examples/stm32/other/usb_dfu/usbdfu.c | 8 ++-- examples/stm32/other/usb_hid/usbhid.c | 8 ++-- .../stm32/stm32-h103/fancyblink/fancyblink.c | 4 +- .../stm32/stm32-h103/miniblink/miniblink.c | 4 +- examples/stm32/stm32-h103/spi/spi.c | 4 +- examples/stm32/stm32-h103/usart/usart.c | 6 +-- examples/stm32/stm32-h103/usb_cdcacm/cdcacm.c | 4 +- examples/stm32/stm32-h103/usb_dfu/usbdfu.c | 8 ++-- examples/stm32/stm32-h103/usb_hid/usbhid.c | 8 ++-- examples/stm32/stm32-h103/usb_iap/usbiap.c | 8 ++-- include/libopenstm32.h | 48 +++++++++---------- include/{libopenstm32 => stm32}/adc.h | 2 +- include/{libopenstm32 => stm32}/bkp.h | 2 +- include/{libopenstm32 => stm32}/can.h | 2 +- include/{libopenstm32 => stm32}/crc.h | 2 +- include/{libopenstm32 => stm32}/dma.h | 2 +- include/{libopenstm32 => stm32}/ethernet.h | 2 +- include/{libopenstm32 => stm32}/exti.h | 2 +- include/{libopenstm32 => stm32}/flash.h | 2 +- include/{libopenstm32 => stm32}/gpio.h | 2 +- include/{libopenstm32 => stm32}/i2c.h | 2 +- include/{libopenstm32 => stm32}/iwdg.h | 2 +- include/{libopenstm32 => stm32}/memorymap.h | 0 include/{libopenstm32 => stm32}/nvic.h | 2 +- include/{libopenstm32 => stm32}/pwr.h | 2 +- include/{libopenstm32 => stm32}/rcc.h | 2 +- include/{libopenstm32 => stm32}/rtc.h | 4 +- include/{libopenstm32 => stm32}/scb.h | 2 +- include/{libopenstm32 => stm32}/spi.h | 2 +- include/{libopenstm32 => stm32}/systick.h | 2 +- include/{libopenstm32 => stm32}/timer.h | 2 +- include/{libopenstm32 => stm32}/tools.h | 0 include/{libopenstm32 => stm32}/usart.h | 2 +- include/{libopenstm32 => stm32}/usb.h | 4 +- include/{libopenstm32 => stm32}/usb_desc.h | 0 include/{libopenstm32 => stm32}/wwdg.h | 2 +- lib/stm32/adc.c | 2 +- lib/stm32/can.c | 4 +- lib/stm32/dma.c | 2 +- lib/stm32/ethernet.c | 2 +- lib/stm32/exti.c | 4 +- lib/stm32/flash.c | 2 +- lib/stm32/gpio.c | 2 +- lib/stm32/i2c.c | 2 +- lib/stm32/nvic.c | 2 +- lib/stm32/rcc.c | 4 +- lib/stm32/rtc.c | 6 +-- lib/stm32/scb.c | 2 +- lib/stm32/spi.c | 2 +- lib/stm32/systick.c | 2 +- lib/stm32/timer.c | 2 +- lib/stm32/usart.c | 2 +- lib/usb/usb_f103.c | 4 +- 72 files changed, 178 insertions(+), 178 deletions(-) rename include/{libopenstm32 => stm32}/adc.h (99%) rename include/{libopenstm32 => stm32}/bkp.h (99%) rename include/{libopenstm32 => stm32}/can.h (99%) rename include/{libopenstm32 => stm32}/crc.h (97%) rename include/{libopenstm32 => stm32}/dma.h (99%) rename include/{libopenstm32 => stm32}/ethernet.h (99%) rename include/{libopenstm32 => stm32}/exti.h (98%) rename include/{libopenstm32 => stm32}/flash.h (99%) rename include/{libopenstm32 => stm32}/gpio.h (99%) rename include/{libopenstm32 => stm32}/i2c.h (99%) rename include/{libopenstm32 => stm32}/iwdg.h (98%) rename include/{libopenstm32 => stm32}/memorymap.h (100%) rename include/{libopenstm32 => stm32}/nvic.h (99%) rename include/{libopenstm32 => stm32}/pwr.h (98%) rename include/{libopenstm32 => stm32}/rcc.h (99%) rename include/{libopenstm32 => stm32}/rtc.h (98%) rename include/{libopenstm32 => stm32}/scb.h (99%) rename include/{libopenstm32 => stm32}/spi.h (99%) rename include/{libopenstm32 => stm32}/systick.h (98%) rename include/{libopenstm32 => stm32}/timer.h (99%) rename include/{libopenstm32 => stm32}/tools.h (100%) rename include/{libopenstm32 => stm32}/usart.h (99%) rename include/{libopenstm32 => stm32}/usb.h (99%) rename include/{libopenstm32 => stm32}/usb_desc.h (100%) rename include/{libopenstm32 => stm32}/wwdg.h (98%) diff --git a/examples/stm32/lisa-m/usb_dfu/usbdfu.c b/examples/stm32/lisa-m/usb_dfu/usbdfu.c index 0a6789df..b0cc3a25 100644 --- a/examples/stm32/lisa-m/usb_dfu/usbdfu.c +++ b/examples/stm32/lisa-m/usb_dfu/usbdfu.c @@ -18,10 +18,10 @@ */ #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/examples/stm32/lisa-m/usb_hid/usbhid.c b/examples/stm32/lisa-m/usb_hid/usbhid.c index 1628503a..0bec5a2b 100644 --- a/examples/stm32/lisa-m/usb_hid/usbhid.c +++ b/examples/stm32/lisa-m/usb_hid/usbhid.c @@ -18,9 +18,9 @@ */ #include -#include -#include -#include +#include +#include +#include #include #include @@ -28,7 +28,7 @@ #define INCLUDE_DFU_INTERFACE #ifdef INCLUDE_DFU_INTERFACE -#include +#include #include #endif diff --git a/examples/stm32/mb525/fancyblink/fancyblink.c b/examples/stm32/mb525/fancyblink/fancyblink.c index b10d1384..9a0e27d1 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 . */ -#include -#include +#include +#include void clock_setup(void) { diff --git a/examples/stm32/mb525/pwmleds/pwmleds.c b/examples/stm32/mb525/pwmleds/pwmleds.c index 78932cbe..7305f581 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 . */ -#include -#include -#include +#include +#include +#include // #define COMPARE // #define MOVING_FADE diff --git a/examples/stm32/obldc/can/can.c b/examples/stm32/obldc/can/can.c index d96d1c94..6e2b7604 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 . */ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include struct can_tx_msg { u32 std_id; diff --git a/examples/stm32/obldc/led/led.c b/examples/stm32/obldc/led/led.c index 77841065..754b1a91 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 . */ -#include -#include +#include +#include /* Set STM32 to 72 MHz. */ void clock_setup(void) diff --git a/examples/stm32/obldc/systick/systick.c b/examples/stm32/obldc/systick/systick.c index c469c1c4..df180d34 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 . */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include u32 temp32; diff --git a/examples/stm32/obldc/usart/usart.c b/examples/stm32/obldc/usart/usart.c index 87121815..1a8238a9 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 . */ -#include -#include -#include +#include +#include +#include void clock_setup(void) { diff --git a/examples/stm32/obldc/usart_irq/usart_irq.c b/examples/stm32/obldc/usart_irq/usart_irq.c index 5be24d23..ef868aef 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 . */ -#include -#include -#include -#include +#include +#include +#include +#include void clock_setup(void) { diff --git a/examples/stm32/other/adc_temperature_sensor/adc.c b/examples/stm32/other/adc_temperature_sensor/adc.c index 74453990..c300b8e2 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 . */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include void usart_setup(void) { diff --git a/examples/stm32/other/dma_mem2mem/dma.c b/examples/stm32/other/dma_mem2mem/dma.c index b609497f..d4da83ae 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 . */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include void usart_setup(void) { diff --git a/examples/stm32/other/dogm128/dogm128.h b/examples/stm32/other/dogm128/dogm128.h index 5be924f8..dac1d846 100644 --- a/examples/stm32/other/dogm128/dogm128.h +++ b/examples/stm32/other/dogm128/dogm128.h @@ -21,8 +21,8 @@ #define DOGM128_H #include -#include -#include +#include +#include /* PB10 GPIO - ~RESET * PB12 SPI2_NSS - ~CS1 diff --git a/examples/stm32/other/dogm128/main.c b/examples/stm32/other/dogm128/main.c index 3cea0601..61bb526e 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 . */ -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include "./dogm128.h" void gpio_setup(void) 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 1227fd17..9147f669 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 . */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "stts75.h" void usart_setup(void) diff --git a/examples/stm32/other/i2c_stts75_sensor/stts75.c b/examples/stm32/other/i2c_stts75_sensor/stts75.c index 319394f8..ab8c3d7d 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 . */ -#include +#include #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 d3c4bcb0..0134891e 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 . */ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include void clock_setup(void) { diff --git a/examples/stm32/other/systick/systick.c b/examples/stm32/other/systick/systick.c index 68120d28..7462a35d 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 . */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include u32 temp32; diff --git a/examples/stm32/other/timer_interrupt/timer.c b/examples/stm32/other/timer_interrupt/timer.c index d1f2bbb4..73c16ac0 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 . */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include void gpio_setup(void) { diff --git a/examples/stm32/other/usb_cdcacm/cdcacm.c b/examples/stm32/other/usb_cdcacm/cdcacm.c index 8305dc2e..f6e7db7d 100644 --- a/examples/stm32/other/usb_cdcacm/cdcacm.c +++ b/examples/stm32/other/usb_cdcacm/cdcacm.c @@ -18,8 +18,8 @@ */ #include -#include -#include +#include +#include #include #include diff --git a/examples/stm32/other/usb_dfu/usbdfu.c b/examples/stm32/other/usb_dfu/usbdfu.c index 9981585d..6044697c 100644 --- a/examples/stm32/other/usb_dfu/usbdfu.c +++ b/examples/stm32/other/usb_dfu/usbdfu.c @@ -18,10 +18,10 @@ */ #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/examples/stm32/other/usb_hid/usbhid.c b/examples/stm32/other/usb_hid/usbhid.c index 02c653dd..14f218c1 100644 --- a/examples/stm32/other/usb_hid/usbhid.c +++ b/examples/stm32/other/usb_hid/usbhid.c @@ -18,9 +18,9 @@ */ #include -#include -#include -#include +#include +#include +#include #include #include @@ -28,7 +28,7 @@ #define INCLUDE_DFU_INTERFACE #ifdef INCLUDE_DFU_INTERFACE -#include +#include #include #endif diff --git a/examples/stm32/stm32-h103/fancyblink/fancyblink.c b/examples/stm32/stm32-h103/fancyblink/fancyblink.c index 014ae90e..8d152dc8 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 . */ -#include -#include +#include +#include /* Set STM32 to 72 MHz. */ void clock_setup(void) diff --git a/examples/stm32/stm32-h103/miniblink/miniblink.c b/examples/stm32/stm32-h103/miniblink/miniblink.c index dc482005..867d6fc9 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 . */ -#include -#include +#include +#include void gpio_setup(void) { diff --git a/examples/stm32/stm32-h103/spi/spi.c b/examples/stm32/stm32-h103/spi/spi.c index b174130c..dd6ccddc 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 . */ -#include -#include +#include +#include void clock_setup(void) { diff --git a/examples/stm32/stm32-h103/usart/usart.c b/examples/stm32/stm32-h103/usart/usart.c index 44703483..782c48b4 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 . */ -#include -#include -#include +#include +#include +#include void clock_setup(void) { diff --git a/examples/stm32/stm32-h103/usb_cdcacm/cdcacm.c b/examples/stm32/stm32-h103/usb_cdcacm/cdcacm.c index 305ad43a..ae922a90 100644 --- a/examples/stm32/stm32-h103/usb_cdcacm/cdcacm.c +++ b/examples/stm32/stm32-h103/usb_cdcacm/cdcacm.c @@ -18,8 +18,8 @@ */ #include -#include -#include +#include +#include #include #include diff --git a/examples/stm32/stm32-h103/usb_dfu/usbdfu.c b/examples/stm32/stm32-h103/usb_dfu/usbdfu.c index 0a6789df..b0cc3a25 100644 --- a/examples/stm32/stm32-h103/usb_dfu/usbdfu.c +++ b/examples/stm32/stm32-h103/usb_dfu/usbdfu.c @@ -18,10 +18,10 @@ */ #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/examples/stm32/stm32-h103/usb_hid/usbhid.c b/examples/stm32/stm32-h103/usb_hid/usbhid.c index e326dd0f..731def39 100644 --- a/examples/stm32/stm32-h103/usb_hid/usbhid.c +++ b/examples/stm32/stm32-h103/usb_hid/usbhid.c @@ -18,9 +18,9 @@ */ #include -#include -#include -#include +#include +#include +#include #include #include @@ -28,7 +28,7 @@ #define INCLUDE_DFU_INTERFACE #ifdef INCLUDE_DFU_INTERFACE -#include +#include #include #endif diff --git a/examples/stm32/stm32-h103/usb_iap/usbiap.c b/examples/stm32/stm32-h103/usb_iap/usbiap.c index 0a6789df..b0cc3a25 100644 --- a/examples/stm32/stm32-h103/usb_iap/usbiap.c +++ b/examples/stm32/stm32-h103/usb_iap/usbiap.c @@ -18,10 +18,10 @@ */ #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/include/libopenstm32.h b/include/libopenstm32.h index a6185905..36129950 100644 --- a/include/libopenstm32.h +++ b/include/libopenstm32.h @@ -20,30 +20,30 @@ #ifndef LIBOPENSTM32_LIBOPENSTM32_H #define LIBOPENSTM32_LIBOPENSTM32_H -#include +#include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #endif diff --git a/include/libopenstm32/adc.h b/include/stm32/adc.h similarity index 99% rename from include/libopenstm32/adc.h rename to include/stm32/adc.h index 95d21b87..2ae24b8c 100644 --- a/include/libopenstm32/adc.h +++ b/include/stm32/adc.h @@ -20,7 +20,7 @@ #ifndef LIBOPENSTM32_ADC_H #define LIBOPENSTM32_ADC_H -#include +#include #include /* --- Convenience macros -------------------------------------------------- */ diff --git a/include/libopenstm32/bkp.h b/include/stm32/bkp.h similarity index 99% rename from include/libopenstm32/bkp.h rename to include/stm32/bkp.h index 10b9e70c..fee9df02 100644 --- a/include/libopenstm32/bkp.h +++ b/include/stm32/bkp.h @@ -20,7 +20,7 @@ #ifndef LIBOPENSTM32_BKP_H #define LIBOPENSTM32_BKP_H -#include +#include #include /* --- BKP registers ------------------------------------------------------- */ diff --git a/include/libopenstm32/can.h b/include/stm32/can.h similarity index 99% rename from include/libopenstm32/can.h rename to include/stm32/can.h index 74e73801..b3270904 100644 --- a/include/libopenstm32/can.h +++ b/include/stm32/can.h @@ -20,7 +20,7 @@ #ifndef LIBOPENSTM32_CAN_H #define LIBOPENSTM32_CAN_H -#include +#include #include /* --- Convenience macros -------------------------------------------------- */ diff --git a/include/libopenstm32/crc.h b/include/stm32/crc.h similarity index 97% rename from include/libopenstm32/crc.h rename to include/stm32/crc.h index f642a18f..dba4e7ef 100644 --- a/include/libopenstm32/crc.h +++ b/include/stm32/crc.h @@ -20,7 +20,7 @@ #ifndef LIBOPENSTM32_CRC_H #define LIBOPENSTM32_CRC_H -#include +#include #include /* --- CRC registers ------------------------------------------------------- */ diff --git a/include/libopenstm32/dma.h b/include/stm32/dma.h similarity index 99% rename from include/libopenstm32/dma.h rename to include/stm32/dma.h index 92a0918f..6761ab4c 100644 --- a/include/libopenstm32/dma.h +++ b/include/stm32/dma.h @@ -20,7 +20,7 @@ #ifndef LIBOPENSTM32_DMA_H #define LIBOPENSTM32_DMA_H -#include +#include #include /* --- Convenience macros -------------------------------------------------- */ diff --git a/include/libopenstm32/ethernet.h b/include/stm32/ethernet.h similarity index 99% rename from include/libopenstm32/ethernet.h rename to include/stm32/ethernet.h index 92791df5..c2934e7d 100644 --- a/include/libopenstm32/ethernet.h +++ b/include/stm32/ethernet.h @@ -20,7 +20,7 @@ #ifndef LIBOPENSTM32_ETHERNET_H #define LIBOPENSTM32_ETHERNET_H -#include +#include #include /* Ethernet MAC registers */ diff --git a/include/libopenstm32/exti.h b/include/stm32/exti.h similarity index 98% rename from include/libopenstm32/exti.h rename to include/stm32/exti.h index db84cac9..cf291b0c 100644 --- a/include/libopenstm32/exti.h +++ b/include/stm32/exti.h @@ -20,7 +20,7 @@ #ifndef LIBOPENSTM32_EXTI_H #define LIBOPENSTM32_EXTI_H -#include +#include #include /* --- EXTI registers ------------------------------------------------------ */ diff --git a/include/libopenstm32/flash.h b/include/stm32/flash.h similarity index 99% rename from include/libopenstm32/flash.h rename to include/stm32/flash.h index 66dac338..a864858d 100644 --- a/include/libopenstm32/flash.h +++ b/include/stm32/flash.h @@ -28,7 +28,7 @@ #ifndef LIBOPENSTM32_FLASH_H #define LIBOPENSTM32_FLASH_H -#include +#include #include /* --- FLASH registers ----------------------------------------------------- */ diff --git a/include/libopenstm32/gpio.h b/include/stm32/gpio.h similarity index 99% rename from include/libopenstm32/gpio.h rename to include/stm32/gpio.h index e0ef4a8b..049cfded 100644 --- a/include/libopenstm32/gpio.h +++ b/include/stm32/gpio.h @@ -20,7 +20,7 @@ #ifndef LIBOPENSTM32_GPIO_H #define LIBOPENSTM32_GPIO_H -#include +#include #include /* --- Convenience macros -------------------------------------------------- */ diff --git a/include/libopenstm32/i2c.h b/include/stm32/i2c.h similarity index 99% rename from include/libopenstm32/i2c.h rename to include/stm32/i2c.h index e9722e5e..99fbc8b4 100644 --- a/include/libopenstm32/i2c.h +++ b/include/stm32/i2c.h @@ -20,7 +20,7 @@ #ifndef LIBOPENSTM32_I2C_H #define LIBOPENSTM32_I2C_H -#include +#include #include /* --- Convenience macros -------------------------------------------------- */ diff --git a/include/libopenstm32/iwdg.h b/include/stm32/iwdg.h similarity index 98% rename from include/libopenstm32/iwdg.h rename to include/stm32/iwdg.h index 3435aea3..abcdb28d 100644 --- a/include/libopenstm32/iwdg.h +++ b/include/stm32/iwdg.h @@ -20,7 +20,7 @@ #ifndef LIBOPENSTM32_IWDG_H #define LIBOPENSTM32_IWDG_H -#include +#include #include /* --- IWDG registers ------------------------------------------------------ */ diff --git a/include/libopenstm32/memorymap.h b/include/stm32/memorymap.h similarity index 100% rename from include/libopenstm32/memorymap.h rename to include/stm32/memorymap.h diff --git a/include/libopenstm32/nvic.h b/include/stm32/nvic.h similarity index 99% rename from include/libopenstm32/nvic.h rename to include/stm32/nvic.h index a0ccb98c..52b86710 100644 --- a/include/libopenstm32/nvic.h +++ b/include/stm32/nvic.h @@ -20,7 +20,7 @@ #ifndef LIBOPENSTM32_NVIC_H #define LIBOPENSTM32_NVIC_H -#include +#include #include /* --- NVIC Registers ------------------------------------------------------ */ diff --git a/include/libopenstm32/pwr.h b/include/stm32/pwr.h similarity index 98% rename from include/libopenstm32/pwr.h rename to include/stm32/pwr.h index ba5a5b6c..1c0202ce 100644 --- a/include/libopenstm32/pwr.h +++ b/include/stm32/pwr.h @@ -20,7 +20,7 @@ #ifndef LIBOPENSTM32_PWR_H #define LIBOPENSTM32_PWR_H -#include +#include #include /* --- PWR registers ------------------------------------------------------- */ diff --git a/include/libopenstm32/rcc.h b/include/stm32/rcc.h similarity index 99% rename from include/libopenstm32/rcc.h rename to include/stm32/rcc.h index cc0244dc..a89ed0b1 100644 --- a/include/libopenstm32/rcc.h +++ b/include/stm32/rcc.h @@ -21,7 +21,7 @@ #ifndef LIBOPENSTM32_RCC_H #define LIBOPENSTM32_RCC_H -#include +#include #include /* Note: Regs/bits marked (**) only exist in "connectivity line" STM32s. */ diff --git a/include/libopenstm32/rtc.h b/include/stm32/rtc.h similarity index 98% rename from include/libopenstm32/rtc.h rename to include/stm32/rtc.h index 76fc16ed..dcb2f038 100644 --- a/include/libopenstm32/rtc.h +++ b/include/stm32/rtc.h @@ -20,9 +20,9 @@ #ifndef LIBOPENSTM32_RTC_H #define LIBOPENSTM32_RTC_H -#include +#include #include -#include +#include /* --- RTC registers ------------------------------------------------------- */ diff --git a/include/libopenstm32/scb.h b/include/stm32/scb.h similarity index 99% rename from include/libopenstm32/scb.h rename to include/stm32/scb.h index ef6eb8a2..03f6046f 100644 --- a/include/libopenstm32/scb.h +++ b/include/stm32/scb.h @@ -21,7 +21,7 @@ #ifndef LIBOPENSTM32_SCB_H #define LIBOPENSTM32_SCB_H -#include +#include #include /* --- SCB: Registers ------------------------------------------------------ */ diff --git a/include/libopenstm32/spi.h b/include/stm32/spi.h similarity index 99% rename from include/libopenstm32/spi.h rename to include/stm32/spi.h index 71026d17..ca21431d 100644 --- a/include/libopenstm32/spi.h +++ b/include/stm32/spi.h @@ -20,7 +20,7 @@ #ifndef LIBOPENSTM32_SPI_H #define LIBOPENSTM32_SPI_H -#include +#include #include /* Registers can be accessed as 16bit or 32bit values. */ diff --git a/include/libopenstm32/systick.h b/include/stm32/systick.h similarity index 98% rename from include/libopenstm32/systick.h rename to include/stm32/systick.h index 420c57cf..dc18058a 100644 --- a/include/libopenstm32/systick.h +++ b/include/stm32/systick.h @@ -20,7 +20,7 @@ #ifndef LIBOPENSTM32_SYSTICK_H #define LIBOPENSTM32_SYSTICK_H -#include +#include #include /* --- SYSTICK registers --------------------------------------------------- */ diff --git a/include/libopenstm32/timer.h b/include/stm32/timer.h similarity index 99% rename from include/libopenstm32/timer.h rename to include/stm32/timer.h index 5a21b027..b5d335a4 100644 --- a/include/libopenstm32/timer.h +++ b/include/stm32/timer.h @@ -20,7 +20,7 @@ #ifndef LIBOPENSTM32_TIMER_H #define LIBOPENSTM32_TIMER_H -#include +#include #include /* --- Convenience macros -------------------------------------------------- */ diff --git a/include/libopenstm32/tools.h b/include/stm32/tools.h similarity index 100% rename from include/libopenstm32/tools.h rename to include/stm32/tools.h diff --git a/include/libopenstm32/usart.h b/include/stm32/usart.h similarity index 99% rename from include/libopenstm32/usart.h rename to include/stm32/usart.h index eb820188..9b2a50bd 100644 --- a/include/libopenstm32/usart.h +++ b/include/stm32/usart.h @@ -20,7 +20,7 @@ #ifndef LIBOPENSTM32_USART_H #define LIBOPENSTM32_USART_H -#include +#include #include /* --- Convenience macros -------------------------------------------------- */ diff --git a/include/libopenstm32/usb.h b/include/stm32/usb.h similarity index 99% rename from include/libopenstm32/usb.h rename to include/stm32/usb.h index 00815d86..5e79ba40 100644 --- a/include/libopenstm32/usb.h +++ b/include/stm32/usb.h @@ -20,9 +20,9 @@ #ifndef LIBOPENSTM32_USB_H #define LIBOPENSTM32_USB_H -#include +#include #include -#include +#include /* --- USB base addresses -------------------------------------------------- */ diff --git a/include/libopenstm32/usb_desc.h b/include/stm32/usb_desc.h similarity index 100% rename from include/libopenstm32/usb_desc.h rename to include/stm32/usb_desc.h diff --git a/include/libopenstm32/wwdg.h b/include/stm32/wwdg.h similarity index 98% rename from include/libopenstm32/wwdg.h rename to include/stm32/wwdg.h index 87d80064..46177632 100644 --- a/include/libopenstm32/wwdg.h +++ b/include/stm32/wwdg.h @@ -20,7 +20,7 @@ #ifndef LIBOPENSTM32_WWDG_H #define LIBOPENSTM32_WWDG_H -#include +#include #include /* --- WWDG registers ------------------------------------------------------ */ diff --git a/lib/stm32/adc.c b/lib/stm32/adc.c index 240c3f66..08670142 100644 --- a/lib/stm32/adc.c +++ b/lib/stm32/adc.c @@ -31,7 +31,7 @@ * reg16 = adc_read(ADC1, ADC_CH_0); */ -#include +#include void rcc_set_adc_clk(u32 prescaler) { diff --git a/lib/stm32/can.c b/lib/stm32/can.c index baddab34..879ece89 100644 --- a/lib/stm32/can.c +++ b/lib/stm32/can.c @@ -17,8 +17,8 @@ * along with this program. If not, see . */ -#include -#include +#include +#include void can_reset(u32 canport) { diff --git a/lib/stm32/dma.c b/lib/stm32/dma.c index 71df580c..51815909 100644 --- a/lib/stm32/dma.c +++ b/lib/stm32/dma.c @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include +#include void dma_enable_mem2mem_mode(u32 dma, u8 channel) { diff --git a/lib/stm32/ethernet.c b/lib/stm32/ethernet.c index c1abd030..1df41413 100644 --- a/lib/stm32/ethernet.c +++ b/lib/stm32/ethernet.c @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include +#include void eth_smi_write(u8 phy, u8 reg, u16 data) { diff --git a/lib/stm32/exti.c b/lib/stm32/exti.c index df7f4cba..7bbdec95 100644 --- a/lib/stm32/exti.c +++ b/lib/stm32/exti.c @@ -17,8 +17,8 @@ * along with this program. If not, see . */ -#include -#include +#include +#include void exti_set_trigger(u32 extis, exti_trigger_type trig) { diff --git a/lib/stm32/flash.c b/lib/stm32/flash.c index 085aed4d..42cd7525 100644 --- a/lib/stm32/flash.c +++ b/lib/stm32/flash.c @@ -18,7 +18,7 @@ * along with this program. If not, see . */ -#include +#include void flash_prefetch_buffer_enable(void) { diff --git a/lib/stm32/gpio.c b/lib/stm32/gpio.c index 747977d1..2fe9a966 100644 --- a/lib/stm32/gpio.c +++ b/lib/stm32/gpio.c @@ -34,7 +34,7 @@ * - GPIO remapping support */ -#include +#include 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 e161b7f3..7cbe0458 100644 --- a/lib/stm32/i2c.c +++ b/lib/stm32/i2c.c @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include +#include void i2c_peripheral_enable(u32 i2c) { diff --git a/lib/stm32/nvic.c b/lib/stm32/nvic.c index 4dffe45c..62935d1f 100644 --- a/lib/stm32/nvic.c +++ b/lib/stm32/nvic.c @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include +#include void nvic_enable_irq(u8 irqn) { diff --git a/lib/stm32/rcc.c b/lib/stm32/rcc.c index dc4dca1a..87a144cf 100644 --- a/lib/stm32/rcc.c +++ b/lib/stm32/rcc.c @@ -19,8 +19,8 @@ * along with this program. If not, see . */ -#include -#include +#include +#include void rcc_osc_ready_int_clear(osc_t osc) { diff --git a/lib/stm32/rtc.c b/lib/stm32/rtc.c index 604177fd..ca12d6a9 100644 --- a/lib/stm32/rtc.c +++ b/lib/stm32/rtc.c @@ -18,9 +18,9 @@ * along with this program. If not, see . */ -#include -#include -#include +#include +#include +#include void rtc_awake_from_off(osc_t clock_source) { diff --git a/lib/stm32/scb.c b/lib/stm32/scb.c index d6744a1d..2dd2185d 100644 --- a/lib/stm32/scb.c +++ b/lib/stm32/scb.c @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include +#include void scb_reset_core(void) { diff --git a/lib/stm32/spi.c b/lib/stm32/spi.c index 0acd3929..8c23b537 100644 --- a/lib/stm32/spi.c +++ b/lib/stm32/spi.c @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include +#include /* * SPI and I2S code. diff --git a/lib/stm32/systick.c b/lib/stm32/systick.c index fad22539..9a8ccac3 100644 --- a/lib/stm32/systick.c +++ b/lib/stm32/systick.c @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include +#include void systick_set_reload(u32 value) { diff --git a/lib/stm32/timer.c b/lib/stm32/timer.c index e0044f7e..9e7f5432 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 +#include 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 6f3905f2..0247f0d7 100644 --- a/lib/stm32/usart.c +++ b/lib/stm32/usart.c @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include +#include void usart_set_baudrate(u32 usart, u32 baud) { diff --git a/lib/usb/usb_f103.c b/lib/usb/usb_f103.c index 14ec14b0..874be3ea 100644 --- a/lib/usb/usb_f103.c +++ b/lib/usb/usb_f103.c @@ -18,8 +18,8 @@ */ #include -#include -#include +#include +#include #include #include "usb_private.h"