From 9b0b516ae84d18c7ec7b9bbbc5dc1828c2547541 Mon Sep 17 00:00:00 2001
From: Brad Smith <brad@cvs.openbsd.org>
Date: Sun, 1 Oct 2006 20:51:37 +0000
Subject: fix dmesg line wrapping; this was fallout from shortening the ne(4)
 dmesg printing.

reported/tested by and okay nick@
---
 sys/dev/isa/if_ec.c |  6 +++---
 sys/dev/isa/if_we.c | 21 ++++++++++++++-------
 2 files changed, 17 insertions(+), 10 deletions(-)

(limited to 'sys')

diff --git a/sys/dev/isa/if_ec.c b/sys/dev/isa/if_ec.c
index 9051c9240b9..9ce72a8722a 100644
--- a/sys/dev/isa/if_ec.c
+++ b/sys/dev/isa/if_ec.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ec.c,v 1.7 2006/07/29 11:31:21 miod Exp $	*/
+/*	$OpenBSD: if_ec.c,v 1.8 2006/10/01 20:51:36 brad Exp $	*/
 /*	$NetBSD: if_ec.c,v 1.9 1998/07/05 06:49:12 jonathan Exp $	*/
 
 /*-
@@ -385,7 +385,7 @@ ec_attach(parent, self, aux)
 	else
 		esc->sc_16bitp = 0;
 
-	printf("%s: 3Com 3c503 Ethernet (%s-bit)\n",
+	printf("%s: 3Com 3c503 Ethernet (%s-bit)",
 	    sc->sc_dev.dv_xname, esc->sc_16bitp ? "16" : "8");
 
 	/* Select page 0 registers. */
@@ -419,7 +419,7 @@ ec_attach(parent, self, aux)
 
 	/* Do generic parts of attach. */
 	if (dp8390_config(sc)) {
-		printf("%s: configuration failed\n", sc->sc_dev.dv_xname);
+		printf(": configuration failed\n");
 		return;
 	}
 
diff --git a/sys/dev/isa/if_we.c b/sys/dev/isa/if_we.c
index 12a396790d1..0fefb38814a 100644
--- a/sys/dev/isa/if_we.c
+++ b/sys/dev/isa/if_we.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_we.c,v 1.14 2006/07/29 11:31:21 miod Exp $	*/
+/*	$OpenBSD: if_we.c,v 1.15 2006/10/01 20:51:36 brad Exp $	*/
 /*	$NetBSD: if_we.c,v 1.11 1998/07/05 06:49:14 jonathan Exp $	*/
 
 /*-
@@ -363,6 +363,8 @@ we_attach(parent, self, aux)
 	u_int8_t x;
 	int i;
 
+	printf("\n");
+
 	nict = asict = ia->ia_iot;
 	memt = ia->ia_memt;
 
@@ -370,20 +372,23 @@ we_attach(parent, self, aux)
 	if (!strcmp(parent->dv_cfdata->cf_driver->cd_name, "isapnp") && ia->ia_ioh)
 		asich = ia->ia_ioh;
 	else if (bus_space_map(asict, ia->ia_iobase, WE_NPORTS, 0, &asich)) {
-		printf(": can't map nic i/o space\n");
+		printf("%s: can't map nic i/o space\n",
+		    sc->sc_dev.dv_xname);
 		return;
 	}
 
 	if (bus_space_subregion(asict, asich, WE_NIC_OFFSET, WE_NIC_NPORTS,
 	    &nich)) {
-		printf(": can't subregion i/o space\n");
+		printf("%s: can't subregion i/o space\n",
+		    sc->sc_dev.dv_xname);
 		return;
 	}
 
 	typestr = we_params(asict, asich, &wsc->sc_type, NULL,
 	    &wsc->sc_16bitp, &sc->is790);
 	if (typestr == NULL) {
-		printf(": where did the card go?\n");
+		printf("%s: where did the card go?\n",
+		    sc->sc_dev.dv_xname);
 		return;
 	}
 
@@ -394,7 +399,8 @@ we_attach(parent, self, aux)
 	if (!strcmp(parent->dv_cfdata->cf_driver->cd_name, "isapnp") && ia->ia_memh)
 		memh = ia->ia_memh;
 	else if (bus_space_map(memt, ia->ia_maddr, ia->ia_msize, 0, &memh)) {
-		printf(": can't map shared memory\n");
+		printf("%s: can't map shared memory\n",
+		    sc->sc_dev.dv_xname);
 		return;
 	}
 
@@ -424,7 +430,8 @@ we_attach(parent, self, aux)
 
 	/* Now we can use the NIC_{GET,PUT}() macros. */
 
-	printf(": %s (%s-bit)\n", typestr, wsc->sc_16bitp ? "16" : "8");
+	printf("%s: %s (%s-bit)", sc->sc_dev.dv_xname, typestr,
+	    wsc->sc_16bitp ? "16" : "8");
 
 	/* Get station address from EEPROM. */
 	for (i = 0; i < ETHER_ADDR_LEN; i++)
@@ -523,7 +530,7 @@ we_attach(parent, self, aux)
 	else
 		sc->sc_media_init = dp8390_media_init;
 	if (dp8390_config(sc)) {
-		printf("%s: configuration failed\n", sc->sc_dev.dv_xname);
+		printf(": configuration failed\n");
 		return;
 	}
 
-- 
cgit v1.2.3