summaryrefslogtreecommitdiffstats
path: root/sys/arm/sa11x0
diff options
context:
space:
mode:
authorcognet <cognet@FreeBSD.org>2007-09-12 18:28:09 +0000
committercognet <cognet@FreeBSD.org>2007-09-12 18:28:09 +0000
commit4e0d648ec925cad7877be30f25677e3505b3f5d0 (patch)
tree5cbcf38e2b51bbc20d7d0945c943733f3f31e6ba /sys/arm/sa11x0
parente651705b7e9100bab6eada7793ec8c47c24d65aa (diff)
downloadFreeBSD-src-4e0d648ec925cad7877be30f25677e3505b3f5d0.zip
FreeBSD-src-4e0d648ec925cad7877be30f25677e3505b3f5d0.tar.gz
It's probably time I learn C.
Fix a few while (!uart_getreg() & SR1_TNF) when while (!(uart_getreg() & SR18TNF)) was really meant. This driver should die anyway, it's awful, and uart_ns8250 should be fine for the StrongArm 1110. I'll kill it later. Submitted by: Mikhael Skvorts Approved by: re (blanket)
Diffstat (limited to 'sys/arm/sa11x0')
-rw-r--r--sys/arm/sa11x0/uart_dev_sa1110.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/arm/sa11x0/uart_dev_sa1110.c b/sys/arm/sa11x0/uart_dev_sa1110.c
index 35ff22b..f057453 100644
--- a/sys/arm/sa11x0/uart_dev_sa1110.c
+++ b/sys/arm/sa11x0/uart_dev_sa1110.c
@@ -97,7 +97,7 @@ sa1110_term(struct uart_bas *bas)
static void
sa1110_putc(struct uart_bas *bas, int c)
{
- while (!uart_getreg(bas, SACOM_SR1) & SR1_TNF);
+ while (!(uart_getreg(bas, SACOM_SR1) & SR1_TNF));
uart_setreg(bas, SACOM_DR, c);
}
@@ -186,7 +186,7 @@ sa1110_bus_transmit(struct uart_softc *sc)
uart_setreg(&sc->sc_bas, SACOM_CR3, uart_getreg(&sc->sc_bas, SACOM_CR3)
| CR3_TIE);
for (i = 0; i < sc->sc_txdatasz; i++) {
- while (!uart_getreg(&sc->sc_bas, SACOM_SR1) & SR1_TNF);
+ while (!(uart_getreg(&sc->sc_bas, SACOM_SR1) & SR1_TNF));
uart_setreg(&sc->sc_bas, SACOM_DR, sc->sc_txbuf[i]);
uart_barrier(&sc->sc_bas);
OpenPOWER on IntegriCloud