Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/arch/hpcmips/conf/TX3922,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/hpcmips/conf/TX3922,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.63
retrieving revision 1.63.2.4
diff -u -p -r1.63 -r1.63.2.4
--- src/sys/arch/hpcmips/conf/TX3922	2005/04/15 17:27:21	1.63
+++ src/sys/arch/hpcmips/conf/TX3922	2008/02/04 09:21:58	1.63.2.4
@@ -1,7 +1,7 @@
 #
 # Distribution kernel (TOSHIBA TX3922 based model) kernel config file
 #
-#	$NetBSD: TX3922,v 1.63 2005/04/15 17:27:21 itohy Exp $
+#	$NetBSD: TX3922,v 1.63.2.4 2008/02/04 09:21:58 yamt Exp $
 #
 include		"arch/hpcmips/conf/std.hpcmips"
 
@@ -10,7 +10,7 @@ include		"arch/hpcmips/conf/std.hpcmips"
 maxusers	16
 
 include		"arch/hpcmips/conf/std.hpcmips.tx39"
-makeoptions	CPUFLAGS="-mips2"	# CPU codegen options
+makeoptions	CPUFLAGS="-march=r3900"	# CPU codegen options
 options 	TX392X			# Toshiba TX3922
 
 options 	TX39_DEBUG
@@ -34,6 +34,9 @@ options 	MSGBUFSIZE=65534
 options 	SERIALCONSSLOT=0	# UARTA 0, UARTB 1
 
 options 	COMPAT_43
+options 	COMPAT_16
+options 	COMPAT_20
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options		COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.
 
 #options 	SCSIVERBOSE	# human readable SCSI error messages
@@ -64,6 +67,7 @@ file-system 	PROCFS		# /proc
 #file-system 	UMAPFS		# NULLFS + uid and gid remapping
 file-system 	UNION		# union file system
 #file-system	CODA		# Coda File System; also needs vcoda (below)
+file-system	PTYFS		# /dev/pts/N support
 
 # Networking options
 #options 	GATEWAY		# IP packet forwarding
@@ -71,19 +75,18 @@ options 	INET		# IP + ICMP + TCP + UDP
 options 	INET6		# IPV6
 #options 	IPSEC		# IP security
 #options 	IPSEC_ESP	# IP security (encryption part; define w/ IPSEC)
+#options 	IPSEC_NAT_T	# IPsec NAT traversal (NAT-T)
 #options 	IPSEC_DEBUG	# debug for IP security
 #options 	MROUTING	# Multicast routing support
 #options 	PIM		# Protocol Independent Multicast
 #options 	ISO		# OSI networking
 #options 	TPIP		# TPIP
 #options 	EON		# OSI tunneling over IP
-#options 	CCITT,LLC,HDLC	# X.25
 
 options 	NFSSERVER	# Sun NFS-compatible filesystem (server)
 options 	SOFTDEP		# FFS soft updates support.
 #options 	QUOTA		# UFS quotas
-options 	VNODE_OP_NOINLINE # don't inline vnode op calls
-options 	FFS_NO_SNAPSHOT	# No FFS snapshots
+options 	FFS_NO_SNAPSHOT	# No FFS snapshot support
 
 options 	NFS_BOOT_DHCP
 
@@ -103,6 +106,7 @@ apmdev0	at hpcapm0			# APM
 
 txcsbus1	at tx39biu? platform SHARP_TELIOS
 txcsbus2	at tx39biu? platform VICTOR_INTERLINK
+txcsbus3	at tx39biu? platform FUJITSU_PENCENTRA_200
 
 # IO module manager (virtual bridge) DO NOT DELETE
 txioman* at txsim?
@@ -151,13 +155,17 @@ ucbio*		at ucb?
 # interrupt-mode don't work. use polling mode.
 tc5165buf*	at txcsbus1 iocs 1 iocsbase 0 iocssize 0x100 iocswidth 16
 hpckbd*		at tc5165buf?
-#wsmouse*	at ucbtp? mux 0
+wsmouse*	at ucbtp? mux 0
 
 # VICTOR InterLink keyboard driver
 # chip select: CARD1 IRQ ???
 m38813c*	at txcsbus2 iocs 8 iocswidth 16 iocsbase 0 iocssize 8
 hpckbd*		at m38813c?
 
+# Sharp Telios LCD and battery control driver
+#  register space: KUCS3
+teliosio*	at txcsbus1 regcs 13 regcswidth 16
+
 # TC6358TB(Plum2)
 #  register space: CS3,
 #  I/O space: MCS0 & MCS1,  IRQ: 8:21 (IO[5] positive)
@@ -176,7 +184,7 @@ usb*	at ohci?
 
 # USB Hubs
 uhub*	at usb?
-uhub*	at uhub? port ? configuration ? interface ?
+uhub*	at uhub? port ?
 
 # USB HID device
 uhidev*	at uhub? port ? configuration ? interface ?
@@ -189,6 +197,9 @@ wsmouse*	at ums? mux 0
 ukbd*	at uhidev? reportid ?
 wskbd*	at ukbd? console ? mux 1
 
+# USB serial adapter
+ucycom*	at uhidev? reportid ?
+
 # USB Generic HID devices
 uhid*	at uhidev? reportid ?
 
@@ -204,7 +215,6 @@ ucom*	at umodem?
 
 # USB Mass Storage
 umass*	at uhub? port ? configuration ? interface ?
-atapibus* at umass?
 scsibus* at umass? channel ?
 
 # USB audio
@@ -218,7 +228,7 @@ cue*	at uhub? port ?		# CATC USB-EL1201A
 kue*	at uhub? port ?		# Kawasaki LSI KL5KUSB101B based adapters
 url*	at uhub? port ?		# Realtek RTL8150L based adapters
 
-# Prolofic PL2301/PL2302 host-to-host adapter
+# Prolific PL2301/PL2302 host-to-host adapter
 upl*	at uhub? port ?
 
 # USB Handspring Visor
@@ -333,13 +343,13 @@ sd*	at scsibus? target ? lun ?	# SCSI di
 #options 	RAID_AUTOCONFIG		# auto-configuration of RAID components
 #pseudo-device	fss		4	# file system snapshot device
 pseudo-device	md		1	# memory disk
-pseudo-device	vnd		4	# disk-like interface to files
+pseudo-device	vnd			# disk-like interface to files
 
 # network pseudo-devices
-pseudo-device	bpfilter	8	# Berkeley packet filter
+pseudo-device	bpfilter		# Berkeley packet filter
 pseudo-device	ipfilter		# IP filter (firewall) and NAT
 pseudo-device	loop		1	# network loopback
-pseudo-device	ppp		2	# Point-to-Point Protocol
+pseudo-device	ppp			# Point-to-Point Protocol
 
 # mouse & keyboard multiplexor pseudo-devices
 pseudo-device	wsmux
@@ -353,5 +363,6 @@ pseudo-device	clockctl		# user control o
 #pseudo-device	vcoda		4	# coda minicache <-> venus comm.
 
 # for IPv6
-pseudo-device	gif		4	# IPv[46] over IPv[46] tunnel (RFC1933)
-#pseudo-device	faith		1	# IPv[46] tcp relay translation i/f
+pseudo-device	gif			# IPv[46] over IPv[46] tunnel (RFC1933)
+#pseudo-device	faith			# IPv[46] tcp relay translation i/f
+pseudo-device	stf			# 6to4 IPv6 over IPv4 encapsulation