PERFORCE change 112546 for review
John Baldwin
jhb at freebsd.org
Fri Jan 5 11:27:41 PST 2007
On Friday 05 January 2007 11:29, Paolo Pisati wrote:
> http://perforce.freebsd.org/chv.cgi?CH=112546
>
> Change 112546 by piso at piso_newluxor on 2007/01/05 16:29:28
>
> o s/mi_handle_intr/handle_intr/g
> o indentation
Actually, can you call it 'intr_handle()?' Or maybe 'intr_event_handle()'?
Also, can you make the intr_eoi_src and intr_disable_eoi_src function pointers
be part of 'struct intr_event' passed to intr_event_create() instead of
passing them to this function? You also shouldn't need to pass 'isrc' to
the function as it's already in the intr_event.
> Affected files ...
>
> .. //depot/projects/soc2006/intr_filter/amd64/amd64/intr_machdep.c#14 edit
> .. //depot/projects/soc2006/intr_filter/arm/arm/intr.c#13 edit
> .. //depot/projects/soc2006/intr_filter/i386/i386/intr_machdep.c#21 edit
> .. //depot/projects/soc2006/intr_filter/ia64/ia64/interrupt.c#12 edit
> .. //depot/projects/soc2006/intr_filter/kern/kern_intr.c#24 edit
> .. //depot/projects/soc2006/intr_filter/powerpc/powerpc/intr_machdep.c#18
edit
> .. //depot/projects/soc2006/intr_filter/sparc64/sparc64/intr_machdep.c#13
edit
> .. //depot/projects/soc2006/intr_filter/sys/interrupt.h#11 edit
>
> Differences ...
>
> ==== //depot/projects/soc2006/intr_filter/amd64/amd64/intr_machdep.c#14
(text+ko) ====
>
> @@ -274,7 +274,7 @@
> if (vector == 0)
> clkintr_pending = 1;
>
> - res = mi_handle_intr(ie, frame, intr_eoi_src, intr_disab_eoi_src, isrc);
> + res = handle_intr(ie, frame, intr_eoi_src, intr_disab_eoi_src, isrc);
> switch(res) {
> case 0:
> /* FALLTHROUGH */
>
> ==== //depot/projects/soc2006/intr_filter/arm/arm/intr.c#13 (text+ko) ====
>
> @@ -141,8 +141,8 @@
> while ((i = arm_get_next_irq()) != -1) {
> intrcnt[intrcnt_tab[i]]++;
> event = intr_events[i];
> - res = mi_handle_intr(event, frame, intr_eoi_src_stub,
> - intr_disab_eoi_src, (void *)i);
> + res = handle_intr(event, frame, intr_eoi_src_stub,
> + intr_disab_eoi_src, (void *)i);
> switch (res) {
> case 0:
> break;
>
> ==== //depot/projects/soc2006/intr_filter/i386/i386/intr_machdep.c#21
(text+ko) ====
>
> @@ -262,7 +262,7 @@
> if (vector == 0)
> clkintr_pending = 1;
>
> - res = mi_handle_intr(ie, frame, intr_eoi_src, intr_disab_eoi_src, isrc);
> + res = handle_intr(ie, frame, intr_eoi_src, intr_disab_eoi_src, isrc);
> switch(res) {
> case 0:
> /* FALLTHROUGH */
>
> ==== //depot/projects/soc2006/intr_filter/ia64/ia64/interrupt.c#12 (text+ko)
====
>
> @@ -396,8 +396,8 @@
> if (i->cntp)
> atomic_add_long(i->cntp, 1);
>
> - res = mi_handle_intr(i->event, frame, intr_eoi_src_stub,
> - intr_disab_eoi_src_stub, NULL);
> + res = handle_intr(i->event, frame, intr_eoi_src_stub,
> + intr_disab_eoi_src_stub, NULL);
> switch (res) {
> case 0:
> break;
>
> ==== //depot/projects/soc2006/intr_filter/kern/kern_intr.c#24 (text+ko) ====
>
> @@ -1007,9 +1007,9 @@
> * o ECHILD: no ithread scheduled.
> */
> int
> -mi_handle_intr(struct intr_event *ie, struct trapframe *frame,
> - void (*intr_eoi_src)(void *),
> - void (*intr_disab_eoi_src)(void *), void *arg)
> +handle_intr(struct intr_event *ie, struct trapframe *frame,
> + void (*intr_eoi_src)(void *), void (*intr_disab_eoi_src)(void *),
> + void *arg)
> {
> struct intr_thread *ithd;
> struct thread *td;
>
> ==== //depot/projects/soc2006/intr_filter/powerpc/powerpc/intr_machdep.c#18
(text+ko) ====
>
> @@ -280,7 +280,7 @@
> ie = i->event;
> KASSERT(ie != NULL, ("%s: interrupt without an event", __func__));
>
> - res = mi_handle_intr(ie, NULL, intr_eoi_src_stub,
> + res = handle_intr(ie, NULL, intr_eoi_src_stub,
> intr_disab_eoi_src_stub, NULL);
> switch(res) {
> case 0:
>
> ==== //depot/projects/soc2006/intr_filter/sparc64/sparc64/intr_machdep.c#13
(text+ko) ====
>
> @@ -272,8 +272,8 @@
>
> iv = cookie;
> ie = iv->iv_event;
> - res = mi_handle_intr(ie, NULL, intr_eoi_src_stub, intr_disab_eoi_src_stub,
> - NULL);
> + res = handle_intr(ie, NULL, intr_eoi_src_stub,
> + intr_disab_eoi_src_stub, NULL);
> switch (res) {
> case 0:
> /* FALLTHROUGH */
>
> ==== //depot/projects/soc2006/intr_filter/sys/interrupt.h#11 (text+ko) ====
>
> @@ -119,9 +119,9 @@
> void stray_detection(void *_arg);
> void intr_eoi_src_stub(void *arg __unused);
> void intr_disab_eoi_src_stub(void *arg __unused);
> -int mi_handle_intr(struct intr_event *ie, struct trapframe *frame,
> - void (*intr_eoi_src)(void *),
> - void (*intr_disab_eoi_src)(void *), void *arg);
> +int handle_intr(struct intr_event *ie, struct trapframe *frame,
> + void (*intr_eoi_src)(void *), void (*intr_disab_eoi_src)(void *),
> + void *arg);
> u_char intr_priority(enum intr_type flags);
> int intr_event_add_handler(struct intr_event *ie, const char *name,
> driver_filter_t filter, driver_intr_t handler, void *arg, u_char pri,
enum intr_type flags,
>
--
John Baldwin
More information about the p4-projects
mailing list