From owner-svn-src-head@FreeBSD.ORG  Thu Jul 30 00:16:06 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DF6971065673;
	Thu, 30 Jul 2009 00:16:06 +0000 (UTC)
	(envelope-from alfred@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id CD9948FC26;
	Thu, 30 Jul 2009 00:16:06 +0000 (UTC)
	(envelope-from alfred@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n6U0G69L086549;
	Thu, 30 Jul 2009 00:16:06 GMT (envelope-from alfred@svn.freebsd.org)
Received: (from alfred@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n6U0G6H8086547;
	Thu, 30 Jul 2009 00:16:06 GMT (envelope-from alfred@svn.freebsd.org)
Message-Id: <200907300016.n6U0G6H8086547@svn.freebsd.org>
From: Alfred Perlstein <alfred@FreeBSD.org>
Date: Thu, 30 Jul 2009 00:16:06 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r195964 - head/sys/dev/usb/serial
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 30 Jul 2009 00:16:07 -0000

Author: alfred
Date: Thu Jul 30 00:16:06 2009
New Revision: 195964
URL: http://svn.freebsd.org/changeset/base/195964

Log:
  ULPT:
  - add conditional printer status checking
  - P4 ID: 166176
  
  Submitted by:	hps
  Approved by:	re

Modified:
  head/sys/dev/usb/serial/ulpt.c

Modified: head/sys/dev/usb/serial/ulpt.c
==============================================================================
--- head/sys/dev/usb/serial/ulpt.c	Thu Jul 30 00:15:50 2009	(r195963)
+++ head/sys/dev/usb/serial/ulpt.c	Thu Jul 30 00:16:06 2009	(r195964)
@@ -426,6 +426,9 @@ ulpt_open(struct usb_fifo *fifo, int ffl
 	/* we assume that open is a serial process */
 
 	if (sc->sc_fflags == 0) {
+
+		/* reset USB paralell port */
+
 		ulpt_reset(sc);
 	}
 	return (unlpt_open(fifo, fflags));
@@ -720,7 +723,12 @@ ulpt_watchdog(void *arg)
 
 	mtx_assert(&sc->sc_mtx, MA_OWNED);
 
-	usbd_transfer_start(sc->sc_xfer[ULPT_INTR_DT_RD]);
+	/* 
+	 * Only read status while the device is not opened, due to
+	 * possible hardware or firmware bug in some printers.
+	 */
+	if (sc->sc_fflags == 0)
+		usbd_transfer_start(sc->sc_xfer[ULPT_INTR_DT_RD]);
 
 	usb_callout_reset(&sc->sc_watchdog,
 	    hz, &ulpt_watchdog, sc);