Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cpu/cc2538: avoid using bitfields with the LCRH register #2753

Merged
merged 1 commit into from
Mar 2, 2016
Merged

cpu/cc2538: avoid using bitfields with the LCRH register #2753

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 14 additions & 8 deletions cpu/cc2538/periph/uart.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@
#undef BIT
#define BIT(n) ( 1 << (n) )

#define UART_WORD_LENGTH 8

enum {
FIFO_LEVEL_1_8TH = 0,
FIFO_LEVEL_2_8TH = 1,
Expand All @@ -40,6 +38,17 @@ enum {
FIFO_LEVEL_7_8TH = 4,
};

/* Valid word lengths for the LCRHbits.WLEN bit field: */
enum {
WLEN_5_BITS = 0,
WLEN_6_BITS = 1,
WLEN_7_BITS = 2,
WLEN_8_BITS = 3,
};

/* Bit field definitions for the UART Line Control Register: */
#define FEN BIT( 4) /**< Enable FIFOs */

/* Bit masks for the UART Masked Interrupt Status (MIS) Register: */
#define OEMIS BIT(10) /**< UART overrun error masked status */
#define BEMIS BIT( 9) /**< UART break error masked status */
Expand Down Expand Up @@ -87,10 +96,10 @@ static void reset(cc2538_uart_t *u)
u->cc2538_uart_dr.ECR = 0xFF;

/* Flush FIFOs by clearing LCHR.FEN */
u->cc2538_uart_lcrh.LCRHbits.FEN = 0;
u->cc2538_uart_lcrh.LCRH &= ~FEN;

/* Restore LCHR configuration */
u->cc2538_uart_lcrh.LCRHbits.FEN = 1;
u->cc2538_uart_lcrh.LCRH |= FEN;

/* UART Enable */
u->cc2538_uart_ctl.CTLbits.UARTEN = 1;
Expand Down Expand Up @@ -303,10 +312,7 @@ static int init_base(uart_t uart, uint32_t baudrate)
u->FBRD = divisor & DIVFRAC_MASK;

/* Configure line control for 8-bit, no parity, 1 stop bit and enable */
u->cc2538_uart_lcrh.LCRH = 0;
u->cc2538_uart_lcrh.LCRHbits.WLEN = UART_WORD_LENGTH - 5;
u->cc2538_uart_lcrh.LCRHbits.FEN = 1; /**< Enable FIFOs */
u->cc2538_uart_lcrh.LCRHbits.PEN = 0; /**< No parity */
u->cc2538_uart_lcrh.LCRH = (WLEN_8_BITS << 5) | FEN;

/* UART Enable */
u->cc2538_uart_ctl.CTLbits.UARTEN = 1;
Expand Down