CVS commit: src/sys/dev/isa

[Christoph Egger]

Module Name:    src
Committed By:   cegger
Date:           Sat Jan 23 17:22:05 UTC 2010

Modified Files:
        src/sys/dev/isa: ess.c

Log Message:
essattach: printf -> aprint_*


To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 src/sys/dev/isa/ess.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/dev/isa/ess.c
diff -u src/sys/dev/isa/ess.c:1.76 src/sys/dev/isa/ess.c:1.77
--- src/sys/dev/isa/ess.c:1.76	Tue Apr  8 20:08:49 2008
+++ src/sys/dev/isa/ess.c	Sat Jan 23 17:22:04 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: ess.c,v 1.76 2008/04/08 20:08:49 cegger Exp $	*/
+/*	$NetBSD: ess.c,v 1.77 2010/01/23 17:22:04 cegger Exp $	*/
 
 /*
  * Copyright 1997
@@ -66,7 +66,7 @@
 */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ess.c,v 1.76 2008/04/08 20:08:49 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ess.c,v 1.77 2010/01/23 17:22:04 cegger Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -922,7 +922,7 @@
 		return;
 	}
 
-	printf(": ESS Technology ES%s [version 0x%04x]\n",
+	aprint_normal(": ESS Technology ES%s [version 0x%04x]\n",
 	    essmodel[sc->sc_model], sc->sc_version);
 
 	sc->sc_audio1.polled = sc->sc_audio1.irq == -1;
@@ -930,10 +930,10 @@
 		sc->sc_audio1.ih = isa_intr_establish(sc->sc_ic,
 		    sc->sc_audio1.irq, sc->sc_audio1.ist, IPL_AUDIO,
 		    ess_audio1_intr, sc);
-		printf("%s: audio1 interrupting at irq %d\n",
-		    device_xname(&sc->sc_dev), sc->sc_audio1.irq);
+		aprint_normal_dev(&sc->sc_dev,
+		    "audio1 interrupting at irq %d\n", sc->sc_audio1.irq);
 	} else
-		printf("%s: audio1 polled\n", device_xname(&sc->sc_dev));
+		aprint_normal_dev(&sc->sc_dev, "audio1 polled\n");
 	sc->sc_audio1.maxsize = isa_dmamaxsize(sc->sc_ic, sc->sc_audio1.drq);
 
 	if (isa_drq_alloc(sc->sc_ic, sc->sc_audio1.drq) != 0) {
@@ -955,10 +955,11 @@
 			sc->sc_audio2.ih = isa_intr_establish(sc->sc_ic,
 			    sc->sc_audio2.irq, sc->sc_audio2.ist, IPL_AUDIO,
 			    ess_audio2_intr, sc);
-			printf("%s: audio2 interrupting at irq %d\n",
-			    device_xname(&sc->sc_dev), sc->sc_audio2.irq);
+			aprint_normal_dev(&sc->sc_dev,
+			    "audio2 interrupting at irq %d\n",
+			    sc->sc_audio2.irq);
 		} else
-			printf("%s: audio2 polled\n", device_xname(&sc->sc_dev));
+			aprint_normal_dev(&sc->sc_dev, "audio2 polled\n");
 		sc->sc_audio2.maxsize = isa_dmamaxsize(sc->sc_ic,
 		    sc->sc_audio2.drq);