Fri Sep 3 16:21:15 2021 UTC ()

Ignore mouse packets to avoid unexpected data handled as keyboard input.

Patch from moveccr.


(tsutsui)

diff -r1.4 -r1.5 src/sys/arch/luna68k/stand/boot/kbd.c

--- src/sys/arch/luna68k/stand/boot/kbd.c 2015/02/14 13:06:28	1.4
+++ src/sys/arch/luna68k/stand/boot/kbd.c 2021/09/03 16:21:15	1.5

 @@ -1,14 +1,14 @@
-/*	$NetBSD: kbd.c,v 1.4 2015/02/14 13:06:28 tsutsui Exp $	*/
+/*	$NetBSD: kbd.c,v 1.5 2021/09/03 16:21:15 tsutsui Exp $	*/
 /*
  * Copyright (c) 1992 OMRON Corporation.
+ *
  * This code is derived from software contributed to Berkeley by
  * OMRON Corporation.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -203,32 +203,43 @@ static const struct kbd_keymap kbd_keyma
 	{ KC_IGNORE,	{ 0,	    0        } },	/* 120 [0x78]	      */
 	{ KC_IGNORE,	{ 0,	    0        } },	/* 121 [0x79]	      */
 	{ KC_IGNORE,	{ 0,	    0        } },	/* 122 [0x7A]	      */
 	{ KC_IGNORE,	{ 0,	    0        } },	/* 123 [0x7B]	      */
 	{ KC_IGNORE,	{ 0,	    0        } },	/* 124 [0x7C]	      */
 	{ KC_IGNORE,	{ 0,	    0        } },	/* 125 [0x7D]	      */
 	{ KC_IGNORE,	{ 0,	    0        } },	/* 126 [0x7E]	      */
 	{ KC_IGNORE,	{ 0,	    0        } },	/* 127 [0x7F]	      */
 };
 int	shift_flag = 0;
 int	ctrl_flag  = 0;
 int	meta_flag  = 0;
 int	mouse_flag  = 0;
 int
 kbd_decode(uint8_t code)
+{
 	unsigned int c, updown = 0;
 	/* ignore mouse data */
 	if (mouse_flag != 0) {
 		mouse_flag--;
 		return KC_IGNORE;
+	}
 	if ((code & 0xf8) == 0x80) {
 		mouse_flag = 2;
 		return KC_IGNORE;
+	}
 	if (code & 0x80)
 		updown = 1;
 	code &= 0x7F;
 	c = kbd_keymap[code].km_type;
 	if (c == KC_IGNORE)
 		return KC_IGNORE;
 	if ((c == KC_CODE) && updown)
 		return KC_IGNORE;