Populate kbdmap-related definitions to the userland.
Also g/c unused ioctls. Pointed out by he.
This commit is contained in:
minoura
parent
aea96fa075
commit
72c4550293
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: md.x68k,v 1.48 2004/05/08 21:53:23 kleink Exp $
|
||||
# $NetBSD: md.x68k,v 1.49 2004/05/12 14:25:08 minoura Exp $
|
||||
./usr/include/ieeefp.h comp-c-include
|
||||
./usr/include/x68k comp-c-include
|
||||
./usr/include/x68k/_G_config.h comp-obsolete obsolete
|
||||
|
|
@ -30,6 +30,7 @@
|
|||
./usr/include/x68k/intr.h comp-c-include
|
||||
./usr/include/x68k/iteioctl.h comp-c-include
|
||||
./usr/include/x68k/kbd.h comp-c-include
|
||||
./usr/include/x68k/kbdmap.h comp-c-include
|
||||
./usr/include/x68k/kbio.h comp-c-include
|
||||
./usr/include/x68k/kcore.h comp-c-include
|
||||
./usr/include/x68k/limits.h comp-c-include
|
||||
|
|
|
|||
|
|
@ -1,106 +1,6 @@
|
|||
/* $NetBSD: kbdmap.h,v 1.2 1998/01/05 07:03:43 perry Exp $ */
|
||||
|
||||
#define NUL 0
|
||||
#define SOH 1
|
||||
#define STX 2
|
||||
#define ETX 3
|
||||
#define EOT 4
|
||||
#define ENQ 5
|
||||
#define ACK 6
|
||||
#define BEL 7
|
||||
#define BS 8
|
||||
#define HT 9
|
||||
#define LF 10
|
||||
#define VT 11
|
||||
#define FF 12
|
||||
#define CR 13
|
||||
#define SO 14
|
||||
#define SI 15
|
||||
#define DLE 16
|
||||
#define DC1 17
|
||||
#define DC2 18
|
||||
#define DC3 19
|
||||
#define DC4 20
|
||||
#define NAK 21
|
||||
#define SYN 22
|
||||
#define ETB 23
|
||||
#define CAN 24
|
||||
#define EM 25
|
||||
#define SUB 26
|
||||
#define ESC 27
|
||||
#define FS 28
|
||||
#define GS 29
|
||||
#define RS 30
|
||||
#define US 31
|
||||
#define DEL 127
|
||||
#define IND 132
|
||||
#define NEL 133
|
||||
#define SSA 134
|
||||
#define ESA 135
|
||||
#define HTS 136
|
||||
#define HTJ 137
|
||||
#define VTS 138
|
||||
#define PLD 139
|
||||
#define PLU 140
|
||||
#define RI 141
|
||||
#define SS2 142
|
||||
#define SS3 143
|
||||
#define DCS 144
|
||||
#define PU1 145
|
||||
#define PU2 146
|
||||
#define STS 147
|
||||
#define CCH 148
|
||||
#define MW 149
|
||||
#define SPA 150
|
||||
#define EPA 151
|
||||
#define CSI 155
|
||||
#define ST 156
|
||||
#define OSC 157
|
||||
#define PM 158
|
||||
#define APC 159
|
||||
|
||||
|
||||
/* a normal Amiga keyboard has 0x60 `normal' keys, plus modifier keys that
|
||||
don't appear in the keymap */
|
||||
#define KBD_NUM_KEYS 0x6d
|
||||
|
||||
/* size of string table */
|
||||
#define KBD_STRTAB_SIZE 255
|
||||
|
||||
/* for dead keys, index into acctable */
|
||||
#define KBD_ACC_GRAVE 0
|
||||
#define KBD_ACC_ACUTE 1
|
||||
#define KBD_ACC_CIRC 2
|
||||
#define KBD_ACC_TILDE 3
|
||||
#define KBD_ACC_DIER 4
|
||||
#define KBD_NUM_ACC 5
|
||||
|
||||
|
||||
struct key {
|
||||
unsigned char mode; /* see possible values below */
|
||||
unsigned char code;
|
||||
};
|
||||
|
||||
#define KBD_MODE_STRING (1<<0) /* code is index into strings[] */
|
||||
#define KBD_MODE_DEAD (1<<1) /* acc-index in upper nibble, code = plain acc */
|
||||
#define KBD_MODE_CAPS (1<<2) /* key is capsable. Only used in non-shifted maps */
|
||||
#define KBD_MODE_KPAD (1<<3) /* key is on keypad */
|
||||
#define KBD_MODE_GRAVE (KBD_ACC_GRAVE << 4)
|
||||
#define KBD_MODE_ACUTE (KBD_ACC_ACUTE << 4)
|
||||
#define KBD_MODE_CIRC (KBD_ACC_CIRC << 4)
|
||||
#define KBD_MODE_TILDE (KBD_ACC_TILDE << 4)
|
||||
#define KBD_MODE_DIER (KBD_ACC_DIER << 4)
|
||||
#define KBD_MODE_ACCENT(m) ((m) >> 4) /* get accent from mode */
|
||||
#define KBD_MODE_ACCMASK (0xf0)
|
||||
|
||||
struct kbdmap {
|
||||
struct key keys[KBD_NUM_KEYS],
|
||||
shift_keys[KBD_NUM_KEYS],
|
||||
alt_keys[KBD_NUM_KEYS],
|
||||
alt_shift_keys[KBD_NUM_KEYS];
|
||||
unsigned char strings[KBD_STRTAB_SIZE];
|
||||
};
|
||||
/* $NetBSD: kbdmap.h,v 1.3 2004/05/12 14:25:08 minoura Exp $ */
|
||||
|
||||
#include <machine/kbdmap.h>
|
||||
|
||||
#ifdef _KERNEL
|
||||
/* XXX: ITE interface */
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.27 2004/05/08 21:51:51 kleink Exp $
|
||||
# $NetBSD: Makefile,v 1.28 2004/05/12 14:25:08 minoura Exp $
|
||||
|
||||
INCSDIR= /usr/include/x68k
|
||||
|
||||
|
|
@ -12,7 +12,7 @@ INCS= ansi.h aout_machdep.h asm.h \
|
|||
ieee.h ieeefp.h \
|
||||
int_const.h int_fmtio.h int_limits.h int_mwgwtypes.h int_types.h \
|
||||
intr.h iteioctl.h \
|
||||
kbd.h kbio.h kcore.h \
|
||||
kbd.h kbdmap.h kbio.h kcore.h \
|
||||
lock.h limits.h \
|
||||
math.h mcontext.h \
|
||||
opmbellio.h opmreg.h \
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
* from: Utah $Hdr: iteioctl.h 1.1 90/07/09$
|
||||
*
|
||||
* @(#)iteioctl.h 7.2 (Berkeley) 11/4/90
|
||||
* $NetBSD: iteioctl.h,v 1.5 2004/05/08 08:40:08 minoura Exp $
|
||||
* $NetBSD: iteioctl.h,v 1.6 2004/05/12 14:25:08 minoura Exp $
|
||||
*/
|
||||
/*
|
||||
* Copyright (c) 1988 University of Utah.
|
||||
|
|
@ -73,12 +73,14 @@
|
|||
* from: Utah $Hdr: iteioctl.h 1.1 90/07/09$
|
||||
*
|
||||
* @(#)iteioctl.h 7.2 (Berkeley) 11/4/90
|
||||
* $NetBSD: iteioctl.h,v 1.5 2004/05/08 08:40:08 minoura Exp $
|
||||
* $NetBSD: iteioctl.h,v 1.6 2004/05/12 14:25:08 minoura Exp $
|
||||
*/
|
||||
|
||||
#ifndef _X68K_ITEIOCTL_H_
|
||||
#define _X68K_ITEIOCTL_H_
|
||||
|
||||
#include <machine/kbdmap.h>
|
||||
|
||||
struct itewinsize {
|
||||
int x; /* leftedge offset to the right */
|
||||
int y; /* topedge offset down */
|
||||
|
|
@ -95,16 +97,18 @@ struct iterepeat {
|
|||
|
||||
#define ITEIOCSKMAP _IOW('Z',0x70, struct kbdmap)
|
||||
#define ITEIOCGKMAP _IOR('Z',0x71, struct kbdmap)
|
||||
#ifdef notyet /* could be implemented... */
|
||||
#define ITEIOCGWINSZ _IOR('Z',0x72, struct itewinsize)
|
||||
#define ITEIOCSWINSZ _IOW('Z',0x73, struct itewinsize)
|
||||
#define ITEIOCDSPWIN _IO('Z', 0x74)
|
||||
#define ITEIOCREMWIN _IO('Z', 0x75)
|
||||
#define ITEIOCGBELL _IOR('Z', 0x76, struct itebell)
|
||||
#define ITEIOCSBELL _IOW('Z', 0x77, struct itebell)
|
||||
#endif
|
||||
#define ITEIOCGREPT _IOR('Z', 0x78, struct iterepeat)
|
||||
#define ITEIOCSREPT _IOW('Z', 0x79, struct iterepeat)
|
||||
|
||||
#ifdef notyet
|
||||
#define ITESWITCH _IOW('Z',0x69, int) /* XXX */
|
||||
#endif
|
||||
|
||||
#define ITELOADFONT _IOW('Z',0x80, unsigned char [4096])
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,107 @@
|
|||
/* $NetBSD: kbdmap.h,v 1.1 2004/05/12 14:25:08 minoura Exp $ */
|
||||
|
||||
#ifndef _X68K_KBDMAP_H_
|
||||
#define _X68K_KBDMAP_H_
|
||||
|
||||
#define NUL 0
|
||||
#define SOH 1
|
||||
#define STX 2
|
||||
#define ETX 3
|
||||
#define EOT 4
|
||||
#define ENQ 5
|
||||
#define ACK 6
|
||||
#define BEL 7
|
||||
#define BS 8
|
||||
#define HT 9
|
||||
#define LF 10
|
||||
#define VT 11
|
||||
#define FF 12
|
||||
#define CR 13
|
||||
#define SO 14
|
||||
#define SI 15
|
||||
#define DLE 16
|
||||
#define DC1 17
|
||||
#define DC2 18
|
||||
#define DC3 19
|
||||
#define DC4 20
|
||||
#define NAK 21
|
||||
#define SYN 22
|
||||
#define ETB 23
|
||||
#define CAN 24
|
||||
#define EM 25
|
||||
#define SUB 26
|
||||
#define ESC 27
|
||||
#define FS 28
|
||||
#define GS 29
|
||||
#define RS 30
|
||||
#define US 31
|
||||
#define DEL 127
|
||||
#define IND 132
|
||||
#define NEL 133
|
||||
#define SSA 134
|
||||
#define ESA 135
|
||||
#define HTS 136
|
||||
#define HTJ 137
|
||||
#define VTS 138
|
||||
#define PLD 139
|
||||
#define PLU 140
|
||||
#define RI 141
|
||||
#define SS2 142
|
||||
#define SS3 143
|
||||
#define DCS 144
|
||||
#define PU1 145
|
||||
#define PU2 146
|
||||
#define STS 147
|
||||
#define CCH 148
|
||||
#define MW 149
|
||||
#define SPA 150
|
||||
#define EPA 151
|
||||
#define CSI 155
|
||||
#define ST 156
|
||||
#define OSC 157
|
||||
#define PM 158
|
||||
#define APC 159
|
||||
|
||||
|
||||
/* a normal x68k keyboard has 0x6d `normal' keys, plus modifier keys that
|
||||
don't appear in the keymap */
|
||||
#define KBD_NUM_KEYS 0x6d
|
||||
|
||||
/* size of string table */
|
||||
#define KBD_STRTAB_SIZE 255
|
||||
|
||||
/* for dead keys, index into acctable */
|
||||
#define KBD_ACC_GRAVE 0
|
||||
#define KBD_ACC_ACUTE 1
|
||||
#define KBD_ACC_CIRC 2
|
||||
#define KBD_ACC_TILDE 3
|
||||
#define KBD_ACC_DIER 4
|
||||
#define KBD_NUM_ACC 5
|
||||
|
||||
|
||||
struct key {
|
||||
unsigned char mode; /* see possible values below */
|
||||
unsigned char code;
|
||||
};
|
||||
|
||||
#define KBD_MODE_STRING (1<<0) /* code is index into strings[] */
|
||||
#define KBD_MODE_DEAD (1<<1) /* acc-index in upper nibble, code = plain acc */
|
||||
#define KBD_MODE_CAPS (1<<2) /* key is capsable. Only used in non-shifted maps */
|
||||
#define KBD_MODE_KPAD (1<<3) /* key is on keypad */
|
||||
#define KBD_MODE_GRAVE (KBD_ACC_GRAVE << 4)
|
||||
#define KBD_MODE_ACUTE (KBD_ACC_ACUTE << 4)
|
||||
#define KBD_MODE_CIRC (KBD_ACC_CIRC << 4)
|
||||
#define KBD_MODE_TILDE (KBD_ACC_TILDE << 4)
|
||||
#define KBD_MODE_DIER (KBD_ACC_DIER << 4)
|
||||
#define KBD_MODE_ACCENT(m) ((m) >> 4) /* get accent from mode */
|
||||
#define KBD_MODE_ACCMASK (0xf0)
|
||||
|
||||
struct kbdmap {
|
||||
struct key keys[KBD_NUM_KEYS],
|
||||
shift_keys[KBD_NUM_KEYS],
|
||||
alt_keys[KBD_NUM_KEYS],
|
||||
alt_shift_keys[KBD_NUM_KEYS];
|
||||
unsigned char strings[KBD_STRTAB_SIZE];
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
@ -1,11 +1,11 @@
|
|||
/* $NetBSD: ascii_kmap.c,v 1.4 2003/08/28 09:47:07 isaki Exp $ */
|
||||
/* $NetBSD: ascii_kmap.c,v 1.5 2004/05/12 14:25:08 minoura Exp $ */
|
||||
/* from: arch/amiga/dev/kbdmap.c */
|
||||
/* modified for X680x0 by Masaru Oki */
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__RCSID("$NetBSD: ascii_kmap.c,v 1.4 2003/08/28 09:47:07 isaki Exp $");
|
||||
__RCSID("$NetBSD: ascii_kmap.c,v 1.5 2004/05/12 14:25:08 minoura Exp $");
|
||||
|
||||
#include "kbdmap.h"
|
||||
#include <machine/kbdmap.h>
|
||||
|
||||
/* define a default keymap. This can be changed by keyboard ioctl's
|
||||
(later at least..) */
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
/* $NetBSD: jis_kmap.c,v 1.3 2003/07/15 01:44:54 lukem Exp $ */
|
||||
/* $NetBSD: jis_kmap.c,v 1.4 2004/05/12 14:25:08 minoura Exp $ */
|
||||
/* from: arch/amiga/dev/kbdmap.c */
|
||||
/* modified for X680x0 by Masaru Oki */
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__RCSID("$NetBSD: jis_kmap.c,v 1.3 2003/07/15 01:44:54 lukem Exp $");
|
||||
__RCSID("$NetBSD: jis_kmap.c,v 1.4 2004/05/12 14:25:08 minoura Exp $");
|
||||
|
||||
#include "kbdmap.h"
|
||||
#include <machine/kbdmap.h>
|
||||
|
||||
/* define a default keymap. This can be changed by keyboard ioctl's
|
||||
(later at least..) */
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: loadkmap.c,v 1.6 2003/07/15 01:44:54 lukem Exp $ */
|
||||
/* $NetBSD: loadkmap.c,v 1.7 2004/05/12 14:25:08 minoura Exp $ */
|
||||
/*
|
||||
* loadkmap - load keyboard map (for NetBSD/X680x0)
|
||||
* from: amiga/stand/loadkmap/loadkmap.c
|
||||
|
|
@ -6,14 +6,13 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__RCSID("$NetBSD: loadkmap.c,v 1.6 2003/07/15 01:44:54 lukem Exp $");
|
||||
__RCSID("$NetBSD: loadkmap.c,v 1.7 2004/05/12 14:25:08 minoura Exp $");
|
||||
|
||||
#include <stdio.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/ioctl.h>
|
||||
#define ITEKANJI 1 /* XXX */
|
||||
#include <machine/kbdmap.h>
|
||||
#include <machine/iteioctl.h>
|
||||
#include "kbdmap.h"
|
||||
|
||||
void load_kmap(const char *);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue