change keymap_t to pccons_keymap_t in pccons

diff --git a/sys/arch/i386/include/pccons.h b/sys/arch/i386/include/pccons.h
index f619d86..7802f12 100644 (file)
--- a/sys/arch/i386/include/pccons.h
+++ b/sys/arch/i386/include/pccons.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: pccons.h,v 1.3 1996/04/22 20:12:14 hannken Exp $      */
+/*     $OpenBSD: pccons.h,v 1.4 1996/09/01 16:39:57 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_ */

diff --git a/sys/arch/i386/isa/pccons.c b/sys/arch/i386/isa/pccons.c
index b01bc94..9bc45f0 100644 (file)
--- a/sys/arch/i386/isa/pccons.c
+++ b/sys/arch/i386/isa/pccons.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: pccons.c,v 1.25 1996/08/29 09:26:08 deraadt Exp $     */
+/*     $OpenBSD: pccons.c,v 1.26 1996/09/01 16:39:59 deraadt Exp $     */
 /*     $NetBSD: pccons.c,v 1.99.4.1 1996/06/04 20:03:53 cgd Exp $      */
 
 /*-
@@ -97,7 +97,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 */
 #ifdef XSERVER
 int pc_xmode = 0;
 #endif
@@ -705,7 +705,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)
@@ -718,13 +718,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:
                return ENOTTY;
@@ -1441,7 +1441,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 */