diff --git a/sys/conf/files b/sys/conf/files index 2f218c3916f..a2f950fddc4 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -779,6 +779,18 @@ dev/twe/twe.c optional twe dev/twe/twe_freebsd.c optional twe dev/tx/if_tx.c optional tx dev/txp/if_txp.c optional txp +dev/uart/uart_if.m optional uart +dev/uart/uart_bus_acpi.c optional uart acpi +dev/uart/uart_bus_ebus.c optional uart ebus +dev/uart/uart_bus_isa.c optional uart isa +dev/uart/uart_bus_pci.c optional uart cardbus +dev/uart/uart_bus_pci.c optional uart pci +dev/uart/uart_bus_puc.c optional uart puc +dev/uart/uart_core.c optional uart +dev/uart/uart_dev_ns8250.c optional uart +dev/uart/uart_dev_sab82532.c optional uart +dev/uart/uart_dev_z8530.c optional uart +dev/uart/uart_tty.c optional uart dev/ubsec/ubsec.c optional ubsec # # USB support diff --git a/sys/conf/files.alpha b/sys/conf/files.alpha index c909e6fa214..5ab03db9d17 100644 --- a/sys/conf/files.alpha +++ b/sys/conf/files.alpha @@ -192,6 +192,7 @@ dev/syscons/scvidctl.c optional sc dev/syscons/scvtb.c optional sc dev/syscons/syscons.c optional sc dev/syscons/sysmouse.c optional sc +dev/uart/uart_cpu_alpha.c optional uart geom/geom_bsd.c standard geom/geom_bsd_enc.c standard isa/atkbd_isa.c optional atkbd diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64 index 291773cd573..c296f59a8c5 100644 --- a/sys/conf/files.amd64 +++ b/sys/conf/files.amd64 @@ -42,6 +42,7 @@ dev/syscons/scvidctl.c optional sc dev/syscons/scvtb.c optional sc dev/syscons/syscons.c optional sc dev/syscons/sysmouse.c optional sc +dev/uart/uart_cpu_amd64.c optional uart isa/atkbd_isa.c optional atkbd amd64/acpica/OsdEnvironment.c optional acpi diff --git a/sys/conf/files.i386 b/sys/conf/files.i386 index a47166bae0d..7b75de6070e 100644 --- a/sys/conf/files.i386 +++ b/sys/conf/files.i386 @@ -153,6 +153,7 @@ dev/syscons/scvidctl.c optional sc dev/syscons/scvtb.c optional sc dev/syscons/syscons.c optional sc dev/syscons/sysmouse.c optional sc +dev/uart/uart_cpu_i386.c optional uart geom/geom_bsd.c standard geom/geom_bsd_enc.c standard geom/geom_mbr.c standard diff --git a/sys/conf/files.ia64 b/sys/conf/files.ia64 index 7a17631d9c3..f71aa1e2575 100644 --- a/sys/conf/files.ia64 +++ b/sys/conf/files.ia64 @@ -70,6 +70,7 @@ dev/syscons/scvidctl.c optional sc dev/syscons/scvtb.c optional sc dev/syscons/syscons.c optional sc dev/syscons/sysmouse.c optional sc +dev/uart/uart_cpu_ia64.c optional uart geom/geom_bsd.c standard geom/geom_bsd_enc.c standard geom/geom_gpt.c standard diff --git a/sys/conf/files.pc98 b/sys/conf/files.pc98 index 58a53b63a85..2473a6db4de 100644 --- a/sys/conf/files.pc98 +++ b/sys/conf/files.pc98 @@ -131,6 +131,7 @@ dev/syscons/scterm-dumb.c optional sc dev/syscons/scvidctl.c optional sc dev/syscons/syscons.c optional sc dev/syscons/sysmouse.c optional sc +dev/uart/uart_cpu_i386.c optional uart geom/geom_bsd.c standard geom/geom_bsd_enc.c standard geom/geom_pc98.c standard diff --git a/sys/conf/files.sparc64 b/sys/conf/files.sparc64 index 866d8329e8b..9befc1f4a32 100644 --- a/sys/conf/files.sparc64 +++ b/sys/conf/files.sparc64 @@ -32,6 +32,7 @@ dev/syscons/scvidctl.c optional sc dev/syscons/scvtb.c optional sc dev/syscons/syscons.c optional sc dev/syscons/sysmouse.c optional sc +dev/uart/uart_cpu_sparc64.c optional uart geom/geom_bsd.c standard geom/geom_bsd_enc.c standard geom/geom_sunlabel.c standard diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk index 60d2afe2de9..2591f176c37 100644 --- a/sys/conf/kmod.mk +++ b/sys/conf/kmod.mk @@ -257,7 +257,7 @@ MFILES?= kern/bus_if.m kern/device_if.m dev/iicbus/iicbb_if.m \ dev/pci/pcib_if.m dev/ppbus/ppbus_if.m dev/smbus/smbus_if.m \ dev/usb/usb_if.m dev/sound/pcm/ac97_if.m dev/sound/pcm/channel_if.m \ dev/sound/pcm/feeder_if.m dev/sound/pcm/mixer_if.m pci/agp_if.m \ - opencrypto/crypto_if.m pc98/pc98/canbus_if.m + opencrypto/crypto_if.m pc98/pc98/canbus_if.m dev/uart/uart_if.m .for _srcsrc in ${MFILES} .for _ext in c h diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 3db86481d35..8617abdddf3 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -123,6 +123,7 @@ SUBDIR= accf_data \ twe \ tx \ txp \ + uart \ ubsa \ ubsec \ ucom \ @@ -241,7 +242,7 @@ SUBDIR+=aac \ mly \ s3 \ vesa - + .elif ${MACHINE} == "pc98" SUBDIR+=canbepm \ canbus \ diff --git a/sys/modules/uart/Makefile b/sys/modules/uart/Makefile new file mode 100644 index 00000000000..588e2a8f781 --- /dev/null +++ b/sys/modules/uart/Makefile @@ -0,0 +1,12 @@ +# $FreeBSD$ + +.PATH: ${.CURDIR}/../../dev/uart + +KMOD= uart +SRCS= uart_bus_acpi.c uart_bus_ebus.c uart_bus_isa.c uart_bus_pci.c \ + uart_bus_puc.c uart_core.c uart_cpu_${MACHINE_ARCH}.c \ + uart_dev_ns8250.c uart_dev_sab82532.c uart_dev_z8530.c uart_if.c \ + uart_tty.c +SRCS+= bus_if.h device_if.h isa_if.h pci_if.h uart_if.h + +.include