Sat Aug 8 14:18:51 2009 UTC ()
Use device_xname.


(skrll)
diff -r1.15 -r1.16 src/sys/arch/hp700/gsc/gscbus.c
cvs diff -r1.15 -r1.16 src/sys/arch/hp700/gsc/Attic/gscbus.c (expand / switch to unified diff)

--- src/sys/arch/hp700/gsc/Attic/gscbus.c 2009/05/07 15:34:49 1.15
+++ src/sys/arch/hp700/gsc/Attic/gscbus.c 2009/08/08 14:18:51 1.16
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: gscbus.c,v 1.15 2009/05/07 15:34:49 skrll Exp $ */ 1/* $NetBSD: gscbus.c,v 1.16 2009/08/08 14:18:51 skrll Exp $ */
2 2
3/* $OpenBSD: gscbus.c,v 1.13 2001/08/01 20:32:04 miod Exp $ */ 3/* $OpenBSD: gscbus.c,v 1.13 2001/08/01 20:32:04 miod Exp $ */
4 4
5/* 5/*
6 * Copyright (c) 1998 Michael Shalayeff 6 * Copyright (c) 1998 Michael Shalayeff
7 * All rights reserved. 7 * All rights reserved.
8 * 8 *
9 * Redistribution and use in source and binary forms, with or without 9 * Redistribution and use in source and binary forms, with or without
10 * modification, are permitted provided that the following conditions 10 * modification, are permitted provided that the following conditions
11 * are met: 11 * are met:
12 * 1. Redistributions of source code must retain the above copyright 12 * 1. Redistributions of source code must retain the above copyright
13 * notice, this list of conditions and the following disclaimer. 13 * notice, this list of conditions and the following disclaimer.
14 * 2. Redistributions in binary form must reproduce the above copyright 14 * 2. Redistributions in binary form must reproduce the above copyright
@@ -62,27 +62,27 @@ @@ -62,27 +62,27 @@
62 * f0826000 -- ie0 62 * f0826000 -- ie0
63 * f0827000 -- dma reset 63 * f0827000 -- dma reset
64 * f0828000 -- timers 64 * f0828000 -- timers
65 * f0829000 -- domain kbd 65 * f0829000 -- domain kbd
66 * f082f000 -- asp0 66 * f082f000 -- asp0
67 * f1000000 -- audio0 67 * f1000000 -- audio0
68 * fc000000 -- eisa0 68 * fc000000 -- eisa0
69 * fffbe000 -- cpu0 69 * fffbe000 -- cpu0
70 * fffbf000 -- mem0 70 * fffbf000 -- mem0
71 * 71 *
72 */ 72 */
73 73
74#include <sys/cdefs.h> 74#include <sys/cdefs.h>
75__KERNEL_RCSID(0, "$NetBSD: gscbus.c,v 1.15 2009/05/07 15:34:49 skrll Exp $"); 75__KERNEL_RCSID(0, "$NetBSD: gscbus.c,v 1.16 2009/08/08 14:18:51 skrll Exp $");
76 76
77#define GSCDEBUG 77#define GSCDEBUG
78 78
79#include "opt_kgdb.h" 79#include "opt_kgdb.h"
80 80
81#include <sys/param.h> 81#include <sys/param.h>
82#include <sys/systm.h> 82#include <sys/systm.h>
83#include <sys/device.h> 83#include <sys/device.h>
84#include <sys/malloc.h> 84#include <sys/malloc.h>
85#include <sys/user.h> 85#include <sys/user.h>
86#include <sys/mbuf.h> 86#include <sys/mbuf.h>
87#include <sys/reboot.h> 87#include <sys/reboot.h>
88 88
@@ -143,27 +143,27 @@ gscattach(device_t parent, device_t self @@ -143,27 +143,27 @@ gscattach(device_t parent, device_t self
143 struct gsc_attach_args *ga = aux; 143 struct gsc_attach_args *ga = aux;
144 144
145 sc->sc_dev = self; 145 sc->sc_dev = self;
146 sc->sc_ga = *ga; 146 sc->sc_ga = *ga;
147 147
148#ifdef USELEDS 148#ifdef USELEDS
149 if (machine_ledaddr) 149 if (machine_ledaddr)
150 aprint_normal(": %sleds", machine_ledword? "word" : ""); 150 aprint_normal(": %sleds", machine_ledword? "word" : "");
151#endif 151#endif
152 152
153 aprint_normal("\n"); 153 aprint_normal("\n");
154 154
155 /* Add the I/O subsystem's interrupt register. */ 155 /* Add the I/O subsystem's interrupt register. */
156 ga->ga_int_reg->int_reg_dev = parent->dv_xname; 156 ga->ga_int_reg->int_reg_dev = device_xname(parent);
157 sc->sc_ih = hp700_intr_establish(sc->sc_dev, IPL_NONE, NULL, 157 sc->sc_ih = hp700_intr_establish(sc->sc_dev, IPL_NONE, NULL,
158 ga->ga_int_reg, &int_reg_cpu, ga->ga_irq); 158 ga->ga_int_reg, &int_reg_cpu, ga->ga_irq);
159 159
160 ga->ga_ca.ca_nmodules = MAXMODBUS; 160 ga->ga_ca.ca_nmodules = MAXMODBUS;
161 ga->ga_ca.ca_hpabase = 0; 161 ga->ga_ca.ca_hpabase = 0;
162 pdc_scanbus(self, &ga->ga_ca, gsc_module_callback); 162 pdc_scanbus(self, &ga->ga_ca, gsc_module_callback);
163} 163}
164 164
165int 165int
166gscprint(void *aux, const char *pnp) 166gscprint(void *aux, const char *pnp)
167{ 167{
168 168
169 return (UNCONF); 169 return (UNCONF);