diff options
Diffstat (limited to 'sys/arch/i386/pci')
| -rw-r--r-- | sys/arch/i386/pci/pci_machdep.c | 13 | ||||
| -rw-r--r-- | sys/arch/i386/pci/pci_machdep.h | 13 |
2 files changed, 11 insertions, 15 deletions
diff --git a/sys/arch/i386/pci/pci_machdep.c b/sys/arch/i386/pci/pci_machdep.c index de242832c0a..df9d24054b8 100644 --- a/sys/arch/i386/pci/pci_machdep.c +++ b/sys/arch/i386/pci/pci_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pci_machdep.c,v 1.18 2001/01/27 04:59:40 mickey Exp $ */ +/* $OpenBSD: pci_machdep.c,v 1.19 2001/08/25 10:13:29 art Exp $ */ /* $NetBSD: pci_machdep.c,v 1.28 1997/06/06 23:29:17 thorpej Exp $ */ /*- @@ -405,12 +405,15 @@ not1: } int -pci_intr_map(pc, intrtag, pin, line, ihp) - pci_chipset_tag_t pc; - pcitag_t intrtag; - int pin, line; +pci_intr_map(pa, ihp) + struct pci_attach_args *pa; pci_intr_handle_t *ihp; { + pci_chipset_tag_t pc = pa->pa_pc; + pcitag_t intrtag = pa->pa_intrtag; + int pin = pa->pa_intrpin; + int line = pa->pa_intrline; + if (pin == 0) { /* No IRQ used. */ goto bad; diff --git a/sys/arch/i386/pci/pci_machdep.h b/sys/arch/i386/pci/pci_machdep.h index 64adaecff05..911dc7f897a 100644 --- a/sys/arch/i386/pci/pci_machdep.h +++ b/sys/arch/i386/pci/pci_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pci_machdep.h,v 1.8 2001/08/17 22:26:58 mickey Exp $ */ +/* $OpenBSD: pci_machdep.h,v 1.9 2001/08/25 10:13:29 art Exp $ */ /* $NetBSD: pci_machdep.h,v 1.7 1997/06/06 23:29:18 thorpej Exp $ */ /* @@ -87,7 +87,8 @@ pcitag_t pci_make_tag __P((pci_chipset_tag_t, int, int, int)); pcireg_t pci_conf_read __P((pci_chipset_tag_t, pcitag_t, int)); void pci_conf_write __P((pci_chipset_tag_t, pcitag_t, int, pcireg_t)); -int pci_intr_map __P((pci_chipset_tag_t, pcitag_t, int, int, +struct pci_attach_args; +int pci_intr_map __P((struct pci_attach_args *, pci_intr_handle_t *)); #define pci_intr_line(ih) ((ih).line) const char *pci_intr_string __P((pci_chipset_tag_t, pci_intr_handle_t)); @@ -98,14 +99,6 @@ void pci_decompose_tag __P((pci_chipset_tag_t, pcitag_t, int *, int *, int *)); /* - * Compatibility functions, to map the old i386 PCI functions to the new ones. - * NOT TO BE USED BY NEW CODE. - */ -void *pci_map_int __P((pcitag_t, int, int (*)(void *), void *)); -int pci_map_io __P((pcitag_t, int, int *)); -int pci_map_mem __P((pcitag_t, int, vm_offset_t *, vm_offset_t *)); - -/* * Section 6.2.4, `Miscellaneous Functions' of the PIC Specification, * says that 255 means `unknown' or `no connection' to the interrupt * controller on a PC. |