diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2005-08-14 11:02:34 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2005-08-14 11:02:34 +0000 |
| commit | bb3fdfa8291acc35d5db62c3361d2883056bea8b (patch) | |
| tree | 5b03bba6d14430b824914d1dfe740b18c94818a5 /sys/arch/sgi | |
| parent | 7a5cb464cb9e625c495a794c61a769a8c4e866b5 (diff) | |
catched->caught
Diffstat (limited to 'sys/arch/sgi')
| -rw-r--r-- | sys/arch/sgi/localbus/macebus.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/arch/sgi/localbus/macebus.c b/sys/arch/sgi/localbus/macebus.c index 1e65422c093..252bd282614 100644 --- a/sys/arch/sgi/localbus/macebus.c +++ b/sys/arch/sgi/localbus/macebus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: macebus.c,v 1.12 2005/07/18 02:43:25 fgsch Exp $ */ +/* $OpenBSD: macebus.c,v 1.13 2005/08/14 11:02:32 miod Exp $ */ /* * Copyright (c) 2000-2004 Opsycon AB (www.opsycon.se) @@ -688,7 +688,7 @@ intrmask_t macebus_iointr(intrmask_t hwpend, struct trap_frame *cf) { struct intrhand *ih; - intrmask_t catched, vm; + intrmask_t caught, vm; int v; intrmask_t pending; u_int64_t intstat, isastat, mask; @@ -697,7 +697,7 @@ macebus_iointr(intrmask_t hwpend, struct trap_frame *cf) intstat &= 0xffff; isastat = bus_space_read_8(&macebus_tag, mace_h, MACE_ISA_INT_STAT); - catched = 0; + caught = 0; /* Mask off masked interrupts and save them as pending */ if (intstat & cf->cpl) { @@ -705,7 +705,7 @@ macebus_iointr(intrmask_t hwpend, struct trap_frame *cf) mask = bus_space_read_8(&crimebus_tag, crime_h, CRIME_INT_MASK); mask &= ~ipending; bus_space_write_8(&crimebus_tag, crime_h, CRIME_INT_MASK, mask); - catched++; + caught++; } /* Scan all unmasked. Scan the first 16 for now */ @@ -719,7 +719,7 @@ macebus_iointr(intrmask_t hwpend, struct trap_frame *cf) while (ih) { ih->frame = cf; if ((*ih->ih_fun)(ih->ih_arg)) { - catched |= vm; + caught |= vm; ih->ih_count.ec_count++; } ih = ih->ih_next; @@ -727,7 +727,7 @@ macebus_iointr(intrmask_t hwpend, struct trap_frame *cf) } } - if (catched) + if (caught) return CR_INT_0; return 0; /* Non found here */ |