jackcartersmith/blackmagic
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Reverted the api of the usart_set_baudrate function to hide the clock rail selection again.

Browse Source
This commit is contained in:
Piotr Esden-Tempski 2011-11-16 18:06:20 -08:00
parent 679f39426f
commit 8af809a12a
2 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/libopencm3/stm32/usart.h
View File

@ -294,7 +294,7 @@
/* --- Function prototypes ------------------------------------------------- */
void usart_set_baudrate(u32 usart, u32 baud, u32 clock);
void usart_set_baudrate(u32 usart, u32 baud);
void usart_set_databits(u32 usart, u32 bits);
void usart_set_stopbits(u32 usart, u32 stopbits);
void usart_set_parity(u32 usart, u32 parity);

32
lib/stm32/usart.c
View File

@ -19,13 +19,33 @@
#include <libopencm3/stm32/usart.h>
void usart_set_baudrate(u32 usart, u32 baud, u32 clock)
{
//u32 clock = rcc_ppre1_frequency;
#if defined(STM32F1)
# include <libopencm3/stm32/f1/rcc.h>
#elif defined(STM32F2)
# include <libopencm3/stm32/f2/rcc.h>
#elif defined(STM32F4)
# include <libopencm3/stm32/f4/rcc.h>
#else
# error "stm32 family not defined."
#endif
//if (usart == USART1) {
// clock = rcc_ppre2_frequency;
//}
void usart_set_baudrate(u32 usart, u32 baud)
{
u32 clock = rcc_ppre1_frequency;
//#ifdef STM32F1
if (usart == USART1) {
clock = rcc_ppre2_frequency;
}
/* This has to be added for F2 when it get's support for USART6 */
/*
#else
if ((usart == USART1) ||
(usart == USART6)) {
clock = rcc_ppre2_frequency;
}
#endif
*/
/* yes it is as simple as that. The reference manual is
* talking about factional calculation but it seems to be only