Date: Fri, 8 Jan 2021 03:44:16 GMT From: Warner Losh <imp@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: ba29d48c7cbc - main - pccard: Remove uart(4) PC Card attachment Message-ID: <202101080344.1083iGYk006763@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=ba29d48c7cbc95ba08df1d62930bf7f7183f67d6 commit ba29d48c7cbc95ba08df1d62930bf7f7183f67d6 Author: Warner Losh <imp@FreeBSD.org> AuthorDate: 2021-01-07 22:37:26 +0000 Commit: Warner Losh <imp@FreeBSD.org> CommitDate: 2021-01-08 03:23:09 +0000 pccard: Remove uart(4) PC Card attachment pccard is going away, so remove uart's attachment. Relnotes: Yes --- share/man/man4/uart.4 | 3 -- sys/conf/files | 1 - sys/dev/uart/uart_bus_pccard.c | 106 ----------------------------------------- sys/modules/uart/Makefile | 7 ++- 4 files changed, 3 insertions(+), 114 deletions(-) diff --git a/share/man/man4/uart.4 b/share/man/man4/uart.4 index cce718b790f3..2fe7bb4175d5 100644 --- a/share/man/man4/uart.4 +++ b/share/man/man4/uart.4 @@ -271,9 +271,6 @@ be locked for devices that support more than one setting. The CLOCAL flag on callin ports should be locked off for logins to avoid certain security holes, but this needs to be done by getty if the callin port is used for anything else. -.Sh DEPRECATION NOTICE -The PC Card attachment of this driver is scheduled for removal prior to the release of -.Fx 13.0 .Sh FILES .Bl -tag -width "/dev/ttyu?.init" -compact .It Pa /dev/ttyu? diff --git a/sys/conf/files b/sys/conf/files index 86047c264a79..16086435246a 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -3242,7 +3242,6 @@ dev/tws/tws_user.c optional tws dev/uart/uart_bus_acpi.c optional uart acpi dev/uart/uart_bus_fdt.c optional uart fdt 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 diff --git a/sys/dev/uart/uart_bus_pccard.c b/sys/dev/uart/uart_bus_pccard.c deleted file mode 100644 index c3397bc80b86..000000000000 --- a/sys/dev/uart/uart_bus_pccard.c +++ /dev/null @@ -1,106 +0,0 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD - * - * Copyright (c) 2003 Norikatsu Shigemura, Takenori Watanabe All rights reserved. - * Copyright (c) 2001 M. Warner Losh <imp@FreeBSD.org> - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include <sys/cdefs.h> -__FBSDID("$FreeBSD$"); - -#include <sys/param.h> -#include <sys/systm.h> -#include <sys/bus.h> -#include <sys/conf.h> -#include <sys/kernel.h> -#include <sys/module.h> -#include <machine/bus.h> -#include <machine/resource.h> - -#include <dev/pccard/pccard_cis.h> -#include <dev/pccard/pccardvar.h> - -#include <dev/uart/uart.h> -#include <dev/uart/uart_bus.h> - -#include "pccarddevs.h" - -static int uart_pccard_probe(device_t dev); -static int uart_pccard_attach(device_t dev); - -static device_method_t uart_pccard_methods[] = { - /* Device interface */ - DEVMETHOD(device_probe, uart_pccard_probe), - DEVMETHOD(device_attach, uart_pccard_attach), - DEVMETHOD(device_detach, uart_bus_detach), - { 0, 0 } -}; - -static uint32_t uart_pccard_function = PCCARD_FUNCTION_SERIAL; - -static driver_t uart_pccard_driver = { - uart_driver_name, - uart_pccard_methods, - sizeof(struct uart_softc), -}; - -static int -uart_pccard_probe(device_t dev) -{ - int error; - uint32_t fcn; - - fcn = PCCARD_FUNCTION_UNSPEC; - error = pccard_get_function(dev, &fcn); - if (error != 0) - return (error); - /* - * If a serial card, we are likely the right driver. However, - * some serial cards are better serviced by other drivers, so - * allow other drivers to claim it, if they want. - */ - if (fcn == uart_pccard_function) - return (BUS_PROBE_GENERIC); - - return (ENXIO); -} - -static int -uart_pccard_attach(device_t dev) -{ - struct uart_softc *sc; - int error; - - sc = device_get_softc(dev); - sc->sc_class = &uart_ns8250_class; - - error = uart_bus_probe(dev, 0, 0, 0, 0, 0, 0); - if (error > 0) - return (error); - gone_in_dev(dev, 13, "pccard removed"); - return (uart_bus_attach(dev)); -} - -DRIVER_MODULE(uart, pccard, uart_pccard_driver, uart_devclass, 0, 0); -MODULE_PNP_INFO("U32:function_type;", pccard, uart, &uart_pccard_function, - 1); diff --git a/sys/modules/uart/Makefile b/sys/modules/uart/Makefile index 821fff46763e..ad946fb063d6 100644 --- a/sys/modules/uart/Makefile +++ b/sys/modules/uart/Makefile @@ -28,16 +28,15 @@ uart_dev_mu=uart_dev_mu.c .endif KMOD= uart -SRCS= ${uart_bus_acpi} uart_bus_isa.c uart_bus_pccard.c \ +SRCS= ${uart_bus_acpi} uart_bus_isa.c \ uart_bus_pci.c uart_bus_puc.c uart_bus_scc.c \ uart_core.c ${uart_cpu_acpi} ${uart_cpu_machine} uart_dbg.c \ ${uart_dev_mvebu} uart_dev_ns8250.c ${uart_dev_mu} \ uart_dev_quicc.c uart_dev_z8530.c \ uart_if.c uart_if.h uart_subr.c uart_tty.c -SRCS+= acpi_if.h bus_if.h card_if.h device_if.h isa_if.h ${ofw_bus_if} \ - pci_if.h \ - power_if.h pccarddevs.h serdev_if.h +SRCS+= acpi_if.h bus_if.h device_if.h isa_if.h ${ofw_bus_if} pci_if.h \ + serdev_if.h SRCS+= opt_acpi.h opt_platform.h opt_uart.h .include <bsd.kmod.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202101080344.1083iGYk006763>