diff options
author | marius <marius@FreeBSD.org> | 2010-09-11 18:55:00 +0000 |
---|---|---|
committer | marius <marius@FreeBSD.org> | 2010-09-11 18:55:00 +0000 |
commit | 0b2ac861b54b90c8db0a69d05d466c2fa101b714 (patch) | |
tree | 231d5ccd3759f477673adfb3f7670899307ba854 /sys/dev/ofw | |
parent | 2beda3228fedb15b6266577cec362ec352a47ebc (diff) | |
download | FreeBSD-src-0b2ac861b54b90c8db0a69d05d466c2fa101b714.zip FreeBSD-src-0b2ac861b54b90c8db0a69d05d466c2fa101b714.tar.gz |
Change OF_interpret() to also take an array of cell_t (missed in r209801).
Reviewed by: nwhitehorn
Diffstat (limited to 'sys/dev/ofw')
-rw-r--r-- | sys/dev/ofw/ofw_fdt.c | 4 | ||||
-rw-r--r-- | sys/dev/ofw/ofw_if.m | 2 | ||||
-rw-r--r-- | sys/dev/ofw/ofw_standard.c | 10 | ||||
-rw-r--r-- | sys/dev/ofw/openfirm.c | 2 |
4 files changed, 8 insertions, 10 deletions
diff --git a/sys/dev/ofw/ofw_fdt.c b/sys/dev/ofw/ofw_fdt.c index 0ec0830..d67b2e5 100644 --- a/sys/dev/ofw/ofw_fdt.c +++ b/sys/dev/ofw/ofw_fdt.c @@ -66,7 +66,7 @@ static ssize_t ofw_fdt_canon(ofw_t, const char *, char *, size_t); static phandle_t ofw_fdt_finddevice(ofw_t, const char *); static ssize_t ofw_fdt_instance_to_path(ofw_t, ihandle_t, char *, size_t); static ssize_t ofw_fdt_package_to_path(ofw_t, phandle_t, char *, size_t); -static int ofw_fdt_interpret(ofw_t, const char *, int, unsigned long *); +static int ofw_fdt_interpret(ofw_t, const char *, int, cell_t *); static ofw_method_t ofw_fdt_methods[] = { OFWMETHOD(ofw_init, ofw_fdt_init), @@ -435,7 +435,7 @@ ofw_fdt_fixup(ofw_t ofw) } static int -ofw_fdt_interpret(ofw_t ofw, const char *cmd, int nret, unsigned long *retvals) +ofw_fdt_interpret(ofw_t ofw, const char *cmd, int nret, cell_t *retvals) { int rv; diff --git a/sys/dev/ofw/ofw_if.m b/sys/dev/ofw/ofw_if.m index eff85a2..6017a69 100644 --- a/sys/dev/ofw/ofw_if.m +++ b/sys/dev/ofw/ofw_if.m @@ -244,7 +244,7 @@ METHOD int interpret { ofw_t _ofw; const char *_cmd; int _nreturns; - unsigned long *_returns; + cell_t *_returns; }; # Device I/O Functions (optional) diff --git a/sys/dev/ofw/ofw_standard.c b/sys/dev/ofw/ofw_standard.c index e3f8bcc..b514a94 100644 --- a/sys/dev/ofw/ofw_standard.c +++ b/sys/dev/ofw/ofw_standard.c @@ -73,7 +73,7 @@ __FBSDID("$FreeBSD$"); static int ofw_std_init(ofw_t ofw, void *openfirm); static int ofw_std_test(ofw_t ofw, const char *name); static int ofw_std_interpret(ofw_t ofw, const char *cmd, int nreturns, - unsigned long *returns); + cell_t *returns); static phandle_t ofw_std_peer(ofw_t ofw, phandle_t node); static phandle_t ofw_std_child(ofw_t ofw, phandle_t node); static phandle_t ofw_std_parent(ofw_t ofw, phandle_t node); @@ -94,8 +94,7 @@ static ssize_t ofw_std_instance_to_path(ofw_t ofw, ihandle_t instance, static ssize_t ofw_std_package_to_path(ofw_t ofw, phandle_t package, char *buf, size_t len); static int ofw_std_call_method(ofw_t ofw, ihandle_t instance, - const char *method, int nargs, int nreturns, - cell_t *args_and_returns); + const char *method, int nargs, int nreturns, cell_t *args_and_returns); static ihandle_t ofw_std_open(ofw_t ofw, const char *device); static void ofw_std_close(ofw_t ofw, ihandle_t instance); static ssize_t ofw_std_read(ofw_t ofw, ihandle_t instance, void *addr, @@ -185,8 +184,7 @@ ofw_std_test(ofw_t ofw, const char *name) } static int -ofw_std_interpret(ofw_t ofw, const char *cmd, int nreturns, - unsigned long *returns) +ofw_std_interpret(ofw_t ofw, const char *cmd, int nreturns, cell_t *returns) { struct { cell_t name; @@ -529,7 +527,7 @@ ofw_std_call_method(ofw_t ofw, ihandle_t instance, const char *method, 2, 1, }; - cell_t *cp, *ap; + cell_t *ap, *cp; int n; if (nargs > 6) diff --git a/sys/dev/ofw/openfirm.c b/sys/dev/ofw/openfirm.c index 241ce8a63..8424fc2 100644 --- a/sys/dev/ofw/openfirm.c +++ b/sys/dev/ofw/openfirm.c @@ -165,7 +165,7 @@ int OF_interpret(const char *cmd, int nreturns, ...) { va_list ap; - unsigned long slots[16]; + cell_t slots[16]; int i = 0; int status; |