make these tables look a little bit nicer.

1 files changed, 55 insertions, 156 deletions

diff --git a/sys/dev/pci/if_bge.c b/sys/dev/pci/if_bge.c
index d7feb3c3c5a..7078b05ad18 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.152 2006/06/11 00:31:57 brad Exp $	*/
+/*	$OpenBSD: if_bge.c,v 1.153 2006/06/15 20:34:41 brad Exp $	*/
 
 /*
  * Copyright (c) 2001 Wind River Systems
@@ -287,129 +287,48 @@ static const struct bge_revision {
 	u_int32_t		br_chipid;
 	const char		*br_name;
 } bge_revisions[] = {
-	{ BGE_CHIPID_BCM5700_A0,
-	  "BCM5700 A0" },
-
-	{ BGE_CHIPID_BCM5700_A1,
-	  "BCM5700 A1" },
-
-	{ BGE_CHIPID_BCM5700_B0,
-	  "BCM5700 B0" },
-
-	{ BGE_CHIPID_BCM5700_B1,
-	  "BCM5700 B1" },
-
-	{ BGE_CHIPID_BCM5700_B2,
-	  "BCM5700 B2" },
-
-	{ BGE_CHIPID_BCM5700_B3,
-	  "BCM5700 B3" },
-
-	/* This is treated like a BCM5700 Bx */
-	{ BGE_CHIPID_BCM5700_ALTIMA,
-	  "BCM5700 Altima" },
-
-	{ BGE_CHIPID_BCM5700_C0,
-	  "BCM5700 C0" },
-
-	{ BGE_CHIPID_BCM5701_A0,
-	  "BCM5701 A0" },
-
-	{ BGE_CHIPID_BCM5701_B0,
-	  "BCM5701 B0" },
-
-	{ BGE_CHIPID_BCM5701_B2,
-	  "BCM5701 B2" },
-
-	{ BGE_CHIPID_BCM5701_B5,
-	  "BCM5701 B5" },
-
-	{ BGE_CHIPID_BCM5703_A0,
-	  "BCM5703 A0" },
-
-	{ BGE_CHIPID_BCM5703_A1,
-	  "BCM5703 A1" },
-
-	{ BGE_CHIPID_BCM5703_A2,
-	  "BCM5703 A2" },
-
-	{ BGE_CHIPID_BCM5703_A3,
-	  "BCM5703 A3" },
-
-	{ BGE_CHIPID_BCM5704_A0,
-	  "BCM5704 A0" },
-
-	{ BGE_CHIPID_BCM5704_A1,
-	  "BCM5704 A1" },
-
-	{ BGE_CHIPID_BCM5704_A2,
-	  "BCM5704 A2" },
-
-	{ BGE_CHIPID_BCM5704_A3,
-	  "BCM5704 A3" },
-
-	{ BGE_CHIPID_BCM5704_B0,
-	  "BCM5704 B0" },
-
-	{ BGE_CHIPID_BCM5705_A0,
-	  "BCM5705 A0" },
-
-	{ BGE_CHIPID_BCM5705_A1,
-	  "BCM5705 A1" },
-
-	{ BGE_CHIPID_BCM5705_A2,
-	  "BCM5705 A2" },
-
-	{ BGE_CHIPID_BCM5705_A3,
-	  "BCM5705 A3" },
-
-	{ BGE_CHIPID_BCM5750_A0,
-	  "BCM5750 A0" },
-
-	{ BGE_CHIPID_BCM5750_A1,
-	  "BCM5750 A1" },
-
-	{ BGE_CHIPID_BCM5750_A3,
-	  "BCM5750 A3" },
-
-	{ BGE_CHIPID_BCM5750_B0,
-	  "BCM5750 B0" },
-
-	{ BGE_CHIPID_BCM5750_B1,
-	  "BCM5750 B1" },
-
-	{ BGE_CHIPID_BCM5750_C0,
-	  "BCM5750 C0" },
-
-	{ BGE_CHIPID_BCM5750_C1,
-	  "BCM5750 C1" },
-
-	{ BGE_CHIPID_BCM5714_A0,
-	  "BCM5714 A0" },
-
-	{ BGE_CHIPID_BCM5752_A0,
-	  "BCM5752 A0" },
-
-	{ BGE_CHIPID_BCM5752_A1,
-	  "BCM5752 A1" },
-
-	{ BGE_CHIPID_BCM5752_A2,
-	  "BCM5752 A2" },
-
-	{ BGE_CHIPID_BCM5714_B0,
-	  "BCM5714 B0" },
-
-	{ BGE_CHIPID_BCM5714_B3,
-	  "BCM5714 B3" },
-
-	{ BGE_CHIPID_BCM5715_A0,
-	  "BCM5715 A0" },
-
-	{ BGE_CHIPID_BCM5715_A1,
-	  "BCM5715 A1" },
-
-	{ 0,
-	  NULL }
+	{ BGE_CHIPID_BCM5700_A0, "BCM5700 A0" },
+	{ BGE_CHIPID_BCM5700_A1, "BCM5700 A1" },
+	{ BGE_CHIPID_BCM5700_B0, "BCM5700 B0" },
+	{ BGE_CHIPID_BCM5700_B1, "BCM5700 B1" },
+	{ BGE_CHIPID_BCM5700_B2, "BCM5700 B2" },
+	{ BGE_CHIPID_BCM5700_B3, "BCM5700 B3" },
+	{ BGE_CHIPID_BCM5700_ALTIMA, "BCM5700 Altima" },
+	{ BGE_CHIPID_BCM5700_C0, "BCM5700 C0" },
+	{ BGE_CHIPID_BCM5701_A0, "BCM5701 A0" },
+	{ BGE_CHIPID_BCM5701_B0, "BCM5701 B0" },
+	{ BGE_CHIPID_BCM5701_B2, "BCM5701 B2" },
+	{ BGE_CHIPID_BCM5701_B5, "BCM5701 B5" },
+	{ BGE_CHIPID_BCM5703_A0, "BCM5703 A0" },
+	{ BGE_CHIPID_BCM5703_A1, "BCM5703 A1" },
+	{ BGE_CHIPID_BCM5703_A2, "BCM5703 A2" },
+	{ BGE_CHIPID_BCM5703_A3, "BCM5703 A3" },
+	{ BGE_CHIPID_BCM5704_A0, "BCM5704 A0" },
+	{ BGE_CHIPID_BCM5704_A1, "BCM5704 A1" },
+	{ BGE_CHIPID_BCM5704_A2, "BCM5704 A2" },
+	{ BGE_CHIPID_BCM5704_A3, "BCM5704 A3" },
+	{ BGE_CHIPID_BCM5704_B0, "BCM5704 B0" },
+	{ BGE_CHIPID_BCM5705_A0, "BCM5705 A0" },
+	{ BGE_CHIPID_BCM5705_A1, "BCM5705 A1" },
+	{ BGE_CHIPID_BCM5705_A2, "BCM5705 A2" },
+	{ BGE_CHIPID_BCM5705_A3, "BCM5705 A3" },
+	{ BGE_CHIPID_BCM5750_A0, "BCM5750 A0" },
+	{ BGE_CHIPID_BCM5750_A1, "BCM5750 A1" },
+	{ BGE_CHIPID_BCM5750_A3, "BCM5750 A3" },
+	{ BGE_CHIPID_BCM5750_B0, "BCM5750 B0" },
+	{ BGE_CHIPID_BCM5750_B1, "BCM5750 B1" },
+	{ BGE_CHIPID_BCM5750_C0, "BCM5750 C0" },
+	{ BGE_CHIPID_BCM5750_C1, "BCM5750 C1" },
+	{ BGE_CHIPID_BCM5714_A0, "BCM5714 A0" },
+	{ BGE_CHIPID_BCM5752_A0, "BCM5752 A0" },
+	{ BGE_CHIPID_BCM5752_A1, "BCM5752 A1" },
+	{ BGE_CHIPID_BCM5752_A2, "BCM5752 A2" },
+	{ BGE_CHIPID_BCM5714_B0, "BCM5714 B0" },
+	{ BGE_CHIPID_BCM5714_B3, "BCM5714 B3" },
+	{ BGE_CHIPID_BCM5715_A0, "BCM5715 A0" },
+	{ BGE_CHIPID_BCM5715_A1, "BCM5715 A1" },
+
+	{ 0, NULL }
 };
 
 /*
@@ -417,38 +336,18 @@ static const struct bge_revision {
  * that we don't know about have a shot at working.
  */
 static const struct bge_revision bge_majorrevs[] = {
-	{ BGE_ASICREV_BCM5700,
-	  "unknown BCM5700" },
-
-	{ BGE_ASICREV_BCM5701,
-	  "unknown BCM5701" },
-
-	{ BGE_ASICREV_BCM5703,
-	  "unknown BCM5703" },
-
-	{ BGE_ASICREV_BCM5704,
-	  "unknown BCM5704" },
-
-	{ BGE_ASICREV_BCM5705,
-	  "unknown BCM5705" },
-
-	{ BGE_ASICREV_BCM5750,
-	  "unknown BCM5750" },
-
-	{ BGE_ASICREV_BCM5714_A0,
-	  "unknown BCM5714" },
-
-	{ BGE_ASICREV_BCM5752,
-	  "unknown BCM5752" },
-
-	{ BGE_ASICREV_BCM5780,
-	  "unknown BCM5780" },
-
-	{ BGE_ASICREV_BCM5714,
-	  "unknown BCM5714" },
-
-	{ 0,
-	  NULL }
+	{ BGE_ASICREV_BCM5700, "unknown BCM5700" },
+	{ BGE_ASICREV_BCM5701, "unknown BCM5701" },
+	{ BGE_ASICREV_BCM5703, "unknown BCM5703" },
+	{ BGE_ASICREV_BCM5704, "unknown BCM5704" },
+	{ BGE_ASICREV_BCM5705, "unknown BCM5705" },
+	{ BGE_ASICREV_BCM5750, "unknown BCM5750" },
+	{ BGE_ASICREV_BCM5714_A0, "unknown BCM5714" },
+	{ BGE_ASICREV_BCM5752, "unknown BCM5752" },
+	{ BGE_ASICREV_BCM5780, "unknown BCM5780" },
+	{ BGE_ASICREV_BCM5714, "unknown BCM5714" },
+
+	{ 0, NULL }
 };
 
 u_int32_t