shorten ne(4) dmesg entries from 2-3 lines to 1.

Thanks to Han Boetes for testing on an isapnp card.

6 files changed, 19 insertions, 30 deletions

diff --git a/sys/dev/ic/dp8390.c b/sys/dev/ic/dp8390.c
index 4c13874cc71..39d96f35982 100644
--- a/sys/dev/ic/dp8390.c
+++ b/sys/dev/ic/dp8390.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dp8390.c,v 1.28 2005/06/08 17:02:59 henning Exp $	*/
+/*	$OpenBSD: dp8390.c,v 1.29 2005/10/22 23:26:02 brad Exp $	*/
 /*	$NetBSD: dp8390.c,v 1.13 1998/07/05 06:49:11 jonathan Exp $	*/
 
 /*
@@ -127,8 +127,7 @@ dp8390_config(sc)
 	IFQ_SET_READY(&ifp->if_snd);
 
 	/* Print additional info when attached. */
-	printf("%s: address %s\n", sc->sc_dev.dv_xname,
-	    ether_sprintf(sc->sc_arpcom.ac_enaddr));
+	printf(", address %s\n", ether_sprintf(sc->sc_arpcom.ac_enaddr));
 
 	/* Initialize media goo. */
 	(*sc->sc_media_init)(sc);
diff --git a/sys/dev/ic/ne2000.c b/sys/dev/ic/ne2000.c
index 9f365fe9971..527b71bf68b 100644
--- a/sys/dev/ic/ne2000.c
+++ b/sys/dev/ic/ne2000.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ne2000.c,v 1.14 2004/01/07 00:34:25 fgsch Exp $	*/
+/*	$OpenBSD: ne2000.c,v 1.15 2005/10/22 23:26:02 brad Exp $	*/
 /*	$NetBSD: ne2000.c,v 1.12 1998/06/10 01:15:50 thorpej Exp $	*/
 
 /*-
@@ -122,8 +122,7 @@ ne2000_attach(nsc, myea)
 	if (nsc->sc_type == 0) {
 		nsc->sc_type = ne2000_detect(nsc);
 		if (nsc->sc_type == 0) {
-			printf("%s: where did the card go?\n",
-			    dsc->sc_dev.dv_xname);
+			printf(": where did the card go?\n");
 			return (1);
 		}
 	}
@@ -211,8 +210,7 @@ ne2000_attach(nsc, myea)
 		}
 
 		if (mstart == 0) {
-			printf("%s: cannot find start of RAM\n",
-			    dsc->sc_dev.dv_xname);
+			printf(": cannot find start of RAM\n");
 			return;
 		}
 
@@ -239,8 +237,8 @@ ne2000_attach(nsc, myea)
 				break;
 		}
 
-		printf("%s: RAM start 0x%x, size %d\n",
-		    dsc->sc_dev.dv_xname, mstart, memsize);
+		printf(": RAM start 0x%x, size %d\n",
+		    mstart, memsize);
 
 		dsc->mem_start = mstart;
 	}
@@ -281,7 +279,7 @@ ne2000_attach(nsc, myea)
 		dsc->sc_media_init = dp8390_media_init;
 
 	if (dp8390_config(dsc)) {
-		printf("%s: setup failed\n", dsc->sc_dev.dv_xname);
+		printf(": setup failed\n");
 		return (1);
 	}
 
diff --git a/sys/dev/isa/if_ne_isa.c b/sys/dev/isa/if_ne_isa.c
index bcf09026b32..a69740b7d73 100644
--- a/sys/dev/isa/if_ne_isa.c
+++ b/sys/dev/isa/if_ne_isa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ne_isa.c,v 1.8 2005/06/08 17:03:00 henning Exp $	*/
+/*	$OpenBSD: if_ne_isa.c,v 1.9 2005/10/22 23:26:05 brad Exp $	*/
 /*	$NetBSD: if_ne_isa.c,v 1.6 1998/07/05 06:49:13 jonathan Exp $	*/
 
 /*-
@@ -166,8 +166,6 @@ ne_isa_attach(parent, self, aux)
 	bus_space_handle_t asich;
 	const char *typestr;
 
-	printf("\n");
-
 	/* Map i/o space. */
 	if (bus_space_map(nict, ia->ia_iobase, NE2000_NPORTS, 0, &nich)) {
 		printf("%s: can't map i/o space\n", dsc->sc_dev.dv_xname);
@@ -211,11 +209,11 @@ ne_isa_attach(parent, self, aux)
 		break;
 
 	default:
-		printf("%s: where did the card go?!\n", dsc->sc_dev.dv_xname);
+		printf(": where did the card go?!\n");
 		return;
 	}
 
-	printf("%s: %s Ethernet\n", dsc->sc_dev.dv_xname, typestr);
+	printf(", %s", typestr);
 
 	/* This interface is always enabled. */
 	dsc->sc_enabled = 1;
@@ -230,6 +228,5 @@ ne_isa_attach(parent, self, aux)
 	isc->sc_ih = isa_intr_establish(ia->ia_ic, ia->ia_irq, IST_EDGE,
 	    IPL_NET, dp8390_intr, dsc, dsc->sc_dev.dv_xname);
 	if (isc->sc_ih == NULL)
-		printf("%s: couldn't establish interrupt handler\n",
-		    dsc->sc_dev.dv_xname);
+		printf(": couldn't establish interrupt handler\n");
 }
diff --git a/sys/dev/isa/if_ne_isapnp.c b/sys/dev/isa/if_ne_isapnp.c
index fb54bef7574..5b5aa32ff8b 100644
--- a/sys/dev/isa/if_ne_isapnp.c
+++ b/sys/dev/isa/if_ne_isapnp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ne_isapnp.c,v 1.7 2005/06/08 17:03:00 henning Exp $	*/
+/*	$OpenBSD: if_ne_isapnp.c,v 1.8 2005/10/22 23:26:05 brad Exp $	*/
 /*	$NetBSD: if_ne_isapnp.c,v 1.7 1998/07/23 19:30:45 christos Exp $	*/
 
 /*-
@@ -132,8 +132,6 @@ ne_isapnp_attach(
 	const char *typestr;
 	int netype;
 
-	printf("\n");
-
 	nict = ipa->ia_iot;
 	nich = ipa->ipa_io[0].h;
 
@@ -181,11 +179,11 @@ ne_isapnp_attach(
 		break;
 
 	default:
-		printf("%s: where did the card go?!\n", dsc->sc_dev.dv_xname);
+		printf(": where did the card go?!\n");
 		return;
 	}
 
-	printf("%s: %s Ethernet\n", dsc->sc_dev.dv_xname, typestr);
+	printf(": %s", typestr);
 
 	/* This interface is always enabled. */
 	dsc->sc_enabled = 1;
@@ -201,6 +199,5 @@ ne_isapnp_attach(
 	    IST_EDGE, IPL_NET, dp8390_intr, dsc,
 	    dsc->sc_dev.dv_xname);
 	if (isc->sc_ih == NULL)
-		printf("%s: couldn't establish interrupt handler\n",
-		    dsc->sc_dev.dv_xname);
+		printf(": couldn't establish interrupt handler\n");
 }
diff --git a/sys/dev/pci/if_ne_pci.c b/sys/dev/pci/if_ne_pci.c
index e4eb5967a9b..28aeaaf90e7 100644
--- a/sys/dev/pci/if_ne_pci.c
+++ b/sys/dev/pci/if_ne_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ne_pci.c,v 1.13 2005/09/11 18:17:08 mickey Exp $	*/
+/*	$OpenBSD: if_ne_pci.c,v 1.14 2005/10/22 23:26:08 brad Exp $	*/
 /*	$NetBSD: if_ne_pci.c,v 1.8 1998/07/05 00:51:24 jonathan Exp $	*/
 
 /*-
@@ -252,7 +252,7 @@ ne_pci_attach(parent, self, aux)
 		bus_space_unmap(nict, nich, iosize);
 		return;
 	}
-	printf(": %s\n", intrstr);
+	printf(": %s", intrstr);
 
 	/*
 	 * Do generic NE2000 attach.  This will read the station address
diff --git a/sys/dev/pcmcia/if_ne_pcmcia.c b/sys/dev/pcmcia/if_ne_pcmcia.c
index 472298510e6..30df0ad79f2 100644
--- a/sys/dev/pcmcia/if_ne_pcmcia.c
+++ b/sys/dev/pcmcia/if_ne_pcmcia.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ne_pcmcia.c,v 1.81 2005/09/19 20:19:02 fgsch Exp $	*/
+/*	$OpenBSD: if_ne_pcmcia.c,v 1.82 2005/10/22 23:26:06 brad Exp $	*/
 /*	$NetBSD: if_ne_pcmcia.c,v 1.17 1998/08/15 19:00:04 thorpej Exp $	*/
 
 /*
@@ -780,8 +780,6 @@ again:
 	if (*intrstr)
 		printf(", %s", intrstr);
 
-	printf("\n");
-
 	if (ne2000_attach(nsc, enaddr))
 		goto fail_5;