Module Name: src
Committed By: jmcneill
Date: Tue Jul 23 12:28:52 UTC 2019
Modified Files:
src/sys/dev/pckbport: pckbd.c
Log Message:
pckbd_cngetc: Set type=0 and return if no data is available
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/dev/pckbport/pckbd.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/pckbport/pckbd.c
diff -u src/sys/dev/pckbport/pckbd.c:1.33 src/sys/dev/pckbport/pckbd.c:1.34
--- src/sys/dev/pckbport/pckbd.c:1.33 Sun Jun 11 03:55:56 2017
+++ src/sys/dev/pckbport/pckbd.c Tue Jul 23 12:28:52 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: pckbd.c,v 1.33 2017/06/11 03:55:56 nat Exp $ */
+/* $NetBSD: pckbd.c,v 1.34 2019/07/23 12:28:52 jmcneill Exp $ */
/*-
* Copyright (c) 1998, 2009 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pckbd.c,v 1.33 2017/06/11 03:55:56 nat Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pckbd.c,v 1.34 2019/07/23 12:28:52 jmcneill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1094,8 +1094,11 @@ pckbd_cngetc(void *v, u_int *type, int *
for (;;) {
val = pckbport_poll_data(t->t_kbctag, t->t_kbcslot);
- if (val == -1)
- continue;
+ if (val == -1) {
+ *type = 0;
+ *data = 0;
+ return;
+ }
val = pckbd_scancode_translate(t, val);
if (val == 0)