diff options
| author | marcel <marcel@FreeBSD.org> | 2006-04-01 19:04:54 +0000 |
|---|---|---|
| committer | marcel <marcel@FreeBSD.org> | 2006-04-01 19:04:54 +0000 |
| commit | 01ed5990aef062b97e91680895804b9689c8076b (patch) | |
| tree | f866ed454b38b3e3ed100d7237faffef820e51f3 /sys/dev/uart/uart_dev_z8530.c | |
| parent | 6d14bcd43fdc1e895dd4255bb9f88dba939296ce (diff) | |
| download | FreeBSD-src-01ed5990aef062b97e91680895804b9689c8076b.zip FreeBSD-src-01ed5990aef062b97e91680895804b9689c8076b.tar.gz | |
Don't hold the hardware mutex across getc(). It can wait indefinitely
for a character to be received. Instead let getc() do any necesary
locking.
Diffstat (limited to 'sys/dev/uart/uart_dev_z8530.c')
| -rw-r--r-- | sys/dev/uart/uart_dev_z8530.c | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/sys/dev/uart/uart_dev_z8530.c b/sys/dev/uart/uart_dev_z8530.c index 09895eb..4bde071 100644 --- a/sys/dev/uart/uart_dev_z8530.c +++ b/sys/dev/uart/uart_dev_z8530.c @@ -178,7 +178,7 @@ 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_getc(struct uart_bas *bas); +static int z8530_getc(struct uart_bas *bas, struct mtx *); struct uart_ops uart_z8530_ops = { .probe = z8530_probe, @@ -229,12 +229,23 @@ z8530_poll(struct uart_bas *bas) } static int -z8530_getc(struct uart_bas *bas) +z8530_getc(struct uart_bas *bas, struct mtx *hwmtx) { + int c; - while (!(uart_getreg(bas, REG_CTRL) & BES_RXA)) - ; - return (uart_getreg(bas, REG_DATA)); + uart_lock(hwmtx); + + while (!(uart_getreg(bas, REG_CTRL) & BES_RXA)) { + uart_unlock(hwmtx); + DELAY(10); + uart_lock(hwmtx); + } + + c = uart_getreg(bas, REG_DATA); + + uart_unlock(hwmtx); + + return (c); } /* |
