diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1996-12-08 00:21:01 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1996-12-08 00:21:01 +0000 |
| commit | a92da5c62c369c891657c866ae655e835e619b1b (patch) | |
| tree | dc969867b8b6715fb4be99f7ce144cfaec2f5d7c /sys/arch/alpha/pci/ciavar.h | |
| parent | a67276bead2aa835bc93c17180c2109635ba693c (diff) | |
Merge to NetBSD 961107, i.e. mostly new bus.h
Diffstat (limited to 'sys/arch/alpha/pci/ciavar.h')
| -rw-r--r-- | sys/arch/alpha/pci/ciavar.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/arch/alpha/pci/ciavar.h b/sys/arch/alpha/pci/ciavar.h index a0b5e82be37..37ae618659d 100644 --- a/sys/arch/alpha/pci/ciavar.h +++ b/sys/arch/alpha/pci/ciavar.h @@ -1,5 +1,5 @@ -/* $OpenBSD: ciavar.h,v 1.4 1996/10/30 22:39:58 niklas Exp $ */ -/* $NetBSD: ciavar.h,v 1.4 1996/06/10 00:03:59 cgd Exp $ */ +/* $OpenBSD: ciavar.h,v 1.5 1996/12/08 00:20:37 niklas Exp $ */ +/* $NetBSD: ciavar.h,v 1.5 1996/10/23 04:12:24 cgd Exp $ */ /* * Copyright (c) 1995, 1996 Carnegie-Mellon University. @@ -38,7 +38,7 @@ * do their dirty work (and more!). */ struct cia_config { - struct alpha_bus_chipset cc_bc; + bus_space_tag_t cc_iot, cc_memt; struct alpha_pci_chipset cc_pc; u_int32_t cc_hae_mem; @@ -55,5 +55,5 @@ struct cia_softc { void cia_init __P((struct cia_config *)); void cia_pci_init __P((pci_chipset_tag_t, void *)); -void cia_bus_mem_init __P((bus_chipset_tag_t bc, void *memv)); -void cia_bus_io_init __P((bus_chipset_tag_t bc, void *iov)); +bus_space_tag_t cia_bus_io_init __P((void *iov)); +bus_space_tag_t cia_bus_mem_init __P((void *memv)); |