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

Pass the device_t of the AT PIC driver to atpic_intr() so that

Browse Source 
we don't have to use a global variable. Pass a NULL frame pointer
to the dispatch function just like openpic(4).
This commit is contained in:
marcel 2010-06-24 05:05:18 +00:00
parent ecf1995ac7
commit 5f1f55f820
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/powerpc/mpc85xx/atpic.c
View File

@ -82,8 +82,6 @@ static void atpic_mask(device_t, u_int);
static void atpic_unmask(device_t, u_int); static void atpic_unmask(device_t, u_int);
static uint32_t atpic_id (device_t dev); static uint32_t atpic_id (device_t dev);
static device_t pic8259;
static device_method_t atpic_isa_methods[] = { static device_method_t atpic_isa_methods[] = {
/* Device interface */ /* Device interface */
DEVMETHOD(device_identify, atpic_isa_identify), DEVMETHOD(device_identify, atpic_isa_identify),
@ -140,7 +138,7 @@ static void
atpic_intr(void *arg) atpic_intr(void *arg)
{ {
atpic_dispatch(pic8259, arg); atpic_dispatch(arg, NULL);
} }
static void static void
@ -217,7 +215,7 @@ atpic_isa_attach(device_t dev)
goto fail; goto fail;
error = bus_setup_intr(dev, sc->sc_ires, INTR_TYPE_MISC | INTR_MPSAFE, error = bus_setup_intr(dev, sc->sc_ires, INTR_TYPE_MISC | INTR_MPSAFE,
NULL, atpic_intr, NULL, &sc->sc_icookie); NULL, atpic_intr, dev, &sc->sc_icookie);
if (error) if (error)
goto fail; goto fail;
@ -225,7 +223,6 @@ atpic_isa_attach(device_t dev)
atpic_init(sc, ATPIC_MASTER); atpic_init(sc, ATPIC_MASTER);
powerpc_register_pic(dev, 0x10); powerpc_register_pic(dev, 0x10);
pic8259 = dev;
return (0); return (0);
fail: fail: