diff options
Diffstat (limited to 'sys/arch/sparc64')
-rw-r--r-- | sys/arch/sparc64/dev/pci_machdep.c | 10 | ||||
-rw-r--r-- | sys/arch/sparc64/include/pci_machdep.h | 10 |
2 files changed, 13 insertions, 7 deletions
diff --git a/sys/arch/sparc64/dev/pci_machdep.c b/sys/arch/sparc64/dev/pci_machdep.c index 46c752bcdaf..53e33734932 100644 --- a/sys/arch/sparc64/dev/pci_machdep.c +++ b/sys/arch/sparc64/dev/pci_machdep.c @@ -396,11 +396,12 @@ pci_conf_write(pc, tag, reg, data) * XXX: how does this deal with multiple interrupts for a device? */ int -pci_intr_map(pa, ihp) - struct pci_attach_args *pa; +pci_intr_map(pc, tag, pin, line, ihp) + pci_chipset_tag_t pc; + pcitag_t tag; + int pin, line; pci_intr_handle_t *ihp; { - pcitag_t tag = pa->pa_tag; int interrupts; int len, node = PCITAG_NODE(tag); char devtype[30]; @@ -461,12 +462,13 @@ pci_intr_evcnt(pc, ih) } void * -pci_intr_establish(pc, ih, level, func, arg) +pci_intr_establish(pc, ih, level, func, arg, what) pci_chipset_tag_t pc; pci_intr_handle_t ih; int level; int (*func) __P((void *)); void *arg; + char *what; { void *cookie; struct psycho_pbm *pp = (struct psycho_pbm *)pc->cookie; diff --git a/sys/arch/sparc64/include/pci_machdep.h b/sys/arch/sparc64/include/pci_machdep.h index ff05ac48c50..53980ee6d1e 100644 --- a/sys/arch/sparc64/include/pci_machdep.h +++ b/sys/arch/sparc64/include/pci_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pci_machdep.h,v 1.2 2001/08/20 20:23:52 jason Exp $ */ +/* $OpenBSD: pci_machdep.h,v 1.3 2001/08/22 20:08:55 art Exp $ */ /* $NetBSD: pci_machdep.h,v 1.7 2001/07/20 00:07:14 eeh Exp $ */ /* @@ -85,11 +85,15 @@ pcitag_t pci_make_tag(pci_chipset_tag_t, int, int, int); pcireg_t pci_conf_read(pci_chipset_tag_t, pcitag_t, int); void pci_conf_write(pci_chipset_tag_t, pcitag_t, int, pcireg_t); -int pci_intr_map(struct pci_attach_args *, pci_intr_handle_t *); +int pci_intr_map(pci_chipset_tag_t, pcitag_t, int, int, + pci_intr_handle_t *); const char *pci_intr_string(pci_chipset_tag_t, pci_intr_handle_t); const struct evcnt *pci_intr_evcnt(pci_chipset_tag_t, pci_intr_handle_t); void *pci_intr_establish(pci_chipset_tag_t, pci_intr_handle_t, - int, int (*)(void *), void *); + int, int (*)(void *), void *, char *); void pci_intr_disestablish(pci_chipset_tag_t, void *); +#define pciide_machdep_compat_intr_establish(a, b, c, d, e) (NULL) +#define pciide_machdep_compat_intr_disestablish(a, b) do { } while (0) + #endif /* _MACHINE_PCI_MACHDEP_H_ */ |