Module Name: src
Committed By: kiyohara
Date: Sun Aug 1 06:13:19 UTC 2010
Modified Files:
src/sys/arch/bebox/conf: GENERIC majors.bebox
src/sys/arch/bebox/include: param.h
Log Message:
Support xserver.
To generate a diff of this commit:
cvs rdiff -u -r1.119 -r1.120 src/sys/arch/bebox/conf/GENERIC
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/bebox/conf/majors.bebox
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/bebox/include/param.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/bebox/conf/GENERIC
diff -u src/sys/arch/bebox/conf/GENERIC:1.119 src/sys/arch/bebox/conf/GENERIC:1.120
--- src/sys/arch/bebox/conf/GENERIC:1.119 Sat May 8 22:16:26 2010
+++ src/sys/arch/bebox/conf/GENERIC Sun Aug 1 06:13:19 2010
@@ -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 @@
#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 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 @@
#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 ?
Index: src/sys/arch/bebox/conf/majors.bebox
diff -u src/sys/arch/bebox/conf/majors.bebox:1.21 src/sys/arch/bebox/conf/majors.bebox:1.22
--- src/sys/arch/bebox/conf/majors.bebox:1.21 Wed Nov 12 12:35:57 2008
+++ src/sys/arch/bebox/conf/majors.bebox Sun Aug 1 06:13:19 2010
@@ -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 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
Index: src/sys/arch/bebox/include/param.h
diff -u src/sys/arch/bebox/include/param.h:1.10 src/sys/arch/bebox/include/param.h:1.11
--- src/sys/arch/bebox/include/param.h:1.10 Wed Oct 17 19:54:00 2007
+++ src/sys/arch/bebox/include/param.h Sun Aug 1 06:13:19 2010
@@ -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
