From 44b42c61ceaa04e1bb39237af1404972e358cb52 Mon Sep 17 00:00:00 2001
From: deraadt <deraadt@openbsd.org>
Date: Mon, 3 Apr 2000 21:13:48 +0000
Subject: [PATCH] fix dmesg output

---
 sys/dev/pci/eso.c       |  4 ++--
 sys/dev/pci/if_ne_pci.c |  4 ++--
 sys/dev/pci/sv.c        | 19 ++++++++-----------
 3 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/sys/dev/pci/eso.c b/sys/dev/pci/eso.c
index 9c0fd9491ce..43c1df56119 100644
--- a/sys/dev/pci/eso.c
+++ b/sys/dev/pci/eso.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: eso.c,v 1.8 2000/01/11 13:40:05 deraadt Exp $	*/
+/*	$OpenBSD: eso.c,v 1.9 2000/04/03 21:13:48 deraadt Exp $	*/
 /*	$NetBSD: eso.c,v 1.3 1999/08/02 17:37:43 augustss Exp $	*/
 
 /*
@@ -350,7 +350,7 @@ eso_attach(parent, self, aux)
 		printf("\n");
 		return;
 	}
-	printf(" %s\n", intrstring);
+	printf(", %s\n", intrstring);
 
 	/*
 	 * Set up the DDMA Control register; a suitable I/O region has been
diff --git a/sys/dev/pci/if_ne_pci.c b/sys/dev/pci/if_ne_pci.c
index 3f09b950729..32cd4ffc11c 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.6 1999/09/01 21:43:38 deraadt Exp $	*/
+/*	$OpenBSD: if_ne_pci.c,v 1.7 2000/04/03 21:13:48 deraadt Exp $	*/
 /*	$NetBSD: if_ne_pci.c,v 1.8 1998/07/05 00:51:24 jonathan Exp $	*/
 
 /*-
@@ -282,7 +282,7 @@ ne_pci_attach(parent, self, aux)
 		printf("\n");
 		return;
 	}
-	printf(" %s\n", intrstr);
+	printf(": %s\n", intrstr);
 
 	/*
 	 * Do generic NE2000 attach.  This will read the station address
diff --git a/sys/dev/pci/sv.c b/sys/dev/pci/sv.c
index 2f12913d56f..4899b951c1a 100644
--- a/sys/dev/pci/sv.c
+++ b/sys/dev/pci/sv.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: sv.c,v 1.7 1999/08/04 23:27:49 niklas Exp $ */
+/*      $OpenBSD: sv.c,v 1.8 2000/04/03 21:13:48 deraadt Exp $ */
 
 /*
  * Copyright (c) 1998 Constantine Paul Sapuntzakis
@@ -290,20 +290,18 @@ sv_attach(parent, self, aux)
   u_int32_t  dmareg, dmaio; 
   u_int8_t   reg;
 
-  printf ("\n");
-
   sc->sc_pci_chipset_tag = pc;
   sc->sc_pci_tag = pa->pa_tag;
 
   /* Map the enhanced port only */
   if (pci_io_find(pc, pa->pa_tag, SV_ENHANCED_PORTBASE_SLOT, 
 		  &iobase, &iosize)) {
-    printf ("%s: Couldn't find enhanced synth I/O range\n", sc->sc_dev.dv_xname);
+    printf (": Couldn't find enhanced synth I/O range\n");
     return;
   }
 
   if (bus_space_map(sc->sc_iot, iobase, iosize, 0, &sc->sc_ioh)) {
-      printf("%s: can't map i/o space\n", sc->sc_dev.dv_xname);
+      printf(": can't map i/o space\n");
       return;
   }
 
@@ -321,7 +319,7 @@ sv_attach(parent, self, aux)
          and disable this DMA before we enable the device */
       pci_conf_write(pa->pa_pc, pa->pa_tag, SV_DMAA_CONFIG_OFF, 0);
 
-      printf ("%s: can't map DMA i/o space\n", sc->sc_dev.dv_xname);
+      printf (": can't map DMA i/o space\n");
       goto enable;
     }
 
@@ -341,7 +339,7 @@ sv_attach(parent, self, aux)
          and disable this DMA before we enable the device */
       pci_conf_write (pa->pa_pc, pa->pa_tag, SV_DMAC_CONFIG_OFF, 
 		      dmareg & ~SV_DMA_CHANNEL_ENABLE); 
-      printf ("%s: can't map DMA i/o space\n", sc->sc_dev.dv_xname);
+      printf (": can't map DMA i/o space\n");
       goto enable;
     }
 
@@ -393,21 +391,20 @@ sv_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_AUDIO, sv_intr, 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);
 
   sv_init_mixer(sc);
 
-- 
2.20.1