EMTime/libopencm3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added USART_ prefix to bit definitions.

Browse Source 
This matches the new convention used throughout libopenstm32.
This commit is contained in:
Piotr Esden-Tempski
2010-01-15 00:03:29 +01:00
parent afc9cc84de
commit 667f32bd45
3 changed files with 66 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/usart.c
View File

@@ -30,9 +30,9 @@ void usart_set_baudrate(u32 usart, u32 baud)
void usart_set_databits(u32 usart, u32 bits)
{
if (bits == 8)
USART_CR1(usart) &= ~CR1_M; /* 8 data bits */
USART_CR1(usart) &= ~USART_CR1_M; /* 8 data bits */
else
USART_CR1(usart) |= CR1_M; /* 9 data bits */
USART_CR1(usart) |= USART_CR1_M; /* 9 data bits */
}
void usart_set_stopbits(u32 usart, u32 stopbits)
@@ -73,12 +73,12 @@ void usart_set_flow_control(u32 usart, u32 flowcontrol)
void usart_enable(u32 usart)
{
USART_CR1(usart) |= CR1_UE;
USART_CR1(usart) |= USART_CR1_UE;
}
void usart_disable(u32 usart)
{
USART_CR1(usart) &= ~CR1_UE;
USART_CR1(usart) &= ~USART_CR1_UE;
}
void usart_send(u32 usart, u16 data)
@@ -87,13 +87,13 @@ void usart_send(u32 usart, u16 data)
USART_DR(usart) = (data & 0x1ff);
/* Wait until the data has been transferred into the shift register. */
while ((USART_SR(usart) & SR_TXE) == 0);
while ((USART_SR(usart) & USART_SR_TXE) == 0);
}
u16 usart_recv(u32 usart)
{
/* Wait until the data is ready to be received. */
while ((USART_SR(usart) & SR_RXNE) == 0);
while ((USART_SR(usart) & USART_SR_RXNE) == 0);
/* Receive data. */
return USART_DR(usart) & 0x1ff;