diff options
author | Brad Smith <brad@cvs.openbsd.org> | 2004-10-07 21:17:00 +0000 |
---|---|---|
committer | Brad Smith <brad@cvs.openbsd.org> | 2004-10-07 21:17:00 +0000 |
commit | 9350625265b367dd90f4e9d1e3a690ec3f31767b (patch) | |
tree | b82efaabd250819cc10a7f2ea318c13bd48bb3b3 /sys/dev | |
parent | 132749700173796cbd1512b1a7b854936be23b50 (diff) |
cardbusdevs -> pcidevs
From NetBSD
Diffstat (limited to 'sys/dev')
-rw-r--r-- | sys/dev/cardbus/Makefile | 8 | ||||
-rw-r--r-- | sys/dev/cardbus/cardbus.c | 6 | ||||
-rw-r--r-- | sys/dev/cardbus/cardbusdevs | 131 | ||||
-rw-r--r-- | sys/dev/cardbus/cardbusdevs.h | 138 | ||||
-rw-r--r-- | sys/dev/cardbus/cardbusdevs_data.h | 248 | ||||
-rw-r--r-- | sys/dev/cardbus/com_cardbus.c | 14 | ||||
-rw-r--r-- | sys/dev/cardbus/devlist2h.awk | 208 | ||||
-rw-r--r-- | sys/dev/cardbus/fwohci_cardbus.c | 3 | ||||
-rw-r--r-- | sys/dev/cardbus/if_atw_cardbus.c | 3 | ||||
-rw-r--r-- | sys/dev/cardbus/if_dc_cardbus.c | 19 | ||||
-rw-r--r-- | sys/dev/cardbus/if_fxp_cardbus.c | 9 | ||||
-rw-r--r-- | sys/dev/cardbus/if_rl_cardbus.c | 21 | ||||
-rw-r--r-- | sys/dev/cardbus/if_xl_cardbus.c | 18 |
13 files changed, 43 insertions, 783 deletions
diff --git a/sys/dev/cardbus/Makefile b/sys/dev/cardbus/Makefile deleted file mode 100644 index 292061f1a71..00000000000 --- a/sys/dev/cardbus/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# $OpenBSD: Makefile,v 1.1 2001/01/27 21:16:00 deraadt Exp $ -# $NetBSD: Makefile.cardbusdevs,v 1.2 1999/10/15 06:42:21 haya Exp $ - -AWK= awk - -cardbusdevs.h cardbusdevs_data.h: cardbusdevs devlist2h.awk - /bin/rm -f cardbusdevs.h cardbusdevs_data.h - ${AWK} -f devlist2h.awk cardbusdevs diff --git a/sys/dev/cardbus/cardbus.c b/sys/dev/cardbus/cardbus.c index 08643cf78b1..f9f477e7752 100644 --- a/sys/dev/cardbus/cardbus.c +++ b/sys/dev/cardbus/cardbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cardbus.c,v 1.14 2004/09/18 00:19:48 brad Exp $ */ +/* $OpenBSD: cardbus.c,v 1.15 2004/10/07 21:16:59 brad Exp $ */ /* $NetBSD: cardbus.c,v 1.24 2000/04/02 19:11:37 mycroft Exp $ */ /* @@ -45,7 +45,7 @@ #include <machine/bus.h> #include <dev/cardbus/cardbusvar.h> -#include <dev/cardbus/cardbusdevs.h> +#include <dev/pci/pcidevs.h> #include <dev/cardbus/cardbus_exrom.h> @@ -448,7 +448,7 @@ cardbus_attach_card(sc) cis_ptr = cardbus_conf_read(cc, cf, tag, CARDBUS_CIS_REG); /* Invalid vendor ID value? */ - if (CARDBUS_VENDOR(id) == CARDBUS_VENDOR_INVALID) { + if (CARDBUS_VENDOR(id) == PCI_VENDOR_INVALID) { continue; } diff --git a/sys/dev/cardbus/cardbusdevs b/sys/dev/cardbus/cardbusdevs deleted file mode 100644 index a0151619952..00000000000 --- a/sys/dev/cardbus/cardbusdevs +++ /dev/null @@ -1,131 +0,0 @@ -$OpenBSD: cardbusdevs,v 1.17 2004/09/17 23:37:26 brad Exp $ -/* $NetBSD: cardbusdevs,v 1.7 1999/12/11 22:22:34 explorer Exp $ */ - -/* - * Copyright (C) 1999 Hayakawa Koichi. - * All rights reserved. - * - * 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 author - * for the NetBSD Project. - * 4. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. - */ - -/* - * This code is stolen from sys/dev/pci/pcidevs. - */ - - -/* - * List of known CardBus vendors - */ - -vendor DEC 0x1011 DEC -vendor OPTI 0x1045 Opti -vendor DLINK 0x1186 D-Link -vendor 3COM 0x10B7 3Com -vendor REALTEK 0x10ec Realtek Semiconductor -vendor ACCTON 0x1113 Accton -vendor XIRCOM 0x115d Xircom -vendor COREGA 0x1259 Corega -vendor ADMTEK 0x1317 ADMtek -vendor ABOCOM 0x13d1 Abocom -vendor PLANEX 0x14ea Planex -vendor NETGEAR 0x168c Netgear -vendor LINKSYS 0x1737 Linksys -vendor INTEL 0x8086 Intel -vendor ADP 0x9004 Adaptec -vendor ADP2 0x9005 Adaptec(2) -vendor INVALID 0xffff INVALID - -/* - * List of known products. Grouped by vendor. - */ - -/* 3COM Products */ -product 3COM 3C575 0x5057 3C575 -product 3COM 3CCFE575BT 0x5157 3CCFE575BT -product 3COM 3CCFE575CT 0x5257 3CCFE575CT -product 3COM 3CCFEM656 0x6560 3CCFEM656 -product 3COM 3CCFEM656B 0x6562 3CCFEM656B -product 3COM MODEM56 0x6563 56k Modem -product 3COM 3CCFEM656C 0x6564 3CCFEM656C -product 3COM GLOBALMODEM56 0x6565 56k Global Modem - -/* Abocom products */ -product ABOCOM FE2500 0xab02 FE2500 -product ABOCOM PCM200 0xab03 PCM200 -product ABOCOM TE100 0xab06 TE100 - -/* Planex products */ -product PLANEX FNW_3603_TX 0xab06 FNW-3603-TX 10/100 Ethernet -product PLANEX FNW_3800_TX 0xab07 FNW-3800-TX 10/100 Ethernet - -/* Accton products */ -product ACCTON MPX5030 0x1211 MPX503x -product ACCTON EN2242 0x1216 EN2242 - -/* ADMtek products */ -product ADMTEK AN985 0x1985 AN985 - -/* Adaptec products */ -product ADP 1480 0x6075 APA-1480 - -/* Corega products */ -product COREGA CB_TXD 0xa117 FEther CB-TXD 10/100 Ethernet -product COREGA 2CB_TXD 0xa11e FEther II CB-TXD 10/100 Ethernet - -/* DEC products */ -product DEC 21142 0x0019 21142/3 - -/* D-Link products */ -product DLINK DFE_690TXD 0x1340 DFE-690TXD - -/* Intel products */ -product INTEL 82557 0x1229 82557 -/* XXX product name? */ -product INTEL MODEM56 0x1002 Modem -product INTEL DFE660 0x7192 DFE-660 - -/* Linksys products */ -product LINKSYS PCM200 0xab09 PCM200 - -/* Netgear products */ -product NETGEAR HA501 0x0007 HA501 - -/* Opti products */ -product OPTI 82C861 0xc861 82C861 - -/* Realtek (Creative Labs?) products */ -product REALTEK RT8138 0x8138 8138 Ethernet -product REALTEK RT8139 0x8139 8139 Ethernet - -/* Xircom products */ -/* is the `-3' here just indicating revision 3, or is it really part - of the device name? */ -product XIRCOM X3201_3 0x0002 X3201-3 -/* this is the device id `indicating 21143 driver compatibility' */ -product XIRCOM X3201_3_21143 0x0003 X3201-3 (21143) -product XIRCOM MODEM56 0x0103 56k Modem -product XIRCOM CBEM56G 0x0105 CBEM56G Modem diff --git a/sys/dev/cardbus/cardbusdevs.h b/sys/dev/cardbus/cardbusdevs.h deleted file mode 100644 index aa7ee0076b2..00000000000 --- a/sys/dev/cardbus/cardbusdevs.h +++ /dev/null @@ -1,138 +0,0 @@ -/* $OpenBSD: cardbusdevs.h,v 1.18 2004/09/17 23:39:06 brad Exp $ */ - -/* - * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. - * - * generated from: - * OpenBSD: cardbusdevs,v 1.17 2004/09/17 23:37:26 brad Exp - */ -/* $NetBSD: cardbusdevs,v 1.7 1999/12/11 22:22:34 explorer Exp $ */ - -/* - * Copyright (C) 1999 Hayakawa Koichi. - * All rights reserved. - * - * 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 author - * for the NetBSD Project. - * 4. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. - */ - -/* - * This code is stolen from sys/dev/pci/pcidevs. - */ - - -/* - * List of known CardBus vendors - */ - -#define CARDBUS_VENDOR_DEC 0x1011 /* DEC */ -#define CARDBUS_VENDOR_OPTI 0x1045 /* Opti */ -#define CARDBUS_VENDOR_DLINK 0x1186 /* D-Link */ -#define CARDBUS_VENDOR_3COM 0x10B7 /* 3Com */ -#define CARDBUS_VENDOR_REALTEK 0x10ec /* Realtek Semiconductor */ -#define CARDBUS_VENDOR_ACCTON 0x1113 /* Accton */ -#define CARDBUS_VENDOR_XIRCOM 0x115d /* Xircom */ -#define CARDBUS_VENDOR_COREGA 0x1259 /* Corega */ -#define CARDBUS_VENDOR_ADMTEK 0x1317 /* ADMtek */ -#define CARDBUS_VENDOR_ABOCOM 0x13d1 /* Abocom */ -#define CARDBUS_VENDOR_PLANEX 0x14ea /* Planex */ -#define CARDBUS_VENDOR_NETGEAR 0x168c /* Netgear */ -#define CARDBUS_VENDOR_LINKSYS 0x1737 /* Linksys */ -#define CARDBUS_VENDOR_INTEL 0x8086 /* Intel */ -#define CARDBUS_VENDOR_ADP 0x9004 /* Adaptec */ -#define CARDBUS_VENDOR_ADP2 0x9005 /* Adaptec(2) */ -#define CARDBUS_VENDOR_INVALID 0xffff /* INVALID */ - -/* - * List of known products. Grouped by vendor. - */ - -/* 3COM Products */ -#define CARDBUS_PRODUCT_3COM_3C575 0x5057 /* 3C575 */ -#define CARDBUS_PRODUCT_3COM_3CCFE575BT 0x5157 /* 3CCFE575BT */ -#define CARDBUS_PRODUCT_3COM_3CCFE575CT 0x5257 /* 3CCFE575CT */ -#define CARDBUS_PRODUCT_3COM_3CCFEM656 0x6560 /* 3CCFEM656 */ -#define CARDBUS_PRODUCT_3COM_3CCFEM656B 0x6562 /* 3CCFEM656B */ -#define CARDBUS_PRODUCT_3COM_MODEM56 0x6563 /* 56k Modem */ -#define CARDBUS_PRODUCT_3COM_3CCFEM656C 0x6564 /* 3CCFEM656C */ -#define CARDBUS_PRODUCT_3COM_GLOBALMODEM56 0x6565 /* 56k Global Modem */ - -/* Abocom products */ -#define CARDBUS_PRODUCT_ABOCOM_FE2500 0xab02 /* FE2500 */ -#define CARDBUS_PRODUCT_ABOCOM_PCM200 0xab03 /* PCM200 */ -#define CARDBUS_PRODUCT_ABOCOM_TE100 0xab06 /* TE100 */ - -/* Planex products */ -#define CARDBUS_PRODUCT_PLANEX_FNW_3603_TX 0xab06 /* FNW-3603-TX 10/100 Ethernet */ -#define CARDBUS_PRODUCT_PLANEX_FNW_3800_TX 0xab07 /* FNW-3800-TX 10/100 Ethernet */ - -/* Accton products */ -#define CARDBUS_PRODUCT_ACCTON_MPX5030 0x1211 /* MPX503x */ -#define CARDBUS_PRODUCT_ACCTON_EN2242 0x1216 /* EN2242 */ - -/* ADMtek products */ -#define CARDBUS_PRODUCT_ADMTEK_AN985 0x1985 /* AN985 */ - -/* Adaptec products */ -#define CARDBUS_PRODUCT_ADP_1480 0x6075 /* APA-1480 */ - -/* Corega products */ -#define CARDBUS_PRODUCT_COREGA_CB_TXD 0xa117 /* FEther CB-TXD 10/100 Ethernet */ -#define CARDBUS_PRODUCT_COREGA_2CB_TXD 0xa11e /* FEther II CB-TXD 10/100 Ethernet */ - -/* DEC products */ -#define CARDBUS_PRODUCT_DEC_21142 0x0019 /* 21142/3 */ - -/* D-Link products */ -#define CARDBUS_PRODUCT_DLINK_DFE_690TXD 0x1340 /* DFE-690TXD */ - -/* Intel products */ -#define CARDBUS_PRODUCT_INTEL_82557 0x1229 /* 82557 */ -/* XXX product name? */ -#define CARDBUS_PRODUCT_INTEL_MODEM56 0x1002 /* Modem */ -#define CARDBUS_PRODUCT_INTEL_DFE660 0x7192 /* DFE-660 */ - -/* Linksys products */ -#define CARDBUS_PRODUCT_LINKSYS_PCM200 0xab09 /* PCM200 */ - -/* Netgear products */ -#define CARDBUS_PRODUCT_NETGEAR_HA501 0x0007 /* HA501 */ - -/* Opti products */ -#define CARDBUS_PRODUCT_OPTI_82C861 0xc861 /* 82C861 */ - -/* Realtek (Creative Labs?) products */ -#define CARDBUS_PRODUCT_REALTEK_RT8138 0x8138 /* 8138 Ethernet */ -#define CARDBUS_PRODUCT_REALTEK_RT8139 0x8139 /* 8139 Ethernet */ - -/* Xircom products */ -/* is the `-3' here just indicating revision 3, or is it really part - of the device name? */ -#define CARDBUS_PRODUCT_XIRCOM_X3201_3 0x0002 /* X3201-3 */ -/* this is the device id `indicating 21143 driver compatibility' */ -#define CARDBUS_PRODUCT_XIRCOM_X3201_3_21143 0x0003 /* X3201-3 (21143) */ -#define CARDBUS_PRODUCT_XIRCOM_MODEM56 0x0103 /* 56k Modem */ -#define CARDBUS_PRODUCT_XIRCOM_CBEM56G 0x0105 /* CBEM56G Modem */ diff --git a/sys/dev/cardbus/cardbusdevs_data.h b/sys/dev/cardbus/cardbusdevs_data.h deleted file mode 100644 index 7aeaf3c9d69..00000000000 --- a/sys/dev/cardbus/cardbusdevs_data.h +++ /dev/null @@ -1,248 +0,0 @@ -/* $OpenBSD: cardbusdevs_data.h,v 1.18 2004/09/17 23:39:06 brad Exp $ */ - -/* - * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. - * - * generated from: - * OpenBSD: cardbusdevs,v 1.17 2004/09/17 23:37:26 brad Exp - */ -/* $NetBSD: cardbusdevs,v 1.7 1999/12/11 22:22:34 explorer Exp $ */ - -/* - * Copyright (C) 1999 Hayakawa Koichi. - * All rights reserved. - * - * 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 author - * for the NetBSD Project. - * 4. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. - */ - -struct cardbus_known_product cardbus_known_product[] = { - { - CARDBUS_VENDOR_3COM, CARDBUS_PRODUCT_3COM_3C575, - "3C575", - }, - { - CARDBUS_VENDOR_3COM, CARDBUS_PRODUCT_3COM_3CCFE575BT, - "3CCFE575BT", - }, - { - CARDBUS_VENDOR_3COM, CARDBUS_PRODUCT_3COM_3CCFE575CT, - "3CCFE575CT", - }, - { - CARDBUS_VENDOR_3COM, CARDBUS_PRODUCT_3COM_3CCFEM656, - "3CCFEM656", - }, - { - CARDBUS_VENDOR_3COM, CARDBUS_PRODUCT_3COM_3CCFEM656B, - "3CCFEM656B", - }, - { - CARDBUS_VENDOR_3COM, CARDBUS_PRODUCT_3COM_MODEM56, - "56k Modem", - }, - { - CARDBUS_VENDOR_3COM, CARDBUS_PRODUCT_3COM_3CCFEM656C, - "3CCFEM656C", - }, - { - CARDBUS_VENDOR_3COM, CARDBUS_PRODUCT_3COM_GLOBALMODEM56, - "56k Global Modem", - }, - { - CARDBUS_VENDOR_ABOCOM, CARDBUS_PRODUCT_ABOCOM_FE2500, - "FE2500", - }, - { - CARDBUS_VENDOR_ABOCOM, CARDBUS_PRODUCT_ABOCOM_PCM200, - "PCM200", - }, - { - CARDBUS_VENDOR_ABOCOM, CARDBUS_PRODUCT_ABOCOM_TE100, - "TE100", - }, - { - CARDBUS_VENDOR_PLANEX, CARDBUS_PRODUCT_PLANEX_FNW_3603_TX, - "FNW-3603-TX 10/100 Ethernet", - }, - { - CARDBUS_VENDOR_PLANEX, CARDBUS_PRODUCT_PLANEX_FNW_3800_TX, - "FNW-3800-TX 10/100 Ethernet", - }, - { - CARDBUS_VENDOR_ACCTON, CARDBUS_PRODUCT_ACCTON_MPX5030, - "MPX503x", - }, - { - CARDBUS_VENDOR_ACCTON, CARDBUS_PRODUCT_ACCTON_EN2242, - "EN2242", - }, - { - CARDBUS_VENDOR_ADMTEK, CARDBUS_PRODUCT_ADMTEK_AN985, - "AN985", - }, - { - CARDBUS_VENDOR_ADP, CARDBUS_PRODUCT_ADP_1480, - "APA-1480", - }, - { - CARDBUS_VENDOR_COREGA, CARDBUS_PRODUCT_COREGA_CB_TXD, - "FEther CB-TXD 10/100 Ethernet", - }, - { - CARDBUS_VENDOR_COREGA, CARDBUS_PRODUCT_COREGA_2CB_TXD, - "FEther II CB-TXD 10/100 Ethernet", - }, - { - CARDBUS_VENDOR_DEC, CARDBUS_PRODUCT_DEC_21142, - "21142/3", - }, - { - CARDBUS_VENDOR_DLINK, CARDBUS_PRODUCT_DLINK_DFE_690TXD, - "DFE-690TXD", - }, - { - CARDBUS_VENDOR_INTEL, CARDBUS_PRODUCT_INTEL_82557, - "82557", - }, - { - CARDBUS_VENDOR_INTEL, CARDBUS_PRODUCT_INTEL_MODEM56, - "Modem", - }, - { - CARDBUS_VENDOR_INTEL, CARDBUS_PRODUCT_INTEL_DFE660, - "DFE-660", - }, - { - CARDBUS_VENDOR_LINKSYS, CARDBUS_PRODUCT_LINKSYS_PCM200, - "PCM200", - }, - { - CARDBUS_VENDOR_NETGEAR, CARDBUS_PRODUCT_NETGEAR_HA501, - "HA501", - }, - { - CARDBUS_VENDOR_OPTI, CARDBUS_PRODUCT_OPTI_82C861, - "82C861", - }, - { - CARDBUS_VENDOR_REALTEK, CARDBUS_PRODUCT_REALTEK_RT8138, - "8138 Ethernet", - }, - { - CARDBUS_VENDOR_REALTEK, CARDBUS_PRODUCT_REALTEK_RT8139, - "8139 Ethernet", - }, - { - CARDBUS_VENDOR_XIRCOM, CARDBUS_PRODUCT_XIRCOM_X3201_3, - "X3201-3", - }, - { - CARDBUS_VENDOR_XIRCOM, CARDBUS_PRODUCT_XIRCOM_X3201_3_21143, - "X3201-3 (21143)", - }, - { - CARDBUS_VENDOR_XIRCOM, CARDBUS_PRODUCT_XIRCOM_MODEM56, - "56k Modem", - }, - { - CARDBUS_VENDOR_XIRCOM, CARDBUS_PRODUCT_XIRCOM_CBEM56G, - "CBEM56G Modem", - }, - { 0, 0, NULL } -}; - -struct cardbus_known_vendor cardbus_known_vendors[] = { - { - CARDBUS_VENDOR_DEC, 0, - "DEC", - }, - { - CARDBUS_VENDOR_OPTI, 0, - "Opti", - }, - { - CARDBUS_VENDOR_DLINK, 0, - "D-Link", - }, - { - CARDBUS_VENDOR_3COM, 0, - "3Com", - }, - { - CARDBUS_VENDOR_REALTEK, 0, - "Realtek Semiconductor", - }, - { - CARDBUS_VENDOR_ACCTON, 0, - "Accton", - }, - { - CARDBUS_VENDOR_XIRCOM, 0, - "Xircom", - }, - { - CARDBUS_VENDOR_COREGA, 0, - "Corega", - }, - { - CARDBUS_VENDOR_ADMTEK, 0, - "ADMtek", - }, - { - CARDBUS_VENDOR_ABOCOM, 0, - "Abocom", - }, - { - CARDBUS_VENDOR_PLANEX, 0, - "Planex", - }, - { - CARDBUS_VENDOR_NETGEAR, 0, - "Netgear", - }, - { - CARDBUS_VENDOR_LINKSYS, 0, - "Linksys", - }, - { - CARDBUS_VENDOR_INTEL, 0, - "Intel", - }, - { - CARDBUS_VENDOR_ADP, 0, - "Adaptec", - }, - { - CARDBUS_VENDOR_ADP2, 0, - "Adaptec(2)", - }, - { - CARDBUS_VENDOR_INVALID, 0, - "INVALID", - }, - { 0, 0, NULL } -}; diff --git a/sys/dev/cardbus/com_cardbus.c b/sys/dev/cardbus/com_cardbus.c index 3c2d9417550..838e627ec0d 100644 --- a/sys/dev/cardbus/com_cardbus.c +++ b/sys/dev/cardbus/com_cardbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: com_cardbus.c,v 1.8 2004/07/12 22:52:35 brad Exp $ */ +/* $OpenBSD: com_cardbus.c,v 1.9 2004/10/07 21:16:59 brad Exp $ */ /* $NetBSD: com_cardbus.c,v 1.4 2000/04/17 09:21:59 joda Exp $ */ /* @@ -52,7 +52,7 @@ #include <sys/device.h> #include <dev/cardbus/cardbusvar.h> -#include <dev/cardbus/cardbusdevs.h> +#include <dev/pci/pcidevs.h> #include <dev/pcmcia/pcmciareg.h> @@ -120,15 +120,15 @@ static struct csdev { cardbusreg_t reg; int type; } csdevs[] = { - { CARDBUS_VENDOR_XIRCOM, CARDBUS_PRODUCT_XIRCOM_MODEM56, + { PCI_VENDOR_XIRCOM, PCI_PRODUCT_XIRCOM_MODEM56, CARDBUS_BASE0_REG, CARDBUS_MAPREG_TYPE_IO }, - { CARDBUS_VENDOR_XIRCOM, CARDBUS_PRODUCT_XIRCOM_CBEM56G, + { PCI_VENDOR_XIRCOM, PCI_PRODUCT_XIRCOM_CBEM56G, CARDBUS_BASE0_REG, CARDBUS_MAPREG_TYPE_IO }, - { CARDBUS_VENDOR_INTEL, CARDBUS_PRODUCT_INTEL_MODEM56, + { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_MODEM56, CARDBUS_BASE0_REG, CARDBUS_MAPREG_TYPE_IO }, - { CARDBUS_VENDOR_3COM, CARDBUS_PRODUCT_3COM_MODEM56, + { PCI_VENDOR_3COM, PCI_PRODUCT_3COM_MODEM56, CARDBUS_BASE0_REG, CARDBUS_MAPREG_TYPE_IO }, - { CARDBUS_VENDOR_3COM, CARDBUS_PRODUCT_3COM_GLOBALMODEM56, + { PCI_VENDOR_3COM, PCI_PRODUCT_3COM_GLOBALMODEM56, CARDBUS_BASE0_REG, CARDBUS_MAPREG_TYPE_IO } }; diff --git a/sys/dev/cardbus/devlist2h.awk b/sys/dev/cardbus/devlist2h.awk deleted file mode 100644 index 1ae253f66a1..00000000000 --- a/sys/dev/cardbus/devlist2h.awk +++ /dev/null @@ -1,208 +0,0 @@ -#! /usr/bin/awk -f -# $OpenBSD: devlist2h.awk,v 1.4 2001/01/27 21:15:27 deraadt Exp $ -# $NetBSD: devlist2h.awk,v 1.1 1999/10/15 06:07:22 haya Exp $ -# -# Copyright (c) 1995, 1996 Christopher G. Demetriou -# All rights reserved. -# -# 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 Christopher G. Demetriou. -# 4. The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. -# -BEGIN { - nproducts = nvendors = 0 - dfile="cardbusdevs_data.h" - hfile="cardbusdevs.h" -} -NR == 1 { - VERSION = $0 - gsub("\\$", "", VERSION) - - printf("/*\t\$OpenBSD\$\t*/\n\n") > dfile - printf("/*\n") > dfile - printf(" * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.\n") \ - > dfile - printf(" *\n") > dfile - printf(" * generated from:\n") > dfile - printf(" *\t%s\n", VERSION) > dfile - printf(" */\n") > dfile - - printf("/*\t\$OpenBSD\$\t*/\n\n") > hfile - printf("/*\n") > hfile - printf(" * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.\n") \ - > hfile - printf(" *\n") > hfile - printf(" * generated from:\n") > hfile - printf(" *\t%s\n", VERSION) > hfile - printf(" */\n") > hfile - - next -} -$1 == "vendor" { - nvendors++ - - vendorindex[$2] = nvendors; # record index for this name, for later. - vendors[nvendors, 1] = $2; # name - vendors[nvendors, 2] = $3; # id - printf("#define\tCARDBUS_VENDOR_%s\t%s\t", vendors[nvendors, 1], - vendors[nvendors, 2]) > hfile - - i = 3; f = 4; - - # comments - ocomment = oparen = 0 - if (f <= NF) { - printf("\t/* ") > hfile - ocomment = 1; - } - while (f <= NF) { - if ($f == "#") { - printf("(") > hfile - oparen = 1 - f++ - continue - } - if (oparen) { - printf("%s", $f) > hfile - if (f < NF) - printf(" ") > hfile - f++ - continue - } - vendors[nvendors, i] = $f - printf("%s", vendors[nvendors, i]) > hfile - if (f < NF) - printf(" ") > hfile - i++; f++; - } - if (oparen) - printf(")") > hfile - if (ocomment) - printf(" */") > hfile - printf("\n") > hfile - - next -} -$1 == "product" { - nproducts++ - - products[nproducts, 1] = $2; # vendor name - products[nproducts, 2] = $3; # product id - products[nproducts, 3] = $4; # id - printf("#define\tCARDBUS_PRODUCT_%s_%s\t%s\t", products[nproducts, 1], - products[nproducts, 2], products[nproducts, 3]) > hfile - - i=4; f = 5; - - # comments - ocomment = oparen = 0 - if (f <= NF) { - printf("\t/* ") > hfile - ocomment = 1; - } - while (f <= NF) { - if ($f == "#") { - printf("(") > hfile - oparen = 1 - f++ - continue - } - if (oparen) { - printf("%s", $f) > hfile - if (f < NF) - printf(" ") > hfile - f++ - continue - } - products[nproducts, i] = $f - printf("%s", products[nproducts, i]) > hfile - if (f < NF) - printf(" ") > hfile - i++; f++; - } - if (oparen) - printf(")") > hfile - if (ocomment) - printf(" */") > hfile - printf("\n") > hfile - - next -} -{ - if ($0 == "") - blanklines++ - print $0 > hfile - if (blanklines < 2) - print $0 > dfile -} -END { - # print out the match tables - - printf("\n") > dfile - - printf("struct cardbus_known_product cardbus_known_product[] = {\n") \ - > dfile - for (i = 1; i <= nproducts; i++) { - printf("\t{\n") > dfile - printf("\t CARDBUS_VENDOR_%s, CARDBUS_PRODUCT_%s_%s,\n", - products[i, 1], products[i, 1], products[i, 2]) \ - > dfile - - printf("\t \"") > dfile - j = 4; - needspace = 0; - while (products[i, j] != "") { - if (needspace) - printf(" ") > dfile - printf("%s", products[i, j]) > dfile - needspace = 1 - j++ - } - printf("\",\n") > dfile - printf("\t},\n") > dfile - } - printf("\t{ 0, 0, NULL }\n") > dfile - printf("};\n\n") > dfile - - printf("struct cardbus_known_vendor cardbus_known_vendors[] = {\n") > dfile - for (i = 1; i <= nvendors; i++) { - printf("\t{\n") > dfile - printf("\t CARDBUS_VENDOR_%s, 0,\n", vendors[i, 1]) \ - > dfile - printf("\t \"") > dfile - j = 3; - needspace = 0; - while (vendors[i, j] != "") { - if (needspace) - printf(" ") > dfile - printf("%s", vendors[i, j]) > dfile - needspace = 1 - j++ - } - printf("\",\n") > dfile - printf("\t},\n") > dfile - } - printf("\t{ 0, 0, NULL }\n") > dfile - printf("};\n") > dfile -} diff --git a/sys/dev/cardbus/fwohci_cardbus.c b/sys/dev/cardbus/fwohci_cardbus.c index 5fef41d74f5..35584bf1c7f 100644 --- a/sys/dev/cardbus/fwohci_cardbus.c +++ b/sys/dev/cardbus/fwohci_cardbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fwohci_cardbus.c,v 1.5 2003/07/13 01:19:14 brad Exp $ */ +/* $OpenBSD: fwohci_cardbus.c,v 1.6 2004/10/07 21:16:59 brad Exp $ */ /* $NetBSD: fwohci_cardbus.c,v 1.5 2002/01/26 16:34:28 ichiro Exp $ */ /* @@ -60,7 +60,6 @@ __KERNEL_RCSID(0, "$NetBSD: fwohci_cardbus.c,v 1.5 2002/01/26 16:34:28 ichiro Ex #include <dev/pci/pcidevs.h> #include <dev/cardbus/cardbusvar.h> -#include <dev/cardbus/cardbusdevs.h> #include <dev/ieee1394/ieee1394reg.h> #include <dev/ieee1394/ieee1394var.h> diff --git a/sys/dev/cardbus/if_atw_cardbus.c b/sys/dev/cardbus/if_atw_cardbus.c index f26ba94100f..fb2a581871e 100644 --- a/sys/dev/cardbus/if_atw_cardbus.c +++ b/sys/dev/cardbus/if_atw_cardbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_atw_cardbus.c,v 1.6 2004/08/04 01:05:54 millert Exp $ */ +/* $OpenBSD: if_atw_cardbus.c,v 1.7 2004/10/07 21:16:59 brad Exp $ */ /* $NetBSD: if_atw_cardbus.c,v 1.9 2004/07/23 07:07:55 dyoung Exp $ */ /*- @@ -92,7 +92,6 @@ #include <dev/pci/pcidevs.h> #include <dev/cardbus/cardbusvar.h> -#include <dev/cardbus/cardbusdevs.h> /* * PCI configuration space registers used by the ADM8211. diff --git a/sys/dev/cardbus/if_dc_cardbus.c b/sys/dev/cardbus/if_dc_cardbus.c index 39f6e39ac67..d21ea5e132e 100644 --- a/sys/dev/cardbus/if_dc_cardbus.c +++ b/sys/dev/cardbus/if_dc_cardbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_dc_cardbus.c,v 1.14 2004/09/18 00:13:02 brad Exp $ */ +/* $OpenBSD: if_dc_cardbus.c,v 1.15 2004/10/07 21:16:59 brad Exp $ */ #include <sys/param.h> #include <sys/systm.h> @@ -29,7 +29,6 @@ #include <dev/pci/pcidevs.h> #include <dev/cardbus/cardbusvar.h> -#include <dev/cardbus/cardbusdevs.h> #include <dev/ic/dcreg.h> @@ -67,9 +66,9 @@ struct dc_type dc_cardbus_devs[] = { { PCI_VENDOR_XIRCOM, PCI_PRODUCT_XIRCOM_X3201_3_21143 }, { PCI_VENDOR_ADMTEK, PCI_PRODUCT_ADMTEK_AN985 }, { PCI_VENDOR_ACCTON, PCI_PRODUCT_ACCTON_EN2242 }, - { CARDBUS_VENDOR_ABOCOM, CARDBUS_PRODUCT_ABOCOM_FE2500 }, - { CARDBUS_VENDOR_ABOCOM, CARDBUS_PRODUCT_ABOCOM_PCM200 }, - { CARDBUS_VENDOR_LINKSYS, CARDBUS_PRODUCT_LINKSYS_PCM200 }, + { PCI_VENDOR_ABOCOM, PCI_PRODUCT_ABOCOM_FE2500 }, + { PCI_VENDOR_ABOCOM, PCI_PRODUCT_ABOCOM_PCM200 }, + { PCI_VENDOR_LINKSYS, PCI_PRODUCT_LINKSYS_PCM200 }, { 0 } }; @@ -156,13 +155,13 @@ dc_cardbus_attach(parent, self, aux) break; case PCI_VENDOR_ADMTEK: case PCI_VENDOR_ACCTON: - case CARDBUS_VENDOR_ABOCOM: - case CARDBUS_VENDOR_LINKSYS: + case PCI_VENDOR_ABOCOM: + case PCI_VENDOR_LINKSYS: if (PCI_PRODUCT(ca->ca_id) == PCI_PRODUCT_ADMTEK_AN985 || PCI_PRODUCT(ca->ca_id) == PCI_PRODUCT_ACCTON_EN2242 || - PCI_PRODUCT(ca->ca_id) == CARDBUS_PRODUCT_ABOCOM_FE2500 || - PCI_PRODUCT(ca->ca_id) == CARDBUS_PRODUCT_ABOCOM_PCM200 || - PCI_PRODUCT(ca->ca_id) == CARDBUS_PRODUCT_LINKSYS_PCM200) { + PCI_PRODUCT(ca->ca_id) == PCI_PRODUCT_ABOCOM_FE2500 || + PCI_PRODUCT(ca->ca_id) == PCI_PRODUCT_ABOCOM_PCM200 || + PCI_PRODUCT(ca->ca_id) == PCI_PRODUCT_LINKSYS_PCM200) { sc->dc_type = DC_TYPE_AN983; sc->dc_flags |= DC_TX_USE_TX_INTR|DC_TX_ADMTEK_WAR; sc->dc_pmode = DC_PMODE_MII; diff --git a/sys/dev/cardbus/if_fxp_cardbus.c b/sys/dev/cardbus/if_fxp_cardbus.c index c429d9a9fba..f5ef1f53442 100644 --- a/sys/dev/cardbus/if_fxp_cardbus.c +++ b/sys/dev/cardbus/if_fxp_cardbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_fxp_cardbus.c,v 1.8 2004/08/04 19:42:30 mickey Exp $ */ +/* $OpenBSD: if_fxp_cardbus.c,v 1.9 2004/10/07 21:16:59 brad Exp $ */ /* $NetBSD: if_fxp_cardbus.c,v 1.12 2000/05/08 18:23:36 thorpej Exp $ */ /* @@ -85,7 +85,6 @@ #include <dev/pci/pcidevs.h> #include <dev/cardbus/cardbusvar.h> -#include <dev/cardbus/cardbusdevs.h> int fxp_cardbus_match(struct device *, void *, void *); void fxp_cardbus_attach(struct device *, struct device *, void *); @@ -119,8 +118,8 @@ fxp_cardbus_match(parent, match, aux) { struct cardbus_attach_args *ca = aux; - if (CARDBUS_VENDOR(ca->ca_id) == CARDBUS_VENDOR_INTEL && - CARDBUS_PRODUCT(ca->ca_id) == CARDBUS_PRODUCT_INTEL_82557) + if (CARDBUS_VENDOR(ca->ca_id) == PCI_VENDOR_INTEL && + CARDBUS_PRODUCT(ca->ca_id) == PCI_PRODUCT_INTEL_82557) return (1); return (0); @@ -181,8 +180,6 @@ fxp_cardbus_attach(parent, self, aux) sc->sc_enabled = 0; #endif - sc->not_82557 = 1; - Cardbus_function_enable(csc->ct); fxp_cardbus_setup(sc); diff --git a/sys/dev/cardbus/if_rl_cardbus.c b/sys/dev/cardbus/if_rl_cardbus.c index 02b2492fffc..9187f38c506 100644 --- a/sys/dev/cardbus/if_rl_cardbus.c +++ b/sys/dev/cardbus/if_rl_cardbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_rl_cardbus.c,v 1.7 2004/07/09 20:08:02 brad Exp $ */ +/* $OpenBSD: if_rl_cardbus.c,v 1.8 2004/10/07 21:16:59 brad Exp $ */ /* $NetBSD: if_rl_cardbus.c,v 1.3.8.3 2001/11/14 19:14:02 nathanw Exp $ */ /* @@ -77,7 +77,6 @@ #include <dev/pci/pcidevs.h> #include <dev/cardbus/cardbusvar.h> -#include <dev/cardbus/cardbusdevs.h> /* * Default to using PIO access for this driver. On SMP systems, @@ -95,15 +94,15 @@ * Various supported device vendors/types and their names. */ static const struct rl_type rl_cardbus_devs[] = { - { CARDBUS_VENDOR_ACCTON, CARDBUS_PRODUCT_ACCTON_MPX5030 }, - { CARDBUS_VENDOR_ABOCOM, CARDBUS_PRODUCT_ABOCOM_TE100 }, - { CARDBUS_VENDOR_REALTEK, CARDBUS_PRODUCT_REALTEK_RT8138 }, - { CARDBUS_VENDOR_REALTEK, CARDBUS_PRODUCT_REALTEK_RT8139 }, - { CARDBUS_VENDOR_COREGA, CARDBUS_PRODUCT_COREGA_CB_TXD }, - { CARDBUS_VENDOR_COREGA, CARDBUS_PRODUCT_COREGA_2CB_TXD }, - { CARDBUS_VENDOR_DLINK, CARDBUS_PRODUCT_DLINK_DFE_690TXD }, - { CARDBUS_VENDOR_PLANEX, CARDBUS_PRODUCT_PLANEX_FNW_3603_TX }, - { CARDBUS_VENDOR_PLANEX, CARDBUS_PRODUCT_PLANEX_FNW_3800_TX }, + { PCI_VENDOR_ACCTON, PCI_PRODUCT_ACCTON_5030 }, + { PCI_VENDOR_ABOCOM, PCI_PRODUCT_ABOCOM_TE100 }, + { PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RT8138 }, + { PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RT8139 }, + { PCI_VENDOR_COREGA, PCI_PRODUCT_COREGA_CB_TXD }, + { PCI_VENDOR_COREGA, PCI_PRODUCT_COREGA_2CB_TXD }, + { PCI_VENDOR_DLINK, PCI_PRODUCT_DLINK_DFE690TXD }, + { PCI_VENDOR_PLANEX, PCI_PRODUCT_PLANEX_FNW_3603_TX }, + { PCI_VENDOR_PLANEX, PCI_PRODUCT_PLANEX_FNW_3800_TX }, { 0, 0 } }; diff --git a/sys/dev/cardbus/if_xl_cardbus.c b/sys/dev/cardbus/if_xl_cardbus.c index eed8c321e91..50a613b9b3d 100644 --- a/sys/dev/cardbus/if_xl_cardbus.c +++ b/sys/dev/cardbus/if_xl_cardbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_xl_cardbus.c,v 1.14 2003/10/30 03:16:58 itojun Exp $ */ +/* $OpenBSD: if_xl_cardbus.c,v 1.15 2004/10/07 21:16:59 brad Exp $ */ /* $NetBSD: if_xl_cardbus.c,v 1.13 2000/03/07 00:32:52 mycroft Exp $ */ /* @@ -67,7 +67,7 @@ #include <machine/bus.h> #include <dev/cardbus/cardbusvar.h> -#include <dev/cardbus/cardbusdevs.h> +#include <dev/pci/pcidevs.h> #include <dev/mii/mii.h> #include <dev/mii/miivar.h> @@ -121,13 +121,13 @@ const struct xl_cardbus_product { int ecp_cardtype; /* card type */ const char *ecp_name; /* device name */ } xl_cardbus_products[] = { - { CARDBUS_PRODUCT_3COM_3C575, + { PCI_PRODUCT_3COM_3C575, XL_FLAG_PHYOK | XL_FLAG_EEPROM_OFFSET_30 | XL_FLAG_8BITROM, CARDBUS_COMMAND_IO_ENABLE | CARDBUS_COMMAND_MASTER_ENABLE, XL_CARDBUS_BOOMERANG, "3c575-TX Ethernet" }, - { CARDBUS_PRODUCT_3COM_3CCFE575BT, + { PCI_PRODUCT_3COM_3CCFE575BT, XL_FLAG_PHYOK | XL_FLAG_EEPROM_OFFSET_30 | XL_FLAG_8BITROM | XL_FLAG_INVERT_LED_PWR, CARDBUS_COMMAND_IO_ENABLE | CARDBUS_COMMAND_MEM_ENABLE | @@ -135,7 +135,7 @@ const struct xl_cardbus_product { XL_CARDBUS_CYCLONE, "3c575B-TX Ethernet" }, - { CARDBUS_PRODUCT_3COM_3CCFE575CT, + { PCI_PRODUCT_3COM_3CCFE575CT, XL_FLAG_PHYOK | XL_FLAG_EEPROM_OFFSET_30 | XL_FLAG_8BITROM | XL_FLAG_INVERT_MII_PWR, CARDBUS_COMMAND_IO_ENABLE | CARDBUS_COMMAND_MEM_ENABLE | @@ -143,7 +143,7 @@ const struct xl_cardbus_product { XL_CARDBUS_CYCLONE, "3c575C-TX Ethernet" }, - { CARDBUS_PRODUCT_3COM_3CCFEM656, + { PCI_PRODUCT_3COM_3CCFEM656, XL_FLAG_PHYOK | XL_FLAG_EEPROM_OFFSET_30 | XL_FLAG_8BITROM | XL_FLAG_INVERT_LED_PWR | XL_FLAG_INVERT_MII_PWR, CARDBUS_COMMAND_IO_ENABLE | CARDBUS_COMMAND_MEM_ENABLE | @@ -151,7 +151,7 @@ const struct xl_cardbus_product { XL_CARDBUS_CYCLONE, "3c656-TX Ethernet" }, - { CARDBUS_PRODUCT_3COM_3CCFEM656B, + { PCI_PRODUCT_3COM_3CCFEM656B, XL_FLAG_PHYOK | XL_FLAG_EEPROM_OFFSET_30 | XL_FLAG_8BITROM | XL_FLAG_INVERT_LED_PWR | XL_FLAG_INVERT_MII_PWR, CARDBUS_COMMAND_IO_ENABLE | CARDBUS_COMMAND_MEM_ENABLE | @@ -159,7 +159,7 @@ const struct xl_cardbus_product { XL_CARDBUS_CYCLONE, "3c656B-TX Ethernet" }, - { CARDBUS_PRODUCT_3COM_3CCFEM656C, + { PCI_PRODUCT_3COM_3CCFEM656C, XL_FLAG_PHYOK | XL_FLAG_EEPROM_OFFSET_30 | XL_FLAG_8BITROM | XL_FLAG_INVERT_MII_PWR, CARDBUS_COMMAND_IO_ENABLE | CARDBUS_COMMAND_MEM_ENABLE | @@ -182,7 +182,7 @@ xl_cardbus_lookup(ca) { const struct xl_cardbus_product *ecp; - if (CARDBUS_VENDOR(ca->ca_id) != CARDBUS_VENDOR_3COM) + if (CARDBUS_VENDOR(ca->ca_id) != PCI_VENDOR_3COM) return (NULL); for (ecp = xl_cardbus_products; ecp->ecp_name != NULL; ecp++) |