diff options
| author | knakahara <knakahara@NetBSD.org> | 2022-12-09 00:35:58 +0000 |
|---|---|---|
| committer | knakahara <knakahara@NetBSD.org> | 2022-12-09 00:35:58 +0000 |
| commit | 2f9cd2bbabf5acb74a7231be8321a561f9009952 (patch) | |
| tree | cf4ca1a75dc822cfafbf74c80cf1955ddfaba09b /sys/dev | |
| parent | 6f8f925397bdf4c1bbec71f8b3b690339719135e (diff) | |
Revert com.c:r1.381 because i386/qemu cannot boot. Pointed out by gson@n.o and martin@n.o.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/ic/com.c | 36 |
1 files changed, 7 insertions, 29 deletions
diff --git a/sys/dev/ic/com.c b/sys/dev/ic/com.c index 25446a67509..8ae6f795d4d 100644 --- a/sys/dev/ic/com.c +++ b/sys/dev/ic/com.c @@ -1,4 +1,4 @@ -/* $NetBSD: com.c,v 1.381 2022/12/08 09:08:49 knakahara Exp $ */ +/* $NetBSD: com.c,v 1.382 2022/12/09 00:35:58 knakahara Exp $ */ /*- * Copyright (c) 1998, 1999, 2004, 2008 The NetBSD Foundation, Inc. @@ -70,7 +70,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: com.c,v 1.381 2022/12/08 09:08:49 knakahara Exp $"); +__KERNEL_RCSID(0, "$NetBSD: com.c,v 1.382 2022/12/09 00:35:58 knakahara Exp $"); #include "opt_com.h" #include "opt_ddb.h" @@ -206,28 +206,6 @@ static struct consdev comcons = { .cn_pri = CN_NORMAL }; -#define CSR_WRITE_1_SYNC(r, o, v) do { \ - CSR_WRITE_1(r, o, v); \ - switch(o) { \ - case COM_REG_IER: \ - (void)CSR_READ_1(r, COM_REG_IIR); \ - break; \ - case COM_REG_TXDATA: \ - (void)CSR_READ_1(r, COM_REG_TLR); \ - break; \ - } \ - } while(0) -#define CSR_WRITE_MULTI_SYNC(r, o, p, n) do { \ - CSR_WRITE_MULTI(r, o, p, n); \ - switch(o) { \ - case COM_REG_IER: \ - (void)CSR_READ_1(r, COM_REG_IIR); \ - break; \ - case COM_REG_TXDATA: \ - (void)CSR_READ_1(r, COM_REG_TLR); \ - break; \ - } \ - } while(0) const struct cdevsw com_cdevsw = { .d_open = comopen, @@ -1983,7 +1961,7 @@ comstart(struct tty *tp) /* Enable transmit completion interrupts if necessary. */ if (!ISSET(sc->sc_ier, IER_ETXRDY)) { SET(sc->sc_ier, IER_ETXRDY); - CSR_WRITE_1_SYNC(regsp, COM_REG_IER, sc->sc_ier); + CSR_WRITE_1(regsp, COM_REG_IER, sc->sc_ier); } /* Output the first chunk of the contiguous buffer. */ @@ -1993,7 +1971,7 @@ comstart(struct tty *tp) n = sc->sc_tbc; if (n > sc->sc_fifolen) n = sc->sc_fifolen; - CSR_WRITE_MULTI_SYNC(regsp, COM_REG_TXDATA, sc->sc_tba, n); + CSR_WRITE_MULTI(regsp, COM_REG_TXDATA, sc->sc_tba, n); sc->sc_tbc -= n; sc->sc_tba += n; } @@ -2381,7 +2359,7 @@ again: do { CLR(sc->sc_ier, IER_ERXRDY); break; } - CSR_WRITE_1_SYNC(regsp, COM_REG_IER, sc->sc_ier); + CSR_WRITE_1(regsp, COM_REG_IER, sc->sc_ier); } } else { if ((iir & (IIR_RXRDY|IIR_TXRDY)) == IIR_RXRDY) { @@ -2465,14 +2443,14 @@ do_tx: n = sc->sc_tbc; if (n > sc->sc_fifolen) n = sc->sc_fifolen; - CSR_WRITE_MULTI_SYNC(regsp, COM_REG_TXDATA, sc->sc_tba, n); + CSR_WRITE_MULTI(regsp, COM_REG_TXDATA, sc->sc_tba, n); sc->sc_tbc -= n; sc->sc_tba += n; } else { /* Disable transmit completion interrupts if necessary. */ if (ISSET(sc->sc_ier, IER_ETXRDY)) { CLR(sc->sc_ier, IER_ETXRDY); - CSR_WRITE_1_SYNC(regsp, COM_REG_IER, sc->sc_ier); + CSR_WRITE_1(regsp, COM_REG_IER, sc->sc_ier); } if (sc->sc_tx_busy) { sc->sc_tx_busy = 0; |
