Module Name: src
Committed By: skrll
Date: Wed Oct 10 15:46:34 UTC 2012
Modified Files:
src/sys/arch/hp700/dev: asp.c cpu.c elroy.c wax.c
src/sys/arch/hp700/hp700: autoconf.c
Log Message:
Use device_xname.
>From chuq
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/hp700/dev/asp.c
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/hp700/dev/cpu.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/hp700/dev/elroy.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/hp700/dev/wax.c
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/hp700/hp700/autoconf.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/hp700/dev/asp.c
diff -u src/sys/arch/hp700/dev/asp.c:1.21 src/sys/arch/hp700/dev/asp.c:1.22
--- src/sys/arch/hp700/dev/asp.c:1.21 Wed May 23 16:11:37 2012
+++ src/sys/arch/hp700/dev/asp.c Wed Oct 10 15:46:33 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: asp.c,v 1.21 2012/05/23 16:11:37 skrll Exp $ */
+/* $NetBSD: asp.c,v 1.22 2012/10/10 15:46:33 skrll Exp $ */
/* $OpenBSD: asp.c,v 1.5 2000/02/09 05:04:22 mickey Exp $ */
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: asp.c,v 1.21 2012/05/23 16:11:37 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: asp.c,v 1.22 2012/10/10 15:46:33 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -262,7 +262,7 @@ aspattach(device_t parent, device_t self
/* Attach the GSC bus. */
ga.ga_ca = *ca; /* clone from us */
- if (strcmp(parent->dv_xname, "mainbus0") == 0) {
+ if (strcmp(device_xname(parent), "mainbus0") == 0) {
ga.ga_dp.dp_bc[0] = ga.ga_dp.dp_bc[1];
ga.ga_dp.dp_bc[1] = ga.ga_dp.dp_bc[2];
ga.ga_dp.dp_bc[2] = ga.ga_dp.dp_bc[3];
Index: src/sys/arch/hp700/dev/cpu.c
diff -u src/sys/arch/hp700/dev/cpu.c:1.28 src/sys/arch/hp700/dev/cpu.c:1.29
--- src/sys/arch/hp700/dev/cpu.c:1.28 Wed May 23 21:11:34 2012
+++ src/sys/arch/hp700/dev/cpu.c Wed Oct 10 15:46:34 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.28 2012/05/23 21:11:34 skrll Exp $ */
+/* $NetBSD: cpu.c,v 1.29 2012/10/10 15:46:34 skrll Exp $ */
/* $OpenBSD: cpu.c,v 1.29 2009/02/08 18:33:28 miod Exp $ */
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.28 2012/05/23 21:11:34 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.29 2012/10/10 15:46:34 skrll Exp $");
#include "opt_multiprocessor.h"
@@ -122,7 +122,7 @@ cpuattach(device_t parent, device_t self
}
/* Print the CPU type, spec, level, category, and speed. */
- aprint_normal("\n%s: %s, PA-RISC %s", self->dv_xname,
+ aprint_normal("\n%s: %s, PA-RISC %s", device_xname(self),
hppa_cpu_info->hci_chip_type,
hppa_cpu_info->hci_chip_spec);
aprint_normal(", lev %s, cat %c, ",
@@ -132,7 +132,7 @@ cpuattach(device_t parent, device_t self
if (mhz % 100 > 9)
aprint_normal(".%02d", mhz % 100);
- aprint_normal(" MHz clk\n%s: %s", self->dv_xname,
+ aprint_normal(" MHz clk\n%s: %s", device_xname(self),
pdc_model.sh? "shadows, ": "");
if (pdc_cache.dc_conf.cc_fsel)
@@ -158,7 +158,7 @@ cpuattach(device_t parent, device_t self
* Describe the floating-point support.
*/
KASSERT(fpu_present);
- aprint_normal("%s: %s floating point, rev %d\n", self->dv_xname,
+ aprint_normal("%s: %s floating point, rev %d\n", device_xname(self),
hppa_mod_info(HPPA_TYPE_FPU, (fpu_version >> 16) & 0x1f),
(fpu_version >> 11) & 0x1f);
Index: src/sys/arch/hp700/dev/elroy.c
diff -u src/sys/arch/hp700/dev/elroy.c:1.12 src/sys/arch/hp700/dev/elroy.c:1.13
--- src/sys/arch/hp700/dev/elroy.c:1.12 Fri Jan 27 18:52:56 2012
+++ src/sys/arch/hp700/dev/elroy.c Wed Oct 10 15:46:34 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: elroy.c,v 1.12 2012/01/27 18:52:56 para Exp $ */
+/* $NetBSD: elroy.c,v 1.13 2012/10/10 15:46:34 skrll Exp $ */
/* $OpenBSD: elroy.c,v 1.5 2009/03/30 21:24:57 kettenis Exp $ */
@@ -452,7 +452,7 @@ elroy_alloc_parent(device_t self, struct
return (NULL);
snprintf(sc->sc_memexname, sizeof(sc->sc_memexname),
- "%s_mem", sc->sc_dv.dv_xname);
+ "%s_mem", device_xname(sc->sc_dv));
if ((sc->sc_memex = extent_create(sc->sc_memexname,
mem_start, mem_start + ELROY_MEM_WINDOW,
NULL, 0, EX_NOWAIT | EX_MALLOCOK)) == NULL) {
Index: src/sys/arch/hp700/dev/wax.c
diff -u src/sys/arch/hp700/dev/wax.c:1.20 src/sys/arch/hp700/dev/wax.c:1.21
--- src/sys/arch/hp700/dev/wax.c:1.20 Wed May 23 16:11:37 2012
+++ src/sys/arch/hp700/dev/wax.c Wed Oct 10 15:46:34 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: wax.c,v 1.20 2012/05/23 16:11:37 skrll Exp $ */
+/* $NetBSD: wax.c,v 1.21 2012/10/10 15:46:34 skrll Exp $ */
/* $OpenBSD: wax.c,v 1.1 1998/11/23 03:04:10 mickey Exp $ */
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wax.c,v 1.20 2012/05/23 16:11:37 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wax.c,v 1.21 2012/10/10 15:46:34 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -152,7 +152,7 @@ waxattach(device_t parent, device_t self
/* Attach the GSC bus. */
ga.ga_ca = *ca; /* clone from us */
- if (strcmp(parent->dv_xname, "mainbus0") == 0) {
+ if (strcmp(device_xname(parent), "mainbus0") == 0) {
ga.ga_dp.dp_bc[0] = ga.ga_dp.dp_bc[1];
ga.ga_dp.dp_bc[1] = ga.ga_dp.dp_bc[2];
ga.ga_dp.dp_bc[2] = ga.ga_dp.dp_bc[3];
Index: src/sys/arch/hp700/hp700/autoconf.c
diff -u src/sys/arch/hp700/hp700/autoconf.c:1.48 src/sys/arch/hp700/hp700/autoconf.c:1.49
--- src/sys/arch/hp700/hp700/autoconf.c:1.48 Sun Jul 29 18:05:40 2012
+++ src/sys/arch/hp700/hp700/autoconf.c Wed Oct 10 15:46:34 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.48 2012/07/29 18:05:40 mlelstv Exp $ */
+/* $NetBSD: autoconf.c,v 1.49 2012/10/10 15:46:34 skrll Exp $ */
/* $OpenBSD: autoconf.c,v 1.15 2001/06/25 00:43:10 mickey Exp $ */
@@ -86,7 +86,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.48 2012/07/29 18:05:40 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.49 2012/10/10 15:46:34 skrll Exp $");
#include "opt_kgdb.h"
#include "opt_useleds.h"
@@ -474,7 +474,7 @@ cpu_rootconf(void)
#endif /* DEBUG */
if (boot_device != NULL)
- printf("boot device: %s\n", boot_device->dv_xname );
+ printf("boot device: %s\n", device_xname(boot_device));
booted_device = boot_device;
rootconf();
}
