Date: Mon, 29 Sep 2003 19:21:40 -0700 (PDT) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 38833 for review Message-ID: <200309300221.h8U2LeSb030617@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=38833 Change 38833 by peter@peter_hammer on 2003/09/29 19:20:53 no, I won't go back to pretending the vector is part of the frame. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#8 edit .. //depot/projects/hammer/sys/amd64/include/apicvar.h#4 edit .. //depot/projects/hammer/sys/amd64/isa/atpic.c#5 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/local_apic.c#8 (text+ko) ==== @@ -421,13 +421,14 @@ } void -lapic_handle_intr(struct intrframe frame) +lapic_handle_intr(void *cookie, struct intrframe frame) { struct intsrc *isrc; + int vec = (uintptr_t)cookie; - if (frame.if_vec == -1) + if (vec == -1) panic("Couldn't get vector from ISR!"); - isrc = intr_lookup_source(frame.if_vec); + isrc = intr_lookup_source(vec); isrc->is_pic->pic_disable_source(isrc); lapic->eoi = 0; intr_execute_handlers(isrc, &frame); ==== //depot/projects/hammer/sys/amd64/include/apicvar.h#4 (text+ko) ==== @@ -152,7 +152,7 @@ void lapic_ipi_raw(register_t icrlo, u_int dest); void lapic_ipi_vectored(u_int vector, int dest); int lapic_ipi_wait(int delay); -void lapic_handle_intr(struct intrframe frame); +void lapic_handle_intr(void *cookie, struct intrframe frame); void lapic_set_logical_id(u_int apic_id, u_int cluster, u_int cluster_id); int lapic_set_lvt_mask(u_int apic_id, u_int lvt, u_char masked); int lapic_set_lvt_mode(u_int apic_id, u_int lvt, u_int32_t mode); ==== //depot/projects/hammer/sys/amd64/isa/atpic.c#5 (text+ko) ==== @@ -342,17 +342,17 @@ SYSINIT(atpic_init, SI_SUB_INTR, SI_ORDER_SECOND + 1, atpic_init, NULL) /* XXX */ -void atpic_sched_ithd(struct intrframe iframe); +void atpic_sched_ithd(void *cookie, struct intrframe iframe); void -atpic_sched_ithd(struct intrframe iframe) +atpic_sched_ithd(void *cookie, struct intrframe iframe) { struct atpic_intsrc *asrc; struct intsrc *isrc; + int vec = (uintptr_t)cookie; - KASSERT((uint)iframe.if_vec < ICU_LEN, - ("unknown int %d\n", iframe.if_vec)); - asrc = &atintrs[iframe.if_vec]; + KASSERT(vec < ICU_LEN, ("unknown int %d\n", vec)); + asrc = &atintrs[vec]; if (asrc->at_extsrc != NULL) isrc = asrc->at_extsrc; else
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200309300221.h8U2LeSb030617>