[src/trunk]: src/sys/arch/i386/pci de-__P, partially ANSIfy

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

details:   https://anonhg.NetBSD.org/src/rev/3fbf7f9aae07
branches:  trunk
changeset: 573632:3fbf7f9aae07
user:      perry <perry%NetBSD.org@localhost>
date:      Thu Feb 03 21:35:44 2005 +0000

description:
de-__P, partially ANSIfy

diffstat:

 sys/arch/i386/pci/ali1543.c          |  10 +++++-----
 sys/arch/i386/pci/ichlpcib.c         |   7 +++----
 sys/arch/i386/pci/p64h2apic.c        |  19 +++++++------------
 sys/arch/i386/pci/pceb.c             |  22 ++++++++--------------
 sys/arch/i386/pci/pchb.c             |   8 ++++----
 sys/arch/i386/pci/pci_intr_fixup.c   |  10 +++++-----
 sys/arch/i386/pci/pcib.c             |  22 ++++++++--------------
 sys/arch/i386/pci/pcibios.c          |  17 ++++++++---------
 sys/arch/i386/pci/pcic_pci_machdep.c |  23 +++++++----------------
 sys/arch/i386/pci/pcmb.c             |  22 ++++++++--------------
 10 files changed, 63 insertions(+), 97 deletions(-)

diffs (truncated from 518 to 300 lines):

diff -r 1489f0717c30 -r 3fbf7f9aae07 sys/arch/i386/pci/ali1543.c
--- a/sys/arch/i386/pci/ali1543.c       Thu Feb 03 21:08:57 2005 +0000
+++ b/sys/arch/i386/pci/ali1543.c       Thu Feb 03 21:35:44 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ali1543.c,v 1.5 2003/02/26 22:23:06 fvdl Exp $ */
+/*     $NetBSD: ali1543.c,v 1.6 2005/02/03 21:35:44 perry Exp $        */
 
 /*
  * Copyright (c) 2001
@@ -94,7 +94,7 @@
 /* HAYAKAWA Koichi wrote ALi 1543 PCI ICU code basing on VIA82C586 driver */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ali1543.c,v 1.5 2003/02/26 22:23:06 fvdl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ali1543.c,v 1.6 2005/02/03 21:35:44 perry Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -114,9 +114,9 @@
 #include <i386/pci/piixvar.h>
 
 
-int ali1543_getclink (pciintr_icu_handle_t, int, int *);
-int ali1543_get_intr (pciintr_icu_handle_t, int, int *);
-int ali1543_set_intr (pciintr_icu_handle_t, int, int);
+int ali1543_getclink(pciintr_icu_handle_t, int, int *);
+int ali1543_get_intr(pciintr_icu_handle_t, int, int *);
+int ali1543_set_intr(pciintr_icu_handle_t, int, int);
 
 
 const struct pciintr_icu ali1543_icu = {
diff -r 1489f0717c30 -r 3fbf7f9aae07 sys/arch/i386/pci/ichlpcib.c
--- a/sys/arch/i386/pci/ichlpcib.c      Thu Feb 03 21:08:57 2005 +0000
+++ b/sys/arch/i386/pci/ichlpcib.c      Thu Feb 03 21:35:44 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ichlpcib.c,v 1.7 2005/01/12 17:45:58 drochner Exp $    */
+/*     $NetBSD: ichlpcib.c,v 1.8 2005/02/03 21:35:44 perry Exp $       */
 
 /*-
  * Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -46,7 +46,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ichlpcib.c,v 1.7 2005/01/12 17:45:58 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ichlpcib.c,v 1.8 2005/02/03 21:35:44 perry Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -76,8 +76,7 @@
 static int lpcibmatch(struct device *, struct cfdata *, void *);
 static void lpcibattach(struct device *, struct device *, void *);
 
-static void tcotimer_configure(struct lpcib_softc *,
-                               struct pci_attach_args *);
+static void tcotimer_configure(struct lpcib_softc *, struct pci_attach_args *);
 static int tcotimer_setmode(struct sysmon_wdog *);
 static int tcotimer_tickle(struct sysmon_wdog *);
 
diff -r 1489f0717c30 -r 3fbf7f9aae07 sys/arch/i386/pci/p64h2apic.c
--- a/sys/arch/i386/pci/p64h2apic.c     Thu Feb 03 21:08:57 2005 +0000
+++ b/sys/arch/i386/pci/p64h2apic.c     Thu Feb 03 21:35:44 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: p64h2apic.c,v 1.6 2004/04/23 21:13:05 itojun Exp $ */
+/* $NetBSD: p64h2apic.c,v 1.7 2005/02/03 21:35:44 perry Exp $ */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: p64h2apic.c,v 1.6 2004/04/23 21:13:05 itojun Exp $");
+__KERNEL_RCSID(0, "$NetBSD: p64h2apic.c,v 1.7 2005/02/03 21:35:44 perry Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -56,8 +56,8 @@
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcidevs.h>
 
-static int     p64h2match __P((struct device *, struct cfdata *, void *));
-static void    p64h2attach __P((struct device *, struct device *, void *));
+static int     p64h2match(struct device *, struct cfdata *, void *);
+static void    p64h2attach(struct device *, struct device *, void *);
 
 struct p64h2apic_softc {
        struct device sc_dev;
@@ -67,14 +67,11 @@
 CFATTACH_DECL(p64h2apic, sizeof(struct p64h2apic_softc),
     p64h2match, p64h2attach, NULL, NULL);
 
-int    p64h2print __P((void *, const char *pnp));
+int    p64h2print(void *, const char *pnp);
 
 
 static int
-p64h2match(parent, match, aux)
-       struct device *parent;
-       struct cfdata *match;
-       void *aux;
+p64h2match(struct device *parent, struct cfdata *match, void *aux)
 {
        struct pci_attach_args *pa = aux;
 
@@ -86,9 +83,7 @@
 }
 
 static void
-p64h2attach(parent, self, aux)
-       struct device *parent, *self;
-       void *aux;
+p64h2attach(struct device *parent, struct device *self, void *aux)
 {
        struct p64h2apic_softc *sc = (void *) self;
        struct pci_attach_args *pa = aux;
diff -r 1489f0717c30 -r 3fbf7f9aae07 sys/arch/i386/pci/pceb.c
--- a/sys/arch/i386/pci/pceb.c  Thu Feb 03 21:08:57 2005 +0000
+++ b/sys/arch/i386/pci/pceb.c  Thu Feb 03 21:35:44 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pceb.c,v 1.14 2004/08/30 15:05:17 drochner Exp $       */
+/*     $NetBSD: pceb.c,v 1.15 2005/02/03 21:35:44 perry Exp $  */
 
 /*-
  * Copyright (c) 1996, 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pceb.c,v 1.14 2004/08/30 15:05:17 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pceb.c,v 1.15 2005/02/03 21:35:44 perry Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -57,13 +57,13 @@
 #include "eisa.h"
 #include "isa.h"
 
-int    pcebmatch __P((struct device *, struct cfdata *, void *));
-void   pcebattach __P((struct device *, struct device *, void *));
+int    pcebmatch(struct device *, struct cfdata *, void *);
+void   pcebattach(struct device *, struct device *, void *);
 
 CFATTACH_DECL(pceb, sizeof(struct device),
     pcebmatch, pcebattach, NULL, NULL);
 
-void   pceb_callback __P((struct device *));
+void   pceb_callback(struct device *);
 
 union pceb_attach_args {
        const char *ea_name;                    /* XXX should be common */
@@ -72,10 +72,7 @@
 };
 
 int
-pcebmatch(parent, match, aux)
-       struct device *parent;
-       struct cfdata *match;
-       void *aux;
+pcebmatch(struct device *parent, struct cfdata *match, void *aux)
 {
        struct pci_attach_args *pa = aux;
 
@@ -104,9 +101,7 @@
 }
 
 void
-pcebattach(parent, self, aux)
-       struct device *parent, *self;
-       void *aux;
+pcebattach(struct device *parent, struct device *self, void *aux)
 {
        struct pci_attach_args *pa = aux;
        char devinfo[256];
@@ -125,8 +120,7 @@
 }
 
 void
-pceb_callback(self)
-       struct device *self;
+pceb_callback(struct device *self)
 {
        union pceb_attach_args ea;
 
diff -r 1489f0717c30 -r 3fbf7f9aae07 sys/arch/i386/pci/pchb.c
--- a/sys/arch/i386/pci/pchb.c  Thu Feb 03 21:08:57 2005 +0000
+++ b/sys/arch/i386/pci/pchb.c  Thu Feb 03 21:35:44 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pchb.c,v 1.54 2004/08/30 15:05:17 drochner Exp $       */
+/*     $NetBSD: pchb.c,v 1.55 2005/02/03 21:35:44 perry Exp $  */
 
 /*-
  * Copyright (c) 1996, 1998, 2000 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pchb.c,v 1.54 2004/08/30 15:05:17 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pchb.c,v 1.55 2005/02/03 21:35:44 perry Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -78,8 +78,8 @@
 #define I82424_BCTL_PCIMEM_BURSTEN     0x01
 #define I82424_BCTL_PCI_BURSTEN                0x02
 
-int    pchbmatch __P((struct device *, struct cfdata *, void *));
-void   pchbattach __P((struct device *, struct device *, void *));
+int    pchbmatch(struct device *, struct cfdata *, void *);
+void   pchbattach(struct device *, struct device *, void *);
 
 CFATTACH_DECL(pchb, sizeof(struct pchb_softc),
     pchbmatch, pchbattach, NULL, NULL);
diff -r 1489f0717c30 -r 3fbf7f9aae07 sys/arch/i386/pci/pci_intr_fixup.c
--- a/sys/arch/i386/pci/pci_intr_fixup.c        Thu Feb 03 21:08:57 2005 +0000
+++ b/sys/arch/i386/pci/pci_intr_fixup.c        Thu Feb 03 21:35:44 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pci_intr_fixup.c,v 1.30 2004/04/30 02:44:03 christos Exp $     */
+/*     $NetBSD: pci_intr_fixup.c,v 1.31 2005/02/03 21:35:44 perry Exp $        */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_intr_fixup.c,v 1.30 2004/04/30 02:44:03 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_intr_fixup.c,v 1.31 2005/02/03 21:35:44 perry Exp $");
 
 #include "opt_pcibios.h"
 
@@ -336,7 +336,7 @@
 }
 
 int
-pciintr_link_init()
+pciintr_link_init(void)
 {
        int entry, pin, link;
        struct pcibios_intr_routing *pir;
@@ -395,7 +395,7 @@
  * Hopes the BIOS already setup the ICU.
  */
 int
-pciintr_guess_irq()
+pciintr_guess_irq(void)
 {
        struct pciintr_link_map *l;
        int irq, guessed = 0;
@@ -423,7 +423,7 @@
 #endif /* PCIBIOS_INTR_GUESS */
 
 int
-pciintr_link_fixup()
+pciintr_link_fixup(void)
 {
        struct pciintr_link_map *l;
        int irq;
diff -r 1489f0717c30 -r 3fbf7f9aae07 sys/arch/i386/pci/pcib.c
--- a/sys/arch/i386/pci/pcib.c  Thu Feb 03 21:08:57 2005 +0000
+++ b/sys/arch/i386/pci/pcib.c  Thu Feb 03 21:35:44 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pcib.c,v 1.34 2004/08/30 15:05:17 drochner Exp $       */
+/*     $NetBSD: pcib.c,v 1.35 2005/02/03 21:35:44 perry Exp $  */
 
 /*-
  * Copyright (c) 1996, 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.34 2004/08/30 15:05:17 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.35 2005/02/03 21:35:44 perry Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -55,19 +55,16 @@
 
 #include "isa.h"
 
-int    pcibmatch __P((struct device *, struct cfdata *, void *));
-void   pcibattach __P((struct device *, struct device *, void *));
+int    pcibmatch(struct device *, struct cfdata *, void *);
+void   pcibattach(struct device *, struct device *, void *);
 
 CFATTACH_DECL(pcib, sizeof(struct device),
     pcibmatch, pcibattach, NULL, NULL);
 
-void   pcib_callback __P((struct device *));
+void   pcib_callback(struct device *);
 
 int
-pcibmatch(parent, match, aux)
-       struct device *parent;
-       struct cfdata *match;
-       void *aux;
+pcibmatch(struct device *parent, struct cfdata *match, void *aux)
 {
        struct pci_attach_args *pa = aux;