Fri Jan 2 13:09:36 2009 UTC ()
Remove duplicated key symbol in UK keymap.


(jdc)
diff -r1.15 -r1.16 src/sys/dev/sun/wskbdmap_sun.c
cvs diff -r1.15 -r1.16 src/sys/dev/sun/wskbdmap_sun.c (expand / switch to unified diff)

--- src/sys/dev/sun/wskbdmap_sun.c 2008/05/25 15:51:44 1.15
+++ src/sys/dev/sun/wskbdmap_sun.c 2009/01/02 13:09:36 1.16
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: wskbdmap_sun.c,v 1.15 2008/05/25 15:51:44 ghen Exp $ */ 1/* $NetBSD: wskbdmap_sun.c,v 1.16 2009/01/02 13:09:36 jdc Exp $ */
2/* $OpenBSD: sunkbd.c,v 1.9 2002/09/08 23:22:00 miod Exp $ */ 2/* $OpenBSD: sunkbd.c,v 1.9 2002/09/08 23:22:00 miod Exp $ */
3 3
4/* 4/*
5 * Copyright (c) 2002 Jason L. Wright (jason@thought.net) 5 * Copyright (c) 2002 Jason L. Wright (jason@thought.net)
6 * All rights reserved. 6 * All rights reserved.
7 * 7 *
8 * Redistribution and use in source and binary forms, with or without 8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions 9 * modification, are permitted provided that the following conditions
10 * are met: 10 * are met:
11 * 1. Redistributions of source code must retain the above copyright 11 * 1. Redistributions of source code must retain the above copyright
12 * notice, this list of conditions and the following disclaimer. 12 * notice, this list of conditions and the following disclaimer.
13 * 2. Redistributions in binary form must reproduce the above copyright 13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in the 14 * notice, this list of conditions and the following disclaimer in the
@@ -28,27 +28,27 @@ @@ -28,27 +28,27 @@
28 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 28 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
29 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, 29 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
30 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN 30 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
31 * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 31 * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
32 * POSSIBILITY OF SUCH DAMAGE. 32 * POSSIBILITY OF SUCH DAMAGE.
33 * 33 *
34 * Effort sponsored in part by the Defense Advanced Research Projects 34 * Effort sponsored in part by the Defense Advanced Research Projects
35 * Agency (DARPA) and Air Force Research Laboratory, Air Force 35 * Agency (DARPA) and Air Force Research Laboratory, Air Force
36 * Materiel Command, USAF, under agreement number F30602-01-2-0537. 36 * Materiel Command, USAF, under agreement number F30602-01-2-0537.
37 * 37 *
38 */ 38 */
39 39
40#include <sys/cdefs.h> 40#include <sys/cdefs.h>
41__KERNEL_RCSID(0, "$NetBSD: wskbdmap_sun.c,v 1.15 2008/05/25 15:51:44 ghen Exp $"); 41__KERNEL_RCSID(0, "$NetBSD: wskbdmap_sun.c,v 1.16 2009/01/02 13:09:36 jdc Exp $");
42 42
43#include <sys/types.h> 43#include <sys/types.h>
44#include <dev/wscons/wsksymdef.h> 44#include <dev/wscons/wsksymdef.h>
45#include <dev/wscons/wsksymvar.h> 45#include <dev/wscons/wsksymvar.h>
46 46
47#include "opt_sunkbd.h" 47#include "opt_sunkbd.h"
48 48
49#define KC(n) KS_KEYCODE(n) 49#define KC(n) KS_KEYCODE(n)
50 50
51static const keysym_t wssun_keydesctab_us [] = { 51static const keysym_t wssun_keydesctab_us [] = {
52/* pos command normal shifted */ 52/* pos command normal shifted */
53 KC(0x01), KS_Cmd, 53 KC(0x01), KS_Cmd,
54 KC(0x02), KS_Cmd_BrightnessDown, 54 KC(0x02), KS_Cmd_BrightnessDown,
@@ -242,27 +242,26 @@ const keysym_t wssun_keydesctab_de_nodea @@ -242,27 +242,26 @@ const keysym_t wssun_keydesctab_de_nodea
242 KC(0x29), KS_apostrophe, KS_grave, 242 KC(0x29), KS_apostrophe, KS_grave,
243 KC(0x2a), KS_asciicircum, KS_degree, 243 KC(0x2a), KS_asciicircum, KS_degree,
244 KC(0x41), KS_plus, KS_asterisk, KS_asciitilde, 244 KC(0x41), KS_plus, KS_asterisk, KS_asciitilde,
245}; 245};
246 246
247const keysym_t wssun_keydesctab_uk[] = { 247const keysym_t wssun_keydesctab_uk[] = {
248 KC(0x1f), KS_2, KS_quotedbl, 248 KC(0x1f), KS_2, KS_quotedbl,
249 KC(0x20), KS_3, KS_sterling, 249 KC(0x20), KS_3, KS_sterling,
250 KC(0x21), KS_4, KS_dollar, KS_currency, 250 KC(0x21), KS_4, KS_dollar, KS_currency,
251 KC(0x2a), KS_grave, KS_notsign, 251 KC(0x2a), KS_grave, KS_notsign,
252 KC(0x57), KS_apostrophe, KS_at, 252 KC(0x57), KS_apostrophe, KS_at,
253 KC(0x58), KS_numbersign, KS_asciitilde, 253 KC(0x58), KS_numbersign, KS_asciitilde,
254 KC(0x7c), KS_backslash, KS_bar, 254 KC(0x7c), KS_backslash, KS_bar,
255 KC(0x7c), KS_backslash, KS_bar, 
256}; 255};
257 256
258static const keysym_t wssun_keydesctab_us_dvorak[] = { 257static const keysym_t wssun_keydesctab_us_dvorak[] = {
259/* pos command normal shifted */ 258/* pos command normal shifted */
260 KC(0x28), KS_bracketleft, KS_braceleft, 259 KC(0x28), KS_bracketleft, KS_braceleft,
261 KC(0x29), KS_bracketright,KS_braceright, 260 KC(0x29), KS_bracketright,KS_braceright,
262 KC(0x36), KS_apostrophe, KS_quotedbl, 261 KC(0x36), KS_apostrophe, KS_quotedbl,
263 KC(0x37), KS_comma, KS_less, 262 KC(0x37), KS_comma, KS_less,
264 KC(0x38), KS_period, KS_greater, 263 KC(0x38), KS_period, KS_greater,
265 KC(0x39), KS_p, 264 KC(0x39), KS_p,
266 KC(0x3a), KS_y, 265 KC(0x3a), KS_y,
267 KC(0x3b), KS_f, 266 KC(0x3b), KS_f,
268 KC(0x3c), KS_g, 267 KC(0x3c), KS_g,