summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorkiyohara <kiyohara@NetBSD.org>2010-08-01 06:13:19 +0000
committerkiyohara <kiyohara@NetBSD.org>2010-08-01 06:13:19 +0000
commitada1d3f0c856ff2fd8b68c37b18ff17f3adf9043 (patch)
treee77b108ee68856d9708aba741bb166f299ec88fe /sys
parent6be2ca7ac479eb9810c3fb9d3ca25607d9756917 (diff)
Support xserver.
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/bebox/conf/GENERIC8
-rw-r--r--sys/arch/bebox/conf/majors.bebox3
-rw-r--r--sys/arch/bebox/include/param.h5
3 files changed, 12 insertions, 4 deletions
diff --git a/sys/arch/bebox/conf/GENERIC b/sys/arch/bebox/conf/GENERIC
index 51ba4bbb305..ec777cf9789 100644
--- a/sys/arch/bebox/conf/GENERIC
+++ b/sys/arch/bebox/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.119 2010/05/08 22:16:26 mrg Exp $
+# $NetBSD: GENERIC,v 1.120 2010/08/01 06:13:19 kiyohara Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/bebox/conf/std.bebox"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.119 $"
+#ident "GENERIC-$Revision: 1.120 $"
maxusers 32
@@ -161,6 +161,9 @@ options SCSIVERBOSE # human readable SCSI error messages
#options WSEMUL_SUN # sun terminal emulation
options WSEMUL_VT100 # VT100 / VT220 emulation
options WS_DEFAULT_FG=WSCOL_LIGHT_WHITE
+# compatibility to other console drivers
+options WSDISPLAY_COMPAT_USL # VT handling
+options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes
config netbsd root on ? type ?
@@ -186,6 +189,7 @@ pms* at pckbc? # PS/2 mouse for wsmouse
#options PMS_DISABLE_POWERHOOK # Disable PS/2 reset on resume
options PMS_SYNAPTICS_TOUCHPAD # Enable support for Synaptics Touchpads
genfb* at pci? dev ? function ?
+options WSFB_FAKE_VGA_FB
vga* at pci? dev ? function ?
wsdisplay* at vga? console ?
wskbd* at pckbd? console ?
diff --git a/sys/arch/bebox/conf/majors.bebox b/sys/arch/bebox/conf/majors.bebox
index f75bf6fae74..0613907e0f2 100644
--- a/sys/arch/bebox/conf/majors.bebox
+++ b/sys/arch/bebox/conf/majors.bebox
@@ -1,4 +1,4 @@
-# $NetBSD: majors.bebox,v 1.21 2008/11/12 12:35:57 ad Exp $
+# $NetBSD: majors.bebox,v 1.22 2010/08/01 06:13:19 kiyohara Exp $
#
# Device majors for bebox
#
@@ -59,6 +59,7 @@ device-major clockctl char 58 clockctl
device-major cgd char 60 block 19 cgd
device-major ksyms char 61 ksyms
device-major wsfont char 62 wsfont
+device-major pci char 63 pci
device-major nsmb char 98 nsmb
diff --git a/sys/arch/bebox/include/param.h b/sys/arch/bebox/include/param.h
index 5035665c6de..e3fbc02d63b 100644
--- a/sys/arch/bebox/include/param.h
+++ b/sys/arch/bebox/include/param.h
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.10 2007/10/17 19:54:00 garbled Exp $ */
+/* $NetBSD: param.h,v 1.11 2010/08/01 06:13:19 kiyohara Exp $ */
/*-
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -49,3 +49,6 @@
#define KERNBASE 0x3100
#include <powerpc/param.h>
+
+/* at this offset we mmap() the PCI IO range in display drivers */
+#define PCI_MAGIC_IO_RANGE 0xf2000000