diff options
| author | Federico G. Schwindt <fgsch@cvs.openbsd.org> | 2008-07-02 03:00:01 +0000 |
|---|---|---|
| committer | Federico G. Schwindt <fgsch@cvs.openbsd.org> | 2008-07-02 03:00:01 +0000 |
| commit | 2bbeb14e7d0899f31acede7fbb290dbc5480da3f (patch) | |
| tree | f39071575f28d23f2b03197ef34e218abb2f48d0 /sys/arch/amd64/include | |
| parent | 51e6641b4d0c8f6d4ba6f5724a6eda1b34251931 (diff) | |
* Dynamically set the rbus start address. from netbsd.
* For amd64, remove pcibios traces.
* make RBUS_IO_START, RBUS_IO_SIZE, RBUS_MIN_START and RBUS_MEM_SIZE
(on i386) configurable via kernel options.
* Remove unneeded headers.
* Some cleanups.
originally reported in pr/5829 and tested by viq <viq at viq dot ath dot cx>.
fixes ian@ laptop too.
kettenis@ and miod@ agrees that although not perfect, this is the right
direction.
Diffstat (limited to 'sys/arch/amd64/include')
| -rw-r--r-- | sys/arch/amd64/include/rbus_machdep.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/sys/arch/amd64/include/rbus_machdep.h b/sys/arch/amd64/include/rbus_machdep.h index 0ab405f539c..f61370b904a 100644 --- a/sys/arch/amd64/include/rbus_machdep.h +++ b/sys/arch/amd64/include/rbus_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: rbus_machdep.h,v 1.3 2007/12/20 13:34:48 kettenis Exp $ */ +/* $OpenBSD: rbus_machdep.h,v 1.4 2008/07/02 03:00:00 fgsch Exp $ */ /* $NetBSD: rbus_machdep.h,v 1.2 1999/10/15 06:43:05 haya Exp $ */ /* @@ -31,9 +31,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - -#if !defined _ARCH_AMD64_AMD64_RBUS_MACHDEP_H_ -#define _ARCH_AMD64_AMD64_RBUS_MACHDEP_H_ +#ifndef _AMD64_RBUS_MACHDEP_H_ +#define _AMD64_RBUS_MACHDEP_H_ struct pci_attach_args; /* XXX */ @@ -43,13 +42,14 @@ struct pci_attach_args; /* XXX */ #define md_space_unmap(bt, bsh, size, adrp) \ _bus_space_unmap((bt), (bsh), (size), (adrp)) +rbus_tag_t rbus_pccbb_parent_io(struct device *, + struct pci_attach_args *); +rbus_tag_t rbus_pccbb_parent_mem(struct device *, + struct pci_attach_args *); -rbus_tag_t rbus_pccbb_parent_io(struct device *self, - struct pci_attach_args *pa); -rbus_tag_t rbus_pccbb_parent_mem(struct device *self, - struct pci_attach_args *pa); +bus_addr_t rbus_min_start_hint(void); -void pccbb_attach_hook(struct device *, struct device *, - struct pci_attach_args *); +void pccbb_attach_hook(struct device *, struct device *, + struct pci_attach_args *); -#endif /* _ARCH_AMD64_AMD64_RBUS_MACHDEP_H_ */ +#endif /* _AMD64_RBUS_MACHDEP_H_ */ |