diff options
| -rw-r--r-- | sys/dev/pci/if_bge.c | 15 | ||||
| -rw-r--r-- | sys/dev/pci/if_bgereg.h | 9 | ||||
| -rw-r--r-- | sys/dev/pci/pcidevs.h | 10 | ||||
| -rw-r--r-- | sys/dev/pci/pcidevs_data.h | 30 |
4 files changed, 55 insertions, 9 deletions
diff --git a/sys/dev/pci/if_bge.c b/sys/dev/pci/if_bge.c index 320091ed349..e41493fcb57 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.19 2003/02/11 19:20:27 mickey Exp $ */ +/* $OpenBSD: if_bge.c,v 1.20 2003/09/03 21:24:28 jason Exp $ */ /* * Copyright (c) 2001 Wind River Systems * Copyright (c) 1997, 1998, 1999, 2001 @@ -200,15 +200,19 @@ const struct pci_matchid bge_devices[] = { { PCI_VENDOR_ALTEON, PCI_PRODUCT_ALTEON_BCM5700 }, { PCI_VENDOR_ALTEON, PCI_PRODUCT_ALTEON_BCM5701 }, - { PCI_VENDOR_ALTIMA, PCI_PRODUCT_ALTIMA_AC100X }, + { PCI_VENDOR_ALTIMA, PCI_PRODUCT_ALTIMA_AC1000 }, + { PCI_VENDOR_ALTIMA, PCI_PRODUCT_ALTIMA_AC1001 }, { PCI_VENDOR_ALTIMA, PCI_PRODUCT_ALTIMA_AC9100 }, { PCI_VENDOR_BROADCOM, PCI_PRODUCT_BROADCOM_BCM5700 }, { PCI_VENDOR_BROADCOM, PCI_PRODUCT_BROADCOM_BCM5701 }, { PCI_VENDOR_BROADCOM, PCI_PRODUCT_BROADCOM_BCM5702 }, - { PCI_VENDOR_BROADCOM, PCI_PRODUCT_BROADCOM_BCM5703 }, { PCI_VENDOR_BROADCOM, PCI_PRODUCT_BROADCOM_BCM5702X }, + { PCI_VENDOR_BROADCOM, PCI_PRODUCT_BROADCOM_BCM5703 }, { PCI_VENDOR_BROADCOM, PCI_PRODUCT_BROADCOM_BCM5703X }, + { PCI_VENDOR_BROADCOM, PCI_PRODUCT_BROADCOM_BCM5704C }, + { PCI_VENDOR_BROADCOM, PCI_PRODUCT_BROADCOM_BCM5704S }, + { PCI_VENDOR_BROADCOM, PCI_PRODUCT_BROADCOM_BCM5705M }, { PCI_VENDOR_SCHNEIDERKOCH, PCI_PRODUCT_SCHNEIDERKOCH_SK9D21 }, @@ -439,6 +443,11 @@ bge_miibus_readreg(dev, phy, reg) switch(sc->bge_asicrev) { case BGE_ASICREV_BCM5701_B5: case BGE_ASICREV_BCM5703_A2: + case BGE_ASICREV_BCM5704_A0: + case BGE_ASICREV_BCM5704_A1: + case BGE_ASICREV_BCM5704_A2: + case BGE_ASICREV_BCM5704_A3: + case BGE_ASICREV_BCM5705_A1: return(0); } diff --git a/sys/dev/pci/if_bgereg.h b/sys/dev/pci/if_bgereg.h index ac9e53155a6..f3996414ccc 100644 --- a/sys/dev/pci/if_bgereg.h +++ b/sys/dev/pci/if_bgereg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_bgereg.h,v 1.5 2002/11/26 04:38:40 nate Exp $ */ +/* $OpenBSD: if_bgereg.h,v 1.6 2003/09/03 21:24:28 jason Exp $ */ /* * Copyright (c) 2001 Wind River Systems * Copyright (c) 1997, 1998, 1999, 2001 @@ -225,6 +225,13 @@ #define BGE_ASICREV_BCM5703_A0 0x10000000 #define BGE_ASICREV_BCM5703_A1 0x10010000 #define BGE_ASICREV_BCM5703_A2 0x10020000 +#define BGE_ASICREV_BCM5704_A0 0x20000000 +#define BGE_ASICREV_BCM5704_A1 0x20010000 +#define BGE_ASICREV_BCM5704_A2 0x20020000 +#define BGE_ASICREV_BCM5704_A3 0x20030000 +#define BGE_ASICREV_BCM5705_A0 0x30000000 +#define BGE_ASICREV_BCM5705_A1 0x30010000 +#define BGE_ASICREV_BCM5705_A2 0x30020000 /* shorthand one */ #define BGE_ASICREV_BCM5700 0x71000000 diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h index dd0b6d5144c..3a7c0c8eadf 100644 --- a/sys/dev/pci/pcidevs.h +++ b/sys/dev/pci/pcidevs.h @@ -2,7 +2,7 @@ * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * OpenBSD: pcidevs,v 1.666 2003/09/03 15:53:31 jason Exp + * OpenBSD: pcidevs,v 1.667 2003/09/03 21:23:16 jason Exp */ /* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */ @@ -477,7 +477,8 @@ #define PCI_PRODUCT_ALTEON_BCM5701 0x0004 /* BCM5701 (Broadcom) */ /* Altima products */ -#define PCI_PRODUCT_ALTIMA_AC100X 0x03e8 /* AC100X */ +#define PCI_PRODUCT_ALTIMA_AC1000 0x03e8 /* AC1000 */ +#define PCI_PRODUCT_ALTIMA_AC1001 0x03e9 /* AC1001 */ #define PCI_PRODUCT_ALTIMA_AC9100 0x03ea /* AC9100 */ /* AMD products */ @@ -698,8 +699,13 @@ #define PCI_PRODUCT_BROADCOM_BCM5701 0x1645 /* BCM5701 */ #define PCI_PRODUCT_BROADCOM_BCM5702 0x1646 /* BCM5702 */ #define PCI_PRODUCT_BROADCOM_BCM5703 0x1647 /* BCM5703 */ +#define PCI_PRODUCT_BROADCOM_BCM5704C 0x1648 /* BCM5704C */ +#define PCI_PRODUCT_BROADCOM_BCM5702FE 0x164d /* BCM5702FE */ +#define PCI_PRODUCT_BROADCOM_BCM5705 0x1653 /* BCM5705 */ +#define PCI_PRODUCT_BROADCOM_BCM5705M 0x165d /* BCM5705M */ #define PCI_PRODUCT_BROADCOM_BCM5702X 0x16a6 /* BCM5702X */ #define PCI_PRODUCT_BROADCOM_BCM5703X 0x16a7 /* BCM5703X */ +#define PCI_PRODUCT_BROADCOM_BCM5704S 0x16a8 /* BCM4704S */ #define PCI_PRODUCT_BROADCOM_BCM4401 0x4401 /* BCM4401 */ #define PCI_PRODUCT_BROADCOM_5801 0x5801 /* 5801 */ #define PCI_PRODUCT_BROADCOM_5802 0x5802 /* 5802 */ diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h index fd5d1edbe0b..dc18659c3ca 100644 --- a/sys/dev/pci/pcidevs_data.h +++ b/sys/dev/pci/pcidevs_data.h @@ -2,7 +2,7 @@ * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * OpenBSD: pcidevs,v 1.666 2003/09/03 15:53:31 jason Exp + * OpenBSD: pcidevs,v 1.667 2003/09/03 21:23:16 jason Exp */ /* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */ @@ -711,8 +711,12 @@ static const struct pci_known_product pci_known_products[] = { "BCM5701 (Broadcom)", }, { - PCI_VENDOR_ALTIMA, PCI_PRODUCT_ALTIMA_AC100X, - "AC100X", + PCI_VENDOR_ALTIMA, PCI_PRODUCT_ALTIMA_AC1000, + "AC1000", + }, + { + PCI_VENDOR_ALTIMA, PCI_PRODUCT_ALTIMA_AC1001, + "AC1001", }, { PCI_VENDOR_ALTIMA, PCI_PRODUCT_ALTIMA_AC9100, @@ -1455,6 +1459,22 @@ static const struct pci_known_product pci_known_products[] = { "BCM5703", }, { + PCI_VENDOR_BROADCOM, PCI_PRODUCT_BROADCOM_BCM5704C, + "BCM5704C", + }, + { + PCI_VENDOR_BROADCOM, PCI_PRODUCT_BROADCOM_BCM5702FE, + "BCM5702FE", + }, + { + PCI_VENDOR_BROADCOM, PCI_PRODUCT_BROADCOM_BCM5705, + "BCM5705", + }, + { + PCI_VENDOR_BROADCOM, PCI_PRODUCT_BROADCOM_BCM5705M, + "BCM5705M", + }, + { PCI_VENDOR_BROADCOM, PCI_PRODUCT_BROADCOM_BCM5702X, "BCM5702X", }, @@ -1463,6 +1483,10 @@ static const struct pci_known_product pci_known_products[] = { "BCM5703X", }, { + PCI_VENDOR_BROADCOM, PCI_PRODUCT_BROADCOM_BCM5704S, + "BCM4704S", + }, + { PCI_VENDOR_BROADCOM, PCI_PRODUCT_BROADCOM_BCM4401, "BCM4401", }, |