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

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

details:   https://anonhg.NetBSD.org/src/rev/23ad0b539af5
branches:  trunk
changeset: 555520:23ad0b539af5
user:      chs <chs%NetBSD.org@localhost>
date:      Thu Nov 20 03:58:47 2003 +0000

description:
de-__P, remove register, ansify.

diffstat:

 sys/arch/hp700/gsc/com_gsc.c    |   25 +++-----
 sys/arch/hp700/gsc/fdc_gsc.c    |   20 +++----
 sys/arch/hp700/gsc/gscbus.c     |   29 ++++------
 sys/arch/hp700/gsc/gscbusvar.h  |    7 +-
 sys/arch/hp700/gsc/if_ie_gsc.c  |  104 +++++++++++++++-------------------------
 sys/arch/hp700/gsc/lpt_gsc.c    |   35 +++++--------
 sys/arch/hp700/gsc/oosiop_gsc.c |   16 +----
 sys/arch/hp700/gsc/osiop_gsc.c  |   20 ++-----
 sys/arch/hp700/gsc/siop_gsc.c   |   24 +++-----
 9 files changed, 106 insertions(+), 174 deletions(-)

diffs (truncated from 704 to 300 lines):

diff -r 1aac0ce07426 -r 23ad0b539af5 sys/arch/hp700/gsc/com_gsc.c
--- a/sys/arch/hp700/gsc/com_gsc.c      Thu Nov 20 03:31:02 2003 +0000
+++ b/sys/arch/hp700/gsc/com_gsc.c      Thu Nov 20 03:58:47 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: com_gsc.c,v 1.7 2003/07/15 02:29:25 lukem Exp $        */
+/*     $NetBSD: com_gsc.c,v 1.8 2003/11/20 03:58:47 chs Exp $  */
 
 /*     $OpenBSD: com_gsc.c,v 1.8 2000/03/13 14:39:59 mickey Exp $      */
 
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_gsc.c,v 1.7 2003/07/15 02:29:25 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_gsc.c,v 1.8 2003/11/20 03:58:47 chs Exp $");
 
 #include "opt_kgdb.h"
 
@@ -71,19 +71,16 @@
        void    *sc_ih;                 /* interrupt handler */
 }; 
 
-int    com_gsc_probe __P((struct device *, struct cfdata *, void *));
-void   com_gsc_attach __P((struct device *, struct device *, void *));
+int    com_gsc_probe(struct device *, struct cfdata *, void *);
+void   com_gsc_attach(struct device *, struct device *, void *);
 
 CFATTACH_DECL(com_gsc, sizeof(struct com_gsc_softc),
     com_gsc_probe, com_gsc_attach, NULL, NULL);
 
 int
-com_gsc_probe(parent, match, aux)
-       struct device *parent;
-       struct cfdata *match;
-       void *aux;
+com_gsc_probe(struct device *parent, struct cfdata *match, void *aux)
 {
-       register struct gsc_attach_args *ga = aux;
+       struct gsc_attach_args *ga = aux;
        bus_space_handle_t ioh;
        int rv;
 
@@ -129,13 +126,11 @@
 }
 
 void
-com_gsc_attach(parent, self, aux)
-       struct device *parent, *self;
-       void *aux;
+com_gsc_attach(struct device *parent, struct device *self, void *aux)
 {
-       register struct com_gsc_softc *gsc = (void *)self;
+       struct com_gsc_softc *gsc = (void *)self;
        struct com_softc *sc = &gsc->sc_com;
-       register struct gsc_attach_args *ga = aux;
+       struct gsc_attach_args *ga = aux;
 
        sc->sc_hwflags = 0;
        sc->sc_swflags = 0;
@@ -162,7 +157,7 @@
 }
 
 #ifdef KGDB
-int com_gsc_kgdb_attach __P((void));
+int com_gsc_kgdb_attach(void);
 int
 com_gsc_kgdb_attach(void)
 {
diff -r 1aac0ce07426 -r 23ad0b539af5 sys/arch/hp700/gsc/fdc_gsc.c
--- a/sys/arch/hp700/gsc/fdc_gsc.c      Thu Nov 20 03:31:02 2003 +0000
+++ b/sys/arch/hp700/gsc/fdc_gsc.c      Thu Nov 20 03:58:47 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fdc_gsc.c,v 1.4 2003/07/15 02:29:25 lukem Exp $        */
+/*     $NetBSD: fdc_gsc.c,v 1.5 2003/11/20 03:58:47 chs Exp $  */
 
 /*     $OpenBSD: fdc_gsc.c,v 1.1 1998/09/30 04:45:46 mickey Exp $      */
 
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdc_gsc.c,v 1.4 2003/07/15 02:29:25 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdc_gsc.c,v 1.5 2003/11/20 03:58:47 chs Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -50,18 +50,16 @@
 #include <hp700/dev/cpudevs.h>
 
 /* controller driver configuration */
-int fdc_gsc_probe __P((struct device *, void *, void *));
-void fdc_gsc_attach __P((struct device *, struct device *, void *));
+int fdc_gsc_probe(struct device *, void *, void *);
+void fdc_gsc_attach(struct device *, struct device *, void *);
 
 CFATTACH_DECL(fdc_gsc, sizeof(struct fdc_softc),
     fdc_gsc_probe, fdc_gsc_attach, NULL, NULL);
 
 int
-fdc_gsc_probe(parent, match, aux)
-       struct device *parent;
-       void *match, *aux;
+fdc_gsc_probe(struct device *parent, void *match, void *aux)
 {
-       register struct confargs *ca = aux;
+       struct confargs *ca = aux;
        bus_space_handle_t ioh;
        int rv;
 
@@ -79,13 +77,11 @@
 }
 
 void
-fdc_gsc_attach(parent, self, aux)
-       struct device *parent, *self;
-       void *aux;
+fdc_gsc_attach(struct device *parent, struct device *self, void *aux)
 {
        struct fdc_softc *sc = (void *)self;
        bus_space_handle_t ioh;
-       register struct confargs *ca = aux;
+       struct confargs *ca = aux;
 
        /* Re-map the I/O space. */
        if (bus_space_map(ca->ca_iot, ca->ca_hpa, IOMOD_HPASIZE, 0, &ioh))
diff -r 1aac0ce07426 -r 23ad0b539af5 sys/arch/hp700/gsc/gscbus.c
--- a/sys/arch/hp700/gsc/gscbus.c       Thu Nov 20 03:31:02 2003 +0000
+++ b/sys/arch/hp700/gsc/gscbus.c       Thu Nov 20 03:58:47 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: gscbus.c,v 1.8 2003/11/18 04:04:42 chs Exp $   */
+/*     $NetBSD: gscbus.c,v 1.9 2003/11/20 03:58:47 chs Exp $   */
 
 /*     $OpenBSD: gscbus.c,v 1.13 2001/08/01 20:32:04 miod Exp $        */
 
@@ -72,7 +72,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gscbus.c,v 1.8 2003/11/18 04:04:42 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gscbus.c,v 1.9 2003/11/20 03:58:47 chs Exp $");
 
 #define GSCDEBUG
 
@@ -93,8 +93,8 @@
 #include <hp700/gsc/gscbusvar.h>
 #include <hp700/hp700/machdep.h>
 
-int    gscmatch __P((struct device *, struct cfdata *, void *));
-void   gscattach __P((struct device *, struct device *, void *));
+int    gscmatch(struct device *, struct cfdata *, void *);
+void   gscattach(struct device *, struct device *, void *);
 
 struct gsc_softc {
        struct device sc_dev;
@@ -111,7 +111,7 @@
  * to fix up the module's attach arguments, then we match
  * and attach it.
  */
-static void gsc_module_callback __P((struct device *, struct confargs *));
+static void gsc_module_callback(struct device *, struct confargs *);
 static void
 gsc_module_callback(struct device *self, struct confargs *ca)
 {
@@ -129,10 +129,7 @@
 }
 
 int
-gscmatch(parent, cf, aux)   
-       struct device *parent;
-       struct cfdata *cf;
-       void *aux;
+gscmatch(struct device *parent, struct cfdata *cf, void *aux)
 {
        struct gsc_attach_args *ga = aux;
 
@@ -140,13 +137,10 @@
 }
 
 void
-gscattach(parent, self, aux)
-       struct device *parent;
-       struct device *self;
-       void *aux;
+gscattach(struct device *parent, struct device *self, void *aux)
 {
-       register struct gsc_softc *sc = (struct gsc_softc *)self;
-       register struct gsc_attach_args *ga = aux;
+       struct gsc_softc *sc = (struct gsc_softc *)self;
+       struct gsc_attach_args *ga = aux;
 
        sc->sc_ga = *ga;
 
@@ -165,9 +159,8 @@
 }
 
 int
-gscprint(aux, pnp)
-       void *aux;
-       const char *pnp;
+gscprint(void *aux, const char *pnp)
 {
+
        return (UNCONF);
 }
diff -r 1aac0ce07426 -r 23ad0b539af5 sys/arch/hp700/gsc/gscbusvar.h
--- a/sys/arch/hp700/gsc/gscbusvar.h    Thu Nov 20 03:31:02 2003 +0000
+++ b/sys/arch/hp700/gsc/gscbusvar.h    Thu Nov 20 03:58:47 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: gscbusvar.h,v 1.3 2002/08/25 20:20:00 fredette Exp $   */
+/*     $NetBSD: gscbusvar.h,v 1.4 2003/11/20 03:58:47 chs Exp $        */
 
 /*     $OpenBSD: gscbusvar.h,v 1.3 1999/08/16 02:48:39 mickey Exp $    */
 
@@ -49,7 +49,7 @@
        struct hp700_int_reg *ga_int_reg;
 
        /* This fixes a module's attach arguments. */
-       void (*ga_fix_args) __P((void *, struct gsc_attach_args *));
+       void (*ga_fix_args)(void *, struct gsc_attach_args *);
        void *ga_fix_args_cookie;
 
        /* The SCSI target for the host adapter. */
@@ -59,5 +59,4 @@
        u_int8_t ga_ether_address[6];
 }; 
 
-int gscprint __P((void *, const char *));
-
+int gscprint(void *, const char *);
diff -r 1aac0ce07426 -r 23ad0b539af5 sys/arch/hp700/gsc/if_ie_gsc.c
--- a/sys/arch/hp700/gsc/if_ie_gsc.c    Thu Nov 20 03:31:02 2003 +0000
+++ b/sys/arch/hp700/gsc/if_ie_gsc.c    Thu Nov 20 03:58:47 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_ie_gsc.c,v 1.9 2003/07/15 02:29:25 lukem Exp $      */
+/*     $NetBSD: if_ie_gsc.c,v 1.10 2003/11/20 03:58:47 chs Exp $       */
 
 /*     $OpenBSD: if_ie_gsc.c,v 1.6 2001/01/12 22:57:04 mickey Exp $    */
 
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ie_gsc.c,v 1.9 2003/07/15 02:29:25 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ie_gsc.c,v 1.10 2003/11/20 03:58:47 chs Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -124,8 +124,8 @@
 #define        IEGSC_GECKO     (1 << 0)
 }; 
 
-int    ie_gsc_probe __P((struct device *, struct cfdata *, void *));
-void   ie_gsc_attach __P((struct device *, struct device *, void *));
+int    ie_gsc_probe(struct device *, struct cfdata *, void *);
+void   ie_gsc_attach(struct device *, struct device *, void *);
 
 CFATTACH_DECL(ie_gsc, sizeof(struct ie_gsc_softc),
     ie_gsc_probe, ie_gsc_attach, NULL, NULL);
@@ -135,25 +135,23 @@
 };
 #define        IE_NMEDIA       (sizeof(ie_gsc_media) / sizeof(ie_gsc_media[0]))
 
-void ie_gsc_reset __P((struct ie_softc *sc, int what));
-void ie_gsc_attend __P((struct ie_softc *, int));
-void ie_gsc_run __P((struct ie_softc *sc));
-void ie_gsc_port __P((struct ie_softc *sc, u_int));
-u_int16_t ie_gsc_read16 __P((struct ie_softc *sc, int offset));
-void ie_gsc_write16 __P((struct ie_softc *sc, int offset, u_int16_t v));
-void ie_gsc_write24 __P((struct ie_softc *sc, int offset, int addr));
-void ie_gsc_memcopyin __P((struct ie_softc *sc, void *p, int offset, size_t));
-void ie_gsc_memcopyout __P((struct ie_softc *sc, const void *p, int, size_t));
+void ie_gsc_reset(struct ie_softc *, int);
+void ie_gsc_attend(struct ie_softc *, int);
+void ie_gsc_run(struct ie_softc *);
+void ie_gsc_port(struct ie_softc *, u_int);
+uint16_t ie_gsc_read16(struct ie_softc *, int);
+void ie_gsc_write16(struct ie_softc *, int, uint16_t);
+void ie_gsc_write24(struct ie_softc *, int, int);
+void ie_gsc_memcopyin(struct ie_softc *, void *, int, size_t);
+void ie_gsc_memcopyout(struct ie_softc *, const void *, int, size_t);
 
 
 /* Reset the adapter. */
 void
-ie_gsc_reset(sc, what)
-       struct ie_softc *sc;
-       int what;
+ie_gsc_reset(struct ie_softc *sc, int what)
 {
        struct ie_gsc_softc *gsc = (struct ie_gsc_softc *) sc;
-       register int i;
+       int i;
        
        switch (what) {
        case CHIP_PROBE:
@@ -196,26 +194,22 @@
 
 /* Do a channel attention on the adapter. */
 void
-ie_gsc_attend(sc, why)