On Fri, Jan 10, 2020 at 02:57:41PM +1100, Jonathan Gray wrote:
> On Sun, Dec 22, 2019 at 03:35:09PM -0600, Scott Cheloha wrote:
> > ok?
> >
> > Index: pluart.c
> > ===================================================================
> > RCS file: /cvs/src/sys/dev/ic/pluart.c,v
> > retrieving revision 1.4
> > diff -u -p -r1.4 pluart.c
> > --- pluart.c 11 Aug 2019 10:03:32 -0000 1.4
> > +++ pluart.c 22 Dec 2019 21:32:50 -0000
> > @@ -225,7 +225,7 @@ pluart_intr(void *arg)
> > if (p >= sc->sc_ibufend) {
> > sc->sc_floods++;
> > if (sc->sc_errors++ == 0)
> > - timeout_add(&sc->sc_diag_tmo, 60 * hz);
> > + timeout_add_sec(&sc->sc_diag_tmo, 60);
> > } else {
> > *p++ = c;
> > if (p == sc->sc_ibufhigh && ISSET(tp->t_cflag,
> > CRTSCTS)) {
> > @@ -428,7 +428,7 @@ pluart_softint(void *arg)
> > if (ISSET(c, IMXUART_RX_OVERRUN)) {
> > sc->sc_overflows++;
> > if (sc->sc_errors++ == 0)
> > - timeout_add(&sc->sc_diag_tmo, 60 * hz);
> > + timeout_add_sec(&sc->sc_diag_tmo, 60);
> > }
> > */
> > /* This is ugly, but fast. */
> > @@ -605,7 +605,7 @@ pluartclose(dev_t dev, int flag, int mod
> > /* tty device is waiting for carrier; drop dtr then re-raise */
> > //CLR(sc->sc_ucr3, IMXUART_CR3_DSR);
> > //bus_space_write_4(iot, ioh, IMXUART_UCR3, sc->sc_ucr3);
> > - timeout_add(&sc->sc_dtr_tmo, hz * 2);
> > + timeout_add_sec(&sc->sc_dtr_tmo, 2);
> > } else {
> > /* no one else waiting; turn off the uart */
> > pluart_pwroff(sc);
> >
> >
>
> ok jsg@
>
> same diff for exuart
That diff below is what I came up with here, just wasn't sure if that
code was dead or not.
ok cheloha@
>
> Index: exuart.c
> ===================================================================
> RCS file: /cvs/src/sys/arch/armv7/exynos/exuart.c,v
> retrieving revision 1.16
> diff -u -p -r1.16 exuart.c
> --- exuart.c 19 Jul 2019 00:17:15 -0000 1.16
> +++ exuart.c 10 Jan 2020 03:52:57 -0000
> @@ -283,7 +283,7 @@ exuart_intr(void *arg)
> if (p >= sc->sc_ibufend) {
> sc->sc_floods++;
> if (sc->sc_errors++ == 0)
> - timeout_add(&sc->sc_diag_tmo, 60 * hz);
> + timeout_add_sec(&sc->sc_diag_tmo, 60);
> } else {
> *p++ = c;
> if (p == sc->sc_ibufhigh && ISSET(tp->t_cflag, CRTSCTS))
> @@ -710,7 +710,7 @@ exuartclose(dev_t dev, int flag, int mod
> /* tty device is waiting for carrier; drop dtr then re-raise */
> //CLR(sc->sc_ucr3, EXUART_CR3_DSR);
> //bus_space_write_2(iot, ioh, EXUART_UCR3, sc->sc_ucr3);
> - timeout_add(&sc->sc_dtr_tmo, hz * 2);
> + timeout_add_sec(&sc->sc_dtr_tmo, 2);
> } else {
> /* no one else waiting; turn off the uart */
> exuart_pwroff(sc);
