From 80fd23580aa9916193bc12de241d7d589a8d6c92 Mon Sep 17 00:00:00 2001 From: Piotr Esden-Tempski Date: Tue, 26 Feb 2013 17:14:31 -0800 Subject: Fix all warnings for stm32f1 lib. --- include/libopencm3/stm32/common/usart_common_all.h | 2 ++ include/libopencm3/stm32/f1/ethernet.h | 7 +++++++ include/libopencm3/stm32/f1/rcc.h | 6 +++++- include/libopencm3/stm32/timer.h | 2 +- 4 files changed, 15 insertions(+), 2 deletions(-) (limited to 'include/libopencm3') diff --git a/include/libopencm3/stm32/common/usart_common_all.h b/include/libopencm3/stm32/common/usart_common_all.h index 1334420..553ba28 100644 --- a/include/libopencm3/stm32/common/usart_common_all.h +++ b/include/libopencm3/stm32/common/usart_common_all.h @@ -359,6 +359,8 @@ void usart_enable_rx_interrupt(u32 usart); void usart_disable_rx_interrupt(u32 usart); void usart_enable_tx_interrupt(u32 usart); void usart_disable_tx_interrupt(u32 usart); +void usart_enable_error_interrupt(u32 usart); +void usart_disable_error_interrupt(u32 usart); bool usart_get_flag(u32 usart, u32 flag); bool usart_get_interrupt_source(u32 usart, u32 flag); diff --git a/include/libopencm3/stm32/f1/ethernet.h b/include/libopencm3/stm32/f1/ethernet.h index 08edd84..7fa437f 100644 --- a/include/libopencm3/stm32/f1/ethernet.h +++ b/include/libopencm3/stm32/f1/ethernet.h @@ -200,4 +200,11 @@ #define ETH_DMAIER_AISE 0x00008000 #define ETH_DMAIER_NSIE 0x00010000 +BEGIN_DECLS + +void eth_smi_write(u8 phy, u8 reg, u16 data); +u16 eth_smi_read(u8 phy, u8 reg); + +END_DECLS + #endif diff --git a/include/libopencm3/stm32/f1/rcc.h b/include/libopencm3/stm32/f1/rcc.h index 868ad9c..01c9346 100644 --- a/include/libopencm3/stm32/f1/rcc.h +++ b/include/libopencm3/stm32/f1/rcc.h @@ -517,6 +517,7 @@ void rcc_peripheral_clear_reset(volatile u32 *reg, u32 clear_reset); void rcc_set_sysclk_source(u32 clk); void rcc_set_pll_multiplication_factor(u32 mul); void rcc_set_pll2_multiplication_factor(u32 mul); +void rcc_set_pll3_multiplication_factor(u32 mul); void rcc_set_pll_source(u32 pllsrc); void rcc_set_pllxtpre(u32 pllxtpre); void rcc_set_adcpre(u32 adcpre); @@ -524,7 +525,10 @@ void rcc_set_ppre2(u32 ppre2); void rcc_set_ppre1(u32 ppre1); void rcc_set_hpre(u32 hpre); void rcc_set_usbpre(u32 usbpre); -u32 rcc_get_system_clock_source(int i); +void rcc_set_prediv1(u32 prediv); +void rcc_set_prediv2(u32 prediv); +void rcc_set_prediv1_source(u32 rccsrc); +u32 rcc_system_clock_source(void); void rcc_clock_setup_in_hsi_out_64mhz(void); void rcc_clock_setup_in_hsi_out_48mhz(void); void rcc_clock_setup_in_hsi_out_24mhz(void); diff --git a/include/libopencm3/stm32/timer.h b/include/libopencm3/stm32/timer.h index 4977674..3803bd2 100644 --- a/include/libopencm3/stm32/timer.h +++ b/include/libopencm3/stm32/timer.h @@ -1028,7 +1028,7 @@ BEGIN_DECLS void timer_reset(u32 timer_peripheral); void timer_enable_irq(u32 timer_peripheral, u32 irq); void timer_disable_irq(u32 timer_peripheral, u32 irq); -bool timer_return_interrupt_source(u32 timer_peripheral, u32 flag); +bool timer_interrupt_source(u32 timer_peripheral, u32 flag); bool timer_get_flag(u32 timer_peripheral, u32 flag); void timer_clear_flag(u32 timer_peripheral, u32 flag); void timer_set_mode(u32 timer_peripheral, u32 clock_div, -- cgit v1.2.3