summaryrefslogtreecommitdiff
path: root/sbin/wsconsctl
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2005-01-14 22:39:41 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2005-01-14 22:39:41 +0000
commit273b900d6597bdaa55c8f7565ccfcfd87910c84f (patch)
treede2ec91a3754bec3aeefc49cac97832f7dc43bea /sbin/wsconsctl
parent09195bcd50c1ebbc578d97af2b759602c1b64b16 (diff)
Switch OpenBSD/hp300 to wscons, still using on-board ROM fonts for now.
Main features: - MI hil drivers, allowing live plug/unplug of devices, and the keyboard does not need to be at id 1 anymore. - SGC bus support on 4xx models. SGC frame buffers are supported too, but not as console, though you can use them as a regular glass terminal if you run a getty on ttyC0. Currently not compiled-in, awaiting for an sti(4) fix to be commited. - HP-UX compatibility interfaces are removed. grfinfo and hilinfo are removed. X11 support is currently broken by these changes; X.org X11R6 support will be available very soon. Tested on hyperion and 4 different flavours of catseye/topcat/kathmandu; other, older frame buffers (davinci, gatorbox and renaissance) could not been tested but should work; please report any regression.
Diffstat (limited to 'sbin/wsconsctl')
-rw-r--r--sbin/wsconsctl/Makefile16
-rw-r--r--sbin/wsconsctl/util.c9
2 files changed, 15 insertions, 10 deletions
diff --git a/sbin/wsconsctl/Makefile b/sbin/wsconsctl/Makefile
index 9ef0c977ad4..b7ad8330a8e 100644
--- a/sbin/wsconsctl/Makefile
+++ b/sbin/wsconsctl/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.21 2005/01/13 19:17:25 drahn Exp $
+# $OpenBSD: Makefile,v 1.22 2005/01/14 22:39:17 miod Exp $
.if ${MACHINE} == "alpha" || ${MACHINE} == "amd64" || \
- ${MACHINE} == "cats" || ${MACHINE} == "hppa" || \
- ${MACHINE} == "i386" || ${MACHINE} == "luna88k" || \
- ${MACHINE} == "macppc" || ${MACHINE} == "sparc" || \
- ${MACHINE} == "sgi" || ${MACHINE} == "sparc64" || \
- ${MACHINE} == "zaurus"
+ ${MACHINE} == "cats" || ${MACHINE} == "hp300" || \
+ ${MACHINE} == "hppa" || ${MACHINE} == "i386" || \
+ ${MACHINE} == "luna88k" || ${MACHINE} == "macppc" || \
+ ${MACHINE} == "sgi" || ${MACHINE} == "sparc" || \
+ ${MACHINE} == "sparc64" || ${MACHINE} == "zaurus"
PROG= wsconsctl
SRCS= display.c keyboard.c keysym.c map_parse.y map_scan.l \
@@ -26,7 +26,7 @@ NOPROG=yes
.endif
MAN= wsconsctl.8
-MANSUBDIR= alpha amd64 cats hppa i386 luna88k macppc sgi sparc sparc64
-MANSUBDIR+= zaurus
+MANSUBDIR= alpha amd64 cats hp300 hppa i386 luna88k macppc sgi
+MANSUBDIR+= sparc sparc64 zaurus
.include <bsd.prog.mk>
diff --git a/sbin/wsconsctl/util.c b/sbin/wsconsctl/util.c
index 1501c88d6ee..0f531e0a72c 100644
--- a/sbin/wsconsctl/util.c
+++ b/sbin/wsconsctl/util.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: util.c,v 1.26 2005/01/14 15:49:03 drahn Exp $ */
+/* $OpenBSD: util.c,v 1.27 2005/01/14 22:39:17 miod Exp $ */
/* $NetBSD: util.c,v 1.8 2000/03/14 08:11:53 sato Exp $ */
/*-
@@ -131,7 +131,12 @@ static const struct nameint dpytype_tab[] = {
{ WSDISPLAY_TYPE_MGX, "mgx" },
{ WSDISPLAY_TYPE_SB_P9000, "p9000" },
{ WSDISPLAY_TYPE_RFLEX, "rasterflex" },
- { WSDISPLAY_TYPE_LUNA, "luna" }
+ { WSDISPLAY_TYPE_LUNA, "luna" },
+ { WSDISPLAY_TYPE_DVBOX, "davinci" },
+ { WSDISPLAY_TYPE_GBOX, "gatorbox" },
+ { WSDISPLAY_TYPE_RBOX, "renaissance" },
+ { WSDISPLAY_TYPE_HYPERION, "hyperion" },
+ { WSDISPLAY_TYPE_TOPCAT, "topcat" }
};
static const struct nameint kbdenc_tab[] = {