[src/trunk]: src/sys Add support for ITK IX1 PnP cards.

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/sys Add support for ITK IX1 PnP cards.
From: martin <martin%NetBSD.org@localhost>
Date: Fri, 24 Jan 2020 10:20:02 +0000
details:   https://anonhg.NetBSD.org/src/rev/0a67dc282ffd
branches:  trunk
changeset: 520957:0a67dc282ffd
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Jan 21 12:31:42 2002 +0000

description:
Add support for ITK IX1 PnP cards.
Thanks to Nick Hudson for testing.

diffstat:

 sys/arch/i386/conf/GENERIC_ISDN    |   3 +-
 sys/dev/isapnp/files.isapnp        |   5 +-
 sys/dev/isapnp/isic_isapnp.c       |  16 ++++++--
 sys/dev/isapnp/isic_isapnp_itkix.c |  68 ++++++++++++++++++++++++++++++++++++++
 4 files changed, 84 insertions(+), 8 deletions(-)

diffs (180 lines):

diff -r d0440bb7f447 -r 0a67dc282ffd sys/arch/i386/conf/GENERIC_ISDN
--- a/sys/arch/i386/conf/GENERIC_ISDN   Mon Jan 21 12:21:31 2002 +0000
+++ b/sys/arch/i386/conf/GENERIC_ISDN   Mon Jan 21 12:31:42 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC_ISDN,v 1.5 2001/11/20 12:56:30 lukem Exp $
+# $NetBSD: GENERIC_ISDN,v 1.6 2002/01/21 12:31:42 martin Exp $
 #
 # GENERIC kernel with all supported ISDN devices and drivers
 
@@ -43,6 +43,7 @@
 options        ISICPNP_SEDLBAUER       # Sedlbauer WinSpeed
 options        ISICPNP_DYNALINK        # Dynalink IS64PH
 options        ISICPNP_SIEMENS_ISURF2  # Siemens I-Surf
+options                ISICPNP_ITKIX           # ITK IX PnP cards
 isic* at isapnp?
 #
 #---------------------------------------------------------------------
diff -r d0440bb7f447 -r 0a67dc282ffd sys/dev/isapnp/files.isapnp
--- a/sys/dev/isapnp/files.isapnp       Mon Jan 21 12:21:31 2002 +0000
+++ b/sys/dev/isapnp/files.isapnp       Mon Jan 21 12:31:42 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.isapnp,v 1.29 2001/11/28 10:21:22 lukem Exp $
+#      $NetBSD: files.isapnp,v 1.30 2002/01/21 12:31:43 martin Exp $
 #
 # Config file and device description for machine-independent ISAPnP code.
 # Included by ports that need it.
@@ -94,7 +94,7 @@
 defflag        opt_isicpnp.h   ISICPNP_TEL_S0_16_3_P ISICPNP_CRTX_S0_P ISICPNP_DRN_NGO
                        ISICPNP_ELSA_QS1ISA ISICPNP_ELSA_PCC16
                        ISICPNP_SEDLBAUER ISICPNP_DYNALINK
-                       ISICPNP_SIEMENS_ISURF2
+                       ISICPNP_SIEMENS_ISURF2 ISICPNP_ITKIX
 
 file dev/isapnp/isic_isapnp_tel_s0P.c          isic_isapnp
 file dev/isapnp/isic_isapnp_ctx_s0P.c          isic_isapnp
@@ -103,3 +103,4 @@
 file dev/isapnp/isic_isapnp_sws.c              isic_isapnp
 file dev/isapnp/isic_isapnp_dynalink.c         isic_isapnp
 file dev/isapnp/isic_isapnp_siemens_isurf.c    isic_isapnp
+file dev/isapnp/isic_isapnp_itkix.c            isic_isapnp
diff -r d0440bb7f447 -r 0a67dc282ffd sys/dev/isapnp/isic_isapnp.c
--- a/sys/dev/isapnp/isic_isapnp.c      Mon Jan 21 12:21:31 2002 +0000
+++ b/sys/dev/isapnp/isic_isapnp.c      Mon Jan 21 12:31:42 2002 +0000
@@ -33,7 +33,7 @@
  *     isapnp_isic.c - ISA-P&P bus frontend for i4b_isic driver
  *     --------------------------------------------------------
  *
- *     $Id: isic_isapnp.c,v 1.5 2001/11/15 09:48:10 lukem Exp $ 
+ *     $Id: isic_isapnp.c,v 1.6 2002/01/21 12:31:43 martin Exp $ 
  *
  *      last edit-date: [Fri Jan  5 11:38:29 2001]
  *
@@ -43,7 +43,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_isapnp.c,v 1.5 2001/11/15 09:48:10 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_isapnp.c,v 1.6 2002/01/21 12:31:43 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/errno.h>
@@ -102,7 +102,8 @@
 
 /* map allocators */
 #if defined(ISICPNP_ELSA_QS1ISA) || defined(ISICPNP_SEDLBAUER) \
-       || defined(ISICPNP_DYNALINK) || defined(ISICPNP_SIEMENS_ISURF2)
+       || defined(ISICPNP_DYNALINK) || defined(ISICPNP_SIEMENS_ISURF2) \
+       || defined(ISICPNP_ITKIX)
 static void generic_pnp_mapalloc(struct isapnp_attach_args *ipa, struct l1_softc *sc);
 #endif
 #ifdef ISICPNP_DRN_NGO
@@ -120,6 +121,7 @@
 extern void isic_attach_sws __P((struct l1_softc *sc));
 extern void isic_attach_Eqs1pi __P((struct l1_softc *sc));
 extern void isic_attach_siemens_isurf __P((struct l1_softc *sc));
+extern void isic_attach_isapnp_itkix1 __P((struct l1_softc *sc));
 
 struct isic_isapnp_card_desc {
        char *devlogic;                 /* ISAPNP logical device ID */
@@ -159,6 +161,10 @@
        { "SIE0020", "Siemens I-Surf 2.0 PnP", CARD_TYPEP_SIE_ISURF2,
          generic_pnp_mapalloc, isic_attach_siemens_isurf },
 #endif
+#ifdef ISICPNP_ITKIX
+       { "ITK0025", "ix1-micro 3.0", 0,
+         generic_pnp_mapalloc, isic_attach_isapnp_itkix1 },
+#endif
 };
 #define        NUM_DESCRIPTIONS        (sizeof(isic_isapnp_descriptions)/sizeof(isic_isapnp_descriptions[0]))
 
@@ -190,7 +196,6 @@
        return 0;
 }
 
-
 /*---------------------------------------------------------------------------*
  *     card independend attach for ISA P&P cards
  *---------------------------------------------------------------------------*/
@@ -369,7 +374,8 @@
 }
 
 #if defined(ISICPNP_ELSA_QS1ISA) || defined(ISICPNP_SEDLBAUER) \
-       || defined(ISICPNP_DYNALINK) || defined(ISICPNP_SIEMENS_ISURF2)
+       || defined(ISICPNP_DYNALINK) || defined(ISICPNP_SIEMENS_ISURF2) \
+       || defined(ISICPNP_ITKIX)
 static void
 generic_pnp_mapalloc(struct isapnp_attach_args *ipa, struct l1_softc *sc)
 {
diff -r d0440bb7f447 -r 0a67dc282ffd sys/dev/isapnp/isic_isapnp_itkix.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/dev/isapnp/isic_isapnp_itkix.c        Mon Jan 21 12:31:42 2002 +0000
@@ -0,0 +1,68 @@
+/*     $NetBSD: isic_isapnp_itkix.c,v 1.1 2002/01/21 12:31:44 martin Exp $     */
+
+/*
+ * Copyright (c) 2002 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 without 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/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: isic_isapnp_itkix.c,v 1.1 2002/01/21 12:31:44 martin Exp $");
+
+#include "opt_isicpnp.h"
+
+#ifdef ISICPNP_ITKIX
+
+#include <sys/param.h>
+#include <sys/ioccom.h>
+#include <sys/kernel.h>
+#include <sys/systm.h>
+#include <sys/mbuf.h>
+#include <sys/callout.h>
+#include <machine/bus.h>
+#include <sys/device.h>
+#include <sys/socket.h>
+
+#include <net/if.h>
+
+#include <netisdn/i4b_debug.h>
+#include <netisdn/i4b_ioctl.h>
+
+#include <dev/ic/isic_l1.h>
+
+/* XXX: this is a hack to share some more code - will be replaced with generic
+ *      io-mapped isic driver */
+#include "opt_isicisa.h"
+#ifndef ISICISA_ITKIX1
+#define ISICISA_ITKIX1
+#include <dev/isa/isic_isa_itk_ix1.c>
+#else
+extern int isic_attach_itkix1(struct l1_softc *sc);
+#endif
+
+void isic_attach_isapnp_itkix1(struct l1_softc *sc);
+
+void isic_attach_isapnp_itkix1(struct l1_softc *sc)
+{
+       isic_attach_itkix1(sc);
+}
+
+#endif
Prev by Date: [src/trunk]: src/share/man/man4/man4.hp300 Drop a trailing comma in SEE ALSO.
Next by Date: [src/trunk]: src/sys/dev/mii Regen; add another Marvell 88E1000 PHY model num...
Previous by Thread: [src/trunk]: src/share/man/man4/man4.hp300 Drop a trailing comma in SEE ALSO.
Next by Thread: [src/trunk]: src/sys/dev/mii Regen; add another Marvell 88E1000 PHY model num...
Indexes:
Home | Main Index | Thread Index | Old Index