diff options
| author | Dale Rahn <drahn@cvs.openbsd.org> | 2001-05-02 06:02:47 +0000 |
|---|---|---|
| committer | Dale Rahn <drahn@cvs.openbsd.org> | 2001-05-02 06:02:47 +0000 |
| commit | 37e57f68442bc85b9f8c9f92e4c6db9a3b51a3a8 (patch) | |
| tree | c28f3fb2deb453a57796a44a98e7dbddb6f056ea | |
| parent | bf1fad0a996e213e8697ac3d92e77e5de784f2f1 (diff) | |
Move powerpc interrupt enablement into the interrupt controller, not after
config runs. openpic already had this change.
Cleans up config operations for other changes.
| -rw-r--r-- | sys/arch/powerpc/mac/macintr.c | 4 | ||||
| -rw-r--r-- | sys/arch/powerpc/powerpc/machdep.c | 13 |
2 files changed, 4 insertions, 13 deletions
diff --git a/sys/arch/powerpc/mac/macintr.c b/sys/arch/powerpc/mac/macintr.c index 75d92f9f42d..7f6ef0c040d 100644 --- a/sys/arch/powerpc/mac/macintr.c +++ b/sys/arch/powerpc/mac/macintr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: macintr.c,v 1.7 2001/04/08 05:00:26 drahn Exp $ */ +/* $OpenBSD: macintr.c,v 1.8 2001/05/02 06:02:46 drahn Exp $ */ /*- * Copyright (c) 1995 Per Fogelstrom @@ -180,6 +180,8 @@ macintr_attach(parent, self, aux) mac_intr_establish(parent, 0x14, IST_LEVEL, IPL_HIGH, prog_switch, (void *)0x14, "prog button"); + ppc_intr_enable(1); + printf("\n"); } void diff --git a/sys/arch/powerpc/powerpc/machdep.c b/sys/arch/powerpc/powerpc/machdep.c index 2fe792f6f17..7117f62406e 100644 --- a/sys/arch/powerpc/powerpc/machdep.c +++ b/sys/arch/powerpc/powerpc/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.56 2001/04/08 05:00:27 drahn Exp $ */ +/* $OpenBSD: machdep.c,v 1.57 2001/05/02 06:02:45 drahn Exp $ */ /* $NetBSD: machdep.c,v 1.4 1996/10/16 19:33:11 ws Exp $ */ /* @@ -587,17 +587,6 @@ cpu_startup() */ devio_malloc_safe = 1; configure(); - - /* - * Now allow hardware interrupts. - */ - { - int msr; - - splhigh(); - __asm__ volatile ("mfmsr %0; ori %0, %0, %1; mtmsr %0" - : "=r"(msr) : "K"(PSL_EE)); - } } |