Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/dev/isa Filename cleanup police (per discussion with Sor...
details: https://anonhg.NetBSD.org/src/rev/a9d9a5ad0994
branches: trunk
changeset: 503936:a9d9a5ad0994
user: martin <martin%NetBSD.org@localhost>
date: Sun Feb 18 13:54:32 2001 +0000
description:
Filename cleanup police (per discussion with Soren S. Jorvang):
remove all (legacy) "i4b_" prefixes outside of sys/netisdn.
Prefix all card specific driver support files with the basename
of the driver bus attachement file.
Renamed here:
i4b_isic_isa.c -> isic_isa.c
i4b_avm_a1.c -> isic_isa_avm_a1.c
i4b_daic_isa.c -> daic_isa.c
i4b_itk_ix1.c -> isic_isa_itk_ix1.c
i4b_tel_s08.c -> isic_isa_tel_s08.c
i4b_tel_s016.c -> isic_isa_tel_s016.c
i4b_tel_s0163.c -> isic_isa_tel_s0163.c
i4b_usr_sti.c -> isic_isa_usr_sti.c
diffstat:
sys/dev/isa/daic_isa.c | 146 ++++
sys/dev/isa/files.isa | 18 +-
sys/dev/isa/i4b_avm_a1.c | 507 --------------
sys/dev/isa/i4b_daic_isa.c | 146 ----
sys/dev/isa/i4b_isic_isa.c | 1299 --------------------------------------
sys/dev/isa/i4b_itk_ix1.c | 496 --------------
sys/dev/isa/i4b_tel_s016.c | 455 -------------
sys/dev/isa/i4b_tel_s0163.c | 602 -----------------
sys/dev/isa/i4b_tel_s08.c | 388 -----------
sys/dev/isa/i4b_usr_sti.c | 439 ------------
sys/dev/isa/isic_isa.c | 1299 ++++++++++++++++++++++++++++++++++++++
sys/dev/isa/isic_isa_avm_a1.c | 507 ++++++++++++++
sys/dev/isa/isic_isa_itk_ix1.c | 496 ++++++++++++++
sys/dev/isa/isic_isa_tel_s016.c | 455 +++++++++++++
sys/dev/isa/isic_isa_tel_s0163.c | 602 +++++++++++++++++
sys/dev/isa/isic_isa_tel_s08.c | 388 +++++++++++
sys/dev/isa/isic_isa_usr_sti.c | 439 ++++++++++++
17 files changed, 4341 insertions(+), 4341 deletions(-)
diffs (truncated from 8765 to 300 lines):
diff -r 182ba34db690 -r a9d9a5ad0994 sys/dev/isa/daic_isa.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/dev/isa/daic_isa.c Sun Feb 18 13:54:32 2001 +0000
@@ -0,0 +1,146 @@
+/*-
+ * Copyright (c) 1997, 2001 Martin Husemann <martin%duskware.de@localhost>
+ * 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. The name of the author may not be used to endorse or promote products
+ * derived from this software withough specific prior written permission
+ *
+ * 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.
+ *
+ */
+
+#include <sys/types.h>
+#include <sys/param.h>
+#include <sys/errno.h>
+#include <sys/syslog.h>
+#include <sys/device.h>
+
+#if defined(__NetBSD__) && __NetBSD_Version__ >= 104230000
+#include <sys/callout.h>
+#endif
+
+#include <machine/cpu.h>
+#include <machine/intr.h>
+#include <machine/bus.h>
+
+#include <sys/socket.h>
+#include <net/if.h>
+#include <dev/isa/isavar.h>
+#include <netisdn/i4b_ioctl.h>
+#include <netisdn/i4b_l3l4.h>
+#include <dev/ic/daicvar.h>
+
+/* driver state */
+struct daic_isa_softc {
+ struct daic sc_daic; /* MI driver state */
+ void *sc_ih; /* interrupt handler */
+};
+
+/* local functions */
+#ifdef __BROKEN_INDIRECT_CONFIG
+static int daic_isa_probe __P((struct device *, void *, void *));
+#else
+static int daic_isa_probe __P((struct device *, struct cfdata *, void *));
+#endif
+static void daic_isa_attach __P((struct device *, struct device *, void *));
+static int daic_isa_intr __P((void *));
+
+struct cfattach daic_isa_ca = {
+ sizeof(struct daic_isa_softc), daic_isa_probe, daic_isa_attach
+};
+
+static int
+#ifdef __BROKEN_INDIRECT_CONFIG
+daic_isa_probe(parent, match, aux)
+#else
+daic_isa_probe(parent, cf, aux)
+#endif
+ struct device *parent;
+#ifdef __BROKEN_INDIRECT_CONFIG
+ void *match;
+#else
+ struct cfdata *cf;
+#endif
+ void *aux;
+{
+ struct isa_attach_args *ia = aux;
+ bus_space_tag_t memt = ia->ia_memt;
+ bus_space_handle_t memh;
+ int card;
+
+ /* We need some controller memory to comunicate! */
+ if (ia->ia_maddr == MADDRUNK || ia->ia_msize == -1)
+ goto bad;
+
+ /* Map card RAM. */
+ ia->ia_msize = DAIC_ISA_MEMSIZE;
+ ia->ia_iosize = 0;
+ if (bus_space_map(memt, ia->ia_maddr, ia->ia_msize,
+ 0, &memh))
+ goto bad;
+
+ /* MI check for card at this location */
+ card = daic_probe(memt, memh);
+ if (card < 0)
+ goto bad;
+ if (card == DAIC_TYPE_QUAD)
+ ia->ia_msize = DAIC_ISA_QUADSIZE;
+
+ bus_space_unmap(memt, memh, DAIC_ISA_MEMSIZE);
+ return 1;
+
+bad:
+ /* unmap card RAM */
+ bus_space_unmap(memt, memh, DAIC_ISA_MEMSIZE);
+ return 0;
+}
+
+static void
+daic_isa_attach(parent, self, aux)
+ struct device *parent, *self;
+ void *aux;
+{
+ struct daic_isa_softc *sc = (void *)self;
+ struct isa_attach_args *ia = aux;
+ bus_space_tag_t memt = ia->ia_memt;
+ bus_space_handle_t memh;
+
+ /* Map card RAM. */
+ if (bus_space_map(memt, ia->ia_maddr, ia->ia_msize,
+ 0, &memh))
+ return;
+
+ sc->sc_daic.sc_iot = memt;
+ sc->sc_daic.sc_ioh = memh;
+
+ /* MI initialization of card */
+ daic_attach(self, &sc->sc_daic);
+
+ sc->sc_ih = isa_intr_establish(ia->ia_ic, ia->ia_irq, IST_EDGE,
+ IPL_NET, daic_isa_intr, sc);
+}
+
+/*
+ * Controller interrupt.
+ */
+static int
+daic_isa_intr(arg)
+ void *arg;
+{
+ struct daic_isa_softc *sc = arg;
+ return daic_intr(&sc->sc_daic);
+}
diff -r 182ba34db690 -r a9d9a5ad0994 sys/dev/isa/files.isa
--- a/sys/dev/isa/files.isa Sun Feb 18 12:42:31 2001 +0000
+++ b/sys/dev/isa/files.isa Sun Feb 18 13:54:32 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.isa,v 1.108 2001/02/17 15:38:09 martin Exp $
+# $NetBSD: files.isa,v 1.109 2001/02/18 13:54:32 martin Exp $
#
# Config file and device description for machine-independent ISA code.
# Included by ports that need it. Requires that the SCSI files be
@@ -435,19 +435,19 @@
# ISDN devices
attach isic at isa with isic_isa
-file dev/isa/i4b_isic_isa.c isic_isa
+file dev/isa/isic_isa.c isic_isa
attach daic at isa with daic_isa
-file dev/isa/i4b_daic_isa.c daic_isa
+file dev/isa/daic_isa.c daic_isa
defopt opt_isicisa.h ISICISA_TEL_S0_8 ISICISA_TEL_S0_16 ISICISA_TEL_S0_16_3
ISICISA_AVM_A1 ISICISA_USR_STI ISICISA_ITKIX1
-file dev/isa/i4b_tel_s08.c isic_isa
-file dev/isa/i4b_tel_s016.c isic_isa
-file dev/isa/i4b_tel_s0163.c isic_isa
-file dev/isa/i4b_avm_a1.c isic_isa
-file dev/isa/i4b_usr_sti.c isic_isa
-file dev/isa/i4b_itk_ix1.c isic_isa
+file dev/isa/isic_isa_tel_s08.c isic_isa
+file dev/isa/isic_isa_tel_s016.c isic_isa
+file dev/isa/isic_isa_tel_s0163.c isic_isa
+file dev/isa/isic_isa_avm_a1.c isic_isa
+file dev/isa/isic_isa_usr_sti.c isic_isa
+file dev/isa/isic_isa_itk_ix1.c isic_isa
#
# ISA Plug 'n Play autoconfiguration glue.
diff -r 182ba34db690 -r a9d9a5ad0994 sys/dev/isa/i4b_avm_a1.c
--- a/sys/dev/isa/i4b_avm_a1.c Sun Feb 18 12:42:31 2001 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,507 +0,0 @@
-/*
- * Copyright (c) 1996 Andrew Gordon. All rights reserved.
- *
- * Copyright (c) 1997, 1999 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.
- * 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.
- *
- *---------------------------------------------------------------------------
- *
- * i4b_avm_a1.c - AVM A1/Fritz passive card driver for isdn4bsd
- * ------------------------------------------------------------
- *
- * $Id: i4b_avm_a1.c,v 1.1.1.1 2001/01/05 12:50:15 martin Exp $
- *
- * last edit-date: [Fri Jan 5 11:37:22 2001]
- *
- *---------------------------------------------------------------------------*/
-
-#include "opt_isicisa.h"
-#ifdef ISICISA_AVM_A1
-
-#include <sys/param.h>
-#if defined(__FreeBSD__) && __FreeBSD__ >= 3
-#include <sys/ioccom.h>
-#else
-#include <sys/ioctl.h>
-#endif
-#include <sys/kernel.h>
-#include <sys/systm.h>
-#include <sys/mbuf.h>
-
-#if defined(__NetBSD__) && __NetBSD_Version__ >= 104230000
-#include <sys/callout.h>
-#endif
-
-#ifdef __FreeBSD__
-#include <machine/clock.h>
-#include <i386/isa/isa_device.h>
-#else
-#include <machine/bus.h>
-#include <sys/device.h>
-#endif
-
-#include <sys/socket.h>
-#include <net/if.h>
-
-#ifdef __FreeBSD__
-#include <machine/i4b_debug.h>
-#include <machine/i4b_ioctl.h>
-#else
-#include <netisdn/i4b_debug.h>
-#include <netisdn/i4b_ioctl.h>
-#endif
-
-#include <netisdn/i4b_global.h>
-
-#include <dev/ic/i4b_isicl1.h>
-#include <dev/ic/i4b_isac.h>
-#include <dev/ic/i4b_hscx.h>
-
-#ifndef __FreeBSD__
-static u_int8_t avma1_read_reg __P((struct l1_softc *sc, int what, bus_size_t offs));
-static void avma1_write_reg __P((struct l1_softc *sc, int what, bus_size_t offs, u_int8_t data));
-static void avma1_read_fifo __P((struct l1_softc *sc, int what, void *buf, size_t size));
-static void avma1_write_fifo __P((struct l1_softc *sc, int what, const void *data, size_t size));
-#endif
-
-/*---------------------------------------------------------------------------*
- * AVM A1 and AVM Fritz! Card special registers
- *---------------------------------------------------------------------------*/
-
-#define AVM_CONF_REG 0x1800 /* base offset for config register */
-#define AVM_CONF_IRQ 0x1801 /* base offset for IRQ register */
- /* config register write */
-#define AVM_CONF_WR_RESET 0x01 /* 1 = RESET ISAC and HSCX */
-#define AVM_CONF_WR_CCL 0x02 /* 1 = clear counter low nibble */
-#define AVM_CONF_WR_CCH 0x04 /* 1 = clear counter high nibble */
-#define AVM_CONF_WR_IRQEN 0x08 /* 1 = enable IRQ */
-#define AVM_CONF_WR_TEST 0x10 /* test bit */
- /* config register read */
-#define AVM_CONF_RD_IIRQ 0x01 /* 0 = ISAC IRQ active */
-#define AVM_CONF_RD_HIRQ 0x02 /* 0 = HSCX IRQ active */
-#define AVM_CONF_RD_CIRQ 0x04 /* 0 = counter IRQ active */
-#define AVM_CONF_RD_ZER1 0x08 /* unused, always read 0 */
Home |
Main Index |
Thread Index |
Old Index