diff options
| -rw-r--r-- | sys/arch/macppc/dev/mediabay.c | 6 | ||||
| -rw-r--r-- | sys/arch/macppc/dev/smu.c | 6 | ||||
| -rw-r--r-- | sys/arch/macppc/dev/thermal.c | 4 | ||||
| -rw-r--r-- | sys/arch/macppc/dev/xlights.c | 6 |
4 files changed, 11 insertions, 11 deletions
diff --git a/sys/arch/macppc/dev/mediabay.c b/sys/arch/macppc/dev/mediabay.c index c10fcee8cc1..13152fda31d 100644 --- a/sys/arch/macppc/dev/mediabay.c +++ b/sys/arch/macppc/dev/mediabay.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mediabay.c,v 1.6 2013/11/18 20:21:51 deraadt Exp $ */ +/* $OpenBSD: mediabay.c,v 1.7 2019/10/08 13:21:38 cheloha Exp $ */ /* $NetBSD: mediabay.c,v 1.9 2003/07/15 02:43:29 lukem Exp $ */ /*- @@ -235,10 +235,10 @@ mediabay_kthread(v) u_int x, fcr; sleep: - tsleep(&sc->sc_kthread, PRIBIO, "mbayev", 0); + tsleep_nsec(&sc->sc_kthread, PRIBIO, "mbayev", INFSLP); /* sleep 0.25 sec */ - tsleep(mediabay_kthread, PRIBIO, "mbayev", hz/4); + tsleep_nsec(mediabay_kthread, PRIBIO, "mbayev", MSEC_TO_NSEC(250)); DPRINTF("%s: ", sc->sc_dev.dv_xname); x = in32rb(sc->sc_addr); diff --git a/sys/arch/macppc/dev/smu.c b/sys/arch/macppc/dev/smu.c index 7b223b9acfe..fefaab2cdad 100644 --- a/sys/arch/macppc/dev/smu.c +++ b/sys/arch/macppc/dev/smu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: smu.c,v 1.33 2016/05/29 11:00:37 mglocker Exp $ */ +/* $OpenBSD: smu.c,v 1.34 2019/10/08 13:21:38 cheloha Exp $ */ /* * Copyright (c) 2005 Mark Kettenis @@ -508,7 +508,7 @@ smu_intr(void *arg) } int -smu_do_cmd(struct smu_softc *sc, int timo) +smu_do_cmd(struct smu_softc *sc, int msecs) { struct smu_cmd *cmd = (struct smu_cmd *)sc->sc_cmd; u_int8_t gpio, ack = ~cmd->cmd; @@ -525,7 +525,7 @@ smu_do_cmd(struct smu_softc *sc, int timo) bus_space_write_1(sc->sc_memt, sc->sc_gpioh, 0, GPIO_DDR_OUTPUT); do { - error = tsleep(sc, PWAIT, "smu", (timo * hz) / 1000); + error = tsleep_nsec(sc, PWAIT, "smu", MSEC_TO_NSEC(msecs)); if (error) return (error); gpio = bus_space_read_1(sc->sc_memt, sc->sc_gpioh, 0); diff --git a/sys/arch/macppc/dev/thermal.c b/sys/arch/macppc/dev/thermal.c index 270b79444ba..2b362a72f87 100644 --- a/sys/arch/macppc/dev/thermal.c +++ b/sys/arch/macppc/dev/thermal.c @@ -1,4 +1,4 @@ -/* $OpenBSD: thermal.c,v 1.5 2016/07/29 04:41:53 jsg Exp $ */ +/* $OpenBSD: thermal.c,v 1.6 2019/10/08 13:21:38 cheloha Exp $ */ /*- * Copyright (c) 2009-2011 Nathan Whitehorn @@ -91,7 +91,7 @@ thermal_thread_loop(void *arg) { while (thermal_enable) { thermal_manage_fans(); - tsleep(&thermal_enable, 0, "thermal", hz); + tsleep_nsec(&thermal_enable, 0, "thermal", SEC_TO_NSEC(1)); } kthread_exit(0); } diff --git a/sys/arch/macppc/dev/xlights.c b/sys/arch/macppc/dev/xlights.c index 8ab39f37b7c..ba0390adbda 100644 --- a/sys/arch/macppc/dev/xlights.c +++ b/sys/arch/macppc/dev/xlights.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xlights.c,v 1.8 2017/09/08 05:36:52 deraadt Exp $ */ +/* $OpenBSD: xlights.c,v 1.9 2019/10/08 13:21:38 cheloha Exp $ */ /* * Copyright (c) 2007 Gordon Willem Klok <gwk@openbsd,org> * @@ -266,8 +266,8 @@ xlights_theosDOT(void *v) } else { xlights_startdma(sc); while (sc->sc_dmasts) - tsleep(sc->sc_buf, PWAIT, - "blinken", 0); + tsleep_nsec(sc->sc_buf, PWAIT, + "blinken", INFSLP); p = sc->sc_buf; } } |