src - OpenBSD base system

diff options


context:
space:
mode:

author	Miod Vallat <miod@cvs.openbsd.org>	2002-04-19 00:05:23 +0000
committer	Miod Vallat <miod@cvs.openbsd.org>	2002-04-19 00:05:23 +0000
commit	1d6bf71b5a7ec2d601440b0302ad45fdf9103b76 (patch)
tree	d3908238a8cbe9c3d5bd27f7f7d8cd442a90d3a8 /sbin/kbd
parent	e64625898d11e784c8f61ea130568357714255c7 (diff)

Do not commit kbd for arches where it provides no real support.

While there, remove dead parts.

Diffstat (limited to 'sbin/kbd')

-rw-r--r--

sbin/kbd/Makefile

-rw-r--r--

sbin/kbd/kbd_i386.c

121

-rw-r--r--

sbin/kbd/kbd_void.c

-rw-r--r--

sbin/kbd/tables/french

164

-rw-r--r--

sbin/kbd/tables/german

164

-rw-r--r--

sbin/kbd/tables/koi8

164

-rw-r--r--

sbin/kbd/tables/swedish

164

-rw-r--r--

sbin/kbd/tables/swedish7

165

-rw-r--r--

sbin/kbd/tables/us.english

165

9 files changed, 14 insertions, 1177 deletions

diff --git a/sbin/kbd/Makefile b/sbin/kbd/Makefile
index 2d3a0533322..1be751a0f28 100644
--- a/sbin/kbd/Makefile
+++ b/sbin/kbd/Makefile

@@ -1,23 +1,27 @@

-# $OpenBSD: Makefile,v 1.13 2002/02/19 01:49:57 maja Exp $

+# $OpenBSD: Makefile,v 1.14 2002/04/19 00:05:20 miod Exp $

+.if (${MACHINE} == "alpha") || (${MACHINE} == "hppa") || \

+ (${MACHINE} == "i386") || (${MACHINE} == "macppc") || \

+ (${MACHINE} == "sparc") || (${MACHINE} == "sparc64") || \

+ (${MACHINE} == "vax")

PROG= kbd

-MAN= kbd.8

SRCS= main.c

CFLAGS+=-I${.CURDIR}

-.if (${MACHINE} == "arc")

-SRCS+= kbd_i386.c

-.elif (${MACHINE} == "i386") || (${MACHINE} == "macppc") || \

- (${MACHINE} == "vax") || (${MACHINE} == "alpha") || \

- (${MACHINE} == "sparc64")

+.if (${MACHINE} == "sparc")

+SRCS+= kbd_sparc.c

+.else

SRCS+= kbd_wscons.c

LDADD= -lkvm

DPADD= ${LIBKVM}

-.elif (${MACHINE} == "sparc")

-SRCS+= kbd_sparc.c

+.endif

.else

-SRCS+= kbd_void.c

+NOPROG= Yes

.endif

+MAN= kbd.8

+MANSUBDIR= alpha hppa i386 macppc sparc sparc64 vax

.include <bsd.prog.mk>

diff --git a/sbin/kbd/kbd_i386.c b/sbin/kbd/kbd_i386.c
deleted file mode 100644
index 4de20547dbb..00000000000
--- a/sbin/kbd/kbd_i386.c
+++ /dev/null

@@ -1,121 +0,0 @@

-/* $OpenBSD: kbd_i386.c,v 1.10 2001/05/01 17:20:20 aaron Exp $ */

-/*

- *

- * 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.

- * 3. All advertising materials mentioning features or use of this software

- * must display the following acknowledgement:

- * This product includes software developed for the NetBSD Project

- * by Juergen Hannken-Illjes.

- * 4. The name of the author may not be used to endorse or promote products

- * derived from this software without specific prior written permission.

- *

- * 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.

- */

-#include <sys/types.h>

-#include <machine/pccons.h>

-#include <paths.h>

-#include <unistd.h>

-#include <fcntl.h>

-#include <err.h>

-#include <stdio.h>

-#define NUM_NAMES 10

-struct {

- char *name[NUM_NAMES];

- pccons_keymap_t map[KB_NUM_KEYS];

-} keymaps[] = {

- {

-#include "tables/us.english"

- },

- {

-#include "tables/german"

- },

- {

-#include "tables/koi8"

- },

- {

-#include "tables/french"

- },

- {

-#include "tables/swedish"

- },

- {

-#include "tables/swedish7"

- },

- {

- { NULL }

- }

-};

-extern char *__progname;

-void

-kbd_list()

- int i, j;

- printf("tables available:\n%-16s %s\n\n", "encoding", "nick names");

- for (i = 0; keymaps[i].name[0]; i++) {

- printf("%-16s",keymaps[i].name[0]);

- for (j = 1; j < NUM_NAMES && keymaps[i].name[j]; j++)

- printf(" %s", keymaps[i].name[j]);

- printf("\n");

- }

-void

-kbd_set(name, verbose)

- char *name;

- int verbose;

- int i, j, fd;

- pccons_keymap_t *map = NULL;

- for (i = 0; keymaps[i].name[0]; i++)

- for (j = 0; j < NUM_NAMES && keymaps[i].name[j]; j++)

- if (strcmp(keymaps[i].name[j], name) == 0) {

- name = keymaps[i].name[0];

- map = keymaps[i].map;

- break;

- }

- if (map == NULL) {

- fprintf(stderr, "%s: no such keymap: %s\n", __progname, name);

- exit(1);

- }

- if ((fd = open(_PATH_CONSOLE, O_RDONLY)) < 0)

- err(1, "%s", _PATH_CONSOLE);

- if (ioctl(fd, CONSOLE_SET_KEYMAP, map) < 0)

- err(1, "CONSOLE_SET_KEYMAP");

- close(fd);

- if (verbose)

- fprintf(stderr, "keyboard mapping set to %s\n", name);

diff --git a/sbin/kbd/kbd_void.c b/sbin/kbd/kbd_void.c
deleted file mode 100644
index 1057df21cc8..00000000000
--- a/sbin/kbd/kbd_void.c
+++ /dev/null

@@ -1,60 +0,0 @@

-/* $OpenBSD: kbd_void.c,v 1.3 1996/09/28 08:49:08 pefo Exp $ */