From a8bf95d0249565f4210ccab5c13232d501ce0c2d Mon Sep 17 00:00:00 2001 From: Till Straumann Date: Wed, 22 Apr 2009 22:06:58 +0000 Subject: - importing updated version from SLAC as of 20090422 --- bsd_eth_drivers/libbsdport/sysbus.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'bsd_eth_drivers/libbsdport/sysbus.c') diff --git a/bsd_eth_drivers/libbsdport/sysbus.c b/bsd_eth_drivers/libbsdport/sysbus.c index fc0ae0b..fcd3aac 100644 --- a/bsd_eth_drivers/libbsdport/sysbus.c +++ b/bsd_eth_drivers/libbsdport/sysbus.c @@ -143,17 +143,12 @@ bus_setup_intr(device_t dev, struct resource *r, int flags, driver_filter_t filt int rval; struct irq_cookie *info = 0; + + if ( filter && handler ) { rtems_panic("bus_setup_intr for both: filter & handler not implemented\n"); } - if ( (flags & INTR_FAST) && filter ) { - rtems_panic("bus_setup_intr for both: filter & INTR_FAST not implemented\n"); - /* handler is a fast handler already */ - filter = (driver_filter_t) handler; - handler = 0; - } - if ( handler ) { if ( !dev->drv ) { device_printf(dev, "bus_setup_intr: device has no driver attached\n"); @@ -192,8 +187,7 @@ struct irq_cookie *info = 0; return rval; } - if ( cookiep ) - *cookiep = info; + *cookiep = info; return rval; } -- cgit v1.2.3