From nobody@FreeBSD.org  Fri Sep 25 22:03:20 2009
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D5167106566C
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 25 Sep 2009 22:03:20 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id AB7E88FC12
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 25 Sep 2009 22:03:20 +0000 (UTC)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id n8PM3K9e041944
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 25 Sep 2009 22:03:20 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id n8PM3KRs041943;
	Fri, 25 Sep 2009 22:03:20 GMT
	(envelope-from nobody)
Message-Id: <200909252203.n8PM3KRs041943@www.freebsd.org>
Date: Fri, 25 Sep 2009 22:03:20 GMT
From: paradox <ddkprog@yahoo.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: the problem CapsLock Led
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         139144
>Category:       kern
>Synopsis:       [keyboard] [patch] CapsLock LED should not depend on keymap
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Sep 25 22:10:00 UTC 2009
>Closed-Date:    
>Last-Modified:  Thu Jan 07 00:06:30 UTC 2010
>Originator:     paradox
>Release:        9 current
>Organization:
>Environment:
FreeBSD asus 9.0-CURRENT FreeBSD 9.0-CURRENT #0: Fri Sep 25 16:10:42 UTC 2009     root@asus:/work/cvsup/freebsd/9.0/src/sys/amd64/compile/GENERIC  amd64
>Description:
have problem with CapsLock Led indicator
as i am understand CapsLock Led should not depend on keymap
and should always indication CapsLock Key status
but after load keymap 
  as example kbdcontrol -l ru.koi8-r
lost status indication CapsLock Key
possible not better patch below
but it works
>How-To-Repeat:
press CapsLock key before
and after load keymap
kbdcontrol -l ru.koi8-r 
>Fix:


Patch attached with submission follows:

--- kbd.c.orig	2009-09-26 01:29:58.000000000 +0400
+++ kbd.c	2009-09-26 01:35:23.000000000 +0400
@@ -1232,6 +1232,19 @@
 	if (up) {	/* break: key released */
 		action = kbd->kb_lastact[keycode];
 		kbd->kb_lastact[keycode] = NOP;
+
+		switch (keycode) {
+		case 0x3a:
+#ifndef PC98
+			state &= ~CLKDOWN;
+#else
+			state &= ~CLKED;
+			i = state & LOCK_MASK;
+			kbdd_ioctl(kbd, KDSETLED, (caddr_t)&i);
+#endif
+		default:;
+		}
+
 		switch (action) {
 		case LSHA:
 			if (state & SHIFTAON) {
@@ -1303,13 +1316,6 @@
 			state &= ~NLKDOWN;
 			break;
 		case CLK:
-#ifndef PC98
-			state &= ~CLKDOWN;
-#else
-			state &= ~CLKED;
-			i = state & LOCK_MASK;
-			kbdd_ioctl(kbd, KDSETLED, (caddr_t)&i);
-#endif
 			break;
 		case SLK:
 			state &= ~SLKDOWN;
@@ -1333,12 +1339,9 @@
 				kbd->kb_lastact[keycode] = action;
 			if (kbd->kb_lastact[keycode] != action)
 				action = NOP;
-			switch (action) {
-			/* LOCKING KEYS */
-			case NLK:
-				set_lockkey_state(kbd, state, NLK);
-				break;
-			case CLK:
+
+			switch (keycode) {
+			case 0x3a:
 #ifndef PC98
 				set_lockkey_state(kbd, state, CLK);
 #else
@@ -1346,6 +1349,16 @@
 				i = state & LOCK_MASK;
 				kbdd_ioctl(kbd, KDSETLED, (caddr_t)&i);
 #endif
+
+			default:;
+			}
+
+			switch (action) {
+			/* LOCKING KEYS */
+			case NLK:
+				set_lockkey_state(kbd, state, NLK);
+				break;
+			case CLK:
 				break;
 			case SLK:
 				set_lockkey_state(kbd, state, SLK);


>Release-Note:
>Audit-Trail:
>Unformatted:
