From owner-p4-projects@FreeBSD.ORG  Thu Jan 28 16:42:39 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id AA5DC1065672; Thu, 28 Jan 2010 16:42:39 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 66B79106566C
	for <perforce@FreeBSD.org>; Thu, 28 Jan 2010 16:42:39 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 544328FC1A
	for <perforce@FreeBSD.org>; Thu, 28 Jan 2010 16:42:39 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o0SGgdLd072049
	for <perforce@FreeBSD.org>; Thu, 28 Jan 2010 16:42:39 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o0SGgdaG072047
	for perforce@freebsd.org; Thu, 28 Jan 2010 16:42:39 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Thu, 28 Jan 2010 16:42:39 GMT
Message-Id: <201001281642.o0SGgdaG072047@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 173847 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 28 Jan 2010 16:42:39 -0000

http://p4web.freebsd.org/chv.cgi?CH=173847

Change 173847 by hselasky@hselasky_laptop001 on 2010/01/28 16:42:37

	
	USB input:
		- fix for leftover key-presses after polling
		- patch by: HPS
	
	PR:		usb/143286, kern/141011

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/input/ukbd.c#41 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/input/ukbd.c#41 (text+ko) ====

@@ -283,7 +283,8 @@
 static int	ukbd_enable(keyboard_t *);
 static int	ukbd_disable(keyboard_t *);
 static void	ukbd_interrupt(struct ukbd_softc *);
-static int	ukbd_is_polling(struct ukbd_softc *sc);
+static int	ukbd_is_polling(struct ukbd_softc *);
+static void	ukbd_event_keyinput(struct ukbd_softc *);
 
 static device_probe_t ukbd_probe;
 static device_attach_t ukbd_attach;
@@ -395,7 +396,6 @@
 	uint32_t o_mod;
 	uint32_t now = sc->sc_time_ms;
 	uint32_t dtime;
-	uint32_t c;
 	uint8_t key;
 	uint8_t i;
 	uint8_t j;
@@ -482,6 +482,17 @@
 	if (sc->sc_inputs == 0)
 		goto done;
 
+	ukbd_event_keyinput(sc);
+
+done:
+	return;
+}
+
+static void
+ukbd_event_keyinput(struct ukbd_softc *sc)
+{
+	int c;
+
 	if (KBD_IS_ACTIVE(&sc->sc_kbd) &&
 	    KBD_IS_BUSY(&sc->sc_kbd)) {
 		/* let the callback function process the input */
@@ -493,8 +504,6 @@
 			c = ukbd_read_char(&sc->sc_kbd, 0);
 		} while (c != NOKEY);
 	}
-done:
-	return;
 }
 
 static void
@@ -509,6 +518,9 @@
 	ukbd_interrupt(sc);
 
 	if (ukbd_any_key_pressed(sc)) {
+		if (ukbd_is_polling(sc) == 0)
+			ukbd_event_keyinput(sc);
+
 		ukbd_start_timer(sc);
 	} else {
 		sc->sc_flags &= ~UKBD_FLAG_TIMER_RUNNING;