[src/netbsd-1-4]: src/sys/dev/pcmcia Pull up revisions 1.4-1.5 (requested by ...

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/73cdfcfefca4
branches:  netbsd-1-4
changeset: 470325:73cdfcfefca4
user:      he <he%NetBSD.org@localhost>
date:      Tue Feb 08 22:22:54 2000 +0000

description:
Pull up revisions 1.4-1.5 (requested by enami):
  Add support for 3Com/Megaherz 10/100 Ethernet Modem combined
  card (3CCFEM556BI and 3CXEM556B-INT).  Should fix PR#8331 and
  PR#8188.

diffstat:

 sys/dev/pcmcia/pcmcia_cis_quirks.c |  54 +++++++++++++++++++++++++++++++++++++-
 1 files changed, 53 insertions(+), 1 deletions(-)

diffs (75 lines):

diff -r d08dd7be173e -r 73cdfcfefca4 sys/dev/pcmcia/pcmcia_cis_quirks.c
--- a/sys/dev/pcmcia/pcmcia_cis_quirks.c        Tue Feb 08 22:22:23 2000 +0000
+++ b/sys/dev/pcmcia/pcmcia_cis_quirks.c        Tue Feb 08 22:22:54 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pcmcia_cis_quirks.c,v 1.3 1998/12/29 09:00:28 marc Exp $       */
+/*     $NetBSD: pcmcia_cis_quirks.c,v 1.3.2.1 2000/02/08 22:22:54 he Exp $     */
 
 #define        PCMCIADEBUG
 
@@ -90,6 +90,48 @@
        0,                      /* maxtwins */
 };
 
+static struct pcmcia_function pcmcia_3ccfem556bi_func0 = {
+       0,                      /* function number */
+       PCMCIA_FUNCTION_NETWORK,
+       0x07,                   /* last cfe number */
+       0x1000,                 /* ccr_base */
+       0x267,                  /* ccr_mask */
+};
+
+static struct pcmcia_config_entry pcmcia_3ccfem556bi_func0_cfe0 = {
+       0x07,                   /* cfe number */
+       PCMCIA_CFE_IO8 | PCMCIA_CFE_IO16 | PCMCIA_CFE_IRQLEVEL,
+       PCMCIA_IFTYPE_IO,
+       1,                      /* num_iospace */
+       5,                      /* iomask */
+       { { 0x0020, 0 } },      /* iospace */
+       0xffff,                 /* irqmask */
+       0,                      /* num_memspace */
+       { },                    /* memspace */
+       0,                      /* maxtwins */
+};
+
+static struct pcmcia_function pcmcia_3ccfem556bi_func1 = {
+       1,                      /* function number */
+       PCMCIA_FUNCTION_SERIAL,
+       0x27,                   /* last cfe number */
+       0x1100,                 /* ccr_base */
+       0x277,                  /* ccr_mask */
+};
+
+static struct pcmcia_config_entry pcmcia_3ccfem556bi_func1_cfe0 = {
+       0x27,                   /* cfe number */
+       PCMCIA_CFE_IO8 | PCMCIA_CFE_IRQLEVEL,
+       PCMCIA_IFTYPE_IO,
+       1,                      /* num_iospace */
+       3,                      /* iomask */
+       { { 0x0008, 0 } },      /* iospace */
+       0xffff,                 /* irqmask */
+       0,                      /* num_memspace */
+       { },                    /* memspace */
+       0,                      /* maxtwins */
+};
+
 static struct pcmcia_function pcmcia_sveclancard_func0 = {
        0,                      /* function number */
        PCMCIA_FUNCTION_NETWORK,
@@ -117,6 +159,16 @@
          &pcmcia_3cxem556_func0, &pcmcia_3cxem556_func0_cfe0 },
        { PCMCIA_VENDOR_3COM, PCMCIA_PRODUCT_3COM_3CXEM556, PCMCIA_CIS_INVALID,
          &pcmcia_3cxem556_func1, &pcmcia_3cxem556_func1_cfe0 },
+       { PCMCIA_VENDOR_3COM, PCMCIA_PRODUCT_3COM_3CXEM556INT, PCMCIA_CIS_INVALID, 
+         &pcmcia_3cxem556_func0, &pcmcia_3cxem556_func0_cfe0 },
+       { PCMCIA_VENDOR_3COM, PCMCIA_PRODUCT_3COM_3CXEM556INT, PCMCIA_CIS_INVALID,
+         &pcmcia_3cxem556_func1, &pcmcia_3cxem556_func1_cfe0 },
+       { PCMCIA_VENDOR_3COM, PCMCIA_PRODUCT_3COM_3CCFEM556BI,
+         PCMCIA_CIS_INVALID,
+         &pcmcia_3ccfem556bi_func0, &pcmcia_3ccfem556bi_func0_cfe0 },
+       { PCMCIA_VENDOR_3COM, PCMCIA_PRODUCT_3COM_3CCFEM556BI,
+         PCMCIA_CIS_INVALID,
+         &pcmcia_3ccfem556bi_func1, &pcmcia_3ccfem556bi_func1_cfe0 },
        { PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID, PCMCIA_CIS_SVEC_LANCARD,
          &pcmcia_sveclancard_func0, &pcmcia_sveclancard_func0_cfe0 },
 };