Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/pci Remove iwic(4). It is part of ISDN, which we are...



details:   https://anonhg.NetBSD.org/src/rev/239f538a8e97
branches:  trunk
changeset: 993636:239f538a8e97
user:      maxv <maxv%NetBSD.org@localhost>
date:      Sat Sep 22 12:41:00 2018 +0000

description:
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).

diffstat:

 distrib/sets/lists/man/mi       |    8 +-
 share/man/man4/Makefile         |    4 +-
 share/man/man4/iwic.4           |   68 ---
 sys/arch/amd64/conf/ALL         |    7 +-
 sys/arch/i386/conf/ALL          |    7 +-
 sys/arch/i386/conf/GENERIC_ISDN |    5 +-
 sys/dev/DEVNAMES                |    3 +-
 sys/dev/pci/iwic_bchan.c        |  755 ----------------------------------------
 sys/dev/pci/iwic_dchan.c        |  460 ------------------------
 sys/dev/pci/iwic_fsm.c          |  226 -----------
 sys/dev/pci/iwic_pci.c          |  452 -----------------------
 sys/dev/pci/iwicreg.h           |  264 -------------
 sys/dev/pci/iwicvar.h           |  200 ----------
 13 files changed, 12 insertions(+), 2447 deletions(-)

diffs (truncated from 2599 to 300 lines):

diff -r e19042be4f8f -r 239f538a8e97 distrib/sets/lists/man/mi
--- a/distrib/sets/lists/man/mi Sat Sep 22 12:26:27 2018 +0000
+++ b/distrib/sets/lists/man/mi Sat Sep 22 12:41:00 2018 +0000
@@ -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
diff -r e19042be4f8f -r 239f538a8e97 share/man/man4/Makefile
--- a/share/man/man4/Makefile   Sat Sep 22 12:26:27 2018 +0000
+++ b/share/man/man4/Makefile   Sat Sep 22 12:41:00 2018 +0000
@@ -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 @@
 
 # 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
diff -r e19042be4f8f -r 239f538a8e97 share/man/man4/iwic.4
--- a/share/man/man4/iwic.4     Sat Sep 22 12:26:27 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,68 +0,0 @@
-.\"    $NetBSD: iwic.4,v 1.6 2014/03/18 18:20:39 riastradh Exp $
-.\"
-.\" Copyright (c) 2000, 2002 Hellmuth Michaelis. 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 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.
-.\"
-.\" $FreeBSD: src/usr.sbin/i4b/man/iwic.4,v 1.7 2002/07/28 18:21:48 hm Exp $
-.\"
-.\"    last edit-date: [Sun Jul 28 16:49:47 2002]
-.\"
-.Dd September 25, 2002
-.Dt IWIC 4
-.Os
-.Sh NAME
-.Nm iwic
-.Nd isdn4bsd Winbond ISDN Chip device driver
-.Sh SYNOPSIS
-.Cd "iwic* at pci?"
-.Sh DESCRIPTION
-The
-.Nm
-driver provides D-channel layer 1 support as specified in ITU Recommendation
-I.430 and layer 1 support for the B-channel.
-.Pp
-The driver supports passive PCI ISDN cards from various manufacturers
-based on the Winbond W6692 chip.
-.Ss SUPPORTED CARDS
-.Bl -tag -width Ds -compact
-.It Ar ASUSCOM P-IN100-ST-D
-.Pp
-.It Ar Dynalink IS64PPH
-.El
-.Sh SEE ALSO
-.Xr isdnd 8
-.Sh STANDARDS
-CCITT Recommendation I.430
-.Sh AUTHORS
-.An -nosplit
-The
-.Nm
-driver was written by
-.An Dave Boyce Aq Mt dave%abyss.demon.co.uk@localhost .
-.Pp
-This manpage was written by
-.An Hellmuth Michaelis Aq Mt hm%freebsd.org@localhost .
-.Sh CAVEATS
-The driver is still in a somewhat experimental state.
-.Sh BUGS
-Layer 1 persistent deactivation not yet implemented.
diff -r e19042be4f8f -r 239f538a8e97 sys/arch/amd64/conf/ALL
--- a/sys/arch/amd64/conf/ALL   Sat Sep 22 12:26:27 2018 +0000
+++ b/sys/arch/amd64/conf/ALL   Sat Sep 22 12:41:00 2018 +0000
@@ -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 @@
 
 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 @@
 #
 isic*          at pci?
 
-# Winbond W6692
-iwic*          at pci?
-
 #
 #---------------------------------------------------------------------
 # Supported PCMCIA cards:
diff -r e19042be4f8f -r 239f538a8e97 sys/arch/i386/conf/ALL
--- a/sys/arch/i386/conf/ALL    Sat Sep 22 12:26:27 2018 +0000
+++ b/sys/arch/i386/conf/ALL    Sat Sep 22 12:41:00 2018 +0000
@@ -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 @@
 
 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 pci?
 
-# Winbond W6692
-iwic*          at pci?
-
 #
 #---------------------------------------------------------------------
 # Supported PCMCIA cards:
diff -r e19042be4f8f -r 239f538a8e97 sys/arch/i386/conf/GENERIC_ISDN
--- a/sys/arch/i386/conf/GENERIC_ISDN   Sat Sep 22 12:26:27 2018 +0000
+++ b/sys/arch/i386/conf/GENERIC_ISDN   Sat Sep 22 12:41:00 2018 +0000
@@ -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 pci?
 
-# Winbond W6692
-iwic*          at pci?
-
 #
 #---------------------------------------------------------------------
 # Supported PCMCIA cards:
diff -r e19042be4f8f -r 239f538a8e97 sys/dev/DEVNAMES
--- a/sys/dev/DEVNAMES  Sat Sep 22 12:26:27 2018 +0000
+++ b/sys/dev/DEVNAMES  Sat Sep 22 12:41:00 2018 +0000
@@ -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 @@
 ivsc                   amiga
 ivsc                   amigappc
 iwi                    MI
-iwic                   MI
 iwm                    mac68k
 ix                     MI
 ixg                    MI
diff -r e19042be4f8f -r 239f538a8e97 sys/dev/pci/iwic_bchan.c
--- a/sys/dev/pci/iwic_bchan.c  Sat Sep 22 12:26:27 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,755 +0,0 @@
-/*     $NetBSD: iwic_bchan.c,v 1.10 2018/09/03 16:29:32 riastradh Exp $        */
-
-/*
- * Copyright (c) 1999, 2000 Dave Boyce. All rights reserved.
- *
- * Copyright (c) 2000, 2001 Hellmuth Michaelis. 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 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.
- *
- *---------------------------------------------------------------------------
- *
- *      i4b_iwic - isdn4bsd Winbond W6692 driver
- *      ----------------------------------------
- *
- * $FreeBSD$
- *
- *      last edit-date: [Tue Jan 16 13:21:24 2001]
- *
- *---------------------------------------------------------------------------*/
-
-#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iwic_bchan.c,v 1.10 2018/09/03 16:29:32 riastradh Exp $");
-
-#include <sys/param.h>
-#include <sys/kernel.h>
-#include <sys/systm.h>
-#include <sys/mbuf.h>
-#include <sys/callout.h>
-#include <sys/socket.h>
-#include <sys/device.h>
-#include <net/if.h>
-
-#include <sys/bus.h>
-
-#include <dev/pci/pcireg.h>
-#include <dev/pci/pcivar.h>
-#include <dev/pci/pcidevs.h>
-
-#include <dev/pci/iwicreg.h>
-#include <dev/pci/iwicvar.h>
-
-#include <netisdn/i4b_debug.h>
-#include <netisdn/i4b_ioctl.h>
-#include <netisdn/i4b_trace.h>
-
-#include <netisdn/i4b_l2.h>
-#include <netisdn/i4b_l1l2.h>
-#include <netisdn/i4b_mbuf.h>
-#include <netisdn/i4b_global.h>
-
-static void iwic_bchan_init(struct iwic_softc *sc, int chan_no, int activate);
-
-/*---------------------------------------------------------------------------*
- *     B-channel interrupt handler
- *---------------------------------------------------------------------------*/
-void
-iwic_bchan_xirq(struct iwic_softc *sc, int chan_no)
-{
-       int irq_stat;



Home | Main Index | Thread Index | Old Index