summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcognet <cognet@FreeBSD.org>2006-02-27 23:19:13 +0000
committercognet <cognet@FreeBSD.org>2006-02-27 23:19:13 +0000
commitce247bd7742e102956de1e6effb70edb80f9ec31 (patch)
tree1e163b6b81f9f926cae4ee86511c527da5a89ec6
parentd85c4ef4cda9fc53fbbd1078bff0eb3d0dd9777b (diff)
downloadFreeBSD-src-ce247bd7742e102956de1e6effb70edb80f9ec31.zip
FreeBSD-src-ce247bd7742e102956de1e6effb70edb80f9ec31.tar.gz
Get this to compile with the recent UART changes.
-rw-r--r--sys/arm/at91/uart_dev_at91usart.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/arm/at91/uart_dev_at91usart.c b/sys/arm/at91/uart_dev_at91usart.c
index c7bce4f..3e48276 100644
--- a/sys/arm/at91/uart_dev_at91usart.c
+++ b/sys/arm/at91/uart_dev_at91usart.c
@@ -359,9 +359,9 @@ at91_usart_bus_ipend(struct uart_softc *sc)
mtx_lock_spin(&sc->sc_hwmtx);
if (csr & USART_CSR_TXRDY && sc->sc_txbusy)
- ipend |= UART_IPEND_TXIDLE;
+ ipend |= SER_INT_TXIDLE;
if (csr & USART_CSR_RXRDY)
- ipend |= UART_IPEND_RXREADY;
+ ipend |= SER_INT_RXREADY;
mtx_unlock_spin(&sc->sc_hwmtx);
return (ipend);
}
@@ -388,7 +388,7 @@ at91_usart_bus_getsig(struct uart_softc *sc)
sig |= SER_DSR;
if (csr & USART_CSR_RI)
sig |= SER_RI;
- new = sig & ~UART_SIGMASK_DELTA;
+ new = sig & ~SER_MASK_DELTA;
sc->sc_hwsig = new;
mtx_unlock_spin(&sc->sc_hwmtx);
return (sig);
OpenPOWER on IntegriCloud