Module Name: src
Committed By: maxv
Date: Sat Sep 22 12:41:01 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/dev: DEVNAMES
Removed Files:
src/share/man/man4: iwic.4
src/sys/dev/pci: iwic_bchan.c iwic_dchan.c iwic_fsm.c iwic_pci.c
iwicreg.h iwicvar.h
Log Message:
Remove iwic(4). It is part of ISDN, which we are now retiring. This driver
was still marked as experimental (its man page dates back to 2002).
To generate a diff of this commit:
cvs rdiff -u -r1.1621 -r1.1622 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.669 -r1.670 src/share/man/man4/Makefile
cvs rdiff -u -r1.6 -r0 src/share/man/man4/iwic.4
cvs rdiff -u -r1.104 -r1.105 src/sys/arch/amd64/conf/ALL
cvs rdiff -u -r1.454 -r1.455 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/i386/conf/GENERIC_ISDN
cvs rdiff -u -r1.315 -r1.316 src/sys/dev/DEVNAMES
cvs rdiff -u -r1.10 -r0 src/sys/dev/pci/iwic_bchan.c \
src/sys/dev/pci/iwic_dchan.c
cvs rdiff -u -r1.4 -r0 src/sys/dev/pci/iwic_fsm.c
cvs rdiff -u -r1.20 -r0 src/sys/dev/pci/iwic_pci.c
cvs rdiff -u -r1.2 -r0 src/sys/dev/pci/iwicreg.h
cvs rdiff -u -r1.6 -r0 src/sys/dev/pci/iwicvar.h
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.1621 src/distrib/sets/lists/man/mi:1.1622
--- src/distrib/sets/lists/man/mi:1.1621 Sat Sep 22 12:19:11 2018
+++ src/distrib/sets/lists/man/mi Sat Sep 22 12:41:00 2018
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1621 2018/09/22 12:19:11 maxv Exp $
+# $NetBSD: mi,v 1.1622 2018/09/22 12:41:00 maxv Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -1359,7 +1359,7 @@
./usr/share/man/cat4/iteide.0 man-sys-catman .cat
./usr/share/man/cat4/itesio.0 man-sys-catman .cat
./usr/share/man/cat4/iwi.0 man-sys-catman .cat
-./usr/share/man/cat4/iwic.0 man-sys-catman .cat
+./usr/share/man/cat4/iwic.0 man-obsolete obsolete
./usr/share/man/cat4/iwm.0 man-sys-catman .cat
./usr/share/man/cat4/iwn.0 man-sys-catman .cat
./usr/share/man/cat4/ix.0 man-sys-catman .cat
@@ -4476,7 +4476,7 @@
./usr/share/man/html4/iteide.html man-sys-htmlman html
./usr/share/man/html4/itesio.html man-sys-htmlman html
./usr/share/man/html4/iwi.html man-sys-htmlman html
-./usr/share/man/html4/iwic.html man-sys-htmlman html
+./usr/share/man/html4/iwic.html man-obsolete obsolete
./usr/share/man/html4/iwm.html man-sys-htmlman html
./usr/share/man/html4/iwn.html man-sys-htmlman html
./usr/share/man/html4/ix.html man-sys-htmlman html
@@ -7433,7 +7433,7 @@
./usr/share/man/man4/iteide.4 man-sys-man .man
./usr/share/man/man4/itesio.4 man-sys-man .man
./usr/share/man/man4/iwi.4 man-sys-man .man
-./usr/share/man/man4/iwic.4 man-sys-man .man
+./usr/share/man/man4/iwic.4 man-obsolete obsolete
./usr/share/man/man4/iwm.4 man-sys-man .man
./usr/share/man/man4/iwn.4 man-sys-man .man
./usr/share/man/man4/ix.4 man-sys-man .man
Index: src/share/man/man4/Makefile
diff -u src/share/man/man4/Makefile:1.669 src/share/man/man4/Makefile:1.670
--- src/share/man/man4/Makefile:1.669 Sat Sep 22 12:19:11 2018
+++ src/share/man/man4/Makefile Sat Sep 22 12:41:00 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.669 2018/09/22 12:19:11 maxv Exp $
+# $NetBSD: Makefile,v 1.670 2018/09/22 12:41:00 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 \
- isic.4 iwic.4 isdncapi.4
+ isic.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.104 src/sys/arch/amd64/conf/ALL:1.105
--- src/sys/arch/amd64/conf/ALL:1.104 Sat Sep 22 12:26:27 2018
+++ src/sys/arch/amd64/conf/ALL Sat Sep 22 12:41:00 2018
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.104 2018/09/22 12:26:27 maxv Exp $
+# $NetBSD: ALL,v 1.105 2018/09/22 12:41:00 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.104 $"
+#ident "ALL-$Revision: 1.105 $"
maxusers 64 # estimated number of users
@@ -1753,9 +1753,6 @@ options ISICISA_ITKIX1
#
isic* at pci?
-# Winbond W6692
-iwic* at pci?
-
#
#---------------------------------------------------------------------
# Supported PCMCIA cards:
Index: src/sys/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.454 src/sys/arch/i386/conf/ALL:1.455
--- src/sys/arch/i386/conf/ALL:1.454 Sat Sep 22 12:26:27 2018
+++ src/sys/arch/i386/conf/ALL Sat Sep 22 12:41:00 2018
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.454 2018/09/22 12:26:27 maxv Exp $
+# $NetBSD: ALL,v 1.455 2018/09/22 12:41:00 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.454 $"
+#ident "ALL-$Revision: 1.455 $"
maxusers 64 # estimated number of users
@@ -1899,9 +1899,6 @@ isic* at isapnp?
#
isic* at pci?
-# Winbond W6692
-iwic* at pci?
-
#
#---------------------------------------------------------------------
# Supported PCMCIA cards:
Index: src/sys/arch/i386/conf/GENERIC_ISDN
diff -u src/sys/arch/i386/conf/GENERIC_ISDN:1.19 src/sys/arch/i386/conf/GENERIC_ISDN:1.20
--- src/sys/arch/i386/conf/GENERIC_ISDN:1.19 Sat Sep 22 12:26:27 2018
+++ src/sys/arch/i386/conf/GENERIC_ISDN Sat Sep 22 12:41:00 2018
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC_ISDN,v 1.19 2018/09/22 12:26:27 maxv Exp $
+# $NetBSD: GENERIC_ISDN,v 1.20 2018/09/22 12:41:00 maxv Exp $
#
# GENERIC kernel with all supported ISDN devices and drivers
@@ -51,9 +51,6 @@ isic* at isapnp?
#
isic* at pci?
-# Winbond W6692
-iwic* at pci?
-
#
#---------------------------------------------------------------------
# Supported PCMCIA cards:
Index: src/sys/dev/DEVNAMES
diff -u src/sys/dev/DEVNAMES:1.315 src/sys/dev/DEVNAMES:1.316
--- src/sys/dev/DEVNAMES:1.315 Sat Sep 22 12:19:11 2018
+++ src/sys/dev/DEVNAMES Sat Sep 22 12:41:00 2018
@@ -1,4 +1,4 @@
-# $NetBSD: DEVNAMES,v 1.315 2018/09/22 12:19:11 maxv Exp $
+# $NetBSD: DEVNAMES,v 1.316 2018/09/22 12:41:00 maxv Exp $
#
# This file contains all used device names and defined attributes in
# alphabetical order. New devices added to the system somewhere should first
@@ -701,7 +701,6 @@ iteide MI
ivsc amiga
ivsc amigappc
iwi MI
-iwic MI
iwm mac68k
ix MI
ixg MI
