Add the Broadcom BCM5787F PCI id.

Add D-Link DGE-560SX and another Marvell Yukon (unknown model) PCI ids.
From the Linux sky2 driver via brad@

3 files changed, 15 insertions, 9 deletions

diff --git a/sys/dev/pci/if_bge.c b/sys/dev/pci/if_bge.c
index fe3a0f8523a..b2486fbd293 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.199 2006/12/04 14:35:20 reyk Exp $	*/
+/*	$OpenBSD: if_bge.c,v 1.200 2006/12/08 02:13:36 gwk Exp $	*/
 
 /*
  * Copyright (c) 2001 Wind River Systems
@@ -255,6 +255,7 @@ const struct pci_matchid bge_devices[] = {
 	{ PCI_VENDOR_BROADCOM, PCI_PRODUCT_BROADCOM_BCM5782 },
 	{ PCI_VENDOR_BROADCOM, PCI_PRODUCT_BROADCOM_BCM5786 },
 	{ PCI_VENDOR_BROADCOM, PCI_PRODUCT_BROADCOM_BCM5787 },
+	{ PCI_VENDOR_BROADCOM, PCI_PRODUCT_BROADCOM_BCM5787F },
 	{ PCI_VENDOR_BROADCOM, PCI_PRODUCT_BROADCOM_BCM5787M },
 	{ PCI_VENDOR_BROADCOM, PCI_PRODUCT_BROADCOM_BCM5788 },
 	{ PCI_VENDOR_BROADCOM, PCI_PRODUCT_BROADCOM_BCM5789 },
@@ -1790,7 +1791,8 @@ bge_attach(struct device *parent, struct device *self, void *aux)
 	      PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_BROADCOM_BCM5705F)) ||
 	    (PCI_VENDOR(pa->pa_id) == PCI_VENDOR_BROADCOM &&
 	     (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_BROADCOM_BCM5751F ||
-	      PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_BROADCOM_BCM5753F)) ||
+	      PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_BROADCOM_BCM5753F ||
+	      PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_BROADCOM_BCM5787F)) ||
 	    BGE_ASICREV(sc->bge_chipid) == BGE_ASICREV_BCM5906)
 		sc->bge_flags |= BGE_10_100_ONLY;
 
diff --git a/sys/dev/pci/if_msk.c b/sys/dev/pci/if_msk.c
index da4d86ef1de..7c33369e42c 100644
--- a/sys/dev/pci/if_msk.c
+++ b/sys/dev/pci/if_msk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_msk.c,v 1.27 2006/12/06 23:34:45 reyk Exp $	*/
+/*	$OpenBSD: if_msk.c,v 1.28 2006/12/08 02:13:36 gwk Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
@@ -185,6 +185,7 @@ void msk_dump_bytes(const char *, int);
 /* supported device vendors */
 const struct pci_matchid mskc_devices[] = {
 	{ PCI_VENDOR_DLINK,		PCI_PRODUCT_DLINK_DGE550SX },
+	{ PCI_VENDOR_DLINK,		PCI_PRODUCT_DLINK_DGE560SX },
 	{ PCI_VENDOR_DLINK,		PCI_PRODUCT_DLINK_DGE560T },
 	{ PCI_VENDOR_MARVELL,		PCI_PRODUCT_MARVELL_YUKON_1 },
 	{ PCI_VENDOR_MARVELL,		PCI_PRODUCT_MARVELL_YUKON_2 },
@@ -192,6 +193,7 @@ const struct pci_matchid mskc_devices[] = {
 	{ PCI_VENDOR_MARVELL,		PCI_PRODUCT_MARVELL_YUKON_4 },
 	{ PCI_VENDOR_MARVELL,		PCI_PRODUCT_MARVELL_YUKON_5 },
 	{ PCI_VENDOR_MARVELL,		PCI_PRODUCT_MARVELL_YUKON_6 },
+	{ PCI_VENDOR_MARVELL,		PCI_PRODUCT_MARVELL_YUKON_7 },
 	{ PCI_VENDOR_MARVELL,		PCI_PRODUCT_MARVELL_YUKON_8035 },
 	{ PCI_VENDOR_MARVELL,		PCI_PRODUCT_MARVELL_YUKON_8036 },
 	{ PCI_VENDOR_MARVELL,		PCI_PRODUCT_MARVELL_YUKON_8038 },
diff --git a/sys/dev/pci/pcidevs b/sys/dev/pci/pcidevs
index 5e992b72cff..c1eacbf37fa 100644
--- a/sys/dev/pci/pcidevs
+++ b/sys/dev/pci/pcidevs
@@ -1,4 +1,4 @@
-$OpenBSD: pcidevs,v 1.1198 2006/12/07 20:03:20 mk Exp $
+$OpenBSD: pcidevs,v 1.1199 2006/12/08 02:13:36 gwk Exp $
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $	*/
 
 /*
@@ -1418,6 +1418,7 @@ product DLINK DGE550SX		0x4001	DGE-550SX
 product DLINK DGE528T		0x4300	DGE-528T
 product DLINK DGE560T		0x4b00	DGE-560T
 product DLINK DGE530T_B1	0x4b01	DGE-530T B1
+product DLINK DGE560SX		0x4b02	DGE-560SX
 product DLINK DGE530T_A1	0x4c00	DGE-530T A1
 
 /* Distributed Processing Technology products */
@@ -2391,16 +2392,17 @@ product MARVELL YUKON_8035	0x4350	Yukon 88E8035
 product MARVELL YUKON_8036	0x4351	Yukon 88E8036
 product MARVELL YUKON_8038	0x4352	Yukon 88E8038
 product MARVELL YUKON_1		0x4353	Yukon
+product MARVELL YUKON_2		0x4356	Yukon
 product MARVELL YUKON_8052	0x4360	Yukon 88E8052
 product MARVELL YUKON_8050	0x4361	Yukon 88E8050
 product MARVELL YUKON_8053	0x4362	Yukon 88E8053
 product MARVELL YUKON_8055	0x4363	Yukon 88E8055
 product MARVELL YUKON_8056	0x4364	Yukon 88E8056
-product MARVELL YUKON_2		0x4365	Yukon
-product MARVELL YUKON_3		0x4366	Yukon
-product MARVELL YUKON_4		0x4367	Yukon
-product MARVELL YUKON_5		0x4368	Yukon
-product MARVELL YUKON_6		0x4369	Yukon
+product MARVELL YUKON_3		0x4365	Yukon
+product MARVELL YUKON_4		0x4366	Yukon
+product MARVELL YUKON_5		0x4367	Yukon
+product MARVELL YUKON_6		0x4368	Yukon
+product MARVELL YUKON_7		0x4369	Yukon
 product MARVELL YUKON_BELKIN	0x5005	Yukon (Belkin F5D5005)
 product MARVELL 88SX5040	0x5040	88SX5040 SATA
 product MARVELL 88SX5041	0x5041	88SX5041 SATA