svn commit: r365539 - in stable/12: share/man/man4 sys/dev/an sys/dev/ata sys/dev/cmx sys/dev/fdc sys/dev/if_ndis sys/dev/puc sys/dev/uart sys/dev/wi sys/netgraph/bluetooth/drivers/bt3c
Warner Losh
imp at FreeBSD.org
Wed Sep 9 22:54:14 UTC 2020
Author: imp
Date: Wed Sep 9 22:54:09 2020
New Revision: 365539
URL: https://svnweb.freebsd.org/changeset/base/365539
Log:
MFC: 364430:
r364430 | imp | 2020-08-20 11:19:40 -0600 (Thu, 20 Aug 2020) | 6 lines
Tag pccard drivers with gone in 13.
MFC After: 3 days
Reviewed by: emaste, brooks, adrian (on twitter)
Differential Revision: https://reviews.freebsd.org/D26095
Modified:
stable/12/share/man/man4/an.4
stable/12/share/man/man4/ata.4
stable/12/share/man/man4/cmx.4
stable/12/share/man/man4/fdc.4
stable/12/share/man/man4/ndis.4
stable/12/share/man/man4/ng_bt3c.4
stable/12/share/man/man4/pccard.4
stable/12/share/man/man4/puc.4
stable/12/share/man/man4/uart.4
stable/12/share/man/man4/wi.4
stable/12/sys/dev/an/if_an_pccard.c
stable/12/sys/dev/ata/ata-card.c
stable/12/sys/dev/cmx/cmx_pccard.c
stable/12/sys/dev/fdc/fdc_pccard.c
stable/12/sys/dev/if_ndis/if_ndis_pccard.c
stable/12/sys/dev/puc/puc_pccard.c
stable/12/sys/dev/uart/uart_bus_pccard.c
stable/12/sys/dev/wi/if_wi_pccard.c
stable/12/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/share/man/man4/an.4
==============================================================================
--- stable/12/share/man/man4/an.4 Wed Sep 9 22:51:58 2020 (r365538)
+++ stable/12/share/man/man4/an.4 Wed Sep 9 22:54:09 2020 (r365539)
@@ -51,6 +51,9 @@ 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
Modified: stable/12/share/man/man4/ata.4
==============================================================================
--- stable/12/share/man/man4/ata.4 Wed Sep 9 22:51:58 2020 (r365538)
+++ stable/12/share/man/man4/ata.4 Wed Sep 9 22:54:09 2020 (r365539)
@@ -222,6 +222,9 @@ Unknown ATA chipsets are supported in PIO modes, and i
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
Modified: stable/12/share/man/man4/cmx.4
==============================================================================
--- stable/12/share/man/man4/cmx.4 Wed Sep 9 22:51:58 2020 (r365538)
+++ stable/12/share/man/man4/cmx.4 Wed Sep 9 22:54:09 2020 (r365539)
@@ -34,6 +34,9 @@
.Nd Omnikey CardMan 4040 smartcard reader device driver
.Sh SYNOPSIS
.Cd device cmx
+.Sh DEPRECATION NOTICE
+This driver is scheduled for removal prior to the release of
+.Fx 13.0
.Sh DESCRIPTION
The
.Nm
Modified: stable/12/share/man/man4/fdc.4
==============================================================================
--- stable/12/share/man/man4/fdc.4 Wed Sep 9 22:51:58 2020 (r365538)
+++ stable/12/share/man/man4/fdc.4 Wed Sep 9 22:54:09 2020 (r365539)
@@ -313,6 +313,9 @@ Third argument is a pointer to
This type is the same as being used in the per-drive configuration
flags, or in the CMOS configuration data or ACPI namespace on IA32 systems.
.El
+.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 ".Pa /dev/fd*" -compact
.It Pa /dev/fd*
Modified: stable/12/share/man/man4/ndis.4
==============================================================================
--- stable/12/share/man/man4/ndis.4 Wed Sep 9 22:51:58 2020 (r365538)
+++ stable/12/share/man/man4/ndis.4 Wed Sep 9 22:54:09 2020 (r365539)
@@ -120,6 +120,9 @@ driver-specific registry keys to control the media set
which can be configured via the
.Xr sysctl 8
command.
+.Sh DEPRECATION NOTICE
+The PC Card attachment of this driver is scheduled for removal prior to the release of
+.Fx 13.0
.Sh DIAGNOSTICS
.Bl -diag
.It "ndis%d: watchdog timeout"
Modified: stable/12/share/man/man4/ng_bt3c.4
==============================================================================
--- stable/12/share/man/man4/ng_bt3c.4 Wed Sep 9 22:51:58 2020 (r365538)
+++ stable/12/share/man/man4/ng_bt3c.4 Wed Sep 9 22:54:09 2020 (r365539)
@@ -34,6 +34,9 @@
.Sh SYNOPSIS
.In sys/types.h
.In netgraph/bluetooth/include/ng_bt3c.h
+.Sh DEPRECATION NOTICE
+This driver is scheduled for removal prior to the release of
+.Fx 13.0
.Sh DESCRIPTION
The
.Nm btccc
Modified: stable/12/share/man/man4/pccard.4
==============================================================================
--- stable/12/share/man/man4/pccard.4 Wed Sep 9 22:51:58 2020 (r365538)
+++ stable/12/share/man/man4/pccard.4 Wed Sep 9 22:54:09 2020 (r365539)
@@ -34,7 +34,7 @@
.Cd device pccard
.Sh DEPRECATION NOTICE
This driver is scheduled for removal prior to the release of
-.Fx 13.0
+.Fx 13.0 .
.Sh DESCRIPTION
The
.Nm
Modified: stable/12/share/man/man4/puc.4
==============================================================================
--- stable/12/share/man/man4/puc.4 Wed Sep 9 22:51:58 2020 (r365538)
+++ stable/12/share/man/man4/puc.4 Wed Sep 9 22:54:09 2020 (r365539)
@@ -47,6 +47,9 @@ driver.
The list of supported devices is in
.Pa sys/dev/puc/pucdata.c .
Support for new cards should be added there.
+.Sh DEPRECATION NOTICE
+The PC Card attachment of this driver is scheduled for removal prior to the release of
+.Fx 13.0
.Sh SEE ALSO
.Xr ppc 4 ,
.Xr uart 4
Modified: stable/12/share/man/man4/uart.4
==============================================================================
--- stable/12/share/man/man4/uart.4 Wed Sep 9 22:51:58 2020 (r365538)
+++ stable/12/share/man/man4/uart.4 Wed Sep 9 22:54:09 2020 (r365539)
@@ -271,6 +271,9 @@ be locked for devices that support more than one setti
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?
Modified: stable/12/share/man/man4/wi.4
==============================================================================
--- stable/12/share/man/man4/wi.4 Wed Sep 9 22:51:58 2020 (r365538)
+++ stable/12/share/man/man4/wi.4 Wed Sep 9 22:54:09 2020 (r365539)
@@ -52,6 +52,9 @@ module at boot time, place the following line in
.Bd -literal -offset indent
if_wi_load="YES"
.Ed
+.Sh DEPRECATION NOTICE
+This driver is scheduled for removal prior to the release of
+.Fx 13.0
.Sh DESCRIPTION
The
.Nm
Modified: stable/12/sys/dev/an/if_an_pccard.c
==============================================================================
--- stable/12/sys/dev/an/if_an_pccard.c Wed Sep 9 22:51:58 2020 (r365538)
+++ stable/12/sys/dev/an/if_an_pccard.c Wed Sep 9 22:54:09 2020 (r365539)
@@ -156,5 +156,7 @@ an_pccard_attach(device_t dev)
fail:
if (error)
an_release_resources(dev);
+ else
+ gone_in_dev(dev, 13, "pccard removed");
return (error);
}
Modified: stable/12/sys/dev/ata/ata-card.c
==============================================================================
--- stable/12/sys/dev/ata/ata-card.c Wed Sep 9 22:51:58 2020 (r365538)
+++ stable/12/sys/dev/ata/ata-card.c Wed Sep 9 22:54:09 2020 (r365539)
@@ -144,6 +144,7 @@ ata_pccard_attach(device_t dev)
err = ata_probe(dev);
if (err > 0)
return (err);
+ gone_in_dev(dev, 13, "pccard removed");
return (ata_attach(dev));
}
Modified: stable/12/sys/dev/cmx/cmx_pccard.c
==============================================================================
--- stable/12/sys/dev/cmx/cmx_pccard.c Wed Sep 9 22:51:58 2020 (r365538)
+++ stable/12/sys/dev/cmx/cmx_pccard.c Wed Sep 9 22:54:09 2020 (r365539)
@@ -95,7 +95,7 @@ cmx_pccard_attach(device_t dev)
return rv;
}
- device_printf(dev, "attached\n");
+ gone_in_dev(dev, 13, "pccard removed");
return 0;
}
Modified: stable/12/sys/dev/fdc/fdc_pccard.c
==============================================================================
--- stable/12/sys/dev/fdc/fdc_pccard.c Wed Sep 9 22:51:58 2020 (r365538)
+++ stable/12/sys/dev/fdc/fdc_pccard.c Wed Sep 9 22:54:09 2020 (r365539)
@@ -111,9 +111,10 @@ fdc_pccard_attach(device_t dev)
device_set_flags(child, 0x24);
error = bus_generic_attach(dev);
}
- if (error == 0)
+ if (error == 0) {
+ gone_in_dev(dev, 13, "pccard removed");
fdc_start_worker(dev);
- else
+ } else
fdc_release_resources(fdc);
return (error);
}
Modified: stable/12/sys/dev/if_ndis/if_ndis_pccard.c
==============================================================================
--- stable/12/sys/dev/if_ndis/if_ndis_pccard.c Wed Sep 9 22:51:58 2020 (r365538)
+++ stable/12/sys/dev/if_ndis/if_ndis_pccard.c Wed Sep 9 22:54:09 2020 (r365539)
@@ -303,6 +303,8 @@ ndis_attach_pccard(dev)
}
error = ndis_attach(dev);
+ if (error == 0)
+ gone_in_dev(dev, 13, "pccard removed");
fail:
return(error);
Modified: stable/12/sys/dev/puc/puc_pccard.c
==============================================================================
--- stable/12/sys/dev/puc/puc_pccard.c Wed Sep 9 22:51:58 2020 (r365538)
+++ stable/12/sys/dev/puc/puc_pccard.c Wed Sep 9 22:54:09 2020 (r365539)
@@ -73,10 +73,21 @@ puc_pccard_probe(device_t dev)
return (ENXIO);
}
+static int
+puc_pccard_attach(device_t dev)
+{
+ int error;
+
+ error = puc_bfe_attach(dev);
+ if (error == 0)
+ gone_in_dev(dev, 13, "pccard removed");
+ return (error);
+}
+
static device_method_t puc_pccard_methods[] = {
/* Device interface */
DEVMETHOD(device_probe, puc_pccard_probe),
- DEVMETHOD(device_attach, puc_bfe_attach),
+ DEVMETHOD(device_attach, puc_pccard_attach),
DEVMETHOD(device_detach, puc_bfe_detach),
DEVMETHOD(bus_alloc_resource, puc_bus_alloc_resource),
Modified: stable/12/sys/dev/uart/uart_bus_pccard.c
==============================================================================
--- stable/12/sys/dev/uart/uart_bus_pccard.c Wed Sep 9 22:51:58 2020 (r365538)
+++ stable/12/sys/dev/uart/uart_bus_pccard.c Wed Sep 9 22:54:09 2020 (r365539)
@@ -98,6 +98,7 @@ uart_pccard_attach(device_t dev)
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));
}
Modified: stable/12/sys/dev/wi/if_wi_pccard.c
==============================================================================
--- stable/12/sys/dev/wi/if_wi_pccard.c Wed Sep 9 22:51:58 2020 (r365538)
+++ stable/12/sys/dev/wi/if_wi_pccard.c Wed Sep 9 22:54:09 2020 (r365539)
@@ -200,6 +200,7 @@ wi_pccard_attach(device_t dev)
error = wi_attach(dev);
if (error != 0)
wi_free(dev);
+ gone_in_dev(dev, 13, "pccard removed");
}
return error;
}
Modified: stable/12/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c
==============================================================================
--- stable/12/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c Wed Sep 9 22:51:58 2020 (r365538)
+++ stable/12/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c Wed Sep 9 22:54:09 2020 (r365539)
@@ -677,6 +677,8 @@ bt3c_pccard_attach(device_t dev)
NG_NODE_SET_PRIVATE(sc->node, sc);
+ gone_in_dev(dev, 13, "pccard removed");
+
return (0);
bad:
if (sc->ith != NULL) {
More information about the svn-src-stable-12
mailing list