diff options
| author | Marius Strobl <marius@FreeBSD.org> | 2007-01-18 22:01:19 +0000 |
|---|---|---|
| committer | Marius Strobl <marius@FreeBSD.org> | 2007-01-18 22:01:19 +0000 |
| commit | 97202af2dca1942e1873e9ef8feb527a2e58fa7b (patch) | |
| tree | 9d40efb79e6c86a1071e9763b706b391d9e9c487 /sys/dev/uart/uart_dev_z8530.c | |
| parent | 33eb7cb0a9e63309241e39b448a2428c29e0d6ac (diff) | |
Notes
Diffstat (limited to 'sys/dev/uart/uart_dev_z8530.c')
| -rw-r--r-- | sys/dev/uart/uart_dev_z8530.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sys/dev/uart/uart_dev_z8530.c b/sys/dev/uart/uart_dev_z8530.c index 04ebc6926144..850971817050 100644 --- a/sys/dev/uart/uart_dev_z8530.c +++ b/sys/dev/uart/uart_dev_z8530.c @@ -192,7 +192,7 @@ static int z8530_probe(struct uart_bas *bas); static void z8530_init(struct uart_bas *bas, int, int, int, int); static void z8530_term(struct uart_bas *bas); static void z8530_putc(struct uart_bas *bas, int); -static int z8530_poll(struct uart_bas *bas); +static int z8530_rxready(struct uart_bas *bas); static int z8530_getc(struct uart_bas *bas, struct mtx *); struct uart_ops uart_z8530_ops = { @@ -200,7 +200,7 @@ struct uart_ops uart_z8530_ops = { .init = z8530_init, .term = z8530_term, .putc = z8530_putc, - .poll = z8530_poll, + .rxready = z8530_rxready, .getc = z8530_getc, }; @@ -235,12 +235,10 @@ z8530_putc(struct uart_bas *bas, int c) } static int -z8530_poll(struct uart_bas *bas) +z8530_rxready(struct uart_bas *bas) { - if (!(uart_getreg(bas, REG_CTRL) & BES_RXA)) - return (-1); - return (uart_getreg(bas, REG_DATA)); + return ((uart_getreg(bas, REG_CTRL) & BES_RXA) != 0 ? 1 : 0); } static int |