Module Name: src
Committed By: mbalmer
Date: Tue Mar 29 07:48:14 UTC 2011
Modified Files:
src/sys/dev/usb: ulpt.c
Log Message:
Don't comment out printer reset on open, if this causes a problem, use the
/dev/ulpnX device node which sets a flag that prevents the reset.
To generate a diff of this commit:
cvs rdiff -u -r1.85 -r1.86 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/ulpt.c
diff -u src/sys/dev/usb/ulpt.c:1.85 src/sys/dev/usb/ulpt.c:1.86
--- src/sys/dev/usb/ulpt.c:1.85 Wed Nov 3 22:34:24 2010
+++ src/sys/dev/usb/ulpt.c Tue Mar 29 07:48:13 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ulpt.c,v 1.85 2010/11/03 22:34:24 dyoung Exp $ */
+/* $NetBSD: ulpt.c,v 1.86 2011/03/29 07:48:13 mbalmer Exp $ */
/* $FreeBSD: src/sys/dev/usb/ulpt.c,v 1.24 1999/11/17 22:33:44 n_hibma Exp $ */
/*
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ulpt.c,v 1.85 2010/11/03 22:34:24 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulpt.c,v 1.86 2011/03/29 07:48:13 mbalmer Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -524,10 +524,8 @@
error = 0;
sc->sc_refcnt++;
-#if 0 /* XXX causes some printers to disconnect */
if ((flags & ULPT_NOPRIME) == 0)
ulpt_reset(sc);
-#endif
for (spin = 0; (ulpt_status(sc) & LPS_SELECT) == 0; spin += STEP) {
DPRINTFN(2, ("ulpt_open: waiting a while\n"));
