mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2025-01-30 16:51:41 +00:00
Code Issues Releases Activity

- Introduce a flags value into the interrupt handler structure.

Browse Source 
- Copy the flags passed to inthand_add into the flags value.
- If the interrupt is INTR_FAST, re-enable the irq after running the handler.
This commit is contained in:
Benno Rice 2003-02-01 07:20:36 +00:00
parent 4230e8de2f
commit cbab7e25fd
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=110180
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/powerpc/include/intr_machdep.h
View File

@ -37,10 +37,11 @@ struct intr_handler {
void *ih_arg;
struct ithd *ih_ithd;
u_int ih_irq;
u_int ih_flags;
};
void intr_init(void (*)(void), int, void (*)(int), void (*)(int));
void intr_setup(u_int, ih_func_t *, void *);
void intr_setup(u_int, ih_func_t *, void *, u_int);
int inthand_add(const char *, u_int, void (*)(void *), void *, int,
void **);
int inthand_remove(u_int, void *);

15
sys/powerpc/powerpc/intr_machdep.c
View File

@ -108,7 +108,6 @@ intr_init(void (*handler)(void), int nirq, void (*irq_e)(int),
{
int i;
u_int32_t msr;
u_long offset;
if (intr_initialized != 0)
panic("intr_init: interrupts intialized twice\n");
@ -129,6 +128,7 @@ intr_init(void (*handler)(void), int nirq, void (*irq_e)(int),
intr_handlers[i].ih_func = intr_stray_handler;
intr_handlers[i].ih_arg = &intr_handlers[i];
intr_handlers[i].ih_irq = i;
intr_handlers[i].ih_flags = 0;
}
msr = mfmsr();
@ -145,7 +145,7 @@ intr_init(void (*handler)(void), int nirq, void (*irq_e)(int),
}
void
intr_setup(u_int irq, ih_func_t *ihf, void *iha)
intr_setup(u_int irq, ih_func_t *ihf, void *iha, u_int flags)
{
u_int32_t msr;
@ -155,6 +155,7 @@ intr_setup(u_int irq, ih_func_t *ihf, void *iha)
intr_handlers[irq].ih_func = ihf;
intr_handlers[irq].ih_arg = iha;
intr_handlers[irq].ih_irq = irq;
intr_handlers[irq].ih_flags = flags;
mtmsr(msr);
}
@ -200,7 +201,7 @@ inthand_add(const char *name, u_int irq, void (*handler)(void *), void *arg,
ithread_priority(flags), flags, cookiep);
if ((flags & INTR_FAST) == 0 || error) {
intr_setup(irq, sched_ithd, ih);
intr_setup(irq, sched_ithd, ih, flags);
error = 0;
}
@ -208,7 +209,7 @@ inthand_add(const char *name, u_int irq, void (*handler)(void *), void *arg,
return (error);
if (flags & INTR_FAST)
intr_setup(irq, handler, arg);
intr_setup(irq, handler, arg, flags);
intr_stray_count[irq] = 0;
@ -229,9 +230,9 @@ inthand_remove(u_int irq, void *cookie)
mtx_lock_spin(&intr_table_lock);
if (ih->ih_ithd == NULL) {
intr_setup(irq, intr_stray_handler, ih);
intr_setup(irq, intr_stray_handler, ih, 0);
} else {
intr_setup(irq, sched_ithd, ih);
intr_setup(irq, sched_ithd, ih, 0);
}
mtx_unlock_spin(&intr_table_lock);
@ -245,6 +246,8 @@ intr_handle(u_int irq)
{
intr_handlers[irq].ih_func(intr_handlers[irq].ih_arg);
if ((intr_handlers[irq].ih_flags & INTR_FAST) != 0)
irq_enable(irq);
}
static void