diff options
| author |   deraadt <deraadt@openbsd.org> | 1996-09-01 16:48:07 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 1996-09-01 16:48:07 +0000 |
| commit | 72e75a099c5c15d5ff8e3ac2d84fafb8999b4bc2 (patch) | |
| tree | 887a3af77bf96bca71b9bd4fcf2da5d6d60172f9 | |
| parent | untimeout & density handling; from rcjvdb@urc.tue.nl... this patch is from january 2 1995 (diff) | |
| download | wireguard-openbsd-72e75a099c5c15d5ff8e3ac2d84fafb8999b4bc2.tar.xz wireguard-openbsd-72e75a099c5c15d5ff8e3ac2d84fafb8999b4bc2.zip | |
change keymap_t to pccons_keymap_t in pccons
| -rw-r--r-- | sbin/kbd/kbd_i386.c | 6 | ||||
| -rw-r--r-- | sys/arch/arc/dev/pccons.c | 12 | ||||
| -rw-r--r-- | sys/arch/arc/include/pccons.h | 8 |
3 files changed, 13 insertions, 13 deletions
diff --git a/sbin/kbd/kbd_i386.c b/sbin/kbd/kbd_i386.c index 9679a1fa9b8..53fcfeeffcf 100644 --- a/sbin/kbd/kbd_i386.c +++ b/sbin/kbd/kbd_i386.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kbd_i386.c,v 1.4 1996/06/30 00:37:09 maja Exp $ */ +/* $OpenBSD: kbd_i386.c,v 1.5 1996/09/01 16:48:07 deraadt Exp $ */ /* * Copyright (c) 1996 Juergen Hannken-Illjes @@ -43,7 +43,7 @@ struct { char *name[NUM_NAMES]; - keymap_t map[KB_NUM_KEYS]; + pccons_keymap_t map[KB_NUM_KEYS]; } keymaps[] = { { @@ -91,7 +91,7 @@ kbd_set(name, verbose) int verbose; { int i, j, fd; - keymap_t *map = NULL; + pccons_keymap_t *map = NULL; for (i = 0; keymaps[i].name[0]; i++) for (j = 0; j < NUM_NAMES && keymaps[i].name[j]; j++) diff --git a/sys/arch/arc/dev/pccons.c b/sys/arch/arc/dev/pccons.c index 111d47f2fc4..ad40177d6bd 100644 --- a/sys/arch/arc/dev/pccons.c +++ b/sys/arch/arc/dev/pccons.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pccons.c,v 1.2 1996/07/16 07:46:16 pefo Exp $ */ +/* $OpenBSD: pccons.c,v 1.3 1996/09/01 16:50:08 deraadt Exp $ */ /* $NetBSD: pccons.c,v 1.89 1995/05/04 19:35:20 cgd Exp $ */ /*- @@ -96,7 +96,7 @@ static u_char lock_state = 0x00, /* all off */ old_typematic_rate = 0xff; static u_short cursor_shape = 0xffff, /* don't update until set by user */ old_cursor_shape = 0xffff; -static keymap_t scan_codes[KB_NUM_KEYS];/* keyboard translation table */ +static pccons_keymap_t scan_codes[KB_NUM_KEYS];/* keyboard translation table */ int pc_xmode = 0; /* @@ -674,7 +674,7 @@ pcioctl(dev, cmd, data, flag, p) return 0; } case CONSOLE_SET_KEYMAP: { - keymap_t *map = (keymap_t *) data; + pccons_keymap_t *map = (pccons_keymap_t *) data; int i; if (!data) @@ -687,13 +687,13 @@ pcioctl(dev, cmd, data, flag, p) map[i].shift_altgr[KB_CODE_SIZE-1]) return EINVAL; - bcopy(data,scan_codes,sizeof(keymap_t[KB_NUM_KEYS])); + bcopy(data, scan_codes, sizeof(pccons_keymap_t[KB_NUM_KEYS])); return 0; } case CONSOLE_GET_KEYMAP: if (!data) return EINVAL; - bcopy(scan_codes,data,sizeof(keymap_t[KB_NUM_KEYS])); + bcopy(scan_codes, data, sizeof(pccons_keymap_t[KB_NUM_KEYS])); return 0; default: @@ -1331,7 +1331,7 @@ sput(cp, n) async_update(); } -static keymap_t scan_codes[KB_NUM_KEYS] = { +static pccons_keymap_t scan_codes[KB_NUM_KEYS] = { /* type unshift shift control altgr shift_altgr scancode */ KB_NONE, "", "", "", "", "", /* 0 unused */ KB_ASCII, "\033", "\033", "\033", "", "", /* 1 ESCape */ diff --git a/sys/arch/arc/include/pccons.h b/sys/arch/arc/include/pccons.h index 98b20f299ab..f75ac09a16b 100644 --- a/sys/arch/arc/include/pccons.h +++ b/sys/arch/arc/include/pccons.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pccons.h,v 1.1.1.1 1996/06/24 09:07:17 pefo Exp $ */ +/* $OpenBSD: pccons.h,v 1.2 1996/09/01 16:50:12 deraadt Exp $ */ /* $NetBSD: pccons.h,v 1.4 1996/02/02 18:06:06 mycroft Exp $ */ /* @@ -33,13 +33,13 @@ typedef struct { char ctl[KB_CODE_SIZE]; char altgr[KB_CODE_SIZE]; char shift_altgr[KB_CODE_SIZE]; -} keymap_t; +} pccons_keymap_t; #define CONSOLE_X_MODE_ON _IO('t',121) #define CONSOLE_X_MODE_OFF _IO('t',122) #define CONSOLE_X_BELL _IOW('t',123,int[2]) #define CONSOLE_SET_TYPEMATIC_RATE _IOW('t',124,u_char) -#define CONSOLE_GET_KEYMAP _IOR('t',128,keymap_t[KB_NUM_KEYS]) -#define CONSOLE_SET_KEYMAP _IOW('t',129,keymap_t[KB_NUM_KEYS]) +#define CONSOLE_GET_KEYMAP _IOR('t',128,pccons_keymap_t[KB_NUM_KEYS]) +#define CONSOLE_SET_KEYMAP _IOW('t',129,pccons_keymap_t[KB_NUM_KEYS]) #endif /* _PCCONS_H_ */ |