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

change PROM_getprop() from taking a "void **" for the storage, to a 

"void *", and do the extra de-reference directly in the function.  this
avoids having to cast dozens of different types to "void **", which sets
of GCC3's strict-aliasing.  testing by martin@
This commit is contained in:
mrg 2003-08-27 15:59:49 +00:00
parent 9ff45a46f3
commit 9e599bdb11
22 changed files with 114 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/arch/sparc/dev/bootbus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: bootbus.c,v 1.10 2003/07/15 00:04:51 lukem Exp $ */
/* $NetBSD: bootbus.c,v 1.11 2003/08/27 15:59:50 mrg Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: bootbus.c,v 1.10 2003/07/15 00:04:51 lukem Exp $");
__KERNEL_RCSID(0, "$NetBSD: bootbus.c,v 1.11 2003/08/27 15:59:50 mrg Exp $");
#include <sys/param.h>
#include <sys/malloc.h>
@ -115,7 +115,7 @@ bootbus_attach(struct device *parent, struct device *self, void *aux)
*/
error = PROM_getprop(sc->sc_node, "ranges",
sizeof(struct openprom_range), &sc->sc_bustag->nranges,
(void **) &sc->sc_bustag->ranges);
&sc->sc_bustag->ranges);
if (error) {
printf("%s: error %d getting \"ranges\" property\n",
sc->sc_dev.dv_xname, error);
@ -176,7 +176,7 @@ bootbus_setup_attach_args(struct bootbus_softc *sc, bus_space_tag_t bustag,
memset(baa, 0, sizeof(*baa));
error = PROM_getprop(node, "name", 1, &n, (void **) &baa->ba_name);
error = PROM_getprop(node, "name", 1, &n, &baa->ba_name);
if (error)
return (error);
baa->ba_name[n] = '\0';
@ -185,21 +185,21 @@ bootbus_setup_attach_args(struct bootbus_softc *sc, bus_space_tag_t bustag,
baa->ba_node = node;
error = PROM_getprop(node, "reg", sizeof(struct openprom_addr),
&baa->ba_nreg, (void **) &baa->ba_reg);
&baa->ba_nreg, &baa->ba_reg);
if (error) {
bootbus_destroy_attach_args(baa);
return (error);
}
error = PROM_getprop(node, "intr", sizeof(struct openprom_intr),
&baa->ba_nintr, (void **) &baa->ba_intr);
&baa->ba_nintr, &baa->ba_intr);
if (error != 0 && error != ENOENT) {
bootbus_destroy_attach_args(baa);
return (error);
}
error = PROM_getprop(node, "address", sizeof(uint32_t),
&baa->ba_npromvaddrs, (void **) &baa->ba_promvaddrs);
&baa->ba_npromvaddrs, &baa->ba_promvaddrs);
if (error != 0 && error != ENOENT) {
bootbus_destroy_attach_args(baa);
return (error);

12
sys/arch/sparc/dev/ebus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ebus.c,v 1.14 2003/07/15 00:04:54 lukem Exp $ */
/* $NetBSD: ebus.c,v 1.15 2003/08/27 15:59:50 mrg Exp $ */
/*
* Copyright (c) 1999, 2000 Matthew R. Green
@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ebus.c,v 1.14 2003/07/15 00:04:54 lukem Exp $");
__KERNEL_RCSID(0, "$NetBSD: ebus.c,v 1.15 2003/08/27 15:59:50 mrg Exp $");
#if defined(DEBUG) && !defined(EBUS_DEBUG)
#define EBUS_DEBUG
@ -270,7 +270,7 @@ ebus_attach(parent, self, aux)
*
*/
error = PROM_getprop(node, "reg", sizeof(struct ofw_pci_register),
&sc->sc_nreg, (void **)&sc->sc_reg);
&sc->sc_nreg, &sc->sc_reg);
if (error)
panic("%s: unable to read ebus registers (error %d)",
self->dv_xname, error);
@ -303,7 +303,7 @@ ebus_setup_attach_args(sc, node, ea)
memset(ea, 0, sizeof(struct ebus_attach_args));
err = PROM_getprop(node, "name", 1, &n, (void **)&ea->ea_name);
err = PROM_getprop(node, "name", 1, &n, &ea->ea_name);
if (err != 0)
return (err);
ea->ea_name[n] = '\0';
@ -313,7 +313,7 @@ ebus_setup_attach_args(sc, node, ea)
ea->ea_dmatag = sc->sc_dmatag;
err = PROM_getprop(node, "reg", sizeof(struct ebus_regs),
&ea->ea_nreg, (void **)&ea->ea_reg);
&ea->ea_nreg, &ea->ea_reg);
if (err != 0)
return (err);
@ -331,7 +331,7 @@ ebus_setup_attach_args(sc, node, ea)
err = PROM_getprop(node, "address", sizeof(u_int32_t),
&ea->ea_nvaddr, (void **)&ea->ea_vaddr);
&ea->ea_nvaddr, &ea->ea_vaddr);
if (err != ENOENT) {
if (err != 0)
return (err);

16
sys/arch/sparc/dev/sbus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: sbus.c,v 1.58 2003/08/07 16:29:36 agc Exp $ */
/* $NetBSD: sbus.c,v 1.59 2003/08/27 15:59:50 mrg Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -81,7 +81,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: sbus.c,v 1.58 2003/08/07 16:29:36 agc Exp $");
__KERNEL_RCSID(0, "$NetBSD: sbus.c,v 1.59 2003/08/27 15:59:50 mrg Exp $");
#include <sys/param.h>
#include <sys/malloc.h>
@ -404,7 +404,7 @@ sbus_attach_common(sc, busname, busnode, specials)
* Collect address translations from the OBP.
*/
error = PROM_getprop(busnode, "ranges", sizeof(struct rom_range),
&sbt->nranges, (void **) &sbt->ranges);
&sbt->nranges, &sbt->ranges);
switch (error) {
case 0:
break;
@ -472,7 +472,7 @@ sbus_setup_attach_args(sc, bustag, dmatag, node, sa)
int n, error;
bzero(sa, sizeof(struct sbus_attach_args));
error = PROM_getprop(node, "name", 1, &n, (void **)&sa->sa_name);
error = PROM_getprop(node, "name", 1, &n, &sa->sa_name);
if (error != 0)
return (error);
sa->sa_name[n] = '\0';
@ -483,7 +483,7 @@ sbus_setup_attach_args(sc, bustag, dmatag, node, sa)
sa->sa_frequency = sc->sc_clockfreq;
error = PROM_getprop(node, "reg", sizeof(struct openprom_addr),
&sa->sa_nreg, (void **)&sa->sa_reg);
&sa->sa_nreg, &sa->sa_reg);
if (error != 0) {
char buf[32];
if (error != ENOENT ||
@ -505,7 +505,7 @@ sbus_setup_attach_args(sc, bustag, dmatag, node, sa)
return (error);
error = PROM_getprop(node, "address", sizeof(u_int32_t),
&sa->sa_npromvaddrs, (void **)&sa->sa_promvaddrs);
&sa->sa_npromvaddrs, &sa->sa_promvaddrs);
if (error != 0 && error != ENOENT)
return (error);
@ -617,7 +617,7 @@ sbus_get_intr(sc, node, ipp, np)
* The `interrupts' property contains the Sbus interrupt level.
*/
if (PROM_getprop(node, "interrupts", sizeof(int), np,
(void **)&ipl) == 0) {
&ipl) == 0) {
/* Change format to an `struct openprom_intr' array */
struct openprom_intr *ip;
ip = malloc(*np * sizeof(struct openprom_intr), M_DEVBUF,
@ -640,7 +640,7 @@ sbus_get_intr(sc, node, ipp, np)
*/
*ipp = NULL;
error = PROM_getprop(node, "intr", sizeof(struct openprom_intr),
np, (void **)ipp);
np, ipp);
switch (error) {
case 0:
for (n = *np; n-- > 0;) {

10
sys/arch/sparc/dev/vme_machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: vme_machdep.c,v 1.47 2003/08/01 12:19:50 pk Exp $ */
/* $NetBSD: vme_machdep.c,v 1.48 2003/08/27 15:59:50 mrg Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: vme_machdep.c,v 1.47 2003/08/01 12:19:50 pk Exp $");
__KERNEL_RCSID(0, "$NetBSD: vme_machdep.c,v 1.48 2003/08/27 15:59:50 mrg Exp $");
#include <sys/param.h>
#include <sys/extent.h>
@ -464,7 +464,7 @@ vmeattach_iommu(parent, self, aux)
* Get "range" property.
*/
if (PROM_getprop(node, "ranges", sizeof(struct rom_range),
&sc->sc_nrange, (void **)&sc->sc_range) != 0) {
&sc->sc_nrange, &sc->sc_range) != 0) {
panic("%s: can't get ranges property", self->dv_xname);
}
@ -932,6 +932,7 @@ sparc_vme4_dmamap_load(t, map, buf, buflen, p, flags)
{
bus_addr_t dva;
bus_size_t sgsize;
u_long ldva;
vaddr_t va, voff;
pmap_t pmap;
int pagesz = PAGE_SIZE;
@ -953,9 +954,10 @@ sparc_vme4_dmamap_load(t, map, buf, buflen, p, flags)
(flags & BUS_DMA_NOWAIT) == 0
? EX_WAITOK
: EX_NOWAIT,
(u_long *)&dva);
&ldva);
if (error != 0)
return (error);
dva = (bus_addr_t)ldva;
map->dm_mapsize = buflen;
map->dm_nsegs = 1;

6
sys/arch/sparc/dev/zs_kgdb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: zs_kgdb.c,v 1.12 2003/07/15 00:04:58 lukem Exp $ */
/* $NetBSD: zs_kgdb.c,v 1.13 2003/08/27 15:59:50 mrg Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: zs_kgdb.c,v 1.12 2003/07/15 00:04:58 lukem Exp $");
__KERNEL_RCSID(0, "$NetBSD: zs_kgdb.c,v 1.13 2003/08/27 15:59:50 mrg Exp $");
#include "opt_kgdb.h"
@ -384,7 +384,7 @@ findzs(zs)
vaddrs = vstore;
nvaddrs = sizeof(vstore)/sizeof(vstore[0]);
if (PROM_getprop(node, "address", sizeof(int),
&nvaddrs, (void **)&vaddrs) != 0)
&nvaddrs, &vaddrs) != 0)
return (NULL);
return ((void *)vaddrs[0]);

4
sys/arch/sparc/include/promlib.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: promlib.h,v 1.10 2003/06/25 14:38:53 martin Exp $ */
/* $NetBSD: promlib.h,v 1.11 2003/08/27 15:59:50 mrg Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@ -141,7 +141,7 @@ void prom_init __P((void)); /* To setup promops */
/* Utility routines */
int prom_prop __P((int, char *, int, int *, void **));
int PROM_getprop __P((int, char *, int, int *, void **));
int PROM_getprop __P((int, char *, int, int *, void *));
int PROM_getpropint __P((int node, char *name, int deflt));
char *PROM_getpropstring __P((int node, char *name));
char *PROM_getpropstringA __P((int node, char *name, char *, size_t));

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

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.200 2003/08/25 17:50:26 uwe Exp $ */
/* $NetBSD: autoconf.c,v 1.201 2003/08/27 15:59:52 mrg Exp $ */
/*
* Copyright (c) 1996
@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.200 2003/08/25 17:50:26 uwe Exp $");
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.201 2003/08/27 15:59:52 mrg Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@ -371,7 +371,7 @@ bootstrap4m()
vaddrs = vstore;
nvaddrs = sizeof(vstore)/sizeof(vstore[0]);
if (PROM_getprop(node, "address", sizeof(int),
&nvaddrs, (void **)&vaddrs) != 0) {
&nvaddrs, &vaddrs) != 0) {
printf("bootstrap: could not get interrupt properties");
prom_halt();
}
@ -1406,7 +1406,7 @@ PROM_getprop_reg1(node, rrp)
char buf[32];
error = PROM_getprop(node, "reg", sizeof(struct openprom_addr),
&n, (void **)&rrp0);
&n, &rrp0);
if (error != 0) {
if (error == ENOENT &&
strcmp(PROM_getpropstringA(node, "device_type", buf, sizeof buf),
@ -1431,7 +1431,7 @@ PROM_getprop_intr1(node, ip)
struct rom_intr *rip = NULL;
error = PROM_getprop(node, "intr", sizeof(struct rom_intr),
&n, (void **)&rip);
&n, &rip);
if (error != 0) {
if (error == ENOENT) {
*ip = 0;
@ -1453,7 +1453,7 @@ PROM_getprop_address1(node, vpp)
int error, n;
void **vp = NULL;
error = PROM_getprop(node, "address", sizeof(u_int32_t), &n, (void **)&vp);
error = PROM_getprop(node, "address", sizeof(u_int32_t), &n, &vp);
if (error != 0) {
if (error == ENOENT) {
*vpp = 0;

10
sys/arch/sparc/sparc/cpu.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cpu.c,v 1.178 2003/08/01 12:29:30 pk Exp $ */
/* $NetBSD: cpu.c,v 1.179 2003/08/27 15:59:52 mrg Exp $ */
/*
* Copyright (c) 1996
@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.178 2003/08/01 12:29:30 pk Exp $");
__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.179 2003/08/27 15:59:52 mrg Exp $");
#include "opt_multiprocessor.h"
#include "opt_lockdebug.h"
@ -323,12 +323,12 @@ cpu_mainbus_attach(parent, self, aux)
*/
if (node != 0 && (error = PROM_getprop(node, "mailbox-virtual",
sizeof(*mbprop),
&n, (void **)&mbprop)) == 0) {
&n, &mbprop)) == 0) {
cpi->mailbox = mbprop->va;
free(mbprop, M_DEVBUF);
} else if (node != 0 && (error = PROM_getprop(node, "mailbox",
sizeof(struct openprom_addr),
&n, (void **)&rrp)) == 0) {
&n, &rrp)) == 0) {
/* XXX - map cached/uncached? If cached, deal with
* cache congruency!
*/
@ -354,7 +354,7 @@ cpu_mainbus_attach(parent, self, aux)
rrp = NULL;
if (node == 0 || (error = PROM_getprop(node, "reg",
sizeof(struct openprom_addr),
&n, (void **)&rrp)) != 0)
&n, &rrp)) != 0)
return;
/* register set #0 is the MBus port register */

10
sys/arch/sparc/sparc/cpuunit.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cpuunit.c,v 1.8 2003/07/15 00:05:03 lukem Exp $ */
/* $NetBSD: cpuunit.c,v 1.9 2003/08/27 15:59:53 mrg Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: cpuunit.c,v 1.8 2003/07/15 00:05:03 lukem Exp $");
__KERNEL_RCSID(0, "$NetBSD: cpuunit.c,v 1.9 2003/08/27 15:59:53 mrg Exp $");
#include <sys/param.h>
#include <sys/malloc.h>
@ -117,7 +117,7 @@ cpuunit_attach(struct device *parent, struct device *self, void *aux)
*/
error = PROM_getprop(sc->sc_node, "ranges",
sizeof(struct openprom_range), &sc->sc_bustag->nranges,
(void **) &sc->sc_bustag->ranges);
&sc->sc_bustag->ranges);
if (error) {
printf("%s: error %d getting \"ranges\" property\n",
sc->sc_dev.dv_xname, error);
@ -157,13 +157,13 @@ cpuunit_setup_attach_args(struct cpuunit_softc *sc, bus_space_tag_t bustag,
memset(cpua, 0, sizeof(*cpua));
error = PROM_getprop(node, "name", 1, &n, (void **) &cpua->cpua_name);
error = PROM_getprop(node, "name", 1, &n, &cpua->cpua_name);
if (error)
return (error);
cpua->cpua_name[n] = '\0';
error = PROM_getprop(node, "device_type", 1, &n,
(void **) &cpua->cpua_type);
&cpua->cpua_type);
if (error) {
free(cpua->cpua_name, M_DEVBUF);
return (error);

6
sys/arch/sparc/sparc/iommu.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: iommu.c,v 1.76 2003/07/15 00:05:05 lukem Exp $ */
/* $NetBSD: iommu.c,v 1.77 2003/08/27 15:59:53 mrg Exp $ */
/*
* Copyright (c) 1996
@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: iommu.c,v 1.76 2003/07/15 00:05:05 lukem Exp $");
__KERNEL_RCSID(0, "$NetBSD: iommu.c,v 1.77 2003/08/27 15:59:53 mrg Exp $");
#include "opt_sparc_arch.h"
@ -330,7 +330,7 @@ iommu_attach(parent, self, aux)
ia.iom_reg = NULL;
PROM_getprop(node, "reg", sizeof(struct openprom_addr),
&ia.iom_nreg, (void **)&ia.iom_reg);
&ia.iom_nreg, &ia.iom_reg);
(void) config_found(&sc->sc_dev, (void *)&ia, iommu_print);
if (ia.iom_reg != NULL)

6
sys/arch/sparc/sparc/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.231 2003/08/07 16:29:45 agc Exp $ */
/* $NetBSD: machdep.c,v 1.232 2003/08/27 15:59:53 mrg Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@ -78,7 +78,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.231 2003/08/07 16:29:45 agc Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.232 2003/08/27 15:59:53 mrg Exp $");
#include "opt_compat_netbsd.h"
#include "opt_compat_sunos.h"
@ -302,7 +302,7 @@ cpu_startup()
size = MAXBSIZE * nbuf; /* # bytes for buffers */
/* allocate VM for buffers... area is not managed by VM system */
if (uvm_map(kernel_map, (vaddr_t *) &buffers, round_page(size),
if (uvm_map(kernel_map, (void *)&buffers, round_page(size),
NULL, UVM_UNKNOWN_OFFSET, 0,
UVM_MAPFLAG(UVM_PROT_NONE, UVM_PROT_NONE, UVM_INH_NONE,
UVM_ADV_NORMAL, 0)) != 0)

6
sys/arch/sparc/sparc/openprom.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: openprom.c,v 1.18 2003/08/07 16:29:45 agc Exp $ */
/* $NetBSD: openprom.c,v 1.19 2003/08/27 15:59:53 mrg Exp $ */
/*
* Copyright (c) 1992, 1993
@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: openprom.c,v 1.18 2003/08/07 16:29:45 agc Exp $");
__KERNEL_RCSID(0, "$NetBSD: openprom.c,v 1.19 2003/08/27 15:59:53 mrg Exp $");
#include "opt_sparc_arch.h"
@ -177,7 +177,7 @@ openpromioctl(dev, cmd, data, flags, p)
break;
value = malloc(len, M_TEMP, M_WAITOK);
s = splhigh();
error = PROM_getprop(node, name, 1, &len, (void **)&value);
error = PROM_getprop(node, name, 1, &len, &value);
splx(s);
if (error != 0)
break;

6
sys/arch/sparc/sparc/pmap.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pmap.c,v 1.270 2003/08/24 18:10:31 chs Exp $ */
/* $NetBSD: pmap.c,v 1.271 2003/08/27 15:59:53 mrg Exp $ */
/*
* Copyright (c) 1996
@ -56,7 +56,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.270 2003/08/24 18:10:31 chs Exp $");
__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.271 2003/08/27 15:59:53 mrg Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@ -7870,7 +7870,7 @@ pmap_dumpmmu(dump, blkno)
for (i = 0; i < npmemarr; i++) {
memseg.start = pmemarr[i].addr;
memseg.size = pmemarr[i].len;
EXPEDITE(&memseg, sizeof(phys_ram_seg_t));
EXPEDITE((void *)&memseg, sizeof(phys_ram_seg_t));
}
EXPEDITE(&kernel_segmap_store, sizeof(kernel_segmap_store));

24
sys/arch/sparc/sparc/promlib.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: promlib.c,v 1.21 2003/08/10 14:50:09 martin Exp $ */
/* $NetBSD: promlib.c,v 1.22 2003/08/27 15:59:54 mrg Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: promlib.c,v 1.21 2003/08/10 14:50:09 martin Exp $");
__KERNEL_RCSID(0, "$NetBSD: promlib.c,v 1.22 2003/08/27 15:59:54 mrg Exp $");
#if defined(_KERNEL_OPT)
#include "opt_sparc_arch.h"
@ -202,7 +202,7 @@ PROM_getprop(node, name, size, nitem, bufp)
char *name;
int size;
int *nitem;
void **bufp;
void *bufp;
{
void *buf;
int len;
@ -214,7 +214,7 @@ PROM_getprop(node, name, size, nitem, bufp)
if ((len % size) != 0)
return (EINVAL);
buf = *bufp;
buf = *(void **)bufp;
if (buf == NULL) {
/* No storage provided, so we allocate some */
buf = malloc(len, M_DEVBUF, M_NOWAIT);
@ -226,7 +226,7 @@ PROM_getprop(node, name, size, nitem, bufp)
}
_prom_getprop(node, name, buf, len);
*bufp = buf;
*(void **)bufp = buf;
*nitem = len / size;
return (0);
}
@ -258,7 +258,7 @@ PROM_getpropstringA(node, name, buf, bufsize)
{
int len = bufsize - 1;
if (PROM_getprop(node, name, 1, &len, (void **)&buf) != 0)
if (PROM_getprop(node, name, 1, &len, &buf) != 0)
len = 0;
buf[len] = '\0'; /* usually unnecessary */
@ -278,7 +278,7 @@ PROM_getpropint(node, name, deflt)
int intbuf, *ip = &intbuf;
int len = 1;
if (PROM_getprop(node, name, sizeof(int), &len, (void **)&ip) != 0)
if (PROM_getprop(node, name, sizeof(int), &len, &ip) != 0)
return (deflt);
return (*ip);
@ -758,7 +758,7 @@ opf_getbootpath()
char *buf = NULL;
int blen = 0;
if (PROM_getprop(node, "bootpath", 1, &blen, (void **)&buf) != 0)
if (PROM_getprop(node, "bootpath", 1, &blen, &buf) != 0)
return ("");
return (buf);
@ -771,7 +771,7 @@ opf_getbootargs()
char *buf = NULL;
int blen = 0;
if (PROM_getprop(node, "bootargs", 1, &blen, (void **)&buf) != 0)
if (PROM_getprop(node, "bootargs", 1, &blen, &buf) != 0)
return ("");
return (parse_bootargs(buf));
@ -784,7 +784,7 @@ opf_getbootfile()
char *buf = NULL;
int blen = 0;
if (PROM_getprop(node, "bootargs", 1, &blen, (void **)&buf) != 0)
if (PROM_getprop(node, "bootargs", 1, &blen, &buf) != 0)
return ("");
return (parse_bootfile(buf));
@ -889,7 +889,7 @@ prom_makememarr(ap, max, which)
} else {
n = max;
if (PROM_getprop(node, prop, sizeof(struct memarr),
&n, (void **)&ap) != 0)
&n, &ap) != 0)
panic("makememarr: cannot get property");
}
break;
@ -940,7 +940,7 @@ prom_getidprom(void)
dst = (char *)&idprom;
len = sizeof(struct idprom);
node = prom_findroot();
if (PROM_getprop(node, "idprom", 1, &len, (void **)&dst) != 0) {
if (PROM_getprop(node, "idprom", 1, &len, &dst) != 0) {
printf("`idprom' property cannot be read: "
"cannot get ethernet address");
}

18
sys/arch/sparc64/dev/ebus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ebus.c,v 1.40 2003/07/15 03:36:04 lukem Exp $ */
/* $NetBSD: ebus.c,v 1.41 2003/08/27 15:59:54 mrg Exp $ */
/*
* Copyright (c) 1999, 2000, 2001 Matthew R. Green
@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ebus.c,v 1.40 2003/07/15 03:36:04 lukem Exp $");
__KERNEL_RCSID(0, "$NetBSD: ebus.c,v 1.41 2003/08/27 15:59:54 mrg Exp $");
#include "opt_ddb.h"
@ -200,13 +200,13 @@ ebus_attach(parent, self, aux)
sc->sc_range = NULL;
error = PROM_getprop(node, "interrupt-map",
sizeof(struct ebus_interrupt_map),
&sc->sc_nintmap, (void **)&sc->sc_intmap);
&sc->sc_nintmap, &sc->sc_intmap);
switch (error) {
case 0:
immp = &sc->sc_intmapmask;
error = PROM_getprop(node, "interrupt-map-mask",
sizeof(struct ebus_interrupt_map_mask), &nmapmask,
(void *)&immp);
&immp);
if (error)
panic("could not get ebus interrupt-map-mask");
if (nmapmask != 1)
@ -220,7 +220,7 @@ ebus_attach(parent, self, aux)
}
error = PROM_getprop(node, "ranges", sizeof(struct ebus_ranges),
&sc->sc_nrange, (void **)&sc->sc_range);
&sc->sc_nrange, &sc->sc_range);
if (error)
panic("ebus ranges: error %d", error);
@ -252,7 +252,7 @@ ebus_setup_attach_args(sc, node, ea)
int n, rv;
bzero(ea, sizeof(struct ebus_attach_args));
rv = PROM_getprop(node, "name", 1, &n, (void **)&ea->ea_name);
rv = PROM_getprop(node, "name", 1, &n, &ea->ea_name);
if (rv != 0)
return (rv);
ea->ea_name[n] = '\0';
@ -262,12 +262,12 @@ ebus_setup_attach_args(sc, node, ea)
ea->ea_dmatag = sc->sc_dmatag;
rv = PROM_getprop(node, "reg", sizeof(struct ebus_regs), &ea->ea_nreg,
(void **)&ea->ea_reg);
&ea->ea_reg);
if (rv)
return (rv);
rv = PROM_getprop(node, "address", sizeof(u_int32_t), &ea->ea_nvaddr,
(void **)&ea->ea_vaddr);
&ea->ea_vaddr);
if (rv != ENOENT) {
if (rv)
return (rv);
@ -279,7 +279,7 @@ ebus_setup_attach_args(sc, node, ea)
ea->ea_nvaddr = 0;
if (PROM_getprop(node, "interrupts", sizeof(u_int32_t), &ea->ea_nintr,
(void **)&ea->ea_intr))
&ea->ea_intr))
ea->ea_nintr = 0;
else
ebus_find_ino(sc, ea);

12
sys/arch/sparc64/dev/psycho.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: psycho.c,v 1.65 2003/08/22 00:46:25 petrov Exp $ */
/* $NetBSD: psycho.c,v 1.66 2003/08/27 15:59:54 mrg Exp $ */
/*
* Copyright (c) 2001, 2002 Eduardo E. Horvath
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: psycho.c,v 1.65 2003/08/22 00:46:25 petrov Exp $");
__KERNEL_RCSID(0, "$NetBSD: psycho.c,v 1.66 2003/08/27 15:59:54 mrg Exp $");
#include "opt_ddb.h"
@ -717,7 +717,7 @@ psycho_alloc_extent(pp, node, ss, name)
bsize = BUS_ADDR(pr->size_hi, pr->size_lo);
/* get available lists */
if (PROM_getprop(node, "available", sizeof(*pa), &num, (void *)&pa)) {
if (PROM_getprop(node, "available", sizeof(*pa), &num, &pa)) {
printf("psycho_alloc_extent: PROM_getprop failed\n");
return NULL;
}
@ -778,7 +778,7 @@ psycho_get_bus_range(node, brp)
{
int n;
if (PROM_getprop(node, "bus-range", sizeof(*brp), &n, (void *)&brp))
if (PROM_getprop(node, "bus-range", sizeof(*brp), &n, &brp))
panic("could not get psycho bus-range");
if (n != 2)
panic("broken psycho bus-range");
@ -792,7 +792,7 @@ psycho_get_ranges(node, rp, np)
int *np;
{
if (PROM_getprop(node, "ranges", sizeof(**rp), np, (void **)rp))
if (PROM_getprop(node, "ranges", sizeof(**rp), np, rp))
panic("could not get psycho ranges");
DPRINTF(PDB_PROM, ("psycho debug: got `ranges' for node %08x: %d entries\n", node, *np));
}
@ -949,7 +949,7 @@ psycho_iommu_init(sc, tsbsize)
* `#virtual-dma-addr-cells' and DTRT, but I'm lazy.
*/
if (!PROM_getprop(sc->sc_node, "virtual-dma", sizeof(vdma), &nitem,
(void *)&vdma)) {
&vdma)) {
/* Damn. Gotta use these values. */
iobase = vdma[0];
#define TSBCASE(x) case 1<<((x)+23): tsbsize = (x); break

14
sys/arch/sparc64/dev/sbus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: sbus.c,v 1.61 2003/07/15 03:36:07 lukem Exp $ */
/* $NetBSD: sbus.c,v 1.62 2003/08/27 15:59:55 mrg Exp $ */
/*
* Copyright (c) 1999-2002 Eduardo Horvath
@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: sbus.c,v 1.61 2003/07/15 03:36:07 lukem Exp $");
__KERNEL_RCSID(0, "$NetBSD: sbus.c,v 1.62 2003/08/27 15:59:55 mrg Exp $");
#include "opt_ddb.h"
@ -244,7 +244,7 @@ sbus_attach(parent, self, aux)
* Collect address translations from the OBP.
*/
error = PROM_getprop(node, "ranges", sizeof(struct openprom_range),
&sc->sc_nrange, (void **)&sc->sc_range);
&sc->sc_nrange, &sc->sc_range);
if (error)
panic("%s: error getting ranges property", sc->sc_dev.dv_xname);
@ -334,7 +334,7 @@ sbus_setup_attach_args(sc, bustag, dmatag, node, sa)
int n;
bzero(sa, sizeof(struct sbus_attach_args));
error = PROM_getprop(node, "name", 1, &n, (void **)&sa->sa_name);
error = PROM_getprop(node, "name", 1, &n, &sa->sa_name);
if (error != 0)
return (error);
sa->sa_name[n] = '\0';
@ -345,7 +345,7 @@ sbus_setup_attach_args(sc, bustag, dmatag, node, sa)
sa->sa_frequency = sc->sc_clockfreq;
error = PROM_getprop(node, "reg", sizeof(struct openprom_addr),
&sa->sa_nreg, (void **)&sa->sa_reg);
&sa->sa_nreg, &sa->sa_reg);
if (error != 0) {
char buf[32];
if (error != ENOENT ||
@ -368,7 +368,7 @@ sbus_setup_attach_args(sc, bustag, dmatag, node, sa)
return (error);
error = PROM_getprop(node, "address", sizeof(u_int32_t),
&sa->sa_npromvaddrs, (void **)&sa->sa_promvaddrs);
&sa->sa_npromvaddrs, &sa->sa_promvaddrs);
if (error != 0 && error != ENOENT)
return (error);
@ -548,7 +548,7 @@ sbus_get_intr(sc, node, ipp, np, slot)
* The `interrupts' property contains the Sbus interrupt level.
*/
ipl = NULL;
if (PROM_getprop(node, "interrupts", sizeof(int), np, (void *)&ipl) == 0) {
if (PROM_getprop(node, "interrupts", sizeof(int), np, &ipl) == 0) {
struct openprom_intr *ip;
int pri;

4
sys/arch/sparc64/include/autoconf.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.h,v 1.14 2003/08/07 16:29:49 agc Exp $ */
/* $NetBSD: autoconf.h,v 1.15 2003/08/27 15:59:55 mrg Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@ -128,7 +128,7 @@ struct mainbus_attach_args {
* length; the others convert or make some other guarantee.
*/
long PROM_getproplen __P((int node, char *name));
int PROM_getprop __P((int, char *, size_t, int *, void **));
int PROM_getprop __P((int, char *, size_t, int *, void *));
char *PROM_getpropstring __P((int node, char *name));
int PROM_getpropint __P((int node, char *name, int deflt));

18
sys/arch/sparc64/sparc64/autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: autoconf.c,v 1.81 2003/08/25 17:50:27 uwe Exp $ */
/* $NetBSD: autoconf.c,v 1.82 2003/08/27 15:59:55 mrg Exp $ */
/*
* Copyright (c) 1996
@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.81 2003/08/25 17:50:27 uwe Exp $");
__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.82 2003/08/27 15:59:55 mrg Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@ -687,7 +687,7 @@ extern struct sparc_bus_space_tag mainbus_space_tag;
ma.ma_upaid = portid;
if (PROM_getprop(node, "reg", sizeof(*ma.ma_reg),
&ma.ma_nreg, (void**)&ma.ma_reg) != 0)
&ma.ma_nreg, &ma.ma_reg) != 0)
continue;
#ifdef DEBUG
if (autoconf_debug & ACDB_PROBE) {
@ -700,7 +700,7 @@ extern struct sparc_bus_space_tag mainbus_space_tag;
}
#endif
rv = PROM_getprop(node, "interrupts", sizeof(*ma.ma_interrupts),
&ma.ma_ninterrupts, (void**)&ma.ma_interrupts);
&ma.ma_ninterrupts, &ma.ma_interrupts);
if (rv != 0 && rv != ENOENT) {
free(ma.ma_reg, M_DEVBUF);
continue;
@ -714,7 +714,7 @@ extern struct sparc_bus_space_tag mainbus_space_tag;
}
#endif
rv = PROM_getprop(node, "address", sizeof(*ma.ma_address),
&ma.ma_naddress, (void**)&ma.ma_address);
&ma.ma_naddress, &ma.ma_address);
if (rv != 0 && rv != ENOENT) {
free(ma.ma_reg, M_DEVBUF);
if (ma.ma_ninterrupts)
@ -751,7 +751,7 @@ PROM_getprop(node, name, size, nitem, bufp)
char *name;
size_t size;
int *nitem;
void **bufp;
void *bufp;
{
void *buf;
long len;
@ -764,7 +764,7 @@ PROM_getprop(node, name, size, nitem, bufp)
if ((len % size) != 0)
return (EINVAL);
buf = *bufp;
buf = *(void **)bufp;
if (buf == NULL) {
/* No storage provided, so we allocate some */
buf = malloc(len, M_DEVBUF, M_NOWAIT);
@ -773,7 +773,7 @@ PROM_getprop(node, name, size, nitem, bufp)
}
OF_getprop(node, name, buf, len);
*bufp = buf;
*(void **)bufp = buf;
*nitem = len / size;
return (0);
}
@ -814,7 +814,7 @@ PROM_getpropstringA(node, name, buffer)
{
int blen;
if (PROM_getprop(node, name, 1, &blen, (void *)&buffer) != 0)
if (PROM_getprop(node, name, 1, &blen, &buffer) != 0)
blen = 0;
buffer[blen] = '\0'; /* usually unnecessary */

6
sys/arch/sparc64/sparc64/clock.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: clock.c,v 1.61 2003/08/24 17:52:38 chs Exp $ */
/* $NetBSD: clock.c,v 1.62 2003/08/27 15:59:55 mrg Exp $ */
/*
* Copyright (c) 1992, 1993
@ -55,7 +55,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.61 2003/08/24 17:52:38 chs Exp $");
__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.62 2003/08/27 15:59:55 mrg Exp $");
#include "opt_multiprocessor.h"
@ -584,7 +584,7 @@ myetheraddr(cp)
int node, n;
node = findroot();
if (PROM_getprop(node, "idprom", sizeof *idp, &n, (void *)&idp) ||
if (PROM_getprop(node, "idprom", sizeof *idp, &n, &idp) ||
n != 1) {
printf("\nmyetheraddr: clock not setup yet, "
"and no idprom property in /\n");

6
sys/arch/sparc64/sparc64/openprom.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: openprom.c,v 1.13 2003/08/07 16:29:51 agc Exp $ */
/* $NetBSD: openprom.c,v 1.14 2003/08/27 15:59:56 mrg Exp $ */
/*
* Copyright (c) 1992, 1993
@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: openprom.c,v 1.13 2003/08/07 16:29:51 agc Exp $");
__KERNEL_RCSID(0, "$NetBSD: openprom.c,v 1.14 2003/08/27 15:59:56 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -178,7 +178,7 @@ openpromioctl(dev, cmd, data, flags, p)
break;
value = malloc(len, M_TEMP, M_WAITOK);
s = splhigh();
error = PROM_getprop(node, name, 1, &len, (void *)&value);
error = PROM_getprop(node, name, 1, &len, &value);
splx(s);
if (error != 0)
break;

6
sys/dev/sbus/qec.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: qec.c,v 1.26 2002/12/10 13:44:48 pk Exp $ */
/* $NetBSD: qec.c,v 1.27 2003/08/27 15:59:49 mrg Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: qec.c,v 1.26 2002/12/10 13:44:48 pk Exp $");
__KERNEL_RCSID(0, "$NetBSD: qec.c,v 1.27 2003/08/27 15:59:49 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -182,7 +182,7 @@ qecattach(parent, self, aux)
* Collect address translations from the OBP.
*/
error = PROM_getprop(node, "ranges", sizeof(struct openprom_range),
&sc->sc_nrange, (void **)&sc->sc_range);
&sc->sc_nrange, &sc->sc_range);
switch (error) {
case 0:
break;