Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Put appropriate prefixes on property names to reduce chances of name

Browse Source 
collisions.
This commit is contained in:
thorpej 2006-07-10 16:28:44 +00:00
parent b794520dcd
commit 55e8bbeb6e
6 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/arch/evbppc/walnut/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.14 2006/05/05 18:04:41 thorpej Exp $ */
/* $NetBSD: autoconf.c,v 1.15 2006/07/10 16:28:44 thorpej Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.14 2006/05/05 18:04:41 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.15 2006/07/10 16:28:44 thorpej Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@ -101,8 +101,8 @@ device_register(struct device *dev, void *aux)
KASSERT(pn != NULL);
if (prop_dictionary_set(device_properties(dev),
"frequency", pn) == FALSE) {
printf("WARNING: unable to set frequency "
"clock-frequency", pn) == FALSE) {
printf("WARNING: unable to set clock-frequency "
"property for %s\n", dev->dv_xname);
}
prop_object_release(pn);

13
sys/arch/powerpc/ibm4xx/dev/com_opb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: com_opb.c,v 1.16 2006/05/07 04:45:03 simonb Exp $ */
/* $NetBSD: com_opb.c,v 1.17 2006/07/10 16:28:44 thorpej Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: com_opb.c,v 1.16 2006/05/07 04:45:03 simonb Exp $");
__KERNEL_RCSID(0, "$NetBSD: com_opb.c,v 1.17 2006/07/10 16:28:44 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@ -119,9 +119,10 @@ com_opb_attach(struct device *parent, struct device *self, void *aux)
bus_space_map(sc->sc_iot, oaa->opb_addr, COM_NPORTS, 0, &sc->sc_ioh);
freq = prop_dictionary_get(device_properties(&sc->sc_dev), "frequency");
freq = prop_dictionary_get(device_properties(&sc->sc_dev),
"clock-frequency");
if (freq == NULL) {
printf(": unable to get frequency property\n");
printf(": unable to get clock-frequency property\n");
return;
}
KASSERT(prop_object_type(freq) == PROP_TYPE_NUMBER);
@ -173,8 +174,8 @@ com_opb_device_register(struct device *dev, int frequency)
KASSERT(pn != NULL);
if (prop_dictionary_set(device_properties(dev),
"frequency", pn) == FALSE) {
printf("WARNING: unable to set frequency "
"clock-frequency", pn) == FALSE) {
printf("WARNING: unable to set clock-frequency "
"property for %s\n", dev->dv_xname);
}
prop_object_release(pn);

12
sys/arch/sgimips/sgimips/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.30 2006/05/05 18:04:42 thorpej Exp $ */
/* $NetBSD: autoconf.c,v 1.31 2006/07/10 16:28:44 thorpej Exp $ */
/*
* Copyright (c) 2000 Soren S. Jorvang
@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.30 2006/05/05 18:04:42 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.31 2006/07/10 16:28:44 thorpej Exp $");
#include "opt_ddb.h"
@ -191,11 +191,11 @@ device_register(struct device *dev, void *aux)
KASSERT(usetd != NULL);
if (prop_dictionary_set(device_properties(dev),
"use-target-defaults",
"aic7xxx-use-target-defaults",
usetd) == FALSE) {
printf("WARNING: unable to set"
"use-target-defaults property for %s\n",
dev->dv_xname);
printf("WARNING: unable to set "
"aic7xxx-use-target-defaults property "
"for %s\n", dev->dv_xname);
}
prop_object_release(usetd);
}

4
sys/dev/i2c/lm75.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: lm75.c,v 1.10 2006/06/12 16:07:33 kiyohara Exp $ */
/* $NetBSD: lm75.c,v 1.11 2006/07/10 16:28:44 thorpej Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@ -158,7 +158,7 @@ lmtemp_attach(struct device *parent, struct device *self, void *aux)
sc->sc_sensor[0].units = sc->sc_info[0].units = ENVSYS_STEMP;
desc = prop_dictionary_get(device_properties(&sc->sc_dev),
"description");
"envsys-description");
if (desc != NULL &&
prop_object_type(desc) == PROP_TYPE_STRING &&
prop_string_size(desc) > 0)

6
sys/dev/onewire/owtemp.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: owtemp.c,v 1.3 2006/05/05 18:04:42 thorpej Exp $ */
/* $NetBSD: owtemp.c,v 1.4 2006/07/10 16:28:44 thorpej Exp $ */
/* $OpenBSD: owtemp.c,v 1.1 2006/03/04 16:27:03 grange Exp $ */
/*
@ -22,7 +22,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: owtemp.c,v 1.3 2006/05/05 18:04:42 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: owtemp.c,v 1.4 2006/07/10 16:28:44 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -121,7 +121,7 @@ owtemp_attach(struct device *parent, struct device *self, void *aux)
sc->sc_sensor[0].units = sc->sc_info[0].units = ENVSYS_STEMP;
desc = prop_dictionary_get(device_properties(&sc->sc_dev),
"description");
"envsys-description");
if (desc != NULL &&
prop_object_type(desc) == PROP_TYPE_STRING &&
prop_string_size(desc) > 0)

6
sys/dev/pci/ahc_pci.c
View File

@ -39,7 +39,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGES.
*
* $Id: ahc_pci.c,v 1.55 2006/05/05 18:04:42 thorpej Exp $
* $Id: ahc_pci.c,v 1.56 2006/07/10 16:28:44 thorpej Exp $
*
* //depot/aic7xxx/aic7xxx/aic7xxx_pci.c#57 $
*
@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ahc_pci.c,v 1.55 2006/05/05 18:04:42 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: ahc_pci.c,v 1.56 2006/07/10 16:28:44 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -1053,7 +1053,7 @@ ahc_pci_attach(struct device *parent, struct device *self, void *aux)
*/
usetd = prop_dictionary_get(
device_properties(&ahc->sc_dev),
"use-target-defaults");
"aic7xxx-use-target-defaults");
if (usetd != NULL) {
KASSERT(prop_object_type(usetd) ==
PROP_TYPE_BOOL);