mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2025-01-02 12:20:51 +00:00
Code Issues Releases Activity

Change OF_interpret() to also take an array of cell_t (missed in r209801).

Browse Source 
Reviewed by:	nwhitehorn
This commit is contained in:
Marius Strobl 2010-09-11 18:55:00 +00:00
parent 8f2dc7de67
commit cdb25d827e
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=212477
5 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/dev/ofw/ofw_fdt.c
View File

@ -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;

2
sys/dev/ofw/ofw_if.m
View File

@ -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)

10
sys/dev/ofw/ofw_standard.c
View File

@ -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)

2
sys/dev/ofw/openfirm.c
View File

@ -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;

7
sys/powerpc/ofw/ofw_real.c
View File

@ -101,7 +101,7 @@ static ssize_t ofw_real_package_to_path(ofw_t, phandle_t package, char *buf,
static int ofw_real_call_method(ofw_t, ihandle_t instance, const char *method,
int nargs, int nreturns, cell_t *args_and_returns);
static int ofw_real_interpret(ofw_t ofw, const char *cmd, int nreturns,
unsigned long *returns);
cell_t *returns);
static ihandle_t ofw_real_open(ofw_t, const char *device);
static void ofw_real_close(ofw_t, ihandle_t instance);
static ssize_t ofw_real_read(ofw_t, ihandle_t instance, void *addr, size_t len);
@ -756,7 +756,7 @@ ofw_real_call_method(ofw_t ofw, ihandle_t instance, const char *method,
cell_t instance;
cell_t args_n_results[12];
} args;
cell_t *cp, *ap;
cell_t *ap, *cp;
int n;
args.name = (cell_t)(uintptr_t)"call-method";
@ -791,8 +791,7 @@ ofw_real_call_method(ofw_t ofw, ihandle_t instance, const char *method,
}
static int
ofw_real_interpret(ofw_t ofw, const char *cmd, int nreturns,
unsigned long *returns)
ofw_real_interpret(ofw_t ofw, const char *cmd, int nreturns, cell_t *returns)
{
vm_offset_t argsptr;
struct {