From owner-p4-projects@FreeBSD.ORG  Mon Aug  3 18:40:35 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B9A081065677; Mon,  3 Aug 2009 18:40:34 +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 771EF1065670
	for <perforce@FreeBSD.org>; Mon,  3 Aug 2009 18:40:34 +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 654A48FC12
	for <perforce@FreeBSD.org>; Mon,  3 Aug 2009 18:40:34 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n73IeYCs087326
	for <perforce@FreeBSD.org>; Mon, 3 Aug 2009 18:40:34 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n73IeY7L087324
	for perforce@freebsd.org; Mon, 3 Aug 2009 18:40:34 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Mon, 3 Aug 2009 18:40:34 GMT
Message-Id: <200908031840.n73IeY7L087324@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>
Cc: 
Subject: PERFORCE change 166980 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
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: Mon, 03 Aug 2009 18:40:36 -0000

http://perforce.freebsd.org/chv.cgi?CH=166980

Change 166980 by hselasky@hselasky_laptop001 on 2009/08/03 18:39:51

	
	Avoid using microtime() in polling mode.

Affected files ...

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

Differences ...

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

@@ -170,7 +170,6 @@
 	int32_t	sc_state;		/* shift/lock key state */
 	int32_t	sc_accents;		/* accent key index (> 0) */
 
-	uint16_t sc_microtime;		/* used when polling */
 	uint16_t sc_inputs;
 	uint16_t sc_inputhead;
 	uint16_t sc_inputtail;
@@ -303,8 +302,8 @@
 static void
 ukbd_do_poll(struct ukbd_softc *sc, uint8_t wait)
 {
-	struct timeval tv;
-	uint16_t temp;
+	uint8_t i;
+	uint8_t j;
 
 	DPRINTFN(2, "polling\n");
 
@@ -312,21 +311,17 @@
 
 		usbd_transfer_poll(sc->sc_xfer, UKBD_N_TRANSFER);
 
-		microtime(&tv);
+		/* Delay-optimised support for repetition of keys */
 
-		temp = tv.tv_usec / 25000;
+		for (j = i = 0; i < UKBD_NKEYCODE; i++)
+			j |= sc->sc_odata.keycode[i];
 
-		/* support repetition of keys: */
+		if (j) {
+			/* a key is pressed - need timekeeping */
+			DELAY(1000);
 
-		if (sc->sc_microtime != temp) {
-
-			/* wait for next delta */
-
-			sc->sc_microtime = temp;
-
-			/* 25 milliseconds have passed */
-
-			sc->sc_time_ms += 25;
+			/* 1 millisecond has passed */
+			sc->sc_time_ms += 1;
 		}
 
 		ukbd_interrupt(sc);