[src/netbsd-1-6]: src/sys/dev/pcmcia pullup-1-6 ticket #829, bouyer@antioche....

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

details:   https://anonhg.NetBSD.org/src/rev/b90091bb7ed8
branches:  netbsd-1-6
changeset: 529086:b90091bb7ed8
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Wed Sep 18 19:37:19 2002 +0000

description:
pullup-1-6 ticket #829, bouyer%antioche.eu.org@localhost.

1.95 -> 1.96 syssrc/sys/dev/pcmcia/if_ne_pcmcia.c
1.176 -> 1.177 syssrc/sys/dev/pcmcia/pcmciadevs

Original log message:

Add ACCTON EN2216-PCMCIA-ETHERNET (there seems to be different variants of
the ACCTON EN2216) to pcmciadevs, and support this adapter by if_ne_pcmcia.
Tested by R?mi Zara <remi_zara%mac.com@localhost>.

diffstat:

 sys/dev/pcmcia/if_ne_pcmcia.c |  8 ++++++--
 sys/dev/pcmcia/pcmciadevs     |  3 ++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diffs (46 lines):

diff -r 7a5e85cb4b2a -r b90091bb7ed8 sys/dev/pcmcia/if_ne_pcmcia.c
--- a/sys/dev/pcmcia/if_ne_pcmcia.c     Wed Sep 18 19:32:06 2002 +0000
+++ b/sys/dev/pcmcia/if_ne_pcmcia.c     Wed Sep 18 19:37:19 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_ne_pcmcia.c,v 1.90.4.1 2002/06/11 01:45:56 lukem Exp $      */
+/*     $NetBSD: if_ne_pcmcia.c,v 1.90.4.2 2002/09/18 19:37:21 thorpej Exp $    */
 
 /*
  * Copyright (c) 1997 Marc Horowitz.  All rights reserved.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ne_pcmcia.c,v 1.90.4.1 2002/06/11 01:45:56 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ne_pcmcia.c,v 1.90.4.2 2002/09/18 19:37:21 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -161,6 +161,10 @@
       PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID,
       PCMCIA_CIS_ACCTON_EN2212,
       0, 0x0ff0, { 0x00, 0x00, 0xe8 } },
+    { PCMCIA_STR_ACCTON_EN2216,
+      PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID,
+      PCMCIA_CIS_ACCTON_EN2216,
+      0, -1, { 0x00, 0x00, 0xe8 } },
 
     { PCMCIA_STR_SVEC_COMBOCARD,
       PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID,
diff -r 7a5e85cb4b2a -r b90091bb7ed8 sys/dev/pcmcia/pcmciadevs
--- a/sys/dev/pcmcia/pcmciadevs Wed Sep 18 19:32:06 2002 +0000
+++ b/sys/dev/pcmcia/pcmciadevs Wed Sep 18 19:37:19 2002 +0000
@@ -1,4 +1,4 @@
-$NetBSD: pcmciadevs,v 1.167.4.4 2002/06/18 14:30:28 lukem Exp $
+$NetBSD: pcmciadevs,v 1.167.4.5 2002/09/18 19:37:19 thorpej Exp $
 /* $FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.20 2001/11/19 05:02:55 imp Exp $*/
 
 /*-
@@ -397,6 +397,7 @@
 vendor YEDATA                  -1      Y-E DATA
 
 product ACCTON EN2212          { "ACCTON", "EN2212", NULL, NULL } Accton EN2212
+product ACCTON EN2216          { "ACCTON", "EN2216-PCMCIA-ETHERNET", "EN2216R01", NULL } Accton EN2216
 product AMBICOM AMB8002T       { "AmbiCom&spInc", "AMB8002T", NULL, NULL } AmbiCom AMB8002T
 product AMD AM79C930           { "AMD", "Am79C930", NULL, NULL } AMD Am79C930
 product BILLIONTON LNT10TN     { "PCMCIA", "LNT-10TN", NULL, NULL } Billionton Systems Inc. LNT-10TN NE2000 Compatible Card