svn commit: r212477 - in head/sys: dev/ofw powerpc/ofw

[Marius Strobl]

Author: marius
Date: Sat Sep 11 18:55:00 2010
New Revision: 212477
URL: http://svn.freebsd.org/changeset/base/212477

Log:
  Change OF_interpret() to also take an array of cell_t (missed in r209801).
  
  Reviewed by:	nwhitehorn

Modified:
  head/sys/dev/ofw/ofw_fdt.c
  head/sys/dev/ofw/ofw_if.m
  head/sys/dev/ofw/ofw_standard.c
  head/sys/dev/ofw/openfirm.c
  head/sys/powerpc/ofw/ofw_real.c

Modified: head/sys/dev/ofw/ofw_fdt.c
==============================================================================
--- head/sys/dev/ofw/ofw_fdt.c	Sat Sep 11 18:50:33 2010	(r212476)
+++ head/sys/dev/ofw/ofw_fdt.c	Sat Sep 11 18:55:00 2010	(r212477)
@@ -66,7 +66,7 @@ static ssize_t ofw_fdt_canon(ofw_t, cons
 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;
 

Modified: head/sys/dev/ofw/ofw_if.m
==============================================================================
--- head/sys/dev/ofw/ofw_if.m	Sat Sep 11 18:50:33 2010	(r212476)
+++ head/sys/dev/ofw/ofw_if.m	Sat Sep 11 18:55:00 2010	(r212477)
@@ -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)

Modified: head/sys/dev/ofw/ofw_standard.c
==============================================================================
--- head/sys/dev/ofw/ofw_standard.c	Sat Sep 11 18:50:33 2010	(r212476)
+++ head/sys/dev/ofw/ofw_standard.c	Sat Sep 11 18:55:00 2010	(r212477)
@@ -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(
 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
 		2,
 		1,
 	};
-	cell_t *cp, *ap;
+	cell_t *ap, *cp;
 	int n;
 
 	if (nargs > 6)

Modified: head/sys/dev/ofw/openfirm.c
==============================================================================
--- head/sys/dev/ofw/openfirm.c	Sat Sep 11 18:50:33 2010	(r212476)
+++ head/sys/dev/ofw/openfirm.c	Sat Sep 11 18:55:00 2010	(r212477)
@@ -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;
 

Modified: head/sys/powerpc/ofw/ofw_real.c
==============================================================================
--- head/sys/powerpc/ofw/ofw_real.c	Sat Sep 11 18:50:33 2010	(r212476)
+++ head/sys/powerpc/ofw/ofw_real.c	Sat Sep 11 18:55:00 2010	(r212477)
@@ -101,7 +101,7 @@ static ssize_t ofw_real_package_to_path(
 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_
 		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_
 }
 
 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 {