diff options
| author | Till Straumann <strauman@slac.stanford.edu> | 2009-04-22 22:06:58 +0000 |
|---|---|---|
| committer | Till Straumann <strauman@slac.stanford.edu> | 2009-04-22 22:06:58 +0000 |
| commit | a8bf95d0249565f4210ccab5c13232d501ce0c2d (patch) | |
| tree | e01f2eca98add8dba13eec23a95fa22120638890 /bsd_eth_drivers/libbsdport/sysbus.c | |
| parent | This commit was manufactured by cvs2svn to create branch 'base'. (diff) | |
| download | libbsdport-a8bf95d0249565f4210ccab5c13232d501ce0c2d.tar.bz2 | |
- importing updated version from SLAC as of 20090422
Diffstat (limited to 'bsd_eth_drivers/libbsdport/sysbus.c')
| -rw-r--r-- | bsd_eth_drivers/libbsdport/sysbus.c | 12 |
1 files changed, 3 insertions, 9 deletions
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; } |