ok?
Index: mediabay.c
===================================================================
RCS file: /cvs/src/sys/arch/macppc/dev/mediabay.c,v
retrieving revision 1.6
diff -u -p -r1.6 mediabay.c
--- mediabay.c 18 Nov 2013 20:21:51 -0000 1.6
+++ mediabay.c 7 Oct 2019 13:33:54 -0000
@@ -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);
Index: smu.c
===================================================================
RCS file: /cvs/src/sys/arch/macppc/dev/smu.c,v
retrieving revision 1.33
diff -u -p -r1.33 smu.c
--- smu.c 29 May 2016 11:00:37 -0000 1.33
+++ smu.c 7 Oct 2019 13:33:54 -0000
@@ -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 tim
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);
Index: thermal.c
===================================================================
RCS file: /cvs/src/sys/arch/macppc/dev/thermal.c,v
retrieving revision 1.5
diff -u -p -r1.5 thermal.c
--- thermal.c 29 Jul 2016 04:41:53 -0000 1.5
+++ thermal.c 7 Oct 2019 13:33:54 -0000
@@ -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);
}
Index: xlights.c
===================================================================
RCS file: /cvs/src/sys/arch/macppc/dev/xlights.c,v
retrieving revision 1.8
diff -u -p -r1.8 xlights.c
--- xlights.c 8 Sep 2017 05:36:52 -0000 1.8
+++ xlights.c 7 Oct 2019 13:33:54 -0000
@@ -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;
}
}
