o Add scc(4) to the build.

o  Add the scc(4) manpage to the build.
o  Update the uart(4) manpage to account for scc(4).
o  Update the uart(4) module build to include support for scc(4).

6 files changed, 45 insertions, 19 deletions

diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile
index 0191dbe..89d4e87 100644
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -267,6 +267,7 @@ MAN=	aac.4 \
 	sbp.4 \
 	sbp_targ.4 \
 	sbsh.4 \
+	scc.4 \
 	sched_4bsd.4 \
 	sched_ule.4 \
 	screen.4 \
diff --git a/share/man/man4/uart.4 b/share/man/man4/uart.4
index e5db313..0099baf 100644
--- a/share/man/man4/uart.4
+++ b/share/man/man4/uart.4
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd August 25, 2003
+.Dd March 29, 2006
 .Dt UART 4
 .Os
 .\"
@@ -38,6 +38,9 @@
 .Pp
 .Cd "device puc"
 .Cd "device uart"
+.Pp
+.Cd "device scc"
+.Cd "device uart"
 .\"
 .Sh DESCRIPTION
 The
@@ -51,15 +54,21 @@ driver.
 The primary support for devices that contain multiple serial interfaces or
 that contain other functionality besides one or more serial interfaces is
 provided by the
-.Xr puc 4
-device driver.
+.Xr puc 4 ,
+or
+.Xr scc 4
+device drivers.
 However, the serial interfaces of those devices that are managed by the
-.Xr puc 4
-driver are controlled by the
+.Xr puc 4 ,
+or
+.Xr scc 4
+driver are each independently controlled by the
 .Nm
 driver.
 As such, the
-.Xr puc 4
+.Xr puc 4 ,
+or
+.Xr scc 4
 driver provides umbrella functionality for the
 .Nm
 driver and hides the complexities that are inherent when elementary components
@@ -112,13 +121,11 @@ driver supports the following classes of UARTs:
 .Bl -bullet -compact
 .It
 NS8250: standard hardware based on the 8250, 16450, 16550, 16650, 16750 or
-the 16950 UARTs
-.It
-SAB82532: Siemens SAB 82532 based serial communications controllers in
-asynchronous mode.
+the 16950 UARTs.
 .It
-Z8530: Zilog 8530 based serial communications controllers in asynchronous
-mode.
+SCC: serial communications controllers supported by the
+.Xr scc 4
+device driver.
 .El
 .\"
 .Sh FILES
@@ -136,7 +143,8 @@ for callout ports
 corresponding callout initial-state and lock-state devices
 .El
 .Sh SEE ALSO
-.Xr puc 4
+.Xr puc 4 ,
+.Xr scc 4
 .\"
 .Sh HISTORY
 The
@@ -144,5 +152,7 @@ The
 device driver first appeared in
 .Fx 5.2 .
 .Sh AUTHORS
-This manual page was written by
+The
+.Nm
+device driver and this manual page were written by
 .An Marcel Moolenaar Aq marcel@xcllnt.net .
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 0e9c754..b5cd672 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -1678,6 +1678,11 @@ options 	BREAK_TO_DEBUGGER	# A BREAK on a serial console goes to
 # Sun servers by the Remote Console.
 options 	ALT_BREAK_TO_DEBUGGER
 
+# Serial Communications Controller
+# Supports the Siemens SAB 82532 and Zilog Z8530 multi-channel
+# communications controllers.
+device		scc
+
 # PCI Universal Communications driver
 # Supports various single and multi port PCI serial cards. Maybe later
 # also the parallel ports on combination serial/parallel cards. New cards
diff --git a/sys/conf/files b/sys/conf/files
index 70a5011..dcf4495 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -823,6 +823,12 @@ dev/rp/rp_pci.c			optional rp pci
 dev/sab/sab.c			optional sab ebus
 dev/safe/safe.c			optional safe
 dev/sbsh/if_sbsh.c		optional sbsh
+dev/scc/scc_if.m		optional	scc
+dev/scc/scc_bfe_ebus.c		optional	scc ebus
+dev/scc/scc_bfe_sbus.c		optional	scc sbus
+dev/scc/scc_core.c		optional	scc
+dev/scc/scc_dev_sab82532.c	optional	scc
+dev/scc/scc_dev_z8530.c		optional	scc
 dev/scd/scd.c			optional scd isa
 dev/scd/scd_isa.c		optional scd isa
 dev/si/si.c			optional si
@@ -947,6 +953,7 @@ dev/uart/uart_bus_isa.c		optional	uart isa
 dev/uart/uart_bus_pccard.c	optional	uart pccard
 dev/uart/uart_bus_pci.c		optional	uart pci
 dev/uart/uart_bus_puc.c		optional	uart puc
+dev/uart/uart_bus_scc.c		optional	uart scc
 dev/uart/uart_core.c		optional	uart
 dev/uart/uart_dbg.c		optional	uart gdb
 dev/uart/uart_dev_ns8250.c	optional	uart
@@ -1307,6 +1314,7 @@ kern/md4c.c			optional netsmb
 kern/md5c.c			standard
 kern/sched_4bsd.c		optional sched_4bsd
 kern/sched_ule.c		optional sched_ule
+kern/serdev_if.m		optional scc
 kern/subr_autoconf.c		standard
 kern/subr_blist.c		standard
 kern/subr_bus.c			standard
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index 80a4ee1..02af02f8 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -210,6 +210,7 @@ SUBDIR=	${_3dfx} \
 	${_safe} \
 	${_sbni} \
 	sbsh \
+	scc \
 	scd \
 	${_scsi_low} \
 	sf \
diff --git a/sys/modules/uart/Makefile b/sys/modules/uart/Makefile
index 88125ae..fe62e98 100644
--- a/sys/modules/uart/Makefile
+++ b/sys/modules/uart/Makefile
@@ -9,14 +9,15 @@ ofw_bus_if=	ofw_bus_if.h
 
 KMOD=	uart
 SRCS=	uart_bus_acpi.c ${uart_bus_ebus} uart_bus_isa.c uart_bus_pccard.c \
-	uart_bus_pci.c uart_bus_puc.c uart_core.c uart_cpu_${MACHINE}.c \
-	uart_dbg.c uart_dev_ns8250.c uart_dev_sab82532.c uart_dev_z8530.c \
-	uart_if.c uart_subr.c uart_tty.c
+	uart_bus_pci.c uart_bus_puc.c uart_bus_scc.c \
+	uart_core.c uart_cpu_${MACHINE}.c uart_dbg.c \
+	uart_dev_ns8250.c uart_dev_sab82532.c uart_dev_z8530.c \
+	uart_if.c uart_if.h uart_subr.c uart_tty.c
 SRCS+=	bus_if.h card_if.h device_if.h isa_if.h ${ofw_bus_if} pci_if.h \
-	power_if.h uart_if.h pccarddevs.h
+	power_if.h pccarddevs.h serdev_if.h
 
 MFILES= dev/pccard/card_if.m dev/pccard/power_if.m dev/pci/pci_if.m \
 	dev/ofw/ofw_bus_if.m dev/uart/uart_if.m isa/isa_if.m kern/bus_if.m \
-	kern/device_if.m
+	kern/device_if.m kern/serdev_if.m
 
 .include <bsd.kmod.mk>