aboutsummaryrefslogtreecommitdiff
path: root/sys/dev/uart/uart_dev_ns8250.c
diff options
context:
space:
mode:
authorMarius Strobl <marius@FreeBSD.org>2007-01-18 22:01:19 +0000
committerMarius Strobl <marius@FreeBSD.org>2007-01-18 22:01:19 +0000
commit97202af2dca1942e1873e9ef8feb527a2e58fa7b (patch)
tree9d40efb79e6c86a1071e9763b706b391d9e9c487 /sys/dev/uart/uart_dev_ns8250.c
parent33eb7cb0a9e63309241e39b448a2428c29e0d6ac (diff)
Notes
Diffstat (limited to 'sys/dev/uart/uart_dev_ns8250.c')
-rw-r--r--sys/dev/uart/uart_dev_ns8250.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/sys/dev/uart/uart_dev_ns8250.c b/sys/dev/uart/uart_dev_ns8250.c
index ba16b556b032a..4262f8d53b7b4 100644
--- a/sys/dev/uart/uart_dev_ns8250.c
+++ b/sys/dev/uart/uart_dev_ns8250.c
@@ -217,7 +217,7 @@ static int ns8250_probe(struct uart_bas *bas);
static void ns8250_init(struct uart_bas *bas, int, int, int, int);
static void ns8250_term(struct uart_bas *bas);
static void ns8250_putc(struct uart_bas *bas, int);
-static int ns8250_poll(struct uart_bas *bas);
+static int ns8250_rxready(struct uart_bas *bas);
static int ns8250_getc(struct uart_bas *bas, struct mtx *);
struct uart_ops uart_ns8250_ops = {
@@ -225,7 +225,7 @@ struct uart_ops uart_ns8250_ops = {
.init = ns8250_init,
.term = ns8250_term,
.putc = ns8250_putc,
- .poll = ns8250_poll,
+ .rxready = ns8250_rxready,
.getc = ns8250_getc,
};
@@ -299,12 +299,10 @@ ns8250_putc(struct uart_bas *bas, int c)
}
static int
-ns8250_poll(struct uart_bas *bas)
+ns8250_rxready(struct uart_bas *bas)
{
- if (uart_getreg(bas, REG_LSR) & LSR_RXRDY)
- return (uart_getreg(bas, REG_DATA));
- return (-1);
+ return ((uart_getreg(bas, REG_LSR) & LSR_RXRDY) != 0 ? 1 : 0);
}
static int