From e38a9372939fe304ec5ec33366bb2a293f0ba695 Mon Sep 17 00:00:00 2001
From: Warner Losh <imp@FreeBSD.org>
Date: Wed, 9 Sep 2020 22:45:11 +0000
Subject: [PATCH] MFC r364335,r364336,r364337,r364351

r364335 | imp | 2020-08-18 00:07:34 -0600 (Tue, 18 Aug 2020) | 6 lines

Modernize a bit.

Remove PC Card specific information. It's of little value these days and on
the way out after most of its drivers have been removed.
Use iwn instead of wi device.

r364336 | imp | 2020-08-18 00:18:18 -0600 (Tue, 18 Aug 2020) | 9 lines

Document that PC Card will likely be removed before 13.

This was discussed in arch@ a while ago. Most of the 16-bit drivers that it
relied on have been removed. There's only a few other drivers remaining that
support it, and those are very rare the days (even the once ubiquitious wi(1)
is now quite rare).

Indvidual drivers will be handled separately before pccard itself is removed.

r364337 | imp | 2020-08-18 00:34:56 -0600 (Tue, 18 Aug 2020) | 2 lines

Use better gone_in_dev rather than just gone_in to print the device name.

r364351 | imp | 2020-08-18 11:29:01 -0600 (Tue, 18 Aug 2020) | 4 lines

bt(4) has already been removed. Add a deprecation notice.

MFC After: 1 day
---
 sbin/devd/devd.conf.5   | 22 ++++++++--------------
 share/man/man4/bt.4     |  5 ++++-
 share/man/man4/pccard.4 |  5 ++++-
 sys/dev/pccard/pccard.c |  1 +
 4 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/sbin/devd/devd.conf.5 b/sbin/devd/devd.conf.5
index 8ef59b3fa68..fc814d25a4b 100644
--- a/sbin/devd/devd.conf.5
+++ b/sbin/devd/devd.conf.5
@@ -41,7 +41,7 @@
 .\" ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 .\" SOFTWARE.
 .\"
-.Dd May 31, 2019
+.Dd August 18, 2020
 .Dt DEVD.CONF 5
 .Os
 .Sh NAME
@@ -253,10 +253,6 @@ Device name of parent bus.
 Device node path if one is created by the
 .Xr devfs 5
 filesystem.
-.It Li cisproduct
-CIS-product.
-.It Li cisvendor
-CIS-vendor.
 .It Li class
 Device class.
 .It Li comm
@@ -285,8 +281,6 @@ Interface Protocol (USB).
 Interface Sub-class (USB).
 .It Li jail
 Jail name for the process triggering the rule (RCTL).
-.It Li manufacturer
-Manufacturer ID (pccard).
 .It Li mode
 Peripheral mode (USB).
 .It Li notify
@@ -300,7 +294,7 @@ PID of the process triggering the rule (RCTL).
 .It Li port
 Hub port number (USB).
 .It Li product
-Product ID (pccard/USB).
+Product ID (USB).
 .It Li release
 Hardware revision (USB).
 .It Li ruid
@@ -312,9 +306,9 @@ Serial Number (USB).
 .It Li slot
 Card slot.
 .It Li subvendor
-Sub-vendor ID.
+Sub-vendor ID (PCI).
 .It Li subdevice
-Sub-device ID.
+Sub-device ID (PCI).
 .It Li subsystem
 Matches a subsystem of a system, see below.
 .It Li system
@@ -641,20 +635,20 @@ notify 0 {
 };
 
 #
-# Try to configure ath and wi devices with pccard_ether
+# Try to configure ath and iwn devices with pccard_ether
 # as they are attached.
 #
 attach 0 {
-        device-name "(ath|wi)[0-9]+";
+        device-name "(ath|iwn)[0-9]+";
         action "/etc/pccard_ether $device-name start";
 };
 
 #
-# Stop ath and wi devices as they are detached from
+# Stop ath and iwn devices as they are detached from
 # the system.
 #
 detach 0 {
-        device-name "(ath|wi)[0-9]+";
+        device-name "(ath|iwn)[0-9]+";
         action "/etc/pccard_ether $device-name stop";
 };
 .Ed
diff --git a/share/man/man4/bt.4 b/share/man/man4/bt.4
index 592cf9ca12a..ebdebae2283 100644
--- a/share/man/man4/bt.4
+++ b/share/man/man4/bt.4
@@ -26,7 +26,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd February 15, 2017
+.Dd August 18, 2020
 .Dt BT 4
 .Os
 .Sh NAME
@@ -46,6 +46,9 @@ In
 .Cd hint.bt.0.at="isa"
 .Cd hint.bt.0.port="0x330"
 .Ed
+.Sh DEPRECATION NOTICE
+This driver is scheduled for removal prior to the release of
+.Fx 13.0 .
 .Sh DESCRIPTION
 This driver provides access to the
 .Tn SCSI
diff --git a/share/man/man4/pccard.4 b/share/man/man4/pccard.4
index f955804978e..97b41238bef 100644
--- a/share/man/man4/pccard.4
+++ b/share/man/man4/pccard.4
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 9, 2002
+.Dd August 18, 2020
 .Dt PCCARD 4
 .Os
 .Sh NAME
@@ -32,6 +32,9 @@
 .Nd PC Card bus driver
 .Sh SYNOPSIS
 .Cd device pccard
+.Sh DEPRECATION NOTICE
+This driver is scheduled for removal prior to the release of
+.Fx 13.0
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/sys/dev/pccard/pccard.c b/sys/dev/pccard/pccard.c
index 1553a49fbb4..124230c2246 100644
--- a/sys/dev/pccard/pccard.c
+++ b/sys/dev/pccard/pccard.c
@@ -843,6 +843,7 @@ pccard_attach(device_t dev)
 	sc->sc_enabled_count = 0;
 	if ((err = pccard_device_create(sc)) != 0)
 		return  (err);
+	gone_in_dev(dev, 13, "PC Card to be removed.");
 	STAILQ_INIT(&sc->card.pf_head);
 	return (bus_generic_attach(dev));
 }
-- 
2.45.0