Module Name: src
Committed By: skrll
Date: Fri Mar 31 10:00:15 UTC 2017
Modified Files:
src/sys/dev/usb [netbsd-7-nhusb]: uthum.c uvscom.c uyurex.c
Log Message:
Convert tsleep to kpause
To generate a diff of this commit:
cvs rdiff -u -r1.10.18.2 -r1.10.18.3 src/sys/dev/usb/uthum.c
cvs rdiff -u -r1.28.20.2 -r1.28.20.3 src/sys/dev/usb/uvscom.c
cvs rdiff -u -r1.9.12.1.4.3 -r1.9.12.1.4.4 src/sys/dev/usb/uyurex.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/uthum.c
diff -u src/sys/dev/usb/uthum.c:1.10.18.2 src/sys/dev/usb/uthum.c:1.10.18.3
--- src/sys/dev/usb/uthum.c:1.10.18.2 Thu Jan 26 21:54:25 2017
+++ src/sys/dev/usb/uthum.c Fri Mar 31 10:00:15 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: uthum.c,v 1.10.18.2 2017/01/26 21:54:25 skrll Exp $ */
+/* $NetBSD: uthum.c,v 1.10.18.3 2017/03/31 10:00:15 skrll Exp $ */
/* $OpenBSD: uthum.c,v 1.6 2010/01/03 18:43:02 deraadt Exp $ */
/*
@@ -22,7 +22,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uthum.c,v 1.10.18.2 2017/01/26 21:54:25 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uthum.c,v 1.10.18.3 2017/03/31 10:00:15 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -294,7 +294,7 @@ uthum_read_data(struct uthum_softc *sc,
/* wait if required */
if (need_delay > 1)
- tsleep(&sc->sc_sme, 0, "uthum", (need_delay*hz+999)/1000 + 1);
+ kpause("uthum", false, (need_delay*hz+999)/1000 + 1, NULL);
/* get answer */
if (uhidev_get_report(&sc->sc_hdev, UHID_FEATURE_REPORT,
Index: src/sys/dev/usb/uvscom.c
diff -u src/sys/dev/usb/uvscom.c:1.28.20.2 src/sys/dev/usb/uvscom.c:1.28.20.3
--- src/sys/dev/usb/uvscom.c:1.28.20.2 Thu Jan 26 21:54:25 2017
+++ src/sys/dev/usb/uvscom.c Fri Mar 31 10:00:15 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: uvscom.c,v 1.28.20.2 2017/01/26 21:54:25 skrll Exp $ */
+/* $NetBSD: uvscom.c,v 1.28.20.3 2017/03/31 10:00:15 skrll Exp $ */
/*-
* Copyright (c) 2001-2002, Shunsuke Akiyama <[email protected]>.
* All rights reserved.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvscom.c,v 1.28.20.2 2017/01/26 21:54:25 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvscom.c,v 1.28.20.3 2017/03/31 10:00:15 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -759,7 +759,7 @@ uvscom_open(void *addr, int portno)
/* unit is not ready */
for (i = UVSCOM_UNIT_WAIT; i > 0; --i) {
- tsleep(&err, TTIPRI, "uvsop", hz); /* XXX */
+ kpause("uvsopen", false, hz, NULL);
if (ISSET(sc->sc_usr, UVSCOM_USTAT_MASK))
break;
}
Index: src/sys/dev/usb/uyurex.c
diff -u src/sys/dev/usb/uyurex.c:1.9.12.1.4.3 src/sys/dev/usb/uyurex.c:1.9.12.1.4.4
--- src/sys/dev/usb/uyurex.c:1.9.12.1.4.3 Fri Mar 31 09:38:05 2017
+++ src/sys/dev/usb/uyurex.c Fri Mar 31 10:00:15 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: uyurex.c,v 1.9.12.1.4.3 2017/03/31 09:38:05 skrll Exp $ */
+/* $NetBSD: uyurex.c,v 1.9.12.1.4.4 2017/03/31 10:00:15 skrll Exp $ */
/* $OpenBSD: uyurex.c,v 1.3 2010/03/04 03:47:22 deraadt Exp $ */
/*
@@ -22,7 +22,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uyurex.c,v 1.9.12.1.4.3 2017/03/31 09:38:05 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uyurex.c,v 1.9.12.1.4.4 2017/03/31 10:00:15 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -341,7 +341,7 @@ uyurex_set_mode(struct uyurex_softc *sc,
}
/* wait ack */
- tsleep(&sc->sc_sme, 0, "uyurex", (1000*hz+999)/1000 + 1);
+ kpause("uyurexsm", false, (1000*hz+999)/1000 + 1, NULL);
}
void
@@ -359,7 +359,7 @@ uyurex_read_value_request(struct uyurex_
return;
/* wait till sensor data are updated, 500ms will be enough */
- tsleep(&sc->sc_sme, 0, "uyurex", (500*hz+999)/1000 + 1);
+ kpause("uyurexrd", false, (500*hz+999)/1000 + 1, NULL);
}
void
@@ -382,5 +382,5 @@ uyurex_write_value_request(struct uyurex
return;
/* wait till sensor data are updated, 250ms will be enough */
- tsleep(&sc->sc_sme, 0, "uyurex", (250*hz+999)/1000 + 1);
+ kpause("uyurexwr", false, (250*hz+999)/1000 + 1, NULL);
}
