diff options
| -rw-r--r-- | drivers/serial/ns16550.c | 37 | ||||
| -rw-r--r-- | include/ns16550.h | 16 |
2 files changed, 28 insertions, 25 deletions
diff --git a/drivers/serial/ns16550.c b/drivers/serial/ns16550.c index 0174744df..056c25d58 100644 --- a/drivers/serial/ns16550.c +++ b/drivers/serial/ns16550.c @@ -17,24 +17,24 @@ UART_FCR_RXSR | \ UART_FCR_TXSR) /* Clear & enable FIFOs */ #ifdef CONFIG_SYS_NS16550_PORT_MAPPED -#define serial_out(x,y) outb(x,(ulong)y) -#define serial_in(y) inb((ulong)y) +#define serial_out(x, y) outb(x, (ulong)y) +#define serial_in(y) inb((ulong)y) #elif defined(CONFIG_SYS_NS16550_MEM32) && (CONFIG_SYS_NS16550_REG_SIZE > 0) -#define serial_out(x,y) out_be32(y,x) -#define serial_in(y) in_be32(y) +#define serial_out(x, y) out_be32(y, x) +#define serial_in(y) in_be32(y) #elif defined(CONFIG_SYS_NS16550_MEM32) && (CONFIG_SYS_NS16550_REG_SIZE < 0) -#define serial_out(x,y) out_le32(y,x) -#define serial_in(y) in_le32(y) +#define serial_out(x, y) out_le32(y, x) +#define serial_in(y) in_le32(y) #else -#define serial_out(x,y) writeb(x,y) -#define serial_in(y) readb(y) +#define serial_out(x, y) writeb(x, y) +#define serial_in(y) readb(y) #endif #ifndef CONFIG_SYS_NS16550_IER #define CONFIG_SYS_NS16550_IER 0x00 #endif /* CONFIG_SYS_NS16550_IER */ -void NS16550_init (NS16550_t com_port, int baud_divisor) +void NS16550_init(NS16550_t com_port, int baud_divisor) { serial_out(CONFIG_SYS_NS16550_IER, &com_port->ier); #if defined(CONFIG_OMAP) && !defined(CONFIG_OMAP3_ZOOM2) @@ -52,15 +52,17 @@ void NS16550_init (NS16550_t com_port, int baud_divisor) serial_out(UART_LCRVAL, &com_port->lcr); #if defined(CONFIG_OMAP) && !defined(CONFIG_OMAP3_ZOOM2) #if defined(CONFIG_APTIX) - serial_out(3, &com_port->mdr1); /* /13 mode so Aptix 6MHz can hit 115200 */ + /* /13 mode so Aptix 6MHz can hit 115200 */ + serial_out(3, &com_port->mdr1); #else - serial_out(0, &com_port->mdr1); /* /16 is proper to hit 115200 with 48MHz */ + /* /16 is proper to hit 115200 with 48MHz */ + serial_out(0, &com_port->mdr1); #endif #endif /* CONFIG_OMAP */ } #ifndef CONFIG_NS16550_MIN_FUNCTIONS -void NS16550_reinit (NS16550_t com_port, int baud_divisor) +void NS16550_reinit(NS16550_t com_port, int baud_divisor) { serial_out(CONFIG_SYS_NS16550_IER, &com_port->ier); serial_out(UART_LCR_BKSE | UART_LCRVAL, &com_port->lcr); @@ -76,9 +78,10 @@ void NS16550_reinit (NS16550_t com_port, int baud_divisor) } #endif /* CONFIG_NS16550_MIN_FUNCTIONS */ -void NS16550_putc (NS16550_t com_port, char c) +void NS16550_putc(NS16550_t com_port, char c) { - while ((serial_in(&com_port->lsr) & UART_LSR_THRE) == 0); + while ((serial_in(&com_port->lsr) & UART_LSR_THRE) == 0) + ; serial_out(c, &com_port->thr); /* @@ -92,7 +95,7 @@ void NS16550_putc (NS16550_t com_port, char c) } #ifndef CONFIG_NS16550_MIN_FUNCTIONS -char NS16550_getc (NS16550_t com_port) +char NS16550_getc(NS16550_t com_port) { while ((serial_in(&com_port->lsr) & UART_LSR_DR) == 0) { #ifdef CONFIG_USB_TTY @@ -104,9 +107,9 @@ char NS16550_getc (NS16550_t com_port) return serial_in(&com_port->rbr); } -int NS16550_tstc (NS16550_t com_port) +int NS16550_tstc(NS16550_t com_port) { - return ((serial_in(&com_port->lsr) & UART_LSR_DR) != 0); + return (serial_in(&com_port->lsr) & UART_LSR_DR) != 0; } #endif /* CONFIG_NS16550_MIN_FUNCTIONS */ diff --git a/include/ns16550.h b/include/ns16550.h index 51f1c17b3..e9d2edab0 100644 --- a/include/ns16550.h +++ b/include/ns16550.h @@ -65,12 +65,12 @@ struct NS16550 { #define dll rbr #define dlm ier -typedef volatile struct NS16550 *NS16550_t; +typedef struct NS16550 *NS16550_t; /* * These are the definitions for the FIFO Control Register */ -#define UART_FCR_FIFO_EN 0x01 /* Fifo enable */ +#define UART_FCR_FIFO_EN 0x01 /* Fifo enable */ #define UART_FCR_CLEAR_RCVR 0x02 /* Clear the RCVR FIFO */ #define UART_FCR_CLEAR_XMIT 0x04 /* Clear the XMIT FIFO */ #define UART_FCR_DMA_SELECT 0x08 /* For DMA applications */ @@ -106,7 +106,7 @@ typedef volatile struct NS16550 *NS16550_t; #define UART_LCR_WLS_6 0x01 /* 6 bit character length */ #define UART_LCR_WLS_7 0x02 /* 7 bit character length */ #define UART_LCR_WLS_8 0x03 /* 8 bit character length */ -#define UART_LCR_STB 0x04 /* Number of stop Bits, off = 1, on = 1.5 or 2) */ +#define UART_LCR_STB 0x04 /* # stop Bits, off=1, on=1.5 or 2) */ #define UART_LCR_PEN 0x08 /* Parity eneble */ #define UART_LCR_EPS 0x10 /* Even Parity Select */ #define UART_LCR_STKP 0x20 /* Stick Parity */ @@ -162,8 +162,8 @@ typedef volatile struct NS16550 *NS16550_t; /* useful defaults for LCR */ #define UART_LCR_8N1 0x03 -void NS16550_init (NS16550_t com_port, int baud_divisor); -void NS16550_putc (NS16550_t com_port, char c); -char NS16550_getc (NS16550_t com_port); -int NS16550_tstc (NS16550_t com_port); -void NS16550_reinit (NS16550_t com_port, int baud_divisor); +void NS16550_init(NS16550_t com_port, int baud_divisor); +void NS16550_putc(NS16550_t com_port, char c); +char NS16550_getc(NS16550_t com_port); +int NS16550_tstc(NS16550_t com_port); +void NS16550_reinit(NS16550_t com_port, int baud_divisor); |