Module Name: src
Committed By: riz
Date: Wed Nov 14 20:18:57 UTC 2012
Modified Files:
src/sys/dev/pcmcia [netbsd-4]: if_ne_pcmcia.c pcmciadevs
Log Message:
Pull up following revision(s) (requested by jnemeth in ticket #1467):
sys/dev/pcmcia/pcmciadevs: revision 1.225
sys/dev/pcmcia/if_ne_pcmcia.c: revision 1.155
add Corega LAPCCTXD FastEthernet
added Corega LAPCCTXT FastEthernet
To generate a diff of this commit:
cvs rdiff -u -r1.149 -r1.149.2.1 src/sys/dev/pcmcia/if_ne_pcmcia.c
cvs rdiff -u -r1.220 -r1.220.2.1 src/sys/dev/pcmcia/pcmciadevs
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pcmcia/if_ne_pcmcia.c
diff -u src/sys/dev/pcmcia/if_ne_pcmcia.c:1.149 src/sys/dev/pcmcia/if_ne_pcmcia.c:1.149.2.1
--- src/sys/dev/pcmcia/if_ne_pcmcia.c:1.149 Thu Nov 16 01:33:20 2006
+++ src/sys/dev/pcmcia/if_ne_pcmcia.c Wed Nov 14 20:18:56 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ne_pcmcia.c,v 1.149 2006/11/16 01:33:20 christos Exp $ */
+/* $NetBSD: if_ne_pcmcia.c,v 1.149.2.1 2012/11/14 20:18:56 riz 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.149 2006/11/16 01:33:20 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ne_pcmcia.c,v 1.149.2.1 2012/11/14 20:18:56 riz Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -336,6 +336,10 @@ static const struct ne2000dev {
PCMCIA_CIS_COREGA_FETHER_II_PCC_TXD,
0, -1, { 0x00, 0x90, 0x99 }, NE2000DVF_AX88190 },
+ { PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID,
+ PCMCIA_CIS_COREGA_LAPCCTXD,
+ 0, -1, { 0x00, 0x90, 0x99 }, 0 },
+
{ PCMCIA_VENDOR_COMPEX, PCMCIA_PRODUCT_COMPEX_LINKPORT_ENET_B,
PCMCIA_CIS_INVALID,
0, 0x01c0, { 0xff, 0xff, 0xff }, 0 },
Index: src/sys/dev/pcmcia/pcmciadevs
diff -u src/sys/dev/pcmcia/pcmciadevs:1.220 src/sys/dev/pcmcia/pcmciadevs:1.220.2.1
--- src/sys/dev/pcmcia/pcmciadevs:1.220 Thu Nov 16 00:52:48 2006
+++ src/sys/dev/pcmcia/pcmciadevs Wed Nov 14 20:18:56 2012
@@ -1,4 +1,4 @@
-$NetBSD: pcmciadevs,v 1.220 2006/11/16 00:52:48 christos Exp $
+$NetBSD: pcmciadevs,v 1.220.2.1 2012/11/14 20:18:56 riz Exp $
/* $FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.20 2001/11/19 05:02:55 imp Exp $*/
/*-
@@ -473,6 +473,7 @@ product COREGA FAST_ETHER_PCC_TX { "core
product COREGA FETHER_PCC_TXD { "corega&spK.K.", "corega&spFEther&spPCC-TXD", NULL, NULL } Corega FEther PCC-TXD
product COREGA FETHER_PCC_TXF { "corega", "FEther&spPCC-TXF", NULL, NULL } Corega FEther PCC-TXF
product COREGA FETHER_II_PCC_TXD { "corega&spK.K.", "corega&spFEtherII&spPCC-TXD", NULL, NULL } Corega FEtherII PCC-TXD
+product COREGA LAPCCTXD { "corega&spK.K.", "(CG-LAPCCTXD)", "(HardwareFirmwareVer.)", NULL } Corega LAPCCTXD
product COREGA WIRELESS_LAN_PCC_11 { "corega&spK.K.", "Wireless&spLAN&spPCC-11", NULL, NULL } Corega Wireless LAN PCC-11
product COREGA WIRELESS_LAN_PCCA_11 { "corega&spK.K.", "Wireless&spLAN&spPCCA-11", NULL, NULL } Corega Wireless LAN PCCA-11
product COREGA WIRELESS_LAN_PCCB_11 { "corega_K.K.", "Wireless_LAN_PCCB-11", NULL, NULL } Corega Wireless LAN PCCB-11
