summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarcel <marcel@FreeBSD.org>2005-11-05 19:48:53 +0000
committermarcel <marcel@FreeBSD.org>2005-11-05 19:48:53 +0000
commite9a0ff879dd34c9e4eb85048230293d64554eb72 (patch)
tree905bd5a31b639c8d8d50e57966e1a2fceca9f6fd
parent07bbeaa7561d8f472f27f07c34bdb81d141cd448 (diff)
downloadFreeBSD-src-e9a0ff879dd34c9e4eb85048230293d64554eb72.zip
FreeBSD-src-e9a0ff879dd34c9e4eb85048230293d64554eb72.tar.gz
Add uart(4). When both sio(4) and uart(4) can handle a serial port,
sio(4) will claim it. This change therefore only affects how ports are handled when they are not claimed by sio(4), and in principle will improve hardware support. MFC after: 2 months
-rw-r--r--sys/alpha/conf/GENERIC5
-rw-r--r--sys/amd64/conf/GENERIC3
-rw-r--r--sys/i386/conf/GENERIC3
3 files changed, 7 insertions, 4 deletions
diff --git a/sys/alpha/conf/GENERIC b/sys/alpha/conf/GENERIC
index 217dfe5..2be16f3 100644
--- a/sys/alpha/conf/GENERIC
+++ b/sys/alpha/conf/GENERIC
@@ -143,8 +143,9 @@ device sc
device mcclock # MC146818 real time clock device
-# Serial (COM) ports (required)
+# Serial (COM) ports
device sio # 8250, 16[45]50 based serial ports
+device uart # Generic UART driver
# Parallel port
device ppc
@@ -155,7 +156,7 @@ device ppi # Parallel port interface device
# If you've got a "dumb" serial or parallel PCI card that is
# supported by the puc(4) glue driver, uncomment the following
-# line to enable it (connects to the sio and/or ppc drivers):
+# line to enable it (connects to sio, uart and/or ppc drivers):
#device puc
# PCI Ethernet NICs.
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 861bb46..7ba46da 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -164,6 +164,7 @@ device cardbus # CardBus (32-bit) bus
# Serial (COM) ports
device sio # 8250, 16[45]50 based serial ports
+device uart # Generic UART driver
# Parallel port
device ppc
@@ -175,7 +176,7 @@ device ppi # Parallel port interface device
# If you've got a "dumb" serial or parallel PCI card that is
# supported by the puc(4) glue driver, uncomment the following
-# line to enable it (connects to the sio and/or ppc drivers):
+# line to enable it (connects to sio, uart and/or ppc drivers):
#device puc
# PCI Ethernet NICs.
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index d07fc46..d9be28d 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -176,6 +176,7 @@ device cardbus # CardBus (32-bit) bus
# Serial (COM) ports
device sio # 8250, 16[45]50 based serial ports
+device uart # Generic UART driver
# Parallel port
device ppc
@@ -187,7 +188,7 @@ device ppi # Parallel port interface device
# If you've got a "dumb" serial or parallel PCI card that is
# supported by the puc(4) glue driver, uncomment the following
-# line to enable it (connects to the sio and/or ppc drivers):
+# line to enable it (connects to sio, uart and/or ppc drivers):
#device puc
# PCI Ethernet NICs.
OpenPOWER on IntegriCloud