diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2008-11-26 12:27:32 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2008-11-26 12:27:32 +0000 |
| commit | 48b54eb9c88c7977b39e6d23df26ba50be6354d1 (patch) | |
| tree | 17b651729b17248b06ea65101a7af1ac636b6aad /sys/arch/amd64/include | |
| parent | e4b262a91442ceb2a758d982ea82b67ec6162eb8 (diff) | |
Change pci_intr_handle_t to be like i386 where it is a struct that stores the
tag and pin. Reduces the differences between the two architectures and I need
it to fix acpiprt(4)-based interrupt routing.
ok toby@, jordan@
Diffstat (limited to 'sys/arch/amd64/include')
| -rw-r--r-- | sys/arch/amd64/include/pci_machdep.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/sys/arch/amd64/include/pci_machdep.h b/sys/arch/amd64/include/pci_machdep.h index e3cd9f94c61..bc4f75c3ca9 100644 --- a/sys/arch/amd64/include/pci_machdep.h +++ b/sys/arch/amd64/include/pci_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pci_machdep.h,v 1.4 2005/10/05 21:48:34 tdeval Exp $ */ +/* $OpenBSD: pci_machdep.h,v 1.5 2008/11/26 12:27:31 kettenis Exp $ */ /* $NetBSD: pci_machdep.h,v 1.1 2003/02/26 21:26:11 fvdl Exp $ */ /* @@ -62,9 +62,13 @@ extern struct x86_bus_dma_tag pci_bus_dma_tag; */ typedef void *pci_chipset_tag_t; typedef union x86_pci_tag_u pcitag_t; -typedef int pci_intr_handle_t; -#define pci_intr_line(ih) ((ih) & 0xff) +typedef struct { + pcitag_t tag; + int line, pin; +} pci_intr_handle_t; + +#define pci_intr_line(ih) ((ih.line) & 0xff) /* * i386-specific PCI variables and functions. |