[src/trunk]: src/sys/arch/sparc Sync sparc64 kernel's OF_seek with ofwboot's ...

[nakayama <nakayama%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/50734aaba7a8
branches:  trunk
changeset: 336912:50734aaba7a8
user:      nakayama <nakayama%NetBSD.org@localhost>
date:      Fri Mar 27 06:10:25 2015 +0000

description:
Sync sparc64 kernel's OF_seek with ofwboot's one, but sparc version
is not changed.

diffstat:

 sys/arch/sparc/include/openfirm.h |  4 +++-
 sys/arch/sparc/sparc/openfirm.c   |  8 ++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diffs (47 lines):

diff -r da8437c17f2d -r 50734aaba7a8 sys/arch/sparc/include/openfirm.h
--- a/sys/arch/sparc/include/openfirm.h Fri Mar 27 06:07:33 2015 +0000
+++ b/sys/arch/sparc/include/openfirm.h Fri Mar 27 06:10:25 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: openfirm.h,v 1.7 2009/05/18 11:39:30 nakayama Exp $    */
+/*     $NetBSD: openfirm.h,v 1.8 2015/03/27 06:10:25 nakayama Exp $    */
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -57,6 +57,8 @@
 typedef uint32_t cell_t;
 #define HDL2CELL(x)    (cell_t)(x)
 #define ADR2CELL(x)    (cell_t)(x)
+#define HDQ2CELL_HI(x) (cell_t)((x) >> 32)
+#define HDQ2CELL_LO(x) (cell_t)(x)
 #endif /* SUN4U */
 
 int    OF_test(const char *);
diff -r da8437c17f2d -r 50734aaba7a8 sys/arch/sparc/sparc/openfirm.c
--- a/sys/arch/sparc/sparc/openfirm.c   Fri Mar 27 06:07:33 2015 +0000
+++ b/sys/arch/sparc/sparc/openfirm.c   Fri Mar 27 06:10:25 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: openfirm.c,v 1.19 2014/11/23 02:15:52 christos Exp $   */
+/*     $NetBSD: openfirm.c,v 1.20 2015/03/27 06:10:25 nakayama Exp $   */
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: openfirm.c,v 1.19 2014/11/23 02:15:52 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: openfirm.c,v 1.20 2015/03/27 06:10:25 nakayama Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -546,8 +546,8 @@
        args.nargs = 3;
        args.nreturns = 1;
        args.handle = HDL2CELL(handle);
-       args.poshi = HDL2CELL(pos >> 32);
-       args.poslo = HDL2CELL(pos);
+       args.poshi = HDQ2CELL_HI(pos);
+       args.poslo = HDQ2CELL_LO(pos);
        if (openfirmware(&args) == -1)
                return -1;
        return args.status;