diff options
50 files changed, 66 insertions, 1231 deletions
diff --git a/sys/conf/files b/sys/conf/files index f3dd06d..4366b63 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -40,6 +40,16 @@ miidevs.h standard \ compile-with "${AWK} -f $S/tools/miidevs2h.awk $S/dev/mii/miidevs" \ no-obj no-implicit-rule \ clean "miidevs.h" +pccarddevs.h standard \ + dependency "$S/tools/pccarddevs2h.awk $S/dev/pccard/pccarddevs" \ + compile-with "${AWK} -f $S/tools/pccarddevs2h.awk $S/dev/pccard/pccarddevs" \ + no-obj no-implicit-rule \ + clean "pccarddevs.h" +usbdevs.h standard \ + dependency "$S/tools/usbdevs2h.awk $S/dev/usb/usbdevs" \ + compile-with "${AWK} -f $S/tools/usbdevs2h.awk $S/dev/usb/usbdevs" \ + no-obj no-implicit-rule \ + clean "usbdevs.h" kern/device_if.m standard kern/bus_if.m standard kern/clock_if.m optional genclock diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk index 1936d811..fd58f13 100644 --- a/sys/conf/kmod.mk +++ b/sys/conf/kmod.mk @@ -326,16 +326,18 @@ vnode_if.${_ext}: @/tools/vnode_if.awk @/kern/vnode_if.src .endif .endfor -.if ${SRCS:Mmiidevs.h} != "" -CLEANFILES+= miidevs.h +.for _i in mii pccard usb +.if ${SRCS:M${_i}devs.h} != "" +CLEANFILES+= ${_i}devs.h .if !exists(@) -miidevs.h: @ +${_i}devs.h: @ .endif .if exists(@) -miidevs.h: @/tools/miidevs2h.awk @/dev/mii/miidevs +${_i}devs.h: @/tools/${_i}devs2h.awk @/dev/${_i}/${_i}devs .endif - ${AWK} -f @/tools/miidevs2h.awk @/dev/mii/miidevs + ${AWK} -f @/tools/${_i}devs2h.awk @/dev/${_i}/${_i}devs .endif +.endfor # _i regress: diff --git a/sys/dev/aic/aic_pccard.c b/sys/dev/aic/aic_pccard.c index bebee3f..54d937e 100644 --- a/sys/dev/aic/aic_pccard.c +++ b/sys/dev/aic/aic_pccard.c @@ -39,7 +39,7 @@ __FBSDID("$FreeBSD$"); #include <dev/aic/aicvar.h> #include <dev/pccard/pccardvar.h> -#include <dev/pccard/pccarddevs.h> +#include "pccarddevs.h" #include "card_if.h" diff --git a/sys/dev/an/if_an_pccard.c b/sys/dev/an/if_an_pccard.c index c9587c9..ad9c6f4 100644 --- a/sys/dev/an/if_an_pccard.c +++ b/sys/dev/an/if_an_pccard.c @@ -67,7 +67,7 @@ __FBSDID("$FreeBSD$"); #include <net/if_media.h> #include <dev/pccard/pccardvar.h> -#include <dev/pccard/pccarddevs.h> +#include "pccarddevs.h" #include "card_if.h" #include <dev/an/if_aironet_ieee.h> diff --git a/sys/dev/ata/ata-card.c b/sys/dev/ata/ata-card.c index a47dc9b..315b844 100644 --- a/sys/dev/ata/ata-card.c +++ b/sys/dev/ata/ata-card.c @@ -45,7 +45,7 @@ __FBSDID("$FreeBSD$"); #include <sys/rman.h> #include <dev/ata/ata-all.h> #include <dev/pccard/pccard_cis.h> -#include <dev/pccard/pccarddevs.h> +#include "pccarddevs.h" #include <dev/pccard/pccardreg.h> #include <dev/pccard/pccardvar.h> diff --git a/sys/dev/awi/if_awi_pccard.c b/sys/dev/awi/if_awi_pccard.c index e860a5c..770e3b4 100644 --- a/sys/dev/awi/if_awi_pccard.c +++ b/sys/dev/awi/if_awi_pccard.c @@ -51,7 +51,7 @@ __FBSDID("$FreeBSD$"); #include <dev/awi/awivar.h> #include <dev/pccard/pccardvar.h> -#include <dev/pccard/pccarddevs.h> +#include "pccarddevs.h" #include "card_if.h" struct awi_pccard_softc { diff --git a/sys/dev/cs/if_cs_pccard.c b/sys/dev/cs/if_cs_pccard.c index 7a8c1ee..69750e0 100644 --- a/sys/dev/cs/if_cs_pccard.c +++ b/sys/dev/cs/if_cs_pccard.c @@ -45,7 +45,7 @@ __FBSDID("$FreeBSD$"); #include <dev/cs/if_csvar.h> #include <dev/cs/if_csreg.h> #include <dev/pccard/pccardvar.h> -#include <dev/pccard/pccarddevs.h> +#include "pccarddevs.h" #include "card_if.h" diff --git a/sys/dev/ed/if_ed_pccard.c b/sys/dev/ed/if_ed_pccard.c index 927ac62..79e1d97 100644 --- a/sys/dev/ed/if_ed_pccard.c +++ b/sys/dev/ed/if_ed_pccard.c @@ -51,7 +51,7 @@ #include <dev/ed/if_edreg.h> #include <dev/ed/if_edvar.h> #include <dev/pccard/pccardvar.h> -#include <dev/pccard/pccarddevs.h> +#include "pccarddevs.h" #ifndef ED_NO_MIIBUS #include <dev/mii/mii.h> #include <dev/mii/miivar.h> diff --git a/sys/dev/ep/if_ep_pccard.c b/sys/dev/ep/if_ep_pccard.c index 69b761c..2122548 100644 --- a/sys/dev/ep/if_ep_pccard.c +++ b/sys/dev/ep/if_ep_pccard.c @@ -56,7 +56,7 @@ __FBSDID("$FreeBSD$"); #include <dev/ep/if_epvar.h> #include <dev/pccard/pccardvar.h> -#include <dev/pccard/pccarddevs.h> +#include "pccarddevs.h" #include "card_if.h" diff --git a/sys/dev/ex/if_ex_pccard.c b/sys/dev/ex/if_ex_pccard.c index 62f034e..241a97f 100644 --- a/sys/dev/ex/if_ex_pccard.c +++ b/sys/dev/ex/if_ex_pccard.c @@ -49,7 +49,7 @@ __FBSDID("$FreeBSD$"); #include <dev/ex/if_exvar.h> #include <dev/pccard/pccardvar.h> -#include <dev/pccard/pccarddevs.h> +#include "pccarddevs.h" static const struct pccard_product ex_pccard_products[] = { PCMCIA_CARD(OLICOM, OC2220, 0), diff --git a/sys/dev/fe/if_fe_pccard.c b/sys/dev/fe/if_fe_pccard.c index ce3415e..ce5f580 100644 --- a/sys/dev/fe/if_fe_pccard.c +++ b/sys/dev/fe/if_fe_pccard.c @@ -47,7 +47,7 @@ __FBSDID("$FreeBSD$"); #include <dev/fe/if_fevar.h> #include <dev/pccard/pccardvar.h> -#include <dev/pccard/pccarddevs.h> +#include "pccarddevs.h" #include "card_if.h" #include <pccard/cardinfo.h> diff --git a/sys/dev/joy/joy_pccard.c b/sys/dev/joy/joy_pccard.c index 4a6a10a..40151f5 100644 --- a/sys/dev/joy/joy_pccard.c +++ b/sys/dev/joy/joy_pccard.c @@ -42,7 +42,7 @@ __FBSDID("$FreeBSD$"); #include <dev/pccard/pccardreg.h> #include <dev/pccard/pccardvar.h> -#include <dev/pccard/pccarddevs.h> +#include "pccarddevs.h" static int joy_pccard_match(device_t dev) diff --git a/sys/dev/ncv/ncr53c500_pccard.c b/sys/dev/ncv/ncr53c500_pccard.c index d3724ef..627f1aa 100644 --- a/sys/dev/ncv/ncr53c500_pccard.c +++ b/sys/dev/ncv/ncr53c500_pccard.c @@ -50,7 +50,7 @@ __FBSDID("$FreeBSD$"); #include <sys/device_port.h> -#include <dev/pccard/pccarddevs.h> +#include "pccarddevs.h" #include <dev/pccard/pccardvar.h> #include <cam/scsi/scsi_low.h> diff --git a/sys/dev/nsp/nsp_pccard.c b/sys/dev/nsp/nsp_pccard.c index 31f6fac..38af6f4 100644 --- a/sys/dev/nsp/nsp_pccard.c +++ b/sys/dev/nsp/nsp_pccard.c @@ -49,7 +49,7 @@ __FBSDID("$FreeBSD$"); #include <sys/device_port.h> -#include <dev/pccard/pccarddevs.h> +#include "pccarddevs.h" #include <dev/pccard/pccardvar.h> #include <cam/scsi/scsi_low.h> diff --git a/sys/dev/owi/if_owi_pccard.c b/sys/dev/owi/if_owi_pccard.c index 549aff5..1720820 100644 --- a/sys/dev/owi/if_owi_pccard.c +++ b/sys/dev/owi/if_owi_pccard.c @@ -60,7 +60,7 @@ #include <dev/owi/if_ieee80211.h> #include <dev/pccard/pccardvar.h> -#include <dev/pccard/pccarddevs.h> +#include "pccarddevs.h" #include <dev/wi/if_wavelan_ieee.h> #include <dev/owi/if_wivar.h> diff --git a/sys/dev/pccard/pccard_cis_quirks.c b/sys/dev/pccard/pccard_cis_quirks.c index c491cb2..a16f863 100644 --- a/sys/dev/pccard/pccard_cis_quirks.c +++ b/sys/dev/pccard/pccard_cis_quirks.c @@ -47,7 +47,7 @@ __FBSDID("$FreeBSD$"); #include <sys/rman.h> #include <machine/resource.h> -#include <dev/pccard/pccarddevs.h> +#include "pccarddevs.h" #include <dev/pccard/pccardreg.h> #include <dev/pccard/pccardvar.h> #include <dev/pccard/pccard_cis.h> diff --git a/sys/dev/pccard/pccarddevs.h b/sys/dev/pccard/pccarddevs.h deleted file mode 100644 index 6203d13..0000000 --- a/sys/dev/pccard/pccarddevs.h +++ /dev/null @@ -1,1180 +0,0 @@ -/* $FreeBSD$ */ - -/* - * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. - * - * generated from: - * FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.85 2004/05/13 01:24:26 imp Exp - */ -/* $NetBSD: pcmciadevs,v 1.186 2003/09/16 08:26:37 onoe Exp $ */ -/* $OpenBSD: pcmciadevs,v 1.93 2002/06/21 08:31:10 henning Exp $ */ - -/*- - * Copyright (c) 1998 The NetBSD Foundation, Inc. - * All rights reserved. - * - * This code is derived from software contributed to The NetBSD Foundation - * by Christos Zoulas. - * - * 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. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS - * ``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 FOUNDATION OR CONTRIBUTORS - * 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. - */ - -/* - * List of known PCMCIA vendors, sorted by numeric ID. - */ - -#define PCMCIA_VENDOR_FUJITSU 0x0004 /* Fujitsu Corporation */ -#define PCMCIA_VENDOR_INTERSIL 0x000b /* Intersil */ -#define PCMCIA_VENDOR_PANASONIC 0x0032 /* Matsushita Electric Industrial Co. */ -#define PCMCIA_VENDOR_SANDISK 0x0045 /* Sandisk Corporation */ -#define PCMCIA_VENDOR_NEWMEDIA 0x0057 /* New Media Corporation */ -#define PCMCIA_VENDOR_INTEL 0x0089 /* Intel */ -#define PCMCIA_VENDOR_IBM 0x00a4 /* IBM Corporation */ -#define PCMCIA_VENDOR_SHARP 0x00b0 /* Sharp Corporation */ -#define PCMCIA_VENDOR_3COM 0x0101 /* 3Com Corporation */ -#define PCMCIA_VENDOR_MEGAHERTZ 0x0102 /* Megahertz Corporation */ -#define PCMCIA_VENDOR_SOCKET 0x0104 /* Socket Communications */ -#define PCMCIA_VENDOR_TDK 0x0105 /* TDK Corporation */ -#define PCMCIA_VENDOR_XIRCOM 0x0105 /* Xircom */ -#define PCMCIA_VENDOR_SMC 0x0108 /* Standard Microsystems Corporation */ -#define PCMCIA_VENDOR_MOTOROLA 0x0109 /* Motorola Corporation */ -#define PCMCIA_VENDOR_NI 0x010b /* National Instruments */ -#define PCMCIA_VENDOR_QLOGIC 0x0114 /* QLogic */ -#define PCMCIA_VENDOR_USROBOTICS 0x0115 /* US Robotics Corporation */ -#define PCMCIA_VENDOR_OLICOM 0x0121 /* Olicom */ -#define PCMCIA_VENDOR_PROXIM 0x0126 /* Proxim */ -#define PCMCIA_VENDOR_DSPSI 0x0128 /* DSP Solutions, Inc */ -#define PCMCIA_VENDOR_ADAPTEC 0x012f /* Adaptec Corporation */ -#define PCMCIA_VENDOR_QUATECH 0x0137 /* Quatech */ -#define PCMCIA_VENDOR_COMPAQ 0x0138 /* Compaq */ -#define PCMCIA_VENDOR_OSITECH 0x0140 /* Ositech */ -#define PCMCIA_VENDOR_DLINK_2 0x0143 /* D-Link */ -#define PCMCIA_VENDOR_DLINK_3 0x0149 /* D-Link */ -#define PCMCIA_VENDOR_LINKSYS 0x0149 /* Linksys Corporation */ -#define PCMCIA_VENDOR_NETGEAR 0x0149 /* Netgear */ -#define PCMCIA_VENDOR_SIMPLETECH 0x014d /* Simple Technology */ -#define PCMCIA_VENDOR_SYMBOL2 0x014d /* Symbol */ -#define PCMCIA_VENDOR_LUCENT 0x0156 /* Lucent Technologies */ -#define PCMCIA_VENDOR_GEMPLUS 0x0157 /* Gemplus */ -#define PCMCIA_VENDOR_AIRONET 0x015f /* Aironet Wireless Communications */ -#define PCMCIA_VENDOR_ERICSSON 0x016b /* Ericsson */ -#define PCMCIA_VENDOR_PSION 0x016c /* Psion */ -#define PCMCIA_VENDOR_COMPAQ2 0x0183 /* Compaq */ -#define PCMCIA_VENDOR_PARALON 0x0183 /* Paralon Technologies Inc */ -#define PCMCIA_VENDOR_KINGSTON 0x0186 /* Kingston */ -#define PCMCIA_VENDOR_MELCO 0x018a /* Melco Corporation */ -#define PCMCIA_VENDOR_DAYNA 0x0194 /* Dayna Corporation */ -#define PCMCIA_VENDOR_RAYTHEON 0x01a6 /* Raytheon */ -#define PCMCIA_VENDOR_IODATA 0x01bf /* I-O DATA */ -#define PCMCIA_VENDOR_BAY 0x01eb /* Bay Networks */ -#define PCMCIA_VENDOR_FARALLON 0x0200 /* Farallon Communications */ -#define PCMCIA_VENDOR_TELECOMDEVICE 0x021b /* Telecom Device */ -#define PCMCIA_VENDOR_NOKIA 0x023d /* Nokia Communications */ -#define PCMCIA_VENDOR_SAMSUNG 0x0250 /* Samsung */ -#define PCMCIA_VENDOR_HWN 0x0261 /* Home Wireless Networks */ -#define PCMCIA_VENDOR_ARTEM 0x0268 /* ARtem */ -#define PCMCIA_VENDOR_SYMBOL 0x026c /* Symbol */ -#define PCMCIA_VENDOR_BUFFALO 0x026f /* BUFFALO (Melco Corporation) */ -#define PCMCIA_VENDOR_BROMAX 0x0274 /* Bromax communications, Inc */ -#define PCMCIA_VENDOR_IODATA2 0x028a /* I-O DATA */ -#define PCMCIA_VENDOR_ASUS 0x02aa /* ASUS */ -#define PCMCIA_VENDOR_SIEMENS 0x02ac /* Siemens */ -#define PCMCIA_VENDOR_MICROSOFT 0x02d2 /* Microsoft Corporation */ - -/* - * The following vendor IDs are byte-swapped from what the company is assigned. - */ -#define PCMCIA_VENDOR_NWN 0x0602 /* No Wires Needed */ -#define PCMCIA_VENDOR_BREEZECOM 0x0a02 /* BreezeCOM */ -#define PCMCIA_VENDOR_LASAT 0x3401 /* Lasat Communications A/S */ -#define PCMCIA_VENDOR_BONDWELL 0x3b01 /* Bondwell */ -#define PCMCIA_VENDOR_LEXARMEDIA 0x4e01 /* Lexar Media */ -#define PCMCIA_VENDOR_COMPEX 0x8a01 /* Compex Corporation */ -#define PCMCIA_VENDOR_ZONET 0x8a01 /* Zonet Technology Inc. */ -#define PCMCIA_VENDOR_ELSA 0xd601 /* Elsa */ - -/* - * The following vendor IDs are not, as far as I can tell, actually - * assigned to these people. However, all the ones starting with '0xc' - * look coherent enough that maybe somebody other than PCMCIA is - * assigning numbers in that range. - */ -#define PCMCIA_VENDOR_NEWMEDIA2 0x10cd /* NewMedia */ -#define PCMCIA_VENDOR_PLANEX_2 0x14ea /* PLANEX */ -#define PCMCIA_VENDOR_ACTIONTEC 0x1668 /* ACTIONTEC */ -#define PCMCIA_VENDOR_AIRVAST 0x50c2 /* AirVast Technology */ -#define PCMCIA_VENDOR_ARCHOS 0x5241 /* Archos */ -#define PCMCIA_VENDOR_DUAL 0x890f /* Dual */ -#define PCMCIA_VENDOR_EDIMAX 0x890f /* Edimax Technology Inc. */ -#define PCMCIA_VENDOR_CONTEC 0xc001 /* Contec */ -#define PCMCIA_VENDOR_MACNICA 0xc00b /* MACNICA */ -#define PCMCIA_VENDOR_ROLAND 0xc00c /* Roland */ -#define PCMCIA_VENDOR_COREGA2 0xc00f /* Corega K.K. */ -#define PCMCIA_VENDOR_ALLIEDTELESIS 0xc00f /* Allied Telesis K.K. */ -#define PCMCIA_VENDOR_HAGIWARASYSCOM 0xc012 /* Hagiwara SYS-COM */ -#define PCMCIA_VENDOR_RATOC 0xc015 /* RATOC System Inc. */ -#define PCMCIA_VENDOR_WORKBIT 0xc024 /* WORKBIT */ -#define PCMCIA_VENDOR_EMTAC 0xc250 /* EMTAC Technology Corporation */ - -/* - * List of known products. Grouped by vendor, sorted by number within the - * group. - */ - -/* 3COM Products */ -#define PCMCIA_CIS_3COM_3CRWE737A { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_3COM_3CRWE737A 0x0001 -#define PCMCIA_STR_3COM_3CRWE737A "3Com AirConnect Wireless LAN" -#define PCMCIA_CIS_3COM_3CXM056BNW { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_3COM_3CXM056BNW 0x002f -#define PCMCIA_STR_3COM_3CXM056BNW "3Com/NoteWorthy 3CXM056-BNW 56K Modem" -#define PCMCIA_CIS_3COM_3CXEM556 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_3COM_3CXEM556 0x0035 -#define PCMCIA_STR_3COM_3CXEM556 "3Com/Megahertz 3CXEM556 Ethernet/Modem" -#define PCMCIA_CIS_3COM_3CXEM556INT { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_3COM_3CXEM556INT 0x003d -#define PCMCIA_STR_3COM_3CXEM556INT "3Com/Megahertz 3CXEM556-INT Ethernet/Modem" -#define PCMCIA_CIS_3COM_3CRWB609 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_3COM_3CRWB609 0x0400 -#define PCMCIA_STR_3COM_3CRWB609 "3Com Bluetooth PC Card 3CRWB60-A" -#define PCMCIA_CIS_3COM_3CCFEM556BI { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_3COM_3CCFEM556BI 0x0556 -#define PCMCIA_STR_3COM_3CCFEM556BI "3Com/Megahertz 3CCFEM556BI Ethernet/Modem" -#define PCMCIA_CIS_3COM_3C562 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_3COM_3C562 0x0562 -#define PCMCIA_STR_3COM_3C562 "3Com 3c562 33.6 Modem/10Mbps Ethernet" -#define PCMCIA_CIS_3COM_3C589 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_3COM_3C589 0x0589 -#define PCMCIA_STR_3COM_3C589 "3Com 3c589 10Mbps Ethernet" -#define PCMCIA_CIS_3COM_3C574 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_3COM_3C574 0x0574 -#define PCMCIA_STR_3COM_3C574 "3Com 3c574-TX 10/100Mbps Ethernet" -#define PCMCIA_CIS_3COM_3CRWE777A { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_3COM_3CRWE777A 0x0777 -#define PCMCIA_STR_3COM_3CRWE777A "3Com 3CRWE777A Airconnect" -#define PCMCIA_CIS_3COM_3C1 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_3COM_3C1 0x0cf1 -#define PCMCIA_STR_3COM_3C1 "3Com Megahertz 3C1 10Mbps LAN CF+ Card" -#define PCMCIA_CIS_3COM_3CRWE62092A { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_3COM_3CRWE62092A 0x2092 -#define PCMCIA_STR_3COM_3CRWE62092A "3Com 3CRWE62092A Wireless LAN" - -/* ACTIONTEC Products */ -#define PCMCIA_CIS_ACTIONTEC_PRISM { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_ACTIONTEC_PRISM 0x0101 -#define PCMCIA_STR_ACTIONTEC_PRISM "PRISM Wireless LAN PC Card" - -/* Adaptec Products */ -#define PCMCIA_CIS_ADAPTEC_APA1460 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_ADAPTEC_APA1460 0x0001 -#define PCMCIA_STR_ADAPTEC_APA1460 "Adaptec APA-1460 SlimSCSI" -#define PCMCIA_CIS_ADAPTEC_APA1460A { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_ADAPTEC_APA1460A 0x0002 -#define PCMCIA_STR_ADAPTEC_APA1460A "Adaptec APA-1460A SlimSCSI" - -/* Aironet */ -#define PCMCIA_CIS_AIRONET_PC4500 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_AIRONET_PC4500 0x0005 -#define PCMCIA_STR_AIRONET_PC4500 "Aironet PC4500 Wireless LAN Adapter" -#define PCMCIA_CIS_AIRONET_PC4800 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_AIRONET_PC4800 0x0007 -#define PCMCIA_STR_AIRONET_PC4800 "Aironet PC4800 Wireless LAN Adapter" -#define PCMCIA_CIS_AIRONET_350 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_AIRONET_350 0x000a -#define PCMCIA_STR_AIRONET_350 "Aironet 350 Wireless LAN Adapter" - -/* AirVast */ -#define PCMCIA_CIS_AIRVAST_WN_100 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_AIRVAST_WN_100 0x7300 -#define PCMCIA_STR_AIRVAST_WN_100 "AirVast WN-100" - -/* Allied Telesis K.K. */ -#define PCMCIA_CIS_ALLIEDTELESIS_LA_PCM { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_ALLIEDTELESIS_LA_PCM 0x0002 -#define PCMCIA_STR_ALLIEDTELESIS_LA_PCM "Allied Telesis LA-PCM" - -/* Archos */ -#define PCMCIA_CIS_ARCHOS_ARC_ATAPI { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_ARCHOS_ARC_ATAPI 0x0043 -#define PCMCIA_STR_ARCHOS_ARC_ATAPI "MiniCD" - -/* ARtem */ -#define PCMCIA_CIS_ARTEM_ONAIR { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_ARTEM_ONAIR 0x0001 -#define PCMCIA_STR_ARTEM_ONAIR "ARtem OnAir" - -/* ASUS WL-100 */ -#define PCMCIA_CIS_ASUS_WL100 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_ASUS_WL100 0x0002 -#define PCMCIA_STR_ASUS_WL100 "ASUS SpaceLink WL-100 Wireless LAN" - -/* Bay Networks */ -#define PCMCIA_CIS_BAY_STACK_650 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_BAY_STACK_650 0x0804 -#define PCMCIA_STR_BAY_STACK_650 "BayStack 650 Wireless LAN" -#define PCMCIA_CIS_BAY_SURFER_PRO { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_BAY_SURFER_PRO 0x0806 -#define PCMCIA_STR_BAY_SURFER_PRO "AirSurfer Pro Wireless LAN" -#define PCMCIA_CIS_BAY_STACK_660 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_BAY_STACK_660 0x0807 -#define PCMCIA_STR_BAY_STACK_660 "BayStack 660 Wireless LAN" -#define PCMCIA_CIS_BAY_EMOBILITY_11B { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_BAY_EMOBILITY_11B 0x080a -#define PCMCIA_STR_BAY_EMOBILITY_11B "e-Mobility 11Mb Wireless LAN" - -/* Bondwell */ -#define PCMCIA_CIS_BONDWELL_B236 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_BONDWELL_B236 0x0000 -#define PCMCIA_STR_BONDWELL_B236 "Game Card Joystick" - -/* BreezeCOM */ -#define PCMCIA_CIS_BREEZECOM_BREEZENET { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_BREEZECOM_BREEZENET 0x0102 -#define PCMCIA_STR_BREEZECOM_BREEZENET "BreezeCOM BreezeNET" - -/* Bromax Communications, Inc (Linksys OEM) */ -#define PCMCIA_CIS_BROMAX_IWN { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_BROMAX_IWN 0x1612 -#define PCMCIA_STR_BROMAX_IWN "Instant Wireless Network PC Card" -#define PCMCIA_CIS_BROMAX_IWN3 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_BROMAX_IWN3 0x1613 -#define PCMCIA_STR_BROMAX_IWN3 "Instant Wireless Network PC Card, Versin 3" -#define PCMCIA_CIS_BROMAX_WCF11 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_BROMAX_WCF11 0x3301 -#define PCMCIA_STR_BROMAX_WCF11 "Instant Wireless Network CF Card" - -/* BUFFALO */ -#define PCMCIA_CIS_BUFFALO_LPC3_CLX { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_BUFFALO_LPC3_CLX 0x0301 -#define PCMCIA_STR_BUFFALO_LPC3_CLX "BUFFALO LPC3-CLX Ethernet Adapter" -#define PCMCIA_CIS_BUFFALO_WLI_PCM_S11 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_BUFFALO_WLI_PCM_S11 0x0305 -#define PCMCIA_STR_BUFFALO_WLI_PCM_S11 "BUFFALO AirStation 11Mbps WLAN" -#define PCMCIA_CIS_BUFFALO_LPC_CF_CLT { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_BUFFALO_LPC_CF_CLT 0x0307 -#define PCMCIA_STR_BUFFALO_LPC_CF_CLT "BUFFALO LPC-CF-CLT" -#define PCMCIA_CIS_BUFFALO_LPC3_CLT { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_BUFFALO_LPC3_CLT 0x030a -#define PCMCIA_STR_BUFFALO_LPC3_CLT "BUFFALO LPC3-CLT Ethernet Adapter" -#define PCMCIA_CIS_BUFFALO_WLI_CF_S11G { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_BUFFALO_WLI_CF_S11G 0x030b -#define PCMCIA_STR_BUFFALO_WLI_CF_S11G "BUFFALO AirStation 11Mbps CF WLAN" - -/* Compaq Products */ -#define PCMCIA_CIS_COMPAQ_NC5004 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_COMPAQ_NC5004 0x0002 -#define PCMCIA_STR_COMPAQ_NC5004 "Compaq Agency NC5004 Wireless Card" -#define PCMCIA_CIS_COMPAQ2_CPQ_10_100 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_COMPAQ2_CPQ_10_100 0x010a -#define PCMCIA_STR_COMPAQ2_CPQ_10_100 "Compaq Netelligent 10/100 Ethernet" - -/* Compex Products */ -#define PCMCIA_CIS_COMPEX_AMP_WIRELESS { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_COMPEX_AMP_WIRELESS 0x0066 -#define PCMCIA_STR_COMPEX_AMP_WIRELESS "AMP" -#define PCMCIA_CIS_COMPEX_LINKPORT_ENET_B { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_COMPEX_LINKPORT_ENET_B 0x0100 -#define PCMCIA_STR_COMPEX_LINKPORT_ENET_B "Compex Linkport ENET-B Ethernet" - -/* Contec C-NET(PC) */ -#define PCMCIA_CIS_CONTEC_CNETPC { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_CONTEC_CNETPC 0x0000 -#define PCMCIA_STR_CONTEC_CNETPC "Contec C-NET(PC)C" -#define PCMCIA_CIS_CONTEC_FX_DS110_PCC { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_CONTEC_FX_DS110_PCC 0x0008 -#define PCMCIA_STR_CONTEC_FX_DS110_PCC "Contec FLEXLAN/FX-DS110-PCC" - -/* Dayna Products */ -#define PCMCIA_CIS_DAYNA_COMMUNICARD_E_1 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_DAYNA_COMMUNICARD_E_1 0x002d -#define PCMCIA_STR_DAYNA_COMMUNICARD_E_1 "Dayna CommuniCard E" -#define PCMCIA_CIS_DAYNA_COMMUNICARD_E_2 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_DAYNA_COMMUNICARD_E_2 0x002f -#define PCMCIA_STR_DAYNA_COMMUNICARD_E_2 "Dayna CommuniCard E" - -/* DIGITAL Products */ -#define PCMCIA_CIS_DIGITAL_MOBILE_MEDIA_CDROM { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_DIGITAL_MOBILE_MEDIA_CDROM 0x0d00 -#define PCMCIA_STR_DIGITAL_MOBILE_MEDIA_CDROM "Digital Mobile Media CD-ROM" - -/* D-Link Products */ -#define PCMCIA_CIS_DLINK_2_DMF560TX { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_DLINK_2_DMF560TX 0xc0ab -#define PCMCIA_STR_DLINK_2_DMF560TX "D-Link DMF-650TX" - -/* DSP Solutions, Inc. (Megahertz OEM) */ -#define PCMCIA_CIS_DSPSI_XJEM1144 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_DSPSI_XJEM1144 0x0101 -#define PCMCIA_STR_DSPSI_XJEM1144 "Megahertz X-JACK" -#define PCMCIA_CIS_DSPSI_XJACK { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_DSPSI_XJACK 0x0103 -#define PCMCIA_STR_DSPSI_XJACK "Megahertz X-JACK Ethernet" - -/* Dual */ -#define PCMCIA_CIS_DUAL_NE2000 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_DUAL_NE2000 0x0100 -#define PCMCIA_STR_DUAL_NE2000 "Dual NE2000" - -/* Edimax Products */ -#define PCMCIA_CIS_EDIMAX_EP4000A { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_EDIMAX_EP4000A 0x0100 -#define PCMCIA_STR_EDIMAX_EP4000A "Edimax EP4000A" - -/* ELSA Products */ -#define PCMCIA_CIS_ELSA_MC2_IEEE { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_ELSA_MC2_IEEE 0x0001 -#define PCMCIA_STR_ELSA_MC2_IEEE "AirLancer MC-2 IEEE" -#define PCMCIA_CIS_ELSA_XI300_IEEE { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_ELSA_XI300_IEEE 0x0002 -#define PCMCIA_STR_ELSA_XI300_IEEE "XI300 Wireless LAN" -#define PCMCIA_CIS_ELSA_XI800_IEEE { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_ELSA_XI800_IEEE 0x0004 -#define PCMCIA_STR_ELSA_XI800_IEEE "XI800 CF Wireless LAN" -#define PCMCIA_CIS_ELSA_XI325_IEEE { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_ELSA_XI325_IEEE 0x0005 -#define PCMCIA_STR_ELSA_XI325_IEEE "XI325 Wireless LAN" - -/* EMTAC */ -#define PCMCIA_CIS_EMTAC_WLAN { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_EMTAC_WLAN 0x0002 -#define PCMCIA_STR_EMTAC_WLAN "EMTAC A2424i 11Mbps WLAN Card" - -/* Ericsson */ -#define PCMCIA_CIS_ERICSSON_WIRELESSLAN { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_ERICSSON_WIRELESSLAN 0x0001 -#define PCMCIA_STR_ERICSSON_WIRELESSLAN "DSSS Wireless LAN PC Card" - -/* Farallon */ -#define PCMCIA_CIS_FARALLON_SKYLINE { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_FARALLON_SKYLINE 0x0a01 -#define PCMCIA_STR_FARALLON_SKYLINE "SkyLINE Wireless" - -/* Fujutsu Products */ -#define PCMCIA_CIS_FUJITSU_SCSI600 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_FUJITSU_SCSI600 0x0401 -#define PCMCIA_STR_FUJITSU_SCSI600 "Fujitsu SCSI 600 Interface" -#define PCMCIA_CIS_FUJITSU_LA10S { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_FUJITSU_LA10S 0x1003 -#define PCMCIA_STR_FUJITSU_LA10S "Fujitsu Compact Flash Ethernet" -#define PCMCIA_CIS_FUJITSU_LA501 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_FUJITSU_LA501 0x2000 -#define PCMCIA_STR_FUJITSU_LA501 "Fujitsu Towa LA501 Ethernet" -#define PCMCIA_CIS_FUJITSU_WL110 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_FUJITSU_WL110 0x2003 -#define PCMCIA_STR_FUJITSU_WL110 "PEGA-WL110 Wireless LAN" - -/* Gemplus */ -#define PCMCIA_CIS_GEMPLUS_GPR400 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_GEMPLUS_GPR400 0x3004 -#define PCMCIA_STR_GEMPLUS_GPR400 "GPR400 Smartcard Reader" - -/* Home Wireless Networks */ -#define PCMCIA_CIS_HWN_AIRWAY80211 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_HWN_AIRWAY80211 0x0002 -#define PCMCIA_STR_HWN_AIRWAY80211 "HWN Airway Wireless PCMCIA Card" - -/* IBM Products */ -#define PCMCIA_CIS_IBM_MICRODRIVE { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_IBM_MICRODRIVE 0x0000 -#define PCMCIA_STR_IBM_MICRODRIVE "IBM Microdrive" -#define PCMCIA_CIS_IBM_3270 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_IBM_3270 0x0001 -#define PCMCIA_STR_IBM_3270 "IBM 3270 Emulation" -#define PCMCIA_CIS_IBM_INFOMOVER { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_IBM_INFOMOVER 0x0002 -#define PCMCIA_STR_IBM_INFOMOVER "IBM InfoMover" -#define PCMCIA_CIS_IBM_5250 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_IBM_5250 0x000b -#define PCMCIA_STR_IBM_5250 "IBM 5250 Emulation" -#define PCMCIA_CIS_IBM_TROPIC { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_IBM_TROPIC 0x001e -#define PCMCIA_STR_IBM_TROPIC "IBM Token Ring 4/16" -#define PCMCIA_CIS_IBM_SCSI { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_IBM_SCSI 0x0026 -#define PCMCIA_STR_IBM_SCSI "IBM SCSI PCMCIA" -#define PCMCIA_CIS_IBM_PORTABLE_CDROM { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_IBM_PORTABLE_CDROM 0x002d -#define PCMCIA_STR_IBM_PORTABLE_CDROM "IBM PCMCIA Portable CD-ROM Drive" -#define PCMCIA_CIS_IBM_HOME_AND_AWAY { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_IBM_HOME_AND_AWAY 0x002e -#define PCMCIA_STR_IBM_HOME_AND_AWAY "IBM Home and Away Modem" -#define PCMCIA_CIS_IBM_WIRELESS_LAN_ENTRY { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_IBM_WIRELESS_LAN_ENTRY 0x0032 -#define PCMCIA_STR_IBM_WIRELESS_LAN_ENTRY "IBM Wireless LAN Entry" -#define PCMCIA_CIS_IBM_SMART_CAPTURE_II { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_IBM_SMART_CAPTURE_II 0x003c -#define PCMCIA_STR_IBM_SMART_CAPTURE_II "IBM Smart Capture Card II" -#define PCMCIA_CIS_IBM_ETHERJET { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_IBM_ETHERJET 0x003f -#define PCMCIA_STR_IBM_ETHERJET "IBM EtherJet Ethernet" - -/* Intel Products */ -#define PCMCIA_CIS_INTEL_PRO_WLAN_2011 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_INTEL_PRO_WLAN_2011 0x0001 -#define PCMCIA_STR_INTEL_PRO_WLAN_2011 "Intel PRO/Wireless 2011 LAN PC Card" -#define PCMCIA_CIS_INTEL_EEPRO100 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_INTEL_EEPRO100 0x010a -#define PCMCIA_STR_INTEL_EEPRO100 "Intel EtherExpress PRO/100" -#define PCMCIA_CIS_INTEL_ETHEREXPPRO { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_INTEL_ETHEREXPPRO 0x0301 -#define PCMCIA_STR_INTEL_ETHEREXPPRO "Intel EtherExpress Pro PCMCIA Card" -#define PCMCIA_CIS_INTEL_PRO100LAN56 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_INTEL_PRO100LAN56 0x110a -#define PCMCIA_STR_INTEL_PRO100LAN56 "Intel EtherExpress PRO/100 LAN Modem" - -/* Intersil */ -/* OEMs sell these things under different marketing names */ -#define PCMCIA_CIS_INTERSIL_MA401RA { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_INTERSIL_MA401RA 0x7300 -#define PCMCIA_STR_INTERSIL_MA401RA "Netgear MA401RA" -#define PCMCIA_CIS_INTERSIL_DWL650 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_INTERSIL_DWL650 0x7110 -#define PCMCIA_STR_INTERSIL_DWL650 "Dlink DWL650" - -/* I-O DATA */ -#define PCMCIA_CIS_IODATA_PCLATE { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_IODATA_PCLATE 0x2216 -#define PCMCIA_STR_IODATA_PCLATE "I-O DATA PCLA/TE" -#define PCMCIA_CIS_IODATA2_WNB11PCM { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_IODATA2_WNB11PCM 0x0002 -#define PCMCIA_STR_IODATA2_WNB11PCM "I-O DATA WN-B11/PCM" -#define PCMCIA_CIS_IODATA2_WCF12 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_IODATA2_WCF12 0x0673 -#define PCMCIA_STR_IODATA2_WCF12 "Wireless CF Card" - -/* Kingston Products */ -#define PCMCIA_CIS_KINGSTON_KNE2 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_KINGSTON_KNE2 0x0100 -#define PCMCIA_STR_KINGSTON_KNE2 "Kingston KNE-PC2 Ethernet" - -/* Lasat Products */ -#define PCMCIA_CIS_LASAT_CREDIT_288 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_LASAT_CREDIT_288 0x2811 -#define PCMCIA_STR_LASAT_CREDIT_288 "Lasat Credit 288 Modem" - -/* Lexar Media */ -#define PCMCIA_CIS_LEXARMEDIA_COMPACTFLASH { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_LEXARMEDIA_COMPACTFLASH 0x0100 -#define PCMCIA_STR_LEXARMEDIA_COMPACTFLASH "Lexar Media CompactFlash" - -/* Linksys corporation */ -#define PCMCIA_CIS_LINKSYS_TRUST_COMBO_ECARD { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_LINKSYS_TRUST_COMBO_ECARD 0x021b -#define PCMCIA_STR_LINKSYS_TRUST_COMBO_ECARD "Trust (Linksys) Combo EthernetCard" -#define PCMCIA_CIS_LINKSYS_ETHERFAST { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_LINKSYS_ETHERFAST 0x0230 -#define PCMCIA_STR_LINKSYS_ETHERFAST "Linksys Etherfast 10/100 Ethernet" -#define PCMCIA_CIS_LINKSYS_ECARD_1 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_LINKSYS_ECARD_1 0x0265 -#define PCMCIA_STR_LINKSYS_ECARD_1 "Linksys EthernetCard or D-Link DE-650" -#define PCMCIA_CIS_LINKSYS_COMBO_ECARD { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_LINKSYS_COMBO_ECARD 0xc1ab -#define PCMCIA_STR_LINKSYS_COMBO_ECARD "Linksys Combo EthernetCard" - -/* Lucent WaveLAN/IEEE */ -#define PCMCIA_CIS_LUCENT_WAVELAN_IEEE { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_LUCENT_WAVELAN_IEEE 0x0002 -#define PCMCIA_STR_LUCENT_WAVELAN_IEEE "WaveLAN/IEEE" - -/* MACNICA */ -#define PCMCIA_CIS_MACNICA_ME1_JEIDA { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_MACNICA_ME1_JEIDA 0x3300 -#define PCMCIA_STR_MACNICA_ME1_JEIDA "MACNICA ME1 for JEIDA" -#define PCMCIA_CIS_MACNICA_MPS110 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_MACNICA_MPS110 0xa041 -#define PCMCIA_STR_MACNICA_MPS110 "MACNICA Miracle SCSI-II mPS110" - -/* Megahertz Products */ -#define PCMCIA_CIS_MEGAHERTZ_XJEM3336 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_MEGAHERTZ_XJEM3336 0x0006 -#define PCMCIA_STR_MEGAHERTZ_XJEM3336 "Megahertz X-JACK Ethernet Modem" -#define PCMCIA_CIS_MEGAHERTZ_XJ4288 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_MEGAHERTZ_XJ4288 0x0023 -#define PCMCIA_STR_MEGAHERTZ_XJ4288 "Megahertz XJ4288 Modem" -#define PCMCIA_CIS_MEGAHERTZ_XJ4336 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_MEGAHERTZ_XJ4336 0x0027 -#define PCMCIA_STR_MEGAHERTZ_XJ4336 "Megahertz XJ4336 Modem" -#define PCMCIA_CIS_MEGAHERTZ_XJ5560 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_MEGAHERTZ_XJ5560 0x0034 -#define PCMCIA_STR_MEGAHERTZ_XJ5560 "Megahertz X-JACK 56kbps Modem" - -/* Melco Products */ -#define PCMCIA_CIS_MELCO_LPC3_TX { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_MELCO_LPC3_TX 0xc1ab -#define PCMCIA_STR_MELCO_LPC3_TX "Melco LPC3-TX" -#define PCMCIA_CIS_MELCO_LPC3_CLX { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_MELCO_LPC3_CLX 0x0301 -#define PCMCIA_STR_MELCO_LPC3_CLX "Melco LPC3-CLX Ethernet Adapter" - -/* Microsoft Products */ -#define PCMCIA_CIS_MICROSOFT_MN_520 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_MICROSOFT_MN_520 0x0001 -#define PCMCIA_STR_MICROSOFT_MN_520 "Microsoft MN-520 WLAN Card" - -/* Motorola Products */ -#define PCMCIA_CIS_MOTOROLA_POWER144 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_MOTOROLA_POWER144 0x0105 -#define PCMCIA_STR_MOTOROLA_POWER144 "Motorola Power 14.4 Modem" -#define PCMCIA_CIS_MOTOROLA_PM100C { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_MOTOROLA_PM100C 0x0302 -#define PCMCIA_STR_MOTOROLA_PM100C "Motorola Personal Messenger 100C CDPD Modem" -#define PCMCIA_CIS_MOTOROLA_MONTANA_336 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_MOTOROLA_MONTANA_336 0x0505 -#define PCMCIA_STR_MOTOROLA_MONTANA_336 "Motorola Montana 33.6" - -/* New Media Products */ -#define PCMCIA_CIS_NEWMEDIA_BASICS { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_NEWMEDIA_BASICS 0x0019 -#define PCMCIA_STR_NEWMEDIA_BASICS "New Media BASICS Ethernet" -#define PCMCIA_CIS_NEWMEDIA_LANSURFER { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_NEWMEDIA_LANSURFER 0x0021 -#define PCMCIA_STR_NEWMEDIA_LANSURFER "NewMedia LANSurfer" -#define PCMCIA_CIS_NEWMEDIA_LIVEWIRE { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_NEWMEDIA_LIVEWIRE 0x1004 -#define PCMCIA_STR_NEWMEDIA_LIVEWIRE "NewMedia LiveWire Ethernet LAN Adapter" -#define PCMCIA_CIS_NEWMEDIA_MULTIMEDIA { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_NEWMEDIA_MULTIMEDIA 0x100b -#define PCMCIA_STR_NEWMEDIA_MULTIMEDIA "NewMedia Multimedia" -#define PCMCIA_CIS_NEWMEDIA_BUSTOASTER2 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_NEWMEDIA_BUSTOASTER2 0xa002 -#define PCMCIA_STR_NEWMEDIA_BUSTOASTER2 "New Media SCSI Bus Toaster" -#define PCMCIA_CIS_NEWMEDIA_BUSTOASTER { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_NEWMEDIA_BUSTOASTER 0xc102 -#define PCMCIA_STR_NEWMEDIA_BUSTOASTER "New Media SCSI Bus Toaster" -#define PCMCIA_CIS_NEWMEDIA_BUSTOASTER3 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_NEWMEDIA_BUSTOASTER3 0xd302 -#define PCMCIA_STR_NEWMEDIA_BUSTOASTER3 "New Media SCSI Bus Toaster" -#define PCMCIA_CIS_NEWMEDIA_WAVJAMMER { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_NEWMEDIA_WAVJAMMER 0xe005 -#define PCMCIA_STR_NEWMEDIA_WAVJAMMER "NewMedia .WAVjammer" -#define PCMCIA_CIS_NEWMEDIA2_BUSTOASTER { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_NEWMEDIA2_BUSTOASTER 0x0001 -#define PCMCIA_STR_NEWMEDIA2_BUSTOASTER "NewMedia BusToaster" - -/* Netgear */ -#define PCMCIA_CIS_NETGEAR_FA410TX { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_NETGEAR_FA410TX 0x0230 -#define PCMCIA_STR_NETGEAR_FA410TX "Netgear FA410TX" -#define PCMCIA_CIS_NETGEAR_FA410TXC { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_NETGEAR_FA410TXC 0x4530 -#define PCMCIA_STR_NETGEAR_FA410TXC "Netgear FA410TXC" -#define PCMCIA_CIS_NETGEAR_FA411 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_NETGEAR_FA411 0x0411 -#define PCMCIA_STR_NETGEAR_FA411 "Netgear FA411" - -/* National Instruments */ -#define PCMCIA_CIS_NI_PCMCIA_GPIB { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_NI_PCMCIA_GPIB 0x4882 -#define PCMCIA_STR_NI_PCMCIA_GPIB "National Instruments PCMCIA-GPIB" - -/* Nokia Products */ -#define PCMCIA_CIS_NOKIA_C110_WLAN { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_NOKIA_C110_WLAN 0x1110 -#define PCMCIA_STR_NOKIA_C110_WLAN "Nokia C110/C111" -#define PCMCIA_CIS_NOKIA_C020_WLAN { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_NOKIA_C020_WLAN 0x20c0 -#define PCMCIA_STR_NOKIA_C020_WLAN "Nokia C020 WLAN Card" - -/* No Wires Needed */ -#define PCMCIA_CIS_NWN_WLAN_550 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_NWN_WLAN_550 0x0002 -#define PCMCIA_STR_NWN_WLAN_550 "NWN 550 WLAN" -#define PCMCIA_CIS_NWN_WLAN_1148 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_NWN_WLAN_1148 0x0003 -#define PCMCIA_STR_NWN_WLAN_1148 "NWN 1148 WLAN" - -/* Olicom Products */ -#define PCMCIA_CIS_OLICOM_TR { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_OLICOM_TR 0x2132 -#define PCMCIA_STR_OLICOM_TR "GoCard Token Ring 16/4" -#define PCMCIA_CIS_OLICOM_OC2220 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_OLICOM_OC2220 0x2022 -#define PCMCIA_STR_OLICOM_OC2220 "GoCard Ethernet" -#define PCMCIA_CIS_OLICOM_OC2231 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_OLICOM_OC2231 0x3122 -#define PCMCIA_STR_OLICOM_OC2231 "GoCard Combo Eth/Modem 288" -#define PCMCIA_CIS_OLICOM_OC2232 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_OLICOM_OC2232 0x3222 -#define PCMCIA_STR_OLICOM_OC2232 "GoCard Combo Eth/Modem 336" - -/* Ositech Products */ -#define PCMCIA_CIS_OSITECH_TRUMPCARD_SOD { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_OSITECH_TRUMPCARD_SOD 0x0008 -#define PCMCIA_STR_OSITECH_TRUMPCARD_SOD "Ositech Seven of Diamonds Ethernet Card" - -/* Panasonic Products */ -#define PCMCIA_CIS_PANASONIC_KXLC002 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_PANASONIC_KXLC002 0x0304 -#define PCMCIA_STR_PANASONIC_KXLC002 "Panasonic 4X CD-ROM Interface Card" -#define PCMCIA_CIS_PANASONIC_KXLC003 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_PANASONIC_KXLC003 0x0504 -#define PCMCIA_STR_PANASONIC_KXLC003 "Panasonic 8X CD-ROM Interface Card" -#define PCMCIA_CIS_PANASONIC_KXLC004 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_PANASONIC_KXLC004 0x0604 -#define PCMCIA_STR_PANASONIC_KXLC004 "Panasonic KXL-810AN Interface Card" -#define PCMCIA_CIS_PANASONIC_KXLC005 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_PANASONIC_KXLC005 0x2704 -#define PCMCIA_STR_PANASONIC_KXLC005 "Panasonic 16X CD-ROM Interface Card" -#define PCMCIA_CIS_PANASONIC_KXLC005_1 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_PANASONIC_KXLC005_1 0x2904 -#define PCMCIA_STR_PANASONIC_KXLC005_1 "Panasonic 16X CD-ROM Interface Card" -#define PCMCIA_CIS_PANASONIC_KME { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_PANASONIC_KME 0x2604 -#define PCMCIA_STR_PANASONIC_KME "Panasonic CD-R/RW Interface" - -/* Planex */ -#define PCMCIA_CIS_PLANEX_2_GWNS11H { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_PLANEX_2_GWNS11H 0xb001 -#define PCMCIA_STR_PLANEX_2_GWNS11H "Planex GW-NS11H" - -/* Proxim */ -#define PCMCIA_CIS_PROXIM_HARMONY { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_PROXIM_HARMONY 0x0002 -#define PCMCIA_STR_PROXIM_HARMONY "Proxim HARMONY 80211B" -#define PCMCIA_CIS_PROXIM_ROAMABOUT_2400FH { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_PROXIM_ROAMABOUT_2400FH 0x1058 -#define PCMCIA_STR_PROXIM_ROAMABOUT_2400FH "Digital RoamAbout 2400FH" -#define PCMCIA_CIS_PROXIM_RANGELAN2_7401 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_PROXIM_RANGELAN2_7401 0x1158 -#define PCMCIA_STR_PROXIM_RANGELAN2_7401 "Proxim RangeLAN2 7401" -#define PCMCIA_CIS_PROXIM_RANGELANDS_8430 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_PROXIM_RANGELANDS_8430 0x8000 -#define PCMCIA_STR_PROXIM_RANGELANDS_8430 "Proxim RangeLAN-DS 8430" - -/* Psion */ -#define PCMCIA_CIS_PSION_GOLDCARD { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_PSION_GOLDCARD 0x0020 -#define PCMCIA_STR_PSION_GOLDCARD "Psion Gold Card" - -/* QLogic */ -#define PCMCIA_CIS_QLOGIC_PC05 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_QLOGIC_PC05 0x0104 -#define PCMCIA_STR_QLOGIC_PC05 "Qlogic Fast SCSI" - -/* Quatech */ -#define PCMCIA_CIS_QUATECH_SPP_100 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_QUATECH_SPP_100 0x0003 -#define PCMCIA_STR_QUATECH_SPP_100 "Quatech Enhanced Parallel Port" -#define PCMCIA_CIS_QUATECH_DSP_225 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_QUATECH_DSP_225 0x0008 -#define PCMCIA_STR_QUATECH_DSP_225 "Quatech Dual Serial Port" - -/* RATOC System Inc. Products */ -/* Don't use because both cards have same product id */ -#define PCMCIA_CIS_RATOC_REX_R280_9530 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_RATOC_REX_R280_9530 0x0001 -#define PCMCIA_STR_RATOC_REX_R280_9530 "RATOC REX-R280/REX-9530" - -/* Raylink/WebGear */ -#define PCMCIA_CIS_RAYTHEON_WLAN { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_RAYTHEON_WLAN 0x0000 -#define PCMCIA_STR_RAYTHEON_WLAN "WLAN Adapter" - -/* Roland */ -#define PCMCIA_CIS_ROLAND_SCP55 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_ROLAND_SCP55 0x0001 -#define PCMCIA_STR_ROLAND_SCP55 "Roland SCP-55" - -/* Samsung */ -#define PCMCIA_CIS_SAMSUNG_SWL_2000N { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_SAMSUNG_SWL_2000N 0x0002 -#define PCMCIA_STR_SAMSUNG_SWL_2000N "Samsung MagicLAN SWL-2000N" - -/* Sandisk Products */ -#define PCMCIA_CIS_SANDISK_SDCFB { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_SANDISK_SDCFB 0x0401 -#define PCMCIA_STR_SANDISK_SDCFB "Sandisk CompactFlash Card" - -/* Sharp Products */ -#define PCMCIA_CIS_SHARP_PALDIO611S { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_SHARP_PALDIO611S 0x0000 -#define PCMCIA_STR_SHARP_PALDIO611S "PALDIO 611S PC CARD" - -/* Siemens */ -#define PCMCIA_CIS_SIEMENS_SS1021 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_SIEMENS_SS1021 0x0002 -#define PCMCIA_STR_SIEMENS_SS1021 "Siemens SpeedStream 1021" - -/* Simple Technology Products */ -#define PCMCIA_CIS_SIMPLETECH_COMMUNICATOR288 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_SIMPLETECH_COMMUNICATOR288 0x0100 -#define PCMCIA_STR_SIMPLETECH_COMMUNICATOR288 "Simple Technology 28.8 Communicator" -/* Simpletech ID also used by Symbol */ -#define PCMCIA_CIS_SIMPLETECH_SPECTRUM24 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_SIMPLETECH_SPECTRUM24 0x801 -#define PCMCIA_STR_SIMPLETECH_SPECTRUM24 "Symbol Spectrum24 WLAN Adapter" - -/* Standard Microsystems Corporation Products */ -#define PCMCIA_CIS_SMC_8016 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_SMC_8016 0x0105 -#define PCMCIA_STR_SMC_8016 "SMC 8016 EtherCard" -#define PCMCIA_CIS_SMC_EZCARD { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_SMC_EZCARD 0x8022 -#define PCMCIA_STR_SMC_EZCARD "SMC EZCard 10 PCMCIA" - -/* Socket Communications Products */ -#define PCMCIA_CIS_SOCKET_EA_ETHER { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_SOCKET_EA_ETHER 0x0000 -#define PCMCIA_STR_SOCKET_EA_ETHER "Socket Communications EA" -#define PCMCIA_CIS_SOCKET_LP_WLAN_CF { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_SOCKET_LP_WLAN_CF 0x0001 -#define PCMCIA_STR_SOCKET_LP_WLAN_CF "Socket Communications Low Power WLAN Card" -#define PCMCIA_CIS_SOCKET_PAGECARD { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_SOCKET_PAGECARD 0x0003 -#define PCMCIA_STR_SOCKET_PAGECARD "Socket Communications PageCard" -#define PCMCIA_CIS_SOCKET_DUAL_RS232 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_SOCKET_DUAL_RS232 0x0006 -#define PCMCIA_STR_SOCKET_DUAL_RS232 "Socket Communications Dual RS232" -#define PCMCIA_CIS_SOCKET_LP_ETHER { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_SOCKET_LP_ETHER 0x000d -#define PCMCIA_STR_SOCKET_LP_ETHER "Socket Communications LP-E" -#define PCMCIA_CIS_SOCKET_LP_ETHER_CF { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_SOCKET_LP_ETHER_CF 0x0075 -#define PCMCIA_STR_SOCKET_LP_ETHER_CF "Socket Communications LP-E CF" -#define PCMCIA_CIS_SOCKET_LP_ETH_10_100_CF { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_SOCKET_LP_ETH_10_100_CF 0x0145 -#define PCMCIA_STR_SOCKET_LP_ETH_10_100_CF "Socket Communications 10/100 Ethernet" - -/* Symbol */ -#define PCMCIA_CIS_SYMBOL_LA4100 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_SYMBOL_LA4100 0x0001 -#define PCMCIA_STR_SYMBOL_LA4100 "Symbol Spectrum24 LA4100 Series WLAN" - -/* TDK Products */ -#define PCMCIA_CIS_TDK_LAK_CD011WL { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_TDK_LAK_CD011WL 0x0000 -#define PCMCIA_STR_TDK_LAK_CD011WL "TDK LAK-CD011WL" -#define PCMCIA_CIS_TDK_LAK_CD021BX { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_TDK_LAK_CD021BX 0x0200 -#define PCMCIA_STR_TDK_LAK_CD021BX "TDK LAK-CD021BX Ethernet" -#define PCMCIA_CIS_TDK_LAK_CF010 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_TDK_LAK_CF010 0x0900 -#define PCMCIA_STR_TDK_LAK_CF010 "TDK LAC-CF010" -#define PCMCIA_CIS_TDK_DFL9610 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_TDK_DFL9610 0x0d0a -#define PCMCIA_STR_TDK_DFL9610 "TDK DFL9610 Ethernet & Digital Cellular" -#define PCMCIA_CIS_TDK_C6500012 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_TDK_C6500012 0x410a -#define PCMCIA_STR_TDK_C6500012 "TDK ELSA MicroLink MC all" -#define PCMCIA_CIS_TDK_LAK_CD031 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_TDK_LAK_CD031 0xc1ab -#define PCMCIA_STR_TDK_LAK_CD031 "TDK LAK-CD031 Ethernet" - -/* Telecom Device */ -#define PCMCIA_CIS_TELECOMDEVICE_TCD_HPC100 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_TELECOMDEVICE_TCD_HPC100 0x0202 -#define PCMCIA_STR_TELECOMDEVICE_TCD_HPC100 "Telecom Device TCD-HPC100" - -/* US Robotics Products */ -#define PCMCIA_CIS_USROBOTICS_WORLDPORT144 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_USROBOTICS_WORLDPORT144 0x3330 -#define PCMCIA_STR_USROBOTICS_WORLDPORT144 "US Robotics WorldPort 14.4 Modem" - -/* WORKBIT Products */ -#define PCMCIA_CIS_WORKBIT_ULTRA_NINJA_16 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_WORKBIT_ULTRA_NINJA_16 0x8006 -#define PCMCIA_STR_WORKBIT_ULTRA_NINJA_16 "WORKBIT Ultra Ninja-16 (16bit mode)" - -/* Xircom Products */ -#define PCMCIA_CIS_XIRCOM_CWE1130 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_XIRCOM_CWE1130 0x0007 -#define PCMCIA_STR_XIRCOM_CWE1130 "Xircom Wireless Ethernet Adapter" -#define PCMCIA_CIS_XIRCOM_CE { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_XIRCOM_CE 0x0108 -#define PCMCIA_STR_XIRCOM_CE "Xircom CreditCard Ethernet" -#define PCMCIA_CIS_XIRCOM_CE2 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_XIRCOM_CE2 0x010a -#define PCMCIA_STR_XIRCOM_CE2 "Xircom CreditCard Ethernet II" -#define PCMCIA_CIS_XIRCOM_CE3 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_XIRCOM_CE3 0x010a -#define PCMCIA_STR_XIRCOM_CE3 "Xircom CreditCard Ethernet 10/100" -#define PCMCIA_CIS_XIRCOM_CE2_2 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_XIRCOM_CE2_2 0x010b -#define PCMCIA_STR_XIRCOM_CE2_2 "Xircom CreditCard Ethernet II" -#define PCMCIA_CIS_XIRCOM_XE2000 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_XIRCOM_XE2000 0x0153 -#define PCMCIA_STR_XIRCOM_XE2000 "Xircom XE2000 10/100 Ethernet" -#define PCMCIA_CIS_XIRCOM_CNW_801 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_XIRCOM_CNW_801 0x0801 -#define PCMCIA_STR_XIRCOM_CNW_801 "Xircom CreditCard Netwave (Canada)" -#define PCMCIA_CIS_XIRCOM_CNW_802 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_XIRCOM_CNW_802 0x0802 -#define PCMCIA_STR_XIRCOM_CNW_802 "Xircom CreditCard Netwave (US)" -#define PCMCIA_CIS_XIRCOM_CT2 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_XIRCOM_CT2 0x1101 -#define PCMCIA_STR_XIRCOM_CT2 "Xircom CreditCard Token Ring II" -#define PCMCIA_CIS_XIRCOM_CEM { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_XIRCOM_CEM 0x110a -#define PCMCIA_STR_XIRCOM_CEM "Xircom CreditCard Ethernet + Modem" -#define PCMCIA_CIS_XIRCOM_CEM2 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_XIRCOM_CEM2 0x110a -#define PCMCIA_STR_XIRCOM_CEM2 "Xircom CreditCard Ethernet + Modem" -#define PCMCIA_CIS_XIRCOM_CEM56 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_XIRCOM_CEM56 0x110a -#define PCMCIA_STR_XIRCOM_CEM56 "Xircom CreditCard Ethernet + Modem 56" -#define PCMCIA_CIS_XIRCOM_REM10 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_XIRCOM_REM10 0x110a -#define PCMCIA_STR_XIRCOM_REM10 "Xircom CreditCard Ethernet 10 + Modem 56" -#define PCMCIA_CIS_XIRCOM_REM56 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_XIRCOM_REM56 0x110a -#define PCMCIA_STR_XIRCOM_REM56 "Xircom RealPort Ethernet 10/100 + Modem 56" -#define PCMCIA_CIS_XIRCOM_XEM5600 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_XIRCOM_XEM5600 0x110a -#define PCMCIA_STR_XIRCOM_XEM5600 "Xircom 10/100 Network + 56K Modem PC Card" -#define PCMCIA_CIS_XIRCOM_CEM28 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_XIRCOM_CEM28 0x110b -#define PCMCIA_STR_XIRCOM_CEM28 "Xircom CreditCard Ethernet + Modem 28.8" -#define PCMCIA_CIS_XIRCOM_CEM56_2 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_XIRCOM_CEM56_2 0x110b -#define PCMCIA_STR_XIRCOM_CEM56_2 "Xircom CreditCard Ethernet + Modem 56" -#define PCMCIA_CIS_XIRCOM_CEM33 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_XIRCOM_CEM33 0x110c -#define PCMCIA_STR_XIRCOM_CEM33 "Xircom CreditCard Ethernet + Modem 33.6" -#define PCMCIA_CIS_XIRCOM_CEM33_2 { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_XIRCOM_CEM33_2 0x110d -#define PCMCIA_STR_XIRCOM_CEM33_2 "Xircom CreditCard Ethernet + Modem 33.6" - -/* ZONET */ -#define PCMCIA_CIS_ZONET_ZEN { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_ZONET_ZEN 0x0100 -#define PCMCIA_STR_ZONET_ZEN "Zonet Zen 10/10" - -/* - * Cards we know only by their cis, sorted by name. - */ -#define PCMCIA_VENDOR_AMBICOM 0xffffffff /* AmbiCom Inc */ -#define PCMCIA_VENDOR_ACCTON 0xffffffff /* ACCTON */ -#define PCMCIA_VENDOR_ADDTRON 0xffffffff /* Addtron */ -#define PCMCIA_VENDOR_ARGOSY 0xffffffff /* ARGOSY */ -#define PCMCIA_VENDOR_AMD 0xffffffff /* AMD */ -#define PCMCIA_VENDOR_BILLIONTON 0xffffffff /* Billionton Systems Inc. */ -#define PCMCIA_VENDOR_CNET 0xffffffff /* CNet */ -#define PCMCIA_VENDOR_COREGA 0xffffffff /* Corega K.K. */ -#define PCMCIA_VENDOR_DIGITAL 0xffffffff /* Digital Equipment Corporation */ -#define PCMCIA_VENDOR_DLINK 0xffffffff /* D-Link */ -#define PCMCIA_VENDOR_DYNALINK 0xffffffff /* DynaLink */ -#define PCMCIA_VENDOR_EIGERLABS 0xffffffff /* Eiger labs,Inc. */ -#define PCMCIA_VENDOR_EPSON 0xffffffff /* Seiko Epson Corporation */ -#define PCMCIA_VENDOR_EXP 0xffffffff /* EXP Computer Inc */ -#define PCMCIA_VENDOR_FUJITSU2 0xffffffff /* Fujitsu */ -#define PCMCIA_VENDOR_FUTUREDOMAIN 0xffffffff /* FutureDomain */ -#define PCMCIA_VENDOR_FREECOM 0xffffffff /* Freecom */ -#define PCMCIA_VENDOR_GEMTEK 0xffffffff /* Gem Tek */ -#define PCMCIA_VENDOR_ICOM 0xffffffff /* ICOM Inc */ -#define PCMCIA_VENDOR_INTERSIL2 0xffffffff /* Intersil */ -#define PCMCIA_VENDOR_IODATA3 0xffffffff /* I-O DATA */ -#define PCMCIA_VENDOR_LANTECH 0xffffffff /* Lantech Computer Company */ -#define PCMCIA_VENDOR_MELCO2 0xffffffff /* Melco Corporation */ -#define PCMCIA_VENDOR_NAKAGAWAMETAL 0xffffffff /* NAKAGAWA METAL */ -#define PCMCIA_VENDOR_NDC 0xffffffff /* NDC */ -#define PCMCIA_VENDOR_NEC 0xffffffff /* NEC */ -#define PCMCIA_VENDOR_OEM2 0xffffffff /* Generic OEM */ -#define PCMCIA_VENDOR_PLANET 0xffffffff /* Planet */ -#define PCMCIA_VENDOR_PLANEX 0xffffffff /* Planex Communications Inc */ -#define PCMCIA_VENDOR_PREMAX 0xffffffff /* Premax */ -#define PCMCIA_VENDOR_RPTI 0xffffffff /* RPTI */ -#define PCMCIA_VENDOR_SVEC 0xffffffff /* SVEC/Hawking Technology */ -#define PCMCIA_VENDOR_SYNERGY21 0xffffffff /* Synergy 21 */ -#define PCMCIA_VENDOR_TEAC 0xffffffff /* TEAC */ -#define PCMCIA_VENDOR_TOSHIBA 0xffffffff /* TOSHIBA */ -#define PCMCIA_VENDOR_WORKBIT2 0xffffffff /* WORKBIT */ -#define PCMCIA_VENDOR_YEDATA 0xffffffff /* Y-E DATA */ -#define PCMCIA_VENDOR_YIS 0xffffffff /* YIS Corporation */ -#define PCMCIA_VENDOR_ZOOM 0xffffffff /* ZOOM */ - -#define PCMCIA_CIS_ACCTON_EN2212 { "ACCTON", "EN2212", NULL, NULL } -#define PCMCIA_PRODUCT_ACCTON_EN2212 0xffffffff -#define PCMCIA_STR_ACCTON_EN2212 "Accton EN2212" -#define PCMCIA_CIS_ACCTON_EN2216 { "ACCTON", "EN2216-PCMCIA-ETHERNET", "EN2216R01", NULL } -#define PCMCIA_PRODUCT_ACCTON_EN2216 0xffffffff -#define PCMCIA_STR_ACCTON_EN2216 "Accton EN2216" -#define PCMCIA_CIS_ACCTON_EN2226 { "Accton", "Fast EtherCard-16", "EN2226", "1.00" } -#define PCMCIA_PRODUCT_ACCTON_EN2226 0xffffffff -#define PCMCIA_STR_ACCTON_EN2226 "Accton EN2226" -#define PCMCIA_CIS_ADDTRON_AWP100 { "Addtron", "AWP-100 Wireless PCMCIA", "Version 01.02", NULL } -#define PCMCIA_PRODUCT_ADDTRON_AWP100 0xffffffff -#define PCMCIA_STR_ADDTRON_AWP100 "" -#define PCMCIA_CIS_ALLIEDTELESIS_WR211PCM { "Allied Telesis K.K.", "WR211PCM", NULL, NULL } -#define PCMCIA_PRODUCT_ALLIEDTELESIS_WR211PCM 0xffffffff -#define PCMCIA_STR_ALLIEDTELESIS_WR211PCM "Allied Telesis WR211PCM" -#define PCMCIA_CIS_AMBICOM_AMB8002T { "AmbiCom Inc", "AMB8002T", NULL, NULL } -#define PCMCIA_PRODUCT_AMBICOM_AMB8002T 0xffffffff -#define PCMCIA_STR_AMBICOM_AMB8002T "AmbiCom AMB8002T" -#define PCMCIA_CIS_AMD_AM79C930 { "AMD", "Am79C930", NULL, NULL } -#define PCMCIA_PRODUCT_AMD_AM79C930 0xffffffff -#define PCMCIA_STR_AMD_AM79C930 "AMD Am79C930" -#define PCMCIA_CIS_ARGOSY_SP320 { "PCMCIA", "RS-COM 2P", NULL, NULL -#define PCMCIA_PRODUCT_ARGOSY_SP320 0xffffffff -#define PCMCIA_STR_ARGOSY_SP320 "} ARGOSY SP320 Dual port serial PCMCIA" -#define PCMCIA_CIS_BILLIONTON_CFLT10N { "CF", "10Base-Ethernet", "1.0", NULL } -#define PCMCIA_PRODUCT_BILLIONTON_CFLT10N 0xffffffff -#define PCMCIA_STR_BILLIONTON_CFLT10N "Billionton Systems Inc. CFLT10N Ethernet" -#define PCMCIA_CIS_BILLIONTON_LNT10TN { "PCMCIA", "LNT-10TN", NULL, NULL } -#define PCMCIA_PRODUCT_BILLIONTON_LNT10TN 0xffffffff -#define PCMCIA_STR_BILLIONTON_LNT10TN "Billionton Systems Inc. LNT-10TN NE2000 Compatible Card" -#define PCMCIA_CIS_CNET_NE2000 { "CNet", "CN40BC Ethernet", "D", "NE2000" } -#define PCMCIA_PRODUCT_CNET_NE2000 0xffffffff -#define PCMCIA_STR_CNET_NE2000 "CNet CN40BC NE2000 Compatible" -#define PCMCIA_CIS_COREGA_ETHER_PCC_T { "corega K.K.", "corega Ether PCC-T", NULL, NULL } -#define PCMCIA_PRODUCT_COREGA_ETHER_PCC_T 0xffffffff -#define PCMCIA_STR_COREGA_ETHER_PCC_T "Corega Ether PCC-T" -#define PCMCIA_CIS_COREGA_ETHER_PCC_TD { "corega K.K.", "corega Ether PCC-TD", NULL, NULL } -#define PCMCIA_PRODUCT_COREGA_ETHER_PCC_TD 0xffffffff -#define PCMCIA_STR_COREGA_ETHER_PCC_TD "Corega Ether PCC-TD" -#define PCMCIA_CIS_COREGA_ETHER_II_PCC_T { "corega K.K.", "corega EtherII PCC-T", NULL, NULL } -#define PCMCIA_PRODUCT_COREGA_ETHER_II_PCC_T 0xffffffff -#define PCMCIA_STR_COREGA_ETHER_II_PCC_T "Corega EtherII PCC-T" -#define PCMCIA_CIS_COREGA_ETHER_II_PCC_TD { "corega K.K.", "corega EtherII PCC-TD", NULL, NULL } -#define PCMCIA_PRODUCT_COREGA_ETHER_II_PCC_TD 0xffffffff -#define PCMCIA_STR_COREGA_ETHER_II_PCC_TD "Corega EtherII PCC-TD" -#define PCMCIA_CIS_COREGA_FAST_ETHER_PCC_TX { "corega K.K.", "corega FastEther PCC-TX", NULL, NULL } -#define PCMCIA_PRODUCT_COREGA_FAST_ETHER_PCC_TX 0xffffffff -#define PCMCIA_STR_COREGA_FAST_ETHER_PCC_TX "Corega FastEther PCC-TX" -#define PCMCIA_CIS_COREGA_FETHER_PCC_TXD { "corega K.K.", "corega FEther PCC-TXD", NULL, NULL } -#define PCMCIA_PRODUCT_COREGA_FETHER_PCC_TXD 0xffffffff -#define PCMCIA_STR_COREGA_FETHER_PCC_TXD "Corega FEther PCC-TXD" -#define PCMCIA_CIS_COREGA_FETHER_PCC_TXF { "corega", "FEther PCC-TXF", NULL, NULL } -#define PCMCIA_PRODUCT_COREGA_FETHER_PCC_TXF 0xffffffff -#define PCMCIA_STR_COREGA_FETHER_PCC_TXF "Corega FEther PCC-TXF" -#define PCMCIA_CIS_COREGA_WIRELESS_LAN_PCC_11 { "corega K.K.", "Wireless LAN PCC-11", NULL, NULL } -#define PCMCIA_PRODUCT_COREGA_WIRELESS_LAN_PCC_11 0xffffffff -#define PCMCIA_STR_COREGA_WIRELESS_LAN_PCC_11 "Corega Wireless LAN PCC-11" -#define PCMCIA_CIS_COREGA_WIRELESS_LAN_PCCA_11 { "corega K.K.", "Wireless LAN PCCA-11", NULL, NULL } -#define PCMCIA_PRODUCT_COREGA_WIRELESS_LAN_PCCA_11 0xffffffff -#define PCMCIA_STR_COREGA_WIRELESS_LAN_PCCA_11 "Corega Wireless LAN PCCA-11" -#define PCMCIA_CIS_COREGA_WIRELESS_LAN_PCCB_11 { "corega_K.K.", "Wireless_LAN_PCCB-11", NULL, NULL } -#define PCMCIA_PRODUCT_COREGA_WIRELESS_LAN_PCCB_11 0xffffffff -#define PCMCIA_STR_COREGA_WIRELESS_LAN_PCCB_11 "Corega Wireless LAN PCCB-11" -#define PCMCIA_CIS_COREGA_WIRELESS_LAN_PCCL_11 { "corega", "WL PCCL-11", NULL, NULL } -#define PCMCIA_PRODUCT_COREGA_WIRELESS_LAN_PCCL_11 0xffffffff -#define PCMCIA_STR_COREGA_WIRELESS_LAN_PCCL_11 "Corega Wireless LAN PCCL-11" - -#define PCMCIA_CIS_DIGITAL_DEPCMXX { "DIGITAL", "DEPCM-XX", NULL, NULL } -#define PCMCIA_PRODUCT_DIGITAL_DEPCMXX 0xffffffff -#define PCMCIA_STR_DIGITAL_DEPCMXX "DEC DEPCM-BA" -#define PCMCIA_CIS_DLINK_DE650 { "D-Link", "DE-650", NULL, NULL } -#define PCMCIA_PRODUCT_DLINK_DE650 0xffffffff -#define PCMCIA_STR_DLINK_DE650 "D-Link DE-650" -#define PCMCIA_CIS_DLINK_DE660 { "D-Link", "DE-660", NULL, NULL } -#define PCMCIA_PRODUCT_DLINK_DE660 0xffffffff -#define PCMCIA_STR_DLINK_DE660 "D-Link DE-660" -#define PCMCIA_CIS_DLINK_DE660PLUS { "D-Link", "DE-660+", NULL, NULL } -#define PCMCIA_PRODUCT_DLINK_DE660PLUS 0xffffffff -#define PCMCIA_STR_DLINK_DE660PLUS "D-Link DE-660+" -#define PCMCIA_CIS_DLINK_DFE670TXD { "D-Link", "DFE-670TXD", NULL, NULL } -#define PCMCIA_PRODUCT_DLINK_DFE670TXD 0xffffffff -#define PCMCIA_STR_DLINK_DFE670TXD "D-Link DFE-670TXD" -#define PCMCIA_CIS_DLINK_DWL650H { "D-Link Corporation", "D-Link DWL-650H 11Mbps WLAN Adapter", NULL, NULL } -#define PCMCIA_PRODUCT_DLINK_DWL650H 0xffffffff -#define PCMCIA_STR_DLINK_DWL650H "D-Link DWL-650H" -#define PCMCIA_CIS_DYNALINK_L10C { "DYNALINK", "L10C", NULL, NULL } -#define PCMCIA_PRODUCT_DYNALINK_L10C 0xffffffff -#define PCMCIA_STR_DYNALINK_L10C "Dynalink L10C" -/* - * vendor ID of EPX_AA2000 is Fujitsu (0x0004) and product ID is 0x2000, but - * it conflicts with Fujitsu Towa LA501 Ethernet. - */ -#define PCMCIA_CIS_EIGERLABS_EPX_AA2000 { "Eiger labs,Inc.", "EPX-AA2000 PC Sound Card", NULL, NULL } -#define PCMCIA_PRODUCT_EIGERLABS_EPX_AA2000 0xffffffff -#define PCMCIA_STR_EIGERLABS_EPX_AA2000 "EPX-AA2000 PC Sound Card" -#define PCMCIA_CIS_EPSON_EEN10B { "Seiko Epson Corp.", "Ethernet", "P/N: EEN10B Rev. 00", NULL } -#define PCMCIA_PRODUCT_EPSON_EEN10B 0xffffffff -#define PCMCIA_STR_EPSON_EEN10B "Epson EEN10B" -#define PCMCIA_CIS_EPSON_SC200 { "EPSON", "SCSI-2 PC Card SC200", NULL, NULL } -#define PCMCIA_PRODUCT_EPSON_SC200 0xffffffff -#define PCMCIA_STR_EPSON_SC200 "Media Intelligent SCSI-2 PC Card MSC-200" -#define PCMCIA_CIS_EXP_EXPMULTIMEDIA { "EXP ", "PnPIDE", "F1", NULL } -#define PCMCIA_PRODUCT_EXP_EXPMULTIMEDIA 0xffffffff -#define PCMCIA_STR_EXP_EXPMULTIMEDIA "EXP IDE/ATAPI DVD Card" -#define PCMCIA_CIS_EXP_THINLANCOMBO { "PCMCIA LAN", "Ethernet", NULL, NULL } -#define PCMCIA_PRODUCT_EXP_THINLANCOMBO 0xffffffff -#define PCMCIA_STR_EXP_THINLANCOMBO "EXP ThinLan Combo" -#define PCMCIA_CIS_FREECOM_PCCARDIDE { "FREECOM", "PCCARD-IDE", NULL, NULL } -#define PCMCIA_PRODUCT_FREECOM_PCCARDIDE 0xffffffff -#define PCMCIA_STR_FREECOM_PCCARDIDE "FREECOM PCCARD-IDE" -#define PCMCIA_CIS_FUJITSU2_FMV_J181 { "PCMCIA MBH10302", "01", NULL, NULL } -#define PCMCIA_PRODUCT_FUJITSU2_FMV_J181 0xffffffff -#define PCMCIA_STR_FUJITSU2_FMV_J181 "FUJITSU FMV-J181 PCMCIA Card" -#define PCMCIA_CIS_FUJITSU2_FMV_J182 { "FUJITSU", "LAN Card(FMV-J182)", "Ver.01", NULL } -#define PCMCIA_PRODUCT_FUJITSU2_FMV_J182 0xffffffff -#define PCMCIA_STR_FUJITSU2_FMV_J182 "FUJITSU FMV-J182 PCMCIA Card" -#define PCMCIA_CIS_FUJITSU2_FMV_J182A { "FUJITSU", "LAN Card(FMV-J182)", "Ver.02", NULL } -#define PCMCIA_PRODUCT_FUJITSU2_FMV_J182A 0xffffffff -#define PCMCIA_STR_FUJITSU2_FMV_J182A "FUJITSU FMV-J182A PCMCIA Card" -#define PCMCIA_CIS_FUJITSU2_ITCFJ182A { "FUJITSU", "LAN Card(ITCFJ182)", "Ver.01", NULL } -#define PCMCIA_PRODUCT_FUJITSU2_ITCFJ182A 0xffffffff -#define PCMCIA_STR_FUJITSU2_ITCFJ182A "FUJITSU ITCFJ182A CompactCard" -#define PCMCIA_CIS_FUTUREDOMAIN_SCSI2GO { "Future Domain Corporation" "SCSI PCMCIA Credit Card Controller", NULL, NULL } -#define PCMCIA_PRODUCT_FUTUREDOMAIN_SCSI2GO 0xffffffff -#define PCMCIA_STR_FUTUREDOMAIN_SCSI2GO "Future Domain SCSI2GO" -#define PCMCIA_CIS_GEMTEK_WLAN { "Intersil", "PRISM 2_5 PCMCIA ADAPTER", "ISL37300P", "Eval-RevA" } -#define PCMCIA_PRODUCT_GEMTEK_WLAN 0xffffffff -#define PCMCIA_STR_GEMTEK_WLAN "GEMTEK Prism2_5 WaveLAN Card" -#define PCMCIA_CIS_IBM_SCSICARD { "IBM Corp.", "SCSI PCMCIA Card", NULL, NULL } -#define PCMCIA_PRODUCT_IBM_SCSICARD 0xffffffff -#define PCMCIA_STR_IBM_SCSICARD "IBM SCSI PCMCIA Card" -#define PCMCIA_CIS_ICOM_SL200 { "Icom", "SL-200", NULL, NULL } -#define PCMCIA_PRODUCT_ICOM_SL200 0xffffffff -#define PCMCIA_STR_ICOM_SL200 "Icom SL-200" -#define PCMCIA_CIS_INTERSIL2_PRISM2 { "INTERSIL", "HFA384x/IEEE", "Version 01.02", NULL } -#define PCMCIA_PRODUCT_INTERSIL2_PRISM2 0xffffffff -#define PCMCIA_STR_INTERSIL2_PRISM2 "Intersil Prism II" -#define PCMCIA_CIS_IODATA_CBIDE2 { "IO DATA", "CBIDE2 ", NULL, NULL } -#define PCMCIA_PRODUCT_IODATA_CBIDE2 0xffffffff -#define PCMCIA_STR_IODATA_CBIDE2 "IO-DATA CBIDE2/16-bit mode" -#define PCMCIA_CIS_IODATA3_CBSC16 { "IO DATA", "CBSC16 ", NULL, NULL } -#define PCMCIA_PRODUCT_IODATA3_CBSC16 0xffffffff -#define PCMCIA_STR_IODATA3_CBSC16 "IO-DATA CBSC16" -#define PCMCIA_CIS_IODATA_PCLAT { "I-O DATA", "PCLA", "ETHERNET", NULL } -#define PCMCIA_PRODUCT_IODATA_PCLAT 0xffffffff -#define PCMCIA_STR_IODATA_PCLAT "IO-DATA PCLA/T" -#define PCMCIA_CIS_LANTECH_FASTNETTX { "ASIX", "AX88190", NULL, NULL } -#define PCMCIA_PRODUCT_LANTECH_FASTNETTX 0xffffffff -#define PCMCIA_STR_LANTECH_FASTNETTX "Lantech Fastnet/TX" -#define PCMCIA_CIS_LINKSYS_ECARD_2 { "LINKSYS", "E-CARD", NULL, NULL } -#define PCMCIA_PRODUCT_LINKSYS_ECARD_2 0xffffffff -#define PCMCIA_STR_LINKSYS_ECARD_2 "Linksys E-Card" -#define PCMCIA_CIS_LINKSYS_PCM100 { "Linksys", "EtherFast 10/100 Integrated PC Card (PCM100)", "Ver 1.0", NULL } -#define PCMCIA_PRODUCT_LINKSYS_PCM100 0xffffffff -#define PCMCIA_STR_LINKSYS_PCM100 "" -#define PCMCIA_CIS_MACNICA_MPS100 { "MACNICA", "MIRACLE SCSI", "mPS100", "D.0" } -#define PCMCIA_PRODUCT_MACNICA_MPS100 0xffffffff -#define PCMCIA_STR_MACNICA_MPS100 "Macnica Miracle SCSI mPS100" -#define PCMCIA_CIS_MEGAHERTZ_XJ2288 { "MEGAHERTZ", "MODEM XJ2288", NULL, NULL } -#define PCMCIA_PRODUCT_MEGAHERTZ_XJ2288 0xffffffff -#define PCMCIA_STR_MEGAHERTZ_XJ2288 "Megahertz XJ2288 Modem" -#define PCMCIA_CIS_MELCO2_LPC2_TX { "MELCO", "LPC2-TX", NULL, NULL } -#define PCMCIA_PRODUCT_MELCO2_LPC2_TX 0xffffffff -#define PCMCIA_STR_MELCO2_LPC2_TX "Melco LPC2-TX" -#define PCMCIA_CIS_NAKAGAWAMETAL_LNT10TN { "PCMCIA", "LNT-10TN", NULL, NULL } -#define PCMCIA_PRODUCT_NAKAGAWAMETAL_LNT10TN 0xffffffff -#define PCMCIA_STR_NAKAGAWAMETAL_LNT10TN "NAKAGAWA METAL LNT-10TN NE2000 Compatible Card" -#define PCMCIA_CIS_NANOSPEED_PRISM2 { "NANOSPEED", "HFA384x/IEEE", "Version 01.02", NULL } -#define PCMCIA_PRODUCT_NANOSPEED_PRISM2 0xffffffff -#define PCMCIA_STR_NANOSPEED_PRISM2 "NANOSPEED ROOT-RZ2000 WLAN Card" -#define PCMCIA_CIS_NDC_ND5100_E { "NDC", "Ethernet", "A", NULL } -#define PCMCIA_PRODUCT_NDC_ND5100_E 0xffffffff -#define PCMCIA_STR_NDC_ND5100_E "Sohoware ND5100E NE2000 Compatible Card" -#define PCMCIA_CIS_NEC_CMZ_RT_WP { "NEC", "Wireless Card CMZ-RT-WP", "Version 01.01", NULL } -#define PCMCIA_PRODUCT_NEC_CMZ_RT_WP 0xffffffff -#define PCMCIA_STR_NEC_CMZ_RT_WP "NEC Wireless Card CMZ-RT-WP" -#define PCMCIA_CIS_NEC_PC9801N_J03R { "NEC", "PC-9801N-J03R", NULL, NULL } -#define PCMCIA_PRODUCT_NEC_PC9801N_J03R 0xffffffff -#define PCMCIA_STR_NEC_PC9801N_J03R "NEC PC-9801N-J03R" -#define PCMCIA_CIS_NEWMEDIA_BASICS_SCSI { "BASICS by New Media Corporation" "SCSI Sym53C500", NULL, NULL } -#define PCMCIA_PRODUCT_NEWMEDIA_BASICS_SCSI 0xffffffff -#define PCMCIA_STR_NEWMEDIA_BASICS_SCSI "New Media Corporation BASICS SCSI" -#define PCMCIA_CIS_NTT_ME_WLAN { "NTT-ME", "11Mbps Wireless LAN PC Card", NULL, NULL } -#define PCMCIA_PRODUCT_NTT_ME_WLAN 0xffffffff -#define PCMCIA_STR_NTT_ME_WLAN "NTT-ME 11Mbps Wireless LAN PC Card" -#define PCMCIA_CIS_OEM2_CDROM1 { "PCMCIA", "CD-ROM", NULL, NULL } -#define PCMCIA_PRODUCT_OEM2_CDROM1 0xffffffff -#define PCMCIA_STR_OEM2_CDROM1 "Generic PCMCIA CD-ROM" -#define PCMCIA_CIS_OEM2_IDE { "PCMCIA", "IDE CARD", NULL, NULL } -#define PCMCIA_PRODUCT_OEM2_IDE 0xffffffff -#define PCMCIA_STR_OEM2_IDE "Generic PCMCIA IDE CARD" -#define PCMCIA_CIS_PLANET_SMARTCOM2000 { "PCMCIA", "UE2212", NULL, NULL } -#define PCMCIA_PRODUCT_PLANET_SMARTCOM2000 0xffffffff -#define PCMCIA_STR_PLANET_SMARTCOM2000 "Planet SmartCOM 2000" -/* - * vendor ID of both FNW-3600-T and FNW-3700-T is LINKSYS (0x0149) and - * product ID is 0xc1ab, but it conflicts with LINKSYS Combo EthernetCard. - */ -#define PCMCIA_CIS_PLANEX_FNW3600T { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_PLANEX_FNW3600T -1 -#define PCMCIA_STR_PLANEX_FNW3600T "Planex FNW-3600-T" -#define PCMCIA_CIS_PLANEX_FNW3700T { NULL, NULL, NULL, NULL } -#define PCMCIA_PRODUCT_PLANEX_FNW3700T -1 -#define PCMCIA_STR_PLANEX_FNW3700T "Planex FNW-3700-T" -#define PCMCIA_CIS_RPTI_EP400 { "RPTI LTD.", "EP400", "CISV100", NULL } -#define PCMCIA_PRODUCT_RPTI_EP400 0xffffffff -#define PCMCIA_STR_RPTI_EP400 "RPTI EP400" -#define PCMCIA_CIS_RPTI_EP401 { "RPTI", "EP401 Ethernet NE2000 Compatible", NULL, NULL } -#define PCMCIA_PRODUCT_RPTI_EP401 0xffffffff -#define PCMCIA_STR_RPTI_EP401 "RPTI EP401" -#define PCMCIA_CIS_PREMAX_PE200 { "PMX ", "PE-200", NULL, NULL } -#define PCMCIA_PRODUCT_PREMAX_PE200 0xffffffff -#define PCMCIA_STR_PREMAX_PE200 "PreMax PE-200" -#define PCMCIA_CIS_RATOC_REX_R280 { "RATOC System Inc.", "10BASE_T CARD R280", NULL, NULL } -#define PCMCIA_PRODUCT_RATOC_REX_R280 0xffffffff -#define PCMCIA_STR_RATOC_REX_R280 "RATOC REX-R280" -#define PCMCIA_CIS_RATOC_REX5536 { "1195 RATOC System Inc.", "REX5536 SCSI2 CARD", NULL, NULL } -#define PCMCIA_PRODUCT_RATOC_REX5536 0xffffffff -#define PCMCIA_STR_RATOC_REX5536 "RATOC REX-5536" -#define PCMCIA_CIS_RATOC_REX5536AM { "PCMCIA SCSI MBH10404", "01", NULL, NULL } -#define PCMCIA_PRODUCT_RATOC_REX5536AM 0xffffffff -#define PCMCIA_STR_RATOC_REX5536AM "RATOC REX-5536AM" -#define PCMCIA_CIS_RATOC_REX5536M { "PCMCIA SCSI2 CARD", "01", NULL, NULL } -#define PCMCIA_PRODUCT_RATOC_REX5536M 0xffffffff -#define PCMCIA_STR_RATOC_REX5536M "RATOC REX-5536M" -#define PCMCIA_CIS_RATOC_REX5572 { "RATOC System Inc.", "SOUND/SCSI2 CARD", NULL, NULL } -#define PCMCIA_PRODUCT_RATOC_REX5572 0xffffffff -#define PCMCIA_STR_RATOC_REX5572 "RATOC REX-5572" -#define PCMCIA_CIS_RATOC_REX9530 { "RATOC System Inc.", "SCSI2 CARD 37", NULL, NULL } -#define PCMCIA_PRODUCT_RATOC_REX9530 0xffffffff -#define PCMCIA_STR_RATOC_REX9530 "RATOC REX-9530" -#define PCMCIA_CIS_SIMPLETECH_SPECTRUM24_ALT { "Symbol Technologies", "LA4111 Spectrum24 Wireless LAN PC Card", NULL, NULL } -#define PCMCIA_PRODUCT_SIMPLETECH_SPECTRUM24_ALT 0xffffffff -#define PCMCIA_STR_SIMPLETECH_SPECTRUM24_ALT "LA4111 Spectrum24 Wireless LAN PC Card" -#define PCMCIA_CIS_SMC_2632W { "SMC", "SMC2632W", "Version 01.02", NULL } -#define PCMCIA_PRODUCT_SMC_2632W 0xffffffff -#define PCMCIA_STR_SMC_2632W "SMC 2632 EZ Connect Wireless PC Card" -#define PCMCIA_CIS_SMC_8041 { "SMC", "8041TX-10/100-PC-Card-V2", NULL, NULL } -#define PCMCIA_PRODUCT_SMC_8041 0xffffffff -#define PCMCIA_STR_SMC_8041 "SMC 8041TX 10/100 PC Card" -#define PCMCIA_CIS_SVEC_COMBOCARD { "Ethernet", "Adapter", NULL, NULL } -#define PCMCIA_PRODUCT_SVEC_COMBOCARD 0xffffffff -#define PCMCIA_STR_SVEC_COMBOCARD "SVEC/Hawking Tech. Combo Card" -#define PCMCIA_CIS_SVEC_LANCARD { "SVEC", "FD605 PCMCIA EtherNet Card", "V1-1", NULL } -#define PCMCIA_PRODUCT_SVEC_LANCARD 0xffffffff -#define PCMCIA_STR_SVEC_LANCARD "SVEC PCMCIA Lan Card" -#define PCMCIA_CIS_SYNERGY21_S21810 { "PCMCIA", "Ethernet", "A", "004743118001" } -#define PCMCIA_PRODUCT_SYNERGY21_S21810 0xffffffff -#define PCMCIA_STR_SYNERGY21_S21810 "Synergy 21 S21810+ NE2000 Compatible Card" -#define PCMCIA_CIS_TEAC_IDECARDII { NULL, "NinjaATA-", NULL, NULL } -#define PCMCIA_PRODUCT_TEAC_IDECARDII 0xffffffff -#define PCMCIA_STR_TEAC_IDECARDII "TEAC IDE Card/II" -#define PCMCIA_CIS_TOSHIBA_CBIDE2 { "LOOKMEET", "CBIDE2 ", NULL, NULL } -#define PCMCIA_PRODUCT_TOSHIBA_CBIDE2 0xffffffff -#define PCMCIA_STR_TOSHIBA_CBIDE2 "TOSHIBA PA2673U CBIDE2/16-bit mode (IO-DATA OEM)" -#define PCMCIA_CIS_WORKBIT2_NINJA_SCSI3 { "WBT", "NinjaSCSI-3", NULL, NULL } -#define PCMCIA_PRODUCT_WORKBIT2_NINJA_SCSI3 0xffffffff -#define PCMCIA_STR_WORKBIT2_NINJA_SCSI3 "WORKBIT Ninja SCSI series" -#define PCMCIA_CIS_XIRCOM_CFE_10 { "Xircom", "CompactCard Ethernet", "CFE-10", "1.00" } -#define PCMCIA_PRODUCT_XIRCOM_CFE_10 0xffffffff -#define PCMCIA_STR_XIRCOM_CFE_10 "Xircom CompactCard CFE-10" -#define PCMCIA_CIS_YEDATA_EXTERNAL_FDD { "Y-E DATA", "External FDD", NULL, NULL } -#define PCMCIA_PRODUCT_YEDATA_EXTERNAL_FDD 0xffffffff -#define PCMCIA_STR_YEDATA_EXTERNAL_FDD "Y-E DATA External FDD" -#define PCMCIA_CIS_YIS_YWL11B { "YIS Corp.", "YWL-11b", NULL, NULL } -#define PCMCIA_PRODUCT_YIS_YWL11B 0xffffffff -#define PCMCIA_STR_YIS_YWL11B "YIS Corp. YWL-11b" -#define PCMCIA_CIS_ZOOM_AIR_4000 { "Zoom", "Air-4000", NULL, NULL } -#define PCMCIA_PRODUCT_ZOOM_AIR_4000 0xffffffff -#define PCMCIA_STR_ZOOM_AIR_4000 "Zoom Air-4000" diff --git a/sys/dev/sio/sio_pccard.c b/sys/dev/sio/sio_pccard.c index 9202184..a666073 100644 --- a/sys/dev/sio/sio_pccard.c +++ b/sys/dev/sio/sio_pccard.c @@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$"); #include <sys/timepps.h> #include <dev/pccard/pccard_cis.h> -#include <dev/pccard/pccarddevs.h> +#include "pccarddevs.h" #include <dev/pccard/pccardreg.h> #include <dev/pccard/pccardvar.h> diff --git a/sys/dev/sn/if_sn_pccard.c b/sys/dev/sn/if_sn_pccard.c index 51f120d..0122a2d 100644 --- a/sys/dev/sn/if_sn_pccard.c +++ b/sys/dev/sn/if_sn_pccard.c @@ -49,7 +49,7 @@ __FBSDID("$FreeBSD$"); #include <dev/sn/if_snvar.h> #include <dev/pccard/pccardvar.h> -#include <dev/pccard/pccarddevs.h> +#include "pccarddevs.h" #include "card_if.h" diff --git a/sys/dev/stg/tmc18c30_pccard.c b/sys/dev/stg/tmc18c30_pccard.c index 347bb02..984f33a 100644 --- a/sys/dev/stg/tmc18c30_pccard.c +++ b/sys/dev/stg/tmc18c30_pccard.c @@ -52,7 +52,7 @@ __FBSDID("$FreeBSD$"); #include <sys/device_port.h> -#include <dev/pccard/pccarddevs.h> +#include "pccarddevs.h" #include <dev/pccard/pccardvar.h> #include <cam/scsi/scsi_low.h> diff --git a/sys/dev/uart/uart_bus_pccard.c b/sys/dev/uart/uart_bus_pccard.c index 968a41a..796b288 100644 --- a/sys/dev/uart/uart_bus_pccard.c +++ b/sys/dev/uart/uart_bus_pccard.c @@ -36,7 +36,7 @@ __FBSDID("$FreeBSD$"); #include <machine/resource.h> #include <dev/pccard/pccard_cis.h> -#include <dev/pccard/pccarddevs.h> +#include "pccarddevs.h" #include <dev/pccard/pccardreg.h> #include <dev/pccard/pccardvar.h> diff --git a/sys/dev/wi/if_wi_pccard.c b/sys/dev/wi/if_wi_pccard.c index d817a2f..941e76a 100644 --- a/sys/dev/wi/if_wi_pccard.c +++ b/sys/dev/wi/if_wi_pccard.c @@ -66,7 +66,7 @@ __FBSDID("$FreeBSD$"); #include <dev/pccard/pccardvar.h> #if __FreeBSD_version >= 500000 -#include <dev/pccard/pccarddevs.h> +#include "pccarddevs.h" #endif #include <dev/wi/if_wavelan_ieee.h> diff --git a/sys/dev/xe/if_xe_pccard.c b/sys/dev/xe/if_xe_pccard.c index 9c3cf8b..cb71f94 100644 --- a/sys/dev/xe/if_xe_pccard.c +++ b/sys/dev/xe/if_xe_pccard.c @@ -52,7 +52,7 @@ __FBSDID("$FreeBSD$"); #include <dev/xe/if_xevar.h> #include <dev/pccard/pccardvar.h> -#include <dev/pccard/pccarddevs.h> +#include "pccarddevs.h" #include <dev/pccard/pccard_cis.h> #include "card_if.h" diff --git a/sys/modules/aic/Makefile b/sys/modules/aic/Makefile index 60df81a..860d9a8 100644 --- a/sys/modules/aic/Makefile +++ b/sys/modules/aic/Makefile @@ -4,7 +4,7 @@ KMOD= aic SRCS= aic.c aic_pccard.c -SRCS+= opt_bdg.h device_if.h bus_if.h pci_if.h isa_if.h card_if.h +SRCS+= device_if.h bus_if.h pci_if.h isa_if.h card_if.h pccarddevs.h SRCS+= opt_cam.h opt_scsi.h .if ${MACHINE} == "pc98" diff --git a/sys/modules/an/Makefile b/sys/modules/an/Makefile index 74fd203..c2c66d5 100644 --- a/sys/modules/an/Makefile +++ b/sys/modules/an/Makefile @@ -5,6 +5,7 @@ KMOD= if_an SRCS= if_an.c if_an_pccard.c if_an_pci.c if_an_isa.c SRCS+= opt_inet.h device_if.h bus_if.h pci_if.h isa_if.h card_if.h +SRCS+= pccarddevs.h opt_inet.h: echo "#define INET 1" > opt_inet.h diff --git a/sys/modules/awi/Makefile b/sys/modules/awi/Makefile index b0e743b..554ffe5 100644 --- a/sys/modules/awi/Makefile +++ b/sys/modules/awi/Makefile @@ -4,7 +4,7 @@ KMOD= if_awi SRCS= am79c930.c awi.c if_awi_pccard.c -SRCS+= bus_if.h card_if.h device_if.h opt_inet.h +SRCS+= bus_if.h card_if.h device_if.h opt_inet.h pccarddevs.h opt_inet.h: echo "#define INET 1" > opt_inet.h diff --git a/sys/modules/cs/Makefile b/sys/modules/cs/Makefile index 579a860..49f7e11 100644 --- a/sys/modules/cs/Makefile +++ b/sys/modules/cs/Makefile @@ -4,6 +4,6 @@ KMOD= if_cs SRCS= if_cs.c if_cs_pccard.c if_cs_isa.c -SRCS+= bus_if.h card_if.h device_if.h isa_if.h +SRCS+= bus_if.h card_if.h device_if.h isa_if.h pccarddevs.h .include <bsd.kmod.mk> diff --git a/sys/modules/ed/Makefile b/sys/modules/ed/Makefile index ea8ac04..dda16ed 100644 --- a/sys/modules/ed/Makefile +++ b/sys/modules/ed/Makefile @@ -12,6 +12,6 @@ SRCS+= if_ed_isa.c .endif SRCS+= opt_ed.h opt_bdg.h bus_if.h card_if.h device_if.h isa_if.h pci_if.h \ - miibus_if.h + miibus_if.h pccarddevs.h .include <bsd.kmod.mk> diff --git a/sys/modules/ep/Makefile b/sys/modules/ep/Makefile index 71fdcc2..9d32932 100644 --- a/sys/modules/ep/Makefile +++ b/sys/modules/ep/Makefile @@ -7,6 +7,6 @@ SRCS= if_ep.c if_ep_pccard.c SRCS+= if_ep_isa.c #SRCS+= if_ep_eisa.c #SRCS+= if_ep_mca.c -SRCS+= opt_bdg.h bus_if.h card_if.h device_if.h isa_if.h pci_if.h +SRCS+= opt_bdg.h bus_if.h card_if.h device_if.h isa_if.h pci_if.h pccarddevs.h .include <bsd.kmod.mk> diff --git a/sys/modules/ex/Makefile b/sys/modules/ex/Makefile index 34f0f13..5c394aa 100644 --- a/sys/modules/ex/Makefile +++ b/sys/modules/ex/Makefile @@ -7,6 +7,6 @@ KMOD= if_ex SRCS= if_ex.c \ if_ex_isa.c isa_if.h \ if_ex_pccard.c card_if.h \ - bus_if.h device_if.h + bus_if.h device_if.h pccarddevs.h .include <bsd.kmod.mk> diff --git a/sys/modules/exca/Makefile b/sys/modules/exca/Makefile index d576611..b7a8d52 100644 --- a/sys/modules/exca/Makefile +++ b/sys/modules/exca/Makefile @@ -3,6 +3,6 @@ .PATH: ${.CURDIR}/../../dev/exca KMOD= exca -SRCS= exca.c device_if.h bus_if.h power_if.h card_if.h +SRCS= exca.c device_if.h bus_if.h power_if.h card_if.h pccarddevs.h .include <bsd.kmod.mk> diff --git a/sys/modules/fdc/Makefile b/sys/modules/fdc/Makefile index b3751f7..2635148 100644 --- a/sys/modules/fdc/Makefile +++ b/sys/modules/fdc/Makefile @@ -13,7 +13,7 @@ SRCS= fd.c SRCS= fdc.c .endif SRCS+= opt_fdc.h card.h \ - bus_if.h card_if.h device_if.h isa_if.h + bus_if.h card_if.h device_if.h isa_if.h pccarddevs.h FDC_DEBUG?= 0 # 0/1 FDC_PCCARD?= 1 # 0/1 whether pccard support (i. e. Y-E DATA PCMCIA diff --git a/sys/modules/fe/Makefile b/sys/modules/fe/Makefile index bbebe86..77af85b 100644 --- a/sys/modules/fe/Makefile +++ b/sys/modules/fe/Makefile @@ -11,6 +11,6 @@ SRCS+= if_fe_cbus.c SRCS+= if_fe_isa.c .endif -SRCS+= bus_if.h card_if.h device_if.h isa_if.h +SRCS+= bus_if.h card_if.h device_if.h isa_if.h pccarddevs.h .include <bsd.kmod.mk> diff --git a/sys/modules/if_ndis/Makefile b/sys/modules/if_ndis/Makefile index 47c3bb1..bce7c96 100644 --- a/sys/modules/if_ndis/Makefile +++ b/sys/modules/if_ndis/Makefile @@ -4,6 +4,6 @@ KMOD= if_ndis SRCS= if_ndis.c if_ndis_pci.c if_ndis_pccard.c -SRCS+= opt_bdg.h device_if.h bus_if.h pci_if.h card_if.h +SRCS+= opt_bdg.h device_if.h bus_if.h pci_if.h card_if.h pccarddevs.h .include <bsd.kmod.mk> diff --git a/sys/modules/joy/Makefile b/sys/modules/joy/Makefile index 042db89..71ba7f1 100644 --- a/sys/modules/joy/Makefile +++ b/sys/modules/joy/Makefile @@ -3,6 +3,7 @@ .PATH: ${.CURDIR}/../../dev/joy KMOD= joy -SRCS= bus_if.h device_if.h isa_if.h card_if.h joy.c joy_isa.c joy_pccard.c +SRCS= bus_if.h device_if.h isa_if.h card_if.h joy.c joy_isa.c joy_pccard.c \ + pccarddevs.h .include <bsd.kmod.mk> diff --git a/sys/modules/ncv/Makefile b/sys/modules/ncv/Makefile index 9d6e842..b1a273a 100644 --- a/sys/modules/ncv/Makefile +++ b/sys/modules/ncv/Makefile @@ -4,7 +4,7 @@ KMOD= ncv SRCS= ncr53c500_pccard.c ncr53c500.c -SRCS+= opt_bdg.h device_if.h bus_if.h pci_if.h isa_if.h card_if.h +SRCS+= opt_bdg.h device_if.h bus_if.h pci_if.h isa_if.h card_if.h pccarddevs.h SRCS+= opt_cam.h opt_scsi.h opt_ddb.h .include <bsd.kmod.mk> diff --git a/sys/modules/netgraph/bluetooth/bt3c/Makefile b/sys/modules/netgraph/bluetooth/bt3c/Makefile index 8cb8550..753400e 100644 --- a/sys/modules/netgraph/bluetooth/bt3c/Makefile +++ b/sys/modules/netgraph/bluetooth/bt3c/Makefile @@ -7,7 +7,7 @@ CFLAGS+= -I${.CURDIR}/../../../../netgraph/bluetooth/include \ -I${.CURDIR}/../../../../netgraph/bluetooth/drivers/bt3c KMOD= ng_bt3c -SRCS= ng_bt3c_pccard.c bus_if.h card_if.h device_if.h +SRCS= ng_bt3c_pccard.c bus_if.h card_if.h device_if.h pccarddevs.h .include <bsd.kmod.mk> diff --git a/sys/modules/nsp/Makefile b/sys/modules/nsp/Makefile index 5c69310..3cdc705 100644 --- a/sys/modules/nsp/Makefile +++ b/sys/modules/nsp/Makefile @@ -4,7 +4,7 @@ KMOD= nsp SRCS= nsp.c nsp_pccard.c -SRCS+= opt_bdg.h device_if.h bus_if.h pci_if.h isa_if.h card_if.h +SRCS+= opt_bdg.h device_if.h bus_if.h pci_if.h isa_if.h card_if.h pccarddevs.h SRCS+= opt_cam.h opt_scsi.h opt_ddb.h .include <bsd.kmod.mk> diff --git a/sys/modules/oldcard/Makefile b/sys/modules/oldcard/Makefile index 8a94ab6..cbe92d7 100644 --- a/sys/modules/oldcard/Makefile +++ b/sys/modules/oldcard/Makefile @@ -5,7 +5,7 @@ KMOD= oldcard SRCS= pccard.c pcic.c pccard_beep.c pccard_nbk.c pcic_pci.c pcic_isa.c \ opt_pcic.h device_if.h bus_if.h isa_if.h pci_if.h \ - power_if.h card_if.h + power_if.h card_if.h pccarddevs.h EXPORT_SYMS= YES # XXX evaluate diff --git a/sys/modules/owi/Makefile b/sys/modules/owi/Makefile index 3ffb1b0..85f5c71 100644 --- a/sys/modules/owi/Makefile +++ b/sys/modules/owi/Makefile @@ -4,7 +4,7 @@ KMOD= if_owi SRCS= opt_wi.h if_owi.c if_owi_pccard.c \ - card_if.h device_if.h bus_if.h pci_if.h + card_if.h device_if.h bus_if.h pci_if.h pccarddevs.h opt_wi.h: touch ${.TARGET} diff --git a/sys/modules/pccard/Makefile b/sys/modules/pccard/Makefile index e1cd70a..f77bc57 100644 --- a/sys/modules/pccard/Makefile +++ b/sys/modules/pccard/Makefile @@ -4,6 +4,6 @@ KMOD= pccard SRCS= pccard.c pccard_cis.c pccard_cis_quirks.c \ - device_if.h bus_if.h card_if.h power_if.h + device_if.h bus_if.h card_if.h power_if.h pccarddevs.h .include <bsd.kmod.mk> diff --git a/sys/modules/pcic/Makefile b/sys/modules/pcic/Makefile index d0ab817..00b0643 100644 --- a/sys/modules/pcic/Makefile +++ b/sys/modules/pcic/Makefile @@ -4,6 +4,6 @@ KMOD= pcic SRCS= i82365.c i82365_isa.c device_if.h bus_if.h isa_if.h \ - power_if.h card_if.h power_if.c card_if.c + power_if.h card_if.h power_if.c card_if.c pccarddevs.h .include <bsd.kmod.mk> diff --git a/sys/modules/ray/Makefile b/sys/modules/ray/Makefile index 2d9f5fc..84eb9d9 100644 --- a/sys/modules/ray/Makefile +++ b/sys/modules/ray/Makefile @@ -4,6 +4,6 @@ KMOD= if_ray SRCS= if_ray.c -SRCS+= device_if.h bus_if.h card_if.h opt_inet.h +SRCS+= device_if.h bus_if.h card_if.h opt_inet.h pccarddevs.h .include <bsd.kmod.mk> diff --git a/sys/modules/sio/Makefile b/sys/modules/sio/Makefile index 1e948a3..7423563 100644 --- a/sys/modules/sio/Makefile +++ b/sys/modules/sio/Makefile @@ -8,7 +8,7 @@ KMOD= sio SRCS= bus_if.h card_if.h device_if.h isa_if.h pci_if.h \ opt_comconsole.h opt_compat.h opt_ddb.h opt_sio.h \ - sio.c sio_pccard.c sio_pci.c sio_puc.c + sio.c sio_pccard.c sio_pci.c sio_puc.c pccarddevs.h .if ${MACHINE} == "pc98" SRCS+= sio_cbus.c .else diff --git a/sys/modules/sn/Makefile b/sys/modules/sn/Makefile index b443ab2..b248c75 100644 --- a/sys/modules/sn/Makefile +++ b/sys/modules/sn/Makefile @@ -4,6 +4,6 @@ KMOD= if_sn SRCS= if_sn.c if_sn_isa.c if_sn_pccard.c device_if.h bus_if.h isa_if.h \ - card_if.h + card_if.h pccarddevs.h .include <bsd.kmod.mk> diff --git a/sys/modules/stg/Makefile b/sys/modules/stg/Makefile index d479777..83362d3 100644 --- a/sys/modules/stg/Makefile +++ b/sys/modules/stg/Makefile @@ -5,7 +5,7 @@ KMOD= stg SRCS= tmc18c30.c tmc18c30_subr.c \ tmc18c30_isa.c isa_if.h \ - tmc18c30_pccard.c card_if.h \ + tmc18c30_pccard.c card_if.h pccarddevs.h \ tmc18c30_pci.c pci_if.h SRCS+= opt_bdg.h device_if.h bus_if.h SRCS+= opt_cam.h opt_scsi.h opt_ddb.h diff --git a/sys/modules/uart/Makefile b/sys/modules/uart/Makefile index 4de0e9a..e03e0ec 100644 --- a/sys/modules/uart/Makefile +++ b/sys/modules/uart/Makefile @@ -11,6 +11,7 @@ SRCS= uart_bus_acpi.c ${uart_bus_ebus} uart_bus_isa.c uart_bus_pccard.c \ uart_bus_pci.c uart_bus_puc.c uart_core.c uart_cpu_${MACHINE}.c \ uart_dev_i8251.c uart_dev_ns8250.c uart_dev_sab82532.c \ uart_dev_z8530.c uart_if.c uart_subr.c uart_tty.c -SRCS+= bus_if.h device_if.h isa_if.h pci_if.h uart_if.h power_if.h card_if.h +SRCS+= bus_if.h device_if.h isa_if.h pci_if.h uart_if.h power_if.h card_if.h \ + pccarddevs.h .include <bsd.kmod.mk> diff --git a/sys/modules/wi/Makefile b/sys/modules/wi/Makefile index 75e1d69..ee577e8 100644 --- a/sys/modules/wi/Makefile +++ b/sys/modules/wi/Makefile @@ -4,7 +4,7 @@ KMOD= if_wi SRCS= opt_wi.h if_wi.c if_wi_pccard.c if_wi_pci.c \ - card_if.h device_if.h bus_if.h pci_if.h + card_if.h device_if.h bus_if.h pci_if.h pccarddevs.h opt_wi.h: echo "#define WI_SYMBOL_FIRMWARE 1" > ${.TARGET} diff --git a/sys/modules/xe/Makefile b/sys/modules/xe/Makefile index 4568fb74..f900854 100644 --- a/sys/modules/xe/Makefile +++ b/sys/modules/xe/Makefile @@ -4,6 +4,6 @@ KMOD= if_xe SRCS= if_xe.c if_xe_pccard.c -SRCS+= bus_if.h card_if.h device_if.h +SRCS+= bus_if.h card_if.h device_if.h pccarddevs.h .include <bsd.kmod.mk> diff --git a/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c b/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c index 656d20c..35fd6a7 100644 --- a/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c +++ b/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c @@ -59,7 +59,7 @@ #include <dev/pccard/pccardreg.h> #include <dev/pccard/pccardvar.h> -#include <dev/pccard/pccarddevs.h> +#include "pccarddevs.h" #include <netgraph/ng_message.h> #include <netgraph/netgraph.h> |
