Re: envy(4): *sleep(9) -> *sleep_nsec(9)

[Alexandre Ratchov]

On Fri, Nov 22, 2019 at 06:41:25PM -0600, Scott Cheloha wrote:
> ok?
> 

sure, thanks

envy(4): *sleep(9) -> *sleep_nsec(9)

[Scott Cheloha]

ok?

Index: envy.c
===
RCS file: /cvs/src/sys/dev/pci/envy.c,v
retrieving revision 1.79
diff -u -p -r1.79 envy.c
--- envy.c  9 May 2019 05:17:45 -   1.79
+++ envy.c  23 Nov 2019 00:40:53 -
@@ -2218,7 +2218,8 @@ envy_halt_output(void *self)
mtx_enter(_lock);
sc->oactive = 0;
if (sc->obusy) {
-   err = msleep(>obusy, _lock, PWAIT, "envyobus", 4 * 
hz);
+   err = msleep_nsec(>obusy, _lock, PWAIT, "envyobus",
+   SEC_TO_NSEC(4));
if (err)
printf("%s: output DMA halt timeout\n", DEVNAME(sc));
}
@@ -2239,7 +2240,8 @@ envy_halt_input(void *self)
mtx_enter(_lock);
sc->iactive = 0;
if (sc->ibusy) {
-   err = msleep(>ibusy, _lock, PWAIT, "envyibus", 4 * 
hz); 
+   err = msleep_nsec(>ibusy, _lock, PWAIT, "envyibus",
+   SEC_TO_NSEC(4));
if (err)
printf("%s: input DMA halt timeout\n", DEVNAME(sc));
}
@@ -2488,7 +2490,7 @@ envy_midi_close(void *self)
unsigned int reg;
 
/* wait for output fifo to drain */
-   tsleep(sc, PWAIT, "envymid", hz / 10);
+   tsleep_nsec(sc, PWAIT, "envymid", MSEC_TO_NSEC(100));
 
/* disable interrupts */
reg = envy_ccs_read(sc, ENVY_CCS_INTMASK);