Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/sparc64 ANSIfication: u_intN_t -> uintN_t, use ANSI...



details:   https://anonhg.NetBSD.org/src/rev/cf263e88691a
branches:  trunk
changeset: 588198:cf263e88691a
user:      cdi <cdi%NetBSD.org@localhost>
date:      Sat Feb 11 17:57:31 2006 +0000

description:
ANSIfication: u_intN_t -> uintN_t, use ANSI function declarations/definitions
instead of K&R ones.

diffstat:

 sys/arch/sparc64/dev/com_ebus.c              |   17 +-
 sys/arch/sparc64/dev/ebus.c                  |   53 ++----
 sys/arch/sparc64/dev/iommu.c                 |  103 +++---------
 sys/arch/sparc64/dev/iommuvar.h              |   44 ++--
 sys/arch/sparc64/dev/kd.c                    |   53 ++----
 sys/arch/sparc64/dev/lpt_ebus.c              |   17 +-
 sys/arch/sparc64/dev/pci_machdep.c           |   66 ++------
 sys/arch/sparc64/dev/sbus.c                  |  167 ++++++--------------
 sys/arch/sparc64/dev/zs.c                    |   81 +++------
 sys/arch/sparc64/include/bootinfo.h          |    4 +-
 sys/arch/sparc64/include/cpu.h               |   10 +-
 sys/arch/sparc64/include/ctlreg.h            |   64 ++++----
 sys/arch/sparc64/include/netbsd32_machdep.h  |    6 +-
 sys/arch/sparc64/include/pcb.h               |    6 +-
 sys/arch/sparc64/include/pci_machdep.h       |    8 +-
 sys/arch/sparc64/include/pmap.h              |   14 +-
 sys/arch/sparc64/include/pte.h               |   14 +-
 sys/arch/sparc64/include/sparc64.h           |   16 +-
 sys/arch/sparc64/include/svr4_32_machdep.h   |    4 +-
 sys/arch/sparc64/sparc64/autoconf.c          |   88 ++++-------
 sys/arch/sparc64/sparc64/cache.h             |   12 +-
 sys/arch/sparc64/sparc64/clock.c             |   86 +++-------
 sys/arch/sparc64/sparc64/compat_16_machdep.c |   18 +-
 sys/arch/sparc64/sparc64/db_interface.c      |  209 ++++++++------------------
 sys/arch/sparc64/sparc64/db_trace.c          |   65 ++-----
 sys/arch/sparc64/sparc64/emul.c              |   57 ++----
 sys/arch/sparc64/sparc64/in4_cksum.c         |    8 +-
 sys/arch/sparc64/sparc64/intr.c              |   31 +--
 sys/arch/sparc64/sparc64/intreg.h            |    4 +-
 sys/arch/sparc64/sparc64/kgdb_machdep.c      |   18 +-
 sys/arch/sparc64/sparc64/kgdb_stub.c         |   75 +++------
 sys/arch/sparc64/sparc64/locore.s            |    6 +-
 sys/arch/sparc64/sparc64/machdep.c           |  139 ++++++-----------
 sys/arch/sparc64/sparc64/netbsd32_machdep.c  |   85 +++++-----
 sys/arch/sparc64/sparc64/ofw_machdep.c       |   16 +-
 sys/arch/sparc64/sparc64/pmap.c              |   81 ++++------
 sys/arch/sparc64/sparc64/rbus_machdep.c      |   11 +-
 sys/arch/sparc64/sparc64/sunos32_machdep.c   |   47 ++---
 sys/arch/sparc64/sparc64/sunos_machdep.c     |    8 +-
 sys/arch/sparc64/sparc64/svr4_32_machdep.c   |   19 +-
 sys/arch/sparc64/sparc64/svr4_machdep.c      |   18 +-
 sys/arch/sparc64/sparc64/sysioreg.h          |  120 +++++++-------
 sys/arch/sparc64/sparc64/trap.c              |   69 ++-----
 sys/arch/sparc64/sparc64/vm_machdep.c        |   10 +-
 44 files changed, 776 insertions(+), 1271 deletions(-)

diffs (truncated from 4796 to 300 lines):

diff -r 8564bde37792 -r cf263e88691a sys/arch/sparc64/dev/com_ebus.c
--- a/sys/arch/sparc64/dev/com_ebus.c   Sat Feb 11 17:39:36 2006 +0000
+++ b/sys/arch/sparc64/dev/com_ebus.c   Sat Feb 11 17:57:31 2006 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: com_ebus.c,v 1.23 2005/12/11 12:19:09 christos Exp $   */
+/*     $NetBSD: com_ebus.c,v 1.24 2006/02/11 17:57:31 cdi Exp $        */
 
 /*
  * Copyright (c) 1999, 2000 Matthew R. Green
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_ebus.c,v 1.23 2005/12/11 12:19:09 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_ebus.c,v 1.24 2006/02/11 17:57:31 cdi Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -56,8 +56,8 @@
 #include "kbd.h"
 #include "ms.h"
 
-int    com_ebus_match __P((struct device *, struct cfdata *, void *));
-void   com_ebus_attach __P((struct device *, struct device *, void *));
+int    com_ebus_match(struct device *, struct cfdata *, void *);
+void   com_ebus_attach(struct device *, struct device *, void *);
 
 CFATTACH_DECL(com_ebus, sizeof(struct com_softc),
     com_ebus_match, com_ebus_attach, NULL, NULL);
@@ -69,10 +69,7 @@
 };
 
 int
-com_ebus_match(parent, match, aux)
-       struct device *parent;
-       struct cfdata *match;
-       void *aux;
+com_ebus_match(struct device *parent, struct cfdata *match, void *aux)
 {
        struct ebus_attach_args *ea = aux;
        int i;
@@ -97,9 +94,7 @@
 #define BAUD_BASE       (1846200)
 
 void
-com_ebus_attach(parent, self, aux)
-       struct device *parent, *self;
-       void *aux;
+com_ebus_attach(struct device *parent, struct device *self, void *aux)
 {
        struct com_softc *sc = (void *)self;
        struct ebus_attach_args *ea = aux;
diff -r 8564bde37792 -r cf263e88691a sys/arch/sparc64/dev/ebus.c
--- a/sys/arch/sparc64/dev/ebus.c       Sat Feb 11 17:39:36 2006 +0000
+++ b/sys/arch/sparc64/dev/ebus.c       Sat Feb 11 17:57:31 2006 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ebus.c,v 1.48 2005/12/11 12:19:09 christos Exp $       */
+/*     $NetBSD: ebus.c,v 1.49 2006/02/11 17:57:31 cdi Exp $    */
 
 /*
  * Copyright (c) 1999, 2000, 2001 Matthew R. Green
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ebus.c,v 1.48 2005/12/11 12:19:09 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ebus.c,v 1.49 2006/02/11 17:57:31 cdi Exp $");
 
 #include "opt_ddb.h"
 
@@ -98,20 +98,19 @@
        int                             sc_nintmap;
 };
 
-int    ebus_match __P((struct device *, struct cfdata *, void *));
-void   ebus_attach __P((struct device *, struct device *, void *));
+int    ebus_match(struct device *, struct cfdata *, void *);
+void   ebus_attach(struct device *, struct device *, void *);
 
 CFATTACH_DECL(ebus, sizeof(struct ebus_softc),
     ebus_match, ebus_attach, NULL, NULL);
 
-bus_space_tag_t ebus_alloc_bus_tag __P((struct ebus_softc *, int));
+bus_space_tag_t ebus_alloc_bus_tag(struct ebus_softc *, int);
 
-int    ebus_setup_attach_args __P((struct ebus_softc *, int,
-           struct ebus_attach_args *));
-void   ebus_destroy_attach_args __P((struct ebus_attach_args *));
-int    ebus_print __P((void *, const char *));
-void   ebus_find_ino __P((struct ebus_softc *, struct ebus_attach_args *));
-int    ebus_find_node __P((struct pci_attach_args *));
+int    ebus_setup_attach_args(struct ebus_softc *, int,
+           struct ebus_attach_args *);
+void   ebus_destroy_attach_args(struct ebus_attach_args *);
+int    ebus_print(void *, const char *);
+void   ebus_find_ino(struct ebus_softc *, struct ebus_attach_args *);
 
 /*
  * here are our bus space and bus DMA routines.
@@ -123,10 +122,7 @@
                                int (*) __P((void *)), void *, void(*)__P((void))));
 
 int
-ebus_match(parent, match, aux)
-       struct device *parent;
-       struct cfdata *match;
-       void *aux;
+ebus_match(struct device *parent, struct cfdata *match, void *aux)
 {
        struct pci_attach_args *pa = aux;
        char *name;
@@ -166,9 +162,7 @@
  * after the sbus code which does similar things.
  */
 void
-ebus_attach(parent, self, aux)
-       struct device *parent, *self;
-       void *aux;
+ebus_attach(struct device *parent, struct device *self, void *aux)
 {
        struct ebus_softc *sc = (struct ebus_softc *)self;
        struct pci_attach_args *pa = aux;
@@ -247,11 +241,11 @@
        }
 }
 
+int    ebus_setup_attach_args(struct ebus_softc *, int,
+           struct ebus_attach_args *);
 int
-ebus_setup_attach_args(sc, node, ea)
-       struct ebus_softc       *sc;
-       int                     node;
-       struct ebus_attach_args *ea;
+ebus_setup_attach_args(struct ebus_softc *sc, int node,
+       struct ebus_attach_args *ea)
 {
        int     n, rv;
 
@@ -293,8 +287,7 @@
 }
 
 void
-ebus_destroy_attach_args(ea)
-       struct ebus_attach_args *ea;
+ebus_destroy_attach_args(struct ebus_attach_args *ea)
 {
 
        if (ea->ea_name)
@@ -308,9 +301,7 @@
 }
 
 int
-ebus_print(aux, p)
-       void *aux;
-       const char *p;
+ebus_print(void *aux, const char *p)
 {
        struct ebus_attach_args *ea = aux;
        int i;
@@ -337,9 +328,7 @@
  * to give the INO for this interrupt.
  */
 void
-ebus_find_ino(sc, ea)
-       struct ebus_softc *sc;
-       struct ebus_attach_args *ea;
+ebus_find_ino(struct ebus_softc *sc, struct ebus_attach_args *ea)
 {
        u_int32_t hi, lo, intr;
        int i, j, k;
@@ -395,9 +384,7 @@
  * about PCI physical addresses, which also applies to ebus.
  */
 bus_space_tag_t
-ebus_alloc_bus_tag(sc, type)
-       struct ebus_softc *sc;
-       int type;
+ebus_alloc_bus_tag(struct ebus_softc *sc, int type)
 {
        bus_space_tag_t bt;
 
diff -r 8564bde37792 -r cf263e88691a sys/arch/sparc64/dev/iommu.c
--- a/sys/arch/sparc64/dev/iommu.c      Sat Feb 11 17:39:36 2006 +0000
+++ b/sys/arch/sparc64/dev/iommu.c      Sat Feb 11 17:57:31 2006 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: iommu.c,v 1.77 2005/11/24 13:08:34 yamt Exp $  */
+/*     $NetBSD: iommu.c,v 1.78 2006/02/11 17:57:31 cdi Exp $   */
 
 /*
  * Copyright (c) 2001, 2002 Eduardo Horvath
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iommu.c,v 1.77 2005/11/24 13:08:34 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iommu.c,v 1.78 2006/02/11 17:57:31 cdi Exp $");
 
 #include "opt_ddb.h"
 
@@ -72,7 +72,7 @@
                        STRBUFREG(strbuf_pgflush), (v));                \
        } while (0)
 
-static int iommu_strbuf_flush_done __P((struct strbuf_ctl *));
+static int iommu_strbuf_flush_done(struct strbuf_ctl *);
 
 /*
  * initialise the UltraSPARC IOMMU (SBUS or PCI):
@@ -82,11 +82,7 @@
  *     - create a private DVMA map.
  */
 void
-iommu_init(name, is, tsbsize, iovabase)
-       char *name;
-       struct iommu_state *is;
-       int tsbsize;
-       u_int32_t iovabase;
+iommu_init(char *name, struct iommu_state *is, int tsbsize, u_int32_t iovabase)
 {
        psize_t size;
        vaddr_t va;
@@ -196,8 +192,7 @@
  * they aren't there when the STRBUF_EN bit does not remain.
  */
 void
-iommu_reset(is)
-       struct iommu_state *is;
+iommu_reset(struct iommu_state *is)
 {
        int i;
        struct strbuf_ctl *sb;
@@ -239,11 +234,7 @@
  * Here are the iommu control routines.
  */
 void
-iommu_enter(sb, va, pa, flags)
-       struct strbuf_ctl *sb;
-       vaddr_t va;
-       int64_t pa;
-       int flags;
+iommu_enter(struct strbuf_ctl *sb, vaddr_t va, int64_t pa, int flags)
 {
        struct iommu_state *is = sb->sb_is;
        int strbuf = (flags & BUS_DMA_STREAMING);
@@ -283,9 +274,7 @@
  * Find the value of a DVMA address (debug routine).
  */
 paddr_t
-iommu_extract(is, dva)
-       struct iommu_state *is;
-       vaddr_t dva;
+iommu_extract(struct iommu_state *is, vaddr_t dva)
 {
        int64_t tte = 0;
 
@@ -305,10 +294,7 @@
  * XXX: this function needs better internal error checking.
  */
 void
-iommu_remove(is, va, len)
-       struct iommu_state *is;
-       vaddr_t va;
-       size_t len;
+iommu_remove(struct iommu_state *is, vaddr_t va, size_t len)
 {
 
 #ifdef DIAGNOSTIC
@@ -344,8 +330,7 @@
 }
 
 static int
-iommu_strbuf_flush_done(sb)
-       struct strbuf_ctl *sb;
+iommu_strbuf_flush_done(struct strbuf_ctl *sb)
 {
        struct iommu_state *is = sb->sb_is;
        struct timeval cur, flushtimeout;
@@ -414,14 +399,8 @@
  * IOMMU DVMA operations, common to SBUS and PCI.
  */
 int
-iommu_dvmamap_load(t, sb, map, buf, buflen, p, flags)
-       bus_dma_tag_t t;
-       struct strbuf_ctl *sb;
-       bus_dmamap_t map;
-       void *buf;
-       bus_size_t buflen;
-       struct proc *p;
-       int flags;
+iommu_dvmamap_load(bus_dma_tag_t t, struct strbuf_ctl *sb, bus_dmamap_t map,
+       void *buf, bus_size_t buflen, struct proc *p, int flags)
 {
        struct iommu_state *is = sb->sb_is;
        int s;
@@ -589,10 +568,7 @@
 
 
 void
-iommu_dvmamap_unload(t, sb, map)
-       bus_dma_tag_t t;



Home | Main Index | Thread Index | Old Index