NetBSD Problem Report #35473

From www@NetBSD.org  Wed Jan 24 09:17:20 2007
Return-Path: <www@NetBSD.org>
Received: by narn.NetBSD.org (Postfix, from userid 31301)
	id 1094663B8AD; Wed, 24 Jan 2007 09:17:20 +0000 (UTC)
Message-Id: <20070124091720.1094663B8AD@narn.NetBSD.org>
Date: Wed, 24 Jan 2007 09:17:20 +0000 (UTC)
From: spanny@spanny.nl
Reply-To: spanny@spanny.nl
To: gnats-bugs@NetBSD.org
Subject: Added Dutch keyboard support to wscons (patches included)
X-Send-Pr-Version: www-1.0

>Number:         35473
>Category:       port-i386
>Synopsis:       Added Dutch keyboard support to wscons (patches included)
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    jruoho
>State:          closed
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Wed Jan 24 09:20:00 +0000 2007
>Closed-Date:    Fri Jul 22 18:02:07 +0000 2011
>Last-Modified:  Fri Jul 22 18:40:01 +0000 2011
>Originator:     Wigcher Spanninga
>Release:        3.1
>Organization:
>Environment:
NetBSD staalbsd 3.1 NetBSD 3.1
>Description:
Being the user of a dutch PC keyboard I find it more convenient to use the dutch keyboard layout when working on the console. I therefor updated wskbdmap_mfii.c and wsksymdef.h to include dutch keyboard support and rebuild the kernel and wsconsctl. If this could be added to some future release that would be nice.
>How-To-Repeat:
wsconsctl -k -w encoding=nl
wsconsctl: nl: not a valid encoding
>Fix:
Applying the following patches and rebuilding the kernel and wsconsctl will fix the problem:

wsksymdef.h:
<--snip-->
Index: wsksymdef.h
===================================================================
RCS file: /cvsroot/src/sys/dev/wscons/wsksymdef.h,v
retrieving revision 1.56
diff -u -r1.56 wsksymdef.h
--- wsksymdef.h	1 Apr 2006 23:02:32 -0000	1.56
+++ wsksymdef.h	24 Jan 2007 08:43:08 -0000
@@ -584,6 +584,7 @@
 action(KB_UK,	0,	0x0700,	"uk",	,	"UK-English")	\
 action(KB_BE,	0,	0x1300,	"be",	,	"Belgian")	\
 action(KB_DK,	0,	0x0400,	"dk",	,	"Danish")	\
+action(KB_NL,	0,	0x1500,	"nl",	,	"Dutch") 	\
 action(KB_FI,	0,	0x0900,	"fi",	,	"Finnish")	\
 action(KB_FR,	0,	0x0600,	"fr",	,	"French")	\
 action(KB_DE, KB_NODEAD,0x0300,	"de",".nodead",	"German")	\
@@ -604,7 +605,7 @@

 /* Define all the KB_xx numeric values using above table */
 #define KBF_ENUM(tag, tagf, value, cc, ccf, country) tag=value,
-enum { KB_ENC_FUN(KBF_ENUM) KB_NEXT=0x1500 };
+enum { KB_ENC_FUN(KBF_ENUM) KB_NEXT=0x1600 };

 /* Define list of KB_xxx and country codes for array initialisation */
 #define KBF_ENCTAB(tag, tagf, value, cc, ccf, country) { tag, cc },
<--snip-->

wskbdmap_mfii.c:
<--snip-->
Index: wskbdmap_mfii.c
===================================================================
RCS file: /cvsroot/src/sys/dev/pckbport/wskbdmap_mfii.c,v
retrieving revision 1.11
diff -u -r1.11 wskbdmap_mfii.c
--- wskbdmap_mfii.c	1 Apr 2006 23:02:32 -0000	1.11
+++ wskbdmap_mfii.c	24 Jan 2007 08:38:32 -0000
@@ -192,6 +192,40 @@
     KC(184), KS_Mode_switch,	KS_Multi_key,
 };

+static const keysym_t pckbd_keydesc_nl[] = {
+/*  pos	     normal		shifted		altgr		shift-altgr */
+    KC(2),   KS_1,		KS_exclam,	KS_onesuperior,
+    KC(3),   KS_2,		KS_quotedbl,	KS_twosuperior,
+    KC(4),   KS_3,		KS_numbersign,	KS_threesuperior,
+    KC(5),   KS_4,		KS_dollar,	KS_onequarter,
+    KC(6),   KS_5,		KS_percent,	KS_onehalf,
+    KC(7),   KS_6,		KS_ampersand,	KS_threequarters,
+    KC(8),   KS_7,		KS_underscore,	KS_sterling,
+    KC(9),   KS_8,		KS_parenleft,	KS_bracketleft,
+    KC(10),  KS_9,		KS_parenright,	KS_bracketright,
+    KC(11),  KS_0,		KS_apostrophe,
+    KC(12),  KS_slash,		KS_question,	KS_backslash,
+    KC(13),  KS_degree,		KS_dead_tilde,	KS_dead_cedilla,
+    KC(18),  KS_e,		KS_E,		KS_currency,
+    KC(26),  KS_dead_diaeresis,	KS_dead_circumflex,
+    KC(27),  KS_asterisk,	KS_bar,
+    KC(30),  KS_s,		KS_S,		KS_ssharp,
+    KC(39),  KS_plus,		KS_plusminus,
+    KC(40),  KS_dead_acute,	KS_dead_grave,
+    KC(41),  KS_at,		KS_paragraph,	KS_notsign,
+    KC(43),  KS_less,		KS_greater,
+    KC(44),  KS_z,		KS_Z,		KS_guillemotleft,
+    KC(45),  KS_x,		KS_X,		KS_guillemotright,
+    KC(46),  KS_c,		KS_C,		KS_cent,
+    KC(50),  KS_m,		KS_M,		KS_mu,
+    KC(51),  KS_comma,		KS_semicolon,
+    KC(52),  KS_period,		KS_colon,
+    KC(53),  KS_minus,		KS_equal,
+    KC(86),  KS_braceleft,	KS_braceright,	KS_brokenbar,
+    KC(184), KS_Mode_switch,	KS_Multi_key,
+};
+
+
 static const keysym_t pckbd_keydesc_de[] = {
 /*  pos      normal		shifted		altgr		shift-altgr */
     KC(3),   KS_2,		KS_quotedbl,	KS_twosuperior,
@@ -579,6 +613,7 @@
 	KBD_MAP(KB_ES ,			KB_US,	pckbd_keydesc_es),
 	KBD_MAP(KB_PT,			KB_US,	pckbd_keydesc_pt),
 	KBD_MAP(KB_GR,			KB_US,	pckbd_keydesc_gr),
+	KBD_MAP(KB_NL,      KB_US,  pckbd_keydesc_nl),
 #endif /* WSKBD_USONLY */

 	/* placeholders */
<--snip-->

>Release-Note:

>Audit-Trail:
From: Wigcher Spanninga <spanny@spanny.nl>
To: gnats-bugs@NetBSD.org
Cc: 
Subject: Re: port-i386/35473: Added Dutch keyboard support to wscons (patches
 included)
Date: Thu, 25 Jan 2007 10:12:21 +0100

 I just found I submitted the wrong patch for wskbdmap_mfii.c.
 My apologies about that, here's the right one:
 <--snip-->
 Index: wskbdmap_mfii.c
 ===================================================================
 RCS file: /cvsroot/src/sys/dev/pckbport/wskbdmap_mfii.c,v
 retrieving revision 1.11
 diff -u -r1.11 wskbdmap_mfii.c
 --- wskbdmap_mfii.c    1 Apr 2006 23:02:32 -0000    1.11
 +++ wskbdmap_mfii.c    25 Jan 2007 09:04:39 -0000
 @@ -192,6 +192,40 @@
      KC(184), KS_Mode_switch,    KS_Multi_key,
  };

 +static const keysym_t pckbd_keydesc_nl[] = {
 +/*  pos         normal        shifted        altgr        shift-altgr */
 +    KC(2),   KS_1,        KS_exclam,    KS_onesuperior,
 +    KC(3),   KS_2,        KS_quotedbl,    KS_twosuperior,
 +    KC(4),   KS_3,        KS_numbersign,    KS_threesuperior,
 +    KC(5),   KS_4,        KS_dollar,    KS_onequarter,
 +    KC(6),   KS_5,        KS_percent,    KS_onehalf,
 +    KC(7),   KS_6,        KS_ampersand,    KS_threequarters,
 +    KC(8),   KS_7,        KS_underscore,    KS_sterling,
 +    KC(9),   KS_8,        KS_parenleft,    KS_braceleft,
 +    KC(10),  KS_9,        KS_parenright,    KS_braceright,
 +    KC(11),  KS_0,        KS_apostrophe,
 +    KC(12),  KS_slash,        KS_question,    KS_backslash,
 +    KC(13),  KS_degree,        KS_dead_tilde,    KS_dead_cedilla,
 +    KC(18),  KS_e,        KS_E,        KS_currency,
 +    KC(26),  KS_dead_diaeresis,    KS_dead_circumflex,
 +    KC(27),  KS_asterisk,    KS_bar,
 +    KC(31),  KS_s,        KS_S,        KS_ssharp,
 +    KC(39),  KS_plus,        KS_plusminus,
 +    KC(40),  KS_dead_acute,    KS_dead_grave,
 +    KC(41),  KS_at,        KS_paragraph,    KS_notsign,
 +    KC(43),  KS_less,        KS_greater,
 +    KC(44),  KS_z,        KS_Z,        KS_guillemotleft,
 +    KC(45),  KS_x,        KS_X,        KS_guillemotright,
 +    KC(46),  KS_c,        KS_C,        KS_cent,
 +    KC(50),  KS_m,        KS_M,        KS_mu,
 +    KC(51),  KS_comma,        KS_semicolon,
 +    KC(52),  KS_period,        KS_colon,
 +    KC(53),  KS_minus,        KS_equal,
 +    KC(86),  KS_bracketright,    KS_bracketleft,    KS_brokenbar,
 +    KC(184), KS_Mode_switch,    KS_Multi_key,
 +};
 +
 +
  static const keysym_t pckbd_keydesc_de[] = {
  /*  pos      normal        shifted        altgr        shift-altgr */
      KC(3),   KS_2,        KS_quotedbl,    KS_twosuperior,
 @@ -579,6 +613,7 @@
      KBD_MAP(KB_ES ,            KB_US,    pckbd_keydesc_es),
      KBD_MAP(KB_PT,            KB_US,    pckbd_keydesc_pt),
      KBD_MAP(KB_GR,            KB_US,    pckbd_keydesc_gr),
 +    KBD_MAP(KB_NL,      KB_US,  pckbd_keydesc_nl),
  #endif /* WSKBD_USONLY */

      /* placeholders */
 <--snip-->


 gnats-admin@NetBSD.org schreef:
 > Thank you very much for your problem report.
 > It has the internal identification `port-i386/35473'.
 > The individual assigned to look at your
 > report is: port-i386-maintainer. 
 >
 >   
 >> Category:       port-i386
 >> Responsible:    port-i386-maintainer
 >> Synopsis:       Added Dutch keyboard support to wscons (patches included)
 >> Arrival-Date:   Wed Jan 24 09:20:00 +0000 2007
 >>     
 >
 >
 >
 >   

Responsible-Changed-From-To: port-i386-maintainer->jruoho
Responsible-Changed-By: jruoho@NetBSD.org
Responsible-Changed-When: Wed, 22 Jun 2011 10:42:54 +0000
Responsible-Changed-Why:

Do we have any Dutch people here? But maybe this can be just committed.



State-Changed-From-To: open->analyzed
State-Changed-By: jruoho@NetBSD.org
State-Changed-When: Wed, 22 Jun 2011 10:42:54 +0000
State-Changed-Why:


State-Changed-From-To: analyzed->closed
State-Changed-By: christos@NetBSD.org
State-Changed-When: Fri, 22 Jul 2011 14:02:07 -0400
State-Changed-Why:
fixed


From: "Christos Zoulas" <christos@netbsd.org>
To: gnats-bugs@gnats.NetBSD.org
Cc: 
Subject: PR/35473 CVS commit: src/sys/dev
Date: Fri, 22 Jul 2011 14:17:12 -0400

 Module Name:	src
 Committed By:	christos
 Date:		Fri Jul 22 18:17:12 UTC 2011

 Modified Files:
 	src/sys/dev/pckbport: wskbdmap_mfii.c
 	src/sys/dev/wscons: wsksymdef.h

 Log Message:
 PR/35473: Wigcher Spanninga: Add Dutch keyboard support to wscons


 To generate a diff of this commit:
 cvs rdiff -u -r1.19 -r1.20 src/sys/dev/pckbport/wskbdmap_mfii.c
 cvs rdiff -u -r1.64 -r1.65 src/sys/dev/wscons/wsksymdef.h

 Please note that diffs are not public domain; they are subject to the
 copyright notices on the relevant files.

From: bch@methodlogic.net
To: gnats-bugs@NetBSD.org
Cc: jruoho@NetBSD.org, gnats-admin@netbsd.org, netbsd-bugs@netbsd.org,
	spanny@spanny.nl
Subject: Re: PR/35473 CVS commit: src/sys/dev
Date: Fri, 22 Jul 2011 18:32:12 +0000

 On Fri, Jul 22, 2011 at 06:20:06PM +0000, Christos Zoulas wrote:
 > The following reply was made to PR port-i386/35473; it has been noted by GNATS.


 --- wskbdmap_mfii.o ---
 /usr/src/sys/dev/pckbport/wskbdmap_mfii.c:192: error: previous definition of 'pckbd_keydesc_nl' was here
 *** [wskbdmap_mfii.o] Error code 1




 > From: "Christos Zoulas" <christos@netbsd.org>
 > To: gnats-bugs@gnats.NetBSD.org
 > Cc: 
 > Subject: PR/35473 CVS commit: src/sys/dev
 > Date: Fri, 22 Jul 2011 14:17:12 -0400
 > 
 >  Module Name:	src
 >  Committed By:	christos
 >  Date:		Fri Jul 22 18:17:12 UTC 2011
 >  
 >  Modified Files:
 >  	src/sys/dev/pckbport: wskbdmap_mfii.c
 >  	src/sys/dev/wscons: wsksymdef.h
 >  
 >  Log Message:
 >  PR/35473: Wigcher Spanninga: Add Dutch keyboard support to wscons
 >  
 >  
 >  To generate a diff of this commit:
 >  cvs rdiff -u -r1.19 -r1.20 src/sys/dev/pckbport/wskbdmap_mfii.c
 >  cvs rdiff -u -r1.64 -r1.65 src/sys/dev/wscons/wsksymdef.h
 >  
 >  Please note that diffs are not public domain; they are subject to the
 >  copyright notices on the relevant files.
 >  

 -- 
 Brad Harder
 Method Logic Digital Consulting
 http://methodlogic.net/
 http://twitter.com/bcharder

>Unformatted:

NetBSD Home
NetBSD PR Database Search

(Contact us) $NetBSD: query-full-pr,v 1.39 2013/11/01 18:47:49 spz Exp $
$NetBSD: gnats_config.sh,v 1.8 2006/05/07 09:23:38 tsutsui Exp $
Copyright © 1994-2007 The NetBSD Foundation, Inc. ALL RIGHTS RESERVED.