CVS commit: src/sys/arch/hp300/conf

2021-05-29 Thread Izumi Tsutsui
Module Name:src
Committed By:   tsutsui
Date:   Sat May 29 22:52:35 UTC 2021

Modified Files:
src/sys/arch/hp300/conf: INSTALL

Log Message:
Reduce diffs from GENERIC for maintainability.

No functional change intended.


To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 src/sys/arch/hp300/conf/INSTALL

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/hp300/conf/INSTALL
diff -u src/sys/arch/hp300/conf/INSTALL:1.68 src/sys/arch/hp300/conf/INSTALL:1.69
--- src/sys/arch/hp300/conf/INSTALL:1.68	Sat May 29 21:08:44 2021
+++ src/sys/arch/hp300/conf/INSTALL	Sat May 29 22:52:35 2021
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.68 2021/05/29 21:08:44 tsutsui Exp $
+# $NetBSD: INSTALL,v 1.69 2021/05/29 22:52:35 tsutsui Exp $
 #
 # INSTALL machine description file
 #
@@ -9,17 +9,18 @@ include 	"arch/hp300/conf/std.hp300"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-# optimise for smaller kernels
-makeoptions 	COPTS="-Os -fno-unwind-tables"
+# Optimize for space.
+makeoptions	COPTS="-Os -fno-unwind-tables"
+
+maxusers	8		# estimated number of users
+
+# Special options for smaller kernels
 #options 	NVNODE=50
 #options 	NBUF=16
 #options 	BUFPAGES=16
 options 	BUFCACHE=5
 options 	NFS_V2_ONLY
 options 	NFS_DEFAULT_NIOTHREADS=1
-options 	USERCONF		# userconf(4) support
-options 	PIPE_SOCKETPAIR		# smaller, but slower pipe(2)
-#options 	SYSCTL_INCLUDE_DESCR	# Include sysctl descriptions in kernel
 
 # Support for various CPU types
 options 	HP320
@@ -38,42 +39,77 @@ options 	HP400
 options 	HP425
 options 	HP433
 options 	FPSP		# floating point interface for 68040
-
-# Need to set locally
-maxusers	8
+#options 	FPU_EMULATE	# software fpu emulation for MC68030
 
 # Standard system options
+#options 	KTRACE		# system call tracing support
+#options 	INSECURE	# disable kernel security level
+options 	USERCONF	# userconf(4) support
+options 	PIPE_SOCKETPAIR	# smaller, but slower pipe(2)
+#options 	SYSCTL_INCLUDE_DESCR	# Include sysctl descriptions in kernel
+#options 	RTC_OFFSET=0	# hardware clock is this many mins. west of GMT
+#options 	NTP		# NTP phase/frequency locked loop
+#options 	SYSVMSG		# System V-style message queues
+#options 	SYSVSEM		# System V-style semaphores
+#options 	SYSVSHM		# System V-style shared memory
+
+#options 	MODULAR		# new style module(7) framework
+#options 	MODULAR_DEFAULT_AUTOLOAD
+
+# Alternate buffer queue strategies for better responsiveness under high
+# disk I/O load.
+#options 	BUFQ_READPRIO
+#options 	BUFQ_PRIOCSCAN
+
+# Debugging options
+#options 	DIAGNOSTIC	# Extra kernel sanity checks
+#options 	DEBUG		# Enable misc. kernel debugging code
+#options 	DDB		# Kernel Dynamic Debugger
+#options 	DDB_HISTORY_SIZE=512	# Enable history editing in DDB
+#options 	KGDB		# remote debugger
+#makeoptions	DEBUG="-g"	# netbsd.gdb with full debugging symbols
+
+# Compatibility options
 #include 	"conf/compat_netbsd09.config"
 options 	COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.
-#options 	SYSVSHM		# System V-style shared memory
-#options 	SYSVSEM		# System V-style semaphores
-#options 	SEMMNI=10	# number of semaphore identifiers
-#options 	SEMMNS=60	# number of semaphores in system
-#options 	SEMUME=10	# max number of undo entries per process
-#options 	SEMMNU=30	# number of undo structures in system
-#options 	SYSVMSG		# System V-style message queues
-#options 	KTRACE		# system call tracing support
-#options 	SCSIVERBOSE	# Verbose SCSI errors
+
+# Binary compatibility.
+#options 	COMPAT_AOUT_M68K	# NetBSD/m68k a.out binary compatibility
+#options 	COMPAT_M68K4K	# NetBSD/m68k4k binary compatibility
+#options 	COMPAT_SUNOS	# SunOS4 m68k binary compatibility
+#options 	COMPAT_LINUX	# Linux/m68k binary compatibility
+#options 	COMPAT_OSSAUDIO	# Linux/m68k binary compatibility
 
 # Filesystems
-file-system	FFS		# fast filesystem
 file-system	CD9660		# CD-ROM ISO-9660 filesystem
-file-system	NFS		# Network filesystem client
-#file-system	UNION		# Union filesystem (req. for FDESC)
-#file-system	KERNFS		# kernel data-structure filesystem
+#file-system	EXT2FS		# second extended file system (linux)
 #file-system	FDESC		# user file descriptor filesystem
-#file-system	PROCFS		# /proc filesystem
+file-system	FFS		# fast filesystem
+#file-system	KERNFS		# kernel data-structure filesystem
+#file-system	LFS		# log-structured file system
 file-system	MFS		# Memory-based filesystem
+file-system	NFS		# Network filesystem client
+#file-system	NULLFS		# loopback file system
+#file-system	OVERLAY		# overlay file system
+#file-system	PUFFS		# Userspace file systems (e.g. ntfs-3g & sshfs)
+#file-system	PROCFS		# /proc filesystem
+#file-system	UMAPFS		# NULLFS + uid and gid remapping
+#file-system	UNION		# Union filesystem (req. for FDESC)
+#file-system	CODA		# Coda File System; also needs vcoda (below)
 #file-system	PTYFS		# /dev/pts/N support
+#file-system	TMPFS		# Efficient 

CVS commit: src/sys/arch/hp300/conf

2021-05-29 Thread Izumi Tsutsui
Module Name:src
Committed By:   tsutsui
Date:   Sat May 29 22:50:18 UTC 2021

Modified Files:
src/sys/arch/hp300/conf: GENERIC

Log Message:
Reorder entries and reorganize comments for maintainability.

No functional change intended.


To generate a diff of this commit:
cvs rdiff -u -r1.207 -r1.208 src/sys/arch/hp300/conf/GENERIC

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/hp300/conf/GENERIC
diff -u src/sys/arch/hp300/conf/GENERIC:1.207 src/sys/arch/hp300/conf/GENERIC:1.208
--- src/sys/arch/hp300/conf/GENERIC:1.207	Thu Jan 21 06:51:54 2021
+++ src/sys/arch/hp300/conf/GENERIC	Sat May 29 22:50:18 2021
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.207 2021/01/21 06:51:54 nia Exp $
+# $NetBSD: GENERIC,v 1.208 2021/05/29 22:50:18 tsutsui Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include 	"arch/hp300/conf/std.hp300"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.207 $"
+#ident 		"GENERIC-$Revision: 1.208 $"
 
 makeoptions	COPTS="-O2 -fno-reorder-blocks -fno-omit-frame-pointer"
 	# See share/mk/sys.mk. -fno-omit-frame-pointer is necessary for
@@ -57,9 +57,9 @@ options 	USERCONF	# userconf(4) support
 options 	SYSCTL_INCLUDE_DESCR	# Include sysctl descriptions in kernel
 #options 	RTC_OFFSET=0	# hardware clock is this many mins. west of GMT
 options 	NTP		# NTP phase/frequency locked loop
-options 	SYSVSHM		# System V-style shared memory
 options 	SYSVMSG		# System V-style message queues
 options 	SYSVSEM		# System V-style semaphores
+options 	SYSVSHM		# System V-style shared memory
 
 options 	MODULAR		# new style module(7) framework
 options 	MODULAR_DEFAULT_AUTOLOAD
@@ -159,7 +159,8 @@ options 	USELEDS		# make the lights twin
 options 	DIOVERBOSE	# recognize "unknown" DIO devices
 
 # workstation console options
-options 	WSEMUL_VT100# VT100 / VT220 emulation
+options 	WSEMUL_VT100			# VT100 / VT220 emulation
+#options 	WSDISPLAY_DEFAULTSCREENS=1
 options 	WSDISPLAY_COMPAT_USL		# wsconscfg VT handling
 options 	WSDISPLAY_COMPAT_RAWKBD
 options 	WS_KERNEL_FG=WSCOL_GREEN
@@ -180,6 +181,12 @@ intio0		at mainbus0		# internal i/o spac
 dio0		at mainbus0		# DIO/DIO-II bus
 sgc0		at mainbus0		# SGC bus
 
+# Real-time clock (not optional)
+rtc*		at intio?
+
+# DMA controller
+dma* 		at intio?
+
 # Human Interface Loop devices
 hil0		at intio?		# HIL controller
 hilkbd* 	at hil?			# keyboards
@@ -188,10 +195,8 @@ hilms*		at hil?			# mice, buttons and ta
 wsmouse*	at hilms? mux 0
 hilid*		at hil?			# ID module
 
-rtc*		at intio?		# real-time clock (not optional)
-dma* 		at intio?		# DMA controller
-frodo*		at intio?		# Frodo utility chip found on 382, 4xx
-nhpib*		at intio?		# slow internal HP-IB
+# Frodo utility chip found on 382, 4xx's
+frodo*		at intio?
 
 # 8250-like serial ports found on Frodo ASIC
 dnkbd0		at frodo? offset 0x0	# Domain keyboard flavor
@@ -202,32 +207,40 @@ com*		at frodo? offset ?	# tty flavor
 # mc146818-like real time clock found on 425e
 mcclock0	at frodo? offset 0x80
 
-dvbox*		at intio?		# Davinci framebuffer
+# Davinci framebuffer
+dvbox*		at intio?
 dvbox*		at dio? scode ?
 wsdisplay*	at dvbox?
 
-gbox*		at intio?		# Gatorbox framebuffer
+# Gatorbox framebuffer
+gbox*		at intio?
 gbox*		at dio? scode ?
 wsdisplay*	at gbox?
 
-hyper*		at dio? scode ?		# Hyperion framebuffer
+# Hyperion framebuffer
+hyper*		at dio? scode ?
 wsdisplay*	at hyper?
 
-rbox*		at intio?		# Renaissance framebuffer
+# Renaissance framebuffer
+rbox*		at intio?
 rbox*		at dio? scode ?
 wsdisplay*	at rbox?
 
-topcat*		at intio?		# Topcat/catseye framebuffers
+# Topcat/catseye framebuffers
+topcat*		at intio?
 topcat*		at dio? scode ?
 wsdisplay*	at topcat?
 
-tvrx*		at dio? scode ?		# TurboVRX framebuffer
+# TurboVRX framebuffer
+tvrx*		at dio? scode ?
 wsdisplay*	at tvrx?
 
-gendiofb*	at dio? scode ?		# dumb framebuffer support for 362/382
+# dumb framebuffer support for 362/382
+gendiofb*	at dio? scode ?
 wsdisplay*	at gendiofb?
 
-sti*		at sgc?	slot ?		# SGC EVRX framebuffers
+# STI framebuffers
+sti*		at sgc?	slot ?
 wsdisplay*	at sti?
 
 com0		at dio0 scode 9		# DCA serial interfaces
@@ -237,10 +250,12 @@ dcm*		at dio? scode ?	flags 0xe # DCM 4-
 
 le*		at dio? scode ?		# LANCE ethernet interfaces
 
-nhpib0		at dio? scode 7		# slow internal HP-IB
+# HP-IB devices
+nhpib*		at intio?		# internal HP-IB
+nhpib0		at dio? scode 7		# 98624A HP-IB
 nhpib*		at dio? scode ?
 
-fhpib*		at dio? scode ?		# `fast' HP-IB
+fhpib*		at dio? scode ?		# 98625A/98625B HP-IB
 
 hpibbus0	at nhpib0
 hpibbus*	at nhpib?
@@ -251,6 +266,7 @@ ct*		at hpibbus? slave ? punit ?	# HP-IB
 mt*		at hpibbus? slave ? punit ?	# HP-IB 9-track tape
 ppi0		at hpibbus0 slave 5 punit 0	# HP-IB plotter
 
+# SCSI devices
 spc*		at dio? scode ?			# HP 98265A SCSI
 scsibus*	at spc?
 
@@ -296,10 +312,10 @@ pseudo-device	agr			# IEEE 802.3ad link 
 pseudo-d

CVS commit: src/sys/arch/hp300/conf

2021-05-29 Thread Izumi Tsutsui
Module Name:src
Committed By:   tsutsui
Date:   Sat May 29 21:08:44 UTC 2021

Modified Files:
src/sys/arch/hp300/conf: INSTALL

Log Message:
Reduce maxusers to 8 as GENERIC.

Should be pulled up to netbsd-9 and netbsd-8.


To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 src/sys/arch/hp300/conf/INSTALL

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/hp300/conf/INSTALL
diff -u src/sys/arch/hp300/conf/INSTALL:1.67 src/sys/arch/hp300/conf/INSTALL:1.68
--- src/sys/arch/hp300/conf/INSTALL:1.67	Sat May 29 21:06:20 2021
+++ src/sys/arch/hp300/conf/INSTALL	Sat May 29 21:08:44 2021
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.67 2021/05/29 21:06:20 tsutsui Exp $
+# $NetBSD: INSTALL,v 1.68 2021/05/29 21:08:44 tsutsui Exp $
 #
 # INSTALL machine description file
 #
@@ -40,7 +40,7 @@ options 	HP433
 options 	FPSP		# floating point interface for 68040
 
 # Need to set locally
-maxusers	32
+maxusers	8
 
 # Standard system options
 #include 	"conf/compat_netbsd09.config"



CVS commit: src/sys/arch/hp300/conf

2021-05-29 Thread Izumi Tsutsui
Module Name:src
Committed By:   tsutsui
Date:   Sat May 29 21:06:20 UTC 2021

Modified Files:
src/sys/arch/hp300/conf: INSTALL

Log Message:
Add missed 'nhpib at intio' for internal HP-IB.  Found on testing HPDisk.

Also fix comments for HP-IB devices.
Should be pulled up to netbsd-8 and netbsd-9.


To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 src/sys/arch/hp300/conf/INSTALL

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/hp300/conf/INSTALL
diff -u src/sys/arch/hp300/conf/INSTALL:1.66 src/sys/arch/hp300/conf/INSTALL:1.67
--- src/sys/arch/hp300/conf/INSTALL:1.66	Sat Dec 12 05:48:55 2020
+++ src/sys/arch/hp300/conf/INSTALL	Sat May 29 21:06:20 2021
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.66 2020/12/12 05:48:55 tsutsui Exp $
+# $NetBSD: INSTALL,v 1.67 2021/05/29 21:06:20 tsutsui Exp $
 #
 # INSTALL machine description file
 #
@@ -183,10 +183,11 @@ dcm*		at dio? scode ?	flags 0xe # DCM 4-
 
 le*		at dio? scode ?		# LANCE ethernet interfaces
 
-nhpib0		at dio? scode 7		# slow internal HP-IB
+nhpib*		at intio?		# internal HP-IB
+nhpib0		at dio? scode 7		# 98624A HP-IB
 nhpib*		at dio? scode ?
 
-fhpib*		at dio? scode ?		# `fast' HP-IB
+fhpib*		at dio? scode ?		# 98625A/98625B HP-IB
 
 hpibbus0	at nhpib0
 hpibbus*	at nhpib?



CVS commit: src/sys/arch/hp300/conf

2020-12-11 Thread Izumi Tsutsui
Module Name:src
Committed By:   tsutsui
Date:   Sat Dec 12 05:48:55 UTC 2020

Modified Files:
src/sys/arch/hp300/conf: INSTALL RAMDISK

Log Message:
Remove options (NVNODE, NBUF, and BUFPAGES) for small RAM machines.

These options make extracting binary sets much slower even on miniroot.
Instead, use "options BUFCACHE=5" (use 5% of memory for buffercache) and
also specify "-fno-unwind-tables" for COPTS to shrink INSTALL kernel.

Worth to pullup to netbsd-9.


To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 src/sys/arch/hp300/conf/INSTALL
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/hp300/conf/RAMDISK

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/hp300/conf/INSTALL
diff -u src/sys/arch/hp300/conf/INSTALL:1.65 src/sys/arch/hp300/conf/INSTALL:1.66
--- src/sys/arch/hp300/conf/INSTALL:1.65	Sun Sep 27 13:48:51 2020
+++ src/sys/arch/hp300/conf/INSTALL	Sat Dec 12 05:48:55 2020
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.65 2020/09/27 13:48:51 roy Exp $
+# $NetBSD: INSTALL,v 1.66 2020/12/12 05:48:55 tsutsui Exp $
 #
 # INSTALL machine description file
 #
@@ -10,10 +10,11 @@ include 	"arch/hp300/conf/std.hp300"
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
 # optimise for smaller kernels
-makeoptions 	COPTS="-Os"
-options 	NVNODE=50
-options 	NBUF=16
-options 	BUFPAGES=16
+makeoptions 	COPTS="-Os -fno-unwind-tables"
+#options 	NVNODE=50
+#options 	NBUF=16
+#options 	BUFPAGES=16
+options 	BUFCACHE=5
 options 	NFS_V2_ONLY
 options 	NFS_DEFAULT_NIOTHREADS=1
 options 	USERCONF		# userconf(4) support

Index: src/sys/arch/hp300/conf/RAMDISK
diff -u src/sys/arch/hp300/conf/RAMDISK:1.15 src/sys/arch/hp300/conf/RAMDISK:1.16
--- src/sys/arch/hp300/conf/RAMDISK:1.15	Tue Dec 29 14:51:38 2015
+++ src/sys/arch/hp300/conf/RAMDISK	Sat Dec 12 05:48:55 2020
@@ -1,4 +1,4 @@
-# $NetBSD: RAMDISK,v 1.15 2015/12/29 14:51:38 christos Exp $
+# $NetBSD: RAMDISK,v 1.16 2020/12/12 05:48:55 tsutsui Exp $
 #
 # RAMDISK machine description file
 #
@@ -7,11 +7,6 @@
 
 include 	"arch/hp300/conf/INSTALL"
 
-# These options for small RAM machines makes extracting binaries much slower.
-no options	NVNODE
-no options	NBUF
-no options	BUFPAGES
-
 # Enable the hooks used for initializing the root memory-disk.
 options 	MEMORY_DISK_HOOKS
 options 	MEMORY_DISK_IS_ROOT		# force root on memory disk



CVS commit: src/sys/arch/hp300/conf

2015-12-29 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Tue Dec 29 14:51:38 UTC 2015

Modified Files:
src/sys/arch/hp300/conf: RAMDISK

Log Message:
Holiday food satiation.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/hp300/conf/RAMDISK

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/hp300/conf/RAMDISK
diff -u src/sys/arch/hp300/conf/RAMDISK:1.14 src/sys/arch/hp300/conf/RAMDISK:1.15
--- src/sys/arch/hp300/conf/RAMDISK:1.14	Tue Apr 29 14:47:22 2014
+++ src/sys/arch/hp300/conf/RAMDISK	Tue Dec 29 09:51:38 2015
@@ -1,4 +1,4 @@
-# $NetBSD: RAMDISK,v 1.14 2014/04/29 18:47:22 tsutsui Exp $
+# $NetBSD: RAMDISK,v 1.15 2015/12/29 14:51:38 christos Exp $
 #
 # RAMDISK machine description file
 #
@@ -16,7 +16,7 @@ no options	BUFPAGES
 options 	MEMORY_DISK_HOOKS
 options 	MEMORY_DISK_IS_ROOT		# force root on memory disk
 options 	MEMORY_DISK_SERVER=0		# no mdconfig(8) support
-options 	MEMORY_DISK_ROOT_SIZE=3200	# size, in blocks (1.60MB)
+options 	MEMORY_DISK_ROOT_SIZE=3600	# size, in blocks (1.80MB)
 options 	MEMORY_DISK_RBFLAGS=RB_SINGLE	# boot in single-user mode
 
 pseudo-device 	md# memory disk device



CVS commit: src/sys/arch/hp300/conf

2014-07-18 Thread Izumi Tsutsui
Module Name:src
Committed By:   tsutsui
Date:   Fri Jul 18 17:59:12 UTC 2014

Modified Files:
src/sys/arch/hp300/conf: GENERIC

Log Message:
More tweaks to GENERIC.

- reduce maxusers from 32 to 8 as other m68k ports
- make NFS_BOOT_DHCP default rather than NFS_BOOT_BOOTP
  (and move these options in "Networking options" block)
- use 8x16 font instead of 12x22 for machines with small screen like HP362


To generate a diff of this commit:
cvs rdiff -u -r1.183 -r1.184 src/sys/arch/hp300/conf/GENERIC

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/hp300/conf/GENERIC
diff -u src/sys/arch/hp300/conf/GENERIC:1.183 src/sys/arch/hp300/conf/GENERIC:1.184
--- src/sys/arch/hp300/conf/GENERIC:1.183	Fri Jul 18 17:51:27 2014
+++ src/sys/arch/hp300/conf/GENERIC	Fri Jul 18 17:59:12 2014
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.183 2014/07/18 17:51:27 tsutsui Exp $
+# $NetBSD: GENERIC,v 1.184 2014/07/18 17:59:12 tsutsui Exp $
 #
 # GENERIC machine description file
 #
@@ -22,11 +22,11 @@ include 	"arch/hp300/conf/std.hp300"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.183 $"
+#ident 		"GENERIC-$Revision: 1.184 $"
 
 makeoptions	COPTS="-O2 -fno-reorder-blocks"	# see share/mk/sys.mk
 
-maxusers	32		# estimated number of users
+maxusers	8		# estimated number of users
 
 # Support for various CPU types
 options 	HP320
@@ -129,7 +129,6 @@ options 	WAPBL		# File system journaling
 #options 	UFS_DIRHASH	# UFS Large Directory Hashing - Experimental
 options 	NFSSERVER	# Network filesystem server
 #options 	EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags
-options 	NFS_BOOT_BOOTP	# use bootp for NFS boot
 options 	FFS_NO_SNAPSHOT	# No FFS snapshot support
 
 # Networking options
@@ -163,6 +162,9 @@ options 	IPFILTER_COMPAT # Compat for IP
 #options 	ALTQ_RIO	# RED with IN/OUT
 #options 	ALTQ_WFQ	# Weighted Fair Queueing
 
+#options 	NFS_BOOT_BOOTP	# use bootp for NFS boot
+options 	NFS_BOOT_DHCP	# use dhcp for NFS boot
+
 # Options for HP hardware
 options 	USELEDS		# make the lights twinkle
 #options 	PANICBUTTON	# two fast s on HIL dump kernel
@@ -181,8 +183,8 @@ options 	WSDISPLAY_COMPAT_RAWKBD
 options 	WS_KERNEL_FG=WSCOL_GREEN
 #options 	WS_KERNEL_BG=WSCOL_BLACK
 
-options 	FONT_GALLANT12x22
-#options 	FONT_VT220ISO8x16
+#options 	FONT_GALLANT12x22
+options 	FONT_VT220ISO8x16
 
 config		netbsd root on ? type ?
 



CVS commit: src/sys/arch/hp300/conf

2014-07-18 Thread Izumi Tsutsui
Module Name:src
Committed By:   tsutsui
Date:   Fri Jul 18 17:51:27 UTC 2014

Modified Files:
src/sys/arch/hp300/conf: GENERIC

Log Message:
Shrink GENERIC and enable MODULAR instead.


To generate a diff of this commit:
cvs rdiff -u -r1.182 -r1.183 src/sys/arch/hp300/conf/GENERIC

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/hp300/conf/GENERIC
diff -u src/sys/arch/hp300/conf/GENERIC:1.182 src/sys/arch/hp300/conf/GENERIC:1.183
--- src/sys/arch/hp300/conf/GENERIC:1.182	Sat Jul  5 09:15:38 2014
+++ src/sys/arch/hp300/conf/GENERIC	Fri Jul 18 17:51:27 2014
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.182 2014/07/05 09:15:38 tsutsui Exp $
+# $NetBSD: GENERIC,v 1.183 2014/07/18 17:51:27 tsutsui Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include 	"arch/hp300/conf/std.hp300"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.182 $"
+#ident 		"GENERIC-$Revision: 1.183 $"
 
 makeoptions	COPTS="-O2 -fno-reorder-blocks"	# see share/mk/sys.mk
 
@@ -59,7 +59,7 @@ options 	SYSVSHM		# System V-style share
 options 	SYSVMSG		# System V-style message queues
 options 	SYSVSEM		# System V-style semaphores
 
-#options 	MODULAR		# new style module(7) framework
+options 	MODULAR		# new style module(7) framework
 
 # Enable experimental buffer queue strategy for better responsiveness under
 # high disk I/O load. Use it with caution - it's not proven to be stable yet.
@@ -97,26 +97,26 @@ options 	COMPAT_60	# NetBSD 6.0 compatib
 options 	COMPAT_AOUT_M68K	# NetBSD/m68k a.out binary compatibility
 options 	COMPAT_M68K4K	# NetBSD/m68k4k binary compatibility
 options 	COMPAT_SUNOS	# SunOS4 m68k binary compatibility
-options 	COMPAT_LINUX	# Linux/m68k binary compatibility
-options 	COMPAT_SVR4	# SVR4 binary compatibility
+#options 	COMPAT_LINUX	# Linux/m68k binary compatibility
+#options 	COMPAT_SVR4	# SVR4 binary compatibility
 options 	COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.
 
 # Filesystems
 file-system	CD9660		# CD-ROM ISO-9660 filesystem
-file-system	EXT2FS		# second extended file system (linux)
+#file-system	EXT2FS		# second extended file system (linux)
 file-system	FDESC		# user file descriptor filesystem
 file-system	FFS		# fast filesystem
 file-system	KERNFS		# kernel data-structure filesystem
-file-system	LFS		# log-structured file system
+#file-system	LFS		# log-structured file system
 file-system	MFS		# Memory-based filesystem
 file-system	NFS		# Network filesystem client
 file-system	NULLFS		# loopback file system
-file-system	OVERLAY		# overlay file system
-file-system	PUFFS		# Userspace file systems (e.g. ntfs-3g & sshfs)
+#file-system	OVERLAY		# overlay file system
+#file-system	PUFFS		# Userspace file systems (e.g. ntfs-3g & sshfs)
 file-system	PROCFS		# /proc filesystem
-file-system	UMAPFS		# NULLFS + uid and gid remapping
-file-system	UNION		# Union filesystem (req. for FDESC)
-file-system	CODA		# Coda File System; also needs vcoda (below)
+#file-system	UMAPFS		# NULLFS + uid and gid remapping
+#file-system	UNION		# Union filesystem (req. for FDESC)
+#file-system	CODA		# Coda File System; also needs vcoda (below)
 file-system	PTYFS		# /dev/pts/N support
 file-system	TMPFS		# Efficient memory file-system
 #file-system	UDF		# experimental - OSTA UDF CD/DVD file-system
@@ -130,7 +130,7 @@ options 	WAPBL		# File system journaling
 options 	NFSSERVER	# Network filesystem server
 #options 	EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags
 options 	NFS_BOOT_BOOTP	# use bootp for NFS boot
-#options 	FFS_NO_SNAPSHOT	# No FFS snapshot support
+options 	FFS_NO_SNAPSHOT	# No FFS snapshot support
 
 # Networking options
 options 	INET		# Internet protocols
@@ -141,8 +141,8 @@ options 	GATEWAY		# IP forwarding
 options 	MROUTING	# Multicast routing
 options 	PIM		# Protocol Independent Multicast
 options 	NETATALK	# AppleTalk networking protocols
-options 	PPP_BSDCOMP	# BSD-Compress compression support for PPP
-options 	PPP_DEFLATE	# Deflate compression support for PPP
+#options 	PPP_BSDCOMP	# BSD-Compress compression support for PPP
+#options 	PPP_DEFLATE	# Deflate compression support for PPP
 options 	PPP_FILTER	# Active filter support for PPP (requires bpf)
 options 	IPFILTER_LOG	# ipmon(8) log support
 options 	IPFILTER_LOOKUP	# ippool(8) support
@@ -294,7 +294,7 @@ options 	RAID_AUTOCONFIG		# auto-configu
 #options 	RF_INCLUDE_INTERDECLUSTER=1
 #options 	RF_INCLUDE_PARITY_DECLUSTERING=1
 #options 	RF_INCLUDE_PARITY_DECLUSTERING_DS=1
-pseudo-device	fss			# file system snapshot device
+#pseudo-device	fss			# file system snapshot device
 pseudo-device	md			# memory disk device (ramdisk)
 pseudo-device	vnd			# vnode pseudo-disks
 #options 	VND_COMPRESSION		# compressed vnd(4)
@@ -320,17 +320,17 @@ pseudo-device	vlan			# IEEE 802.1q encap
 
 #
 # accept filters
-pseudo-device   accf_data		# "dataready" accept filter
-pseudo-device   accf_http		# "

CVS commit: src/sys/arch/hp300/conf

2014-07-05 Thread Izumi Tsutsui
Module Name:src
Committed By:   tsutsui
Date:   Sat Jul  5 09:15:38 UTC 2014

Modified Files:
src/sys/arch/hp300/conf: GENERIC

Log Message:
Use COPTS="-O2 -fno-reorder-blocks" as defined in sys.mk for userland.

with "-O2":
   textdata bss dec hex filename
3717740   86092  152864 3956696  3c5fd8 netbsd

with "-O2 -fno-reorder-blocks":
   textdata bss dec hex filename
3304404   86092  152864 3543360  361140 netbsd


To generate a diff of this commit:
cvs rdiff -u -r1.181 -r1.182 src/sys/arch/hp300/conf/GENERIC

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/hp300/conf/GENERIC
diff -u src/sys/arch/hp300/conf/GENERIC:1.181 src/sys/arch/hp300/conf/GENERIC:1.182
--- src/sys/arch/hp300/conf/GENERIC:1.181	Sat Apr 19 05:37:54 2014
+++ src/sys/arch/hp300/conf/GENERIC	Sat Jul  5 09:15:38 2014
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.181 2014/04/19 05:37:54 tsutsui Exp $
+# $NetBSD: GENERIC,v 1.182 2014/07/05 09:15:38 tsutsui Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,9 @@ include 	"arch/hp300/conf/std.hp300"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.181 $"
+#ident 		"GENERIC-$Revision: 1.182 $"
+
+makeoptions	COPTS="-O2 -fno-reorder-blocks"	# see share/mk/sys.mk
 
 maxusers	32		# estimated number of users
 



CVS commit: src/sys/arch/hp300/conf

2014-04-30 Thread Izumi Tsutsui
Module Name:src
Committed By:   tsutsui
Date:   Wed Apr 30 17:51:53 UTC 2014

Modified Files:
src/sys/arch/hp300/conf: INSTALL

Log Message:
Add and enable sti(4) at sgc in install kernels for 425e.

Tested on both serial console and framebuffer console.
(switched by the service switch on the back panel)


To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/sys/arch/hp300/conf/INSTALL

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/hp300/conf/INSTALL
diff -u src/sys/arch/hp300/conf/INSTALL:1.57 src/sys/arch/hp300/conf/INSTALL:1.58
--- src/sys/arch/hp300/conf/INSTALL:1.57	Tue Apr 29 18:38:27 2014
+++ src/sys/arch/hp300/conf/INSTALL	Wed Apr 30 17:51:53 2014
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.57 2014/04/29 18:38:27 tsutsui Exp $
+# $NetBSD: INSTALL,v 1.58 2014/04/30 17:51:53 tsutsui Exp $
 #
 # INSTALL machine description file
 #
@@ -136,7 +136,7 @@ mainbus0	at root		# root "bus"
 
 intio0		at mainbus0	# internal i/o space
 dio0		at mainbus0	# DIO/DIO-II bus
-#sgc0		at mainbus0	# SGC bus
+sgc0		at mainbus0	# SGC bus
 
 # Real-time clock (not optional)
 rtc*		at intio?
@@ -191,6 +191,9 @@ wsdisplay*	at tvrx?
 gendiofb*	at dio? scode ?
 wsdisplay*	at gendiofb?
 
+sti*		at sgc?	slot ?		# SGC EVRX framebuffers
+wsdisplay*	at sti?
+
 com*		at dio0 scode 9		# DCA serial interfaces
 com*		at dio? scode ?
 



CVS commit: src/sys/arch/hp300/conf

2014-04-29 Thread Izumi Tsutsui
Module Name:src
Committed By:   tsutsui
Date:   Tue Apr 29 18:47:22 UTC 2014

Modified Files:
src/sys/arch/hp300/conf: RAMDISK

Log Message:
Disable options NVNODE, NBUF and BUFPAGES in the RAMDISK kernel.

These options were specified in the INSTALL kernel for 4MB machines,
but nowadays even the INSTALL kernel would not boot on such machines
and the RAMDISK kernel assumes the target machine has more memories.
Furthermore, these options makes extracting binary sets much slower
and also could cause "wapbl_register_deallocation: out of resources"
panic during extracting binaries into a 32GB SSD with 4KB fragments.

Should be pulled up to netbsd-6* branches.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/hp300/conf/RAMDISK

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/hp300/conf/RAMDISK
diff -u src/sys/arch/hp300/conf/RAMDISK:1.13 src/sys/arch/hp300/conf/RAMDISK:1.14
--- src/sys/arch/hp300/conf/RAMDISK:1.13	Tue Nov 23 11:13:58 2010
+++ src/sys/arch/hp300/conf/RAMDISK	Tue Apr 29 18:47:22 2014
@@ -1,4 +1,4 @@
-# $NetBSD: RAMDISK,v 1.13 2010/11/23 11:13:58 hannken Exp $
+# $NetBSD: RAMDISK,v 1.14 2014/04/29 18:47:22 tsutsui Exp $
 #
 # RAMDISK machine description file
 #
@@ -7,6 +7,11 @@
 
 include 	"arch/hp300/conf/INSTALL"
 
+# These options for small RAM machines makes extracting binaries much slower.
+no options	NVNODE
+no options	NBUF
+no options	BUFPAGES
+
 # Enable the hooks used for initializing the root memory-disk.
 options 	MEMORY_DISK_HOOKS
 options 	MEMORY_DISK_IS_ROOT		# force root on memory disk



CVS commit: src/sys/arch/hp300/conf

2014-04-29 Thread Izumi Tsutsui
Module Name:src
Committed By:   tsutsui
Date:   Tue Apr 29 18:38:27 UTC 2014

Modified Files:
src/sys/arch/hp300/conf: INSTALL

Log Message:
Add "pseudo-device wsmux" in INSTALL (and RAMDISK) kernels.

On NetBSD/hp300, hilkbd(4) is probed in config_interrupts(9)
so it's always attached after wsdisplay(4).  In that case,
wskbd can't be used as a console input device without wsmux(4).
(i.e. keyboard didn't work on installer using screen console)

Should be pulled up to all netbsd-6* branches.


To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/hp300/conf/INSTALL

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/hp300/conf/INSTALL
diff -u src/sys/arch/hp300/conf/INSTALL:1.56 src/sys/arch/hp300/conf/INSTALL:1.57
--- src/sys/arch/hp300/conf/INSTALL:1.56	Sat Apr 19 05:37:54 2014
+++ src/sys/arch/hp300/conf/INSTALL	Tue Apr 29 18:38:27 2014
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.56 2014/04/19 05:37:54 tsutsui Exp $
+# $NetBSD: INSTALL,v 1.57 2014/04/29 18:38:27 tsutsui Exp $
 #
 # INSTALL machine description file
 #
@@ -248,3 +248,4 @@ pseudo-device	loop			# loopback network 
 #pseudo-device	stf			# 6to4 IPv6 over IPv4 encapsulation
 #pseudo-device	vlan			# IEEE 802.1q encapsulation
 #pseudo-device	bridge			# simple inter-network bridging
+pseudo-device	wsmux			# mouse & keyboard multiplexor



CVS commit: src/sys/arch/hp300/conf

2011-07-09 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Sat Jul  9 15:01:33 UTC 2011

Modified Files:
src/sys/arch/hp300/conf: Makefile.hp300

Log Message:
apply -Wno-cast-qual upon diofb.c.


To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 src/sys/arch/hp300/conf/Makefile.hp300

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/hp300/conf/Makefile.hp300
diff -u src/sys/arch/hp300/conf/Makefile.hp300:1.88 src/sys/arch/hp300/conf/Makefile.hp300:1.89
--- src/sys/arch/hp300/conf/Makefile.hp300:1.88	Fri Jan 21 15:59:06 2011
+++ src/sys/arch/hp300/conf/Makefile.hp300	Sat Jul  9 15:01:33 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.hp300,v 1.88 2011/01/21 15:59:06 joerg Exp $
+#	$NetBSD: Makefile.hp300,v 1.89 2011/07/09 15:01:33 mrg Exp $
 
 # Makefile for NetBSD
 #
@@ -70,6 +70,10 @@
 ## (7) misc settings
 ##
 
+.if defined(HAVE_GCC) && ${HAVE_GCC} == 45
+CWARNFLAGS.diofb.c+=	 -Wno-cast-qual
+.endif
+
 ##
 ## (8) config(8) generated machinery
 ##



CVS commit: src/sys/arch/hp300/conf

2011-05-21 Thread Izumi Tsutsui
Module Name:src
Committed By:   tsutsui
Date:   Sat May 21 12:06:14 UTC 2011

Modified Files:
src/sys/arch/hp300/conf: GENERIC files.hp300

Log Message:
Add sti at sgc configuration for SGC EVRX framebuffers found on
some later HP4xx models.  Untested, and disabled in GENERIC for now.


To generate a diff of this commit:
cvs rdiff -u -r1.165 -r1.166 src/sys/arch/hp300/conf/GENERIC
cvs rdiff -u -r1.83 -r1.84 src/sys/arch/hp300/conf/files.hp300

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/hp300/conf/GENERIC
diff -u src/sys/arch/hp300/conf/GENERIC:1.165 src/sys/arch/hp300/conf/GENERIC:1.166
--- src/sys/arch/hp300/conf/GENERIC:1.165	Sun Mar  6 17:08:24 2011
+++ src/sys/arch/hp300/conf/GENERIC	Sat May 21 12:06:14 2011
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.165 2011/03/06 17:08:24 bouyer Exp $
+# $NetBSD: GENERIC,v 1.166 2011/05/21 12:06:14 tsutsui Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.165 $"
+#ident 		"GENERIC-$Revision: 1.166 $"
 
 maxusers	32		# estimated number of users
 
@@ -241,6 +241,9 @@
 gendiofb*	at dio? scode ?		# dumb framebuffer support for 362/382
 wsdisplay*	at gendiofb?
 
+#sti*		at sgc?	slot ?		# SGC EVRX framebuffers
+#wsdisplay*	at sti?
+
 com0		at dio0 scode 9		# DCA serial interfaces
 com*		at dio? scode ?
 

Index: src/sys/arch/hp300/conf/files.hp300
diff -u src/sys/arch/hp300/conf/files.hp300:1.83 src/sys/arch/hp300/conf/files.hp300:1.84
--- src/sys/arch/hp300/conf/files.hp300:1.83	Fri Feb 18 16:06:20 2011
+++ src/sys/arch/hp300/conf/files.hp300	Sat May 21 12:06:14 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: files.hp300,v 1.83 2011/02/18 16:06:20 tsutsui Exp $
+#	$NetBSD: files.hp300,v 1.84 2011/05/21 12:06:14 tsutsui Exp $
 #
 # hp300-specific configuration info
 
@@ -182,6 +182,13 @@
 attach	spc at dio
 file	arch/hp300/dev/spc.c		spc needs-flag
 
+#
+# Devices on the SGC bus
+#
+
+attach	sti at sgc with sti_sgc
+file	arch/hp300/dev/sti_sgc.c	sti_sgc
+
 # Memory Disk for ramdisk
 file	dev/md_root.c			memory_disk_hooks
 



CVS commit: src/sys/arch/hp300/conf

2011-02-18 Thread Izumi Tsutsui
Module Name:src
Committed By:   tsutsui
Date:   Fri Feb 18 16:06:20 UTC 2011

Modified Files:
src/sys/arch/hp300/conf: files.hp300

Log Message:
sgc takes slot, not scode.


To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.83 src/sys/arch/hp300/conf/files.hp300

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/hp300/conf/files.hp300
diff -u src/sys/arch/hp300/conf/files.hp300:1.82 src/sys/arch/hp300/conf/files.hp300:1.83
--- src/sys/arch/hp300/conf/files.hp300:1.82	Sat Feb 12 15:49:01 2011
+++ src/sys/arch/hp300/conf/files.hp300	Fri Feb 18 16:06:20 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: files.hp300,v 1.82 2011/02/12 15:49:01 tsutsui Exp $
+#	$NetBSD: files.hp300,v 1.83 2011/02/18 16:06:20 tsutsui Exp $
 #
 # hp300-specific configuration info
 
@@ -46,7 +46,7 @@
 # SGC bus
 #
 
-device	sgc { scode = -1 }
+device	sgc { slot = -1 }
 attach	sgc at mainbus
 file	arch/hp300/dev/sgc.c		sgc
 



CVS commit: src/sys/arch/hp300/conf

2011-02-06 Thread Izumi Tsutsui
Module Name:src
Committed By:   tsutsui
Date:   Sun Feb  6 18:40:55 UTC 2011

Modified Files:
src/sys/arch/hp300/conf: GENERIC

Log Message:
Switch NetBSD/hp300 to wscons with rasops. Simply ported from OpenBSD/hp300.

- Only A1416 Kathmandu (topcat) framebuffer on 425t is tested, but
  all other variants (TigerShark, Hyperion, DaVinci, GatorBox, Renaissance)
  should also work if they are working on OpenBSD/hp300.
- sti(4) and SGC bus support are not pulled because I don't have 425e
  and I can't confirm that 362 and 382 actually have SGC bus.
  (I'll commit a DIO based dumb driver for 362 and 382 framebuffers later)
- Xorg server with wsfb driver will also be integrated soon
  once after keycode with NoSymbol problem is addressed.
  (We have to re-think what code should be used on WSDISPLAY_COMPAT_RAWKBD)
- MI HIL keyboard and mouse drivers are working fine though
  cngetc via hilkbd has some problem (still we can input commands).
- No old HP-UX like HIL ioctl compatibility (we removed COMPAT_HPUX anyway).
  grfinfo(8) and hilinfo(8) will be removed shortly.

Demonstrated on NetBSD booth at Open Source Conference 2011 Kagawa.


To generate a diff of this commit:
cvs rdiff -u -r1.160 -r1.161 src/sys/arch/hp300/conf/GENERIC

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/hp300/conf/GENERIC
diff -u src/sys/arch/hp300/conf/GENERIC:1.160 src/sys/arch/hp300/conf/GENERIC:1.161
--- src/sys/arch/hp300/conf/GENERIC:1.160	Sun Feb  6 06:47:15 2011
+++ src/sys/arch/hp300/conf/GENERIC	Sun Feb  6 18:40:55 2011
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.160 2011/02/06 06:47:15 tsutsui Exp $
+# $NetBSD: GENERIC,v 1.161 2011/02/06 18:40:55 tsutsui Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.160 $"
+#ident 		"GENERIC-$Revision: 1.161 $"
 
 maxusers	32		# estimated number of users
 
@@ -175,6 +175,15 @@
 #options 	SCSIVERBOSE	# Verbose SCSI errors
 options 	DIOVERBOSE	# recognize "unknown" DIO devices
 
+# workstation console options
+options 	WSEMUL_VT100# VT100 / VT220 emulation
+options 	WSDISPLAY_COMPAT_RAWKBD
+options 	WS_KERNEL_FG=WSCOL_GREEN
+#options 	WS_KERNEL_BG=WSCOL_BLACK
+
+options 	FONT_GALLANT12x22
+#options 	FONT_VT220ISO8x16
+
 config		netbsd root on ? type ?
 
 #
@@ -186,40 +195,46 @@
 intio0		at mainbus0		# internal i/o space
 dio0		at mainbus0		# DIO/DIO-II bus
 
+# Human Interface Loop devices
+hil0		at intio?		# HIL controller
+hilkbd* 	at hil?			# keyboards
+wskbd*		at hilkbd? mux 1
+hilms*		at hil?			# mice, buttons and tablets
+wsmouse*	at hilms? mux 0
+hilid*		at hil?			# ID module
+
 rtc*		at intio?		# real-time clock (not optional)
 dma* 		at intio?		# DMA controller
-hil*		at intio?		# Human Interface Loop
-options 	UK_KEYBOARD		# include United Kingdom HIL keymap
-options 	SE_KEYBOARD		# include Swedish HIL keymap
 frodo*		at intio?		# Frodo utility chip found on 382, 4xx
 nhpib*		at intio?		# slow internal HP-IB
 
 # 8250-like serial ports found on Frodo ASIC
 #dnkbd0		at frodo? offset 0x0	# Domain keyboard flavor
+#wskbd*		at dnkbd? mux 1
+#wsmouse*	at dnkbd? mux 0
 com*		at frodo? offset ?	# tty flavor
 
 dvbox*		at intio?		# Davinci framebuffer
 dvbox*		at dio? scode ?
+wsdisplay*	at dvbox?
 
 gbox*		at intio?		# Gatorbox framebuffer
 gbox*		at dio? scode ?
+wsdisplay*	at gbox?
 
 hyper*		at dio? scode ?		# Hyperion framebuffer
+wsdisplay*	at hyper?
 
 rbox*		at intio?		# Renaissance framebuffer
 rbox*		at dio? scode ?
+wsdisplay*	at rbox?
 
 topcat*		at intio?		# Topcat/catseye framebuffers
 topcat*		at dio? scode ?
+wsdisplay*	at topcat?
 
-# Framebuffer abstraction
-grf*		at dvbox?
-grf*		at gbox?
-grf*		at hyper?
-grf*		at rbox?
-grf*		at topcat?
-
-ite*		at grf?			# Internal Terminal Emulator
+tvrx*		at dio? scode ?		# TurboVRX framebuffer
+wsdisplay*	at tvrx?
 
 com0		at dio0 scode 9		# DCA serial interfaces
 com*		at dio? scode ?
@@ -308,6 +323,10 @@
 #pseudo-device	pflog			# PF log if
 pseudo-device	putter			# for puffs and pud
 
+# wscons pseudo-devices
+pseudo-device	wsmux			# mouse & keyboard multiplexor
+pseudo-device	wsfont
+
 # Veriexec
 #
 # a pseudo device needed for veriexec



CVS commit: src/sys/arch/hp300/conf

2011-02-05 Thread Izumi Tsutsui
Module Name:src
Committed By:   tsutsui
Date:   Sun Feb  6 06:47:16 UTC 2011

Modified Files:
src/sys/arch/hp300/conf: GENERIC

Log Message:
- adjust a comment for frodo (362 doesn't have frodo)
- whitespace nits


To generate a diff of this commit:
cvs rdiff -u -r1.159 -r1.160 src/sys/arch/hp300/conf/GENERIC

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/hp300/conf/GENERIC
diff -u src/sys/arch/hp300/conf/GENERIC:1.159 src/sys/arch/hp300/conf/GENERIC:1.160
--- src/sys/arch/hp300/conf/GENERIC:1.159	Mon Jan  3 06:07:43 2011
+++ src/sys/arch/hp300/conf/GENERIC	Sun Feb  6 06:47:15 2011
@@ -1,7 +1,7 @@
-# $NetBSD: GENERIC,v 1.159 2011/01/03 06:07:43 tsutsui Exp $
+# $NetBSD: GENERIC,v 1.160 2011/02/06 06:47:15 tsutsui Exp $
 #
 # GENERIC machine description file
-# 
+#
 # This machine description file is used to generate the default NetBSD
 # kernel.  The generic kernel does not include all options, subsystems
 # and device drivers, but should be useful for most applications.
@@ -22,7 +22,7 @@
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.159 $"
+#ident 		"GENERIC-$Revision: 1.160 $"
 
 maxusers	32		# estimated number of users
 
@@ -59,7 +59,7 @@
 
 #options 	MODULAR		# new style module(7) framework
 
-# Enable experimental buffer queue strategy for better responsiveness under 
+# Enable experimental buffer queue strategy for better responsiveness under
 # high disk I/O load. Use it with caution - it's not proven to be stable yet.
 #options 	BUFQ_READPRIO
 #options 	BUFQ_PRIOCSCAN
@@ -191,14 +191,14 @@
 hil*		at intio?		# Human Interface Loop
 options 	UK_KEYBOARD		# include United Kingdom HIL keymap
 options 	SE_KEYBOARD		# include Swedish HIL keymap
-frodo*		at intio?		# Frodo utility chip found on 3x2, 4xx
+frodo*		at intio?		# Frodo utility chip found on 382, 4xx
 nhpib*		at intio?		# slow internal HP-IB
 
 # 8250-like serial ports found on Frodo ASIC
 #dnkbd0		at frodo? offset 0x0	# Domain keyboard flavor
 com*		at frodo? offset ?	# tty flavor
 
-dvbox*		at intio? 		# Davinci framebuffer
+dvbox*		at intio?		# Davinci framebuffer
 dvbox*		at dio? scode ?
 
 gbox*		at intio?		# Gatorbox framebuffer



CVS commit: src/sys/arch/hp300/conf

2010-10-16 Thread Izumi Tsutsui
Module Name:src
Committed By:   tsutsui
Date:   Sat Oct 16 16:57:29 UTC 2010

Modified Files:
src/sys/arch/hp300/conf: GENERIC

Log Message:
- add commented out options MODULAR
- comment out historical options COMPAT_44


To generate a diff of this commit:
cvs rdiff -u -r1.156 -r1.157 src/sys/arch/hp300/conf/GENERIC

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/hp300/conf/GENERIC
diff -u src/sys/arch/hp300/conf/GENERIC:1.156 src/sys/arch/hp300/conf/GENERIC:1.157
--- src/sys/arch/hp300/conf/GENERIC:1.156	Wed Jul  7 01:24:52 2010
+++ src/sys/arch/hp300/conf/GENERIC	Sat Oct 16 16:57:29 2010
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.156 2010/07/07 01:24:52 chs Exp $
+# $NetBSD: GENERIC,v 1.157 2010/10/16 16:57:29 tsutsui Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.156 $"
+#ident 		"GENERIC-$Revision: 1.157 $"
 
 maxusers	32		# estimated number of users
 
@@ -57,6 +57,8 @@
 options 	SYSVSEM		# System V-style semaphores
 options 	P1003_1B_SEMAPHORE # p1003.1b semaphore support
 
+#options 	MODULAR		# new style module framework
+
 # Enable experimental buffer queue strategy for better responsiveness under 
 # high disk I/O load. Use it with caution - it's not proven to be stable yet.
 #options 	BUFQ_READPRIO
@@ -73,7 +75,7 @@
 
 # Compatibility options
 options 	COMPAT_43	# compatibility with 4.3BSD interfaces
-options 	COMPAT_44	# compatibility with 4.4BSD binaries
+#options 	COMPAT_44	# compatibility with 4.4BSD binaries
 options 	COMPAT_09	# compatibility with NetBSD 0.9
 options 	COMPAT_10	# compatibility with NetBSD 1.0
 options 	COMPAT_11	# compatibility with NetBSD 1.1