From e02d5926c365e1a8691586064f9f8632ed1bf888 Mon Sep 17 00:00:00 2001 From: Mike Silbersack Date: Wed, 22 Jan 2003 17:14:33 +0000 Subject: [PATCH] Correctly identify the 3C920B chipset; although it may ship with some Nforce2 boards, it's definitely not an Nvidia chip. Info from: Nvidia's Linux Network driver & pciids.sourceforge.net --- sys/pci/if_xl.c | 8 ++++---- sys/pci/if_xlreg.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/pci/if_xl.c b/sys/pci/if_xl.c index 203f9bad990c..94ef499342c4 100644 --- a/sys/pci/if_xl.c +++ b/sys/pci/if_xl.c @@ -184,8 +184,8 @@ static struct xl_type xl_devs[] = { "3Com 3c905B-COMBO Fast Etherlink XL" }, { TC_VENDORID, TC_DEVICEID_TORNADO_10_100BT, "3Com 3c905C-TX Fast Etherlink XL" }, - { TC_VENDORID, TC_DEVICEID_TORNADO_10_100BT_NVIDIA, - "3Com 3c905C-TX on nVidia nForce2 chipset" }, + { TC_VENDORID, TC_DEVICEID_TORNADO_10_100BT_920B, + "3Com 3c920B-EMB Integrated Fast Etherlink XL" }, { TC_VENDORID, TC_DEVICEID_HURRICANE_10_100BT_SERV, "3Com 3c980 Fast Etherlink XL" }, { TC_VENDORID, TC_DEVICEID_TORNADO_10_100BT_SERV, @@ -1247,7 +1247,7 @@ xl_choose_xcvr(sc, verbose) case TC_DEVICEID_HURRICANE_656: /* 3c656 */ case TC_DEVICEID_HURRICANE_656B: /* 3c656B */ case TC_DEVICEID_TORNADO_656C: /* 3c656C */ - case TC_DEVICEID_TORNADO_10_100BT_NVIDIA: /* nVidia nForce2 */ + case TC_DEVICEID_TORNADO_10_100BT_920B: /* 3c920B-EMB */ sc->xl_media = XL_MEDIAOPT_MII; sc->xl_xcvr = XL_XCVR_MII; if (verbose) @@ -1344,7 +1344,7 @@ xl_attach(dev) pci_get_device(dev) == TC_DEVICEID_HURRICANE_656B) sc->xl_flags |= XL_FLAG_INVERT_MII_PWR | XL_FLAG_INVERT_LED_PWR; - if (pci_get_device(dev) == TC_DEVICEID_TORNADO_10_100BT_NVIDIA) + if (pci_get_device(dev) == TC_DEVICEID_TORNADO_10_100BT_920B) sc->xl_flags |= XL_FLAG_PHYOK; /* diff --git a/sys/pci/if_xlreg.h b/sys/pci/if_xlreg.h index a035dc6bf4f7..0a5ce446b531 100644 --- a/sys/pci/if_xlreg.h +++ b/sys/pci/if_xlreg.h @@ -677,7 +677,7 @@ struct xl_stats { #define TC_DEVICEID_CYCLONE_10_100_COMBO 0x9058 #define TC_DEVICEID_CYCLONE_10_100FX 0x905A #define TC_DEVICEID_TORNADO_10_100BT 0x9200 -#define TC_DEVICEID_TORNADO_10_100BT_NVIDIA 0x9201 +#define TC_DEVICEID_TORNADO_10_100BT_920B 0x9201 #define TC_DEVICEID_HURRICANE_10_100BT_SERV 0x9800 #define TC_DEVICEID_TORNADO_10_100BT_SERV 0x9805 #define TC_DEVICEID_HURRICANE_SOHO100TX 0x7646