d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update openpic to support the new bus_setup_intr() syntax.

Browse Source 
Reviewed by: marcel
This commit is contained in:
piso 2007-03-07 11:42:14 +00:00
parent 769f429126
commit b9dfa1fd20
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/powerpc/aim/nexus.c
View File

@ -112,7 +112,7 @@ static device_t nexus_add_child(device_t, int, const char *, int);
static int nexus_read_ivar(device_t, device_t, int, uintptr_t *);
static int nexus_write_ivar(device_t, device_t, int, uintptr_t);
static int nexus_setup_intr(device_t, device_t, struct resource *, int,
driver_intr_t *, void *, void **);
driver_filter_t *, driver_intr_t *, void *, void **);
static int nexus_teardown_intr(device_t, device_t, struct resource *,
void *);
static struct resource *nexus_alloc_resource(device_t, device_t, int, int *,
@ -290,7 +290,7 @@ nexus_write_ivar(device_t dev, device_t child, int which, uintptr_t value)
static int
nexus_setup_intr(device_t dev, device_t child, struct resource *res, int flags,
driver_intr_t *intr, void *arg, void **cookiep)
driver_filter_t *filter, driver_intr_t *intr, void *arg, void **cookiep)
{
struct nexus_softc *sc;
@ -299,8 +299,8 @@ nexus_setup_intr(device_t dev, device_t child, struct resource *res, int flags,
if (device_get_state(sc->sc_pic) != DS_ATTACHED)
panic("nexus_setup_intr: no pic attached\n");
return (PIC_SETUP_INTR(sc->sc_pic, child, res, flags, intr, arg,
cookiep));
return (PIC_SETUP_INTR(sc->sc_pic, child, res, flags, filter, intr,
arg, cookiep));
}
static int

8
sys/powerpc/powerpc/nexus.c
View File

@ -112,7 +112,7 @@ static device_t nexus_add_child(device_t, int, const char *, int);
static int nexus_read_ivar(device_t, device_t, int, uintptr_t *);
static int nexus_write_ivar(device_t, device_t, int, uintptr_t);
static int nexus_setup_intr(device_t, device_t, struct resource *, int,
driver_intr_t *, void *, void **);
driver_filter_t *, driver_intr_t *, void *, void **);
static int nexus_teardown_intr(device_t, device_t, struct resource *,
void *);
static struct resource *nexus_alloc_resource(device_t, device_t, int, int *,
@ -290,7 +290,7 @@ nexus_write_ivar(device_t dev, device_t child, int which, uintptr_t value)
static int
nexus_setup_intr(device_t dev, device_t child, struct resource *res, int flags,
driver_intr_t *intr, void *arg, void **cookiep)
driver_filter_t *filter, driver_intr_t *intr, void *arg, void **cookiep)
{
struct nexus_softc *sc;
@ -299,8 +299,8 @@ nexus_setup_intr(device_t dev, device_t child, struct resource *res, int flags,
if (device_get_state(sc->sc_pic) != DS_ATTACHED)
panic("nexus_setup_intr: no pic attached\n");
return (PIC_SETUP_INTR(sc->sc_pic, child, res, flags, intr, arg,
cookiep));
return (PIC_SETUP_INTR(sc->sc_pic, child, res, flags, filter, intr,
arg, cookiep));
}
static int

1
sys/powerpc/powerpc/pic_if.m
View File

@ -44,6 +44,7 @@ METHOD int setup_intr {
device_t child;
struct resource *res;
int flags;
driver_filter_t *filter;
driver_intr_t *intr;
void *arg;
void **cookiep;