From owner-dev-commits-src-all@freebsd.org Fri Jan 8 03:44:17 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B055B4E4AB8; Fri, 8 Jan 2021 03:44:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DBpr12vDvz4pLc; Fri, 8 Jan 2021 03:44:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4F8CC1C93F; Fri, 8 Jan 2021 03:44:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1083iHvR006834; Fri, 8 Jan 2021 03:44:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1083iHmJ006833; Fri, 8 Jan 2021 03:44:17 GMT (envelope-from git) Date: Fri, 8 Jan 2021 03:44:17 GMT Message-Id: <202101080344.1083iHmJ006833@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: fbcdcec55b77 - main - pccard: Remove an(4) PC Card attachment MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fbcdcec55b77c475bcab861d29adcacc8a205a48 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Jan 2021 03:44:18 -0000 The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=fbcdcec55b77c475bcab861d29adcacc8a205a48 commit fbcdcec55b77c475bcab861d29adcacc8a205a48 Author: Warner Losh AuthorDate: 2021-01-07 21:55:19 +0000 Commit: Warner Losh CommitDate: 2021-01-08 03:22:42 +0000 pccard: Remove an(4) PC Card attachment Remove pccard attachment for an driver since pccard support is being removed. Relnotes: Yes --- share/man/man4/an.4 | 22 ++----- sys/conf/files | 1 - sys/dev/an/if_an_pccard.c | 161 ---------------------------------------------- sys/modules/an/Makefile | 5 +- 4 files changed, 8 insertions(+), 181 deletions(-) diff --git a/share/man/man4/an.4 b/share/man/man4/an.4 index 622cdd5efac9..aaa761a36b4d 100644 --- a/share/man/man4/an.4 +++ b/share/man/man4/an.4 @@ -51,9 +51,6 @@ module at boot time, place the following line in .Bd -literal -offset indent if_an_load="YES" .Ed -.Sh DEPRECATION NOTICE -This driver is scheduled for removal prior to the release of -.Fx 13.0 .Sh DESCRIPTION The .Nm @@ -65,25 +62,18 @@ wireless network adapters and variants, including the following: Aironet Communications 4500 and 4800 series .It Cisco Aironet 340 and 350 series -.It -Xircom Wireless Ethernet Adapter .El .Pp -Support for these devices include the ISA, PCI and PCMCIA +Support for these devices include the ISA and PCI varieties. The Aironet 4500 series adapters operate at 1 and 2Mbps while the Aironet 4800 series and Cisco adapters can operate at 1, 2, 5.5 and 11Mbps. -The ISA, PCI -and PCMCIA devices are all based on the same core PCMCIA modules -and all have the same programming interface, however unlike the -Lucent WaveLAN/IEEE cards, the ISA and PCI cards appear to the -host as normal ISA and PCI devices and do not require any PCCARD -support. +The ISA and PCI +devices are all based on the same core PCMCIA hardware +and all have the same programming interface. +The ISA and PCI cards appear to the +host as normal ISA and PCI devices. .Pp -The PCMCIA Aironet cards require PC Card support, including the -kernel -.Xr pccard 4 -driver. ISA cards can either be configured to use ISA Plug and Play or to use a particular I/O address and IRQ by properly setting the DIP switches on the board. diff --git a/sys/conf/files b/sys/conf/files index 467cbb3406f1..c9525bdcf49f 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -913,7 +913,6 @@ dev/amr/amr_linux.c optional amr compat_linux dev/amr/amr_pci.c optional amr pci dev/an/if_an.c optional an dev/an/if_an_isa.c optional an isa -dev/an/if_an_pccard.c optional an pccard dev/an/if_an_pci.c optional an pci # dev/ata/ata_if.m optional ata | atacore diff --git a/sys/dev/an/if_an_pccard.c b/sys/dev/an/if_an_pccard.c deleted file mode 100644 index f20964473bb6..000000000000 --- a/sys/dev/an/if_an_pccard.c +++ /dev/null @@ -1,161 +0,0 @@ -/*- - * SPDX-License-Identifier: BSD-4-Clause - * - * Copyright (c) 1997, 1998, 1999 - * Bill Paul . All rights reserved. - * - * 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. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Bill Paul. - * 4. Neither the name of the author nor the names of any co-contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY Bill Paul AND CONTRIBUTORS ``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 Bill Paul OR THE VOICES IN HIS HEAD - * 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. - */ -/* - * Aironet 4500/4800 802.11 PCMCIA/ISA/PCI driver for FreeBSD. - * - * Written by Bill Paul - * Electrical Engineering Department - * Columbia University, New York City - */ - -#include -__FBSDID("$FreeBSD$"); - -#include "opt_inet.h" - -#ifdef INET -#define ANCACHE -#endif - -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include - -#include -#include - -#include - -#include "pccarddevs.h" -#include "card_if.h" - -/* - * Support for PCMCIA cards. - */ -static int an_pccard_probe(device_t); -static int an_pccard_attach(device_t); - -static device_method_t an_pccard_methods[] = { - /* Device interface */ - DEVMETHOD(device_probe, an_pccard_probe), - DEVMETHOD(device_attach, an_pccard_attach), - DEVMETHOD(device_detach, an_detach), - DEVMETHOD(device_shutdown, an_shutdown), - { 0, 0 } -}; - -static driver_t an_pccard_driver = { - "an", - an_pccard_methods, - sizeof(struct an_softc) -}; - -static devclass_t an_pccard_devclass; - -DRIVER_MODULE(an, pccard, an_pccard_driver, an_pccard_devclass, 0, 0); -MODULE_DEPEND(an, wlan, 1, 1, 1); - -static const struct pccard_product an_pccard_products[] = { - PCMCIA_CARD(AIRONET, PC4800), - PCMCIA_CARD(AIRONET, PC4500), - PCMCIA_CARD(AIRONET, 350), - PCMCIA_CARD(XIRCOM, CWE1130), - { NULL } -}; -PCCARD_PNP_INFO(an_pccard_products); - -static int -an_pccard_probe(device_t dev) -{ - const struct pccard_product *pp; - - if ((pp = pccard_product_lookup(dev, an_pccard_products, - sizeof(an_pccard_products[0]), NULL)) != NULL) { - if (pp->pp_name != NULL) - device_set_desc(dev, pp->pp_name); - return (0); - } - return (ENXIO); -} - -static int -an_pccard_attach(device_t dev) -{ - struct an_softc *sc = device_get_softc(dev); - int flags = device_get_flags(dev); - int error; - - error = an_probe(dev); /* 0 is failure for now */ - if (error == 0) { - error = ENXIO; - goto fail; - } - error = an_alloc_irq(dev, 0, 0); - if (error != 0) - goto fail; - - an_alloc_irq(dev, sc->irq_rid, 0); - - error = an_attach(sc, flags); - if (error) - goto fail; - - /* - * Must setup the interrupt after the an_attach to prevent racing. - */ - error = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_NET, - NULL, an_intr, sc, &sc->irq_handle); -fail: - if (error) - an_release_resources(dev); - else - gone_in_dev(dev, 13, "pccard removed, an doesn't support modern crypto"); - return (error); -} diff --git a/sys/modules/an/Makefile b/sys/modules/an/Makefile index 41c7b2fb871f..a0c613a37c9f 100644 --- a/sys/modules/an/Makefile +++ b/sys/modules/an/Makefile @@ -3,8 +3,7 @@ .PATH: ${SRCTOP}/sys/dev/an KMOD= if_an -SRCS= if_an.c if_an_pccard.c if_an_pci.c if_an_isa.c -SRCS+= opt_inet.h device_if.h bus_if.h pci_if.h isa_if.h card_if.h -SRCS+= pccarddevs.h +SRCS= if_an.c if_an_pci.c if_an_isa.c +SRCS+= opt_inet.h device_if.h bus_if.h pci_if.h isa_if.h .include