From daba5ace03e83a930c128ae644afd186e1fe4341 Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Sun, 1 Mar 2020 20:37:42 +0000 Subject: [PATCH] Finish removal of bktr Remove the old ioctl .h files Remove copying/linking ioctl .h files in instasllworld Remove bktr from lint Add now-removed files with ObsoleteFiles --- ObsoleteFiles.inc | 9 +++++ etc/mtree/BSD.include.dist | 2 - include/Makefile | 14 ++----- sys/conf/NOTES | 68 +-------------------------------- sys/conf/options | 21 ---------- sys/i386/include/ioctl_bt848.h | 42 -------------------- sys/i386/include/ioctl_meteor.h | 42 -------------------- sys/powerpc/conf/NOTES | 1 - 8 files changed, 13 insertions(+), 186 deletions(-) delete mode 100644 sys/i386/include/ioctl_bt848.h delete mode 100644 sys/i386/include/ioctl_meteor.h diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 10dbda3f1d90..907dc5d5cbf8 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -36,6 +36,15 @@ # xargs -n1 | sort | uniq -d; # done +# 20200301: bktr removed +OLD_DIRS+=usr/include/dev/bktr +OLD_FILES+=usr/include/dev/bktr/ioctl_bktr.h +OLD_FILES+=usr/include/dev/bktr/ioctl_meteor.h +.if ${TARGET_ARCH} == "i386" +OLD_FILES+=usr/include/machine/ioctl_bktr.h +OLD_FILES+=usr/include/machine/ioctl_meteor.h +.endif +OLD_FILES+=usr/share/man/man4/bktr.4.gz # 20200229: GCC 4.2.1 removed .if !defined(WITH_PORT_BASE_GCC) OLD_FILES+=usr/bin/g++ diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist index 2d6c641bfa5d..cf279ca1a554 100644 --- a/etc/mtree/BSD.include.dist +++ b/etc/mtree/BSD.include.dist @@ -46,8 +46,6 @@ .. an .. - bktr - .. ciss .. evdev diff --git a/include/Makefile b/include/Makefile index 64f5f75ec5fb..aa5224fbae75 100644 --- a/include/Makefile +++ b/include/Makefile @@ -43,7 +43,7 @@ LDIRS= bsm cam geom net net80211 netgraph netinet netinet6 \ netipsec netsmb nfs nfsclient nfsserver sys vm LSUBDIRS= cam/ata cam/mmc cam/nvme cam/scsi \ - dev/acpica dev/agp dev/an dev/bktr dev/ciss dev/filemon dev/firewire \ + dev/acpica dev/agp dev/an dev/ciss dev/filemon dev/firewire \ dev/hwpmc dev/hyperv \ dev/ic dev/iicbus dev/io dev/mfi dev/mmc dev/nvme \ dev/ofw dev/pbio dev/pci ${_dev_powermac_nvram} dev/ppbus dev/pwm \ @@ -158,7 +158,7 @@ copies: .PHONY .META done; \ fi .endfor -.for i in ${LDIRS} ${LSUBDIRS:Ndev/agp:Ndev/acpica:Ndev/bktr:Ndev/evdev:Ndev/hyperv:Ndev/pci:Ndev/veriexec} ${LSUBSUBDIRS} +.for i in ${LDIRS} ${LSUBDIRS:Ndev/agp:Ndev/acpica:Ndev/evdev:Ndev/hyperv:Ndev/pci:Ndev/veriexec} ${LSUBSUBDIRS} cd ${SRCTOP}/sys; \ ${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 $i/*.h \ ${SDESTDIR}${INCLUDEDIR}/$i @@ -171,9 +171,6 @@ copies: .PHONY .META cd ${SRCTOP}/sys/dev/agp; \ ${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 agpreg.h \ ${SDESTDIR}${INCLUDEDIR}/dev/agp - cd ${SRCTOP}/sys/dev/bktr; \ - ${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 ioctl_*.h \ - ${SDESTDIR}${INCLUDEDIR}/dev/bktr cd ${SRCTOP}/sys/dev/evdev; \ ${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 input.h \ ${SDESTDIR}${INCLUDEDIR}/dev/evdev; \ @@ -261,7 +258,7 @@ symlinks: .PHONY .META ${INSTALL_SYMLINK} ${TAG_ARGS} ../../../sys/$i/$$h ${SDESTDIR}${INCLUDEDIR}/$i; \ done .endfor -.for i in ${LSUBDIRS:Ndev/agp:Ndev/acpica:Ndev/bktr:Ndev/evdev:Ndev/hyperv:Ndev/pci:Ndev/veriexec} +.for i in ${LSUBDIRS:Ndev/agp:Ndev/acpica:Ndev/evdev:Ndev/hyperv:Ndev/pci:Ndev/veriexec} cd ${SRCTOP}/sys/$i; \ for h in *.h; do \ ${INSTALL_SYMLINK} ${TAG_ARGS} ../../../../sys/$i/$$h ${SDESTDIR}${INCLUDEDIR}/$i; \ @@ -277,11 +274,6 @@ symlinks: .PHONY .META ${INSTALL_SYMLINK} ${TAG_ARGS} ../../../../sys/dev/agp/$$h \ ${SDESTDIR}${INCLUDEDIR}/dev/agp; \ done - cd ${SRCTOP}/sys/dev/bktr; \ - for h in ioctl_*.h; do \ - ${INSTALL_SYMLINK} ${TAG_ARGS} ../../../../sys/dev/bktr/$$h \ - ${SDESTDIR}${INCLUDEDIR}/dev/bktr; \ - done cd ${SRCTOP}/sys/dev/evdev; \ for h in input.h input-event-codes.h uinput.h; do \ ln -fs ../../../../sys/dev/evdev/$$h \ diff --git a/sys/conf/NOTES b/sys/conf/NOTES index 2b67f4960eec..61cd36811109 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -2172,72 +2172,10 @@ options SND_OLDSTEREO # # Miscellaneous hardware: # -# bktr: Brooktree bt848/848a/849a/878/879 video capture and TV Tuner board # cmx: OmniKey CardMan 4040 pccard smartcard reader device cmx -# -# The 'bktr' device is a PCI video capture device using the Brooktree -# bt848/bt848a/bt849a/bt878/bt879 chipset. When used with a TV Tuner it forms a -# TV card, e.g. Miro PC/TV, Hauppauge WinCast/TV WinTV, VideoLogic Captivator, -# Intel Smart Video III, AverMedia, IMS Turbo, FlyVideo. -# -# options OVERRIDE_CARD=xxx -# options OVERRIDE_TUNER=xxx -# options OVERRIDE_MSP=1 -# options OVERRIDE_DBX=1 -# These options can be used to override the auto detection -# The current values for xxx are found in src/sys/dev/bktr/bktr_card.h -# Using sysctl(8) run-time overrides on a per-card basis can be made -# -# options BROOKTREE_SYSTEM_DEFAULT=BROOKTREE_PAL -# or -# options BROOKTREE_SYSTEM_DEFAULT=BROOKTREE_NTSC -# Specifies the default video capture mode. -# This is required for Dual Crystal (28&35MHz) boards where PAL is used -# to prevent hangs during initialization, e.g. VideoLogic Captivator PCI. -# -# options BKTR_USE_PLL -# This is required for PAL or SECAM boards with a 28MHz crystal and no 35MHz -# crystal, e.g. some new Bt878 cards. -# -# options BKTR_GPIO_ACCESS -# This enables IOCTLs which give user level access to the GPIO port. -# -# options BKTR_NO_MSP_RESET -# Prevents the MSP34xx reset. Good if you initialize the MSP in another OS first -# -# options BKTR_430_FX_MODE -# Switch Bt878/879 cards into Intel 430FX chipset compatibility mode. -# -# options BKTR_SIS_VIA_MODE -# Switch Bt878/879 cards into SIS/VIA chipset compatibility mode which is -# needed for some old SiS and VIA chipset motherboards. -# This also allows Bt878/879 chips to work on old OPTi (<1997) chipset -# motherboards and motherboards with bad or incomplete PCI 2.1 support. -# As a rough guess, old = before 1998 -# -# options BKTR_NEW_MSP34XX_DRIVER -# Use new, more complete initialization scheme for the msp34* soundchip. -# Should fix stereo autodetection if the old driver does only output -# mono sound. - -# -# options BKTR_USE_FREEBSD_SMBUS -# Compile with FreeBSD SMBus implementation -# -# Brooktree driver has been ported to the new I2C framework. Thus, -# you'll need to have the following 3 lines in the kernel config. -# device smbus -# device iicbus -# device iicbb -# device iicsmb -# The iic and smb devices are only needed if you want to control other -# I2C slaves connected to the external connector of some cards. -# -device bktr - # # PC Card/PCMCIA and Cardbus # @@ -2271,7 +2209,6 @@ device sdhci # # Supported SMB interfaces: # iicsmb I2C to SMB bridge with any iicbus interface -# bktr brooktree848 I2C hardware interface # intpm Intel PIIX4 (82371AB, 82443MX) Power Management Unit # alpm Acer Aladdin-IV/V/Pro2 Power Management Unit # ichsmb Intel ICH SMBus controller chips (82801AA, 82801AB, 82801BA) @@ -2312,11 +2249,8 @@ device jedec_dimm # iicsmb i2c to smb bridge. Allow i2c i/o with smb commands. # iicoc simple polling driver for OpenCores I2C controller # -# Supported interfaces: -# bktr brooktree848 I2C software interface -# # Other: -# iicbb generic I2C bit-banging code (needed by lpbb, bktr) +# iicbb generic I2C bit-banging code (needed by lpbb) # device iicbus # Bus support, required for ic/iic/iicsmb below. device iicbb # bitbang driver; implements i2c on a pair of gpio pins diff --git a/sys/conf/options b/sys/conf/options index 8da6994b0df0..8ed17ab994d3 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -645,27 +645,6 @@ NFS_DEBUG opt_nfs.h # TMPFS options TMPFS_PAGES_MINRESERVED opt_tmpfs.h -# For the Bt848/Bt848A/Bt849/Bt878/Bt879 driver -OVERRIDE_CARD opt_bktr.h -OVERRIDE_TUNER opt_bktr.h -OVERRIDE_DBX opt_bktr.h -OVERRIDE_MSP opt_bktr.h -BROOKTREE_SYSTEM_DEFAULT opt_bktr.h -BROOKTREE_ALLOC_PAGES opt_bktr.h -BKTR_OVERRIDE_CARD opt_bktr.h -BKTR_OVERRIDE_TUNER opt_bktr.h -BKTR_OVERRIDE_DBX opt_bktr.h -BKTR_OVERRIDE_MSP opt_bktr.h -BKTR_SYSTEM_DEFAULT opt_bktr.h -BKTR_ALLOC_PAGES opt_bktr.h -BKTR_USE_PLL opt_bktr.h -BKTR_GPIO_ACCESS opt_bktr.h -BKTR_NO_MSP_RESET opt_bktr.h -BKTR_430_FX_MODE opt_bktr.h -BKTR_SIS_VIA_MODE opt_bktr.h -BKTR_USE_FREEBSD_SMBUS opt_bktr.h -BKTR_NEW_MSP34XX_DRIVER opt_bktr.h - # Options for uart(4) UART_PPS_ON_CTS opt_uart.h UART_POLL_FREQ opt_uart.h diff --git a/sys/i386/include/ioctl_bt848.h b/sys/i386/include/ioctl_bt848.h deleted file mode 100644 index 1d137071211c..000000000000 --- a/sys/i386/include/ioctl_bt848.h +++ /dev/null @@ -1,42 +0,0 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD - * - * Copyright (c) 2003 David O'Brien - * 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. - * - * 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. - * - * $FreeBSD$ - */ - -#ifndef _MACHINE_IOCTL_BT848_H_ -#define _MACHINE_IOCTL_BT848_H_ - -#include - -#ifdef __CC_SUPPORTS_WARNING -#warning Include dev/bktr/ioctl_bt848.h instead of this header. -#endif - -#include - -#endif /* _MACHINE_IOCTL_BT848_H_ */ diff --git a/sys/i386/include/ioctl_meteor.h b/sys/i386/include/ioctl_meteor.h deleted file mode 100644 index 377d8257164b..000000000000 --- a/sys/i386/include/ioctl_meteor.h +++ /dev/null @@ -1,42 +0,0 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD - * - * Copyright (c) 2003 David O'Brien - * 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. - * - * 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. - * - * $FreeBSD$ - */ - -#ifndef _MACHINE_IOCTL_METEOR_H_ -#define _MACHINE_IOCTL_METEOR_H_ - -#include - -#ifdef __CC_SUPPORTS_WARNING -#warning Include dev/bktr/ioctl_meteor.h instead of this header. -#endif - -#include - -#endif /* _MACHINE_IOCTL_METEOR_H_ */ diff --git a/sys/powerpc/conf/NOTES b/sys/powerpc/conf/NOTES index c0fd8a4c0eb4..744fc51d3073 100644 --- a/sys/powerpc/conf/NOTES +++ b/sys/powerpc/conf/NOTES @@ -72,7 +72,6 @@ device adm1030 # Apple G4 MDD fan controller ##################################################################### # Devices we don't want to deal with -nodevice bktr nodevice ccr nodevice cxgbe # XXX: builds on powerpc64 only. nodevice cxgbev