summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorpk <pk@NetBSD.org>2004-03-17 17:04:58 +0000
committerpk <pk@NetBSD.org>2004-03-17 17:04:58 +0000
commitea53363e84235ec506f804b6e9a862ca8e92cbfa (patch)
tree06e9e07b3c4247e26143ed67bc3ebef7d77f89b7 /sys/dev
parenteee22dae1e4afd71d1087c9057a07242a22df381 (diff)
Rename PROM_getprop*() => prom_getprop*().
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/sbus/be.c10
-rw-r--r--sys/dev/sbus/bpp.c6
-rw-r--r--sys/dev/sbus/bwtwo_sbus.c6
-rw-r--r--sys/dev/sbus/cgsix_sbus.c6
-rw-r--r--sys/dev/sbus/cgthree_sbus.c6
-rw-r--r--sys/dev/sbus/dma_sbus.c8
-rw-r--r--sys/dev/sbus/esp_sbus.c14
-rw-r--r--sys/dev/sbus/if_hme_sbus.c6
-rw-r--r--sys/dev/sbus/if_le.c6
-rw-r--r--sys/dev/sbus/if_le_lebuffer.c6
-rw-r--r--sys/dev/sbus/isp_sbus.c8
-rw-r--r--sys/dev/sbus/lebuffer.c6
-rw-r--r--sys/dev/sbus/magma.c18
-rw-r--r--sys/dev/sbus/p9100.c6
-rw-r--r--sys/dev/sbus/qe.c8
-rw-r--r--sys/dev/sbus/qec.c10
-rw-r--r--sys/dev/sbus/sio16.c10
-rw-r--r--sys/dev/sbus/xbox.c10
-rw-r--r--sys/dev/sun/fb.c12
19 files changed, 81 insertions, 81 deletions
diff --git a/sys/dev/sbus/be.c b/sys/dev/sbus/be.c
index c4a4699b7bd..95c607b5cbd 100644
--- a/sys/dev/sbus/be.c
+++ b/sys/dev/sbus/be.c
@@ -1,4 +1,4 @@
-/* $NetBSD: be.c,v 1.41 2004/03/15 23:51:11 pk Exp $ */
+/* $NetBSD: be.c,v 1.42 2004/03/17 17:04:58 pk Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: be.c,v 1.41 2004/03/15 23:51:11 pk Exp $");
+__KERNEL_RCSID(0, "$NetBSD: be.c,v 1.42 2004/03/17 17:04:58 pk Exp $");
#include "opt_ddb.h"
#include "opt_inet.h"
@@ -289,16 +289,16 @@ beattach(parent, self, aux)
sc->sc_qec = qec;
sc->sc_qr = qec->sc_regs;
- sc->sc_rev = PROM_getpropint(node, "board-version", -1);
+ sc->sc_rev = prom_getpropint(node, "board-version", -1);
printf(" rev %x", sc->sc_rev);
bestop(sc);
- sc->sc_channel = PROM_getpropint(node, "channel#", -1);
+ sc->sc_channel = prom_getpropint(node, "channel#", -1);
if (sc->sc_channel == -1)
sc->sc_channel = 0;
- sc->sc_burst = PROM_getpropint(node, "burst-sizes", -1);
+ sc->sc_burst = prom_getpropint(node, "burst-sizes", -1);
if (sc->sc_burst == -1)
sc->sc_burst = qec->sc_burst;
diff --git a/sys/dev/sbus/bpp.c b/sys/dev/sbus/bpp.c
index 300c8a44de3..4b8e3a2f0e5 100644
--- a/sys/dev/sbus/bpp.c
+++ b/sys/dev/sbus/bpp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bpp.c,v 1.21 2003/06/29 22:30:35 fvdl Exp $ */
+/* $NetBSD: bpp.c,v 1.22 2004/03/17 17:04:58 pk Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bpp.c,v 1.21 2003/06/29 22:30:35 fvdl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bpp.c,v 1.22 2004/03/17 17:04:58 pk Exp $");
#include <sys/param.h>
#include <sys/ioctl.h>
@@ -182,7 +182,7 @@ bppattach(parent, self, aux)
if (sbusburst == 0)
sbusburst = SBUS_BURST_32 - 1; /* 1->16 */
- burst = PROM_getpropint(node, "burst-sizes", -1);
+ burst = prom_getpropint(node, "burst-sizes", -1);
if (burst == -1)
/* take SBus burst sizes */
burst = sbusburst;
diff --git a/sys/dev/sbus/bwtwo_sbus.c b/sys/dev/sbus/bwtwo_sbus.c
index 958e581e6e3..e9dfde7e12f 100644
--- a/sys/dev/sbus/bwtwo_sbus.c
+++ b/sys/dev/sbus/bwtwo_sbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bwtwo_sbus.c,v 1.14 2003/12/04 12:42:54 keihan Exp $ */
+/* $NetBSD: bwtwo_sbus.c,v 1.15 2004/03/17 17:04:58 pk Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -86,7 +86,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bwtwo_sbus.c,v 1.14 2003/12/04 12:42:54 keihan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bwtwo_sbus.c,v 1.15 2004/03/17 17:04:58 pk Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -186,7 +186,7 @@ bwtwoattach_sbus(parent, self, args)
sc->sc_pixeloffset = BWREG_MEM;
isconsole = fb_is_console(node);
- name = PROM_getpropstring(node, "model");
+ name = prom_getpropstring(node, "model");
/* Assume `bwtwo at sbus' only happens at sun4c's */
sc->sc_get_video = bwtwo_get_video;
diff --git a/sys/dev/sbus/cgsix_sbus.c b/sys/dev/sbus/cgsix_sbus.c
index 5e0c43f2c80..f3e3d2a325c 100644
--- a/sys/dev/sbus/cgsix_sbus.c
+++ b/sys/dev/sbus/cgsix_sbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cgsix_sbus.c,v 1.12 2002/10/02 16:52:33 thorpej Exp $ */
+/* $NetBSD: cgsix_sbus.c,v 1.13 2004/03/17 17:04:58 pk Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cgsix_sbus.c,v 1.12 2002/10/02 16:52:33 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgsix_sbus.c,v 1.13 2004/03/17 17:04:58 pk Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -183,7 +183,7 @@ cgsixattach(parent, self, aux)
sc->sc_fbc = (struct cg6_fbc *)bus_space_vaddr(sa->sa_bustag, bh);
sbus_establish(sd, &sc->sc_dev);
- name = PROM_getpropstring(node, "model");
+ name = prom_getpropstring(node, "model");
isconsole = fb_is_console(node);
if (isconsole && cgsix_use_rasterconsole) {
diff --git a/sys/dev/sbus/cgthree_sbus.c b/sys/dev/sbus/cgthree_sbus.c
index a3259ad7b65..a59155a5628 100644
--- a/sys/dev/sbus/cgthree_sbus.c
+++ b/sys/dev/sbus/cgthree_sbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cgthree_sbus.c,v 1.13 2003/08/07 16:31:22 agc Exp $ */
+/* $NetBSD: cgthree_sbus.c,v 1.14 2004/03/17 17:04:58 pk Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -85,7 +85,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cgthree_sbus.c,v 1.13 2003/08/07 16:31:22 agc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgthree_sbus.c,v 1.14 2004/03/17 17:04:58 pk Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -183,7 +183,7 @@ cgthreeattach_sbus(parent, self, args)
sc->sc_fbc = (struct fbcontrol *)bus_space_vaddr(sa->sa_bustag, bh);
isconsole = fb_is_console(node);
- name = PROM_getpropstring(node, "model");
+ name = prom_getpropstring(node, "model");
if (name == NULL)
name = "cgthree";
diff --git a/sys/dev/sbus/dma_sbus.c b/sys/dev/sbus/dma_sbus.c
index 2bbcbb46262..8a3d11be351 100644
--- a/sys/dev/sbus/dma_sbus.c
+++ b/sys/dev/sbus/dma_sbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dma_sbus.c,v 1.20 2003/02/06 16:20:05 hannken Exp $ */
+/* $NetBSD: dma_sbus.c,v 1.21 2004/03/17 17:04:58 pk Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dma_sbus.c,v 1.20 2003/02/06 16:20:05 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dma_sbus.c,v 1.21 2004/03/17 17:04:58 pk Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -176,7 +176,7 @@ dmaattach_sbus(parent, self, aux)
if (sbusburst == 0)
sbusburst = SBUS_BURST_32 - 1; /* 1->16 */
- burst = PROM_getpropint(node,"burst-sizes", -1);
+ burst = prom_getpropint(node,"burst-sizes", -1);
if (burst == -1)
/* take SBus burst sizes */
burst = sbusburst;
@@ -196,7 +196,7 @@ dmaattach_sbus(parent, self, aux)
* the "cable-selection" property; default to TP and then
* the user can change it via a "media" option to ifconfig.
*/
- cabletype = PROM_getpropstring(node, "cable-selection");
+ cabletype = prom_getpropstring(node, "cable-selection");
csr = L64854_GCSR(sc);
if (strcmp(cabletype, "tpe") == 0) {
csr |= E_TP_AUI;
diff --git a/sys/dev/sbus/esp_sbus.c b/sys/dev/sbus/esp_sbus.c
index 6a2393cf90c..29900823fc2 100644
--- a/sys/dev/sbus/esp_sbus.c
+++ b/sys/dev/sbus/esp_sbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: esp_sbus.c,v 1.28 2003/02/22 05:11:15 tsutsui Exp $ */
+/* $NetBSD: esp_sbus.c,v 1.29 2004/03/17 17:04:58 pk Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: esp_sbus.c,v 1.28 2003/02/22 05:11:15 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esp_sbus.c,v 1.29 2004/03/17 17:04:58 pk Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -164,8 +164,8 @@ espattach_sbus(parent, self, aux)
esc->sc_bustag = sa->sa_bustag;
esc->sc_dmatag = sa->sa_dmatag;
- sc->sc_id = PROM_getpropint(sa->sa_node, "initiator-id", 7);
- sc->sc_freq = PROM_getpropint(sa->sa_node, "clock-frequency", -1);
+ sc->sc_id = prom_getpropint(sa->sa_node, "initiator-id", 7);
+ sc->sc_freq = prom_getpropint(sa->sa_node, "clock-frequency", -1);
if (sc->sc_freq < 0)
sc->sc_freq = ((struct sbus_softc *)
sc->sc_dev.dv_parent)->sc_clockfreq;
@@ -231,7 +231,7 @@ espattach_sbus(parent, self, aux)
if (sbusburst == 0)
sbusburst = SBUS_BURST_32 - 1; /* 1->16 */
- burst = PROM_getpropint(sa->sa_node, "burst-sizes", -1);
+ burst = prom_getpropint(sa->sa_node, "burst-sizes", -1);
#if ESP_SBUS_DEBUG
printf("espattach_sbus: burst 0x%x, sbus 0x%x\n",
@@ -371,8 +371,8 @@ espattach_dma(parent, self, aux)
esc->sc_bustag = sa->sa_bustag;
esc->sc_dmatag = sa->sa_dmatag;
- sc->sc_id = PROM_getpropint(sa->sa_node, "initiator-id", 7);
- sc->sc_freq = PROM_getpropint(sa->sa_node, "clock-frequency", -1);
+ sc->sc_id = prom_getpropint(sa->sa_node, "initiator-id", 7);
+ sc->sc_freq = prom_getpropint(sa->sa_node, "clock-frequency", -1);
esc->sc_dma = (struct lsi64854_softc *)parent;
esc->sc_dma->sc_client = sc;
diff --git a/sys/dev/sbus/if_hme_sbus.c b/sys/dev/sbus/if_hme_sbus.c
index 2cdab9bf6a1..d90ea21293f 100644
--- a/sys/dev/sbus/if_hme_sbus.c
+++ b/sys/dev/sbus/if_hme_sbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_hme_sbus.c,v 1.18 2004/03/15 23:51:11 pk Exp $ */
+/* $NetBSD: if_hme_sbus.c,v 1.19 2004/03/17 17:04:58 pk Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_hme_sbus.c,v 1.18 2004/03/15 23:51:11 pk Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_hme_sbus.c,v 1.19 2004/03/17 17:04:58 pk Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -180,7 +180,7 @@ hmeattach_sbus(parent, self, aux)
if (sbusburst == 0)
sbusburst = SBUS_BURST_32 - 1; /* 1->16 */
- burst = PROM_getpropint(node, "burst-sizes", -1);
+ burst = prom_getpropint(node, "burst-sizes", -1);
if (burst == -1)
/* take SBus burst sizes */
burst = sbusburst;
diff --git a/sys/dev/sbus/if_le.c b/sys/dev/sbus/if_le.c
index 3cbda836977..98c05f0e37f 100644
--- a/sys/dev/sbus/if_le.c
+++ b/sys/dev/sbus/if_le.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_le.c,v 1.29 2004/03/15 23:51:11 pk Exp $ */
+/* $NetBSD: if_le.c,v 1.30 2004/03/17 17:04:58 pk Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_le.c,v 1.29 2004/03/15 23:51:11 pk Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_le.c,v 1.30 2004/03/17 17:04:58 pk Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -200,7 +200,7 @@ leattach_sbus(parent, self, aux)
lebuf->attached = 1;
/* That old black magic... */
- sc->sc_conf3 = PROM_getpropint(sa->sa_node,
+ sc->sc_conf3 = prom_getpropint(sa->sa_node,
"busmaster-regval",
LE_C3_BSWP | LE_C3_ACON | LE_C3_BCON);
break;
diff --git a/sys/dev/sbus/if_le_lebuffer.c b/sys/dev/sbus/if_le_lebuffer.c
index df72bf22cce..31cd7a0bb75 100644
--- a/sys/dev/sbus/if_le_lebuffer.c
+++ b/sys/dev/sbus/if_le_lebuffer.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_le_lebuffer.c,v 1.18 2004/03/15 23:51:12 pk Exp $ */
+/* $NetBSD: if_le_lebuffer.c,v 1.19 2004/03/17 17:04:58 pk Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_le_lebuffer.c,v 1.18 2004/03/15 23:51:12 pk Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_le_lebuffer.c,v 1.19 2004/03/17 17:04:58 pk Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -185,7 +185,7 @@ leattach_lebuffer(parent, self, aux)
lebuf->attached = 1;
/* That old black magic... */
- sc->sc_conf3 = PROM_getpropint(sa->sa_node, "busmaster-regval",
+ sc->sc_conf3 = prom_getpropint(sa->sa_node, "busmaster-regval",
LE_C3_BSWP | LE_C3_ACON | LE_C3_BCON);
/* Assume SBus is grandparent */
diff --git a/sys/dev/sbus/isp_sbus.c b/sys/dev/sbus/isp_sbus.c
index 22b44a938b5..ca58b1ed720 100644
--- a/sys/dev/sbus/isp_sbus.c
+++ b/sys/dev/sbus/isp_sbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: isp_sbus.c,v 1.61 2003/12/04 13:57:31 keihan Exp $ */
+/* $NetBSD: isp_sbus.c,v 1.62 2004/03/17 17:04:58 pk Exp $ */
/*
* This driver, which is contained in NetBSD in the files:
*
@@ -59,7 +59,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isp_sbus.c,v 1.61 2003/12/04 13:57:31 keihan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isp_sbus.c,v 1.62 2004/03/17 17:04:58 pk Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -175,7 +175,7 @@ isp_sbus_attach(struct device *parent, struct device *self, void *aux)
}
sbc->sbus_node = sa->sa_node;
- freq = PROM_getpropint(sa->sa_node, "clock-frequency", 0);
+ freq = prom_getpropint(sa->sa_node, "clock-frequency", 0);
if (freq) {
/*
* Convert from HZ to MHz, rounding up.
@@ -196,7 +196,7 @@ isp_sbus_attach(struct device *parent, struct device *self, void *aux)
sbusburst = ((struct sbus_softc *)parent)->sc_burst;
if (sbusburst == 0)
sbusburst = SBUS_BURST_32 - 1;
- ispburst = PROM_getpropint(sa->sa_node, "burst-sizes", -1);
+ ispburst = prom_getpropint(sa->sa_node, "burst-sizes", -1);
if (ispburst == -1) {
ispburst = sbusburst;
}
diff --git a/sys/dev/sbus/lebuffer.c b/sys/dev/sbus/lebuffer.c
index 82d1e090209..4735be14f66 100644
--- a/sys/dev/sbus/lebuffer.c
+++ b/sys/dev/sbus/lebuffer.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lebuffer.c,v 1.18 2002/10/02 16:52:40 thorpej Exp $ */
+/* $NetBSD: lebuffer.c,v 1.19 2004/03/17 17:04:58 pk Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lebuffer.c,v 1.18 2002/10/02 16:52:40 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lebuffer.c,v 1.19 2004/03/17 17:04:58 pk Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -128,7 +128,7 @@ lebufattach(parent, self, aux)
if (sbusburst == 0)
sbusburst = SBUS_BURST_32 - 1; /* 1->16 */
- sc->sc_burst = PROM_getpropint(node, "burst-sizes", -1);
+ sc->sc_burst = prom_getpropint(node, "burst-sizes", -1);
if (sc->sc_burst == -1)
/* take SBus burst sizes */
sc->sc_burst = sbusburst;
diff --git a/sys/dev/sbus/magma.c b/sys/dev/sbus/magma.c
index 2296235a31d..33d7e507995 100644
--- a/sys/dev/sbus/magma.c
+++ b/sys/dev/sbus/magma.c
@@ -1,4 +1,4 @@
-/* $NetBSD: magma.c,v 1.27 2003/06/29 22:30:35 fvdl Exp $ */
+/* $NetBSD: magma.c,v 1.28 2004/03/17 17:04:58 pk Exp $ */
/*
* magma.c
*
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: magma.c,v 1.27 2003/06/29 22:30:35 fvdl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: magma.c,v 1.28 2004/03/17 17:04:58 pk Exp $");
#if 0
#define MAGMA_DEBUG
@@ -339,13 +339,13 @@ magma_match(parent, cf, aux)
dprintf(("magma: matched `%s'\n", sa->sa_name));
dprintf(("magma: magma_prom `%s'\n",
- PROM_getpropstring(sa->sa_node, "magma_prom")));
+ prom_getpropstring(sa->sa_node, "magma_prom")));
dprintf(("magma: intlevels `%s'\n",
- PROM_getpropstring(sa->sa_node, "intlevels")));
+ prom_getpropstring(sa->sa_node, "intlevels")));
dprintf(("magma: chiprev `%s'\n",
- PROM_getpropstring(sa->sa_node, "chiprev")));
+ prom_getpropstring(sa->sa_node, "chiprev")));
dprintf(("magma: clock `%s'\n",
- PROM_getpropstring(sa->sa_node, "clock")));
+ prom_getpropstring(sa->sa_node, "clock")));
return (1);
}
@@ -372,7 +372,7 @@ magma_attach(parent, self, aux)
* `supported_cards[]' above), and must be distinguished
* by the `magma_prom' property.
*/
- magma_prom = PROM_getpropstring(node, "magma_prom");
+ magma_prom = prom_getpropstring(node, "magma_prom");
for (card = supported_cards; card->mb_name != NULL; card++) {
if (strcmp(sa->sa_name, card->mb_sbusname) != 0)
@@ -414,7 +414,7 @@ magma_attach(parent, self, aux)
* Find the clock speed; it's the same for all CD1400 chips
* on the board.
*/
- clockstr = PROM_getpropstring(node, "clock");
+ clockstr = prom_getpropstring(node, "clock");
if (*clockstr == '\0')
/* Default to 25MHz */
cd_clock = 25;
@@ -431,7 +431,7 @@ magma_attach(parent, self, aux)
cd->cd_clock = cd_clock;
cd->cd_reg = (caddr_t)bh + card->mb_cd1400[chip];
- /* PROM_getpropstring(node, "chiprev"); */
+ /* prom_getpropstring(node, "chiprev"); */
/* seemingly the Magma drivers just ignore the propstring */
cd->cd_chiprev = cd1400_read_reg(cd, CD1400_GFRCR);
diff --git a/sys/dev/sbus/p9100.c b/sys/dev/sbus/p9100.c
index 96e2de58086..c0064580089 100644
--- a/sys/dev/sbus/p9100.c
+++ b/sys/dev/sbus/p9100.c
@@ -1,4 +1,4 @@
-/* $NetBSD: p9100.c,v 1.18 2003/08/25 17:50:29 uwe Exp $ */
+/* $NetBSD: p9100.c,v 1.19 2004/03/17 17:04:58 pk Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: p9100.c,v 1.18 2003/08/25 17:50:29 uwe Exp $");
+__KERNEL_RCSID(0, "$NetBSD: p9100.c,v 1.19 2004/03/17 17:04:58 pk Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -264,7 +264,7 @@ p9100_sbus_attach(struct device *parent, struct device *self, void *args)
(i & 7), fb->fb_type.fb_width, fb->fb_type.fb_height,
fb->fb_type.fb_depth);
- fb->fb_type.fb_cmsize = PROM_getpropint(node, "cmsize", 256);
+ fb->fb_type.fb_cmsize = prom_getpropint(node, "cmsize", 256);
if ((1 << fb->fb_type.fb_depth) != fb->fb_type.fb_cmsize)
printf(", %d entry colormap", fb->fb_type.fb_cmsize);
diff --git a/sys/dev/sbus/qe.c b/sys/dev/sbus/qe.c
index 56e25e452ba..a9b851bbbc6 100644
--- a/sys/dev/sbus/qe.c
+++ b/sys/dev/sbus/qe.c
@@ -1,4 +1,4 @@
-/* $NetBSD: qe.c,v 1.31 2004/03/15 23:51:12 pk Exp $ */
+/* $NetBSD: qe.c,v 1.32 2004/03/17 17:04:59 pk Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: qe.c,v 1.31 2004/03/15 23:51:12 pk Exp $");
+__KERNEL_RCSID(0, "$NetBSD: qe.c,v 1.32 2004/03/17 17:04:59 pk Exp $");
#define QEDEBUG
@@ -242,7 +242,7 @@ qeattach(parent, self, aux)
return;
}
- sc->sc_rev = PROM_getpropint(node, "mace-version", -1);
+ sc->sc_rev = prom_getpropint(node, "mace-version", -1);
printf(" rev %x", sc->sc_rev);
sc->sc_bustag = sa->sa_bustag;
@@ -250,7 +250,7 @@ qeattach(parent, self, aux)
sc->sc_qec = qec;
sc->sc_qr = qec->sc_regs;
- sc->sc_channel = PROM_getpropint(node, "channel#", -1);
+ sc->sc_channel = prom_getpropint(node, "channel#", -1);
sc->sc_burst = qec->sc_burst;
qestop(sc);
diff --git a/sys/dev/sbus/qec.c b/sys/dev/sbus/qec.c
index f2a70f09ddc..220ba3c5ab1 100644
--- a/sys/dev/sbus/qec.c
+++ b/sys/dev/sbus/qec.c
@@ -1,4 +1,4 @@
-/* $NetBSD: qec.c,v 1.27 2003/08/27 15:59:49 mrg Exp $ */
+/* $NetBSD: qec.c,v 1.28 2004/03/17 17:04:59 pk Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: qec.c,v 1.27 2003/08/27 15:59:49 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: qec.c,v 1.28 2004/03/17 17:04:59 pk Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -155,7 +155,7 @@ qecattach(parent, self, aux)
sc->sc_bufsiz = (bus_size_t)sa->sa_reg[1].oa_size;
/* Get number of on-board channels */
- sc->sc_nchannels = PROM_getpropint(node, "#channels", -1);
+ sc->sc_nchannels = prom_getpropint(node, "#channels", -1);
if (sc->sc_nchannels == -1) {
printf(": no channels\n");
return;
@@ -168,7 +168,7 @@ qecattach(parent, self, aux)
if (sbusburst == 0)
sbusburst = SBUS_BURST_32 - 1; /* 1->16 */
- sc->sc_burst = PROM_getpropint(node, "burst-sizes", -1);
+ sc->sc_burst = prom_getpropint(node, "burst-sizes", -1);
if (sc->sc_burst == -1)
/* take SBus burst sizes */
sc->sc_burst = sbusburst;
@@ -181,7 +181,7 @@ qecattach(parent, self, aux)
/*
* Collect address translations from the OBP.
*/
- error = PROM_getprop(node, "ranges", sizeof(struct openprom_range),
+ error = prom_getprop(node, "ranges", sizeof(struct openprom_range),
&sc->sc_nrange, &sc->sc_range);
switch (error) {
case 0:
diff --git a/sys/dev/sbus/sio16.c b/sys/dev/sbus/sio16.c
index 39d737b06f8..e574b88d70b 100644
--- a/sys/dev/sbus/sio16.c
+++ b/sys/dev/sbus/sio16.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sio16.c,v 1.11 2002/12/10 13:44:48 pk Exp $ */
+/* $NetBSD: sio16.c,v 1.12 2004/03/17 17:04:59 pk Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sio16.c,v 1.11 2002/12/10 13:44:48 pk Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sio16.c,v 1.12 2004/03/17 17:04:59 pk Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -191,14 +191,14 @@ sio16_attach(parent, self, aux)
}
sc->sc_ack = h;
- mode = PROM_getpropstring(sa->sa_node, "mode");
+ mode = prom_getpropstring(sa->sa_node, "mode");
if (mode)
printf(", %s mode", mode);
/* get the clock frequency */
- sc->sc_clk = PROM_getpropint(sa->sa_node, "clk", 24000);
+ sc->sc_clk = prom_getpropint(sa->sa_node, "clk", 24000);
- model = PROM_getpropstring(sa->sa_node, "model");
+ model = prom_getpropstring(sa->sa_node, "model");
if (model == 0) {
printf(", no model property, bailing\n");
return;
diff --git a/sys/dev/sbus/xbox.c b/sys/dev/sbus/xbox.c
index 254801d10a3..5a699560f8d 100644
--- a/sys/dev/sbus/xbox.c
+++ b/sys/dev/sbus/xbox.c
@@ -1,4 +1,4 @@
-/* $NetBSD: xbox.c,v 1.10 2003/01/01 00:10:24 thorpej Exp $ */
+/* $NetBSD: xbox.c,v 1.11 2004/03/17 17:04:59 pk Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xbox.c,v 1.10 2003/01/01 00:10:24 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xbox.c,v 1.11 2004/03/17 17:04:59 pk Exp $");
#include <sys/param.h>
#include <sys/malloc.h>
@@ -143,12 +143,12 @@ xbox_attach(parent, self, aux)
struct xbox_attach_args xa;
char *cp;
- sc->sc_key = PROM_getpropint(node, "write0-key", -1);
+ sc->sc_key = prom_getpropint(node, "write0-key", -1);
- cp = PROM_getpropstring(node, "model");
+ cp = prom_getpropstring(node, "model");
printf(": model %s", cp);
- cp = PROM_getpropstring(node, "child-present");
+ cp = prom_getpropstring(node, "child-present");
if (strcmp(cp, "true") != 0) {
printf(": no sbus devices\n");
return;
diff --git a/sys/dev/sun/fb.c b/sys/dev/sun/fb.c
index 4f1e7faaa0f..71f3ca43953 100644
--- a/sys/dev/sun/fb.c
+++ b/sys/dev/sun/fb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fb.c,v 1.17 2004/03/17 14:00:46 pk Exp $ */
+/* $NetBSD: fb.c,v 1.18 2004/03/17 17:04:58 pk Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fb.c,v 1.17 2004/03/17 14:00:46 pk Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fb.c,v 1.18 2004/03/17 17:04:58 pk Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -123,7 +123,7 @@ fb_is_console(node)
if (prom_stdout() != PROMDEV_SCREEN)
return (0);
- fbnode = PROM_getpropint(findroot(), "fb", 0);
+ fbnode = prom_getpropint(findroot(), "fb", 0);
return (fbnode == 0 || node == fbnode);
case PROM_OBP_V2:
@@ -276,9 +276,9 @@ fb_setsize_obp(fb, depth, def_width, def_height, node)
struct fbdevice *fb;
int depth, def_width, def_height, node;
{
- fb->fb_type.fb_width = PROM_getpropint(node, "width", def_width);
- fb->fb_type.fb_height = PROM_getpropint(node, "height", def_height);
- fb->fb_linebytes = PROM_getpropint(node, "linebytes",
+ fb->fb_type.fb_width = prom_getpropint(node, "width", def_width);
+ fb->fb_type.fb_height = prom_getpropint(node, "height", def_height);
+ fb->fb_linebytes = prom_getpropint(node, "linebytes",
(fb->fb_type.fb_width * depth) / 8);
}