summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorcegger <cegger@NetBSD.org>2008-04-05 15:50:49 +0000
committercegger <cegger@NetBSD.org>2008-04-05 15:50:49 +0000
commit3069a1f144dd2da179c42975bf71efcdb367709a (patch)
tree1e43a1f64312be764ea82ecd1b24a2d2217b54c4 /sys/dev
parentf214b85d2b3d7b5569851d1492057c87e1ff8789 (diff)
use aprint_*_dev and device_xname
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/wscons/wskbd.c6
-rw-r--r--sys/dev/wscons/wsmouse.c8
-rw-r--r--sys/dev/wsfb/genfb.c11
3 files changed, 12 insertions, 13 deletions
diff --git a/sys/dev/wscons/wskbd.c b/sys/dev/wscons/wskbd.c
index 6aff8081b82..c6421c17daf 100644
--- a/sys/dev/wscons/wskbd.c
+++ b/sys/dev/wscons/wskbd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wskbd.c,v 1.115 2008/03/25 00:49:20 cube Exp $ */
+/* $NetBSD: wskbd.c,v 1.116 2008/04/05 15:51:45 cegger Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@@ -79,7 +79,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wskbd.c,v 1.115 2008/03/25 00:49:20 cube Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wskbd.c,v 1.116 2008/04/05 15:51:45 cegger Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -452,7 +452,7 @@ wskbd_attach(device_t parent, device_t self, void *aux)
wsdisplay_set_console_kbd(&sc->sc_base); /* sets me_dispv */
if (sc->sc_base.me_dispdv != NULL)
aprint_normal(", using %s",
- sc->sc_base.me_dispdv->dv_xname);
+ device_xname(sc->sc_base.me_dispdv));
#endif
}
aprint_naive("\n");
diff --git a/sys/dev/wscons/wsmouse.c b/sys/dev/wscons/wsmouse.c
index 7723835e445..9a89b2f9ace 100644
--- a/sys/dev/wscons/wsmouse.c
+++ b/sys/dev/wscons/wsmouse.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wsmouse.c,v 1.56 2008/03/25 00:49:20 cube Exp $ */
+/* $NetBSD: wsmouse.c,v 1.57 2008/04/05 15:51:45 cegger Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -111,7 +111,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsmouse.c,v 1.56 2008/03/25 00:49:20 cube Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsmouse.c,v 1.57 2008/04/05 15:51:45 cegger Exp $");
#include "wsmouse.h"
#include "wsdisplay.h"
@@ -576,7 +576,7 @@ wsmouseopen(dev_t dev, int flags, int mode, struct lwp *l)
return (ENXIO);
#if NWSMUX > 0
- DPRINTF(("wsmouseopen: %s mux=%p p=%p\n", sc->sc_base.me_dv.dv_xname,
+ DPRINTF(("wsmouseopen: %s mux=%p p=%p\n", device_xname(&sc->sc_base.me_dv),
sc->sc_base.me_parent, l));
#endif
@@ -597,7 +597,7 @@ wsmouseopen(dev_t dev, int flags, int mode, struct lwp *l)
error = wsmousedoopen(sc, evar);
if (error) {
DPRINTF(("wsmouseopen: %s open failed\n",
- sc->sc_base.me_dv.dv_xname));
+ device_xname(&sc->sc_base.me_dv)));
sc->sc_base.me_evp = NULL;
wsevent_fini(evar);
}
diff --git a/sys/dev/wsfb/genfb.c b/sys/dev/wsfb/genfb.c
index ab074802c24..adbf922bc38 100644
--- a/sys/dev/wsfb/genfb.c
+++ b/sys/dev/wsfb/genfb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: genfb.c,v 1.15 2008/03/09 21:33:17 phx Exp $ */
+/* $NetBSD: genfb.c,v 1.16 2008/04/05 15:50:49 cegger Exp $ */
/*-
* Copyright (c) 2007 Michael Lorenz
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: genfb.c,v 1.15 2008/03/09 21:33:17 phx Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genfb.c,v 1.16 2008/04/05 15:50:49 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -151,13 +151,12 @@ genfb_attach(struct genfb_softc *sc, struct genfb_ops *ops)
/* do not attach when we're not console */
if (!console) {
- aprint_normal("%s: no console, unable to continue\n",
- sc->sc_dev.dv_xname);
+ aprint_normal_dev(&sc->sc_dev, "no console, unable to continue\n");
return -1;
}
- aprint_verbose("%s: framebuffer at %p, size %dx%d, depth %d, "
- "stride %d\n", sc->sc_dev.dv_xname, sc->sc_fbaddr,
+ aprint_verbose_dev(&sc->sc_dev, "framebuffer at %p, size %dx%d, depth %d, "
+ "stride %d\n", sc->sc_fbaddr,
sc->sc_width, sc->sc_height, sc->sc_depth, sc->sc_stride);
sc->sc_defaultscreen_descr = (struct wsscreen_descr){