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

In uart_bus_grab(), use the ier_mask instead of a custom hack for XScale.

Browse Source 
Suggested by:	jmg
This commit is contained in:
cognet 2014-05-29 21:00:06 +00:00
parent 66cf283e79
commit 85b2ab2f9d
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -930,6 +930,7 @@ ns8250_bus_grab(struct uart_softc *sc)
{
struct uart_bas *bas = &sc->sc_bas;
struct ns8250_softc *ns8250 = (struct ns8250_softc*)sc;
u_char ier;
/*
* turn off all interrupts to enter polling mode. Leave the
@ -937,11 +938,8 @@ ns8250_bus_grab(struct uart_softc *sc)
* All pending interupt signals are reset when IER is set to 0.
*/
uart_lock(sc->sc_hwmtx);
/*
* On XScale, bit 6 (0x40) is the UART Unit Enable, removing it
* turns the UART completely off, so make sure it is stays there.
*/
uart_setreg(bas, REG_IER, ns8250->ier & 0x40);
ier = uart_getreg(bas, REG_IER);
uart_setreg(bas, REG_IER, ier & ns8250->ier_mask);
uart_barrier(bas);
uart_unlock(sc->sc_hwmtx);
}