diff options
| author | Jason Wright <jason@cvs.openbsd.org> | 2003-05-16 17:18:16 +0000 |
|---|---|---|
| committer | Jason Wright <jason@cvs.openbsd.org> | 2003-05-16 17:18:16 +0000 |
| commit | 23226eb12c9b8864963872e6f1b18eff64196318 (patch) | |
| tree | 7ff07edf5c1d4d311d9ec0b47a60ecb0d5b1235d /sys/arch | |
| parent | 85e053e7501287b4034b58a3a8435bf906ed929e (diff) | |
move the interrupt idle stuff to the generic intr_establish function
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/sparc64/dev/iommureg.h | 4 | ||||
| -rw-r--r-- | sys/arch/sparc64/dev/psycho.c | 6 | ||||
| -rw-r--r-- | sys/arch/sparc64/sparc64/intr.c | 5 |
3 files changed, 8 insertions, 7 deletions
diff --git a/sys/arch/sparc64/dev/iommureg.h b/sys/arch/sparc64/dev/iommureg.h index 66d1df1fa4a..92afce82289 100644 --- a/sys/arch/sparc64/dev/iommureg.h +++ b/sys/arch/sparc64/dev/iommureg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: iommureg.h,v 1.6 2003/03/06 08:26:08 henric Exp $ */ +/* $OpenBSD: iommureg.h,v 1.7 2003/05/16 17:18:14 jason Exp $ */ /* $NetBSD: iommureg.h,v 1.6 2001/07/20 00:07:13 eeh Exp $ */ /* @@ -166,4 +166,6 @@ struct iommu_strbuf { #define INTPCIOBINOX(x) ((x)&0x1f) /* OBIO ino index (for PCI machines) */ #define INTPCIINOX(x) (((x)&0x1c)>>2) /* PCI ino index */ +#define INTCLR_IDLE 0 + #endif /* _SPARC64_DEV_IOMMUREG_H_ */ diff --git a/sys/arch/sparc64/dev/psycho.c b/sys/arch/sparc64/dev/psycho.c index b879cba10cf..3ea1aa77d15 100644 --- a/sys/arch/sparc64/dev/psycho.c +++ b/sys/arch/sparc64/dev/psycho.c @@ -1,4 +1,4 @@ -/* $OpenBSD: psycho.c,v 1.31 2003/05/16 06:59:12 henric Exp $ */ +/* $OpenBSD: psycho.c,v 1.32 2003/05/16 17:18:14 jason Exp $ */ /* $NetBSD: psycho.c,v 1.39 2001/10/07 20:30:41 eeh Exp $ */ /* @@ -1182,10 +1182,6 @@ psycho_intr_establish(bus_space_tag_t t, bus_space_tag_t t0, int ihandle, DPRINTF(PDB_INTR, ("; reread intrmap = %016qx", (unsigned long long)(intrmap = *intrmapptr))); } - if (intrclrptr) { - /* set state to IDLE */ - *intrclrptr = 0; - } return (ih); } diff --git a/sys/arch/sparc64/sparc64/intr.c b/sys/arch/sparc64/sparc64/intr.c index 72e559413d2..ce208ac8711 100644 --- a/sys/arch/sparc64/sparc64/intr.c +++ b/sys/arch/sparc64/sparc64/intr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.c,v 1.13 2003/03/20 23:05:30 henric Exp $ */ +/* $OpenBSD: intr.c,v 1.14 2003/05/16 17:18:15 jason Exp $ */ /* $NetBSD: intr.c,v 1.39 2001/07/19 23:38:11 eeh Exp $ */ /* @@ -332,6 +332,9 @@ intr_establish(level, ih) #endif } + if (ih->ih_clr != NULL) /* Set interrupt to idle */ + ih->ih_clr = INTCLR_IDLE; + splx(s); } |