Module Name: src
Committed By: matt
Date: Tue Jan 31 04:28:50 UTC 2012
Modified Files:
src/sys/arch/shark/isa: isa_io.c isadma_machdep.c
src/sys/arch/shark/shark: scr.c
Log Message:
Convert stragglers to use real C89 prototypes.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/shark/isa/isa_io.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/shark/isa/isadma_machdep.c
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/shark/shark/scr.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/shark/isa/isa_io.c
diff -u src/sys/arch/shark/isa/isa_io.c:1.11 src/sys/arch/shark/isa/isa_io.c:1.12
--- src/sys/arch/shark/isa/isa_io.c:1.11 Tue Jul 19 15:07:43 2011
+++ src/sys/arch/shark/isa/isa_io.c Tue Jan 31 04:28:50 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_io.c,v 1.11 2011/07/19 15:07:43 dyoung Exp $ */
+/* $NetBSD: isa_io.c,v 1.12 2012/01/31 04:28:50 matt Exp $ */
/*
* Copyright 1997
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isa_io.c,v 1.11 2011/07/19 15:07:43 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_io.c,v 1.12 2012/01/31 04:28:50 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -379,14 +379,9 @@ isa_bs_subregion(void *t, bus_space_hand
}
int
-isa_bs_alloc(t, rstart, rend, size, alignment, boundary, cacheable,
- bpap, bshp)
- void *t;
- bus_addr_t rstart, rend;
- bus_size_t size, alignment, boundary;
- int cacheable;
- bus_addr_t *bpap;
- bus_space_handle_t *bshp;
+isa_bs_alloc(void *t, bus_addr_t rstart, bus_addr_t rend, bus_size_t size,
+ bus_size_t alignment, bus_size_t boundary, int cacheable,
+ bus_addr_t *bpap, bus_space_handle_t *bshp)
{
panic("isa_alloc(): Help!");
}
Index: src/sys/arch/shark/isa/isadma_machdep.c
diff -u src/sys/arch/shark/isa/isadma_machdep.c:1.15 src/sys/arch/shark/isa/isadma_machdep.c:1.16
--- src/sys/arch/shark/isa/isadma_machdep.c:1.15 Tue Jul 19 15:07:43 2011
+++ src/sys/arch/shark/isa/isadma_machdep.c Tue Jan 31 04:28:50 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: isadma_machdep.c,v 1.15 2011/07/19 15:07:43 dyoung Exp $ */
+/* $NetBSD: isadma_machdep.c,v 1.16 2012/01/31 04:28:50 matt Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isadma_machdep.c,v 1.15 2011/07/19 15:07:43 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isadma_machdep.c,v 1.16 2012/01/31 04:28:50 matt Exp $");
#define ISA_DMA_STATS
@@ -248,13 +248,8 @@ _isa_bus_dmamap_destroy(bus_dma_tag_t t,
* Load an ISA DMA map with a linear buffer.
*/
int
-_isa_bus_dmamap_load(t, map, buf, buflen, p, flags)
- bus_dma_tag_t t;
- bus_dmamap_t map;
- void *buf;
- bus_size_t buflen;
- struct proc *p;
- int flags;
+_isa_bus_dmamap_load(bus_dma_tag_t t, bus_dmamap_t map, void *buf,
+ bus_size_t buflen, struct proc *p, int flags)
{
struct arm32_isa_dma_cookie *cookie = map->_dm_cookie;
int error;
@@ -319,11 +314,8 @@ _isa_bus_dmamap_load(t, map, buf, buflen
* Like _isa_bus_dmamap_load(), but for mbufs.
*/
int
-_isa_bus_dmamap_load_mbuf(t, map, m0, flags)
- bus_dma_tag_t t;
- bus_dmamap_t map;
- struct mbuf *m0;
- int flags;
+_isa_bus_dmamap_load_mbuf( bus_dma_tag_t t, bus_dmamap_t map, struct mbuf *m0,
+ int flags)
{
struct arm32_isa_dma_cookie *cookie = map->_dm_cookie;
int error;
Index: src/sys/arch/shark/shark/scr.c
diff -u src/sys/arch/shark/shark/scr.c:1.26 src/sys/arch/shark/shark/scr.c:1.27
--- src/sys/arch/shark/shark/scr.c:1.26 Tue Jul 26 08:56:26 2011
+++ src/sys/arch/shark/shark/scr.c Tue Jan 31 04:28:50 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: scr.c,v 1.26 2011/07/26 08:56:26 mrg Exp $ */
+/* $NetBSD: scr.c,v 1.27 2012/01/31 04:28:50 matt Exp $ */
/*
* Copyright 1997
@@ -102,7 +102,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: scr.c,v 1.26 2011/07/26 08:56:26 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scr.c,v 1.27 2012/01/31 04:28:50 matt Exp $");
#include "opt_ddb.h"
@@ -3690,11 +3690,12 @@ static void myHatWedge(int nFIQs)
**--
*/
-static void scrTimeout(ftn, sc, arg, count)
- void (*ftn)(struct scr_softc*,int);
- struct scr_softc* sc;
- int arg;
- register int count;
+static void
+scrTimeout(
+ void (*ftn)(struct scr_softc*,int),
+ struct scr_softc* sc,
+ int arg,
+ int count)
{
register Callout *new, *p, *t;
@@ -3778,10 +3779,11 @@ static void scrTimeout(ftn, sc, arg, cou
** nill
**--
*/
-static void scrUntimeout(ftn, sc, arg)
-void (*ftn)(struct scr_softc*,int);
-struct scr_softc* sc;
-int arg;
+static void
+scrUntimeout(
+ void (*ftn)(struct scr_softc*, int),
+ struct scr_softc* sc,
+ int arg)
{
register Callout *p, *t;
ASSERT(scrClkEnable);
