git: 31cafce9fddd - main - pccard: Remove ata(4) PC Card attachemnt
Warner Losh
imp at FreeBSD.org
Fri Jan 8 03:44:17 UTC 2021
The branch main has been updated by imp:
URL: https://cgit.FreeBSD.org/src/commit/?id=31cafce9fdddcfe18299b32cebe5762e4054eb4f
commit 31cafce9fdddcfe18299b32cebe5762e4054eb4f
Author: Warner Losh <imp at FreeBSD.org>
AuthorDate: 2021-01-07 23:27:16 +0000
Commit: Warner Losh <imp at FreeBSD.org>
CommitDate: 2021-01-08 03:23:14 +0000
pccard: Remove ata(4) PC Card attachemnt
Remove ata PC Card attachment.
Relnotes: Yes
---
share/man/man4/ata.4 | 4 -
sys/conf/files | 1 -
sys/dev/ata/ata-card.c | 189 ---------------------------------------
sys/modules/ata/Makefile | 1 -
sys/modules/ata/atacard/Makefile | 9 --
5 files changed, 204 deletions(-)
diff --git a/share/man/man4/ata.4 b/share/man/man4/ata.4
index d9bce208680f..4fb7a3a75874 100644
--- a/share/man/man4/ata.4
+++ b/share/man/man4/ata.4
@@ -44,7 +44,6 @@ place some of the following lines in
.Bd -literal -offset indent
ata_load="YES"
-atacard_load="YES"
ataisa_load="YES"
atapci_load="YES"
@@ -222,9 +221,6 @@ Unknown ATA chipsets are supported in PIO modes, and if the standard
busmaster DMA registers are present and contain valid setup, DMA is
also enabled, although the max mode is limited to UDMA33, as it is
not known what the chipset can do and how to program it.
-.Sh DEPRECATION NOTICE
-The PC Card attachment of this driver is scheduled for removal prior to the release of
-.Fx 13.0
.Sh NOTES
Please remember that in order to use UDMA4/ATA66 and above modes you
.Em must
diff --git a/sys/conf/files b/sys/conf/files
index 16086435246a..7fb003178270 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -920,7 +920,6 @@ dev/ata/ata-all.c optional ata | atacore
dev/ata/ata-dma.c optional ata | atacore
dev/ata/ata-lowlevel.c optional ata | atacore
dev/ata/ata-sata.c optional ata | atacore
-dev/ata/ata-card.c optional ata pccard | atapccard
dev/ata/ata-isa.c optional ata isa | ataisa
dev/ata/ata-pci.c optional ata pci | atapci
dev/ata/chipsets/ata-acard.c optional ata pci | ataacard
diff --git a/sys/dev/ata/ata-card.c b/sys/dev/ata/ata-card.c
deleted file mode 100644
index aa688338558c..000000000000
--- a/sys/dev/ata/ata-card.c
+++ /dev/null
@@ -1,189 +0,0 @@
-/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
- *
- * Copyright (c) 1998 - 2008 Søren Schmidt <sos at FreeBSD.org>
- * 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,
- * without modification, immediately at the beginning of the file.
- * 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/ata.h>
-#include <sys/kernel.h>
-#include <sys/module.h>
-#include <sys/bus.h>
-#include <sys/malloc.h>
-#include <sys/sema.h>
-#include <sys/taskqueue.h>
-#include <vm/uma.h>
-#include <machine/stdarg.h>
-#include <machine/resource.h>
-#include <machine/bus.h>
-#include <sys/rman.h>
-#include <dev/ata/ata-all.h>
-#include <dev/pccard/pccard_cis.h>
-#include <dev/pccard/pccardreg.h>
-#include <dev/pccard/pccardvar.h>
-#include <ata_if.h>
-
-#include "pccarddevs.h"
-
-static const struct pccard_product ata_pccard_products[] = {
- PCMCIA_CARD(FREECOM, PCCARDIDE),
- PCMCIA_CARD(EXP, EXPMULTIMEDIA),
- PCMCIA_CARD(IODATA3, CBIDE2),
- PCMCIA_CARD(OEM2, CDROM1),
- PCMCIA_CARD(OEM2, IDE),
- PCMCIA_CARD(PANASONIC, KXLC005),
- PCMCIA_CARD(TEAC, IDECARDII),
- {NULL}
-};
-
-static int
-ata_pccard_probe(device_t dev)
-{
- const struct pccard_product *pp;
- u_int32_t fcn = PCCARD_FUNCTION_UNSPEC;
- int error = 0;
-
- if ((error = pccard_get_function(dev, &fcn)))
- return error;
-
- /* if it says its a disk we should register it */
- if (fcn == PCCARD_FUNCTION_DISK)
- return 0;
-
- /* match other devices here, primarily cdrom/dvd rom */
- if ((pp = pccard_product_lookup(dev, ata_pccard_products,
- sizeof(ata_pccard_products[0]), NULL))) {
- if (pp->pp_name)
- device_set_desc(dev, pp->pp_name);
- return 0;
- }
- return ENXIO;
-}
-
-static int
-ata_pccard_attach(device_t dev)
-{
- struct ata_channel *ch = device_get_softc(dev);
- struct resource *io, *ctlio;
- int i, rid, err;
- uint16_t funce;
-
- if (ch->attached)
- return (0);
- ch->attached = 1;
-
- /* allocate the io range to get start and length */
- rid = ATA_IOADDR_RID;
- if (!(io = bus_alloc_resource_anywhere(dev, SYS_RES_IOPORT, &rid,
- ATA_IOSIZE, RF_ACTIVE)))
- return (ENXIO);
-
- /* setup the resource vectors */
- for (i = ATA_DATA; i <= ATA_COMMAND; i++) {
- ch->r_io[i].res = io;
- ch->r_io[i].offset = i;
- }
- ch->r_io[ATA_IDX_ADDR].res = io;
-
- /*
- * if we got more than the default ATA_IOSIZE ports, this is a device
- * where ctlio is located at offset 14 into "normal" io space.
- */
- if (rman_get_size(io) > ATA_IOSIZE) {
- ch->r_io[ATA_CONTROL].res = io;
- ch->r_io[ATA_CONTROL].offset = 14;
- }
- else {
- rid = ATA_CTLADDR_RID;
- if (!(ctlio = bus_alloc_resource_anywhere(dev, SYS_RES_IOPORT, &rid,
- ATA_CTLIOSIZE, RF_ACTIVE))) {
- bus_release_resource(dev, SYS_RES_IOPORT, ATA_IOADDR_RID, io);
- for (i = ATA_DATA; i < ATA_MAX_RES; i++)
- ch->r_io[i].res = NULL;
- return (ENXIO);
- }
- ch->r_io[ATA_CONTROL].res = ctlio;
- ch->r_io[ATA_CONTROL].offset = 0;
- }
- ata_default_registers(dev);
-
- /* initialize softc for this channel */
- ch->unit = 0;
- ch->flags |= ATA_USE_16BIT;
- funce = 0; /* Default to sane setting of FUNCE */
- pccard_get_funce_disk(dev, &funce);
- if (!(funce & PFD_I_D))
- ch-> flags |= ATA_NO_SLAVE;
- ata_generic_hw(dev);
- err = ata_probe(dev);
- if (err > 0)
- return (err);
- gone_in_dev(dev, 13, "pccard removed");
- return (ata_attach(dev));
-}
-
-static int
-ata_pccard_detach(device_t dev)
-{
- struct ata_channel *ch = device_get_softc(dev);
- int i;
-
- if (!ch->attached)
- return (0);
- ch->attached = 0;
-
- ata_detach(dev);
- if (ch->r_io[ATA_CONTROL].res != ch->r_io[ATA_DATA].res)
- bus_release_resource(dev, SYS_RES_IOPORT, ATA_CTLADDR_RID,
- ch->r_io[ATA_CONTROL].res);
- bus_release_resource(dev, SYS_RES_IOPORT, ATA_IOADDR_RID,
- ch->r_io[ATA_DATA].res);
- for (i = ATA_DATA; i < ATA_MAX_RES; i++)
- ch->r_io[i].res = NULL;
- return 0;
-}
-
-static device_method_t ata_pccard_methods[] = {
- /* device interface */
- DEVMETHOD(device_probe, ata_pccard_probe),
- DEVMETHOD(device_attach, ata_pccard_attach),
- DEVMETHOD(device_detach, ata_pccard_detach),
-
- DEVMETHOD_END
-};
-
-static driver_t ata_pccard_driver = {
- "ata",
- ata_pccard_methods,
- sizeof(struct ata_channel),
-};
-
-DRIVER_MODULE(ata, pccard, ata_pccard_driver, ata_devclass, NULL, NULL);
-MODULE_DEPEND(ata, ata, 1, 1, 1);
-PCCARD_PNP_INFO(ata_pccard_products);
diff --git a/sys/modules/ata/Makefile b/sys/modules/ata/Makefile
index 21d853325824..c7d1b17f5f40 100644
--- a/sys/modules/ata/Makefile
+++ b/sys/modules/ata/Makefile
@@ -1,7 +1,6 @@
# $FreeBSD$
SUBDIR = atacore
-SUBDIR += atacard
SUBDIR += ataisa
SUBDIR += atapci
diff --git a/sys/modules/ata/atacard/Makefile b/sys/modules/ata/atacard/Makefile
deleted file mode 100644
index 2b58e37dad9c..000000000000
--- a/sys/modules/ata/atacard/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-# $FreeBSD$
-
-.PATH: ${SRCTOP}/sys/dev/ata
-
-KMOD= atacard
-SRCS= ata-card.c
-SRCS+= ata_if.h bus_if.h card_if.h device_if.h pccarddevs.h
-
-.include <bsd.kmod.mk>
More information about the dev-commits-src-all
mailing list