PERFORCE change 135811 for review
Randall R. Stewart
rrs at FreeBSD.org
Wed Feb 20 18:00:52 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=135811
Change 135811 by rrs at rrs-mips2-jnpr on 2008/02/20 18:00:25
s9 indent.
Affected files ...
.. //depot/projects/mips2-jnpr/src/sys/mips/mips32/octeon32/uart_dev_oct16550.c#6 edit
Differences ...
==== //depot/projects/mips2-jnpr/src/sys/mips/mips32/octeon32/uart_dev_oct16550.c#6 (text+ko) ====
@@ -76,7 +76,7 @@
#include <mips/mips32/octeon32/bus_octeon.h>
/* Cavium specific defines pulled from there update of ns16559.h */
-#define USR_TXFIFO_NOTFULL 2 /* Uart TX FIFO Not full */
+#define USR_TXFIFO_NOTFULL 2 /* Uart TX FIFO Not full */
#include "uart_if.h"
@@ -338,13 +338,13 @@
uart_barrier(bas);
}
-static inline void
+static inline void
oct16550_wait_txhr_empty(struct uart_bas *bas, int limit, int delay)
{
while (((uart_getreg(bas, OCT_REG_LSR) & LSR_THRE) == 0) &&
((uart_getreg(bas, OCT_REG_USR) & USR_TX_FIFO_NOTFULL) == 0) && --limit)
DELAY(delay);
-}
+}
static void
oct16550_putc(struct uart_bas *bas, int c)
@@ -548,8 +548,7 @@
case UART_IOCTL_BREAK:
lcr = uart_getreg(bas, OCT_REG_LCR);
if (data)
-
- lcr |= LCR_SBREAK;
+ lcr |= LCR_SBREAK;
else
lcr &= ~LCR_SBREAK;
uart_setreg(bas, OCT_REG_LCR, lcr);
More information about the p4-projects
mailing list