[src/sommerfeld_i386mp_1]: src/sys/arch/i386/i386 Adapt to imask changes.

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

details:   https://anonhg.NetBSD.org/src/rev/efc234e7d37c
branches:  sommerfeld_i386mp_1
changeset: 482165:efc234e7d37c
user:      sommerfeld <sommerfeld%NetBSD.org@localhost>
date:      Sun Feb 20 17:50:27 2000 +0000

description:
Adapt to imask changes.
call into ioapic driver to enable it at the right time.

diffstat:

 sys/arch/i386/i386/autoconf.c |  16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

diffs (37 lines):

diff -r a4cd893985eb -r efc234e7d37c sys/arch/i386/i386/autoconf.c
--- a/sys/arch/i386/i386/autoconf.c     Sun Feb 20 17:45:52 2000 +0000
+++ b/sys/arch/i386/i386/autoconf.c     Sun Feb 20 17:50:27 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: autoconf.c,v 1.45 1999/11/17 01:22:09 thorpej Exp $    */
+/*     $NetBSD: autoconf.c,v 1.45.2.1 2000/02/20 17:50:27 sommerfeld Exp $     */
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -68,6 +68,12 @@
 #include <machine/cpu.h>
 #include <machine/bootinfo.h>
 
+#include "ioapic.h"
+
+#if NIOAPIC > 0
+#include <machine/i82093var.h>
+#endif
+
 static int match_harddisk __P((struct device *, struct btinfo_bootdisk *));
 static void matchbiosdisks __P((void));
 void findroot __P((struct device **, int *));
@@ -107,8 +113,12 @@
                panic("configure: mainbus not configured");
 
        printf("biomask %x netmask %x ttymask %x\n",
-           (u_short)imask[IPL_BIO], (u_short)imask[IPL_NET],
-           (u_short)imask[IPL_TTY]);
+           (u_short)IMASK(IPL_BIO), (u_short)IMASK(IPL_NET),
+           (u_short)IMASK(IPL_TTY));
+
+#if NIOAPIC > 0
+       ioapic_enable();
+#endif
 
        spl0();