From fc9c327ccc47dcc7b2c4197af2cbb842f362ae10 Mon Sep 17 00:00:00 2001
From: Martin Pieuchot <mpi@cvs.openbsd.org>
Date: Sun, 16 Mar 2014 10:32:32 +0000
Subject: Don't use volume keys when in raw-mode (this doesn't work), and let
 Xorg driver do the translation and handle them as regular keys. Fixes
 confusion caused by the volume being changed twice in contradictory ways:
 once by X programs and once by the ukbd(4) driver.

ok ratchov@
---
 sys/dev/usb/hidkbd.c | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

(limited to 'sys/dev/usb/hidkbd.c')

diff --git a/sys/dev/usb/hidkbd.c b/sys/dev/usb/hidkbd.c
index b04dd1294ad..06d0976a6a8 100644
--- a/sys/dev/usb/hidkbd.c
+++ b/sys/dev/usb/hidkbd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hidkbd.c,v 1.8 2013/04/22 15:10:56 deraadt Exp $	*/
+/*	$OpenBSD: hidkbd.c,v 1.9 2014/03/16 10:32:31 mpi Exp $	*/
 /*      $NetBSD: ukbd.c,v 1.85 2003/03/11 16:44:00 augustss Exp $        */
 
 /*
@@ -425,22 +425,6 @@ hidkbd_decode(struct hidkbd *kbd, struct hidkbd_data *ud)
 		}
 		s = spltty();
 		wskbd_rawinput(kbd->sc_wskbddev, cbuf, j);
-
-		/*
-		 * Pass audio keys to wskbd_input anyway.
-		 */
-		for (i = 0; i < nkeys; i++) {
-			key = ibuf[i];
-			switch (key & CODEMASK) {
-			case 127:
-			case 128:
-			case 129:
-				wskbd_input(kbd->sc_wskbddev,
-				    key & RELEASE ?  WSCONS_EVENT_KEY_UP :
-				      WSCONS_EVENT_KEY_DOWN, key & CODEMASK);
-				break;
-			}
-		}
 		splx(s);
 
 		return;
-- 
cgit v1.2.3