From 6a2ffa86e5b748ba71e36d37462a936eb9101be7 Mon Sep 17 00:00:00 2001 From: piso Date: Fri, 23 Feb 2007 12:19:07 +0000 Subject: o break newbus api: add a new argument of type driver_filter_t to bus_setup_intr() o add an int return code to all fast handlers o retire INTR_FAST/IH_FAST For more info: http://docs.freebsd.org/cgi/getmsg.cgi?fetch=465712+0+current/freebsd-current Reviewed by: many Approved by: re@ --- sys/i386/isa/npx.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'sys/i386/isa/npx.c') diff --git a/sys/i386/isa/npx.c b/sys/i386/isa/npx.c index ba202fc..e9ba8b0 100644 --- a/sys/i386/isa/npx.c +++ b/sys/i386/isa/npx.c @@ -149,7 +149,7 @@ static void fpusave(union savefpu *); static void fpurstor(union savefpu *); static int npx_attach(device_t dev); static void npx_identify(driver_t *driver, device_t parent); -static void npx_intr(void *); +static int npx_intr(void *); static int npx_probe(device_t dev); #ifdef I586_CPU_XXX static long timezero(const char *funcname, @@ -201,7 +201,7 @@ npx_identify(driver, parent) /* * Do minimal handling of npx interrupts to convert them to traps. */ -static void +static int npx_intr(dummy) void *dummy; { @@ -234,6 +234,7 @@ npx_intr(dummy) td->td_flags |= TDF_ASTPENDING; mtx_unlock_spin(&sched_lock); } + return (FILTER_HANDLED); } /* @@ -279,8 +280,8 @@ npx_probe(dev) irq_res = bus_alloc_resource(dev, SYS_RES_IRQ, &irq_rid, irq_num, irq_num, 1, RF_ACTIVE); if (irq_res != NULL) { - if (bus_setup_intr(dev, irq_res, INTR_TYPE_MISC | INTR_FAST, - npx_intr, NULL, &irq_cookie) != 0) + if (bus_setup_intr(dev, irq_res, INTR_TYPE_MISC, + npx_intr, NULL, NULL, &irq_cookie) != 0) panic("npx: can't create intr"); } -- cgit v1.1