From 598e5ef7e588d23a31902d672d5888f0f6b010d5 Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Tue, 1 Aug 2006 18:07:57 +0000 Subject: [PATCH] Use pcidevs.h. --- sys/dev/netif/rl/if_rl.c | 48 +++++++++-------- sys/dev/netif/rl/if_rlreg.h | 104 +----------------------------------- 2 files changed, 27 insertions(+), 125 deletions(-) diff --git a/sys/dev/netif/rl/if_rl.c b/sys/dev/netif/rl/if_rl.c index 930a949ab5..0d31f9d1d1 100644 --- a/sys/dev/netif/rl/if_rl.c +++ b/sys/dev/netif/rl/if_rl.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pci/if_rl.c,v 1.38.2.16 2003/03/05 18:42:33 njl Exp $ - * $DragonFly: src/sys/dev/netif/rl/if_rl.c,v 1.30 2005/12/31 14:08:00 sephe Exp $ + * $DragonFly: src/sys/dev/netif/rl/if_rl.c,v 1.31 2006/08/01 18:07:57 swildner Exp $ */ /* @@ -117,6 +117,7 @@ #include #include +#include #include #include @@ -143,31 +144,31 @@ static struct rl_type { uint16_t rl_did; const char *rl_name; } rl_devs[] = { - { RT_VENDORID, RT_DEVICEID_8129, + { PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RT8129, "RealTek 8129 10/100BaseTX" }, - { RT_VENDORID, RT_DEVICEID_8139, + { PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RT8139, "RealTek 8139 10/100BaseTX" }, - { RT_VENDORID, RT_DEVICEID_8138, + { PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RT8139B, "RealTek 8139 10/100BaseTX CardBus" }, - { ACCTON_VENDORID, ACCTON_DEVICEID_5030, + { PCI_VENDOR_ACCTON, PCI_PRODUCT_ACCTON_MPX5030, "Accton MPX 5030/5038 10/100BaseTX" }, - { DELTA_VENDORID, DELTA_DEVICEID_8139, + { PCI_VENDOR_DELTA, PCI_PRODUCT_DELTA_8139, "Delta Electronics 8139 10/100BaseTX" }, - { ADDTRON_VENDORID, ADDTRON_DEVICEID_8139, + { PCI_VENDOR_ADDTRON, PCI_PRODUCT_ADDTRON_8139, "Addtron Technolgy 8139 10/100BaseTX" }, - { DLINK_VENDORID, DLINK_DEVICEID_530TXPLUS, + { PCI_VENDOR_DLINK, PCI_PRODUCT_DLINK_DFE530TXPLUS, "D-Link DFE-530TX+ 10/100BaseTX" }, - { DLINK_VENDORID, DLINK_DEVICEID_690TXD, + { PCI_VENDOR_DLINK, PCI_PRODUCT_DLINK_DFE690TXD, "D-Link DFE-690TX 10/100BaseTX" }, - { NORTEL_VENDORID, ACCTON_DEVICEID_5030, + { PCI_VENDOR_NORTEL, PCI_PRODUCT_NORTEL_BAYSTACK_21, "Nortel Networks 10/100BaseTX" }, - { PEPPERCON_VENDORID, PEPPERCON_DEVICEID_ROLF, + { PCI_VENDOR_PEPPERCON, PCI_PRODUCT_PEPPERCON_ROLF, "Peppercon AG ROL/F" }, - { COREGA_VENDORID, COREGA_DEVICEID_FETHERCBTXD, + { PCI_VENDOR_COREGA, PCI_PRODUCT_COREGA_CB_TXD, "Corega FEther CB-TXD" }, - { COREGA_VENDORID, COREGA_DEVICEID_FETHERIICBTXD, + { PCI_VENDOR_COREGA, PCI_PRODUCT_COREGA_2CB_TXD, "Corega FEtherII CB-TXD" }, - { PLANEX_VENDORID, PLANEX_DEVICEID_FNW3800TX, + { PCI_VENDOR_PLANEX, PCI_PRODUCT_PLANEX_FNW_3800_TX, "Planex FNW-3800-TX" }, { 0, 0, NULL } }; @@ -830,15 +831,18 @@ rl_attach(device_t dev) */ rl_read_eeprom(sc, (caddr_t)&rl_did, RL_EE_PCI_DID, 1, 0); - if (rl_did == RT_DEVICEID_8139 || rl_did == ACCTON_DEVICEID_5030 || - rl_did == DELTA_DEVICEID_8139 || rl_did == ADDTRON_DEVICEID_8139 || - rl_did == DLINK_DEVICEID_530TXPLUS || rl_did == RT_DEVICEID_8138 || - rl_did == DLINK_DEVICEID_690TXD || - rl_did == COREGA_DEVICEID_FETHERCBTXD || - rl_did == COREGA_DEVICEID_FETHERIICBTXD || - rl_did == PLANEX_DEVICEID_FNW3800TX) + if (rl_did == PCI_PRODUCT_REALTEK_RT8139 || + rl_did == PCI_PRODUCT_ACCTON_MPX5030 || + rl_did == PCI_PRODUCT_DELTA_8139 || + rl_did == PCI_PRODUCT_ADDTRON_8139 || + rl_did == PCI_PRODUCT_DLINK_DFE530TXPLUS || + rl_did == PCI_PRODUCT_REALTEK_RT8139B || + rl_did == PCI_PRODUCT_DLINK_DFE690TXD || + rl_did == PCI_PRODUCT_COREGA_CB_TXD || + rl_did == PCI_PRODUCT_COREGA_2CB_TXD || + rl_did == PCI_PRODUCT_PLANEX_FNW_3800_TX) sc->rl_type = RL_8139; - else if (rl_did == RT_DEVICEID_8129) + else if (rl_did == PCI_PRODUCT_REALTEK_RT8129) sc->rl_type = RL_8129; else { device_printf(dev, "unknown device ID: %x\n", rl_did); diff --git a/sys/dev/netif/rl/if_rlreg.h b/sys/dev/netif/rl/if_rlreg.h index 8b5f084d77..88ffc935c5 100644 --- a/sys/dev/netif/rl/if_rlreg.h +++ b/sys/dev/netif/rl/if_rlreg.h @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pci/if_rlreg.h,v 1.14.2.5 2003/03/02 20:58:54 dan Exp $ - * $DragonFly: src/sys/dev/netif/rl/if_rlreg.h,v 1.5 2005/05/20 14:30:33 joerg Exp $ + * $DragonFly: src/sys/dev/netif/rl/if_rlreg.h,v 1.6 2006/08/01 18:07:57 swildner Exp $ */ /* @@ -408,108 +408,6 @@ struct rl_softc { /* * General constants that are fun to know. * - * RealTek PCI vendor ID - */ -#define RT_VENDORID 0x10EC - -/* - * RealTek chip device IDs. - */ -#define RT_DEVICEID_8129 0x8129 -#define RT_DEVICEID_8138 0x8138 -#define RT_DEVICEID_8139 0x8139 - -/* - * Accton PCI vendor ID - */ -#define ACCTON_VENDORID 0x1113 - -/* - * Accton MPX 5030/5038 device ID. - */ -#define ACCTON_DEVICEID_5030 0x1211 - -/* - * Nortel PCI vendor ID - */ -#define NORTEL_VENDORID 0x126C - -/* - * Delta Electronics Vendor ID. - */ -#define DELTA_VENDORID 0x1500 - -/* - * Delta device IDs. - */ -#define DELTA_DEVICEID_8139 0x1360 - -/* - * Addtron vendor ID. - */ -#define ADDTRON_VENDORID 0x4033 - -/* - * Addtron device IDs. - */ -#define ADDTRON_DEVICEID_8139 0x1360 - -/* - * D-Link vendor ID. - */ -#define DLINK_VENDORID 0x1186 - -/* - * D-Link DFE-530TX+ device ID - */ -#define DLINK_DEVICEID_530TXPLUS 0x1300 - -/* - * D-Link DFE-690TXD device ID - */ -#define DLINK_DEVICEID_690TXD 0x1340 - -/* - * Corega K.K vendor ID - */ -#define COREGA_VENDORID 0x1259 - -/* - * Corega FEther CB-TXD device ID - */ -#define COREGA_DEVICEID_FETHERCBTXD 0xa117 - -/* - * Corega FEtherII CB-TXD device ID - */ -#define COREGA_DEVICEID_FETHERIICBTXD 0xa11e - -/* - * Corega CG-LAPCIGT device ID - */ -#define COREGA_DEVICEID_CGLAPCIGT 0xc107 - -/* - * Peppercon vendor ID. - */ -#define PEPPERCON_VENDORID 0x1743 - -/* - * Peppercon AG ROL/F device ID. - */ -#define PEPPERCON_DEVICEID_ROLF 0x8139 - -/* - * Planex Communications, Inc. vendor ID - */ -#define PLANEX_VENDORID 0x14ea - -/* - * Planex FNW-3800-TX device ID - */ -#define PLANEX_DEVICEID_FNW3800TX 0xab07 - -/* * PCI low memory base and low I/O base register, and * other PCI registers. */ -- 2.41.0