From 11ebc6f0faeccb4d0a3730e10eeb67b68e9aa034 Mon Sep 17 00:00:00 2001
From: Bill Paul <wpaul@FreeBSD.org>
Date: Wed, 31 Mar 1999 15:45:15 +0000
Subject: [PATCH] Shorten device names so that the pci probe lines don't exceed
 80 chars and wrap to a second line.

Put 'command never completed' message inside #ifdef DIAGNOSTIC/#endif to
stop people worrying about it (it's harmless).
---
 sys/pci/if_xl.c | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/sys/pci/if_xl.c b/sys/pci/if_xl.c
index 8de565646791..2b5634bf0207 100644
--- a/sys/pci/if_xl.c
+++ b/sys/pci/if_xl.c
@@ -29,7 +29,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_xl.c,v 1.68 1999/03/27 20:35:14 wpaul Exp $
+ *	$Id: if_xl.c,v 1.69 1999/03/31 15:36:30 wpaul Exp $
  */
 
 /*
@@ -150,7 +150,7 @@
 
 #if !defined(lint)
 static const char rcsid[] =
-	"$Id: if_xl.c,v 1.68 1999/03/27 20:35:14 wpaul Exp $";
+	"$Id: if_xl.c,v 1.69 1999/03/31 15:36:30 wpaul Exp $";
 #endif
 
 /*
@@ -158,25 +158,25 @@ static const char rcsid[] =
  */
 static struct xl_type xl_devs[] = {
 	{ TC_VENDORID, TC_DEVICEID_BOOMERANG_10BT,
-		"3Com 3c900 Etherlink XL 10BaseT" },
+		"3Com 3c900-TPO Etherlink XL" },
 	{ TC_VENDORID, TC_DEVICEID_BOOMERANG_10BT_COMBO,
-		"3Com 3c900 Etherlink XL 10BaseT Combo" },
+		"3Com 3c900-COMBO Etherlink XL" },
 	{ TC_VENDORID, TC_DEVICEID_BOOMERANG_10_100BT,
-		"3Com 3c905 Fast Etherlink XL 10/100BaseTX" },
+		"3Com 3c905-TX Fast Etherlink XL" },
 	{ TC_VENDORID, TC_DEVICEID_BOOMERANG_100BT4,
-		"3Com 3c905 Fast Etherlink XL 10/100BaseT4" },
+		"3Com 3c905-T4 Fast Etherlink XL" },
 	{ TC_VENDORID, TC_DEVICEID_CYCLONE_10BT,
-		"3Com 3c900B Etherlink XL 10BaseT" },
+		"3Com 3c900B-TPO Etherlink XL" },
 	{ TC_VENDORID, TC_DEVICEID_CYCLONE_10BT_COMBO,
-		"3Com 3c900B Etherlink XL 10BaseT Combo" },
+		"3Com 3c900B-COMBO Etherlink XL" },
 	{ TC_VENDORID, TC_DEVICEID_CYCLONE_10_100BT,
-		"3Com 3c905B Fast Etherlink XL 10/100BaseTX" },
+		"3Com 3c905B-TX Fast Etherlink XL" },
 	{ TC_VENDORID, TC_DEVICEID_CYCLONE_10_100BT4,
-		"3Com 3c905B Fast Etherlink XL 10/100BaseT4" },
+		"3Com 3c905B-T4 Fast Etherlink XL" },
 	{ TC_VENDORID, TC_DEVICEID_CYCLONE_10_100FX,
-		"3Com 3c905B Fast Etherlink XL 10/100BaseFX/SC" },
+		"3Com 3c905B-FX/SC Fast Etherlink XL" },
 	{ TC_VENDORID, TC_DEVICEID_CYCLONE_10_100BT_SERV,
-		"3Com 3c980 Fast Etherlink XL 10/100BaseTX" },
+		"3Com 3c980 Fast Etherlink XL" },
 	{ 0, 0, NULL }
 };
 
@@ -263,8 +263,11 @@ static void xl_wait(sc)
 		if (!(CSR_READ_2(sc, XL_STATUS) & XL_STAT_CMDBUSY))
 			break;
 	}
+
+#ifdef DIAGNOSTIC
 	if (i == XL_TIMEOUT)
 		printf("xl%d: command never completed!\n", sc->xl_unit);
+#endif
 
 	return;
 }