Implement pckbc_xt_translation() in gsckbc. Thus, we can attach pckbd instead of

gsckbd; the former will cause a proper translation page to be selected by
the keyboard.

Because of this, we no longer depend on the page the keyboard is left in
by the PDC (page 2 for all machines but the PrecisionBook, which is in
page 3), and there is no longer any need to use separate keyboard maps.

5 files changed, 11 insertions, 248 deletions

diff --git a/share/man/man4/man4.hppa/Makefile b/share/man/man4/man4.hppa/Makefile
index 605cede12d1..71d2e7fd4f4 100644
--- a/share/man/man4/man4.hppa/Makefile
+++ b/share/man/man4/man4.hppa/Makefile
@@ -1,7 +1,7 @@
-#	$OpenBSD: Makefile,v 1.26 2008/04/27 14:54:36 kettenis Exp $
+#	$OpenBSD: Makefile,v 1.27 2008/07/16 16:32:08 miod Exp $
 
 MAN=	asp.4 astro.4 cpu.4tbl dino.4 elroy.4
-MAN+=	gecko.4 gsc.4 gsckbc.4 gsckbd.4
+MAN+=	gecko.4 gsc.4 gsckbc.4
 MAN+=	harmony.4 ie.4 intro.4 io.4 lasi.4 lcd.4 mem.4 mongoose.4 pdc.4
 MAN+=	phantomas.4 power.4 runway.4 ssio.4 uturn.4 wax.4
 # tir.4 xbar.4 mcx.4
diff --git a/share/man/man4/man4.hppa/gsckbc.4 b/share/man/man4/man4.hppa/gsckbc.4
index b60c658ae33..9ba2a420de8 100644
--- a/share/man/man4/man4.hppa/gsckbc.4
+++ b/share/man/man4/man4.hppa/gsckbc.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: gsckbc.4,v 1.4 2007/05/31 19:19:54 jmc Exp $
+.\" $OpenBSD: gsckbc.4,v 1.5 2008/07/16 16:32:08 miod Exp $
 .\"
 .\" Copyright (c) 2003, Miodrag Vallat.
 .\" All rights reserved.
@@ -24,7 +24,7 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: July 16 2008 $
 .Dt GSCKBC 4 hppa
 .Os
 .Sh NAME
@@ -32,7 +32,7 @@
 .Nd PS/2-like controller driver
 .Sh SYNOPSIS
 .Cd "gsckbc* at gsc? irq 26"
-.Cd "gsckbd* at gsckbc?"
+.Cd "pckbd*  at gsckbc?"
 .Cd "pms*    at gsckbc?"
 .Sh DESCRIPTION
 The
@@ -48,5 +48,5 @@ port or the
 port.
 .Sh SEE ALSO
 .Xr gsc 4 ,
-.Xr gsckbd 4 ,
+.Xr pckbd 4 ,
 .Xr pms 4
diff --git a/share/man/man4/man4.hppa/gsckbd.4 b/share/man/man4/man4.hppa/gsckbd.4
deleted file mode 100644
index 2fe11dd26d5..00000000000
--- a/share/man/man4/man4.hppa/gsckbd.4
+++ /dev/null
@@ -1,237 +0,0 @@
-.\" $OpenBSD: gsckbd.4,v 1.19 2007/05/31 19:19:54 jmc Exp $
-.\"
-.\" Copyright (c) 2003, Miodrag Vallat.
-.\" All rights reserved.
-.\"
-.\" 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
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-.\" WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-.\" DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
-.\" INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-.\" (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-.\" SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-.\" STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-.\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
-.\"
-.\" Copyright (c) 1999
-.\" 	Matthias Drochner.  All rights reserved.
-.\"
-.\" 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
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.Dd $Mdocdate: May 31 2007 $
-.Dt GSCKBD 4 hppa
-.Os
-.Sh NAME
-.Nm gsckbd
-.Nd PS/2-like keyboard driver for wscons
-.Sh SYNOPSIS
-.Cd "gsckbd* at gsckbc?"
-.Cd "wskbd* at gsckbd?"
-.Cd "option GSCKBD_LAYOUT=XXX"
-.Sh DESCRIPTION
-This driver supports the HP-specific PS/2-like keyboards within the
-.Xr wscons 4
-console framework.
-It doesn't provide direct device driver entry points but makes its
-functions available via the internal
-.Xr wskbd 4
-interface.
-.Pp
-The
-.Nm
-driver supports a number of different key mappings which
-can be chosen from with the kernel option
-.Dq GSCKBD_LAYOUT
-at compile time or with the utility
-.Xr wsconsctl 8
-(variable:
-.Dq keyboard.encoding )
-at runtime.
-Other mappings can be used if the whole keymap is replaced by means of
-.Xr wsconsctl 8 .
-The built-in mappings are at this time:
-.Pp
-.Bl -tag -width Ds -offset indent -compact
-.It KB_BE
-.Pq be
-Belgium French.
-.It KB_BR
-.Pq br
-Brazilian.
-.It KB_CF
-.Pq cf
-Canadian French.
-.It KB_DE
-.Pq de
-German with
-.Dq dead accents .
-.It KB_DK
-.Pq dk
-Danish with
-.Dq dead accents .
-.It KB_ES
-.Pq es
-Spanish.
-.It KB_FR
-.Pq fr
-French.
-.It KB_HU
-.Pq hu
-Hungarian.
-.It KB_IT
-.Pq it
-Italian.
-.It KB_JP
-.Pq jp
-Japanese.
-.It KB_LA
-.Pq la
-Latinamerican.
-.It KB_LT
-.Pq \&lt
-Lithuanian in
-.Dq ISO 8859-13 .
-.It KB_LV
-.Pq \&lv
-Latvian
-.It KB_NL
-.Pq \&nl
-Dutch with
-.Dq dead accents .
-.It KB_NO
-.Pq no
-Norwegian with
-.Dq dead accents .
-.It KB_PL
-.Pq pl
-Polish in
-.Dq ISO 8859-2 .
-.It KB_PT
-.Pq pt
-Portuguese.
-.It KB_RU
-.Pq ru
-Russian in
-.Dq KOI8 .
-.It KB_SF
-.Pq sf
-Swiss French with
-.Dq dead accents .
-.It KB_SG
-.Pq sg
-Swiss German with
-.Dq dead accents .
-.It KB_SI
-.Pq si
-Slovenian.
-.It KB_SV
-.Pq sv
-Swedish with
-.Dq dead accents .
-.It KB_TR
-.Pq tr
-Turkish in
-.Dq ISO 8859-9
-with
-.Dq dead accents .
-.It KB_UA
-.Pq ua
-Ukrainian in
-.Dq KOI8 .
-.It KB_UK
-.Pq uk
-British.
-.It KB_US
-.Pq us
-English/US keyboard mapping (default).
-.It KB_US | KB_DECLK
-.Pq us.declk
-English/US mapping for
-DEC LK400-style keyboards with PC keyboard interface (eg LK461).
-.It KB_US | KB_DVORAK
-.Pq us.dvorak
-English/US keyboard with
-.Dq Dvorak
-layout.
-.It KB_US | KB_MACHDEP
-.Pq us.machdep
-English/US keyboard on the PrecisionBook.
-.El
-.Pp
-The KB_DE, KB_DK, KB_NO, KB_SF, KB_SG, KB_SV and KB_TR mappings can be used in
-the KB_NODEAD
-.Pq .nodead
-variant.
-This switches off the
-.Dq dead accents .
-.Pp
-The KB_BE, KB_FR, KB_JP, KB_US and KB_US | KB_DVORAK mappings can be modified
-to swap the left Control and the Caps Lock keys by the
-KB_SWAPCTRLCAPS variant bit or the
-.Dq .swapctrlcaps
-suffix.
-.Pp
-The KB_METAESC
-.Pq .metaesc
-option can be applied to any layout.
-If set, keys pressed together
-with the ALT modifier are prefixed by an ESC character.
-(Standard behaviour is to add 128 to the ASCII value.)
-.Sh EXAMPLES
-To set a German keyboard layout without
-.Dq dead accents
-and sending an ESC character before the key symbol if the ALT
-key is pressed simultaneously, use
-.Ic wsconsctl -w keyboard.encoding=de.nodead.metaesc .
-To set it at kernel build time, add
-the following to the kernel configuration file:
-.Bd -literal -offset indent
-option PCKBD_LAYOUT="(KB_DE|KB_NODEAD|KB_METAESC)"
-.Ed
-.Sh SEE ALSO
-.Xr gsc 4 ,
-.Xr gsckbc 4 ,
-.Xr pckbd 4 ,
-.Xr wskbd 4 ,
-.Xr wsconsctl 8
-.Sh BUGS
-The list of built-in mappings doesn't follow any logic.
-It grew as people submitted what they needed.
-.Pp
-The
-.Dq br
-and
-.Dq jp
-encodings are missing some keys compared to their
-.Xr pckbd 4
-equivalents.
diff --git a/share/man/man4/pckbd.4 b/share/man/man4/pckbd.4
index 51f5a168c86..f3f6dc68975 100644
--- a/share/man/man4/pckbd.4
+++ b/share/man/man4/pckbd.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: pckbd.4,v 1.34 2007/10/19 06:29:36 jmc Exp $
+.\" $OpenBSD: pckbd.4,v 1.35 2008/07/16 16:32:06 miod Exp $
 .\" $NetBSD: pckbd.4,v 1.3 1999/12/21 11:31:07 drochner Exp $
 .\"
 .\" Copyright (c) 1999
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: October 19 2007 $
+.Dd $Mdocdate: July 16 2008 $
 .Dt PCKBD 4
 .Os
 .Sh NAME
@@ -33,6 +33,7 @@
 .Nd PC keyboard driver for wscons
 .Sh SYNOPSIS
 .Cd "pckbd* at pckbc?"
+.Cd "pckbd* at gsckbc?" Pq hppa
 .Cd "pckbd* at mkbc?" Pq sgi
 .Cd "wskbd* at pckbd?"
 .Cd "option PCKBD_LAYOUT=XXX"
diff --git a/share/man/man4/wskbd.4 b/share/man/man4/wskbd.4
index a8d2f89422e..cf288e08eed 100644
--- a/share/man/man4/wskbd.4
+++ b/share/man/man4/wskbd.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: wskbd.4,v 1.20 2007/05/31 19:19:53 jmc Exp $
+.\" $OpenBSD: wskbd.4,v 1.21 2008/07/16 16:32:06 miod Exp $
 .\" $NetBSD: wskbd.4,v 1.5 2000/03/20 11:51:59 pk Exp $
 .\"
 .\" Copyright (c) 1999
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: July 16 2008 $
 .Dt WSKBD 4
 .Os
 .Sh NAME
@@ -139,7 +139,6 @@ tweak mixer settings.
 .Xr akbd 4 ,
 .Xr comkbd 4 ,
 .Xr dnkbd 4 ,
-.Xr gsckbd 4 ,
 .Xr hilkbd 4 ,
 .Xr intro 4 ,
 .Xr lkkbd 4 ,