diff --git a/sys/arch/sgimips/include/bus.h b/sys/arch/sgimips/include/bus.h index ecb542368b80..c149736d6743 100644 --- a/sys/arch/sgimips/include/bus.h +++ b/sys/arch/sgimips/include/bus.h @@ -1,4 +1,4 @@ -/* $NetBSD: bus.h,v 1.12 2004/01/13 05:47:09 sekiya Exp $ */ +/* $NetBSD: bus.h,v 1.13 2004/01/13 12:57:24 sekiya Exp $ */ /* * Copyright (c) 1996, 1997, 1998, 2001 The NetBSD Foundation, Inc. @@ -70,6 +70,10 @@ typedef u_long bus_space_handle_t; #define SGIMIPS_BUS_SPACE_IO 4 #define SGIMIPS_BUS_SPACE_CRIME 5 +/* Initialization for bus_dmamap_sync, which differs from MIPS1 to MIPS3 */ + +void sgimips_bus_dma_init(void); + /* * int bus_space_map(bus_space_tag_t t, bus_addr_t addr, * bus_size_t size, int flags, bus_space_handle_t *bshp); @@ -616,7 +620,6 @@ struct sgimips_bus_dmamap { }; #ifdef _SGIMIPS_BUS_DMA_PRIVATE -void sgimips_bus_dma_init(void); int _bus_dmamap_create(bus_dma_tag_t, bus_size_t, int, bus_size_t, bus_size_t, int, bus_dmamap_t *); diff --git a/sys/arch/sgimips/sgimips/machdep.c b/sys/arch/sgimips/sgimips/machdep.c index 7329499013df..678e8be0027d 100644 --- a/sys/arch/sgimips/sgimips/machdep.c +++ b/sys/arch/sgimips/sgimips/machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.73 2004/01/13 05:51:07 sekiya Exp $ */ +/* $NetBSD: machdep.c,v 1.74 2004/01/13 12:57:24 sekiya Exp $ */ /* * Copyright (c) 2000 Soren S. Jorvang @@ -34,7 +34,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.73 2004/01/13 05:51:07 sekiya Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.74 2004/01/13 12:57:24 sekiya Exp $"); #include "opt_ddb.h" #include "opt_kgdb.h" @@ -75,6 +75,7 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.73 2004/01/13 05:51:07 sekiya Exp $"); #include #include #include +#include #include #include @@ -524,6 +525,11 @@ mach_init(argc, argv, magic, btinfo) /* We can now no longer use bootinfo. */ bootinfo = NULL; + /* + * Initialize mips version-dependent DMA handlers. + */ + sgimips_bus_dma_init(); + /* * Walk the component tree and count the number of CPUs * present in the system.