d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace our local UART_SIGMASK_* with the global SER_MASK_*.

Browse Source
This commit is contained in:
Marcel Moolenaar 2006-02-24 05:40:17 +00:00
parent 0bb90c9d57
commit ea54941449
5 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/dev/uart/uart_bus.h
View File

@ -48,11 +48,6 @@
#define UART_STAT_OVERRUN 0x0400
#define UART_STAT_PARERR 0x0800
#define UART_SIGMASK_DTE (SER_DTR | SER_RTS)
#define UART_SIGMASK_DCE (SER_DSR | SER_CTS | SER_DCD | SER_RI)
#define UART_SIGMASK_STATE (UART_SIGMASK_DTE | UART_SIGMASK_DCE)
#define UART_SIGMASK_DELTA (UART_SIGMASK_STATE << 8)
#ifdef UART_PPS_ON_CTS
#define UART_SIG_DPPS SER_DCTS
#define UART_SIG_PPS SER_CTS

2
sys/dev/uart/uart_core.c
View File

@ -171,7 +171,7 @@ uart_intr_sigchg(struct uart_softc *sc)
do {
old = sc->sc_ttypend;
new = old & ~UART_SIGMASK_STATE;
new = old & ~SER_MASK_STATE;
new |= sig & SER_INT_SIGMASK;
new |= SER_INT_SIGCHG;
} while (!atomic_cmpset_32(&sc->sc_ttypend, old, new));

2
sys/dev/uart/uart_dev_ns8250.c
View File

@ -460,7 +460,7 @@ ns8250_bus_getsig(struct uart_softc *sc)
SIGCHG(msr & MSR_CTS, sig, SER_CTS, SER_DCTS);
SIGCHG(msr & MSR_DCD, sig, SER_DCD, SER_DDCD);
SIGCHG(msr & MSR_RI, sig, SER_RI, SER_DRI);
new = sig & ~UART_SIGMASK_DELTA;
new = sig & ~SER_MASK_DELTA;
} while (!atomic_cmpset_32(&sc->sc_hwsig, old, new));
return (sig);
}

2
sys/dev/uart/uart_dev_sab82532.c
View File

@ -470,7 +470,7 @@ sab82532_bus_getsig(struct uart_softc *sc)
}
SIGCHG(pvr, sig, SER_DSR, SER_DDSR);
mtx_unlock_spin(&sc->sc_hwmtx);
new = sig & ~UART_SIGMASK_DELTA;
new = sig & ~SER_MASK_DELTA;
} while (!atomic_cmpset_32(&sc->sc_hwsig, old, new));
return (sig);
}

4
sys/dev/uart/uart_dev_z8530.c
View File

@ -354,7 +354,7 @@ z8530_bus_getsig(struct uart_softc *sc)
SIGCHG(bes & BES_CTS, sig, SER_CTS, SER_DCTS);
SIGCHG(bes & BES_DCD, sig, SER_DCD, SER_DDCD);
SIGCHG(bes & BES_SYNC, sig, SER_DSR, SER_DDSR);
new = sig & ~UART_SIGMASK_DELTA;
new = sig & ~SER_MASK_DELTA;
} while (!atomic_cmpset_32(&sc->sc_hwsig, old, new));
return (sig);
}
@ -439,7 +439,7 @@ z8530_bus_ipend(struct uart_softc *sc)
SIGCHG(bes & BES_CTS, sig, SER_CTS, SER_DCTS);
SIGCHG(bes & BES_DCD, sig, SER_DCD, SER_DDCD);
SIGCHG(bes & BES_SYNC, sig, SER_DSR, SER_DDSR);
if (sig & UART_SIGMASK_DELTA)
if (sig & SER_MASK_DELTA)
ipend |= SER_INT_SIGCHG;
src = uart_getmreg(bas, RR_SRC);
if (src & SRC_OVR) {