diff options
| author | Artur Grabowski <art@cvs.openbsd.org> | 2001-08-25 10:13:31 +0000 |
|---|---|---|
| committer | Artur Grabowski <art@cvs.openbsd.org> | 2001-08-25 10:13:31 +0000 |
| commit | 17f1f0da9189e82c93381a61aace686d52339576 (patch) | |
| tree | d816adac02b9344761cb3843f9fba856c754d419 /sys/arch/alpha | |
| parent | eb53c59ffd7697d190539b5f500a59265109c9a1 (diff) | |
Change pci_intr_map to take pci_attach_args as an argument.
All callers actually took all arguments to pci_intr_map from pci_attach_args
structs, so this simplifies code.
This also allows more complicated interrupt assignment schemes like the one
on sparc64.
This makes sparc64 pci interrupts work.
Inspired by the same change in NetBSD.
Diffstat (limited to 'sys/arch/alpha')
| -rw-r--r-- | sys/arch/alpha/pci/pci_machdep.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/arch/alpha/pci/pci_machdep.h b/sys/arch/alpha/pci/pci_machdep.h index 0bc4c544787..d221276a2bc 100644 --- a/sys/arch/alpha/pci/pci_machdep.h +++ b/sys/arch/alpha/pci/pci_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pci_machdep.h,v 1.15 2001/08/17 22:26:58 mickey Exp $ */ +/* $OpenBSD: pci_machdep.h,v 1.16 2001/08/25 10:13:28 art Exp $ */ /* $NetBSD: pci_machdep.h,v 1.6 1996/11/19 04:49:21 cgd Exp $ */ /* @@ -98,8 +98,9 @@ int alpha_sysctl_chipset(int *, u_int, char *, size_t *); (*(c)->pc_conf_read)((c)->pc_conf_v, (t), (r)) #define pci_conf_write(c, t, r, v) \ (*(c)->pc_conf_write)((c)->pc_conf_v, (t), (r), (v)) -#define pci_intr_map(c, it, ip, il, ihp) \ - (*(c)->pc_intr_map)((c)->pc_intr_v, (it), (ip), (il), (ihp)) +#define pci_intr_map(pa, ihp) \ + (*((pa)->pa_pc)->pc_intr_map)((pa)->pa_pc->pc_intr_v, \ + (pa)->pa_intrtag, (pa)->pa_intrpin, (pa)->pa_intrline, (ihp)) #define pci_intr_string(c, ih) \ (*(c)->pc_intr_string)((c)->pc_intr_v, (ih)) #define pci_intr_line(c, ih) \ |