Module Name: src
Committed By: sborrill
Date: Fri Feb 7 11:15:37 UTC 2014
Modified Files:
src/sys/dev/ic [netbsd-6]: pckbc.c
Log Message:
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
To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.53.2.1 src/sys/dev/ic/pckbc.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/ic/pckbc.c
diff -u src/sys/dev/ic/pckbc.c:1.53 src/sys/dev/ic/pckbc.c:1.53.2.1
--- src/sys/dev/ic/pckbc.c:1.53 Thu Feb 2 19:43:03 2012
+++ src/sys/dev/ic/pckbc.c Fri Feb 7 11:15:37 2014
@@ -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 @@ pckbcintr(void *vsc)
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);
