[src/trunk]: src/sys/arch Convert stragglers to use real C89 prototypes.

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f8f3daf494f6
branches:  trunk
changeset: 773330:f8f3daf494f6
user:      matt <matt%NetBSD.org@localhost>
date:      Tue Jan 31 04:28:50 2012 +0000

description:
Convert stragglers to use real C89 prototypes.

diffstat:

 sys/arch/arm/arm/cpufunc.c          |  11 +++++------
 sys/arch/arm/omap/omap2_prcm.c      |   6 +++---
 sys/arch/shark/isa/isa_io.c         |  15 +++++----------
 sys/arch/shark/isa/isadma_machdep.c |  20 ++++++--------------
 sys/arch/shark/shark/scr.c          |  24 +++++++++++++-----------
 5 files changed, 32 insertions(+), 44 deletions(-)

diffs (209 lines):

diff -r 082fe4117291 -r f8f3daf494f6 sys/arch/arm/arm/cpufunc.c
--- a/sys/arch/arm/arm/cpufunc.c        Tue Jan 31 04:28:02 2012 +0000
+++ b/sys/arch/arm/arm/cpufunc.c        Tue Jan 31 04:28:50 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpufunc.c,v 1.103 2011/03/10 08:06:27 bsh Exp $        */
+/*     $NetBSD: cpufunc.c,v 1.104 2012/01/31 04:31:37 matt Exp $       */
 
 /*
  * arm7tdmi support code Copyright (c) 2001 John Fremlin
@@ -49,7 +49,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpufunc.c,v 1.103 2011/03/10 08:06:27 bsh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpufunc.c,v 1.104 2012/01/31 04:31:37 matt Exp $");
 
 #include "opt_compat_netbsd.h"
 #include "opt_cpuoptions.h"
@@ -1298,7 +1298,7 @@
 #endif
 
 static void
-get_cachetype_cp15()
+get_cachetype_cp15(void)
 {
        u_int ctype, isize, dsize;
        u_int multiplier;
@@ -2772,8 +2772,7 @@
 };
 
 void
-armv7_setup(args)
-       char *args;
+armv7_setup(char *args)
 {
        int cpuctrl, cpuctrlmask;
 
@@ -2816,7 +2815,7 @@
 
 /* Clean the data cache to the level of coherency. Slow. */
 void
-armv7_dcache_wbinv_all()
+armv7_dcache_wbinv_all(void)
 {
        u_int clidr, loc, level;
 
diff -r 082fe4117291 -r f8f3daf494f6 sys/arch/arm/omap/omap2_prcm.c
--- a/sys/arch/arm/omap/omap2_prcm.c    Tue Jan 31 04:28:02 2012 +0000
+++ b/sys/arch/arm/omap/omap2_prcm.c    Tue Jan 31 04:28:50 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: omap2_prcm.c,v 1.2 2011/07/01 20:30:21 dyoung Exp $    */
+/*     $NetBSD: omap2_prcm.c,v 1.3 2012/01/31 04:31:37 matt Exp $      */
 
 /*-
  * Copyright (c) 2010 Adam Hoka
@@ -28,7 +28,7 @@
 
 #include "opt_omap.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omap2_prcm.c,v 1.2 2011/07/01 20:30:21 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap2_prcm.c,v 1.3 2012/01/31 04:31:37 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -110,7 +110,7 @@
 }
 
 void
-prcm_cold_reset()
+prcm_cold_reset(void)
 {
        uint32_t val;
        
diff -r 082fe4117291 -r f8f3daf494f6 sys/arch/shark/isa/isa_io.c
--- a/sys/arch/shark/isa/isa_io.c       Tue Jan 31 04:28:02 2012 +0000
+++ b/sys/arch/shark/isa/isa_io.c       Tue Jan 31 04:28:50 2012 +0000
@@ -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 @@
 }
 
 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!");
 }
diff -r 082fe4117291 -r f8f3daf494f6 sys/arch/shark/isa/isadma_machdep.c
--- a/sys/arch/shark/isa/isadma_machdep.c       Tue Jan 31 04:28:02 2012 +0000
+++ b/sys/arch/shark/isa/isadma_machdep.c       Tue Jan 31 04:28:50 2012 +0000
@@ -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 @@
  * 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 @@
  * 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;
diff -r 082fe4117291 -r f8f3daf494f6 sys/arch/shark/shark/scr.c
--- a/sys/arch/shark/shark/scr.c        Tue Jan 31 04:28:02 2012 +0000
+++ b/sys/arch/shark/shark/scr.c        Tue Jan 31 04:28:50 2012 +0000
@@ -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 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 @@
 **      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);