 @@ -1,14 +1,14 @@
-/*	$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.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Tim Rightnour
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #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"
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/systm.h>
 #include <dev/pci/pcivar.h>
 #include <dev/ofw/openfirm.h>
 #include <dev/ofw/ofw_pci.h>
 #include <arch/powerpc/pic/picvar.h>
 #ifdef MULTIPROCESSOR
 @@ -90,30 +90,35 @@ init_prepivr(int node)
 	return setup_prepivr(PIC_IVR_MOT);
+}
 #endif
 static int
 init_openpic(int node)
+{
 	struct ofw_pci_register aadr;
 	struct ranges {
 		uint32_t pci_hi, pci_mid, pci_lo;
 		uint32_t host;
 		uint32_t size_hi, size_lo;
-	} ranges[6], *rp = ranges;
+	} ranges[6];
 	unsigned char *baseaddr = NULL;
 	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;
 	int isumap[OPENPIC_MAX_ISUS];
 #endif
 	if (OF_getprop(node, "assigned-addresses", &aadr, sizeof(aadr))
 	    != sizeof(aadr))
 		goto noaadr;
 	parent = OF_parent(node);
 	len = OF_getprop(parent, "ranges", ranges, sizeof(ranges));
 	if (len == -1)
 @@ -134,38 +139,37 @@ init_openpic(int node)
 			ipiops.ppc_establish_ipi(IST_LEVEL, IPL_HIGH, NULL);
 			for (i=1; i < ncpu; i++) {
 				aprint_verbose("Enabling interrupts "
 				    "for cpu%d\n", i);
 				openpic_set_priority(i, 0);
+			}
 #endif
 			return TRUE;
+		}
 		rp++;
 		len -= sizeof(ranges[0]);
+	}
 #endif
 	rp = 0; /* satisfy -Wall */
 	return FALSE;
  noaadr:
 	/* this isn't a PCI-attached openpic */
 	len = OF_getprop(node, "reg", &reg, sizeof(reg));
 	if (len < sizeof(int)*2)
 		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();
 		ipiops.ppc_establish_ipi(IST_LEVEL, IPL_HIGH, NULL);
 		for (i=1; i < ncpu; i++) {
 			aprint_verbose("Enabling interrupts for cpu%d\n", i);
 			openpic_set_priority(i, 0);
+		}
 #endif
 		return TRUE;
 #else
 		aprint_error("No openpic support compiled into kernel!");
 		return FALSE;