[src/netbsd-6]: src/sys/dev/ic Pull up the following revisions(s) (requested ...

[sborrill <sborrill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/05f2d2065261
branches:  netbsd-6
changeset: 776558:05f2d2065261
user:      sborrill <sborrill%NetBSD.org@localhost>
date:      Fri Feb 07 11:15:37 2014 +0000

description:
Pull up the following revisions(s) (requested by skrll in ticket #1014):
        sys/dev/ic/pckbc.c:     revision 1.56

Do not take data from the keyboard controller in interrupt handler if
we are polling. Fixes PR/47406

diffstat:

 sys/dev/ic/pckbc.c |  10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diffs (35 lines):

diff -r e679b6ffad6a -r 05f2d2065261 sys/dev/ic/pckbc.c
--- a/sys/dev/ic/pckbc.c        Mon Feb 03 11:55:03 2014 +0000
+++ b/sys/dev/ic/pckbc.c        Fri Feb 07 11:15:37 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pckbc.c,v 1.53 2012/02/02 19:43:03 tls Exp $ */
+/* $NetBSD: pckbc.c,v 1.53.2.1 2014/02/07 11:15:37 sborrill Exp $ */
 
 /*
  * Copyright (c) 2004 Ben Harris.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pckbc.c,v 1.53 2012/02/02 19:43:03 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pckbc.c,v 1.53.2.1 2014/02/07 11:15:37 sborrill Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -583,12 +583,14 @@
                if (!(stat & KBS_DIB))
                        break;
 
-               served = 1;
-
                slot = (t->t_haveaux && (stat & 0x20)) ?
                    PCKBC_AUX_SLOT : PCKBC_KBD_SLOT;
                q = t->t_slotdata[slot];
 
+               if (q != NULL && q->polling)
+                       return 0;
+
+               served = 1;
                KBD_DELAY;
                data = bus_space_read_1(t->t_iot, t->t_ioh_d, 0);