Rename include/libopenstm32 to include/stm32.

examples/stm32/lisa-m/usb_dfu/usbdfu.c

@@ -18,10 +18,10 @@
  */
 
 #include <string.h>
-#include <libopenstm32/rcc.h>
-#include <libopenstm32/gpio.h>
-#include <libopenstm32/flash.h>
-#include <libopenstm32/scb.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>
 

examples/stm32/lisa-m/usb_hid/usbhid.c

@@ -18,9 +18,9 @@
  */
 
 #include <stdlib.h>
-#include <libopenstm32/rcc.h>
-#include <libopenstm32/gpio.h>
-#include <libopenstm32/systick.h>
+#include <stm32/rcc.h>
+#include <stm32/gpio.h>
+#include <stm32/systick.h>
 #include <usb/usbd.h>
 #include <usb/hid.h>
 
@@ -28,7 +28,7 @@
 #define INCLUDE_DFU_INTERFACE
 
 #ifdef INCLUDE_DFU_INTERFACE
-#include <libopenstm32/scb.h>
+#include <stm32/scb.h>
 #include <usb/dfu.h>
 #endif
 

examples/stm32/mb525/fancyblink/fancyblink.c

@@ -18,8 +18,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopenstm32/rcc.h>
-#include <libopenstm32/gpio.h>
+#include <stm32/rcc.h>
+#include <stm32/gpio.h>
 
 void clock_setup(void)
 {

examples/stm32/mb525/pwmleds/pwmleds.c

@@ -17,9 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopenstm32/rcc.h>
-#include <libopenstm32/gpio.h>
-#include <libopenstm32/timer.h>
+#include <stm32/rcc.h>
+#include <stm32/gpio.h>
+#include <stm32/timer.h>
 
 // #define COMPARE
 // #define MOVING_FADE

examples/stm32/obldc/can/can.c

@@ -18,12 +18,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopenstm32/rcc.h>
-#include <libopenstm32/flash.h>
-#include <libopenstm32/gpio.h>
-#include <libopenstm32/nvic.h>
-#include <libopenstm32/systick.h>
-#include <libopenstm32/can.h>
+#include <stm32/rcc.h>
+#include <stm32/flash.h>
+#include <stm32/gpio.h>
+#include <stm32/nvic.h>
+#include <stm32/systick.h>
+#include <stm32/can.h>
 
 struct can_tx_msg {
 	u32 std_id;

examples/stm32/obldc/led/led.c

@@ -18,8 +18,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopenstm32/rcc.h>
-#include <libopenstm32/gpio.h>
+#include <stm32/rcc.h>
+#include <stm32/gpio.h>
 
 /* Set STM32 to 72 MHz. */
 void clock_setup(void)

examples/stm32/obldc/systick/systick.c

@@ -18,11 +18,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopenstm32/rcc.h>
-#include <libopenstm32/flash.h>
-#include <libopenstm32/gpio.h>
-#include <libopenstm32/nvic.h>
-#include <libopenstm32/systick.h>
+#include <stm32/rcc.h>
+#include <stm32/flash.h>
+#include <stm32/gpio.h>
+#include <stm32/nvic.h>
+#include <stm32/systick.h>
 
 u32 temp32;
 

examples/stm32/obldc/usart/usart.c

@@ -17,9 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopenstm32/rcc.h>
-#include <libopenstm32/gpio.h>
-#include <libopenstm32/usart.h>
+#include <stm32/rcc.h>
+#include <stm32/gpio.h>
+#include <stm32/usart.h>
 
 void clock_setup(void)
 {

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 <libopenstm32/rcc.h>
-#include <libopenstm32/gpio.h>
-#include <libopenstm32/usart.h>
-#include <libopenstm32/nvic.h>
+#include <stm32/rcc.h>
+#include <stm32/gpio.h>
+#include <stm32/usart.h>
+#include <stm32/nvic.h>
 
 void clock_setup(void)
 {

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 <libopenstm32/rcc.h>
-#include <libopenstm32/flash.h>
-#include <libopenstm32/gpio.h>
-#include <libopenstm32/usart.h>
-#include <libopenstm32/adc.h>
+#include <stm32/rcc.h>
+#include <stm32/flash.h>
+#include <stm32/gpio.h>
+#include <stm32/usart.h>
+#include <stm32/adc.h>
 
 void usart_setup(void)
 {

examples/stm32/other/dma_mem2mem/dma.c

@@ -17,11 +17,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopenstm32/rcc.h>
-#include <libopenstm32/flash.h>
-#include <libopenstm32/gpio.h>
-#include <libopenstm32/usart.h>
-#include <libopenstm32/dma.h>
+#include <stm32/rcc.h>
+#include <stm32/flash.h>
+#include <stm32/gpio.h>
+#include <stm32/usart.h>
+#include <stm32/dma.h>
 
 void usart_setup(void)
 {

examples/stm32/other/dogm128/dogm128.h

@@ -21,8 +21,8 @@
 #define DOGM128_H
 
 #include <cm3/common.h>
-#include <libopenstm32/gpio.h>
-#include <libopenstm32/spi.h>
+#include <stm32/gpio.h>
+#include <stm32/spi.h>
 
 /* PB10 GPIO       - ~RESET 
  * PB12 SPI2_NSS   - ~CS1

examples/stm32/other/dogm128/main.c

@@ -17,13 +17,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopenstm32/rcc.h>
-#include <libopenstm32/flash.h>
-#include <libopenstm32/gpio.h>
-#include <libopenstm32/usart.h>
-#include <libopenstm32/timer.h>
-#include <libopenstm32/nvic.h>
-#include <libopenstm32/spi.h>
+#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 "./dogm128.h"
 
 void gpio_setup(void)

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 <libopenstm32/rcc.h>
-#include <libopenstm32/flash.h>
-#include <libopenstm32/gpio.h>
-#include <libopenstm32/usart.h>
-#include <libopenstm32/i2c.h>
+#include <stm32/rcc.h>
+#include <stm32/flash.h>
+#include <stm32/gpio.h>
+#include <stm32/usart.h>
+#include <stm32/i2c.h>
 #include "stts75.h"
 
 void usart_setup(void)

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 <libopenstm32/i2c.h>
+#include <stm32/i2c.h>
 #include "stts75.h"
 
 void stts75_write_config(u32 i2c, u8 sensor)

examples/stm32/other/rtc/rtc.c

@@ -17,12 +17,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopenstm32/rcc.h>
-#include <libopenstm32/gpio.h>
-#include <libopenstm32/usart.h>
-#include <libopenstm32/rtc.h>
-#include <libopenstm32/pwr.h>
-#include <libopenstm32/nvic.h>
+#include <stm32/rcc.h>
+#include <stm32/gpio.h>
+#include <stm32/usart.h>
+#include <stm32/rtc.h>
+#include <stm32/pwr.h>
+#include <stm32/nvic.h>
 
 void clock_setup(void)
 {

examples/stm32/other/systick/systick.c

@@ -17,11 +17,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopenstm32/rcc.h>
-#include <libopenstm32/flash.h>
-#include <libopenstm32/gpio.h>
-#include <libopenstm32/nvic.h>
-#include <libopenstm32/systick.h>
+#include <stm32/rcc.h>
+#include <stm32/flash.h>
+#include <stm32/gpio.h>
+#include <stm32/nvic.h>
+#include <stm32/systick.h>
 
 u32 temp32;
 

examples/stm32/other/timer_interrupt/timer.c

@@ -17,11 +17,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopenstm32/rcc.h>
-#include <libopenstm32/flash.h>
-#include <libopenstm32/gpio.h>
-#include <libopenstm32/timer.h>
-#include <libopenstm32/nvic.h>
+#include <stm32/rcc.h>
+#include <stm32/flash.h>
+#include <stm32/gpio.h>
+#include <stm32/timer.h>
+#include <stm32/nvic.h>
 
 void gpio_setup(void)
 {

examples/stm32/other/usb_cdcacm/cdcacm.c

@@ -18,8 +18,8 @@
  */
 
 #include <stdlib.h>
-#include <libopenstm32/rcc.h>
-#include <libopenstm32/gpio.h>
+#include <stm32/rcc.h>
+#include <stm32/gpio.h>
 #include <usb/usbd.h>
 #include <usb/cdc.h>
 

examples/stm32/other/usb_dfu/usbdfu.c

@@ -18,10 +18,10 @@
  */
 
 #include <string.h>
-#include <libopenstm32/rcc.h>
-#include <libopenstm32/gpio.h>
-#include <libopenstm32/flash.h>
-#include <libopenstm32/scb.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>
 

examples/stm32/other/usb_hid/usbhid.c

@@ -18,9 +18,9 @@
  */
 
 #include <stdlib.h>
-#include <libopenstm32/rcc.h>
-#include <libopenstm32/gpio.h>
-#include <libopenstm32/systick.h>
+#include <stm32/rcc.h>
+#include <stm32/gpio.h>
+#include <stm32/systick.h>
 #include <usb/usbd.h>
 #include <usb/hid.h>
 
@@ -28,7 +28,7 @@
 #define INCLUDE_DFU_INTERFACE
 
 #ifdef INCLUDE_DFU_INTERFACE
-#include <libopenstm32/scb.h>
+#include <stm32/scb.h>
 #include <usb/dfu.h>
 #endif
 

examples/stm32/stm32-h103/fancyblink/fancyblink.c

@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopenstm32/rcc.h>
-#include <libopenstm32/gpio.h>
+#include <stm32/rcc.h>
+#include <stm32/gpio.h>
 
 /* Set STM32 to 72 MHz. */
 void clock_setup(void)

examples/stm32/stm32-h103/miniblink/miniblink.c

@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopenstm32/rcc.h>
-#include <libopenstm32/gpio.h>
+#include <stm32/rcc.h>
+#include <stm32/gpio.h>
 
 void gpio_setup(void)
 {

examples/stm32/stm32-h103/spi/spi.c

@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopenstm32/rcc.h>
-#include <libopenstm32/spi.h>
+#include <stm32/rcc.h>
+#include <stm32/spi.h>
 
 void clock_setup(void)
 {

examples/stm32/stm32-h103/usart/usart.c

@@ -17,9 +17,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopenstm32/rcc.h>
-#include <libopenstm32/gpio.h>
-#include <libopenstm32/usart.h>
+#include <stm32/rcc.h>
+#include <stm32/gpio.h>
+#include <stm32/usart.h>
 
 void clock_setup(void)
 {

examples/stm32/stm32-h103/usb_cdcacm/cdcacm.c

@@ -18,8 +18,8 @@
  */
 
 #include <stdlib.h>
-#include <libopenstm32/rcc.h>
-#include <libopenstm32/gpio.h>
+#include <stm32/rcc.h>
+#include <stm32/gpio.h>
 #include <usb/usbd.h>
 #include <usb/cdc.h>
 

examples/stm32/stm32-h103/usb_dfu/usbdfu.c

@@ -18,10 +18,10 @@
  */
 
 #include <string.h>
-#include <libopenstm32/rcc.h>
-#include <libopenstm32/gpio.h>
-#include <libopenstm32/flash.h>
-#include <libopenstm32/scb.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>
 

examples/stm32/stm32-h103/usb_hid/usbhid.c

@@ -18,9 +18,9 @@
  */
 
 #include <stdlib.h>
-#include <libopenstm32/rcc.h>
-#include <libopenstm32/gpio.h>
-#include <libopenstm32/systick.h>
+#include <stm32/rcc.h>
+#include <stm32/gpio.h>
+#include <stm32/systick.h>
 #include <usb/usbd.h>
 #include <usb/hid.h>
 
@@ -28,7 +28,7 @@
 #define INCLUDE_DFU_INTERFACE
 
 #ifdef INCLUDE_DFU_INTERFACE
-#include <libopenstm32/scb.h>
+#include <stm32/scb.h>
 #include <usb/dfu.h>
 #endif
 

examples/stm32/stm32-h103/usb_iap/usbiap.c

@@ -18,10 +18,10 @@
  */
 
 #include <string.h>
-#include <libopenstm32/rcc.h>
-#include <libopenstm32/gpio.h>
-#include <libopenstm32/flash.h>
-#include <libopenstm32/scb.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/libopenstm32.h

@@ -20,30 +20,30 @@
 #ifndef LIBOPENSTM32_LIBOPENSTM32_H
 #define LIBOPENSTM32_LIBOPENSTM32_H
 
-#include <libopenstm32/tools.h>
+#include <stm32/tools.h>
 #include <cm3/common.h>
-#include <libopenstm32/memorymap.h>
-#include <libopenstm32/rcc.h>
-#include <libopenstm32/gpio.h>
-#include <libopenstm32/usart.h>
-#include <libopenstm32/adc.h>
-#include <libopenstm32/spi.h>
-#include <libopenstm32/timer.h>
-#include <libopenstm32/flash.h>
-#include <libopenstm32/usb.h>
-#include <libopenstm32/usb_desc.h>
-#include <libopenstm32/can.h>
-#include <libopenstm32/nvic.h>
-#include <libopenstm32/rtc.h>
-#include <libopenstm32/i2c.h>
-#include <libopenstm32/dma.h>
-#include <libopenstm32/scb.h>
-#include <libopenstm32/systick.h>
-#include <libopenstm32/iwdg.h>
-#include <libopenstm32/wwdg.h>
-#include <libopenstm32/pwr.h>
-#include <libopenstm32/crc.h>
-#include <libopenstm32/bkp.h>
-#include <libopenstm32/exti.h>
+#include <stm32/memorymap.h>
+#include <stm32/rcc.h>
+#include <stm32/gpio.h>
+#include <stm32/usart.h>
+#include <stm32/adc.h>
+#include <stm32/spi.h>
+#include <stm32/timer.h>
+#include <stm32/flash.h>
+#include <stm32/usb.h>
+#include <stm32/usb_desc.h>
+#include <stm32/can.h>
+#include <stm32/nvic.h>
+#include <stm32/rtc.h>
+#include <stm32/i2c.h>
+#include <stm32/dma.h>
+#include <stm32/scb.h>
+#include <stm32/systick.h>
+#include <stm32/iwdg.h>
+#include <stm32/wwdg.h>
+#include <stm32/pwr.h>
+#include <stm32/crc.h>
+#include <stm32/bkp.h>
+#include <stm32/exti.h>
 
 #endif

include/libopenstm32/adc.h → include/stm32/adc.h

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

include/libopenstm32/bkp.h → include/stm32/bkp.h

@@ -20,7 +20,7 @@
 #ifndef LIBOPENSTM32_BKP_H
 #define LIBOPENSTM32_BKP_H
 
-#include <libopenstm32/memorymap.h>
+#include <stm32/memorymap.h>
 #include <cm3/common.h>
 
 /* --- BKP registers ------------------------------------------------------- */

include/libopenstm32/can.h → include/stm32/can.h

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

include/libopenstm32/crc.h → include/stm32/crc.h

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

include/libopenstm32/dma.h → include/stm32/dma.h

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

include/libopenstm32/ethernet.h → include/stm32/ethernet.h

@@ -20,7 +20,7 @@
 #ifndef LIBOPENSTM32_ETHERNET_H
 #define LIBOPENSTM32_ETHERNET_H
 
-#include <libopenstm32/memorymap.h>
+#include <stm32/memorymap.h>
 #include <cm3/common.h>
 
 /* Ethernet MAC registers */

include/libopenstm32/exti.h → include/stm32/exti.h

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

include/libopenstm32/flash.h → include/stm32/flash.h

@@ -28,7 +28,7 @@
 #ifndef LIBOPENSTM32_FLASH_H
 #define LIBOPENSTM32_FLASH_H
 
-#include <libopenstm32/memorymap.h>
+#include <stm32/memorymap.h>
 #include <cm3/common.h>
 
 /* --- FLASH registers ----------------------------------------------------- */

include/libopenstm32/gpio.h → include/stm32/gpio.h

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

include/libopenstm32/i2c.h → include/stm32/i2c.h

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

include/libopenstm32/iwdg.h → include/stm32/iwdg.h

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

include/libopenstm32/nvic.h → include/stm32/nvic.h

@@ -20,7 +20,7 @@
 #ifndef LIBOPENSTM32_NVIC_H
 #define LIBOPENSTM32_NVIC_H
 
-#include <libopenstm32/memorymap.h>
+#include <stm32/memorymap.h>
 #include <cm3/common.h>
 
 /* --- NVIC Registers ------------------------------------------------------ */

include/libopenstm32/pwr.h → include/stm32/pwr.h

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

include/libopenstm32/rcc.h → include/stm32/rcc.h

@@ -21,7 +21,7 @@
 #ifndef LIBOPENSTM32_RCC_H
 #define LIBOPENSTM32_RCC_H
 
-#include <libopenstm32/memorymap.h>
+#include <stm32/memorymap.h>
 #include <cm3/common.h>
 
 /* Note: Regs/bits marked (**) only exist in "connectivity line" STM32s. */

include/libopenstm32/rtc.h → include/stm32/rtc.h

@@ -20,9 +20,9 @@
 #ifndef LIBOPENSTM32_RTC_H
 #define LIBOPENSTM32_RTC_H
 
-#include <libopenstm32/memorymap.h>
+#include <stm32/memorymap.h>
 #include <cm3/common.h>
-#include <libopenstm32/pwr.h>
+#include <stm32/pwr.h>
 
 /* --- RTC registers ------------------------------------------------------- */
 

include/libopenstm32/scb.h → include/stm32/scb.h

@@ -21,7 +21,7 @@
 #ifndef LIBOPENSTM32_SCB_H
 #define LIBOPENSTM32_SCB_H
 
-#include <libopenstm32/memorymap.h>
+#include <stm32/memorymap.h>
 #include <cm3/common.h>
 
 /* --- SCB: Registers ------------------------------------------------------ */

include/libopenstm32/spi.h → include/stm32/spi.h

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

include/libopenstm32/systick.h → include/stm32/systick.h

@@ -20,7 +20,7 @@
 #ifndef LIBOPENSTM32_SYSTICK_H
 #define LIBOPENSTM32_SYSTICK_H
 
-#include <libopenstm32/memorymap.h>
+#include <stm32/memorymap.h>
 #include <cm3/common.h>
 
 /* --- SYSTICK registers --------------------------------------------------- */

include/libopenstm32/timer.h → include/stm32/timer.h

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

include/libopenstm32/usart.h → include/stm32/usart.h

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

include/libopenstm32/usb.h → include/stm32/usb.h

@@ -20,9 +20,9 @@
 #ifndef LIBOPENSTM32_USB_H
 #define LIBOPENSTM32_USB_H
 
-#include <libopenstm32/memorymap.h>
+#include <stm32/memorymap.h>
 #include <cm3/common.h>
-#include <libopenstm32/tools.h>
+#include <stm32/tools.h>
 
 /* --- USB base addresses -------------------------------------------------- */
 

include/libopenstm32/wwdg.h → include/stm32/wwdg.h

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

lib/stm32/adc.c

@@ -31,7 +31,7 @@
  *  reg16 = adc_read(ADC1, ADC_CH_0);
  */
 
-#include <libopenstm32/adc.h>
+#include <stm32/adc.h>
 
 void rcc_set_adc_clk(u32 prescaler)
 {

lib/stm32/can.c

@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopenstm32/can.h>
-#include <libopenstm32/rcc.h>
+#include <stm32/can.h>
+#include <stm32/rcc.h>
 
 void can_reset(u32 canport)
 {

lib/stm32/dma.c

@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopenstm32/dma.h>
+#include <stm32/dma.h>
 
 void dma_enable_mem2mem_mode(u32 dma, u8 channel)
 {

lib/stm32/ethernet.c

@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopenstm32/ethernet.h>
+#include <stm32/ethernet.h>
 
 void eth_smi_write(u8 phy, u8 reg, u16 data)
 {

lib/stm32/exti.c

@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopenstm32/exti.h>
-#include <libopenstm32/gpio.h>
+#include <stm32/exti.h>
+#include <stm32/gpio.h>
 
 void exti_set_trigger(u32 extis, exti_trigger_type trig)
 {

lib/stm32/flash.c

@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopenstm32/flash.h>
+#include <stm32/flash.h>
 
 void flash_prefetch_buffer_enable(void)
 {

lib/stm32/gpio.c

@@ -34,7 +34,7 @@
  *  - GPIO remapping support
  */
 
-#include <libopenstm32/gpio.h>
+#include <stm32/gpio.h>
 
 void gpio_set_mode(u32 gpioport, u8 mode, u8 cnf, u16 gpios)
 {

lib/stm32/i2c.c

@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopenstm32/i2c.h>
+#include <stm32/i2c.h>
 
 void i2c_peripheral_enable(u32 i2c)
 {

lib/stm32/nvic.c

@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopenstm32/nvic.h>
+#include <stm32/nvic.h>
 
 void nvic_enable_irq(u8 irqn)
 {

lib/stm32/rcc.c

@@ -19,8 +19,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopenstm32/rcc.h>
-#include <libopenstm32/flash.h>
+#include <stm32/rcc.h>
+#include <stm32/flash.h>
 
 void rcc_osc_ready_int_clear(osc_t osc)
 {

lib/stm32/rtc.c

@@ -18,9 +18,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopenstm32/rcc.h>
-#include <libopenstm32/rtc.h>
-#include <libopenstm32/pwr.h>
+#include <stm32/rcc.h>
+#include <stm32/rtc.h>
+#include <stm32/pwr.h>
 
 void rtc_awake_from_off(osc_t clock_source)
 {

lib/stm32/scb.c

@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopenstm32/scb.h>
+#include <stm32/scb.h>
 
 void scb_reset_core(void)
 {

lib/stm32/spi.c

@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopenstm32/spi.h>
+#include <stm32/spi.h>
 
 /*
  * SPI and I2S code.

lib/stm32/systick.c

@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopenstm32/systick.h>
+#include <stm32/systick.h>
 
 void systick_set_reload(u32 value)
 {

lib/stm32/timer.c

@@ -25,7 +25,7 @@
  *                 TIM_CR1_CMS_CENTRE_3, TIM_CR1_DIR_UP);
  */
 
-#include <libopenstm32/timer.h>
+#include <stm32/timer.h>
 
 void timer_set_mode(u32 timer_peripheral, u8 clock_div, u8 alignment,
 		    u8 direction)

lib/stm32/usart.c

@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopenstm32/usart.h>
+#include <stm32/usart.h>
 
 void usart_set_baudrate(u32 usart, u32 baud)
 {

lib/usb/usb_f103.c

@@ -18,8 +18,8 @@
  */
 
 #include <cm3/common.h>
-#include <libopenstm32/tools.h>
-#include <libopenstm32/usb.h>
+#include <stm32/tools.h>
+#include <stm32/usb.h>
 #include <usb/usbd.h>
 #include "usb_private.h"