Module Name: src
Committed By: tsutsui
Date: Fri Feb 18 19:15:44 UTC 2011
Modified Files:
src/sys/arch/hp300/dev: diofb.c dnkbd.c dvbox.c gbox.c hyper.c rbox.c
topcat.c tvrx.c
Log Message:
Use aprint_normal(9) and variants.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/hp300/dev/diofb.c \
src/sys/arch/hp300/dev/dvbox.c src/sys/arch/hp300/dev/gbox.c \
src/sys/arch/hp300/dev/hyper.c src/sys/arch/hp300/dev/rbox.c \
src/sys/arch/hp300/dev/tvrx.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/hp300/dev/dnkbd.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/hp300/dev/topcat.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/arch/hp300/dev/diofb.c
diff -u src/sys/arch/hp300/dev/diofb.c:1.2 src/sys/arch/hp300/dev/diofb.c:1.3
--- src/sys/arch/hp300/dev/diofb.c:1.2 Sat Feb 12 16:40:29 2011
+++ src/sys/arch/hp300/dev/diofb.c Fri Feb 18 19:15:43 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: diofb.c,v 1.2 2011/02/12 16:40:29 tsutsui Exp $ */
+/* $NetBSD: diofb.c,v 1.3 2011/02/18 19:15:43 tsutsui Exp $ */
/* $OpenBSD: diofb.c,v 1.18 2010/12/26 15:40:59 miod Exp $ */
/*
@@ -305,16 +305,16 @@
{
struct wsemuldisplaydev_attach_args waa;
- printf(": %dx%d", fb->dwidth, fb->dheight);
+ aprint_normal(": %dx%d", fb->dwidth, fb->dheight);
if (fb->planes == 1)
- printf(" monochrome");
+ aprint_normal(" monochrome");
else
- printf("x%d", fb->planes);
+ aprint_normal("x%d", fb->planes);
if (descr != NULL)
- printf(" %s", descr);
- printf(" frame buffer\n");
+ aprint_normal(" %s", descr);
+ aprint_normal(" frame buffer\n");
fb->scrlist[0] = &fb->wsd;
fb->wsl.nscreens = 1;
Index: src/sys/arch/hp300/dev/dvbox.c
diff -u src/sys/arch/hp300/dev/dvbox.c:1.2 src/sys/arch/hp300/dev/dvbox.c:1.3
--- src/sys/arch/hp300/dev/dvbox.c:1.2 Sat Feb 12 16:40:29 2011
+++ src/sys/arch/hp300/dev/dvbox.c Fri Feb 18 19:15:43 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: dvbox.c,v 1.2 2011/02/12 16:40:29 tsutsui Exp $ */
+/* $NetBSD: dvbox.c,v 1.3 2011/02/18 19:15:43 tsutsui Exp $ */
/* $OpenBSD: dvbox.c,v 1.13 2006/08/11 18:33:13 miod Exp $ */
/*
@@ -235,7 +235,7 @@
}
fbr = bus_space_vaddr(da->da_bst, bsh);
if (dvbox_reset(sc->sc_fb, sc->sc_scode, fbr) != 0) {
- printf(": can't map framebuffer\n");
+ aprint_error(": can't reset framebuffer\n");
return;
}
}
Index: src/sys/arch/hp300/dev/gbox.c
diff -u src/sys/arch/hp300/dev/gbox.c:1.2 src/sys/arch/hp300/dev/gbox.c:1.3
--- src/sys/arch/hp300/dev/gbox.c:1.2 Sat Feb 12 16:40:29 2011
+++ src/sys/arch/hp300/dev/gbox.c Fri Feb 18 19:15:43 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: gbox.c,v 1.2 2011/02/12 16:40:29 tsutsui Exp $ */
+/* $NetBSD: gbox.c,v 1.3 2011/02/18 19:15:43 tsutsui Exp $ */
/* $OpenBSD: gbox.c,v 1.15 2007/01/07 15:13:52 miod Exp $ */
/*
@@ -244,7 +244,7 @@
}
fbr = bus_space_vaddr(da->da_bst, bsh);
if (gbox_reset(sc->sc_fb, sc->sc_scode, fbr) != 0) {
- printf(": can't map framebuffer\n");
+ aprint_error(": can't reset framebuffer\n");
return;
}
}
Index: src/sys/arch/hp300/dev/hyper.c
diff -u src/sys/arch/hp300/dev/hyper.c:1.2 src/sys/arch/hp300/dev/hyper.c:1.3
--- src/sys/arch/hp300/dev/hyper.c:1.2 Sat Feb 12 16:40:29 2011
+++ src/sys/arch/hp300/dev/hyper.c Fri Feb 18 19:15:43 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: hyper.c,v 1.2 2011/02/12 16:40:29 tsutsui Exp $ */
+/* $NetBSD: hyper.c,v 1.3 2011/02/18 19:15:43 tsutsui Exp $ */
/* $OpenBSD: hyper.c,v 1.15 2006/04/14 21:05:43 miod Exp $ */
/*
@@ -187,7 +187,7 @@
}
fbr = bus_space_vaddr(da->da_bst, bsh);
if (hyper_reset(sc->sc_fb, sc->sc_scode, fbr) != 0) {
- printf(": can't map framebuffer\n");
+ aprint_error(": can't reset framebuffer\n");
return;
}
}
Index: src/sys/arch/hp300/dev/rbox.c
diff -u src/sys/arch/hp300/dev/rbox.c:1.2 src/sys/arch/hp300/dev/rbox.c:1.3
--- src/sys/arch/hp300/dev/rbox.c:1.2 Sat Feb 12 16:40:29 2011
+++ src/sys/arch/hp300/dev/rbox.c Fri Feb 18 19:15:43 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rbox.c,v 1.2 2011/02/12 16:40:29 tsutsui Exp $ */
+/* $NetBSD: rbox.c,v 1.3 2011/02/18 19:15:43 tsutsui Exp $ */
/* $OpenBSD: rbox.c,v 1.14 2006/08/11 18:33:13 miod Exp $ */
/*
@@ -235,7 +235,7 @@
}
fbr = bus_space_vaddr(da->da_bst, bsh);
if (rbox_reset(sc->sc_fb, sc->sc_scode, fbr) != 0) {
- printf(": can't map framebuffer\n");
+ aprint_error(": can't reset framebuffer\n");
return;
}
}
Index: src/sys/arch/hp300/dev/tvrx.c
diff -u src/sys/arch/hp300/dev/tvrx.c:1.2 src/sys/arch/hp300/dev/tvrx.c:1.3
--- src/sys/arch/hp300/dev/tvrx.c:1.2 Sat Feb 12 16:40:29 2011
+++ src/sys/arch/hp300/dev/tvrx.c Fri Feb 18 19:15:43 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tvrx.c,v 1.2 2011/02/12 16:40:29 tsutsui Exp $ */
+/* $NetBSD: tvrx.c,v 1.3 2011/02/18 19:15:43 tsutsui Exp $ */
/* $OpenBSD: tvrx.c,v 1.1 2006/04/14 21:05:43 miod Exp $ */
/*
@@ -120,7 +120,7 @@
}
fbr = bus_space_vaddr(da->da_bst, bsh);
if (tvrx_reset(sc->sc_fb, sc->sc_scode, fbr) != 0) {
- printf(": can't map framebuffer\n");
+ aprint_error(": can't reset framebuffer\n");
return;
}
}
Index: src/sys/arch/hp300/dev/dnkbd.c
diff -u src/sys/arch/hp300/dev/dnkbd.c:1.4 src/sys/arch/hp300/dev/dnkbd.c:1.5
--- src/sys/arch/hp300/dev/dnkbd.c:1.4 Sat Feb 12 16:41:54 2011
+++ src/sys/arch/hp300/dev/dnkbd.c Fri Feb 18 19:15:43 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: dnkbd.c,v 1.4 2011/02/12 16:41:54 tsutsui Exp $ */
+/* $NetBSD: dnkbd.c,v 1.5 2011/02/18 19:15:43 tsutsui Exp $ */
/* $OpenBSD: dnkbd.c,v 1.17 2009/07/23 21:05:56 blambert Exp $ */
/*
@@ -251,7 +251,7 @@
struct dnkbd_softc *sc = device_private(self);
struct frodo_attach_args *fa = aux;
- printf(": ");
+ aprint_normal(": ");
sc->sc_dev = self;
sc->sc_bst = fa->fa_bst;
@@ -275,7 +275,7 @@
/* probe for keyboard */
if (dnkbd_probe(sc) != 0) {
- printf("no keyboard\n");
+ aprint_normal("no keyboard\n");
return;
}
@@ -425,8 +425,8 @@
}
if (i > sizeof(rspbuf) || i == 0) {
- printf("%s: unexpected identify string length %d\n",
- device_xname(sc->sc_dev), i);
+ aprint_error_dev(sc->sc_dev,
+ "unexpected identify string length %d\n", i);
rc = ENXIO;
goto out;
}
@@ -448,15 +448,15 @@
memcpy(sc->sc_ident, rspbuf, i);
if (cold == 0)
- printf("%s: ", device_xname(sc->sc_dev));
- printf("model ");
+ aprint_normal_dev(sc->sc_dev, "");
+ aprint_normal("model ");
word = rspbuf;
for (i = 0; i < 3; i++) {
end = strchr(word, '\r');
if (end == NULL)
break;
*end++ = '\0';
- printf("<%s> ", word);
+ aprint_normal("<%s> ", word);
/*
* Parse the layout code if applicable
*/
@@ -495,7 +495,7 @@
}
word = end;
}
- printf("\n");
+ aprint_normal("\n");
}
/*
Index: src/sys/arch/hp300/dev/topcat.c
diff -u src/sys/arch/hp300/dev/topcat.c:1.3 src/sys/arch/hp300/dev/topcat.c:1.4
--- src/sys/arch/hp300/dev/topcat.c:1.3 Fri Feb 18 16:02:48 2011
+++ src/sys/arch/hp300/dev/topcat.c Fri Feb 18 19:15:43 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: topcat.c,v 1.3 2011/02/18 16:02:48 tsutsui Exp $ */
+/* $NetBSD: topcat.c,v 1.4 2011/02/18 19:15:43 tsutsui Exp $ */
/* $OpenBSD: topcat.c,v 1.15 2006/08/11 18:33:13 miod Exp $ */
/*
@@ -257,7 +257,7 @@
}
fbr = bus_space_vaddr(da->da_bst, bsh);
if (topcat_reset(sc->sc_fb, sc->sc_scode, fbr) != 0) {
- printf(": can't map framebuffer\n");
+ aprint_error(": can't reset framebuffer\n");
return;
}
}
