Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/dev/pcmcia Update to using new INTERSIL names, plus a co...
details: https://anonhg.NetBSD.org/src/rev/3f0ec09f7b5c
branches: trunk
changeset: 573197:3f0ec09f7b5c
user: imp <imp%NetBSD.org@localhost>
date: Fri Jan 21 20:27:03 2005 +0000
description:
Update to using new INTERSIL names, plus a couple generic entries from FreeBSD
diffstat:
sys/dev/pcmcia/if_wi_pcmcia.c | 20 +++++++++++++-------
sys/dev/pcmcia/pcmciadevs.h | 23 +++++++++++++++--------
sys/dev/pcmcia/pcmciadevs_data.h | 40 +++++++++++++++++++++++++++-------------
3 files changed, 55 insertions(+), 28 deletions(-)
diffs (206 lines):
diff -r fed3ad35dd06 -r 3f0ec09f7b5c sys/dev/pcmcia/if_wi_pcmcia.c
--- a/sys/dev/pcmcia/if_wi_pcmcia.c Fri Jan 21 20:26:09 2005 +0000
+++ b/sys/dev/pcmcia/if_wi_pcmcia.c Fri Jan 21 20:27:03 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wi_pcmcia.c,v 1.58 2004/08/10 22:49:12 mycroft Exp $ */
+/* $NetBSD: if_wi_pcmcia.c,v 1.59 2005/01/21 20:27:03 imp Exp $ */
/*-
* Copyright (c) 2001, 2004 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wi_pcmcia.c,v 1.58 2004/08/10 22:49:12 mycroft Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wi_pcmcia.c,v 1.59 2005/01/21 20:27:03 imp Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -142,10 +142,10 @@
{ PCMCIA_VENDOR_INTEL, PCMCIA_PRODUCT_INTEL_PRO_WLAN_2011,
PCMCIA_CIS_INTEL_PRO_WLAN_2011 },
- { PCMCIA_VENDOR_INTERSIL, PCMCIA_PRODUCT_INTERSIL_PRISM2,
- PCMCIA_CIS_INTERSIL_PRISM2 },
+ { PCMCIA_VENDOR_INTERSIL2, PCMCIA_PRODUCT_INTERSIL2_PRISM2,
+ PCMCIA_CIS_INTERSIL2_PRISM2 },
- { PCMCIA_VENDOR_INTERSIL, PCMCIA_PRODUCT_GEMTEK_WLAN,
+ { PCMCIA_VENDOR_INTERSIL2, PCMCIA_PRODUCT_GEMTEK_WLAN,
PCMCIA_CIS_GEMTEK_WLAN },
{ PCMCIA_VENDOR_SAMSUNG, PCMCIA_PRODUCT_SAMSUNG_SWL_2000N,
@@ -184,8 +184,14 @@
{ PCMCIA_VENDOR_EMTAC, PCMCIA_PRODUCT_EMTAC_WLAN,
PCMCIA_CIS_EMTAC_WLAN },
- { PCMCIA_VENDOR_NETGEAR_2, PCMCIA_PRODUCT_NETGEAR_2_MA401,
- PCMCIA_CIS_NETGEAR_2_MA401 },
+ { PCMCIA_VENDOR_INTERSIL, PCMCIA_PRODUCT_INTERSIL_ISL37100P,
+ PCMCIA_CIS_INTERSIL_ISL37100P },
+
+ { PCMCIA_VENDOR_INTERSIL, PCMCIA_PRODUCT_INTERSIL_ISL37110P,
+ PCMCIA_CIS_INTERSIL_ISL37110P },
+
+ { PCMCIA_VENDOR_INTERSIL, PCMCIA_PRODUCT_INTERSIL_ISL37300P,
+ PCMCIA_CIS_INTERSIL_ISL37300P },
{ PCMCIA_VENDOR_SIMPLETECH, PCMCIA_PRODUCT_SIMPLETECH_SPECTRUM24,
PCMCIA_CIS_SIMPLETECH_SPECTRUM24 },
diff -r fed3ad35dd06 -r 3f0ec09f7b5c sys/dev/pcmcia/pcmciadevs.h
--- a/sys/dev/pcmcia/pcmciadevs.h Fri Jan 21 20:26:09 2005 +0000
+++ b/sys/dev/pcmcia/pcmciadevs.h Fri Jan 21 20:27:03 2005 +0000
@@ -1,10 +1,10 @@
-/* $NetBSD: pcmciadevs.h,v 1.208 2004/08/10 18:45:36 mycroft Exp $ */
+/* $NetBSD: pcmciadevs.h,v 1.209 2005/01/21 20:27:03 imp Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: pcmciadevs,v 1.207 2004/08/10 18:45:25 mycroft Exp
+ * NetBSD: pcmciadevs,v 1.208 2005/01/21 20:26:09 imp Exp
*/
/* $FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.20 2001/11/19 05:02:55 imp Exp $*/
@@ -49,7 +49,7 @@
*/
#define PCMCIA_VENDOR_FUJITSU 0x0004 /* Fujitsu Corporation */
-#define PCMCIA_VENDOR_NETGEAR_2 0x000b /* Netgear */
+#define PCMCIA_VENDOR_INTERSIL 0x000b /* Netgear */
#define PCMCIA_VENDOR_PANASONIC 0x0032 /* Matsushita Electric Industrial Co. */
#define PCMCIA_VENDOR_SANDISK 0x0045 /* Sandisk Corporation */
#define PCMCIA_VENDOR_NEWMEDIA 0x0057 /* New Media Corporation */
@@ -316,6 +316,15 @@
#define PCMCIA_CIS_INTEL_EEPRO100 { NULL, NULL, NULL, NULL }
#define PCMCIA_PRODUCT_INTEL_EEPRO100 0x010a
+/* Intersil */
+/* OEMs sell these things under different marketing names */
+#define PCMCIA_CIS_INTERSIL_ISL37100P { NULL, NULL, NULL, NULL }
+#define PCMCIA_PRODUCT_INTERSIL_ISL37100P 0x7100
+#define PCMCIA_CIS_INTERSIL_ISL37110P { NULL, NULL, NULL, NULL }
+#define PCMCIA_PRODUCT_INTERSIL_ISL37110P 0x7110
+#define PCMCIA_CIS_INTERSIL_ISL37300P { NULL, NULL, NULL, NULL }
+#define PCMCIA_PRODUCT_INTERSIL_ISL37300P 0x7300
+
/* I-O DATA */
#define PCMCIA_CIS_IODATA_PCLATE { NULL, NULL, NULL, NULL }
#define PCMCIA_PRODUCT_IODATA_PCLATE 0x2216
@@ -413,8 +422,6 @@
#define PCMCIA_PRODUCT_NETGEAR_FA410TXC 0x4530
#define PCMCIA_CIS_NETGEAR_FA411 { NULL, NULL, NULL, NULL }
#define PCMCIA_PRODUCT_NETGEAR_FA411 0x0411
-#define PCMCIA_CIS_NETGEAR_2_MA401 { NULL, NULL, NULL, NULL }
-#define PCMCIA_PRODUCT_NETGEAR_2_MA401 0x7300
/* National Instruments */
#define PCMCIA_CIS_NI_PCMCIA_GPIB { NULL, NULL, NULL, NULL }
@@ -577,7 +584,7 @@
#define PCMCIA_VENDOR_GEMTEK -1 /* Gem Tek */
#define PCMCIA_VENDOR_GENIUS -1 /* Genius */
#define PCMCIA_VENDOR_ICOM -1 /* ICOM Inc */
-#define PCMCIA_VENDOR_INTERSIL -1 /* Intersil */
+#define PCMCIA_VENDOR_INTERSIL2 -1 /* Intersil */
#define PCMCIA_VENDOR_LANTECH -1 /* Lantech Computer Company */
#define PCMCIA_VENDOR_NAKAGAWAMETAL -1 /* NAKAGAWA METAL */
#define PCMCIA_VENDOR_NDC -1 /* NDC */
@@ -673,8 +680,8 @@
#define PCMCIA_PRODUCT_GENIUS_ME3000II -1
#define PCMCIA_CIS_ICOM_SL200 { "Icom", "SL-200", NULL, NULL }
#define PCMCIA_PRODUCT_ICOM_SL200 -1
-#define PCMCIA_CIS_INTERSIL_PRISM2 { "INTERSIL", "HFA384x/IEEE", NULL, NULL }
-#define PCMCIA_PRODUCT_INTERSIL_PRISM2 -1
+#define PCMCIA_CIS_INTERSIL2_PRISM2 { "INTERSIL", "HFA384x/IEEE", NULL, NULL }
+#define PCMCIA_PRODUCT_INTERSIL2_PRISM2 -1
#define PCMCIA_CIS_IODATA_CBIDE2 { "IO DATA", "CBIDE2 ", NULL, NULL }
#define PCMCIA_PRODUCT_IODATA_CBIDE2 -1
#define PCMCIA_CIS_IODATA_PCLAT { "I-O DATA", "PCLA", "ETHERNET", NULL }
diff -r fed3ad35dd06 -r 3f0ec09f7b5c sys/dev/pcmcia/pcmciadevs_data.h
--- a/sys/dev/pcmcia/pcmciadevs_data.h Fri Jan 21 20:26:09 2005 +0000
+++ b/sys/dev/pcmcia/pcmciadevs_data.h Fri Jan 21 20:27:03 2005 +0000
@@ -1,10 +1,10 @@
-/* $NetBSD: pcmciadevs_data.h,v 1.208 2004/08/10 18:45:36 mycroft Exp $ */
+/* $NetBSD: pcmciadevs_data.h,v 1.209 2005/01/21 20:27:03 imp Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: pcmciadevs,v 1.207 2004/08/10 18:45:25 mycroft Exp
+ * NetBSD: pcmciadevs,v 1.208 2005/01/21 20:26:09 imp Exp
*/
/* $FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.20 2001/11/19 05:02:55 imp Exp $*/
@@ -540,6 +540,27 @@
"Intel EtherExpress PRO/100", }
,
{
+ PCMCIA_VENDOR_INTERSIL, PCMCIA_PRODUCT_INTERSIL_ISL37100P,
+ PCMCIA_CIS_INTERSIL_ISL37100P,
+ 0,
+ "Netgear",
+ "Intersil ISL37100P", }
+ ,
+ {
+ PCMCIA_VENDOR_INTERSIL, PCMCIA_PRODUCT_INTERSIL_ISL37110P,
+ PCMCIA_CIS_INTERSIL_ISL37110P,
+ 0,
+ "Netgear",
+ "Intersil ISL37110P", }
+ ,
+ {
+ PCMCIA_VENDOR_INTERSIL, PCMCIA_PRODUCT_INTERSIL_ISL37300P,
+ PCMCIA_CIS_INTERSIL_ISL37300P,
+ 0,
+ "Netgear",
+ "Intersil ISL37300P", }
+ ,
+ {
PCMCIA_VENDOR_IODATA, PCMCIA_PRODUCT_IODATA_PCLATE,
PCMCIA_CIS_IODATA_PCLATE,
0,
@@ -799,13 +820,6 @@
"Netgear FA411", }
,
{
- PCMCIA_VENDOR_NETGEAR_2, PCMCIA_PRODUCT_NETGEAR_2_MA401,
- PCMCIA_CIS_NETGEAR_2_MA401,
- 0,
- "Netgear",
- "Netgear MA401", }
- ,
- {
PCMCIA_VENDOR_NI, PCMCIA_PRODUCT_NI_PCMCIA_GPIB,
PCMCIA_CIS_NI_PCMCIA_GPIB,
0,
@@ -1422,8 +1436,8 @@
"Icom SL-200", }
,
{
- PCMCIA_VENDOR_UNKNOWN, PCMCIA_PRODUCT_INTERSIL_PRISM2,
- PCMCIA_CIS_INTERSIL_PRISM2,
+ PCMCIA_VENDOR_UNKNOWN, PCMCIA_PRODUCT_INTERSIL2_PRISM2,
+ PCMCIA_CIS_INTERSIL2_PRISM2,
0,
"Intersil",
"Intersil Prism II", }
@@ -1668,7 +1682,7 @@
NULL,
},
{
- PCMCIA_VENDOR_NETGEAR_2,
+ PCMCIA_VENDOR_INTERSIL,
PCMCIA_KNOWNDEV_NOPROD,
PCMCIA_CIS_INVALID,
0,
@@ -2340,7 +2354,7 @@
NULL,
},
{
- PCMCIA_VENDOR_INTERSIL,
+ PCMCIA_VENDOR_INTERSIL2,
PCMCIA_KNOWNDEV_NOPROD,
PCMCIA_CIS_INVALID,
0,
Home |
Main Index |
Thread Index |
Old Index