[src/trunk]: src/sys/arch/powerpc/oea Heed modeldata.ranges_offset while cons...

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

details:   https://anonhg.NetBSD.org/src/rev/196a54961c2a
branches:  trunk
changeset: 750868:196a54961c2a
user:      phx <phx%NetBSD.org@localhost>
date:      Sun Jan 17 16:47:17 2010 +0000

description:
Heed modeldata.ranges_offset while constructing the ranges bitmap.

diffstat:

 sys/arch/powerpc/oea/ofwoea_machdep.c |  10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diffs (39 lines):

diff -r 60333069aacb -r 196a54961c2a sys/arch/powerpc/oea/ofwoea_machdep.c
--- a/sys/arch/powerpc/oea/ofwoea_machdep.c     Sun Jan 17 16:23:43 2010 +0000
+++ b/sys/arch/powerpc/oea/ofwoea_machdep.c     Sun Jan 17 16:47:17 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ofwoea_machdep.c,v 1.17 2009/02/13 22:41:03 apb Exp $ */
+/* $NetBSD: ofwoea_machdep.c,v 1.18 2010/01/17 16:47:17 phx Exp $ */
 
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofwoea_machdep.c,v 1.17 2009/02/13 22:41:03 apb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofwoea_machdep.c,v 1.18 2010/01/17 16:47:17 phx Exp $");
 
 #include "opt_ppcarch.h"
 #include "opt_compat_netbsd.h"
@@ -349,7 +349,7 @@
 
 
 /*
- * Scan the device tree for ranges, and batmap them.
+ * Scan the device tree for ranges, and return them as bitmap 0..15
  */
 
 static u_int16_t
@@ -373,7 +373,11 @@
                if (j == -1)
                        goto noranges;
 
+#ifdef ofppc
+               reclen = acells + modeldata.ranges_offset + scells;
+#else
                reclen = acells + 1 + scells;
+#endif
 
                for (i=0; i < (mlen/4)/reclen; i++) {
                        addr = map[reclen * i + acells];