Module Name:    src
Committed By:   msaitoh
Date:           Wed Feb 20 08:03:58 UTC 2019

Modified Files:
        src/sys/dev/pci: if_bge.c

Log Message:
 Simplify PCI device table. No functional change.


To generate a diff of this commit:
cvs rdiff -u -r1.324 -r1.325 src/sys/dev/pci/if_bge.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/pci/if_bge.c
diff -u src/sys/dev/pci/if_bge.c:1.324 src/sys/dev/pci/if_bge.c:1.325
--- src/sys/dev/pci/if_bge.c:1.324	Wed Feb 20 04:49:08 2019
+++ src/sys/dev/pci/if_bge.c	Wed Feb 20 08:03:58 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_bge.c,v 1.324 2019/02/20 04:49:08 msaitoh Exp $	*/
+/*	$NetBSD: if_bge.c,v 1.325 2019/02/20 08:03:58 msaitoh Exp $	*/
 
 /*
  * Copyright (c) 2001 Wind River Systems
@@ -79,7 +79,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.324 2019/02/20 04:49:08 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.325 2019/02/20 08:03:58 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -297,375 +297,107 @@ void		bge_debug_info(struct bge_softc *)
 #define	BGE_EVCNT_UPD(ev, val)	/* nothing */
 #endif
 
+#define VIDDID(a, b) PCI_VENDOR_ ## a, PCI_PRODUCT_ ## a ## _ ## b
+/*
+ * The BCM5700 documentation seems to indicate that the hardware still has the
+ * Alteon vendor ID burned into it, though it should always be overridden by
+ * the value in the EEPROM.  We'll check for it anyway.
+ */
 static const struct bge_product {
 	pci_vendor_id_t		bp_vendor;
 	pci_product_id_t	bp_product;
 	const char		*bp_name;
 } bge_products[] = {
-	/*
-	 * The BCM5700 documentation seems to indicate that the hardware
-	 * still has the Alteon vendor ID burned into it, though it
-	 * should always be overridden by the value in the EEPROM.  We'll
-	 * check for it anyway.
-	 */
-	{ PCI_VENDOR_ALTEON,
-	  PCI_PRODUCT_ALTEON_BCM5700,
-	  "Broadcom BCM5700 Gigabit Ethernet",
-	  },
-	{ PCI_VENDOR_ALTEON,
-	  PCI_PRODUCT_ALTEON_BCM5701,
-	  "Broadcom BCM5701 Gigabit Ethernet",
-	  },
-	{ PCI_VENDOR_ALTIMA,
-	  PCI_PRODUCT_ALTIMA_AC1000,
-	  "Altima AC1000 Gigabit Ethernet",
-	  },
-	{ PCI_VENDOR_ALTIMA,
-	  PCI_PRODUCT_ALTIMA_AC1001,
-	  "Altima AC1001 Gigabit Ethernet",
-	   },
-	{ PCI_VENDOR_ALTIMA,
-	  PCI_PRODUCT_ALTIMA_AC1003,
-	  "Altima AC1003 Gigabit Ethernet",
-	   },
-	{ PCI_VENDOR_ALTIMA,
-	  PCI_PRODUCT_ALTIMA_AC9100,
-	  "Altima AC9100 Gigabit Ethernet",
-	  },
-	{ PCI_VENDOR_APPLE,
-	  PCI_PRODUCT_APPLE_BCM5701,
-	  "APPLE BCM5701 Gigabit Ethernet",
-	  },
-	{ PCI_VENDOR_BROADCOM,
-	  PCI_PRODUCT_BROADCOM_BCM5700,
-	  "Broadcom BCM5700 Gigabit Ethernet",
-	  },
-	{ PCI_VENDOR_BROADCOM,
-	  PCI_PRODUCT_BROADCOM_BCM5701,
-	  "Broadcom BCM5701 Gigabit Ethernet",
-	  },
-	{ PCI_VENDOR_BROADCOM,
-	  PCI_PRODUCT_BROADCOM_BCM5702,
-	  "Broadcom BCM5702 Gigabit Ethernet",
-	  },
-	{ PCI_VENDOR_BROADCOM,
-	  PCI_PRODUCT_BROADCOM_BCM5702X,
-	  "Broadcom BCM5702X Gigabit Ethernet" },
-	{ PCI_VENDOR_BROADCOM,
-	  PCI_PRODUCT_BROADCOM_BCM5703,
-	  "Broadcom BCM5703 Gigabit Ethernet",
-	  },
-	{ PCI_VENDOR_BROADCOM,
-	  PCI_PRODUCT_BROADCOM_BCM5703X,
-	  "Broadcom BCM5703X Gigabit Ethernet",
-	  },
-	{ PCI_VENDOR_BROADCOM,
-	  PCI_PRODUCT_BROADCOM_BCM5703_ALT,
-	  "Broadcom BCM5703 Gigabit Ethernet",
-	  },
-	{ PCI_VENDOR_BROADCOM,
-	  PCI_PRODUCT_BROADCOM_BCM5704C,
-	  "Broadcom BCM5704C Dual Gigabit Ethernet",
-	  },
-	{ PCI_VENDOR_BROADCOM,
-	  PCI_PRODUCT_BROADCOM_BCM5704S,
-	  "Broadcom BCM5704S Dual Gigabit Ethernet",
-	  },
-	{ PCI_VENDOR_BROADCOM,
-	  PCI_PRODUCT_BROADCOM_BCM5705,
-	  "Broadcom BCM5705 Gigabit Ethernet",
-	  },
-	{ PCI_VENDOR_BROADCOM,
-	  PCI_PRODUCT_BROADCOM_BCM5705F,
-	  "Broadcom BCM5705F Gigabit Ethernet",
-	  },
-	{ PCI_VENDOR_BROADCOM,
-	  PCI_PRODUCT_BROADCOM_BCM5705K,
-	  "Broadcom BCM5705K Gigabit Ethernet",
-	  },
-	{ PCI_VENDOR_BROADCOM,
-	  PCI_PRODUCT_BROADCOM_BCM5705M,
-	  "Broadcom BCM5705M Gigabit Ethernet",
-	  },
-	{ PCI_VENDOR_BROADCOM,
-	  PCI_PRODUCT_BROADCOM_BCM5705M_ALT,
-	  "Broadcom BCM5705M Gigabit Ethernet",
-	  },
-	{ PCI_VENDOR_BROADCOM,
-	  PCI_PRODUCT_BROADCOM_BCM5714,
-	  "Broadcom BCM5714 Gigabit Ethernet",
-	  },
-	{ PCI_VENDOR_BROADCOM,
-	  PCI_PRODUCT_BROADCOM_BCM5714S,
-	  "Broadcom BCM5714S Gigabit Ethernet",
-	  },
-	{ PCI_VENDOR_BROADCOM,
-	  PCI_PRODUCT_BROADCOM_BCM5715,
-	  "Broadcom BCM5715 Gigabit Ethernet",
-	  },
-	{ PCI_VENDOR_BROADCOM,
-	  PCI_PRODUCT_BROADCOM_BCM5715S,
-	  "Broadcom BCM5715S Gigabit Ethernet",
-	  },
-	{ PCI_VENDOR_BROADCOM,
-	  PCI_PRODUCT_BROADCOM_BCM5717,
-	  "Broadcom BCM5717 Gigabit Ethernet",
-	  },
-	{ PCI_VENDOR_BROADCOM,
-	  PCI_PRODUCT_BROADCOM_BCM5717C,
-	  "Broadcom BCM5717 Gigabit Ethernet",
-	  },
-	{ PCI_VENDOR_BROADCOM,
-	  PCI_PRODUCT_BROADCOM_BCM5718,
-	  "Broadcom BCM5718 Gigabit Ethernet",
-	  },
-	{ PCI_VENDOR_BROADCOM,
-	  PCI_PRODUCT_BROADCOM_BCM5719,
-	  "Broadcom BCM5719 Gigabit Ethernet",
-	  },
-	{ PCI_VENDOR_BROADCOM,
-	  PCI_PRODUCT_BROADCOM_BCM5720,
-	  "Broadcom BCM5720 Gigabit Ethernet",
-	  },
-	{ PCI_VENDOR_BROADCOM,
-	  PCI_PRODUCT_BROADCOM_BCM5721,
-	  "Broadcom BCM5721 Gigabit Ethernet",
-	  },
-	{ PCI_VENDOR_BROADCOM,
-	  PCI_PRODUCT_BROADCOM_BCM5722,
-	  "Broadcom BCM5722 Gigabit Ethernet",
-	  },
-	{ PCI_VENDOR_BROADCOM,
-	  PCI_PRODUCT_BROADCOM_BCM5723,
-	  "Broadcom BCM5723 Gigabit Ethernet",
-	  },
-	{ PCI_VENDOR_BROADCOM,
-	  PCI_PRODUCT_BROADCOM_BCM5750,
-	  "Broadcom BCM5750 Gigabit Ethernet",
-	  },
-	{ PCI_VENDOR_BROADCOM,
-	  PCI_PRODUCT_BROADCOM_BCM5751,
-	  "Broadcom BCM5751 Gigabit Ethernet",
-	  },
-	{ PCI_VENDOR_BROADCOM,
-	  PCI_PRODUCT_BROADCOM_BCM5751F,
-	  "Broadcom BCM5751F Gigabit Ethernet",
-	  },
-	{ PCI_VENDOR_BROADCOM,
-	  PCI_PRODUCT_BROADCOM_BCM5751M,
-	  "Broadcom BCM5751M Gigabit Ethernet",
-	  },
-	{ PCI_VENDOR_BROADCOM,
-	  PCI_PRODUCT_BROADCOM_BCM5752,
-	  "Broadcom BCM5752 Gigabit Ethernet",
-	  },
-	{ PCI_VENDOR_BROADCOM,
-	  PCI_PRODUCT_BROADCOM_BCM5752M,
-	  "Broadcom BCM5752M Gigabit Ethernet",
-	  },
-	{ PCI_VENDOR_BROADCOM,
-	  PCI_PRODUCT_BROADCOM_BCM5753,
-	  "Broadcom BCM5753 Gigabit Ethernet",
-	  },
-	{ PCI_VENDOR_BROADCOM,
-	  PCI_PRODUCT_BROADCOM_BCM5753F,
-	  "Broadcom BCM5753F Gigabit Ethernet",
-	  },
-	{ PCI_VENDOR_BROADCOM,
-	  PCI_PRODUCT_BROADCOM_BCM5753M,
-	  "Broadcom BCM5753M Gigabit Ethernet",
-	  },
-	{ PCI_VENDOR_BROADCOM,
-	  PCI_PRODUCT_BROADCOM_BCM5754,
-	  "Broadcom BCM5754 Gigabit Ethernet",
-	},
-	{ PCI_VENDOR_BROADCOM,
-	  PCI_PRODUCT_BROADCOM_BCM5754M,
-	  "Broadcom BCM5754M Gigabit Ethernet",
-	},
-	{ PCI_VENDOR_BROADCOM,
-	  PCI_PRODUCT_BROADCOM_BCM5755,
-	  "Broadcom BCM5755 Gigabit Ethernet",
-	},
-	{ PCI_VENDOR_BROADCOM,
-	  PCI_PRODUCT_BROADCOM_BCM5755M,
-	  "Broadcom BCM5755M Gigabit Ethernet",
-	},
-	{ PCI_VENDOR_BROADCOM,
-	  PCI_PRODUCT_BROADCOM_BCM5756,
-	  "Broadcom BCM5756 Gigabit Ethernet",
-	},
-	{ PCI_VENDOR_BROADCOM,
-	  PCI_PRODUCT_BROADCOM_BCM5761,
-	  "Broadcom BCM5761 Gigabit Ethernet",
-	},
-	{ PCI_VENDOR_BROADCOM,
-	  PCI_PRODUCT_BROADCOM_BCM5761E,
-	  "Broadcom BCM5761E Gigabit Ethernet",
-	},
-	{ PCI_VENDOR_BROADCOM,
-	  PCI_PRODUCT_BROADCOM_BCM5761S,
-	  "Broadcom BCM5761S Gigabit Ethernet",
-	},
-	{ PCI_VENDOR_BROADCOM,
-	  PCI_PRODUCT_BROADCOM_BCM5761SE,
-	  "Broadcom BCM5761SE Gigabit Ethernet",
-	},
-	{ PCI_VENDOR_BROADCOM,
-	  PCI_PRODUCT_BROADCOM_BCM5764,
-	  "Broadcom BCM5764 Gigabit Ethernet",
-	  },
-	{ PCI_VENDOR_BROADCOM,
-	  PCI_PRODUCT_BROADCOM_BCM5780,
-	  "Broadcom BCM5780 Gigabit Ethernet",
-	  },
-	{ PCI_VENDOR_BROADCOM,
-	  PCI_PRODUCT_BROADCOM_BCM5780S,
-	  "Broadcom BCM5780S Gigabit Ethernet",
-	  },
-	{ PCI_VENDOR_BROADCOM,
-	  PCI_PRODUCT_BROADCOM_BCM5781,
-	  "Broadcom BCM5781 Gigabit Ethernet",
-	  },
-	{ PCI_VENDOR_BROADCOM,
-	  PCI_PRODUCT_BROADCOM_BCM5782,
-	  "Broadcom BCM5782 Gigabit Ethernet",
-	},
-	{ PCI_VENDOR_BROADCOM,
-	  PCI_PRODUCT_BROADCOM_BCM5784M,
-	  "BCM5784M NetLink 1000baseT Ethernet",
-	},
-	{ PCI_VENDOR_BROADCOM,
-	  PCI_PRODUCT_BROADCOM_BCM5785F,
-	  "BCM5785F NetLink 10/100 Ethernet",
-	},
-	{ PCI_VENDOR_BROADCOM,
-	  PCI_PRODUCT_BROADCOM_BCM5785G,
-	  "BCM5785G NetLink 1000baseT Ethernet",
-	},
-	{ PCI_VENDOR_BROADCOM,
-	  PCI_PRODUCT_BROADCOM_BCM5786,
-	  "Broadcom BCM5786 Gigabit Ethernet",
-	},
-	{ PCI_VENDOR_BROADCOM,
-	  PCI_PRODUCT_BROADCOM_BCM5787,
-	  "Broadcom BCM5787 Gigabit Ethernet",
-	},
-	{ PCI_VENDOR_BROADCOM,
-	  PCI_PRODUCT_BROADCOM_BCM5787F,
-	  "Broadcom BCM5787F 10/100 Ethernet",
-	},
-	{ PCI_VENDOR_BROADCOM,
-	  PCI_PRODUCT_BROADCOM_BCM5787M,
-	  "Broadcom BCM5787M Gigabit Ethernet",
-	},
-	{ PCI_VENDOR_BROADCOM,
-	  PCI_PRODUCT_BROADCOM_BCM5788,
-	  "Broadcom BCM5788 Gigabit Ethernet",
-	  },
-	{ PCI_VENDOR_BROADCOM,
-	  PCI_PRODUCT_BROADCOM_BCM5789,
-	  "Broadcom BCM5789 Gigabit Ethernet",
-	  },
-	{ PCI_VENDOR_BROADCOM,
-	  PCI_PRODUCT_BROADCOM_BCM5901,
-	  "Broadcom BCM5901 Fast Ethernet",
-	  },
-	{ PCI_VENDOR_BROADCOM,
-	  PCI_PRODUCT_BROADCOM_BCM5901A2,
-	  "Broadcom BCM5901A2 Fast Ethernet",
-	  },
-	{ PCI_VENDOR_BROADCOM,
-	  PCI_PRODUCT_BROADCOM_BCM5903M,
-	  "Broadcom BCM5903M Fast Ethernet",
-	  },
-	{ PCI_VENDOR_BROADCOM,
-	  PCI_PRODUCT_BROADCOM_BCM5906,
-	  "Broadcom BCM5906 Fast Ethernet",
-	  },
-	{ PCI_VENDOR_BROADCOM,
-	  PCI_PRODUCT_BROADCOM_BCM5906M,
-	  "Broadcom BCM5906M Fast Ethernet",
-	  },
-	{ PCI_VENDOR_BROADCOM,
-	  PCI_PRODUCT_BROADCOM_BCM57760,
-	  "Broadcom BCM57760 Gigabit Ethernet",
-	  },
-	{ PCI_VENDOR_BROADCOM,
-	  PCI_PRODUCT_BROADCOM_BCM57761,
-	  "Broadcom BCM57761 Gigabit Ethernet",
-	  },
-	{ PCI_VENDOR_BROADCOM,
-	  PCI_PRODUCT_BROADCOM_BCM57762,
-	  "Broadcom BCM57762 Gigabit Ethernet",
-	  },
-	{ PCI_VENDOR_BROADCOM,
-	  PCI_PRODUCT_BROADCOM_BCM57765,
-	  "Broadcom BCM57765 Gigabit Ethernet",
-	  },
-	{ PCI_VENDOR_BROADCOM,
-	  PCI_PRODUCT_BROADCOM_BCM57766,
-	  "Broadcom BCM57766 Gigabit Ethernet",
-	  },
-	{ PCI_VENDOR_BROADCOM,
-	  PCI_PRODUCT_BROADCOM_BCM57780,
-	  "Broadcom BCM57780 Gigabit Ethernet",
-	  },
-	{ PCI_VENDOR_BROADCOM,
-	  PCI_PRODUCT_BROADCOM_BCM57781,
-	  "Broadcom BCM57781 Gigabit Ethernet",
-	  },
-	{ PCI_VENDOR_BROADCOM,
-	  PCI_PRODUCT_BROADCOM_BCM57782,
-	  "Broadcom BCM57782 Gigabit Ethernet",
-	  },
-	{ PCI_VENDOR_BROADCOM,
-	  PCI_PRODUCT_BROADCOM_BCM57785,
-	  "Broadcom BCM57785 Gigabit Ethernet",
-	  },
-	{ PCI_VENDOR_BROADCOM,
-	  PCI_PRODUCT_BROADCOM_BCM57786,
-	  "Broadcom BCM57786 Gigabit Ethernet",
-	  },
-	{ PCI_VENDOR_BROADCOM,
-	  PCI_PRODUCT_BROADCOM_BCM57788,
-	  "Broadcom BCM57788 Gigabit Ethernet",
-	  },
-	{ PCI_VENDOR_BROADCOM,
-	  PCI_PRODUCT_BROADCOM_BCM57790,
-	  "Broadcom BCM57790 Gigabit Ethernet",
-	  },
-	{ PCI_VENDOR_BROADCOM,
-	  PCI_PRODUCT_BROADCOM_BCM57791,
-	  "Broadcom BCM57791 Gigabit Ethernet",
-	  },
-	{ PCI_VENDOR_BROADCOM,
-	  PCI_PRODUCT_BROADCOM_BCM57795,
-	  "Broadcom BCM57795 Gigabit Ethernet",
-	  },
-	{ PCI_VENDOR_SCHNEIDERKOCH,
-	  PCI_PRODUCT_SCHNEIDERKOCH_SK_9DX1,
-	  "SysKonnect SK-9Dx1 Gigabit Ethernet",
-	  },
-	{ PCI_VENDOR_3COM,
-	  PCI_PRODUCT_3COM_3C996,
-	  "3Com 3c996 Gigabit Ethernet",
-	  },
-	{ PCI_VENDOR_FUJITSU4,
-	  PCI_PRODUCT_FUJITSU4_PW008GE4,
-	  "Fujitsu PW008GE4 Gigabit Ethernet",
-	  },
-	{ PCI_VENDOR_FUJITSU4,
-	  PCI_PRODUCT_FUJITSU4_PW008GE5,
-	  "Fujitsu PW008GE5 Gigabit Ethernet",
-	  },
-	{ PCI_VENDOR_FUJITSU4,
-	  PCI_PRODUCT_FUJITSU4_PP250_450_LAN,
-	  "Fujitsu Primepower 250/450 Gigabit Ethernet",
-	  },
-	{ 0,
-	  0,
-	  NULL },
+	{ VIDDID(ALTEON,   BCM5700),	"Broadcom BCM5700 Gigabit" },
+	{ VIDDID(ALTEON,   BCM5701),	"Broadcom BCM5701 Gigabit" },
+	{ VIDDID(ALTIMA,   AC1000),	"Altima AC1000 Gigabit" },
+	{ VIDDID(ALTIMA,   AC1001),	"Altima AC1001 Gigabit" },
+	{ VIDDID(ALTIMA,   AC1003),	"Altima AC1003 Gigabit" },
+	{ VIDDID(ALTIMA,   AC9100),	"Altima AC9100 Gigabit" },
+	{ VIDDID(APPLE,	   BCM5701),	"APPLE BCM5701 Gigabit" },
+	{ VIDDID(BROADCOM, BCM5700),	"Broadcom BCM5700 Gigabit" },
+	{ VIDDID(BROADCOM, BCM5701),	"Broadcom BCM5701 Gigabit" },
+	{ VIDDID(BROADCOM, BCM5702),	"Broadcom BCM5702 Gigabit" },
+	{ VIDDID(BROADCOM, BCM5702X),	"Broadcom BCM5702X Gigabit" },
+	{ VIDDID(BROADCOM, BCM5703),	"Broadcom BCM5703 Gigabit" },
+	{ VIDDID(BROADCOM, BCM5703X),	"Broadcom BCM5703X Gigabit" },
+	{ VIDDID(BROADCOM, BCM5703_ALT),"Broadcom BCM5703 Gigabit" },
+	{ VIDDID(BROADCOM, BCM5704C),	"Broadcom BCM5704C Dual Gigabit" },
+	{ VIDDID(BROADCOM, BCM5704S),	"Broadcom BCM5704S Dual Gigabit" },
+	{ VIDDID(BROADCOM, BCM5705),	"Broadcom BCM5705 Gigabit" },
+	{ VIDDID(BROADCOM, BCM5705F),	"Broadcom BCM5705F Gigabit" },
+	{ VIDDID(BROADCOM, BCM5705K),	"Broadcom BCM5705K Gigabit" },
+	{ VIDDID(BROADCOM, BCM5705M),	"Broadcom BCM5705M Gigabit" },
+	{ VIDDID(BROADCOM, BCM5705M_ALT),"Broadcom BCM5705M Gigabit" },
+	{ VIDDID(BROADCOM, BCM5714),	"Broadcom BCM5714 Gigabit" },
+	{ VIDDID(BROADCOM, BCM5714S),	"Broadcom BCM5714S Gigabit" },
+	{ VIDDID(BROADCOM, BCM5715),	"Broadcom BCM5715 Gigabit" },
+	{ VIDDID(BROADCOM, BCM5715S),	"Broadcom BCM5715S Gigabit" },
+	{ VIDDID(BROADCOM, BCM5717),	"Broadcom BCM5717 Gigabit" },
+	{ VIDDID(BROADCOM, BCM5717C),	"Broadcom BCM5717 Gigabit" },
+	{ VIDDID(BROADCOM, BCM5718),	"Broadcom BCM5718 Gigabit" },
+	{ VIDDID(BROADCOM, BCM5719),	"Broadcom BCM5719 Gigabit" },
+	{ VIDDID(BROADCOM, BCM5720),	"Broadcom BCM5720 Gigabit" },
+	{ VIDDID(BROADCOM, BCM5721),	"Broadcom BCM5721 Gigabit" },
+	{ VIDDID(BROADCOM, BCM5722),	"Broadcom BCM5722 Gigabit" },
+	{ VIDDID(BROADCOM, BCM5723),	"Broadcom BCM5723 Gigabit" },
+	{ VIDDID(BROADCOM, BCM5750),	"Broadcom BCM5750 Gigabit" },
+	{ VIDDID(BROADCOM, BCM5751),	"Broadcom BCM5751 Gigabit" },
+	{ VIDDID(BROADCOM, BCM5751F),	"Broadcom BCM5751F Gigabit" },
+	{ VIDDID(BROADCOM, BCM5751M),	"Broadcom BCM5751M Gigabit" },
+	{ VIDDID(BROADCOM, BCM5752),	"Broadcom BCM5752 Gigabit" },
+	{ VIDDID(BROADCOM, BCM5752M),	"Broadcom BCM5752M Gigabit" },
+	{ VIDDID(BROADCOM, BCM5753),	"Broadcom BCM5753 Gigabit" },
+	{ VIDDID(BROADCOM, BCM5753F),	"Broadcom BCM5753F Gigabit" },
+	{ VIDDID(BROADCOM, BCM5753M),	"Broadcom BCM5753M Gigabit" },
+	{ VIDDID(BROADCOM, BCM5754),	"Broadcom BCM5754 Gigabit" },
+	{ VIDDID(BROADCOM, BCM5754M),	"Broadcom BCM5754M Gigabit" },
+	{ VIDDID(BROADCOM, BCM5755),	"Broadcom BCM5755 Gigabit" },
+	{ VIDDID(BROADCOM, BCM5755M),	"Broadcom BCM5755M Gigabit" },
+	{ VIDDID(BROADCOM, BCM5756),	"Broadcom BCM5756 Gigabit" },
+	{ VIDDID(BROADCOM, BCM5761),	"Broadcom BCM5761 Gigabit" },
+	{ VIDDID(BROADCOM, BCM5761E),	"Broadcom BCM5761E Gigabit" },
+	{ VIDDID(BROADCOM, BCM5761S),	"Broadcom BCM5761S Gigabit" },
+	{ VIDDID(BROADCOM, BCM5761SE),	"Broadcom BCM5761SE Gigabit" },
+	{ VIDDID(BROADCOM, BCM5764),	"Broadcom BCM5764 Gigabit" },
+	{ VIDDID(BROADCOM, BCM5780),	"Broadcom BCM5780 Gigabit" },
+	{ VIDDID(BROADCOM, BCM5780S),	"Broadcom BCM5780S Gigabit" },
+	{ VIDDID(BROADCOM, BCM5781),	"Broadcom BCM5781 Gigabit" },
+	{ VIDDID(BROADCOM, BCM5782),	"Broadcom BCM5782 Gigabit" },
+	{ VIDDID(BROADCOM, BCM5784M),	"BCM5784M NetLink 1000baseT" },
+	{ VIDDID(BROADCOM, BCM5785F),	"BCM5785F NetLink 10/100" },
+	{ VIDDID(BROADCOM, BCM5785G),	"BCM5785G NetLink 1000baseT" },
+	{ VIDDID(BROADCOM, BCM5786),	"Broadcom BCM5786 Gigabit" },
+	{ VIDDID(BROADCOM, BCM5787),	"Broadcom BCM5787 Gigabit" },
+	{ VIDDID(BROADCOM, BCM5787F),	"Broadcom BCM5787F 10/100" },
+	{ VIDDID(BROADCOM, BCM5787M),	"Broadcom BCM5787M Gigabit" },
+	{ VIDDID(BROADCOM, BCM5788),	"Broadcom BCM5788 Gigabit" },
+	{ VIDDID(BROADCOM, BCM5789),	"Broadcom BCM5789 Gigabit" },
+	{ VIDDID(BROADCOM, BCM5901),	"Broadcom BCM5901 Fast" },
+	{ VIDDID(BROADCOM, BCM5901A2),	"Broadcom BCM5901A2 Fast" },
+	{ VIDDID(BROADCOM, BCM5903M),	"Broadcom BCM5903M Fast" },
+	{ VIDDID(BROADCOM, BCM5906),	"Broadcom BCM5906 Fast" },
+	{ VIDDID(BROADCOM, BCM5906M),	"Broadcom BCM5906M Fast" },
+	{ VIDDID(BROADCOM, BCM57760),	"Broadcom BCM57760 Gigabit" },
+	{ VIDDID(BROADCOM, BCM57761),	"Broadcom BCM57761 Gigabit" },
+	{ VIDDID(BROADCOM, BCM57762),	"Broadcom BCM57762 Gigabit" },
+	{ VIDDID(BROADCOM, BCM57765),	"Broadcom BCM57765 Gigabit" },
+	{ VIDDID(BROADCOM, BCM57766),	"Broadcom BCM57766 Gigabit" },
+	{ VIDDID(BROADCOM, BCM57780),	"Broadcom BCM57780 Gigabit" },
+	{ VIDDID(BROADCOM, BCM57781),	"Broadcom BCM57781 Gigabit" },
+	{ VIDDID(BROADCOM, BCM57782),	"Broadcom BCM57782 Gigabit" },
+	{ VIDDID(BROADCOM, BCM57785),	"Broadcom BCM57785 Gigabit" },
+	{ VIDDID(BROADCOM, BCM57786),	"Broadcom BCM57786 Gigabit" },
+	{ VIDDID(BROADCOM, BCM57788),	"Broadcom BCM57788 Gigabit" },
+	{ VIDDID(BROADCOM, BCM57790),	"Broadcom BCM57790 Gigabit" },
+	{ VIDDID(BROADCOM, BCM57791),	"Broadcom BCM57791 Gigabit" },
+	{ VIDDID(BROADCOM, BCM57795),	"Broadcom BCM57795 Gigabit" },
+	{ VIDDID(SCHNEIDERKOCH, SK_9DX1),"SysKonnect SK-9Dx1 Gigabit" },
+	{ VIDDID(3COM, 3C996),		"3Com 3c996 Gigabit" },
+	{ VIDDID(FUJITSU4, PW008GE4),	"Fujitsu PW008GE4 Gigabit" },
+	{ VIDDID(FUJITSU4, PW008GE5),	"Fujitsu PW008GE5 Gigabit" },
+	{ VIDDID(FUJITSU4, PP250_450_LAN),"Fujitsu Primepower 250/450 Gigabit" },
+	{ 0, 0, NULL },
 };
 
 #define BGE_IS_JUMBO_CAPABLE(sc)	((sc)->bge_flags & BGEF_JUMBO_CAPABLE)
@@ -3441,7 +3173,7 @@ bge_attach(device_t parent, device_t sel
 	subid = pci_conf_read(pc, sc->sc_pcitag, PCI_SUBSYS_ID_REG);
 
 	aprint_naive(": Ethernet controller\n");
-	aprint_normal(": %s\n", bp->bp_name);
+	aprint_normal(": %s Ethernet\n", bp->bp_name);
 
 	/*
 	 * Map control/status registers.

Reply via email to