From efb510f526c9f6c103d378d9e781c3fca6060c95 Mon Sep 17 00:00:00 2001 From: Piotr Esden-Tempski Date: Mon, 22 Feb 2010 10:01:55 +0100 Subject: [PATCH] Modified include model of some files. This model allows using libopenstm32 in parallel with other stm32 firmware libraries. It is not yet complete change to all code but a start. Only changed parts that I tested. --- include/libopenstm32/common.h | 1 - include/libopenstm32/gpio.h | 3 ++- include/libopenstm32/rcc.h | 3 ++- include/libopenstm32/timer.h | 3 ++- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/include/libopenstm32/common.h b/include/libopenstm32/common.h index 72fa826e..fc06dd9b 100644 --- a/include/libopenstm32/common.h +++ b/include/libopenstm32/common.h @@ -21,7 +21,6 @@ #define LIBOPENSTM32_COMMON_H #include -#include /* Type definitions for shorter and nicer code */ typedef int8_t s8; diff --git a/include/libopenstm32/gpio.h b/include/libopenstm32/gpio.h index 257103e9..b8b7eb53 100644 --- a/include/libopenstm32/gpio.h +++ b/include/libopenstm32/gpio.h @@ -20,7 +20,8 @@ #ifndef LIBOPENSTM32_GPIO_H #define LIBOPENSTM32_GPIO_H -#include +#include +#include /* --- Convenience macros -------------------------------------------------- */ diff --git a/include/libopenstm32/rcc.h b/include/libopenstm32/rcc.h index 0ea7de57..2d9c2a00 100644 --- a/include/libopenstm32/rcc.h +++ b/include/libopenstm32/rcc.h @@ -21,7 +21,8 @@ #ifndef LIBOPENSTM32_RCC_H #define LIBOPENSTM32_RCC_H -#include +#include +#include /* 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/libopenstm32/timer.h b/include/libopenstm32/timer.h index 0249bc47..8434d3da 100644 --- a/include/libopenstm32/timer.h +++ b/include/libopenstm32/timer.h @@ -20,7 +20,8 @@ #ifndef LIBOPENSTM32_TIMER_H #define LIBOPENSTM32_TIMER_H -#include +#include +#include /* --- Convenience macros -------------------------------------------------- */