[src/netbsd-7]: src/sys/arch/ofppc/ofppc Pull up following revision(s) (reque...

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

details:   https://anonhg.NetBSD.org/src/rev/b40e5ab539ce
branches:  netbsd-7
changeset: 798781:b40e5ab539ce
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Jan 04 12:14:30 2015 +0000

description:
Pull up following revision(s) (requested by phx in ticket #380):
        sys/arch/ofppc/ofppc/mainbus.c: revision 1.30
Make it compile with GCC48.

diffstat:

 sys/arch/ofppc/ofppc/mainbus.c |  16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

diffs (55 lines):

diff -r e2c2c9826a8f -r b40e5ab539ce sys/arch/ofppc/ofppc/mainbus.c
--- a/sys/arch/ofppc/ofppc/mainbus.c    Sun Jan 04 11:43:53 2015 +0000
+++ b/sys/arch/ofppc/ofppc/mainbus.c    Sun Jan 04 12:14:30 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mainbus.c,v 1.29 2013/04/21 15:42:11 kiyohara Exp $    */
+/*     $NetBSD: mainbus.c,v 1.29.10.1 2015/01/04 12:14:30 martin Exp $ */
 
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.29 2013/04/21 15:42:11 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.29.10.1 2015/01/04 12:14:30 martin Exp $");
 
 #include "opt_interrupt.h"
 #include "opt_multiprocessor.h"
@@ -100,10 +100,15 @@
                uint32_t pci_hi, pci_mid, pci_lo;
                uint32_t host;
                uint32_t size_hi, size_lo;
-       } ranges[6], *rp = ranges;
-       unsigned char *baseaddr = NULL;
+       } ranges[6];
        uint32_t reg[12];
        int parent, len;
+#if defined(PIC_OPENPIC) || defined(PIC_DISTOPENPIC)
+       unsigned char *baseaddr;
+#endif
+#ifdef PIC_OPENPIC
+       struct ranges *rp = ranges;
+#endif
 #ifdef PIC_DISTOPENPIC
        unsigned char *isu[OPENPIC_MAX_ISUS];
        int i, j;
@@ -144,7 +149,6 @@
                len -= sizeof(ranges[0]);
        }
 #endif
-       rp = 0; /* satisfy -Wall */
        return FALSE;
  noaadr:
        /* this isn't a PCI-attached openpic */
@@ -153,9 +157,9 @@
                return FALSE;
 
        if (len == sizeof(int)*2) {
-               baseaddr = (unsigned char *)mapiodev(reg[0], reg[1], false);
                aprint_verbose("Found openpic at %08x\n", reg[0]);
 #ifdef PIC_OPENPIC
+               baseaddr = (unsigned char *)mapiodev(reg[0], reg[1], false);
                (void)setup_openpic(baseaddr, 0);
 #ifdef MULTIPROCESSOR
                setup_openpic_ipi();