Module Name: src
Committed By: tsutsui
Date: Wed Mar 31 13:15:52 UTC 2010
Modified Files:
src/sys/arch/atari/atari: be_bus.c bus.c
Log Message:
ANSIfy, some KNF.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/atari/atari/be_bus.c
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/atari/atari/bus.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/atari/atari/be_bus.c
diff -u src/sys/arch/atari/atari/be_bus.c:1.13 src/sys/arch/atari/atari/be_bus.c:1.14
--- src/sys/arch/atari/atari/be_bus.c:1.13 Wed Mar 18 16:00:10 2009
+++ src/sys/arch/atari/atari/be_bus.c Wed Mar 31 13:15:52 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: be_bus.c,v 1.13 2009/03/18 16:00:10 cegger Exp $ */
+/* $NetBSD: be_bus.c,v 1.14 2010/03/31 13:15:52 tsutsui Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: be_bus.c,v 1.13 2009/03/18 16:00:10 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: be_bus.c,v 1.14 2010/03/31 13:15:52 tsutsui Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -184,7 +184,7 @@
beb_t = storage;
else {
if ((beb_t = malloc(sizeof(*beb_t), M_TEMP, M_NOWAIT)) == NULL)
- return(NULL);
+ return NULL;
}
memset(beb_t, 0, sizeof(*beb_t));
Index: src/sys/arch/atari/atari/bus.c
diff -u src/sys/arch/atari/atari/bus.c:1.51 src/sys/arch/atari/atari/bus.c:1.52
--- src/sys/arch/atari/atari/bus.c:1.51 Wed Mar 18 16:00:10 2009
+++ src/sys/arch/atari/atari/bus.c Wed Mar 31 13:15:52 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: bus.c,v 1.51 2009/03/18 16:00:10 cegger Exp $ */
+/* $NetBSD: bus.c,v 1.52 2010/03/31 13:15:52 tsutsui Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus.c,v 1.51 2009/03/18 16:00:10 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus.c,v 1.52 2010/03/31 13:15:52 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -128,6 +128,7 @@
int
bootm_free(vaddr_t va, u_long size)
{
+
if ((va < bootm_ex->ex_start) || ((va + size) > bootm_ex->ex_end))
return 0; /* Not for us! */
extent_free(bootm_ex, va, size, EX_NOWAIT);
@@ -135,7 +136,8 @@
}
int
-bus_space_map(bus_space_tag_t t, bus_addr_t bpa, bus_size_t size, int flags, bus_space_handle_t *mhp)
+bus_space_map(bus_space_tag_t t, bus_addr_t bpa, bus_size_t size, int flags,
+ bus_space_handle_t *mhp)
{
int error;
@@ -147,21 +149,24 @@
EX_NOWAIT | (iomem_malloc_safe ? EX_MALLOCOK : 0));
if (error)
- return (error);
+ return error;
error = bus_mem_add_mapping(t, bpa, size, flags, mhp);
if (error) {
if (extent_free(iomem_ex, bpa + t->base, size, EX_NOWAIT |
- (iomem_malloc_safe ? EX_MALLOCOK : 0))) {
- printf("bus_space_map: pa 0x%lx, size 0x%lx\n", bpa, size);
- printf("bus_space_map: can't free region\n");
+ (iomem_malloc_safe ? EX_MALLOCOK : 0))) {
+ printf("bus_space_map: pa 0x%lx, size 0x%lx\n",
+ bpa, size);
+ printf("bus_space_map: can't free region\n");
}
}
- return (error);
+ return error;
}
int
-bus_space_alloc(bus_space_tag_t t, bus_addr_t rstart, bus_addr_t rend, bus_size_t size, bus_size_t alignment, bus_size_t boundary, int flags, bus_addr_t *bpap, bus_space_handle_t *bshp)
+bus_space_alloc(bus_space_tag_t t, bus_addr_t rstart, bus_addr_t rend,
+ bus_size_t size, bus_size_t alignment, bus_size_t boundary, int flags,
+ bus_addr_t *bpap, bus_space_handle_t *bshp)
{
u_long bpa;
int error;
@@ -172,8 +177,8 @@
* XXX: Since we manage the whole of memory in a single map,
* this is nonsense for now! Brace it DIAGNOSTIC....
*/
- if ((rstart + t->base) < iomem_ex->ex_start
- || (rend + t->base) > iomem_ex->ex_end)
+ if ((rstart + t->base) < iomem_ex->ex_start ||
+ (rend + t->base) > iomem_ex->ex_end)
panic("bus_space_alloc: bad region start/end");
#endif /* DIAGNOSTIC */
@@ -186,7 +191,7 @@
&bpa);
if (error)
- return (error);
+ return error;
/*
* Map the bus physical address to a kernel virtual address.
@@ -203,11 +208,12 @@
*bpap = bpa;
- return (error);
+ return error;
}
static int
-bus_mem_add_mapping(bus_space_tag_t t, bus_addr_t bpa, bus_size_t size, int flags, bus_space_handle_t *bshp)
+bus_mem_add_mapping(bus_space_tag_t t, bus_addr_t bpa, bus_size_t size,
+ int flags, bus_space_handle_t *bshp)
{
vaddr_t va;
paddr_t pa, endpa;
@@ -227,15 +233,15 @@
*/
va = bootm_alloc(pa, endpa - pa, flags);
if (va == 0)
- return (ENOMEM);
+ return ENOMEM;
*bshp = va + (bpa & PGOFSET);
- return (0);
+ return 0;
}
va = uvm_km_alloc(kernel_map, endpa - pa, 0,
UVM_KMF_VAONLY | UVM_KMF_NOWAIT);
if (va == 0)
- return (ENOMEM);
+ return ENOMEM;
*bshp = va + (bpa & PGOFSET);
@@ -243,12 +249,12 @@
u_int *ptep, npte;
pmap_enter(pmap_kernel(), (vaddr_t)va, pa,
- VM_PROT_READ|VM_PROT_WRITE, PMAP_WIRED);
+ VM_PROT_READ|VM_PROT_WRITE, PMAP_WIRED);
ptep = kvtopte(va);
npte = *ptep & ~PG_CMASK;
- if (!(flags & BUS_SPACE_MAP_CACHEABLE))
+ if ((flags & BUS_SPACE_MAP_CACHEABLE) == 0)
npte |= PG_CI;
else if (mmutype == MMU_68040)
npte |= PG_CCB;
@@ -257,7 +263,7 @@
}
pmap_update(pmap_kernel());
TBIAS();
- return (0);
+ return 0;
}
void
@@ -273,7 +279,7 @@
panic("unmap_iospace: overflow");
#endif
- (void) pmap_extract(pmap_kernel(), va, &bpa);
+ (void)pmap_extract(pmap_kernel(), va, &bpa);
bpa += ((u_long)bsh & PGOFSET);
/*
@@ -289,7 +295,7 @@
* Mark as free in the extent map.
*/
if (extent_free(iomem_ex, bpa, size,
- EX_NOWAIT | (iomem_malloc_safe ? EX_MALLOCOK : 0))) {
+ EX_NOWAIT | (iomem_malloc_safe ? EX_MALLOCOK : 0))) {
printf("bus_space_unmap: pa 0x%lx, size 0x%lx\n", bpa, size);
printf("bus_space_unmap: can't free region\n");
}
@@ -298,18 +304,18 @@
/*
* Get a new handle for a subregion of an already-mapped area of bus space.
*/
-int bus_space_subregion(t, memh, off, sz, mhp)
-bus_space_tag_t t;
-bus_space_handle_t memh;
-bus_size_t off, sz;
-bus_space_handle_t *mhp;
+int
+bus_space_subregion(bus_space_tag_t t, bus_space_handle_t memh,
+ bus_size_t off, bus_size_t sz, bus_space_handle_t *mhp)
{
+
*mhp = memh + off;
return 0;
}
paddr_t
-bus_space_mmap(bus_space_tag_t t, bus_addr_t addr, off_t off, int prot, int flags)
+bus_space_mmap(bus_space_tag_t t, bus_addr_t addr, off_t off, int prot,
+ int flags)
{
/*
@@ -319,7 +325,7 @@
* Note we are called for each "page" in the device that
* the upper layers want to map.
*/
- return (m68k_btop(addr + off));
+ return m68k_btop(addr + off);
}
/*
@@ -327,7 +333,8 @@
* DMA map creation functions.
*/
int
-_bus_dmamap_create(bus_dma_tag_t t, bus_size_t size, int nsegments, bus_size_t maxsegsz, bus_size_t boundary, int flags, bus_dmamap_t *dmamp)
+_bus_dmamap_create(bus_dma_tag_t t, bus_size_t size, int nsegments,
+ bus_size_t maxsegsz, bus_size_t boundary, int flags, bus_dmamap_t *dmamp)
{
struct atari_bus_dmamap *map;
void *mapstore;
@@ -349,7 +356,7 @@
(sizeof(bus_dma_segment_t) * (nsegments - 1));
if ((mapstore = malloc(mapsize, M_DMAMAP,
(flags & BUS_DMA_NOWAIT) ? M_NOWAIT : M_WAITOK)) == NULL)
- return (ENOMEM);
+ return ENOMEM;
memset(mapstore, 0, mapsize);
map = (struct atari_bus_dmamap *)mapstore;
@@ -363,7 +370,7 @@
map->dm_nsegs = 0;
*dmamp = map;
- return (0);
+ return 0;
}
/*
@@ -382,7 +389,8 @@
* be called by bus-specific DMA map load functions.
*/
int
-_bus_dmamap_load(bus_dma_tag_t t, bus_dmamap_t map, void *buf, bus_size_t buflen, struct proc *p, int flags)
+_bus_dmamap_load(bus_dma_tag_t t, bus_dmamap_t map, void *buf,
+ bus_size_t buflen, struct proc *p, int flags)
{
paddr_t lastaddr;
int seg, error;
@@ -396,7 +404,7 @@
KASSERT(map->dm_maxsegsz <= map->_dm_maxmaxsegsz);
if (buflen > map->_dm_size)
- return (EINVAL);
+ return EINVAL;
if (p != NULL) {
vm = p->p_vmspace;
@@ -411,14 +419,15 @@
map->dm_mapsize = buflen;
map->dm_nsegs = seg + 1;
}
- return (error);
+ return error;
}
/*
* Like _bus_dmamap_load(), but for mbufs.
*/
int
-_bus_dmamap_load_mbuf(bus_dma_tag_t t, bus_dmamap_t map, struct mbuf *m0, int flags)
+_bus_dmamap_load_mbuf(bus_dma_tag_t t, bus_dmamap_t map, struct mbuf *m0,
+ int flags)
{
paddr_t lastaddr;
int seg, error, first;
@@ -437,7 +446,7 @@
#endif
if (m0->m_pkthdr.len > map->_dm_size)
- return (EINVAL);
+ return EINVAL;
first = 1;
seg = 0;
@@ -453,14 +462,15 @@
map->dm_mapsize = m0->m_pkthdr.len;
map->dm_nsegs = seg + 1;
}
- return (error);
+ return error;
}
/*
* Like _bus_dmamap_load(), but for uios.
*/
int
-_bus_dmamap_load_uio(bus_dma_tag_t t, bus_dmamap_t map, struct uio *uio, int flags)
+_bus_dmamap_load_uio(bus_dma_tag_t t, bus_dmamap_t map, struct uio *uio,
+ int flags)
{
paddr_t lastaddr;
int seg, i, error, first;
@@ -499,7 +509,7 @@
map->dm_mapsize = uio->uio_resid;
map->dm_nsegs = seg + 1;
}
- return (error);
+ return error;
}
/*
@@ -507,7 +517,8 @@
* bus_dmamem_alloc().
*/
int
-_bus_dmamap_load_raw(bus_dma_tag_t t, bus_dmamap_t map, bus_dma_segment_t *segs, int nsegs, bus_size_t size, int flags)
+_bus_dmamap_load_raw(bus_dma_tag_t t, bus_dmamap_t map,
+ bus_dma_segment_t *segs, int nsegs, bus_size_t size, int flags)
{
panic("bus_dmamap_load_raw: not implemented");
@@ -535,7 +546,8 @@
* by bus-specific DMA map synchronization functions.
*/
void
-_bus_dmamap_sync(bus_dma_tag_t t, bus_dmamap_t map, bus_addr_t off, bus_size_t len, int ops)
+_bus_dmamap_sync(bus_dma_tag_t t, bus_dmamap_t map, bus_addr_t off,
+ bus_size_t len, int ops)
{
#if defined(M68040) || defined(M68060)
int i, pa_off, inc, seglen;
@@ -581,11 +593,13 @@
* by bus-specific DMA memory allocation functions.
*/
int
-bus_dmamem_alloc(bus_dma_tag_t t, bus_size_t size, bus_size_t alignment, bus_size_t boundary, bus_dma_segment_t *segs, int nsegs, int *rsegs, int flags)
+bus_dmamem_alloc(bus_dma_tag_t t, bus_size_t size, bus_size_t alignment,
+ bus_size_t boundary, bus_dma_segment_t *segs, int nsegs, int *rsegs,
+ int flags)
{
- return (bus_dmamem_alloc_range(t, size, alignment, boundary,
- segs, nsegs, rsegs, flags, 0, trunc_page(avail_end)));
+ return bus_dmamem_alloc_range(t, size, alignment, boundary,
+ segs, nsegs, rsegs, flags, 0, trunc_page(avail_end));
}
/*
@@ -623,7 +637,8 @@
* bus-specific DMA memory map functions.
*/
int
-bus_dmamem_map(bus_dma_tag_t t, bus_dma_segment_t *segs, int nsegs, size_t size, void **kvap, int flags)
+bus_dmamem_map(bus_dma_tag_t t, bus_dma_segment_t *segs, int nsegs,
+ size_t size, void **kvap, int flags)
{
vaddr_t va;
bus_addr_t addr, offset;
@@ -638,7 +653,7 @@
va = uvm_km_alloc(kernel_map, size, 0, UVM_KMF_VAONLY | kmflags);
if (va == 0)
- return (ENOMEM);
+ return ENOMEM;
*kvap = (void *)va;
@@ -655,7 +670,7 @@
}
pmap_update(pmap_kernel());
- return (0);
+ return 0;
}
/*
@@ -683,7 +698,8 @@
* bus-specific DMA mmap(2)'ing functions.
*/
paddr_t
-bus_dmamem_mmap(bus_dma_tag_t t, bus_dma_segment_t *segs, int nsegs, off_t off, int prot, int flags)
+bus_dmamem_mmap(bus_dma_tag_t t, bus_dma_segment_t *segs, int nsegs, off_t off,
+ int prot, int flags)
{
int i, offset;
@@ -708,7 +724,7 @@
}
/* Page not found. */
- return (-1);
+ return -1;
}
/**********************************************************************
@@ -722,7 +738,9 @@
* first indicates if this is the first invocation of this function.
*/
static int
-_bus_dmamap_load_buffer(bus_dma_tag_t t, bus_dmamap_t map, void *buf, bus_size_t buflen, struct vmspace *vm, int flags, paddr_t *lastaddrp, int *segp, int first)
+_bus_dmamap_load_buffer(bus_dma_tag_t t, bus_dmamap_t map, void *buf,
+ bus_size_t buflen, struct vmspace *vm, int flags, paddr_t *lastaddrp,
+ int *segp, int first)
{
bus_size_t sgsize;
bus_addr_t curaddr, lastaddr, offset, baddr, bmask;
@@ -795,8 +813,8 @@
* Did we fit?
*/
if (buflen != 0)
- return (EFBIG); /* XXX better return value here? */
- return (0);
+ return EFBIG; /* XXX better return value here? */
+ return 0;
}
/*
@@ -804,16 +822,9 @@
* Called by DMA-safe memory allocation methods.
*/
int
-bus_dmamem_alloc_range(t, size, alignment, boundary, segs, nsegs, rsegs,
- flags, low, high)
- bus_dma_tag_t t;
- bus_size_t size, alignment, boundary;
- bus_dma_segment_t *segs;
- int nsegs;
- int *rsegs;
- int flags;
- paddr_t low;
- paddr_t high;
+bus_dmamem_alloc_range(bus_dma_tag_t t, bus_size_t size, bus_size_t alignment,
+ bus_size_t boundary, bus_dma_segment_t *segs, int nsegs, int *rsegs,
+ int flags, paddr_t low, paddr_t high)
{
paddr_t curaddr, lastaddr;
bus_addr_t offset;
@@ -832,7 +843,7 @@
error = uvm_pglistalloc(size, low, high, alignment, boundary,
&mlist, nsegs, (flags & BUS_DMA_NOWAIT) == 0);
if (error)
- return (error);
+ return error;
/*
* Compute the location, size, and number of segments actually
@@ -866,5 +877,5 @@
*rsegs = curseg + 1;
- return (0);
+ return 0;
}
