Disconnect drivers that haven't been ported to MPSAFE TTY yet.

As clearly mentioned on the mailing lists, there is a list of drivers
that have not been ported to the MPSAFE TTY layer yet. Remove them from
the kernel configuration files. This means people can now still use
these drivers if they explicitly put them in their kernel configuration
file, which is good.

People should keep in mind that after August 10, these drivers will not
work anymore. Even though owners of the hardware are capable of getting
these drivers working again, I will see if I can at least get them to a
compilable state (if time permits).

14 files changed, 0 insertions, 181 deletions

diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 1536979..3d5e9f0 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -256,8 +256,6 @@ device		wi		# WaveLAN/Intersil/Symbol 802.11 wireless NICs.
 device		loop		# Network loopback
 device		random		# Entropy device
 device		ether		# Ethernet support
-device		sl		# Kernel SLIP
-device		ppp		# Kernel PPP
 device		tun		# Packet tunnel.
 device		pty		# Pseudo-ttys (telnet etc)
 device		md		# Memory "disks"
@@ -290,7 +288,6 @@ device		uscanner	# Scanners
 device		ucom		# Generic com ttys
 device		uark		# Technologies ARK3116 based serial adapters
 device		ubsa		# Belkin F5U103 and compatible serial adapters
-device		ubser		# BWCT console serial adapters
 device		uftdi		# For FTDI usb serial adapters
 device		uipaq		# Some WinCE based devices
 device		uplcom		# Prolific PL-2303 serial adapters
diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES
index 3ace852..1e0aae1 100644
--- a/sys/amd64/conf/NOTES
+++ b/sys/amd64/conf/NOTES
@@ -95,44 +95,6 @@ device		nvram		# Access to rtc cmos via /dev/nvram
 #####################################################################
 # MISCELLANEOUS DEVICES AND OPTIONS
 
-# 
-# sio: serial ports (see sio(4)), including support for various
-#      PC Card devices, such as Modem and NICs
-#
-device		sio
-hint.sio.0.at="isa"
-hint.sio.0.port="0x3F8"
-hint.sio.0.flags="0x10"
-hint.sio.0.irq="4"
-
-# `flags' specific to sio(4).
-#	0x10	enable console support for this unit.  Other console flags
-#		(if applicable) are ignored unless this is set.  Enabling
-#		console support does not make the unit the preferred console.
-#		Boot with -h or set boot_serial=YES in the loader.  For sio(4)
-#		specifically, the 0x20 flag can also be set (see above).
-#		Currently, at most one unit can have console support; the
-#		first one (in config file order) with this flag set is
-#		preferred.  Setting this flag for sio0 gives the old behaviour.
-#	0x20	force this unit to be the console (unless there is another
-#		higher priority console).  This replaces the COMCONSOLE option.
-#	0x40	reserve this unit for low level console operations.  Do not
-#		access the device in any normal way.
-#	0x80	use this port for serial line gdb support in ddb.  Also known
-#		as debug port.
-# PnP `flags'
-#	0x1	disable probing of this device.  Used to prevent your modem
-#		from being attached as a PnP modem.
-# Other flags for sio that aren't documented in the man page.
-#	0x20000	enable hardware RTS/CTS and larger FIFOs.  Only works for
-#		ST16650A-compatible UARTs.
-
-# Options for sio:
-options 	COM_ESP			# Code for Hayes ESP.
-options 	COM_MULTIPORT		# Code for some cards with shared IRQs.
-options 	CONSPEED=115200		# Speed for serial console
-					# (default 9600).
-
 device		speaker		#Play IBM BASIC-style noises out your speaker
 hint.speaker.0.at="isa"
 hint.speaker.0.port="0x61"
@@ -397,8 +359,6 @@ options 	SAFE_RNDTEST	# enable rndtest support
 # ipmi: Intelligent Platform Management Interface
 # smbios: DMI/SMBIOS entry point
 # vpd: Vital Product Data kernel interface
-# cy: Cyclades serial driver
-# digi: Digiboard driver
 # asmc: Apple System Management Controller
 
 # Notes on the Specialix SI/XIO driver:
@@ -407,17 +367,6 @@ options 	SAFE_RNDTEST	# enable rndtest support
 #  The Rev 2 host cards use a 32K chunk, on a 32K boundary.
 #  The cards can use an IRQ of 11, 12 or 15.
 
-device		cy
-options 	CY_PCI_FASTINTR		# Use with cy_pci unless irq is shared
-device		digi
-# BIOS & FEP/OS components of device digi.
-device		digi_CX
-device		digi_CX_PCI
-device		digi_EPCX
-device		digi_EPCX_PCI
-device		digi_Xe
-device		digi_Xem
-device		digi_Xr
 device		ipmi
 # Parallel (8255 PPI) basic I/O (mode 0) port (e.g. Advantech PCL-724)
 device		pbio
diff --git a/sys/arm/conf/KB920X b/sys/arm/conf/KB920X
index 2775961..0ba8a18 100644
--- a/sys/arm/conf/KB920X
+++ b/sys/arm/conf/KB920X
@@ -117,7 +117,6 @@ device		udav
 device          ucom
 device          uark
 device          ubsa
-device          ubser
 device          uftdi
 device          uipaq
 device          uplcom
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 1d45a41..aa052ec 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -648,7 +648,6 @@ options 	NETGRAPH_ATMLLC
 options 	NETGRAPH_ATM_ATMPIF
 options 	NETGRAPH_BLUETOOTH		# ng_bluetooth(4)
 options 	NETGRAPH_BLUETOOTH_BT3C		# ng_bt3c(4)
-options 	NETGRAPH_BLUETOOTH_H4		# ng_h4(4)
 options 	NETGRAPH_BLUETOOTH_HCI		# ng_hci(4)
 options 	NETGRAPH_BLUETOOTH_L2CAP	# ng_l2cap(4)
 options 	NETGRAPH_BLUETOOTH_SOCKET	# ng_btsocket(4)
@@ -691,7 +690,6 @@ options 	NETGRAPH_SPPP
 options 	NETGRAPH_TAG
 options 	NETGRAPH_TCPMSS
 options 	NETGRAPH_TEE
-options 	NETGRAPH_TTY
 options 	NETGRAPH_UI
 options 	NETGRAPH_VJC
 
@@ -788,7 +786,6 @@ device		disc			#Discard device based on loopback
 device		edsc			#Ethernet discard device
 device		tap			#Virtual Ethernet driver
 device		tun			#Tunnel driver (ppp(8), nos-tun(8))
-device		sl			#Serial Line IP
 device		gre			#IP over IP tunneling
 device		if_bridge		#Bridge interface
 device		pf			#PF OpenBSD packet-filter firewall
@@ -796,10 +793,6 @@ device		pflog			#logging support interface for PF
 device		pfsync			#synchronization interface for PF
 device		carp			#Common Address Redundancy Protocol
 device		enc			#IPsec interface
-device		ppp			#Point-to-point protocol
-options 	PPP_BSDCOMP		#PPP BSD-compress support
-options 	PPP_DEFLATE		#PPP zlib/deflate/gzip support
-options 	PPP_FILTER		#enable bpf filtering (needs bpf)
 device		lagg			#Link aggregation interface
 
 device		ef			# Multiple ethernet frames support
@@ -1289,7 +1282,6 @@ options 	SES_ENABLE_PASSTHROUGH
 device		pty		#Pseudo ttys
 device		nmdm		#back-to-back tty devices
 device		md		#Memory/malloc disk
-device		snp		#Snoop device - to look at pty/vty/etc..
 device		ccd		#Concatenated disk driver
 device		firmware	#firmware(9) support
 
@@ -2152,18 +2144,6 @@ hint.scd.0.port="0x230"
 device		joy			# PnP aware, hints for non-PnP only
 hint.joy.0.at="isa"
 hint.joy.0.port="0x201"
-device		rc
-hint.rc.0.at="isa"
-hint.rc.0.port="0x220"
-hint.rc.0.irq="12"
-device		rp
-hint.rp.0.at="isa"
-hint.rp.0.port="0x280"
-device		si
-options 	SI_DEBUG
-hint.si.0.at="isa"
-hint.si.0.maddr="0xd0000"
-hint.si.0.irq="12"
 device		cmx
 
 #
@@ -2436,8 +2416,6 @@ device		ucom
 device		uark
 # USB support for Belkin F5U103 and compatible serial adapters
 device		ubsa
-# USB support for BWCT console serial adapters
-device		ubser
 # USB support for serial adapters based on the FT8U100AX and FT8U232AM
 device		uftdi
 # USB support for some Windows CE based serial communication.
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 23a61b8..587fe3e 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -271,8 +271,6 @@ device		wi		# WaveLAN/Intersil/Symbol 802.11 wireless NICs.
 device		loop		# Network loopback
 device		random		# Entropy device
 device		ether		# Ethernet support
-device		sl		# Kernel SLIP
-device		ppp		# Kernel PPP
 device		tun		# Packet tunnel.
 device		pty		# Pseudo-ttys (telnet etc)
 device		md		# Memory "disks"
@@ -306,7 +304,6 @@ device		uscanner	# Scanners
 device		ucom		# Generic com ttys
 device		uark		# Technologies ARK3116 based serial adapters
 device		ubsa		# Belkin F5U103 and compatible serial adapters
-device		ubser		# BWCT console serial adapters
 device		uftdi		# For FTDI usb serial adapters
 device		uipaq		# Some WinCE based devices
 device		uplcom		# Prolific PL-2303 serial adapters
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index ec89396..93c4954 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -266,44 +266,6 @@ device		nvram		# Access to rtc cmos via /dev/nvram
 #####################################################################
 # MISCELLANEOUS DEVICES AND OPTIONS
 
-# 
-# sio: serial ports (see sio(4)), including support for various
-#      PC Card devices, such as Modem and NICs
-#
-device		sio
-hint.sio.0.at="isa"
-hint.sio.0.port="0x3F8"
-hint.sio.0.flags="0x10"
-hint.sio.0.irq="4"
-
-# `flags' specific to sio(4).
-#	0x10	enable console support for this unit.  Other console flags
-#		(if applicable) are ignored unless this is set.  Enabling
-#		console support does not make the unit the preferred console.
-#		Boot with -h or set boot_serial=YES in the loader.  For sio(4)
-#		specifically, the 0x20 flag can also be set (see above).
-#		Currently, at most one unit can have console support; the
-#		first one (in config file order) with this flag set is
-#		preferred.  Setting this flag for sio0 gives the old behaviour.
-#	0x20	force this unit to be the console (unless there is another
-#		higher priority console).  This replaces the COMCONSOLE option.
-#	0x40	reserve this unit for low level console operations.  Do not
-#		access the device in any normal way.
-#	0x80	use this port for serial line gdb support in ddb.  Also known
-#		as debug port.
-# PnP `flags'
-#	0x1	disable probing of this device.  Used to prevent your modem
-#		from being attached as a PnP modem.
-# Other flags for sio that aren't documented in the man page.
-#	0x20000	enable hardware RTS/CTS and larger FIFOs.  Only works for
-#		ST16650A-compatible UARTs.
-
-# Options for sio:
-options 	COM_ESP			# Code for Hayes ESP.
-options 	COM_MULTIPORT		# Code for some cards with shared IRQs.
-options 	CONSPEED=115200		# Speed for serial console
-					# (default 9600).
-
 device		speaker		#Play IBM BASIC-style noises out your speaker
 hint.speaker.0.at="isa"
 hint.speaker.0.port="0x61"
@@ -610,11 +572,6 @@ hint.ctau.0.at="isa"
 hint.ctau.0.port="0x240"
 hint.ctau.0.irq="15"
 hint.ctau.0.drq="7"
-device		cx
-hint.cx.0.at="isa"
-hint.cx.0.port="0x240"
-hint.cx.0.irq="15"
-hint.cx.0.drq="7"
 #options 	NETGRAPH_CRONYX		# Enable NETGRAPH support for Cronyx adapter(s)
 device		ed
 options 	ED_3C503
@@ -741,8 +698,6 @@ options 	SAFE_RNDTEST	# enable rndtest support
 # smapi: System Management Application Program Interface driver
 # smbios: DMI/SMBIOS entry point
 # vpd: Vital Product Data kernel interface
-# cy: Cyclades serial driver
-# digi: Digiboard driver
 # spic: Sony Programmable I/O controller (VAIO notebooks)
 # asmc: Apple System Management Controller
 
@@ -775,24 +730,6 @@ device		smapi
 device		smbios
 device		vpd
 device		pmtimer			# Adjust system timer at wakeup time
-device		cy
-options 	CY_PCI_FASTINTR		# Use with cy_pci unless irq is shared
-hint.cy.0.at="isa"
-hint.cy.0.irq="10"
-hint.cy.0.maddr="0xd4000"
-hint.cy.0.msize="0x2000"
-device		digi
-hint.digi.0.at="isa"
-hint.digi.0.port="0x104"
-hint.digi.0.maddr="0xd0000"
-# BIOS & FEP/OS components of device digi.
-device		digi_CX
-device		digi_CX_PCI
-device		digi_EPCX
-device		digi_EPCX_PCI
-device		digi_Xe
-device		digi_Xem
-device		digi_Xr
 # Parallel (8255 PPI) basic I/O (mode 0) port (e.g. Advantech PCL-724)
 device		pbio
 hint.pbio.0.at="isa"
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index 6a5a7b1..4b15997 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -65,14 +65,12 @@ SUBDIR=	${_3dfx} \
 	${_cs} \
 	${_ctau} \
 	cue \
-	${_cx} \
 	cxgb \
 	${_cyclic} \
 	dc \
 	dcons \
 	dcons_crom \
 	de \
-	${_digi} \
 	${_dpt} \
 	${_drm} \
 	${_dtrace} \
@@ -116,8 +114,6 @@ SUBDIR=	${_3dfx} \
 	if_gre \
 	if_lagg \
 	${_if_ndis} \
-	if_ppp \
-	if_sl \
 	if_stf \
 	if_tap \
 	if_tun \
@@ -226,13 +222,11 @@ SUBDIR=	${_3dfx} \
 	ral \
 	${_random} \
 	${_ray} \
-	rc \
 	rc4 \
 	${_rdma} \
 	re \
 	reiserfs \
 	rl \
-	rp \
 	rue \
 	rum \
 	${_s3} \
@@ -242,13 +236,11 @@ SUBDIR=	${_3dfx} \
 	${_scsi_low} \
 	sem \
 	sf \
-	${_sio} \
 	sis \
 	sk \
 	${_smbfs} \
 	sn \
 	${_snc} \
-	snp \
 	${_sound} \
 	${_speaker} \
 	${_splash} \
@@ -273,16 +265,13 @@ SUBDIR=	${_3dfx} \
 	uart \
 	ubsa \
 	ubsec \
-	ubser \
 	ucom \
-	ucycom \
 	udav \
 	udbp \
 	udf \
 	udf_iconv \
 	ufm \
 	${_ufs} \
-	ufoma \
 	uftdi \
 	ugen \
 	uhid \
@@ -384,7 +373,6 @@ _cs=		cs
 .if ${MK_CDDL} != "no" || defined(ALL_MODULES)
 _cyclic=	cyclic
 .endif
-_digi=		digi
 _drm=		drm
 .if ${MK_CDDL} != "no" || defined(ALL_MODULES)
 _dtrace=	dtrace
@@ -426,7 +414,6 @@ _ray=		ray
 _rdma=		rdma
 _safe=		safe
 _scsi_low=	scsi_low
-_sio=		sio
 _smbfs=		smbfs
 _sound=		sound
 _speaker=	speaker
@@ -454,7 +441,6 @@ _cm=		cm
 _cmx=		cmx
 _coretemp=	coretemp
 _ctau=		ctau
-_cx=		cx
 _dpt=		dpt
 _ex=		ex
 _hptiop=	hptiop
@@ -516,7 +502,6 @@ _cpufreq=	cpufreq
 .if ${MK_CDDL} != "no" || defined(ALL_MODULES)
 _cyclic=	cyclic
 .endif
-_digi=		digi
 _drm=		drm
 .if ${MK_CDDL} != "no" || defined(ALL_MODULES)
 _dtrace=	dtrace
diff --git a/sys/modules/netgraph/Makefile b/sys/modules/netgraph/Makefile
index a95cfff..1e9462a 100644
--- a/sys/modules/netgraph/Makefile
+++ b/sys/modules/netgraph/Makefile
@@ -48,7 +48,6 @@ SUBDIR=	async \
 	tag \
 	tcpmss \
 	tee \
-	tty \
 	UI \
 	vjc \
 	vlan
diff --git a/sys/modules/netgraph/bluetooth/Makefile b/sys/modules/netgraph/bluetooth/Makefile
index 2c7ae7a..9169cf1 100644
--- a/sys/modules/netgraph/bluetooth/Makefile
+++ b/sys/modules/netgraph/bluetooth/Makefile
@@ -7,7 +7,6 @@ SUBDIR=	\
 	l2cap	\
 	socket	\
 	bt3c	\
-	h4	\
 	ubt	\
 	ubtbcmfw
 
diff --git a/sys/pc98/conf/GENERIC b/sys/pc98/conf/GENERIC
index 2621336..f55a98c 100644
--- a/sys/pc98/conf/GENERIC
+++ b/sys/pc98/conf/GENERIC
@@ -230,8 +230,6 @@ device		wi		# WaveLAN/Intersil/Symbol 802.11 wireless NICs.
 device		loop		# Network loopback
 device		random		# Entropy device
 device		ether		# Ethernet support
-device		sl		# Kernel SLIP
-device		ppp		# Kernel PPP
 device		tun		# Packet tunnel.
 device		pty		# Pseudo-ttys (telnet etc)
 device		md		# Memory "disks"
diff --git a/sys/pc98/conf/NOTES b/sys/pc98/conf/NOTES
index 6596737..4a5786e 100644
--- a/sys/pc98/conf/NOTES
+++ b/sys/pc98/conf/NOTES
@@ -448,8 +448,6 @@ options 	SAFE_RNDTEST	# enable rndtest support
 #
 # apm: Laptop Advanced Power Management (experimental)
 # pmtimer: Timer device driver for power management events (APM or ACPI)
-# cy: Cyclades serial driver
-# digi: Digiboard driver
 
 # Notes on APM
 #  The flags takes the following meaning for apm0:
@@ -459,17 +457,6 @@ device		apm
 hint.apm.0.flags="0x20"
 device		canbus
 device		canbepm
-device		cy
-options 	CY_PCI_FASTINTR		# Use with cy_pci unless irq is shared
-device		digi
-# BIOS & FEP/OS components of device digi.
-device		digi_CX
-device		digi_CX_PCI
-device		digi_EPCX
-device		digi_EPCX_PCI
-device		digi_Xe
-device		digi_Xem
-device		digi_Xr
 device		olpt
 hint.olpt.0.at="isa"
 hint.olpt.0.port="0x040"
diff --git a/sys/powerpc/conf/GENERIC b/sys/powerpc/conf/GENERIC
index aec7d47..86e9687 100644
--- a/sys/powerpc/conf/GENERIC
+++ b/sys/powerpc/conf/GENERIC
@@ -116,8 +116,6 @@ device		fxp		# Intel EtherExpress PRO/100B (82557, 82558)
 device		loop		# Network loopback
 device		random		# Entropy device
 device		ether		# Ethernet support
-device		sl		# Kernel SLIP
-device		ppp		# Kernel PPP
 device		tun		# Packet tunnel.
 device		pty		# Pseudo-ttys (telnet etc)
 device		md		# Memory "disks"
diff --git a/sys/sparc64/conf/GENERIC b/sys/sparc64/conf/GENERIC
index c665b77..91a95a3 100644
--- a/sys/sparc64/conf/GENERIC
+++ b/sys/sparc64/conf/GENERIC
@@ -205,8 +205,6 @@ device		ath_rate_sample	# SampleRate tx rate control for ath
 device		loop		# Network loopback
 device		random		# Entropy device
 device		ether		# Ethernet support
-device		sl		# Kernel SLIP
-device		ppp		# Kernel PPP
 device		tun		# Packet tunnel.
 device		pty		# Pseudo-ttys (telnet etc)
 device		md		# Memory "disks"
diff --git a/sys/sun4v/conf/GENERIC b/sys/sun4v/conf/GENERIC
index ea753e9..4e93a06 100644
--- a/sys/sun4v/conf/GENERIC
+++ b/sys/sun4v/conf/GENERIC
@@ -169,8 +169,6 @@ device		bge		# Broadcom BCM570xx Gigabit Ethernet
 device		loop		# Network loopback
 device		random		# Entropy device
 device		ether		# Ethernet support
-device		sl		# Kernel SLIP
-device		ppp		# Kernel PPP
 device		tun		# Packet tunnel.
 device		pty		# Pseudo-ttys (telnet etc)
 device		md		# Memory "disks"