Re: bktr(4): tsleep(9) -> tsleep_nsec(9)

2019-12-16 Thread Alexandre Ratchov
On Sun, Dec 15, 2019 at 10:28:32PM -0600, Scott Cheloha wrote:
> I don't have any of these cards, but these are straightforward conversions.
> 
> ok?
> 

ok



bktr(4): tsleep(9) -> tsleep_nsec(9)

2019-12-15 Thread Scott Cheloha
I don't have any of these cards, but these are straightforward conversions.

ok?

Index: bktr_audio.c
===
RCS file: /cvs/src/sys/dev/pci/bktr/bktr_audio.c,v
retrieving revision 1.12
diff -u -p -r1.12 bktr_audio.c
--- bktr_audio.c14 Mar 2015 03:38:49 -  1.12
+++ bktr_audio.c16 Dec 2019 04:28:16 -
@@ -229,7 +229,7 @@ temp_mute( bktr_ptr_t bktr, int flag )
set_audio( bktr, AUDIO_MUTE );  /* prevent 'click' */
}
else {
-   tsleep( BKTR_SLEEP, PZERO, "tuning", hz/8 );
+   tsleep_nsec( BKTR_SLEEP, PZERO, "tuning", MSEC_TO_NSEC(125) );
if ( muteState == FALSE )
set_audio( bktr, AUDIO_UNMUTE );
}
Index: bktr_core.c
===
RCS file: /cvs/src/sys/dev/pci/bktr/bktr_core.c,v
retrieving revision 1.40
diff -u -p -r1.40 bktr_core.c
--- bktr_core.c 22 Nov 2018 14:54:36 -  1.40
+++ bktr_core.c 16 Dec 2019 04:28:19 -
@@ -1025,7 +1025,7 @@ video_read(bktr_ptr_t bktr, int unit, de
 BT848_INT_FMTCHG);
 
 
-   status = tsleep(BKTR_SLEEP, BKTRPRI, "captur", 0);
+   status = tsleep_nsec(BKTR_SLEEP, BKTRPRI, "captur", INFSLP);
if (!status)/* successful capture */
status = uiomove((caddr_t)bktr->bigbuf, count, uio);
else
@@ -1057,7 +1057,7 @@ vbi_read(bktr_ptr_t bktr, struct uio *ui
}
 
bktr->vbi_read_blocked = TRUE;
-   if ((status = tsleep(VBI_SLEEP, VBIPRI, "vbi", 0))) {
+   if ((status = tsleep_nsec(VBI_SLEEP, VBIPRI, "vbi", INFSLP))) {
return status;
}
}
@@ -1419,7 +1419,8 @@ video_ioctl( bktr_ptr_t bktr, int unit, 
BT848_INT_FMTCHG);
 
OUTB(bktr, BKTR_CAP_CTL, bktr->bktr_cap_ctl);
-   error = tsleep(BKTR_SLEEP, BKTRPRI, "captur", hz);
+   error = tsleep_nsec(BKTR_SLEEP, BKTRPRI, "captur",
+   SEC_TO_NSEC(1));
if (error && (error != ERESTART)) {
/*  Here if we didn't get complete frame  */
 #ifdef DIAGNOSTIC