Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys Remove the "ifritz" driver (no man page). It is part of ...
details: https://anonhg.NetBSD.org/src/rev/48f20e860819
branches: trunk
changeset: 836017:48f20e860819
user: maxv <maxv%NetBSD.org@localhost>
date: Sat Sep 22 12:26:27 2018 +0000
description:
Remove the "ifritz" driver (no man page). It is part of ISDN, which we are
retiring.
diffstat:
sys/arch/amd64/conf/ALL | 7 +-
sys/arch/i386/conf/ALL | 7 +-
sys/arch/i386/conf/GENERIC_ISDN | 5 +-
sys/conf/files | 6 +-
sys/dev/pci/files.pci | 6 +-
sys/dev/pci/ifpci2.c | 1322 ---------------------------------------
6 files changed, 9 insertions(+), 1344 deletions(-)
diffs (truncated from 1441 to 300 lines):
diff -r f9aac7aef408 -r 48f20e860819 sys/arch/amd64/conf/ALL
--- a/sys/arch/amd64/conf/ALL Sat Sep 22 12:24:01 2018 +0000
+++ b/sys/arch/amd64/conf/ALL Sat Sep 22 12:26:27 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.103 2018/09/22 12:19:11 maxv Exp $
+# $NetBSD: ALL,v 1.104 2018/09/22 12:26:27 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.103 $"
+#ident "ALL-$Revision: 1.104 $"
maxusers 64 # estimated number of users
@@ -1756,9 +1756,6 @@
# Winbond W6692
iwic* at pci?
-# AVM Fritz!PCI V2 card
-ifritz* at pci?
-
#
#---------------------------------------------------------------------
# Supported PCMCIA cards:
diff -r f9aac7aef408 -r 48f20e860819 sys/arch/i386/conf/ALL
--- a/sys/arch/i386/conf/ALL Sat Sep 22 12:24:01 2018 +0000
+++ b/sys/arch/i386/conf/ALL Sat Sep 22 12:26:27 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.453 2018/09/22 12:19:11 maxv Exp $
+# $NetBSD: ALL,v 1.454 2018/09/22 12:26:27 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.453 $"
+#ident "ALL-$Revision: 1.454 $"
maxusers 64 # estimated number of users
@@ -1902,9 +1902,6 @@
# Winbond W6692
iwic* at pci?
-# AVM Fritz!PCI V2 card
-ifritz* at pci?
-
#
#---------------------------------------------------------------------
# Supported PCMCIA cards:
diff -r f9aac7aef408 -r 48f20e860819 sys/arch/i386/conf/GENERIC_ISDN
--- a/sys/arch/i386/conf/GENERIC_ISDN Sat Sep 22 12:24:01 2018 +0000
+++ b/sys/arch/i386/conf/GENERIC_ISDN Sat Sep 22 12:26:27 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC_ISDN,v 1.18 2018/09/22 12:19:11 maxv Exp $
+# $NetBSD: GENERIC_ISDN,v 1.19 2018/09/22 12:26:27 maxv Exp $
#
# GENERIC kernel with all supported ISDN devices and drivers
@@ -54,9 +54,6 @@
# Winbond W6692
iwic* at pci?
-# AVM Fritz!PCI V2 card
-ifritz* at pci?
-
#
#---------------------------------------------------------------------
# Supported PCMCIA cards:
diff -r f9aac7aef408 -r 48f20e860819 sys/conf/files
--- a/sys/conf/files Sat Sep 22 12:24:01 2018 +0000
+++ b/sys/conf/files Sat Sep 22 12:26:27 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files,v 1.1210 2018/09/22 12:19:11 maxv Exp $
+# $NetBSD: files,v 1.1211 2018/09/22 12:26:27 maxv Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
version 20171118
@@ -1377,8 +1377,8 @@
device isic: isdndev, passive_isdn, nisac
file dev/ic/isic.c isic
-file dev/ic/isic_l1.c isic|ifritz
-file dev/ic/isic_l1fsm.c isic|ifritz
+file dev/ic/isic_l1.c isic
+file dev/ic/isic_l1fsm.c isic
file dev/ic/hscx.c isic
file dev/ic/isic_bchan.c isic
diff -r f9aac7aef408 -r 48f20e860819 sys/dev/pci/files.pci
--- a/sys/dev/pci/files.pci Sat Sep 22 12:24:01 2018 +0000
+++ b/sys/dev/pci/files.pci Sat Sep 22 12:26:27 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.pci,v 1.404 2018/09/22 12:19:11 maxv Exp $
+# $NetBSD: files.pci,v 1.405 2018/09/22 12:26:27 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_elsa_qs1p.c isic_pci
-device ifritz: isdndev, passive_isdn, nisacsx
-attach ifritz at pci
-file dev/pci/ifpci2.c ifritz
-
# Winbond W6692
device iwic: isdndev, passive_isdn
attach iwic at pci with iwic_pci
diff -r f9aac7aef408 -r 48f20e860819 sys/dev/pci/ifpci2.c
--- a/sys/dev/pci/ifpci2.c Sat Sep 22 12:24:01 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1322 +0,0 @@
-/* $NetBSD: ifpci2.c,v 1.22 2014/03/29 19:28:25 christos Exp $ */
-/*
- * Copyright (c) 1999 Gary Jennejohn. 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.
- * 3. Neither the name of the author nor the names of any co-contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- * 4. Altered versions must be plainly marked as such, and must not be
- * misrepresented as being the original software and/or documentation.
- *
- * 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.
- *
- *---------------------------------------------------------------------------
- * a lot of code was borrowed from i4b_bchan.c and i4b_hscx.c
- *---------------------------------------------------------------------------
- *
- * Fritz!Card PCI driver
- * ------------------------------------------------
- *
- * $Id: ifpci2.c,v 1.22 2014/03/29 19:28:25 christos Exp $
- *
- * last edit-date: [Fri Jan 5 11:38:58 2001]
- *
- *---------------------------------------------------------------------------*/
-
-#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ifpci2.c,v 1.22 2014/03/29 19:28:25 christos Exp $");
-
-
-#include <sys/param.h>
-#include <sys/ioctl.h>
-#include <sys/kernel.h>
-#include <sys/systm.h>
-#include <sys/mbuf.h>
-
-#include <sys/bus.h>
-#include <sys/device.h>
-
-#include <sys/socket.h>
-#include <net/if.h>
-
-#include <sys/callout.h>
-
-#include <dev/pci/pcireg.h>
-#include <dev/pci/pcivar.h>
-#include <dev/pci/pcidevs.h>
-#include <netisdn/i4b_debug.h>
-#include <netisdn/i4b_ioctl.h>
-
-#include <netisdn/i4b_global.h>
-#include <netisdn/i4b_l2.h>
-#include <netisdn/i4b_l1l2.h>
-#include <netisdn/i4b_trace.h>
-#include <netisdn/i4b_mbuf.h>
-
-#include <dev/ic/isic_l1.h>
-#include <dev/ic/isacsx.h>
-#include <dev/ic/hscx.h>
-
-#include <dev/pci/isic_pci.h>
-
-/* PCI config map to use (only one in this driver) */
-#define FRITZPCI_PORT0_IO_MAPOFF PCI_MAPREG_START+4
-#define FRITZPCI_PORT0_MEM_MAPOFF PCI_MAPREG_START
-
-static isdn_link_t *avma1pp2_ret_linktab(void *token, int channel);
-static void avma1pp2_set_link(void *token, int channel, const struct isdn_l4_driver_functions *l4_driver, void *l4_driver_softc);
-
-void n_connect_request(struct call_desc *cd);
-void n_connect_response(struct call_desc *cd, int response, int cause);
-void n_disconnect_request(struct call_desc *cd, int cause);
-void n_alert_request(struct call_desc *cd);
-void n_mgmt_command(struct isdn_l3_driver *drv, int cmd, void *parm);
-
-extern const struct isdn_layer1_isdnif_driver isic_std_driver;
-
-const struct isdn_l3_driver_functions
-ifpci2_l3_driver = {
- avma1pp2_ret_linktab,
- avma1pp2_set_link,
- n_connect_request,
- n_connect_response,
- n_disconnect_request,
- n_alert_request,
- NULL,
- NULL,
- n_mgmt_command
-};
-
-struct ifpci_softc {
- struct isic_softc sc_isic; /* parent class */
-
- /* PCI-specific goo */
- void *sc_ih; /* interrupt handler */
- bus_addr_t sc_base;
- bus_size_t sc_size;
- pci_chipset_tag_t sc_pc;
-};
-
-/* prototypes */
-static void avma1pp2_disable(struct isic_softc *);
-static int isic_hscx_fifo(l1_bchan_state_t *chan, struct isic_softc *sc);
-
-static int avma1pp2_intr(void*);
-static void avma1pp2_read_fifo(struct isic_softc *sc, int what, void *buf, size_t size);
-static void avma1pp2_write_fifo(struct isic_softc *sc, int what, const void *buf, size_t size);
-static void avma1pp2_write_reg(struct isic_softc *sc, int what, bus_size_t offs, u_int8_t data);
-static u_int8_t avma1pp2_read_reg(struct isic_softc *sc, int what, bus_size_t offs);
-static void hscx_write_fifo(int chan, const void *buf, size_t len, struct isic_softc *sc);
-static void hscx_read_fifo(int chan, void *buf, size_t len, struct isic_softc *sc);
-static void hscx_write_reg(int chan, u_int val, struct isic_softc *sc);
-static u_char hscx_read_reg(int chan, struct isic_softc *sc);
-static u_int hscx_read_reg_int(int chan, struct isic_softc *sc);
-static void avma1pp2_bchannel_stat(isdn_layer1token, int h_chan, bchan_statistics_t *bsp);
-static void avma1pp2_map_int(struct ifpci_softc *sc, struct pci_attach_args *pa);
-static void avma1pp2_bchannel_setup(isdn_layer1token, int h_chan, int bprot, int activate);
-static void avma1pp2_init_linktab(struct isic_softc *);
-static int ifpci2_match(device_t parent, cfdata_t match, void *aux);
-static void ifpci2_attach(device_t parent, device_t self, void *aux);
-static int ifpci2_detach(device_t self, int flags);
-static int ifpci2_activate(device_t self, enum devact act);
-
-CFATTACH_DECL_NEW(ifritz, sizeof(struct ifpci_softc),
- ifpci2_match, ifpci2_attach, ifpci2_detach, ifpci2_activate);
-
-/*---------------------------------------------------------------------------*
- * AVM PCI Fritz!Card V. 2 special registers
- *---------------------------------------------------------------------------*/
-
-/*
- * AVM PCI Status Latch 0 read only bits
- */
-#define ASL_IRQ_ISAC 0x01 /* ISAC interrupt, active high */
-#define ASL_IRQ_HSCX 0x02 /* HSX interrupt, active high */
-#define ASL_IRQ_TIMER 0x04 /* Timer interrupt, active high */
-#define ASL_IRQ_BCHAN ASL_IRQ_HSCX
-/* actually active high */
-#define ASL_IRQ_Pending (ASL_IRQ_ISAC | ASL_IRQ_HSCX | ASL_IRQ_TIMER)
-
-/*
- * AVM PCI Status Latch 0 read only bits
- */
-#define ASL_RESET 0x01
-#define ASL_TIMERRESET 0x04
-#define ASL_ENABLE_INT 0x08
-
-/*
- * "HSCX" status bits
- */
-#define HSCX_STAT_RME 0x01
-#define HSCX_STAT_RDO 0x10
-#define HSCX_STAT_CRCVFRRAB 0x0E
-#define HSCX_STAT_CRCVFR 0x06
-#define HSCX_STAT_RML_MASK 0x3f00
-
-/*
- * "HSCX" interrupt bits
- */
-#define HSCX_INT_XPR 0x80
-#define HSCX_INT_XDU 0x40
-#define HSCX_INT_RPR 0x20
-#define HSCX_INT_MASK 0xE0
Home |
Main Index |
Thread Index |
Old Index