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

Provide the tty-layer mutex when initializing the pps api. This allows

Browse Source 
time_pps_fetch() to be used in blocking mode.

Also, don't init the pps api for system devices (consoles) that provide a
custom attach routine.  The device may actually be a keyboard or other non-
tty device.  If it wants to do pps processing (unlikely) it must handle
everything for itself.  (In reality, only a sun keyboard uses a custom
attach routine, and it doesn't make a good pps device.)
This commit is contained in:
ian 2015-08-08 20:11:47 +00:00
parent c2259f45df
commit ba466d645c
3 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -150,6 +150,7 @@ void uart_sched_softih(struct uart_softc *, uint32_t);
int uart_tty_attach(struct uart_softc *);
int uart_tty_detach(struct uart_softc *);
struct mtx *uart_tty_getlock(struct uart_softc *);
void uart_tty_intr(void *arg);
/*

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

@ -511,9 +511,6 @@ uart_bus_attach(device_t dev)
sc->sc_sysdev->stopbits);
}
sc->sc_pps.ppscap = PPS_CAPTUREBOTH;
pps_init(&sc->sc_pps);
sc->sc_leaving = 0;
sc->sc_testintr = 1;
filt = uart_intr(sc);
@ -568,10 +565,17 @@ uart_bus_attach(device_t dev)
printf("\n");
}
error = (sc->sc_sysdev != NULL && sc->sc_sysdev->attach != NULL)
? (*sc->sc_sysdev->attach)(sc) : uart_tty_attach(sc);
if (error)
goto fail;
if (sc->sc_sysdev != NULL && sc->sc_sysdev->attach != NULL) {
if ((error = sc->sc_sysdev->attach(sc)) != 0)
goto fail;
} else {
if ((error = uart_tty_attach(sc)) != 0)
goto fail;
sc->sc_pps.ppscap = PPS_CAPTUREBOTH;
sc->sc_pps.driver_mtx = uart_tty_getlock(sc);
sc->sc_pps.driver_abi = PPS_ABI_VERSION;
pps_init_abi(&sc->sc_pps);
}
if (sc->sc_sysdev != NULL)
sc->sc_sysdev->hwmtx = sc->sc_hwmtx;

10
sys/dev/uart/uart_tty.c
View File

@ -404,3 +404,13 @@ uart_tty_detach(struct uart_softc *sc)
return (0);
}
struct mtx *
uart_tty_getlock(struct uart_softc *sc)
{
if (sc->sc_u.u_tty.tp != NULL)
return (tty_getlock(sc->sc_u.u_tty.tp));
else
return (NULL);
}