Module Name: src
Committed By: nakayama
Date: Fri Mar 27 06:10:25 UTC 2015
Modified Files:
src/sys/arch/sparc/include: openfirm.h
src/sys/arch/sparc/sparc: openfirm.c
Log Message:
Sync sparc64 kernel's OF_seek with ofwboot's one, but sparc version
is not changed.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/sparc/include/openfirm.h
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/sparc/sparc/openfirm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc/include/openfirm.h
diff -u src/sys/arch/sparc/include/openfirm.h:1.7 src/sys/arch/sparc/include/openfirm.h:1.8
--- src/sys/arch/sparc/include/openfirm.h:1.7 Mon May 18 11:39:30 2009
+++ src/sys/arch/sparc/include/openfirm.h Fri Mar 27 06:10:25 2015
@@ -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 uint64_t cell_t;
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 *);
Index: src/sys/arch/sparc/sparc/openfirm.c
diff -u src/sys/arch/sparc/sparc/openfirm.c:1.19 src/sys/arch/sparc/sparc/openfirm.c:1.20
--- src/sys/arch/sparc/sparc/openfirm.c:1.19 Sun Nov 23 02:15:52 2014
+++ src/sys/arch/sparc/sparc/openfirm.c Fri Mar 27 06:10:25 2015
@@ -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 @@ OF_seek(int handle, u_quad_t pos)
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;
