Sat Aug 7 06:16:22 2010 UTC ()

Remove unnecessary line.
Variable openpic_base exists, if defined PIC_OPENPIC.


(kiyohara)

diff -r1.70 -r1.71 src/sys/arch/prep/prep/machdep.c

--- src/sys/arch/prep/prep/machdep.c 2009/11/27 03:23:12	1.70
+++ src/sys/arch/prep/prep/machdep.c 2010/08/07 06:16:22	1.71

 @@ -1,14 +1,14 @@
-/*	$NetBSD: machdep.c,v 1.70 2009/11/27 03:23:12 rmind Exp $	*/
+/*	$NetBSD: machdep.c,v 1.71 2010/08/07 06:16:22 kiyohara Exp $	*/
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
  * Copyright (C) 1995, 1996 TooLs GmbH.
  * All rights reserved.
+ *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -22,27 +22,27 @@
  * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``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 TOOLS GMBH 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: machdep.c,v 1.70 2009/11/27 03:23:12 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.71 2010/08/07 06:16:22 kiyohara Exp $");
 #include "opt_compat_netbsd.h"
 #include "opt_openpic.h"
 #include <sys/param.h>
 #include <sys/buf.h>
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/exec.h>
 #include <sys/extent.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 @@ -433,50 +433,51 @@ prep_init(void)
 	ndev = be32toh(res->ActualNumDevices);
 	ppc_dev = res->Devices;
 	foundmpic = 0;
 	prep_intr_reg = 0;
 	for (i = 0; i < ((ndev > MAX_DEVICES) ? MAX_DEVICES : ndev); i++) {
 		if (ppc_dev[i].DeviceId.DevId == 0x41d00000) /* ISA_PIC */
 			setup_ivr(&ppc_dev[i]);
 #if defined(PIC_OPENPIC)
 		if (ppc_dev[i].DeviceId.DevId == 0x244d000d) { /* MPIC */
 			foundmpic = prep_setup_openpic(&ppc_dev[i]);
+		}
 #else
 #endif
+	}
 	if (!prep_intr_reg) {
 		/*
 		 * For some reason we never found one, this is known to
 		 * occur on certain motorola VME boards.  Instead we need
 		 * to just hardcode it.
 		 */
 		prep_intr_reg = (vaddr_t) mapiodev(PREP_INTR_REG, PAGE_SIZE);
 		if (!prep_intr_reg)
 			panic("startup: no room for interrupt register");
 		prep_intr_reg_off = INTR_VECTOR_REG;
+	}
 	if (!foundmpic)
 		init_intr();
+}
 static void
 init_intr(void)
+{
         int i;
 #if defined(PIC_OPENPIC)
         openpic_base = 0;
 #endif
 	pic_init();
         i = find_platform_quirk(res->VitalProductData.PrintableModel);
         if (i != -1)
                 if (platform_quirks[i].quirk & PLAT_QUIRK_ISA_HANDLER &&
                     platform_quirks[i].isa_intr_handler == EXT_INTR_I8259) {
 			isa_pic = setup_prepivr(PIC_IVR_MOT);
                         return;
+                }
 	isa_pic = setup_prepivr(PIC_IVR_IBM);
         oea_install_extint(pic_ext_intr);
+}