PERFORCE change 100044 for review
Paolo Pisati
piso at FreeBSD.org
Mon Jun 26 10:37:52 UTC 2006
http://perforce.freebsd.org/chv.cgi?CH=100044
Change 100044 by piso at piso_newluxor on 2006/06/26 10:37:26
Add a filter parameter to at91_setup_intr(), sa1110_setup_intr(),
i80321_pci_setup_intr() and iq80321_setup_intr().
Affected files ...
.. //depot/projects/soc2006/intr_filter/arm/at91/at91.c#2 edit
.. //depot/projects/soc2006/intr_filter/arm/sa11x0/sa11x0.c#2 edit
.. //depot/projects/soc2006/intr_filter/arm/xscale/i80321/i80321_pci.c#2 edit
.. //depot/projects/soc2006/intr_filter/arm/xscale/i80321/iq80321.c#2 edit
Differences ...
==== //depot/projects/soc2006/intr_filter/arm/at91/at91.c#2 (text) ====
@@ -539,15 +539,15 @@
static int
at91_setup_intr(device_t dev, device_t child,
- struct resource *ires, int flags, driver_intr_t *intr, void *arg,
+ struct resource *ires, int flags, driver_filter_t *filter, driver_intr_t *intr, void *arg,
void **cookiep)
{
struct at91_softc *sc = device_get_softc(dev);
if (rman_get_start(ires) == AT91RM92_IRQ_SYSTEM && !(flags & INTR_FAST))
panic("All system interrupt ISRs must be type INTR_FAST");
- BUS_SETUP_INTR(device_get_parent(dev), child, ires, flags, intr, arg,
- cookiep);
+ BUS_SETUP_INTR(device_get_parent(dev), child, ires, flags, filter, intr,
+ arg, cookiep);
bus_space_write_4(sc->sc_st, sc->sc_sys_sh, IC_IECR,
1 << rman_get_start(ires));
return (0);
==== //depot/projects/soc2006/intr_filter/arm/sa11x0/sa11x0.c#2 (text+ko) ====
@@ -92,14 +92,14 @@
static int sa1110_activate_resource(device_t, device_t, int, int,
struct resource *);
static int sa1110_setup_intr(device_t, device_t, struct resource *, int,
- driver_intr_t *, void *, void **);
+ driver_filter_t *, driver_intr_t *, void *, void **);
struct sa11x0_softc *sa11x0_softc; /* There can be only one. */
static int
sa1110_setup_intr(device_t dev, device_t child,
- struct resource *ires, int flags, driver_intr_t *intr, void *arg,
- void **cookiep)
+ struct resource *ires, int flags, driver_filter_t *filter, driver_intr_t *intr,
+ void *arg, void **cookiep)
{
int saved_cpsr;
@@ -114,8 +114,8 @@
saved_cpsr = SetCPSR(I32_bit, I32_bit);
SetCPSR(I32_bit, saved_cpsr & I32_bit);
- BUS_SETUP_INTR(device_get_parent(dev), child, ires, flags, intr, arg,
- cookiep);
+ BUS_SETUP_INTR(device_get_parent(dev), child, ires, flags, filter, intr,
+ arg, cookiep);
return (0);
}
==== //depot/projects/soc2006/intr_filter/arm/xscale/i80321/i80321_pci.c#2 (text+ko) ====
@@ -416,11 +416,11 @@
static int
i80321_pci_setup_intr(device_t dev, device_t child,
- struct resource *ires, int flags, driver_intr_t *intr, void *arg,
- void **cookiep)
+ struct resource *ires, int flags, driver_filter_t *filter,
+ driver_intr_t *intr, void *arg, void **cookiep)
{
return (BUS_SETUP_INTR(device_get_parent(dev), child, ires, flags,
- intr, arg, cookiep));
+ filter, intr, arg, cookiep));
}
static int
==== //depot/projects/soc2006/intr_filter/arm/xscale/i80321/iq80321.c#2 (text+ko) ====
@@ -314,10 +314,10 @@
static int
iq80321_setup_intr(device_t dev, device_t child,
- struct resource *ires, int flags, driver_intr_t *intr, void *arg,
- void **cookiep)
+ struct resource *ires, int flags, driver_filter_t *filter,
+ driver_intr_t *intr, void *arg, void **cookiep)
{
- BUS_SETUP_INTR(device_get_parent(dev), child, ires, flags, intr, arg,
+ BUS_SETUP_INTR(device_get_parent(dev), child, ires, flags, filter, intr, arg,
cookiep);
intr_enabled |= 1 << rman_get_start(ires);
i80321_set_intrmask();
More information about the p4-projects
mailing list