Module Name: src
Committed By: maxv
Date: Sat Sep 22 12:19:11 UTC 2018
Modified Files:
src/distrib/sets/lists/man: mi
src/share/man/man4: Makefile
src/sys/arch/amd64/conf: ALL
src/sys/arch/i386/conf: ALL GENERIC_ISDN
src/sys/conf: files
src/sys/dev: DEVNAMES
src/sys/dev/pci: files.pci
Removed Files:
src/share/man/man4: ifpci.4
src/sys/dev/pci: ifpci.c
Log Message:
Remove ifpci(4). It is part of ISDN, which we are retiring.
To generate a diff of this commit:
cvs rdiff -u -r1.1620 -r1.1621 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.668 -r1.669 src/share/man/man4/Makefile
cvs rdiff -u -r1.6 -r0 src/share/man/man4/ifpci.4
cvs rdiff -u -r1.102 -r1.103 src/sys/arch/amd64/conf/ALL
cvs rdiff -u -r1.452 -r1.453 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/i386/conf/GENERIC_ISDN
cvs rdiff -u -r1.1209 -r1.1210 src/sys/conf/files
cvs rdiff -u -r1.314 -r1.315 src/sys/dev/DEVNAMES
cvs rdiff -u -r1.403 -r1.404 src/sys/dev/pci/files.pci
cvs rdiff -u -r1.32 -r0 src/sys/dev/pci/ifpci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1620 src/distrib/sets/lists/man/mi:1.1621
--- src/distrib/sets/lists/man/mi:1.1620 Fri Sep 21 18:38:25 2018
+++ src/distrib/sets/lists/man/mi Sat Sep 22 12:19:11 2018
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1620 2018/09/21 18:38:25 maxv Exp $
+# $NetBSD: mi,v 1.1621 2018/09/22 12:19:11 maxv Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -1302,7 +1302,7 @@
./usr/share/man/cat4/ieee1394if.0 man-sys-catman .cat
./usr/share/man/cat4/ieee80211.0 man-sys-catman .cat
./usr/share/man/cat4/ifmedia.0 man-sys-catman .cat
-./usr/share/man/cat4/ifpci.0 man-sys-catman .cat
+./usr/share/man/cat4/ifpci.0 man-obsolete obsolete
./usr/share/man/cat4/igmafb.0 man-sys-catman .cat
./usr/share/man/cat4/igphy.0 man-sys-catman .cat
./usr/share/man/cat4/igsfb.0 man-sys-catman .cat
@@ -4422,7 +4422,7 @@
./usr/share/man/html4/ieee1394if.html man-sys-htmlman html
./usr/share/man/html4/ieee80211.html man-sys-htmlman html
./usr/share/man/html4/ifmedia.html man-sys-htmlman html
-./usr/share/man/html4/ifpci.html man-sys-htmlman html
+./usr/share/man/html4/ifpci.html man-obsolete obsolete
./usr/share/man/html4/igmafb.html man-sys-htmlman html
./usr/share/man/html4/igphy.html man-sys-htmlman html
./usr/share/man/html4/igsfb.html man-sys-htmlman html
@@ -7376,7 +7376,7 @@
./usr/share/man/man4/ieee1394if.4 man-sys-man .man
./usr/share/man/man4/ieee80211.4 man-sys-man .man
./usr/share/man/man4/ifmedia.4 man-sys-man .man
-./usr/share/man/man4/ifpci.4 man-sys-man .man
+./usr/share/man/man4/ifpci.4 man-obsolete obsolete
./usr/share/man/man4/igmafb.4 man-sys-man .man
./usr/share/man/man4/igphy.4 man-sys-man .man
./usr/share/man/man4/igsfb.4 man-sys-man .man
Index: src/share/man/man4/Makefile
diff -u src/share/man/man4/Makefile:1.668 src/share/man/man4/Makefile:1.669
--- src/share/man/man4/Makefile:1.668 Fri Sep 21 18:38:25 2018
+++ src/share/man/man4/Makefile Sat Sep 22 12:19:11 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.668 2018/09/21 18:38:25 maxv Exp $
+# $NetBSD: Makefile,v 1.669 2018/09/22 12:19:11 maxv Exp $
# @(#)Makefile 8.1 (Berkeley) 6/18/93
MAN= aac.4 ac97.4 acardide.4 aceride.4 acphy.4 \
@@ -146,7 +146,7 @@ MAN+= faith.4 gif.4 inet6.4 icmp6.4 ip6.
# ISDN devices
MAN+= isdntrc.4 isdntel.4 isdnbchan.4 ippp.4 irip.4 isdnctl.4 isdn.4 \
- ifpci.4 isic.4 iwic.4 isdncapi.4
+ isic.4 iwic.4 isdncapi.4
# onewire bus and devices
MAN+= gpioow.4 onewire.4 owtemp.4
Index: src/sys/arch/amd64/conf/ALL
diff -u src/sys/arch/amd64/conf/ALL:1.102 src/sys/arch/amd64/conf/ALL:1.103
--- src/sys/arch/amd64/conf/ALL:1.102 Fri Sep 21 18:38:25 2018
+++ src/sys/arch/amd64/conf/ALL Sat Sep 22 12:19:11 2018
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.102 2018/09/21 18:38:25 maxv Exp $
+# $NetBSD: ALL,v 1.103 2018/09/22 12:19:11 maxv Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.102 $"
+#ident "ALL-$Revision: 1.103 $"
maxusers 64 # estimated number of users
@@ -1756,9 +1756,6 @@ isic* at pci?
# Winbond W6692
iwic* at pci?
-# AVM Fritz!PCI card
-ifpci* at pci?
-
# AVM Fritz!PCI V2 card
ifritz* at pci?
Index: src/sys/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.452 src/sys/arch/i386/conf/ALL:1.453
--- src/sys/arch/i386/conf/ALL:1.452 Fri Sep 21 18:38:25 2018
+++ src/sys/arch/i386/conf/ALL Sat Sep 22 12:19:11 2018
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.452 2018/09/21 18:38:25 maxv Exp $
+# $NetBSD: ALL,v 1.453 2018/09/22 12:19:11 maxv Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.452 $"
+#ident "ALL-$Revision: 1.453 $"
maxusers 64 # estimated number of users
@@ -1902,9 +1902,6 @@ isic* at pci?
# Winbond W6692
iwic* at pci?
-# AVM Fritz!PCI card
-ifpci* at pci?
-
# AVM Fritz!PCI V2 card
ifritz* at pci?
Index: src/sys/arch/i386/conf/GENERIC_ISDN
diff -u src/sys/arch/i386/conf/GENERIC_ISDN:1.17 src/sys/arch/i386/conf/GENERIC_ISDN:1.18
--- src/sys/arch/i386/conf/GENERIC_ISDN:1.17 Fri Sep 21 18:38:25 2018
+++ src/sys/arch/i386/conf/GENERIC_ISDN Sat Sep 22 12:19:11 2018
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC_ISDN,v 1.17 2018/09/21 18:38:25 maxv Exp $
+# $NetBSD: GENERIC_ISDN,v 1.18 2018/09/22 12:19:11 maxv Exp $
#
# GENERIC kernel with all supported ISDN devices and drivers
@@ -54,9 +54,6 @@ isic* at pci?
# Winbond W6692
iwic* at pci?
-# AVM Fritz!PCI card
-ifpci* at pci?
-
# AVM Fritz!PCI V2 card
ifritz* at pci?
Index: src/sys/conf/files
diff -u src/sys/conf/files:1.1209 src/sys/conf/files:1.1210
--- src/sys/conf/files:1.1209 Fri Sep 21 18:38:25 2018
+++ src/sys/conf/files Sat Sep 22 12:19:11 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files,v 1.1209 2018/09/21 18:38:25 maxv Exp $
+# $NetBSD: files,v 1.1210 2018/09/22 12:19:11 maxv Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
version 20171118
@@ -1377,8 +1377,8 @@ file dev/ic/isac.c nisac needs-flag
device isic: isdndev, passive_isdn, nisac
file dev/ic/isic.c isic
-file dev/ic/isic_l1.c isic|ifpci|ifritz
-file dev/ic/isic_l1fsm.c isic|ifpci|ifritz
+file dev/ic/isic_l1.c isic|ifritz
+file dev/ic/isic_l1fsm.c isic|ifritz
file dev/ic/hscx.c isic
file dev/ic/isic_bchan.c isic
Index: src/sys/dev/DEVNAMES
diff -u src/sys/dev/DEVNAMES:1.314 src/sys/dev/DEVNAMES:1.315
--- src/sys/dev/DEVNAMES:1.314 Fri Sep 21 18:38:25 2018
+++ src/sys/dev/DEVNAMES Sat Sep 22 12:19:11 2018
@@ -1,4 +1,4 @@
-# $NetBSD: DEVNAMES,v 1.314 2018/09/21 18:38:25 maxv Exp $
+# $NetBSD: DEVNAMES,v 1.315 2018/09/22 12:19:11 maxv Exp $
#
# This file contains all used device names and defined attributes in
# alphabetical order. New devices added to the system somewhere should first
@@ -628,7 +628,6 @@ ie MI
ie acorn32
ie sun3
ieee1394 MI
-ifpci MI
ifuba MI Attribute
igsfb MI
iha MI
Index: src/sys/dev/pci/files.pci
diff -u src/sys/dev/pci/files.pci:1.403 src/sys/dev/pci/files.pci:1.404
--- src/sys/dev/pci/files.pci:1.403 Sat Sep 22 05:24:22 2018
+++ src/sys/dev/pci/files.pci Sat Sep 22 12:19:11 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.pci,v 1.403 2018/09/22 05:24:22 nakayama Exp $
+# $NetBSD: files.pci,v 1.404 2018/09/22 12:19:11 maxv Exp $
#
# Config file and device description for machine-independent PCI code.
# Included by ports that need it. Requires that the SCSI files be
@@ -813,10 +813,6 @@ file dev/pci/isic_pci.c isic_pci
file dev/pci/isic_pci_elsa_qs1p.c isic_pci
-device ifpci: isdndev, passive_isdn, nisac
-attach ifpci at pci
-file dev/pci/ifpci.c ifpci
-
device ifritz: isdndev, passive_isdn, nisacsx
attach ifritz at pci
file dev/pci/ifpci2.c ifritz
