diff options
| author | Jason Wright <jason@cvs.openbsd.org> | 2003-02-12 22:41:00 +0000 |
|---|---|---|
| committer | Jason Wright <jason@cvs.openbsd.org> | 2003-02-12 22:41:00 +0000 |
| commit | 21346686bf5ddd8f650fec121ebd08f040ff15c2 (patch) | |
| tree | 1b8c67d4701bce698a6bd0dce33fa9d5bafb4a22 /sys/arch/macppc/dev | |
| parent | 18e212506051ae4ca6a37ede9342958a9295951b (diff) | |
separate evirq into macintr and openpic versions (they just -happened- to be
the same size). ok drahn
Diffstat (limited to 'sys/arch/macppc/dev')
| -rw-r--r-- | sys/arch/macppc/dev/macintr.c | 8 | ||||
| -rw-r--r-- | sys/arch/macppc/dev/openpic.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sys/arch/macppc/dev/macintr.c b/sys/arch/macppc/dev/macintr.c index 240743ccf2f..2d1fa57864e 100644 --- a/sys/arch/macppc/dev/macintr.c +++ b/sys/arch/macppc/dev/macintr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: macintr.c,v 1.15 2002/09/15 09:01:58 deraadt Exp $ */ +/* $OpenBSD: macintr.c,v 1.16 2003/02/12 22:40:59 jason Exp $ */ /*- * Copyright (c) 1995 Per Fogelstrom @@ -67,7 +67,7 @@ int m_hwirq[ICU_LEN], m_virq[64]; unsigned int imen_m = 0xffffffff; int m_virq_max = 0; -struct evcnt evirq[ICU_LEN*2]; +struct evcnt m_evirq[ICU_LEN*2]; static int fakeintr(void *); static char *intr_typename(int type); @@ -555,7 +555,7 @@ start: } uvmexp.intrs++; - evirq[m_hwirq[irq]].ev_count++; + m_evirq[m_hwirq[irq]].ev_count++; } int_state &= ~r_imen; if (int_state) @@ -597,7 +597,7 @@ mac_intr_do_pending_int() ih = ih->ih_next; } - evirq[m_hwirq[irq]].ev_count++; + m_evirq[m_hwirq[irq]].ev_count++; } /*out32rb(INT_ENABLE_REG, ~imen_m);*/ diff --git a/sys/arch/macppc/dev/openpic.c b/sys/arch/macppc/dev/openpic.c index b4983f6985e..a70312c33cb 100644 --- a/sys/arch/macppc/dev/openpic.c +++ b/sys/arch/macppc/dev/openpic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: openpic.c,v 1.18 2002/09/15 09:01:58 deraadt Exp $ */ +/* $OpenBSD: openpic.c,v 1.19 2003/02/12 22:40:59 jason Exp $ */ /*- * Copyright (c) 1995 Per Fogelstrom @@ -67,7 +67,7 @@ int o_hwirq[ICU_LEN], o_virq[ICU_LEN]; unsigned int imen_o = 0xffffffff; int o_virq_max; -struct evcnt evirq[ICU_LEN]; +struct evcnt o_evirq[ICU_LEN]; static int fakeintr(void *); static char *intr_typename(int type); @@ -503,7 +503,7 @@ openpic_do_pending_int() ih = ih->ih_next; } - evirq[o_hwirq[irq]].ev_count++; + o_evirq[o_hwirq[irq]].ev_count++; } /*out32rb(INT_ENABLE_REG, ~imen_o);*/ @@ -651,7 +651,7 @@ ext_intr_openpic() } uvmexp.intrs++; - evirq[realirq].ev_count++; + o_evirq[realirq].ev_count++; } openpic_eoi(0); |