Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mark interrupt handlers attached to the irq chain as active in 

irq_claim().
Clear the active flag in the irq handler when it is removed from the irq
chain in irq_release().
Checks for podule IRQ's in irq_claim() are now guarded with
#if NPODULEBUS > 0
fiq_release() now retrieves the FIQ more registers and places them
back in the fiq handler structure.
This commit is contained in:
mark 1996-05-06 00:30:39 +00:00
parent 181c7ad5cd
commit 938954d516
2 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sys/arch/arm32/arm32/irqhandler.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: irqhandler.c,v 1.4 1996/03/28 21:43:52 mark Exp $ */
/* $NetBSD: irqhandler.c,v 1.5 1996/05/06 00:30:39 mark Exp $ */
/*
* Copyright (c) 1994-1996 Mark Brinicombe.
@ -61,6 +61,8 @@
#include <machine/katelib.h>
#include <machine/pte.h>
#include "podulebus.h"
irqhandler_t *irqhandlers[NIRQS];
fiqhandler_t *fiqhandlers;
@ -179,10 +181,9 @@ irq_claim(irq, handler)
}*/
/*
* Reset the flags for this handler. As it is at the top of the list it
* must be the active handler.
* Reset the flags for this handler.
* As the handler is now in the chain mark it as active.
*/
/* amb - no needed these days */
handler->ih_flags = 0 | IRQ_FLAG_ACTIVE;
/*
@ -229,6 +230,7 @@ irq_claim(irq, handler)
printf("irqmask[%d] = %08x\n", level, irqmasks[level]);
*/
#if NPODULEBUS > 0
/*
* Is this an expansion card IRQ and is there a PODULE IRQ handler
* installed ?
@ -239,6 +241,7 @@ irq_claim(irq, handler)
if (irq >= IRQ_EXPCARD0 && irqhandlers[IRQ_PODULE] == NULL)
panic("Podule IRQ %d claimed but no podulebus handler installed\n",
irq);
#endif
enable_irq(irq);
set_spl_masks();
@ -303,8 +306,8 @@ irq_release(irq, handler)
else
return(-1);
/* Flag the handler being removed as non active (in case it was) */
/* Not needed these days - AMB */
/* Now the handler has been removed from the chain mark is as inactive */
irqhand->ih_flags &= ~IRQ_FLAG_ACTIVE;
/* Make sure the head of the handler list is active */
@ -564,6 +567,10 @@ fiq_release(handler)
WriteWord(IOMD_FIQMSK, 0x00);
/* Retrieve the FIQ registers */
fiq_getregs(handler);
/* Remove the handler */
fiqhandlers = NULL;

19
sys/arch/arm32/iomd/iomd_irqhandler.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: iomd_irqhandler.c,v 1.4 1996/03/28 21:43:52 mark Exp $ */
/* $NetBSD: iomd_irqhandler.c,v 1.5 1996/05/06 00:30:39 mark Exp $ */
/*
* Copyright (c) 1994-1996 Mark Brinicombe.
@ -61,6 +61,8 @@
#include <machine/katelib.h>
#include <machine/pte.h>
#include "podulebus.h"
irqhandler_t *irqhandlers[NIRQS];
fiqhandler_t *fiqhandlers;
@ -179,10 +181,9 @@ irq_claim(irq, handler)
}*/
/*
* Reset the flags for this handler. As it is at the top of the list it
* must be the active handler.
* Reset the flags for this handler.
* As the handler is now in the chain mark it as active.
*/
/* amb - no needed these days */
handler->ih_flags = 0 | IRQ_FLAG_ACTIVE;
/*
@ -229,6 +230,7 @@ irq_claim(irq, handler)
printf("irqmask[%d] = %08x\n", level, irqmasks[level]);
*/
#if NPODULEBUS > 0
/*
* Is this an expansion card IRQ and is there a PODULE IRQ handler
* installed ?
@ -239,6 +241,7 @@ irq_claim(irq, handler)
if (irq >= IRQ_EXPCARD0 && irqhandlers[IRQ_PODULE] == NULL)
panic("Podule IRQ %d claimed but no podulebus handler installed\n",
irq);
#endif
enable_irq(irq);
set_spl_masks();
@ -303,8 +306,8 @@ irq_release(irq, handler)
else
return(-1);
/* Flag the handler being removed as non active (in case it was) */
/* Not needed these days - AMB */
/* Now the handler has been removed from the chain mark is as inactive */
irqhand->ih_flags &= ~IRQ_FLAG_ACTIVE;
/* Make sure the head of the handler list is active */
@ -564,6 +567,10 @@ fiq_release(handler)
WriteWord(IOMD_FIQMSK, 0x00);
/* Retrieve the FIQ registers */
fiq_getregs(handler);
/* Remove the handler */
fiqhandlers = NULL;