Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/sparc64/sparc64 prom_claim_phys: it appears one res...



details:   https://anonhg.NetBSD.org/src/rev/7b6403d29fa4
branches:  trunk
changeset: 493905:7b6403d29fa4
user:      pk <pk%NetBSD.org@localhost>
date:      Mon Jun 26 19:41:20 2000 +0000

description:
prom_claim_phys: it appears one result argument too many was specified.
Now we can return the actual result of the call rather than merely
reflecting the input.

diffstat:

 sys/arch/sparc64/sparc64/ofw_machdep.c |  7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diffs (35 lines):

diff -r fcdf1180779f -r 7b6403d29fa4 sys/arch/sparc64/sparc64/ofw_machdep.c
--- a/sys/arch/sparc64/sparc64/ofw_machdep.c    Mon Jun 26 19:38:14 2000 +0000
+++ b/sys/arch/sparc64/sparc64/ofw_machdep.c    Mon Jun 26 19:41:20 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ofw_machdep.c,v 1.10 2000/06/26 19:36:07 pk Exp $      */
+/*     $NetBSD: ofw_machdep.c,v 1.11 2000/06/26 19:41:20 pk Exp $      */
 
 /*
  * Copyright (C) 1996 Wolfgang Solfrank.
@@ -425,7 +425,6 @@
                cell_t phys_hi;
                cell_t phys_lo;
                cell_t status;
-               cell_t res;
                cell_t rphys_hi;
                cell_t rphys_lo;
        } args;
@@ -436,7 +435,7 @@
        }
        args.name = ADR2CELL(&"call-method");
        args.nargs = 6;
-       args.nreturns = 4;
+       args.nreturns = 3;
        args.method = ADR2CELL(&"claim");
        args.ihandle = HDL2CELL(memh);
        args.align = 0;
@@ -445,7 +444,7 @@
        args.phys_lo = HDL2CELL(phys);
        if (openfirmware(&args) != 0)
                return -1;
-       return (paddr_t)((((paddr_t)args.phys_hi)<<32)|(int)args.phys_lo);
+       return (paddr_t)((((paddr_t)args.rphys_hi)<<32)|(int)args.rphys_lo);
 }
 
 /* 



Home | Main Index | Thread Index | Old Index