diff options
Diffstat (limited to '')
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | bsd_eth_drivers/libbsdport/sysbus.c | 12 |
2 files changed, 7 insertions, 9 deletions
@@ -1,5 +1,9 @@ 2009-02-19 Joel Sherrill <joel.sherrill@oarcorp.com> + * bsd_eth_drivers/libbsdport/sysbus.c: Revert Till's patch. + +2009-02-19 Joel Sherrill <joel.sherrill@oarcorp.com> + * bsd_eth_drivers/if_em/e1000_manage.c, bsd_eth_drivers/if_em/e1000_manage.h: New files. Missed in initial import. 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; } |