From ed0b0bd4d867bcbee51d8cafe0fd576b9f62e12c Mon Sep 17 00:00:00 2001
From: Theo de Raadt <deraadt@cvs.openbsd.org>
Date: Mon, 16 Apr 2001 03:18:20 +0000
Subject: dmesg cleanups

---
 sys/dev/pci/ami_pci.c |  6 +++---
 sys/dev/pci/auich.c   |  4 ++--
 sys/dev/pci/auvia.c   | 19 +++----------------
 sys/dev/pci/cac_pci.c |  4 ++--
 4 files changed, 10 insertions(+), 23 deletions(-)

(limited to 'sys/dev/pci')

diff --git a/sys/dev/pci/ami_pci.c b/sys/dev/pci/ami_pci.c
index a732bfd93e9..7c6b2505a7b 100644
--- a/sys/dev/pci/ami_pci.c
+++ b/sys/dev/pci/ami_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ami_pci.c,v 1.2 2001/03/27 19:17:14 mickey Exp $	*/
+/*	$OpenBSD: ami_pci.c,v 1.3 2001/04/16 03:18:18 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2000 Michael Shalayeff
@@ -192,7 +192,7 @@ ami_pci_attach(parent, self, aux)
 		bus_space_unmap(sc->iot, sc->ioh, size);
 	}
 
-	printf(" %s", intrstr);
+	printf(": %s", intrstr);
 
 	csr = pci_conf_read(pa->pa_pc, pa->pa_tag, PCI_SUBSYS_ID_REG);
 	for (ssp = ami_pci_subsys; ssp->id; ssp++)
@@ -231,7 +231,7 @@ ami_pci_attach(parent, self, aux)
 	default:		lhc = "32b";
 	}
 
-	printf(": %s/%s\n%s", model, lhc, sc->sc_dev.dv_xname);
+	printf(" %s/%s\n%s", model, lhc, sc->sc_dev.dv_xname);
 
 	if (ami_attach(sc)) {
 		pci_intr_disestablish(pa->pa_pc, sc->sc_ih);
diff --git a/sys/dev/pci/auich.c b/sys/dev/pci/auich.c
index 805bcaebb6d..cee985153d2 100644
--- a/sys/dev/pci/auich.c
+++ b/sys/dev/pci/auich.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: auich.c,v 1.7 2001/03/09 09:26:45 mickey Exp $	*/
+/*	$OpenBSD: auich.c,v 1.8 2001/04/16 03:18:18 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2000,2001 Michael Shalayeff
@@ -371,7 +371,7 @@ auich_attach(parent, self, aux)
 	sprintf(sc->sc_audev.version, "0x%02x", PCI_REVISION(pa->pa_class));
 	strcpy(sc->sc_audev.config, sc->sc_dev.dv_xname);
 
-	printf(" %s: %s\n", intrstr, sc->sc_audev.name);
+	printf(": %s %s\n", intrstr, sc->sc_audev.name);
 
 	/* allocate dma lists */
 #define	a(a)	(void*)(((u_long)(a) + sizeof(*(a)) - 1) & ~(sizeof(*(a))-1))
diff --git a/sys/dev/pci/auvia.c b/sys/dev/pci/auvia.c
index 555862b8d95..7daf45dc5ad 100644
--- a/sys/dev/pci/auvia.c
+++ b/sys/dev/pci/auvia.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: auvia.c,v 1.4 2001/03/14 08:09:51 mickey Exp $ */
+/*	$OpenBSD: auvia.c,v 1.5 2001/04/16 03:18:18 deraadt Exp $ */
 /*	$NetBSD: auvia.c,v 1.7 2000/11/15 21:06:33 jdolecek Exp $	*/
 
 /*-
@@ -232,19 +232,6 @@ auvia_attach(struct device *parent, struct device *self, void *aux)
 	u_int16_t v;
 	int r, i;
 
-	r = PCI_REVISION(pa->pa_class);
-	sc->sc_revision[1] = '\0';
-	if (r == 0x20) {
-		sc->sc_revision[0] = 'H';
-	} else if ((r >= 0x10) && (r <= 0x14)) {
-		sc->sc_revision[0] = 'A' + (r - 0x10);
-	} else {
-		sprintf(sc->sc_revision, "0x%02X", r);
-	}
-
-	printf(": VIA VT82C686A AC'97 Audio (rev %s)\n",
-		sc->sc_revision);
-
 	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);
@@ -255,7 +242,7 @@ auvia_attach(struct device *parent, struct device *self, void *aux)
 	sc->sc_ih = pci_intr_establish(pc, ih, IPL_AUDIO, auvia_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");
@@ -266,7 +253,7 @@ auvia_attach(struct device *parent, struct device *self, void *aux)
 	sc->sc_pc = pc;
 	sc->sc_pt = pt;
 
-	printf("%s: interrupting at %s\n", sc->sc_dev.dv_xname, intrstr);
+	printf("%s\n", intrstr);
 
 	if (pci_mapreg_map(pa, 0x10, PCI_MAPREG_TYPE_IO, 0, &sc->sc_iot,
 	    &sc->sc_ioh, &sc->sc_ioaddr, &sc->sc_iosize)) {
diff --git a/sys/dev/pci/cac_pci.c b/sys/dev/pci/cac_pci.c
index 224cca7d3cb..821fbe4c257 100644
--- a/sys/dev/pci/cac_pci.c
+++ b/sys/dev/pci/cac_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cac_pci.c,v 1.2 2001/02/07 04:47:26 mickey Exp $	*/
+/*	$OpenBSD: cac_pci.c,v 1.3 2001/04/16 03:18:19 deraadt Exp $	*/
 /*	$NetBSD: cac_pci.c,v 1.10 2001/01/10 16:48:04 ad Exp $	*/
 
 /*-
@@ -236,7 +236,7 @@ cac_pci_attach(parent, self, aux)
 		return;
 	}
 
-	printf(" %s: Compaq %s\n", intrstr, ct->ct_typestr);
+	printf(": %s Compaq %s\n", intrstr, ct->ct_typestr);
 
 	/* Now attach to the bus-independent code. */
 	sc->sc_cl = ct->ct_linkage;
-- 
cgit v1.2.3