Module Name: src
Committed By: skrll
Date: Sat Jan 28 10:05:09 UTC 2017
Modified Files:
src/sys/dev/usb [nick-nhusb]: TODO.usbmp ulpt.c
Log Message:
Remove tsleep from ulpt(4)
To generate a diff of this commit:
cvs rdiff -u -r1.8.4.6 -r1.8.4.7 src/sys/dev/usb/TODO.usbmp
cvs rdiff -u -r1.95.4.11 -r1.95.4.12 src/sys/dev/usb/ulpt.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/TODO.usbmp
diff -u src/sys/dev/usb/TODO.usbmp:1.8.4.6 src/sys/dev/usb/TODO.usbmp:1.8.4.7
--- src/sys/dev/usb/TODO.usbmp:1.8.4.6 Sat Jan 28 09:43:28 2017
+++ src/sys/dev/usb/TODO.usbmp Sat Jan 28 10:05:09 2017
@@ -1,4 +1,4 @@
-$NetBSD: TODO.usbmp,v 1.8.4.6 2017/01/28 09:43:28 skrll Exp $
+$NetBSD: TODO.usbmp,v 1.8.4.7 2017/01/28 10:05:09 skrll Exp $
the majority of the USB MP device interface is documented in usbdivar.h.
@@ -103,7 +103,6 @@ wakeup/tsleep drivers:
- udsir.c
- uirda.c
- umass_isdata.c
- - ulpt.c
- ustir.c
- uthum.c
- uyurex.c
Index: src/sys/dev/usb/ulpt.c
diff -u src/sys/dev/usb/ulpt.c:1.95.4.11 src/sys/dev/usb/ulpt.c:1.95.4.12
--- src/sys/dev/usb/ulpt.c:1.95.4.11 Mon Dec 5 10:55:18 2016
+++ src/sys/dev/usb/ulpt.c Sat Jan 28 10:05:09 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ulpt.c,v 1.95.4.11 2016/12/05 10:55:18 skrll Exp $ */
+/* $NetBSD: ulpt.c,v 1.95.4.12 2017/01/28 10:05:09 skrll Exp $ */
/*
* Copyright (c) 1998, 2003 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ulpt.c,v 1.95.4.11 2016/12/05 10:55:18 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulpt.c,v 1.95.4.12 2017/01/28 10:05:09 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -465,7 +465,7 @@ ulptopen(dev_t dev, int flag, int mode,
}
/* wait 1/4 second, give up if we get a signal */
- error = tsleep((void *)sc, LPTPRI | PCATCH, "ulptop", STEP);
+ error = kpause("ulptop", true, STEP, NULL);
if (error != EWOULDBLOCK) {
sc->sc_state = 0;
goto done;
@@ -704,7 +704,7 @@ ulpt_do_read(struct ulpt_softc *sc, stru
}
/*
- * XXX Even with the short timeout, this will tsleep,
+ * XXX Even with the short timeout, this will sleep,
* but it should be adequately prompt in practice.
*/
n = nreq;
@@ -748,7 +748,7 @@ ulpt_do_read(struct ulpt_softc *sc, stru
case USBD_INTERRUPTED:
/*
- * The tsleep in usbd_bulk_transfer was
+ * The sleep in usbd_bulk_transfer was
* interrupted. Reflect it to the caller so
* that reading can be interrupted.
*/
