CVS commit: src/sys/dev

[Christoph Egger]

Module Name:    src
Committed By:   cegger
Date:           Tue Sep 29 11:01:39 UTC 2009

Modified Files:
        src/sys/dev/isa: ess_isa.c
        src/sys/dev/isapnp: ess_isapnp.c

Log Message:
use aprint_* in attach routines


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/isa/ess_isa.c
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/isapnp/ess_isapnp.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_isa.c
diff -u src/sys/dev/isa/ess_isa.c:1.22 src/sys/dev/isa/ess_isa.c:1.23
--- src/sys/dev/isa/ess_isa.c:1.22	Tue May  5 12:07:15 2009
+++ src/sys/dev/isa/ess_isa.c	Tue Sep 29 11:01:39 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: ess_isa.c,v 1.22 2009/05/05 12:07:15 cegger Exp $	*/
+/*	$NetBSD: ess_isa.c,v 1.23 2009/09/29 11:01:39 cegger Exp $	*/
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ess_isa.c,v 1.22 2009/05/05 12:07:15 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ess_isa.c,v 1.23 2009/09/29 11:01:39 cegger Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -129,7 +129,9 @@
 	sc = device_private(self);
 	ia = aux;
 	enablejoy = 0;
-	printf("\n");
+
+	aprint_naive("\n");
+	aprint_normal("\n");
 
 	sc->sc_ic = ia->ia_ic;
 	sc->sc_iot = ia->ia_iot;
@@ -148,7 +150,7 @@
 	sc->sc_audio2.drq = ia->ia_ndrq > 1 ? ia->ia_drq[1].ir_drq : -1;
 
 #if NJOY_ESS > 0
-	if (device_cfdata(&sc->sc_dev)->cf_flags & 1) {
+	if (device_cfdata(self)->cf_flags & 1) {
 		sc->sc_joy_iot = ia->ia_iot;
 		if (!bus_space_map(sc->sc_joy_iot, 0x201, 1, 0,
 				   &sc->sc_joy_ioh))
@@ -156,7 +158,7 @@
 	}
 #endif
 
-	printf("%s", device_xname(&sc->sc_dev));
+	aprint_normal_dev(self, "");
 
 	essattach(sc, enablejoy);
 }

Index: src/sys/dev/isapnp/ess_isapnp.c
diff -u src/sys/dev/isapnp/ess_isapnp.c:1.20 src/sys/dev/isapnp/ess_isapnp.c:1.21
--- src/sys/dev/isapnp/ess_isapnp.c:1.20	Tue May  5 12:10:07 2009
+++ src/sys/dev/isapnp/ess_isapnp.c	Tue Sep 29 11:01:39 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: ess_isapnp.c,v 1.20 2009/05/05 12:10:07 cegger Exp $	*/
+/*	$NetBSD: ess_isapnp.c,v 1.21 2009/09/29 11:01:39 cegger Exp $	*/
 
 /*
  * Copyright (c) 1991-1993 Regents of the University of California.
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ess_isapnp.c,v 1.20 2009/05/05 12:10:07 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ess_isapnp.c,v 1.21 2009/09/29 11:01:39 cegger Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -98,10 +98,12 @@
 
 	sc = device_private(self);
 	ipa = aux;
-	printf("\n");
+
+	aprint_naive("\n");
+	aprint_normal("\n");
 
 	if (isapnp_config(ipa->ipa_iot, ipa->ipa_memt, ipa)) {
-		aprint_error_dev(&sc->sc_dev, "error in region allocation\n");
+		aprint_error_dev(self, "error in region allocation\n");
 		return;
 	}
 
@@ -118,11 +120,11 @@
 	sc->sc_audio2.drq = ipa->ipa_drq[1].num;
 
 	if (!essmatch(sc)) {
-		aprint_error_dev(&sc->sc_dev, "essmatch failed\n");
+		aprint_error_dev(self, "essmatch failed\n");
 		return;
 	}
 
-	printf("%s", device_xname(&sc->sc_dev));
+	aprint_normal_dev(self, "");
 
 	essattach(sc, 0);
 }