From 38195fdcaf647fa3baaba96ca37c1362cfcc32ae Mon Sep 17 00:00:00 2001 From: Marcel Moolenaar Date: Sat, 5 Nov 2005 19:48:53 +0000 Subject: [PATCH] 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 --- sys/alpha/conf/GENERIC | 5 +++-- sys/amd64/conf/GENERIC | 3 ++- sys/i386/conf/GENERIC | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sys/alpha/conf/GENERIC b/sys/alpha/conf/GENERIC index 217dfe5fa66..2be16f3b2c2 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 861bb462a89..7ba46da677d 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 d07fc46e18c..d9be28da1ec 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.