diff options
| author | Stuart Henderson <sthen@cvs.openbsd.org> | 2009-12-17 00:55:20 +0000 |
|---|---|---|
| committer | Stuart Henderson <sthen@cvs.openbsd.org> | 2009-12-17 00:55:20 +0000 |
| commit | b573a69412ae7cf6806674f73cd08d910cecf1e3 (patch) | |
| tree | bede2796ce339423b33b367f96c5343dc222bb00 /sys/dev/pci/if_bge.c | |
| parent | d13a921c5bb586b80d9df167d3784ae7e7ead147 (diff) | |
- correct the PCI ids for the BCM5717 and BCM5718 chipsets
- add BCM5724 chipset
from Linux driver via Brad.
- sort by device-id
Diffstat (limited to 'sys/dev/pci/if_bge.c')
| -rw-r--r-- | sys/dev/pci/if_bge.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/sys/dev/pci/if_bge.c b/sys/dev/pci/if_bge.c index cf42f76556b..f88221e42e0 100644 --- a/sys/dev/pci/if_bge.c +++ b/sys/dev/pci/if_bge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_bge.c,v 1.288 2009/12/09 17:13:02 naddy Exp $ */ +/* $OpenBSD: if_bge.c,v 1.289 2009/12/17 00:55:19 sthen Exp $ */ /* * Copyright (c) 2001 Wind River Systems @@ -241,14 +241,13 @@ const struct pci_matchid bge_devices[] = { { PCI_VENDOR_BROADCOM, PCI_PRODUCT_BROADCOM_BCM5714S }, { PCI_VENDOR_BROADCOM, PCI_PRODUCT_BROADCOM_BCM5715 }, { PCI_VENDOR_BROADCOM, PCI_PRODUCT_BROADCOM_BCM5715S }, - { PCI_VENDOR_BROADCOM, PCI_PRODUCT_BROADCOM_BCM5717C }, - { PCI_VENDOR_BROADCOM, PCI_PRODUCT_BROADCOM_BCM5717S }, - { PCI_VENDOR_BROADCOM, PCI_PRODUCT_BROADCOM_BCM5718C }, - { PCI_VENDOR_BROADCOM, PCI_PRODUCT_BROADCOM_BCM5718S }, + { PCI_VENDOR_BROADCOM, PCI_PRODUCT_BROADCOM_BCM5717 }, + { PCI_VENDOR_BROADCOM, PCI_PRODUCT_BROADCOM_BCM5718 }, { PCI_VENDOR_BROADCOM, PCI_PRODUCT_BROADCOM_BCM5720 }, { PCI_VENDOR_BROADCOM, PCI_PRODUCT_BROADCOM_BCM5721 }, { PCI_VENDOR_BROADCOM, PCI_PRODUCT_BROADCOM_BCM5722 }, { PCI_VENDOR_BROADCOM, PCI_PRODUCT_BROADCOM_BCM5723 }, + { PCI_VENDOR_BROADCOM, PCI_PRODUCT_BROADCOM_BCM5724 }, { PCI_VENDOR_BROADCOM, PCI_PRODUCT_BROADCOM_BCM5750 }, { PCI_VENDOR_BROADCOM, PCI_PRODUCT_BROADCOM_BCM5750M }, { PCI_VENDOR_BROADCOM, PCI_PRODUCT_BROADCOM_BCM5751 }, @@ -1840,10 +1839,9 @@ bge_attach(struct device *parent, struct device *self, void *aux) >> BGE_PCIMISCCTL_ASICREV_SHIFT); if (BGE_ASICREV(sc->bge_chipid) == BGE_ASICREV_USE_PRODID_REG) { - if (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_BROADCOM_BCM5717C || - PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_BROADCOM_BCM5717S || - PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_BROADCOM_BCM5718C || - PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_BROADCOM_BCM5718S) + if (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_BROADCOM_BCM5717 || + PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_BROADCOM_BCM5718 || + PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_BROADCOM_BCM5724) sc->bge_chipid = pci_conf_read(pc, pa->pa_tag, BGE_PCI_GEN2_PRODID_ASICREV); else |