From ce7dd46aef9153c4f98a983977ce7bd2a905134d Mon Sep 17 00:00:00 2001 From: Fergus Noble Date: Thu, 15 Sep 2011 01:18:49 -0700 Subject: Update F1 libs with new header file locations. --- lib/stm32f1/adc.c | 2 +- lib/stm32f1/can.c | 2 +- lib/stm32f1/dma.c | 2 +- lib/stm32f1/ethernet.c | 2 +- lib/stm32f1/exti.c | 2 +- lib/stm32f1/flash.c | 2 +- lib/stm32f1/gpio.c | 2 +- lib/stm32f1/nvic.c | 2 +- lib/stm32f1/rcc.c | 4 ++-- lib/stm32f1/rtc.c | 4 ++-- lib/stm32f1/systick.c | 2 +- lib/stm32f1/timer.c | 2 +- lib/stm32f1/usart.c | 2 +- lib/stm32f2/gpio.c | 10 +++++----- 14 files changed, 20 insertions(+), 20 deletions(-) (limited to 'lib') diff --git a/lib/stm32f1/adc.c b/lib/stm32f1/adc.c index 058837c..31e4cbf 100644 --- a/lib/stm32f1/adc.c +++ b/lib/stm32f1/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/stm32f1/can.c b/lib/stm32f1/can.c index e571f8a..8c5d7ec 100644 --- a/lib/stm32f1/can.c +++ b/lib/stm32f1/can.c @@ -18,7 +18,7 @@ */ #include -#include +#include void can_reset(u32 canport) { diff --git a/lib/stm32f1/dma.c b/lib/stm32f1/dma.c index 8feb2c9..4f0af6f 100644 --- a/lib/stm32f1/dma.c +++ b/lib/stm32f1/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/stm32f1/ethernet.c b/lib/stm32f1/ethernet.c index 4a4d080..fc65ec2 100644 --- a/lib/stm32f1/ethernet.c +++ b/lib/stm32f1/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/stm32f1/exti.c b/lib/stm32f1/exti.c index de037e7..969cae4 100644 --- a/lib/stm32f1/exti.c +++ b/lib/stm32f1/exti.c @@ -18,7 +18,7 @@ */ #include -#include +#include void exti_set_trigger(u32 extis, exti_trigger_type trig) { diff --git a/lib/stm32f1/flash.c b/lib/stm32f1/flash.c index 98f7777..b8b3d52 100644 --- a/lib/stm32f1/flash.c +++ b/lib/stm32f1/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/stm32f1/gpio.c b/lib/stm32f1/gpio.c index 52c0c66..cd6be9b 100644 --- a/lib/stm32f1/gpio.c +++ b/lib/stm32f1/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/stm32f1/nvic.c b/lib/stm32f1/nvic.c index cf77cc3..f45b601 100644 --- a/lib/stm32f1/nvic.c +++ b/lib/stm32f1/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/stm32f1/rcc.c b/lib/stm32f1/rcc.c index f646168..689cabb 100644 --- a/lib/stm32f1/rcc.c +++ b/lib/stm32f1/rcc.c @@ -19,8 +19,8 @@ * along with this program. If not, see . */ -#include -#include +#include +#include /* Set the default ppre1 and ppre2 peripheral clock frequencies after reset */ u32 rcc_ppre1_frequency = 8000000; diff --git a/lib/stm32f1/rtc.c b/lib/stm32f1/rtc.c index 4495641..c187be9 100644 --- a/lib/stm32f1/rtc.c +++ b/lib/stm32f1/rtc.c @@ -18,8 +18,8 @@ * along with this program. If not, see . */ -#include -#include +#include +#include #include void rtc_awake_from_off(osc_t clock_source) diff --git a/lib/stm32f1/systick.c b/lib/stm32f1/systick.c index 882601d..3308413 100644 --- a/lib/stm32f1/systick.c +++ b/lib/stm32f1/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/stm32f1/timer.c b/lib/stm32f1/timer.c index 32e240d..a61f67f 100644 --- a/lib/stm32f1/timer.c +++ b/lib/stm32f1/timer.c @@ -26,7 +26,7 @@ */ #include -#include +#include void timer_reset(u32 timer_peripheral) { diff --git a/lib/stm32f1/usart.c b/lib/stm32f1/usart.c index ead0ef7..73e450b 100644 --- a/lib/stm32f1/usart.c +++ b/lib/stm32f1/usart.c @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include +#include #include diff --git a/lib/stm32f2/gpio.c b/lib/stm32f2/gpio.c index f2ea55a..2330628 100644 --- a/lib/stm32f2/gpio.c +++ b/lib/stm32f2/gpio.c @@ -77,9 +77,9 @@ void gpio_set_output_options(u32 gpioport, u8 otype, u8 speed, u16 gpios) for (i = 0; i < 16; i++) { if (!((1 << i) & gpios)) - continue - ospeedr &= ~GPIO_OSPEEDR_MASK(i); - ospeedr |= GPIO_OSPEEDR(i, mode); + continue; + ospeedr &= ~GPIO_OSPEED_MASK(i); + ospeedr |= GPIO_OSPEED(i, speed); } GPIO_OSPEEDR(gpioport) = ospeedr; @@ -95,14 +95,14 @@ void gpio_set_af(u32 gpioport, u8 alt_func_num, u16 gpios) for (i = 0; i < 8; i++) { if (!((1 << i) & gpios)) - continue + continue; afrl &= GPIO_AFR_MASK(i); afrl |= GPIO_AFR(i, alt_func_num); } for (i = 8; i < 16; i++) { if (!((1 << i) & gpios)) - continue + continue; afrl &= GPIO_AFR_MASK(i-8); afrh |= GPIO_AFR(i-8, alt_func_num); } -- cgit v1.2.3