Sun Mar 15 22:25:46 2009 UTC ()
ansify function definitions


(cegger)
diff -r1.18 -r1.19 src/sys/arch/arm/mainbus/mainbus_io.c
cvs diff -r1.18 -r1.19 src/sys/arch/arm/mainbus/mainbus_io.c (expand / switch to unified diff)

--- src/sys/arch/arm/mainbus/mainbus_io.c 2009/03/14 21:04:05 1.18
+++ src/sys/arch/arm/mainbus/mainbus_io.c 2009/03/15 22:25:46 1.19
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: mainbus_io.c,v 1.18 2009/03/14 21:04:05 dsl Exp $ */ 1/* $NetBSD: mainbus_io.c,v 1.19 2009/03/15 22:25:46 cegger Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 1997 Mark Brinicombe. 4 * Copyright (c) 1997 Mark Brinicombe.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
@@ -27,27 +27,27 @@ @@ -27,27 +27,27 @@
27 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 27 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
28 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 28 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
29 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 29 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
30 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 30 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
31 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 31 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
32 * SUCH DAMAGE. 32 * SUCH DAMAGE.
33 */ 33 */
34 34
35/* 35/*
36 * bus_space I/O functions for mainbus 36 * bus_space I/O functions for mainbus
37 */ 37 */
38 38
39#include <sys/cdefs.h> 39#include <sys/cdefs.h>
40__KERNEL_RCSID(0, "$NetBSD: mainbus_io.c,v 1.18 2009/03/14 21:04:05 dsl Exp $"); 40__KERNEL_RCSID(0, "$NetBSD: mainbus_io.c,v 1.19 2009/03/15 22:25:46 cegger Exp $");
41 41
42#include <sys/param.h> 42#include <sys/param.h>
43#include <sys/systm.h> 43#include <sys/systm.h>
44#include <sys/queue.h> 44#include <sys/queue.h>
45 45
46#include <uvm/uvm.h> 46#include <uvm/uvm.h>
47 47
48#include <machine/bus.h> 48#include <machine/bus.h>
49#include <machine/pmap.h> 49#include <machine/pmap.h>
50 50
51/* Proto types for all the bus_space structure functions */ 51/* Proto types for all the bus_space structure functions */
52 52
53bs_protos(mainbus); 53bs_protos(mainbus);
@@ -162,34 +162,30 @@ mainbus_bs_map(void *t, bus_addr_t bpa,  @@ -162,34 +162,30 @@ mainbus_bs_map(void *t, bus_addr_t bpa,
162 pmap_kenter_pa(va, pa, VM_PROT_READ | VM_PROT_WRITE); 162 pmap_kenter_pa(va, pa, VM_PROT_READ | VM_PROT_WRITE);
163 if ((flags & BUS_SPACE_MAP_CACHEABLE) == 0) { 163 if ((flags & BUS_SPACE_MAP_CACHEABLE) == 0) {
164 pte = vtopte(va); 164 pte = vtopte(va);
165 *pte &= ~L2_S_CACHE_MASK; 165 *pte &= ~L2_S_CACHE_MASK;
166 PTE_SYNC(pte); 166 PTE_SYNC(pte);
167 } 167 }
168 } 168 }
169 pmap_update(pmap_kernel()); 169 pmap_update(pmap_kernel());
170 170
171 return(0); 171 return(0);
172} 172}
173 173
174int 174int
175mainbus_bs_alloc(t, rstart, rend, size, alignment, boundary, cacheable, 175mainbus_bs_alloc(void *t, bus_addr_t rstart, bus_addr_t rend,
176 bpap, bshp) 176 bus_size_t size, bus_size_t alignment, bus_size_t boundary,
177 void *t; 177 int cacheable,
178 bus_addr_t rstart, rend; 178 bus_addr_t *bpap, bus_space_handle_t *bshp)
179 bus_size_t size, alignment, boundary; 
180 int cacheable; 
181 bus_addr_t *bpap; 
182 bus_space_handle_t *bshp; 
183{ 179{
184 panic("mainbus_bs_alloc(): Help!"); 180 panic("mainbus_bs_alloc(): Help!");
185} 181}
186 182
187 183
188void 184void
189mainbus_bs_unmap(void *t, bus_space_handle_t bsh, bus_size_t size) 185mainbus_bs_unmap(void *t, bus_space_handle_t bsh, bus_size_t size)
190{ 186{
191 /* 187 /*
192 * Temporary implementation 188 * Temporary implementation
193 */ 189 */
194} 190}
195 191