Preliminary modifications for Xorg 1bpp server, based on OpenBSD/hp300

and NetBSD/luna68k.  Need more work in Xorg.

luna88k/conf/GENERIC:
- enable wsmux on GENERIC kernel

luna88k/dev/luanfb.c:
- make hardware access volatile'd
- add extra ioctl(2) used in Xorg wsfb driver
- add some workaround

luna88k/dev/lunaws.c:
- add WSDISPLAY_COMPAT_RAWKBD stuff for Xorg keyboard input

luna88k/dev/omrasops.c:
- change 'caddr_t' to 'u_int8_t *'

"go for it!" miod@

1 files changed, 8 insertions, 3 deletions

diff --git a/sys/arch/luna88k/conf/GENERIC b/sys/arch/luna88k/conf/GENERIC
index 280a99477af..9d6da0619e8 100644
--- a/sys/arch/luna88k/conf/GENERIC
+++ b/sys/arch/luna88k/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.15 2011/06/29 20:52:09 matthew Exp $
+#	$OpenBSD: GENERIC,v 1.16 2013/04/28 23:33:12 aoyama Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -22,6 +22,8 @@ option		MAX_CPUS=4	# may have up to 4 processors
 # Define this if your processor has the xxx.usr bug (mask C82N)
 option		ERRATA__XXX_USR
 
+# Options for luna88k hardware
+option		WSDISPLAY_COMPAT_RAWKBD	# Provide raw scancodes; needed for X11
 
 config		bsd		swap generic
 
@@ -42,8 +44,8 @@ spc1		at mainbus0
 
 # Workstation Console attachments
 wsdisplay*	at fb?
-wskbd*		at ws?
-wsmouse*	at ws?
+wskbd*		at ws? mux 1
+wsmouse*	at ws? mux 0
 
 # SCSI bus support
 
@@ -56,3 +58,6 @@ ch*		at scsibus?
 safte*		at scsibus?
 ses*		at scsibus?
 uk*		at scsibus?
+
+# Pseudo-device
+pseudo-device	wsmux 2