Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adapt to new sparc bus_space_tag_t world order.

Browse Source
This commit is contained in:
martin 2004-07-10 22:30:29 +00:00
parent 86906dceb8
commit 9d71aa9ed6
1 changed files with 20 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
sys/arch/sparc/sparc/msiiep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: msiiep.c,v 1.21 2004/04/24 15:49:00 kleink Exp $ */
/* $NetBSD: msiiep.c,v 1.22 2004/07/10 22:30:29 martin Exp $ */
/*
* Copyright (c) 2001 Valeriy E. Ushakov
@ -27,7 +27,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: msiiep.c,v 1.21 2004/04/24 15:49:00 kleink Exp $");
__KERNEL_RCSID(0, "$NetBSD: msiiep.c,v 1.22 2004/07/10 22:30:29 martin Exp $");
#include <sys/param.h>
#include <sys/malloc.h>
@ -142,52 +142,8 @@ static paddr_t mspcic_bus_mmap(bus_space_tag_t, bus_addr_t, off_t, int, int);
static void *mspcic_intr_establish(bus_space_tag_t, int, int,
int (*)(void *), void *, void (*)(void));
static struct sparc_bus_space_tag mspcic_io_tag = {
&mspcic_io_cookie, /* cookie */
NULL, /* parent bus tag */
NULL, /* ranges */
0, /* nranges */
mspcic_bus_map, /* bus_space_map */
NULL, /* bus_space_unmap */
NULL, /* bus_space_subregion */
NULL, /* bus_space_barrier */
mspcic_bus_mmap, /* bus_space_mmap */
mspcic_intr_establish, /* bus_intr_establish */
#if __FULL_SPARC_BUS_SPACE
NULL, /* read_1 */
NULL, /* read_2 */
NULL, /* read_4 */
NULL, /* read_8 */
NULL, /* write_1 */
NULL, /* write_2 */
NULL, /* write_4 */
NULL /* write_8 */
#endif
};
static struct sparc_bus_space_tag mspcic_mem_tag = {
&mspcic_mem_cookie, /* cookie */
NULL, /* parent bus tag */
NULL, /* ranges */
0, /* nranges */
mspcic_bus_map, /* bus_space_map */
NULL, /* bus_space_unmap */
NULL, /* bus_space_subregion */
NULL, /* bus_space_barrier */
mspcic_bus_mmap, /* bus_space_mmap */
mspcic_intr_establish /* bus_intr_establish */
#if __FULL_SPARC_BUS_SPACE
NULL, /* read_1 */
NULL, /* read_2 */
NULL, /* read_4 */
NULL, /* read_8 */
NULL, /* write_1 */
NULL, /* write_2 */
NULL, /* write_4 */
NULL /* write_8 */
#endif
};
static struct sparc_bus_space_tag mspcic_io_tag;
static struct sparc_bus_space_tag mspcic_mem_tag;
/*
* DMA tag
@ -350,8 +306,24 @@ mspcic_attach(parent, self, aux)
mspcic_init_maps();
/* init cookies/parents in our statically allocated tags */
mspcic_io_tag = *sc->sc_bustag;
mspcic_io_tag.cookie = &mspcic_io_cookie;
mspcic_io_tag.ranges = NULL;
mspcic_io_tag.nranges = 0;
mspcic_io_tag.sparc_bus_map = mspcic_bus_map;
mspcic_io_tag.sparc_bus_mmap = mspcic_bus_mmap;
mspcic_io_tag.sparc_intr_establish = mspcic_intr_establish;
mspcic_io_tag.parent = sc->sc_bustag;
mspcic_mem_tag = *sc->sc_bustag;
mspcic_mem_tag.cookie = &mspcic_mem_cookie;
mspcic_mem_tag.ranges = NULL;
mspcic_mem_tag.nranges = 0;
mspcic_mem_tag.sparc_bus_map = mspcic_bus_map;
mspcic_mem_tag.sparc_bus_mmap = mspcic_bus_mmap;
mspcic_mem_tag.sparc_intr_establish = mspcic_intr_establish;
mspcic_mem_tag.parent = sc->sc_bustag;
mspcic_dma_tag._cookie = sc;
mspcic_pc_tag.cookie = sc;