d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renamed intr_enqueue to intr_vector and intr_dequeue to intr_fast, to

Browse Source 
better reflect how they are called.
This commit is contained in:
Jake Burkholder 2002-09-28 03:06:35 +00:00
parent 091c1e1acf
commit 3297e8c990
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/sparc64/include/intr_machdep.h
View File

@ -82,6 +82,6 @@ int inthand_add(const char *name, int vec, void (*handler)(void *),
void *arg, int flags, void **cookiep);
int inthand_remove(int vec, void *cookie);
ih_func_t intr_dequeue;
ih_func_t intr_fast;
#endif

2
sys/sparc64/pci/psycho.c
View File

@ -587,7 +587,7 @@ psycho_attach(device_t dev)
sclr = malloc(sizeof(*sclr), M_DEVBUF, M_WAITOK);
sclr->psc_sc = sc;
sclr->psc_clr = clr;
intr_setup(PIL_LOW, intr_dequeue, INTVEC(mr),
intr_setup(PIL_LOW, intr_fast, INTVEC(mr),
psycho_intr_stray, sclr);
}
#endif

2
sys/sparc64/sparc64/exception.S
View File

@ -549,7 +549,7 @@ END(tl0_sfsr_trap)
.macro intr_vector
ldxa [%g0] ASI_INTR_RECEIVE, %g1
andcc %g1, IRSR_BUSY, %g0
bnz,a,pt %xcc, intr_enqueue
bnz,a,pt %xcc, intr_vector
nop
sir
.align 32

8
sys/sparc64/sparc64/interrupt.S
View File

@ -65,7 +65,7 @@
* %g5 - argument, as above for %g4
* %g6 - softint priority
*/
ENTRY(intr_enqueue)
ENTRY(intr_vector)
/*
* Load the interrupt packet from the hardware.
*/
@ -146,9 +146,9 @@ ENTRY(intr_enqueue)
* Done, retry the instruction.
*/
retry
END(intr_enqueue)
END(intr_vector)
ENTRY(intr_dequeue)
ENTRY(intr_fast)
save %sp, -CCFSZ, %sp
1: ldx [PCPU(IRHEAD)], %l0
@ -180,4 +180,4 @@ ENTRY(intr_dequeue)
mov %o1, %o0
ba,a %xcc, 1b
nop
END(intr_dequeue)
END(intr_fast)

10
sys/sparc64/sparc64/intr_machdep.c
View File

@ -143,7 +143,7 @@ intr_init1()
intr_vectors[i].iv_pri = PIL_LOW;
intr_vectors[i].iv_vec = i;
}
intr_handlers[PIL_LOW] = intr_dequeue;
intr_handlers[PIL_LOW] = intr_fast;
}
void
@ -211,7 +211,7 @@ inthand_add(const char *name, int vec, void (*handler)(void *), void *arg,
ithread_priority(flags), flags, cookiep);
if ((flags & INTR_FAST) == 0 || errcode) {
intr_setup(PIL_ITHREAD, intr_dequeue, vec, sched_ithd, iv);
intr_setup(PIL_ITHREAD, intr_fast, vec, sched_ithd, iv);
errcode = 0;
}
@ -219,7 +219,7 @@ inthand_add(const char *name, int vec, void (*handler)(void *), void *arg,
return (errcode);
if (flags & INTR_FAST)
intr_setup(PIL_FAST, intr_dequeue, vec, handler, arg);
intr_setup(PIL_FAST, intr_fast, vec, handler, arg);
intr_stray_count[vec] = 0;
/* XXX: name is not yet used. */
@ -241,10 +241,10 @@ inthand_remove(int vec, void *cookie)
iv = &intr_vectors[vec];
mtx_lock_spin(&intr_table_lock);
if (iv->iv_ithd == NULL) {
intr_setup(PIL_ITHREAD, intr_dequeue, vec,
intr_setup(PIL_ITHREAD, intr_fast, vec,
intr_stray_vector, iv);
} else {
intr_setup(PIL_LOW, intr_dequeue, vec, sched_ithd, iv);
intr_setup(PIL_LOW, intr_fast, vec, sched_ithd, iv);
}
mtx_unlock_spin(&intr_table_lock);
}