[src/trunk]: src/sys/arch/x86/x86 Move a panic() to a different location, and...

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

details:   https://anonhg.NetBSD.org/src/rev/b4dd05af0241
branches:  trunk
changeset: 554515:b4dd05af0241
user:      mycroft <mycroft%NetBSD.org@localhost>
date:      Wed Oct 29 03:40:56 2003 +0000

description:
Move a panic() to a different location, and eliminate a bogus initializer.

diffstat:

 sys/arch/x86/x86/mpbios.c |  12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diffs (55 lines):

diff -r 7b641d72c849 -r b4dd05af0241 sys/arch/x86/x86/mpbios.c
--- a/sys/arch/x86/x86/mpbios.c Wed Oct 29 03:31:22 2003 +0000
+++ b/sys/arch/x86/x86/mpbios.c Wed Oct 29 03:40:56 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mpbios.c,v 1.17 2003/10/27 03:51:35 lukem Exp $        */
+/*     $NetBSD: mpbios.c,v 1.18 2003/10/29 03:40:56 mycroft Exp $      */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -103,7 +103,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpbios.c,v 1.17 2003/10/27 03:51:35 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpbios.c,v 1.18 2003/10/29 03:40:56 mycroft Exp $");
 
 #include "opt_mpacpi.h"
 #include "opt_mpbios.h"
@@ -763,6 +763,7 @@
        case MPS_INTTYPE_SMI:
                *redir |= (IOAPIC_REDLO_DEL_SMI<<IOAPIC_REDLO_DEL_SHIFT);
                break;
+
        case MPS_INTTYPE_ExtINT:
                /*
                 * We are using the ioapic in "native" mode.
@@ -772,8 +773,6 @@
                *redir |= (IOAPIC_REDLO_DEL_EXTINT<<IOAPIC_REDLO_DEL_SHIFT);
                *redir |= (IOAPIC_REDLO_MASK);
                break;
-       default:
-               panic("unknown MPS interrupt type %d", entry->int_type);
        }
 }
 
@@ -1043,7 +1042,7 @@
        struct ioapic_softc *sc = NULL, *sc2;
 
        struct mp_intr_map *altmpi;
-       struct mp_bus *mpb = NULL;      /* XXX gcc */
+       struct mp_bus *mpb;
 
        u_int32_t id = entry->dst_apic_id;
        u_int32_t pin = entry->dst_apic_int;
@@ -1065,7 +1064,10 @@
        case MPS_INTTYPE_NMI:
                mpb = &nmi_bus;
                break;
+       default:
+               panic("unknown MPS interrupt type %d", entry->int_type);
        }
+
        mpi->next = mpb->mb_intrs;
        mpb->mb_intrs = mpi;
        mpi->bus = mpb;