diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2002-08-12 10:44:05 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2002-08-12 10:44:05 +0000 |
| commit | 15dafe6228319925897f71b6a78bb04ebfb3abc4 (patch) | |
| tree | 2bfbe764cfc6f9b1e3c6ca9d29d0881a4283149e /sys/dev | |
| parent | a83486fe3ff711d8b3727f8abae7995141bb7562 (diff) | |
Convert sparc console code from rcons and pseudo-devices to rasops and wscons.
For most framebuffers it is faster.
Other changes include:
o 24 bit support in tcx(4) for the S24 framebuffer
o accelerated cgsix(4) text console
o new cgtwelve(4) driver for the GS framebuffer
o improved serial driver code
o better keyboard support
The following framebuffers have not been tested but should work: cgfour,
cgeight and cgfourteen
These changes will require XF4 changes, to use Xwsfb instead of Xsun*, to be
commited later today.
Most of the work by me during the LSM and the week after, with code borrowed
from jason@, NetBSD (new serial code), and feedback from mickey@. Work on
pnozz(4) done by millert@
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/sun/sunkbdreg.h | 8 | ||||
| -rw-r--r-- | sys/dev/sun/sunkbdvar.h | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/sys/dev/sun/sunkbdreg.h b/sys/dev/sun/sunkbdreg.h index c6afcc449ba..1eb5793e287 100644 --- a/sys/dev/sun/sunkbdreg.h +++ b/sys/dev/sun/sunkbdreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sunkbdreg.h,v 1.2 2002/04/08 17:49:42 jason Exp $ */ +/* $OpenBSD: sunkbdreg.h,v 1.3 2002/08/12 10:43:56 miod Exp $ */ /* * Copyright (c) 2002 Jason L. Wright (jason@thought.net) @@ -46,7 +46,7 @@ #define SKBD_CMD_LAYOUT 0x0f /* keyboard responses (kbd->host) */ -#define SKBD_RSP_RESET_OK 0x04 /* normal reset status */ +#define SKBD_RSP_RESET_OK 0x04 /* normal reset status for type 4/5/6 */ #define SKBD_RSP_IDLE 0x7f /* no keys down */ #define SKBD_RSP_LAYOUT 0xfe /* layout follows */ #define SKBD_RSP_RESET 0xff /* reset status follows */ @@ -60,3 +60,7 @@ #define SKBD_STATE_LAYOUT 1 #define SKBD_STATE_GETKEY 2 +/* keyboard types */ +#define KB_SUN2 2 /* type 2 keyboard */ +#define KB_SUN3 3 /* type 3 keyboard */ +#define KB_SUN4 4 /* type 4/5/6 keyboard */ diff --git a/sys/dev/sun/sunkbdvar.h b/sys/dev/sun/sunkbdvar.h index 503f046581f..6c0bc7219d9 100644 --- a/sys/dev/sun/sunkbdvar.h +++ b/sys/dev/sun/sunkbdvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sunkbdvar.h,v 1.3 2002/05/29 20:43:43 maja Exp $ */ +/* $OpenBSD: sunkbdvar.h,v 1.4 2002/08/12 10:43:56 miod Exp $ */ /* * Copyright (c) 2002 Jason L. Wright (jason@thought.net) @@ -36,10 +36,14 @@ * */ -extern const keysym_t sunkbd_keydesc_us[]; extern const struct wscons_keydesc sunkbd_keydesctab[]; extern struct wskbd_mapdata sunkbd_keymapdata; extern const struct wscons_keydesc sunkbd5_keydesctab[]; extern struct wskbd_mapdata sunkbd5_keymapdata; +/* + * Keyboard types 5 and 6 identify themselves as type 4, but might have + * different layouts. Fortunately they will have distinct layout codes, so + * here's a way to distinct types 5 and 6 from type 4. + */ #define ISTYPE5(layout) ((layout) > 0x20) |