now this is really pretty

10 files changed, 51 insertions, 55 deletions

diff --git a/sys/arch/i386/pci/pchb.c b/sys/arch/i386/pci/pchb.c
index 4c39c084ee2..1173a0b7a95 100644
--- a/sys/arch/i386/pci/pchb.c
+++ b/sys/arch/i386/pci/pchb.c
@@ -186,13 +186,13 @@ pchbattach(parent, self, aux)
 			pbnum = PCISET_PCI_BUS_NUMBER(bcreg);
 			switch (bdnum & PCISET_BRIDGETYPE_MASK) {
 			default:
-				printf(", bdnum=%x (reserved)\n", bdnum);
+				printf(": bdnum=%x (reserved)\n", bdnum);
 				break;
 			case PCISET_TYPE_COMPAT:
-				printf(", Compatibility PB (bus %d)\n", pbnum);
+				printf(": Compatibility PB (bus %d)\n", pbnum);
 				break;
 			case PCISET_TYPE_AUX:
-				printf(", Auxiliary PB (bus %d)\n", pbnum);
+				printf(": Auxiliary PB (bus %d)\n", pbnum);
 				/*
 				 * This host bridge has a second PCI bus.
 				 * Configure it.
diff --git a/sys/dev/pci/ahc_pci.c b/sys/dev/pci/ahc_pci.c
index d18c0b7bb6a..dd95b79973b 100644
--- a/sys/dev/pci/ahc_pci.c
+++ b/sys/dev/pci/ahc_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ahc_pci.c,v 1.8 1998/01/05 13:35:18 deraadt Exp $	*/
+/*	$OpenBSD: ahc_pci.c,v 1.9 1998/01/07 11:03:25 deraadt Exp $	*/
 /*	$NetBSD: ahc_pci.c,v 1.9 1996/10/21 22:56:24 thorpej Exp $	*/
 
 /*
@@ -452,7 +452,7 @@ ahc_pci_attach(parent, self, aux)
 
 	if (pci_intr_map(pa->pa_pc, pa->pa_intrtag, pa->pa_intrpin,
 			 pa->pa_intrline, &ih)) {
-		printf(", couldn't map interrupt\n");
+		printf(": couldn't map interrupt\n");
 		ahc_free(ahc);
 		return;
 	}
@@ -464,7 +464,7 @@ ahc_pci_attach(parent, self, aux)
 	    ahc->sc_dev.dv_xname);
 #endif
 	if (ahc->sc_ih == NULL) {
-		printf(", couldn't establish interrupt");
+		printf(": couldn't establish interrupt");
 		if (intrstr != NULL)
 			printf(" at %s", intrstr);
 		printf("\n");
@@ -472,7 +472,7 @@ ahc_pci_attach(parent, self, aux)
 		return;
 	}
 	if (intrstr != NULL)
-		printf(", %s\n", intrstr);
+		printf(": %s\n", intrstr);
 #endif
 	/*
 	 * Protect ourself from spurrious interrupts during
diff --git a/sys/dev/pci/if_de.c b/sys/dev/pci/if_de.c
index a8c42ad6cc4..29513f448f0 100644
--- a/sys/dev/pci/if_de.c
+++ b/sys/dev/pci/if_de.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_de.c,v 1.27 1998/01/05 13:35:19 deraadt Exp $	*/
+/*	$OpenBSD: if_de.c,v 1.28 1998/01/07 11:03:26 deraadt Exp $	*/
 /*	$NetBSD: if_de.c,v 1.45 1997/06/09 00:34:18 thorpej Exp $	*/
 
 /*-
@@ -5338,7 +5338,7 @@ tulip_pci_attach(
 		printf("\n");
 		return;
 	    }
-	    printf(", %s\n", intrstr);
+	    printf(": %s\n", intrstr);
 	}
 	sc->tulip_ats = shutdownhook_establish(tulip_shutdown, sc);
 	if (sc->tulip_ats == NULL)
diff --git a/sys/dev/pci/if_en_pci.c b/sys/dev/pci/if_en_pci.c
index 9f3cf17786e..6a7cc8c9e18 100644
--- a/sys/dev/pci/if_en_pci.c
+++ b/sys/dev/pci/if_en_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_en_pci.c,v 1.5 1997/05/07 00:17:40 niklas Exp $	*/
+/*	$OpenBSD: if_en_pci.c,v 1.6 1998/01/07 11:03:27 deraadt Exp $	*/
 
 /*
  *
@@ -204,8 +204,6 @@ void *aux;
   const char *intrstr;
   int retval;
 
-  printf("\n");
-
   sc->en_memt = pa->pa_memt;
   sc->is_adaptec = (PCI_VENDOR(pa->pa_id) == PCI_VENDOR_ADP) ? 1 : 0;
   scp->en_pc = pa->pa_pc;
@@ -216,20 +214,19 @@ void *aux;
 
   if (pci_intr_map(scp->en_pc, pa->pa_intrtag, pa->pa_intrpin, 
 					pa->pa_intrline, &ih)) {
-    printf("%s: couldn't map interrupt\n", sc->sc_dev.dv_xname);
+    printf(": couldn't map interrupt\n");
     return;
   }
   intrstr = pci_intr_string(scp->en_pc, ih);
   scp->sc_ih = pci_intr_establish(scp->en_pc, ih, IPL_NET, en_intr, sc,
       sc->sc_dev.dv_xname);
   if (scp->sc_ih == NULL) {
-    printf("%s: couldn't establish interrupt\n", sc->sc_dev.dv_xname);
+    printf(": couldn't establish interrupt\n");
     if (intrstr != NULL)
       printf(" at %s", intrstr);
     printf("\n");
     return;
   }
-  printf("%s: interrupting at %s\n", sc->sc_dev.dv_xname, intrstr);
   sc->ipl = 1; /* XXX */
 
   /*
@@ -243,10 +240,12 @@ void *aux;
       &sc->en_base);
  
   if (retval) {
-    printf("%s: couldn't map memory\n", sc->sc_dev.dv_xname);
+    printf(": couldn't map memory\n");
     return;
   }
 
+  printf(": %s\n", intrstr);
+
   /*
    * set up pci bridge
    */
diff --git a/sys/dev/pci/if_ep_pci.c b/sys/dev/pci/if_ep_pci.c
index deec641fb9a..7a968a3819e 100644
--- a/sys/dev/pci/if_ep_pci.c
+++ b/sys/dev/pci/if_ep_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ep_pci.c,v 1.11 1997/11/07 08:07:27 niklas Exp $	*/
+/*	$OpenBSD: if_ep_pci.c,v 1.12 1998/01/07 11:03:28 deraadt Exp $	*/
 /*	$NetBSD: if_ep_pci.c,v 1.13 1996/10/21 22:56:38 thorpej Exp $	*/
 
 /*
@@ -179,19 +179,18 @@ ep_pci_attach(parent, self, aux)
 	/* Map and establish the interrupt. */
 	if (pci_intr_map(pc, pa->pa_intrtag, pa->pa_intrpin,
 	    pa->pa_intrline, &ih)) {
-		printf("%s: couldn't map interrupt\n", sc->sc_dev.dv_xname);
+		printf(", couldn't map interrupt\n");
 		return;
 	}
 	intrstr = pci_intr_string(pc, ih);
 	sc->sc_ih = pci_intr_establish(pc, ih, IPL_NET, epintr,
 	    sc, sc->sc_dev.dv_xname);
 	if (sc->sc_ih == NULL) {
-		printf("%s: couldn't establish interrupt",
-		    sc->sc_dev.dv_xname);
+		printf(": couldn't establish interrupt");
 		if (intrstr != NULL)
 			printf(" at %s", intrstr);
 		printf("\n");
 		return;
 	}
-	printf("%s: interrupting at %s\n", sc->sc_dev.dv_xname, intrstr);
+	printf(" %s\n", intrstr);
 }
diff --git a/sys/dev/pci/if_fpa.c b/sys/dev/pci/if_fpa.c
index 7a25710f1fb..40dd369b09f 100644
--- a/sys/dev/pci/if_fpa.c
+++ b/sys/dev/pci/if_fpa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_fpa.c,v 1.10 1996/11/28 23:28:06 niklas Exp $	*/
+/*	$OpenBSD: if_fpa.c,v 1.11 1998/01/07 11:03:28 deraadt Exp $	*/
 /*	$NetBSD: if_fpa.c,v 1.15 1996/10/21 22:56:40 thorpej Exp $	*/
 
 /*-
@@ -409,21 +409,21 @@ pdq_pci_attach(
 #ifdef PDQ_IOMAPPED
     sc->sc_csrtag = pa->pa_iot;
     if (pci_io_find(pa->pa_pc, pa->pa_tag, PCI_CBIO, &csrbase, &csrsize)) {
-	printf("\n%s: can't find I/O space!\n", sc->sc_dev.dv_xname);
+	printf(": can't find I/O space!\n");
 	return;
     }
 #else
     sc->sc_csrtag = pa->pa_memt;
     if (pci_mem_find(pa->pa_pc, pa->pa_tag, PCI_CBMA, &csrbase, &csrsize,
       &cacheable)) {
-	printf("\n%s: can't find memory space!\n", sc->sc_dev.dv_xname);
+	printf(": can't find memory space!\n");
 	return;
     }
 #endif
 
     if (bus_space_map(sc->sc_csrtag, csrbase, csrsize, cacheable,
       &sc->sc_csrhandle)) {
-	printf("\n%s: can't map CSRs!\n", sc->sc_dev.dv_xname);
+	printf(": can't map CSRs!\n");
 	return;
     }
 
@@ -431,7 +431,7 @@ pdq_pci_attach(
 				sc->sc_if.if_xname, 0,
 				(void *) sc, PDQ_DEFPA);
     if (sc->sc_pdq == NULL) {
-	printf("%s: initialization failed\n", sc->sc_dev.dv_xname);
+	printf(": initialization failed\n");
 	return;
     }
 
@@ -440,14 +440,14 @@ pdq_pci_attach(
 
     if (pci_intr_map(pa->pa_pc, pa->pa_intrtag, pa->pa_intrpin,
 		     pa->pa_intrline, &intrhandle)) {
-	printf("%s: couldn't map interrupt\n", self->dv_xname);
+	printf(": couldn't map interrupt\n");
 	return;
     }
     intrstr = pci_intr_string(pa->pa_pc, intrhandle);
     sc->sc_ih = pci_intr_establish(pa->pa_pc, intrhandle, IPL_NET, pdq_pci_ifintr,
 	sc, self->dv_xname);
     if (sc->sc_ih == NULL) {
-	printf("%s: couldn't establish interrupt", self->dv_xname);
+	printf(": couldn't establish interrupt");
 	if (intrstr != NULL)
 	    printf(" at %s", intrstr);
 	printf("\n");
@@ -458,7 +458,7 @@ pdq_pci_attach(
     if (sc->sc_ats == NULL)
 	printf("%s: warning: couldn't establish shutdown hook\n", self->dv_xname);
     if (intrstr != NULL)
-	printf("%s: interrupting at %s\n", self->dv_xname, intrstr);
+	printf(": %s\n", intrstr);
 }
 
 struct cfattach fpa_ca = {
diff --git a/sys/dev/pci/if_fxp.c b/sys/dev/pci/if_fxp.c
index 072b27b8749..d30642e598a 100644
--- a/sys/dev/pci/if_fxp.c
+++ b/sys/dev/pci/if_fxp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_fxp.c,v 1.8 1998/01/05 13:35:20 deraadt Exp $	*/
+/*	$OpenBSD: if_fxp.c,v 1.9 1998/01/07 11:03:29 deraadt Exp $	*/
 /*	$NetBSD: if_fxp.c,v 1.2 1997/06/05 02:01:55 thorpej Exp $	*/
 
 /*
@@ -323,8 +323,6 @@ fxp_attach(parent, self, aux)
 	bus_size_t iosize;
 #endif
 
-	printf("\n");
-
 #ifndef __OpenBSD__
 	/*
 	 * Map control/status registers.
@@ -347,14 +345,16 @@ fxp_attach(parent, self, aux)
 	sc->sc_st = iot;
 #endif
 
+
 	/*
 	 * Allocate our interrupt.
 	 */
 	if (pci_intr_map(pc, pa->pa_intrtag, pa->pa_intrpin,
 	    pa->pa_intrline, &ih)) {
-		printf("%s: couldn't map interrupt\n", sc->sc_dev.dv_xname);
+		printf(": couldn't map interrupt\n");
 		return;
 	}
+
 	intrstr = pci_intr_string(pc, ih);
 #ifdef __OpenBSD__
 	sc->sc_ih = pci_intr_establish(pc, ih, IPL_NET, fxp_intr, sc,
@@ -363,14 +363,13 @@ fxp_attach(parent, self, aux)
 	sc->sc_ih = pci_intr_establish(pc, ih, IPL_NET, fxp_intr, sc);
 #endif
 	if (sc->sc_ih == NULL) {
-		printf("%s: couldn't establish interrupt",
-		    sc->sc_dev.dv_xname);
+		printf(": couldn't establish interrupt");
 		if (intrstr != NULL)
 			printf(" at %s", intrstr);
 		printf("\n");
 		return;
 	}
-	printf("%s: interrupting at %s\n", sc->sc_dev.dv_xname, intrstr);
+	printf(": %s\n", intrstr);
 
 	/* Do generic parts of attach. */
 	if (fxp_attach_common(sc, enaddr)) {
@@ -378,8 +377,8 @@ fxp_attach(parent, self, aux)
 		return;
 	}
 
-	printf("%s: Ethernet address %s%s\n", sc->sc_dev.dv_xname,
-	    ether_sprintf(enaddr), sc->phy_10Mbps_only ? ", 10Mbps" : "");
+	printf(": Ethernet address %s%s, %s\n", ether_sprintf(enaddr),
+	    sc->phy_10Mbps_only ? ", 10Mbps" : "", intrstr);
 
 #ifdef __OpenBSD__
 	ifp = &sc->arpcom.ac_if;
diff --git a/sys/dev/pci/if_le_pci.c b/sys/dev/pci/if_le_pci.c
index 91fccc59db8..cd9ca5089a9 100644
--- a/sys/dev/pci/if_le_pci.c
+++ b/sys/dev/pci/if_le_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_le_pci.c,v 1.8 1998/01/05 13:35:20 deraadt Exp $	*/
+/*	$OpenBSD: if_le_pci.c,v 1.9 1998/01/07 11:03:30 deraadt Exp $	*/
 /*	$NetBSD: if_le_pci.c,v 1.13 1996/10/25 21:33:32 cgd Exp $	*/
 
 /*-
@@ -168,14 +168,12 @@ le_pci_attach(parent, self, aux)
 		break;
 	}
 
-	printf("\n");
-
 	if (pci_io_find(pc, pa->pa_tag, PCI_CBIO, &iobase, &iosize)) {
-		printf("%s: can't find I/O base\n", sc->sc_dev.dv_xname);
+		printf(": can't find I/O base\n");
 		return;
 	}
 	if (bus_space_map(iot, iobase, iosize, 0, &ioh)) {
-		printf("%s: can't map I/O space\n", sc->sc_dev.dv_xname);
+		printf(": can't map I/O space\n");
 		return;
 	}
 
@@ -187,11 +185,12 @@ le_pci_attach(parent, self, aux)
 
 	sc->sc_mem = malloc(16384, M_DEVBUF, M_NOWAIT);
 	if (sc->sc_mem == 0) {
-		printf("%s: couldn't allocate memory for card\n",
-		    sc->sc_dev.dv_xname);
+		printf(": couldn't allocate memory for card\n");
 		return;
 	}
 
+	printf("\n");
+
 	lesc->sc_iot = iot;
 	lesc->sc_ioh = ioh;
 
diff --git a/sys/dev/pci/ncr.c b/sys/dev/pci/ncr.c
index bae8b4b0418..6f9e63156f2 100644
--- a/sys/dev/pci/ncr.c
+++ b/sys/dev/pci/ncr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ncr.c,v 1.34 1998/01/05 13:35:21 deraadt Exp $	*/
+/*	$OpenBSD: ncr.c,v 1.35 1998/01/07 11:03:31 deraadt Exp $	*/
 /*	$NetBSD: ncr.c,v 1.63 1997/09/23 02:39:15 perry Exp $	*/
 
 /**************************************************************************
@@ -1461,7 +1461,7 @@ static	void	ncr_attach	(pcici_t tag, int unit);
 
 #if 0
 static char ident[] =
-	"\n$OpenBSD: ncr.c,v 1.34 1998/01/05 13:35:21 deraadt Exp $\n";
+	"\n$OpenBSD: ncr.c,v 1.35 1998/01/07 11:03:31 deraadt Exp $\n";
 #endif
 
 static const u_long	ncr_version = NCR_VERSION	* 11
@@ -3668,14 +3668,14 @@ ncr_attach(parent, self, aux)
 	retval = pci_mem_find(pc, pa->pa_tag, 0x14, &np->paddr,
 	    &memsize, &cacheable);
 	if (retval) {
-		printf("\n%s: couldn't find memory region\n", self->dv_xname);
+		printf(": couldn't find memory region\n");
 		return;
 	}
 
 	/* Map the memory.  Note that we never want it to be cacheable. */
 	retval = bus_space_map(pa->pa_memt, np->paddr, memsize, 0, &np->sc_sh);
 	if (retval) {
-		printf("\n%s: couldn't map memory region\n", self->dv_xname);
+		printf(": couldn't map memory region\n");
 		return;
 	}
 
@@ -3685,14 +3685,14 @@ ncr_attach(parent, self, aux)
 	retval = pci_intr_map(pc, pa->pa_intrtag, pa->pa_intrpin,
 	    pa->pa_intrline, &intrhandle);
 	if (retval) {
-		printf("\n%s: couldn't map interrupt\n", self->dv_xname);
+		printf(": couldn't map interrupt\n");
 		return;
 	}
 	intrstr = pci_intr_string(pc, intrhandle);
 	np->sc_ih = pci_intr_establish(pc, intrhandle, IPL_BIO,
 	    ncr_intr, np, self->dv_xname);
 	if (np->sc_ih == NULL) {
-		printf("\n%s: couldn't establish interrupt", self->dv_xname);
+		printf(": couldn't establish interrupt");
 		if (intrstr != NULL)
 			printf(" at %s", intrstr);
 		printf("\n");
@@ -3701,9 +3701,9 @@ ncr_attach(parent, self, aux)
 
 	i = ncr_chip_lookup(pa->pa_id, rev);
 	if (intrstr != NULL)
-		printf(" %s, %s\n", ncr_chip_table[i].name, intrstr);
+		printf(": %s, %s\n", ncr_chip_table[i].name, intrstr);
 	else
-		printf(" %s\n", ncr_chip_table[i].name);
+		printf(": %s\n", ncr_chip_table[i].name);
 
 #else /* !__OpenBSD__ */
 
diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c
index b57c0fadf90..b0fb4771696 100644
--- a/sys/dev/pci/pci.c
+++ b/sys/dev/pci/pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pci.c,v 1.9 1998/01/05 13:35:23 deraadt Exp $	*/
+/*	$OpenBSD: pci.c,v 1.10 1998/01/07 11:03:32 deraadt Exp $	*/
 /*	$NetBSD: pci.c,v 1.26 1996/12/05 01:25:30 cgd Exp $	*/
 
 /*
@@ -205,7 +205,7 @@ pciprint(aux, pnp)
 	printf(" dev %d function %d", pa->pa_device, pa->pa_function);
 	if (!pnp) {
 		pci_devinfo(pa->pa_id, pa->pa_class, 0, devinfo);
-		printf(": %s", devinfo);
+		printf(" %s", devinfo);
 	}
 
 	return (UNCONF);