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

lpc43xx/uart: Fix code style

Browse Source
This commit is contained in:
Ben Gamari 2013-07-02 07:54:13 -04:00 committed by Piotr Esden-Tempski
parent fa47bb80d5
commit 8eb5fba93b
1 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lib/lpc43xx/uart.c
View File

@ -88,8 +88,7 @@ void uart_init(uart_num_t uart_num,
UART_FCR(uart_port) = 0; UART_FCR(uart_port) = 0;
// Dummy read (to clear existing data) // Dummy read (to clear existing data)
while( UART_LSR(uart_port) & UART_LSR_RDR ) while (UART_LSR(uart_port) & UART_LSR_RDR ) {
{
dummy_read = UART_RBR(uart_port); dummy_read = UART_RBR(uart_port);
} }
@ -158,18 +157,14 @@ uart_rx_data_ready_t uart_rx_data_ready(uart_num_t uart_num)
uart_status = UART_LSR(uart_port) & 0xFF; uart_status = UART_LSR(uart_port) & 0xFF;
/* Check Error */ /* Check Error */
if( (uart_status & UART_LSR_ERROR_MASK) == 0) if ((uart_status & UART_LSR_ERROR_MASK) == 0) {
{
/* No errors check if data is ready */ /* No errors check if data is ready */
if((uart_status & UART_LSR_RDR) == 0) if ((uart_status & UART_LSR_RDR) == 0) {
{
data_ready = UART_RX_NO_DATA; data_ready = UART_RX_NO_DATA;
}else } else {
{
data_ready = UART_RX_DATA_READY; data_ready = UART_RX_DATA_READY;
} }
}else } else {
{
/* UART Error */ /* UART Error */
data_ready = UART_RX_DATA_ERROR; data_ready = UART_RX_DATA_ERROR;
} }
@ -188,7 +183,7 @@ uint8_t uart_read(uart_num_t uart_num)
uart_port = uart_num; uart_port = uart_num;
/* Wait Until Data Received (Rx Data Not Ready) */ /* Wait Until Data Received (Rx Data Not Ready) */
while( (UART_LSR(uart_port) & UART_LSR_RDR) == 0); while ((UART_LSR(uart_port) & UART_LSR_RDR) == 0);
uart_val = (UART_RBR(uart_port) & UART_RBR_MASKBIT); uart_val = (UART_RBR(uart_port) & UART_RBR_MASKBIT);
@ -208,13 +203,11 @@ uint8_t uart_read_timeout(uart_num_t uart_num, uint32_t rx_timeout_nb_cycles, ua
/* Wait Until Data Received (Rx Data Not Ready) */ /* Wait Until Data Received (Rx Data Not Ready) */
counter = 0; counter = 0;
while( (UART_LSR(uart_port) & UART_LSR_RDR) == 0) while ((UART_LSR(uart_port) & UART_LSR_RDR) == 0)
{ {
if(rx_timeout_nb_cycles>0) if (rx_timeout_nb_cycles>0) {
{
counter++; counter++;
if(counter>=rx_timeout_nb_cycles) if (counter>=rx_timeout_nb_cycles) {
{
*error = UART_TIMEOUT_ERROR; *error = UART_TIMEOUT_ERROR;
return 0; return 0;
} }
@ -239,7 +232,7 @@ void uart_write(uart_num_t uart_num, uint8_t data)
uart_port = uart_num; uart_port = uart_num;
/* Wait Until FIFO not full */ /* Wait Until FIFO not full */
while( (UART_LSR(uart_port) & UART_LSR_THRE) == 0); while ((UART_LSR(uart_port) & UART_LSR_THRE) == 0);
UART_THR(uart_port) = data; UART_THR(uart_port) = data;
} }