diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -51,6 +51,13 @@ # xargs -n1 | sort | uniq -d; # done +# 20251101: Remove pccard(4) and related pages +OLD_FILES+=share/man/man4/cbb.4 +OLD_FILES+=share/man/man4/exca.4 +OLD_FILES+=share/man/man4/pccard.4 +OLD_FILES+=share/man/man4/pccbb.4 +OLD_FILES+=share/man/man4/pcic.4 + # 20251028: Remove hifn(4) OLD_FILES+=share/man/man4/hifn.4 diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -160,7 +160,6 @@ et.4 \ etherswitch.4 \ eventtimers.4 \ - exca.4 \ ext2fs.4 \ e6000sw.4 \ e6060sw.4 \ @@ -458,15 +457,12 @@ p9fs.4 \ pass.4 \ pca954x.4 \ - pccard.4 \ - pccbb.4 \ pcf.4 \ pcf8574.4 \ pcf8591.4 \ ${_pchtherm.4} \ pci.4 \ pcib.4 \ - pcic.4 \ pcm.4 \ ${_pf.4} \ ${_pflog.4} \ @@ -776,7 +772,6 @@ MLINKS+=nge.4 if_nge.4 MLINKS+=openfirm.4 openfirmware.4 MLINKS+=ow.4 onewire.4 -MLINKS+=pccbb.4 cbb.4 MLINKS+=pcm.4 snd.4 \ pcm.4 sound.4 MLINKS+=pms.4 pmspcv.4 diff --git a/share/man/man4/ath.4 b/share/man/man4/ath.4 --- a/share/man/man4/ath.4 +++ b/share/man/man4/ath.4 @@ -258,7 +258,6 @@ .Xr ath_hal 4 , .Xr cardbus 4 , .Xr intro 4 , -.Xr pcic 4 , .Xr wlan 4 , .Xr wlan_ccmp 4 , .Xr wlan_tkip 4 , diff --git a/share/man/man4/cardbus.4 b/share/man/man4/cardbus.4 --- a/share/man/man4/cardbus.4 +++ b/share/man/man4/cardbus.4 @@ -50,7 +50,3 @@ .It Cm hw.cardbus.cis_debug Non-zero value causes the CIS parsing of the 32-bit CardBus card to be much more verbose and include a complete CIS dump. -.El -.Sh SEE ALSO -.Xr pccard 4 , -.Xr pccbb 4 diff --git a/share/man/man4/exca.4 b/share/man/man4/exca.4 deleted file mode 100644 --- a/share/man/man4/exca.4 +++ /dev/null @@ -1,37 +0,0 @@ -.\" -.\" Copyright (c) 2003 M. Warner Losh -.\" -.\" 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. The name of the author may not be used to endorse or promote products -.\" derived from this software without specific prior written permission. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 THE AUTHOR OR CONTRIBUTORS 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. -.\" -.Dd February 23, 2003 -.Dt EXCA 4 -.Os -.Sh NAME -.Nm exca -.Nd helper module for PC Card and CardBus systems -.Sh DESCRIPTION -The -.Nm -module is used to implement the Intel ExCA interface to -PC Cards. -.Sh SEE ALSO -.Xr pccbb 4 , -.Xr pcic 4 diff --git a/share/man/man4/pccard.4 b/share/man/man4/pccard.4 deleted file mode 100644 --- a/share/man/man4/pccard.4 +++ /dev/null @@ -1,78 +0,0 @@ -.\" -.\" Copyright (c) 2002 M. Warner Losh -.\" -.\" 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. The name of the author may not be used to endorse or promote products -.\" derived from this software without specific prior written permission. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 THE AUTHOR OR CONTRIBUTORS 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. -.\" -.Dd August 18, 2020 -.Dt PCCARD 4 -.Os -.Sh NAME -.Nm pccard -.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 -driver implements the PC Card bus. -The -.Nm -driver supports all PC Card bridges in the system. -.Sh TUNABLES -The driver supports the following tunable parameters, which may be -added to -.Pa /boot/loader.conf -or set via the -.Xr sysctl 8 -command: -.Bl -tag -width ".Cm hw.pccard.cis_debug" -compact -.It Cm hw.pccard.debug -Non-zero values cause more verbose information to be printed when a -16-bit PC Card is inserted or removed. -.It Cm hw.pccard.cis_debug -Non-zero value causes the CIS parsing of the 16-bit PC Card to be much -more verbose and include a complete CIS dump. -.El -.Sh FILES -.Bl -tag -width ".Pa /dev/pccard0.cis" -compact -.It Pa /dev/pccard0.cis -This exclusive-use device will report all the CIS chains present in a -PC Card, if a 16-bit PC Card is inserted in the slot. -Only one user at a time may access the CIS. -The CIS is presented as the relevant byte stream from the PC Card. -For CIS tuples in Attribute Memory (the default), only the even -locations are presented (the ODD locations are undefined per the -standard). -For CIS tuples in Common Memory, every byte is presented to the user. -Decoding of the CIS tuples is done via a userland program. -All tuples are presented to the user. -.El -.Sh SEE ALSO -.Xr cardbus 4 , -.\" .Xr mecia 4 , -.Xr pccbb 4 -.\" .Xr tcic 4 -.Rs -.%T "PC Card Standard, Release 8" -.Re diff --git a/share/man/man4/pccbb.4 b/share/man/man4/pccbb.4 deleted file mode 100644 --- a/share/man/man4/pccbb.4 +++ /dev/null @@ -1,180 +0,0 @@ -.\" -.\" Copyright (c) 2002-2003 M. Warner Losh -.\" -.\" 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. The name of the author may not be used to endorse or promote products -.\" derived from this software without specific prior written permission. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 THE AUTHOR OR CONTRIBUTORS 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. -.\" -.Dd July 21, 2004 -.Dt PCCBB 4 -.Os -.Sh NAME -.Nm pccbb -.Nd cardbus bridge driver -.Sh SYNOPSIS -.Cd device cbb -.Cd device pccard -.Cd device cardbus -.Cd device exca -.Sh DESCRIPTION -The -.Nm -driver implements the Yenta specification for CardBus bridges. -.Pp -The following PCI cardbus and pcmcia bridges are supported: -.Pp -.Bl -item -compact -.It -Cirrus Logic PD6832 -.It -Cirrus Logic PD6833 -.It -Cirrus Logic PD6834 -.Pp -.It -O2micro OZ6812 -.It -O2micro OZ6832 -.It -O2micro OZ6833 -.It -O2micro OZ6836 -.It -O2micro OZ6860 -.It -O2micro OZ6872 -.It -O2micro OZ6912 -.It -O2micro OZ6922 -.It -O2micro OZ6933 -.It -O2micro OZ6972 -.It -O2Micro OZ711E1 -.It -O2Micro OZ711M1 -.El -.Bl -item -compact -.It -Ricoh RL4C475 -.It -Ricoh RL4C476 -.It -Ricoh RL4C477 -.It -Ricoh RL4C478 -.Pp -.It -TI PCI-1031 -.It -TI PCI-1130 -.It -TI PCI-1131 -.It -TI PCI-1210 -.It -TI PCI-1211 -.It -TI PCI-1220 -.It -TI PCI-1221 -.It -TI PCI-1225 -.It -TI PCI-1250 -.It -TI PCI-1251 -.It -TI PCI-1251B -.It -TI PCI-1260 -.It -TI PCI-1260B -.It -TI PCI-1410 -.It -TI PCI-1420 -.It -TI PCI-1450 -.It -TI PCI-1451 -.It -TI PCI-1510 -.It -TI PCI-1515 -.It -TI PCI-1520 -.It -TI PCI-1530 -.It -TI PCI-1620 -.It -TI PCI-4410 -.It -TI PCI-4450 -.It -TI PCI-4451 -.It -TI PCI-4510 -.It -TI PCI-4520 -.It -TI PCI-[67]x[12]1 -.It -TI PCI-[67]x20 -.It -ENE CB710 -.It -ENE CB720 -.It -ENE CB1211 -.It -ENE CB1255 -.It -ENE CB1410 -.It -ENE CB1420 -.Pp -.It -Toshiba ToPIC95 -.It -Toshiba ToPIC95B -.It -Toshiba ToPIC97 -.It -Toshiba ToPIC100 -.El -.Sh TUNABLES -The driver supports the following tunable parameters, which may be -added to -.Pa /boot/loader.conf -or set via the -.Xr sysctl 8 -command: -.Bl -tag -width ".Cm hw.cbb.debug" -compact -.It Cm hw.cbb.debug -Non-zero values cause more verbose information to be printed to aid in -debugging problems with the bridge chipset. -.El -.Sh SEE ALSO -.Xr cardbus 4 , -.Xr exca 4 , -.Xr pccard 4 diff --git a/share/man/man4/pcic.4 b/share/man/man4/pcic.4 deleted file mode 100644 --- a/share/man/man4/pcic.4 +++ /dev/null @@ -1,100 +0,0 @@ -.\" -.\" Copyright (c) 2001-2002 M. Warner Losh -.\" -.\" 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. The name of the author may not be used to endorse or promote products -.\" derived from this software without specific prior written permission. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 THE AUTHOR OR CONTRIBUTORS 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. -.\" -.Dd July 9, 2002 -.Dt PCIC 4 -.Os -.Sh NAME -.Nm pcic -.Nd PC Card bridge driver -.Sh SYNOPSIS -.Cd device pcic -.Cd device pccard -.Sh DESCRIPTION -The -.Nm -driver provides support for older ISA and non-Yenta PCI PC Card bridges. -The -.Nm -driver supports most -.Tn ExCA -devices attached to the -.Tn ISA -bus or -.Tn PCI -devices that do not conform to the Yenta specification. -.Pp -The following -.Tn ISA -devices, or true clones, are supported in the current code. -.Pp -.Bl -tag -width "Intel i82365SL Step A" -compact -.It Intel i82365SL Step A -.It Intel i82365SL Step B -.It Intel i82365SL Step C -.Tn Intel Ns 's -original 16-bit PC Card controller. -.It Intel i82365SL-DF -.Tn Intel Ns 's -last version of this device. -3.3V support was added. -.It VLSI 82C146 -An older VLSI part with some issues on some machines. -.It Cirrus Logic PD-6710 -.It Cirrus Logic PD-6720 -.It Cirrus Logic PD-6722 -Cirrus Logic's pcic controller. -Compatible with the i82365SL Step C with the addition of a different -3.3V control. -.It Ricoh RF5C296 -.It Ricoh RF5C396 -Ricoh's PC Card bridge chips. -These are compatible with the i82365SL Step C, but with yet another -different 3.3V control. -.It Vadem 365 -.It Vadem 465 -Compatible with i82365SL Step C. -.It Vadem 468 -.It Vadem 469 -Like the earlier Vadem models, but with Vadem's own, incompatible, 3.3V -control system. -.It IBM PCIC -.Tn IBM -clone of the original i82365SL part, with its own ID register value. -Has no 3.3V ability. -.El -.Pp -Many other vendors made parts in this arena, but most of them were -compatible with one of the above chipsets. -.Pp -The following PCI pcmcia bridges are supported: -.Pp -.Bl -tag -width "Intel i82365SL Step A" -compact -.It Cirrus Logic PD6729 -.It Cirrus Logic PD6730 -.Pp -.It O2micro OZ6729 -.It O2micro OZ6730 -.El -.Sh BUGS -This does not work at all at the moment. diff --git a/share/man/man4/xl.4 b/share/man/man4/xl.4 --- a/share/man/man4/xl.4 +++ b/share/man/man4/xl.4 @@ -253,7 +253,6 @@ .Xr miibus 4 , .Xr netintro 4 , .Xr ng_ether 4 , -.Xr pccard 4 , .Xr polling 4 , .Xr ifconfig 8 .Sh HISTORY diff --git a/share/man/man9/DEVICE_DETACH.9 b/share/man/man9/DEVICE_DETACH.9 --- a/share/man/man9/DEVICE_DETACH.9 +++ b/share/man/man9/DEVICE_DETACH.9 @@ -41,9 +41,7 @@ Detach a device. This can be called if the user is replacing the driver software or if a device is about to be physically removed from -the system (e.g.\& for -.Xr pccard 4 -devices). +the system. .Pp The method should deallocate any system resources allocated during the .Xr DEVICE_ATTACH 9 @@ -52,7 +50,6 @@ .Sh RETURN VALUES Zero is returned on success, otherwise an appropriate error is returned. .Sh SEE ALSO -.Xr pccard 4 , .Xr device 9 , .Xr DEVICE_ATTACH 9 , .Xr DEVICE_IDENTIFY 9 , diff --git a/share/man/man9/bus_alloc_resource.9 b/share/man/man9/bus_alloc_resource.9 --- a/share/man/man9/bus_alloc_resource.9 +++ b/share/man/man9/bus_alloc_resource.9 @@ -157,11 +157,6 @@ It should always be set unless you know that the resource cannot be shared. It is the bus driver's task to filter out the flag if the bus does not support sharing. -For example, -.Xr pccard 4 -cannot share IRQs while -.Xr cardbus 4 -can. .It Dv RF_UNMAPPED do not establish implicit mapping when activated via .Xr bus_activate_resource 9 . diff --git a/usr.sbin/dumpcis/dumpcis.8 b/usr.sbin/dumpcis/dumpcis.8 --- a/usr.sbin/dumpcis/dumpcis.8 +++ b/usr.sbin/dumpcis/dumpcis.8 @@ -37,9 +37,7 @@ .Nm utility translates a raw CIS stream into human readable form. .Sh SEE ALSO -.Xr cardbus 4 , -.Xr cbb 4 , -.Xr pccard 4 +.Xr cardbus 4 .Sh AUTHORS The original version was written by .An Warner Losh Aq Mt imp@FreeBSD.org .