Source-Changes-HG archive

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

[src/trunk]: src/sys/arch/hp700/dev de-__P, remove register, ansify.



details:   https://anonhg.NetBSD.org/src/rev/1ea7e0968488
branches:  trunk
changeset: 555619:1ea7e0968488
user:      chs <chs%NetBSD.org@localhost>
date:      Sun Nov 23 17:09:29 2003 +0000

description:
de-__P, remove register, ansify.

diffstat:

 sys/arch/hp700/dev/asp.c      |   28 +++------
 sys/arch/hp700/dev/clock.c    |   19 ++---
 sys/arch/hp700/dev/cpu.c      |   22 ++-----
 sys/arch/hp700/dev/lasi.c     |   26 +++-----
 sys/arch/hp700/dev/mem.c      |   52 +++++++-----------
 sys/arch/hp700/dev/mongoose.c |  114 ++++++++++++++++++++--------------------
 sys/arch/hp700/dev/pdc.c      |  117 ++++++++++++-----------------------------
 sys/arch/hp700/dev/sti_sgc.c  |   19 ++----
 sys/arch/hp700/dev/viper.h    |    6 +-
 sys/arch/hp700/dev/wax.c      |   18 ++----
 10 files changed, 166 insertions(+), 255 deletions(-)

diffs (truncated from 1044 to 300 lines):

diff -r 6e48bbc2fb4b -r 1ea7e0968488 sys/arch/hp700/dev/asp.c
--- a/sys/arch/hp700/dev/asp.c  Sun Nov 23 15:55:03 2003 +0000
+++ b/sys/arch/hp700/dev/asp.c  Sun Nov 23 17:09:29 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: asp.c,v 1.6 2003/07/15 02:29:24 lukem Exp $    */
+/*     $NetBSD: asp.c,v 1.7 2003/11/23 17:09:29 chs Exp $      */
 
 /*     $OpenBSD: asp.c,v 1.5 2000/02/09 05:04:22 mickey Exp $  */
 
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: asp.c,v 1.6 2003/07/15 02:29:24 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: asp.c,v 1.7 2003/11/23 17:09:29 chs Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -135,8 +135,8 @@
        volatile struct asp_trs *sc_trs;
 };
 
-int    aspmatch __P((struct device *, struct cfdata *, void *));
-void   aspattach __P((struct device *, struct device *, void *));
+int    aspmatch(struct device *, struct cfdata *, void *);
+void   aspattach(struct device *, struct device *, void *);
 
 CFATTACH_DECL(asp, sizeof(struct asp_softc),
     aspmatch, aspattach, NULL, NULL);
@@ -144,7 +144,7 @@
 /*
  * Before a module is matched, this fixes up its gsc_attach_args.
  */
-static void asp_fix_args __P((void *, struct gsc_attach_args *)); 
+static void asp_fix_args(void *, struct gsc_attach_args *);
 static void
 asp_fix_args(void *_sc, struct gsc_attach_args *ga)
 {
@@ -167,10 +167,7 @@
 }      
 
 int
-aspmatch(parent, cf, aux)   
-       struct device *parent;
-       struct cfdata *cf;
-       void *aux;
+aspmatch(struct device *parent, struct cfdata *cf, void *aux)
 {
        struct confargs *ca = aux;
 
@@ -192,17 +189,14 @@
 }
 
 void
-aspattach(parent, self, aux)
-       struct device *parent;
-       struct device *self;
-       void *aux;
+aspattach(struct device *parent, struct device *self, void *aux)
 {
-       register struct confargs *ca = aux;
-       register struct asp_softc *sc = (struct asp_softc *)self;
+       struct confargs *ca = aux;
+       struct asp_softc *sc = (struct asp_softc *)self;
        struct gsc_attach_args ga;
        bus_space_handle_t ioh;
-       register u_int32_t irr;
-       register int s;
+       uint32_t irr;
+       int s;
 
        /*
         * Map the ASP interrupt registers.
diff -r 6e48bbc2fb4b -r 1ea7e0968488 sys/arch/hp700/dev/clock.c
--- a/sys/arch/hp700/dev/clock.c        Sun Nov 23 15:55:03 2003 +0000
+++ b/sys/arch/hp700/dev/clock.c        Sun Nov 23 17:09:29 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: clock.c,v 1.2 2003/07/15 02:29:24 lukem Exp $  */
+/*     $NetBSD: clock.c,v 1.3 2003/11/23 17:09:29 chs Exp $    */
 
 /*     $OpenBSD: clock.c,v 1.10 2001/08/31 03:13:42 mickey Exp $       */
 
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.2 2003/07/15 02:29:24 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.3 2003/11/23 17:09:29 chs Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -60,12 +60,12 @@
 
 volatile struct timeval time;
 
-void startrtclock __P((void));
+void startrtclock(void);
 
 static struct pdc_tod tod PDC_ALIGNMENT;
 
 void
-cpu_initclocks()
+cpu_initclocks(void)
 {
        extern u_int cpu_hzticks;
        u_int time_inval;
@@ -76,8 +76,7 @@
 }
 
 int
-clock_intr (v)
-       void *v;
+clock_intr(void *v)
 {
        struct clockframe *frame = v;
 
@@ -103,8 +102,7 @@
  * initialize the system time from the time of day clock
  */
 void
-inittodr(t)
-       time_t t;
+inittodr(time_t t)
 {
        int     tbad = 0;
        int pagezero_cookie;
@@ -141,7 +139,7 @@
  * reset the time of day clock to the value in time
  */
 void
-resettodr()
+resettodr(void)
 {
        int pagezero_cookie;
 
@@ -154,8 +152,7 @@
 }
 
 void
-setstatclockrate(newhz)
-       int newhz;
+setstatclockrate(int newhz)
 {
        /* nothing we can do */
 }
diff -r 6e48bbc2fb4b -r 1ea7e0968488 sys/arch/hp700/dev/cpu.c
--- a/sys/arch/hp700/dev/cpu.c  Sun Nov 23 15:55:03 2003 +0000
+++ b/sys/arch/hp700/dev/cpu.c  Sun Nov 23 17:09:29 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.c,v 1.6 2003/07/15 02:29:24 lukem Exp $    */
+/*     $NetBSD: cpu.c,v 1.7 2003/11/23 17:09:29 chs Exp $      */
 
 /*     $OpenBSD: cpu.c,v 1.8 2000/08/15 20:38:24 mickey Exp $  */
 
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.6 2003/07/15 02:29:24 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.7 2003/11/23 17:09:29 chs Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -56,17 +56,14 @@
        void *sc_ih;
 };
 
-int    cpumatch __P((struct device *, struct cfdata *, void *));
-void   cpuattach __P((struct device *, struct device *, void *));
+int    cpumatch(struct device *, struct cfdata *, void *);
+void   cpuattach(struct device *, struct device *, void *);
 
 CFATTACH_DECL(cpu, sizeof(struct cpu_softc),
     cpumatch, cpuattach, NULL, NULL);
 
 int
-cpumatch(parent, cf, aux)   
-       struct device *parent;
-       struct cfdata *cf;
-       void *aux;
+cpumatch(struct device *parent, struct cfdata *cf, void *aux)
 {
        struct confargs *ca = aux;
 
@@ -81,10 +78,7 @@
 }
 
 void
-cpuattach(parent, self, aux)
-       struct device *parent;
-       struct device *self;
-       void *aux;
+cpuattach(struct device *parent, struct device *self, void *aux)
 {
        /* machdep.c */
        extern struct pdc_cache pdc_cache;
@@ -92,8 +86,8 @@
        extern struct pdc_model pdc_model;
        extern u_int cpu_ticksnum, cpu_ticksdenom;
 
-       register struct cpu_softc *sc = (struct cpu_softc *)self;
-       register struct confargs *ca = aux;
+       struct cpu_softc *sc = (struct cpu_softc *)self;
+       struct confargs *ca = aux;
        char c;
        const char lvls[4][4] = { "0", "1", "1.5", "2" };
        u_int mhz = 100 * cpu_ticksnum / cpu_ticksdenom;
diff -r 6e48bbc2fb4b -r 1ea7e0968488 sys/arch/hp700/dev/lasi.c
--- a/sys/arch/hp700/dev/lasi.c Sun Nov 23 15:55:03 2003 +0000
+++ b/sys/arch/hp700/dev/lasi.c Sun Nov 23 17:09:29 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: lasi.c,v 1.7 2003/11/18 04:04:42 chs Exp $     */
+/*     $NetBSD: lasi.c,v 1.8 2003/11/23 17:09:29 chs Exp $     */
 
 /*     $OpenBSD: lasi.c,v 1.4 2001/06/09 03:57:19 mickey Exp $ */
 
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lasi.c,v 1.7 2003/11/18 04:04:42 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lasi.c,v 1.8 2003/11/23 17:09:29 chs Exp $");
 
 #undef LASIDEBUG
 
@@ -79,8 +79,8 @@
        struct lasi_trs volatile *sc_trs;
 };
 
-int    lasimatch __P((struct device *, struct cfdata *, void *));
-void   lasiattach __P((struct device *, struct device *, void *));
+int    lasimatch(struct device *, struct cfdata *, void *);
+void   lasiattach(struct device *, struct device *, void *);
 
 CFATTACH_DECL(lasi_mainbus, sizeof(struct lasi_softc),
     lasimatch, lasiattach, NULL, NULL);
@@ -91,7 +91,7 @@
 /*
  * Before a module is matched, this fixes up its gsc_attach_args.
  */
-static void lasi_fix_args __P((void *, struct gsc_attach_args *));
+static void lasi_fix_args(void *, struct gsc_attach_args *);
 static void
 lasi_fix_args(void *_sc, struct gsc_attach_args *ga)
 {
@@ -128,12 +128,9 @@
 }
 
 int
-lasimatch(parent, cf, aux)   
-       struct device *parent;
-       struct cfdata *cf;
-       void *aux;
+lasimatch(struct device *parent, struct cfdata *cf, void *aux)
 {
-       register struct confargs *ca = aux;
+       struct confargs *ca = aux;
 
        if (ca->ca_type.iodc_type != HPPA_TYPE_BHA ||
            ca->ca_type.iodc_sv_model != HPPA_BHA_LASI)
@@ -153,13 +150,10 @@
 }
 
 void
-lasiattach(parent, self, aux)
-       struct device *parent;
-       struct device *self;
-       void *aux;
+lasiattach(struct device *parent, struct device *self, void *aux)
 {
-       register struct confargs *ca = aux;
-       register struct lasi_softc *sc = (struct lasi_softc *)self;
+       struct confargs *ca = aux;
+       struct lasi_softc *sc = (struct lasi_softc *)self;
        struct gsc_attach_args ga;
        bus_space_handle_t ioh;
        int s, in;
diff -r 6e48bbc2fb4b -r 1ea7e0968488 sys/arch/hp700/dev/mem.c
--- a/sys/arch/hp700/dev/mem.c  Sun Nov 23 15:55:03 2003 +0000
+++ b/sys/arch/hp700/dev/mem.c  Sun Nov 23 17:09:29 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mem.c,v 1.8 2003/11/18 04:04:42 chs Exp $      */
+/*     $NetBSD: mem.c,v 1.9 2003/11/23 17:09:29 chs Exp $      */
 
 /*     $OpenBSD: mem.c,v 1.5 2001/05/05 20:56:36 art Exp $     */
 
@@ -78,7 +78,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mem.c,v 1.8 2003/11/18 04:04:42 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mem.c,v 1.9 2003/11/23 17:09:29 chs Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -150,8 +150,8 @@
        volatile struct l2_mioc *sc_l2;
 };
 
-int    memmatch __P((struct device *, struct cfdata *, void *));



Home | Main Index | Thread Index | Old Index