Source-Changes-HG archive

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

[src/trunk]: src/sys/dev Get rid of __P.



details:   https://anonhg.NetBSD.org/src/rev/e578f66a3361
branches:  trunk
changeset: 558149:e578f66a3361
user:      dyoung <dyoung%NetBSD.org@localhost>
date:      Thu Jan 29 10:25:49 2004 +0000

description:
Get rid of __P.

diffstat:

 sys/dev/cardbus/if_atw_cardbus.c |   53 ++++-------
 sys/dev/ic/atw.c                 |  175 +++++++++++++-------------------------
 sys/dev/ic/atwvar.h              |   16 +-
 sys/dev/pci/if_atw_pci.c         |   23 +---
 4 files changed, 96 insertions(+), 171 deletions(-)

diffs (truncated from 701 to 300 lines):

diff -r 023f63a3852a -r e578f66a3361 sys/dev/cardbus/if_atw_cardbus.c
--- a/sys/dev/cardbus/if_atw_cardbus.c  Thu Jan 29 10:07:08 2004 +0000
+++ b/sys/dev/cardbus/if_atw_cardbus.c  Thu Jan 29 10:25:49 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_atw_cardbus.c,v 1.4 2004/01/29 10:07:08 dyoung Exp $        */
+/* $NetBSD: if_atw_cardbus.c,v 1.5 2004/01/29 10:25:49 dyoung Exp $ */
 
 /*-
  * Copyright (c) 1999, 2000, 2003 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_atw_cardbus.c,v 1.4 2004/01/29 10:07:08 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_atw_cardbus.c,v 1.5 2004/01/29 10:25:49 dyoung Exp $");
 
 #include "opt_inet.h"
 #include "opt_ns.h"
@@ -121,23 +121,23 @@
        int     sc_intrline;            /* interrupt line */
 };
 
-int    atw_cardbus_match __P((struct device *, struct cfdata *, void *));
-void   atw_cardbus_attach __P((struct device *, struct device *, void *));
-int    atw_cardbus_detach __P((struct device *, int));
+int    atw_cardbus_match(struct device *, struct cfdata *, void *);
+void   atw_cardbus_attach(struct device *, struct device *, void *);
+int    atw_cardbus_detach(struct device *, int);
 
 CFATTACH_DECL(atw_cardbus, sizeof(struct atw_cardbus_softc),
     atw_cardbus_match, atw_cardbus_attach, atw_cardbus_detach, atw_activate);
 
-void   atw_cardbus_setup __P((struct atw_cardbus_softc *));
+void   atw_cardbus_setup(struct atw_cardbus_softc *);
 
-int    atw_cardbus_enable __P((struct atw_softc *));
-void   atw_cardbus_disable __P((struct atw_softc *));
-void   atw_cardbus_power __P((struct atw_softc *, int));
+int    atw_cardbus_enable(struct atw_softc *);
+void   atw_cardbus_disable(struct atw_softc *);
+void   atw_cardbus_power(struct atw_softc *, int);
 
 static void atw_cardbus_intr_ack(struct atw_softc *);
 
 const struct atw_cardbus_product *atw_cardbus_lookup
-    __P((const struct cardbus_attach_args *));
+   (const struct cardbus_attach_args *);
 
 const struct atw_cardbus_product {
        u_int32_t        acp_vendor;    /* PCI vendor ID */
@@ -151,8 +151,7 @@
 };
 
 const struct atw_cardbus_product *
-atw_cardbus_lookup(ca)
-       const struct cardbus_attach_args *ca;
+atw_cardbus_lookup(const struct cardbus_attach_args *ca)
 {
        const struct atw_cardbus_product *acp;
 
@@ -167,10 +166,7 @@
 }
 
 int
-atw_cardbus_match(parent, match, aux)
-       struct device *parent;
-       struct cfdata *match;
-       void *aux;
+atw_cardbus_match(struct device *parent, struct cfdata *match, void *aux)
 {
        struct cardbus_attach_args *ca = aux;
 
@@ -181,9 +177,7 @@
 }
 
 void
-atw_cardbus_attach(parent, self, aux)
-       struct device *parent, *self;
-       void *aux;
+atw_cardbus_attach(struct device *parent, struct device *self, void *aux)
 {
        struct atw_cardbus_softc *csc = (void *)self;
        struct atw_softc *sc = &csc->sc_atw;
@@ -297,16 +291,13 @@
 }
 
 static void
-atw_cardbus_intr_ack(sc)
-        struct atw_softc *sc;
+atw_cardbus_intr_ack(struct atw_softc *sc)
 {
        ATW_WRITE(sc, ATW_FER, ATW_FER_INTR);
 }
 
 int
-atw_cardbus_detach(self, flags)
-       struct device *self;
-       int flags;
+atw_cardbus_detach(struct device *self, int flags)
 {
        struct atw_cardbus_softc *csc = (void *)self;
        struct atw_softc *sc = &csc->sc_atw;
@@ -339,8 +330,7 @@
 }
 
 int
-atw_cardbus_enable(sc)
-       struct atw_softc *sc;
+atw_cardbus_enable(struct atw_softc *sc)
 {
        struct atw_cardbus_softc *csc = (void *) sc;
        cardbus_devfunc_t ct = csc->sc_ct;
@@ -373,8 +363,7 @@
 }
 
 void
-atw_cardbus_disable(sc)
-       struct atw_softc *sc;
+atw_cardbus_disable(struct atw_softc *sc)
 {
        struct atw_cardbus_softc *csc = (void *) sc;
        cardbus_devfunc_t ct = csc->sc_ct;
@@ -390,9 +379,7 @@
 }
 
 void
-atw_cardbus_power(sc, why)
-       struct atw_softc *sc;
-       int why;
+atw_cardbus_power(struct atw_softc *sc, int why)
 {
        struct atw_cardbus_softc *csc = (void *) sc;
 
@@ -412,8 +399,7 @@
 }
 
 void
-atw_cardbus_setup(csc)
-       struct atw_cardbus_softc *csc;
+atw_cardbus_setup(struct atw_cardbus_softc *csc)
 {
        struct atw_softc *sc = &csc->sc_atw;
        cardbus_devfunc_t ct = csc->sc_ct;
@@ -471,4 +457,3 @@
                cardbus_conf_write(cc, cf, csc->sc_tag, CARDBUS_BHLC_REG, reg);
        }
 }
-
diff -r 023f63a3852a -r e578f66a3361 sys/dev/ic/atw.c
--- a/sys/dev/ic/atw.c  Thu Jan 29 10:07:08 2004 +0000
+++ b/sys/dev/ic/atw.c  Thu Jan 29 10:25:49 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: atw.c,v 1.22 2004/01/29 10:02:24 dyoung Exp $  */
+/*     $NetBSD: atw.c,v 1.23 2004/01/29 10:25:49 dyoung Exp $  */
 
 /*-
  * Copyright (c) 1998, 1999, 2000, 2002, 2003, 2004 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: atw.c,v 1.22 2004/01/29 10:02:24 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atw.c,v 1.23 2004/01/29 10:25:49 dyoung Exp $");
 
 #include "bpfilter.h"
 
@@ -175,31 +175,31 @@
 #endif
 
 #ifdef ATW_STATS
-void   atw_print_stats __P((struct atw_softc *));
+void   atw_print_stats(struct atw_softc *);
 #endif
 
-void   atw_start __P((struct ifnet *));
-void   atw_watchdog __P((struct ifnet *));
-int    atw_ioctl __P((struct ifnet *, u_long, caddr_t));
-int    atw_init __P((struct ifnet *));
-void   atw_stop __P((struct ifnet *, int));
-
-void   atw_reset __P((struct atw_softc *));
-int    atw_read_srom __P((struct atw_softc *));
-
-void   atw_shutdown __P((void *));
-
-void   atw_rxdrain __P((struct atw_softc *));
-int    atw_add_rxbuf __P((struct atw_softc *, int));
-void   atw_idle __P((struct atw_softc *, u_int32_t));
-
-int    atw_enable __P((struct atw_softc *));
-void   atw_disable __P((struct atw_softc *));
-void   atw_power __P((int, void *));
-
-void   atw_rxintr __P((struct atw_softc *));
-void   atw_txintr __P((struct atw_softc *));
-void   atw_linkintr __P((struct atw_softc *, u_int32_t));
+void   atw_start(struct ifnet *);
+void   atw_watchdog(struct ifnet *);
+int    atw_ioctl(struct ifnet *, u_long, caddr_t);
+int    atw_init(struct ifnet *);
+void   atw_stop(struct ifnet *, int);
+
+void   atw_reset(struct atw_softc *);
+int    atw_read_srom(struct atw_softc *);
+
+void   atw_shutdown(void *);
+
+void   atw_rxdrain(struct atw_softc *);
+int    atw_add_rxbuf(struct atw_softc *, int);
+void   atw_idle(struct atw_softc *, u_int32_t);
+
+int    atw_enable(struct atw_softc *);
+void   atw_disable(struct atw_softc *);
+void   atw_power(int, void *);
+
+void   atw_rxintr(struct atw_softc *);
+void   atw_txintr(struct atw_softc *);
+void   atw_linkintr(struct atw_softc *, u_int32_t);
 
 static int atw_newstate(struct ieee80211com *, enum ieee80211_state, int);
 static void atw_tsf(struct atw_softc *);
@@ -293,8 +293,7 @@
  *     Enable the ADM8211 chip.
  */
 int
-atw_enable(sc)
-       struct atw_softc *sc;
+atw_enable(struct atw_softc *sc)
 {
 
        if (ATW_IS_ENABLED(sc) == 0) {
@@ -314,8 +313,7 @@
  *     Disable the ADM8211 chip.
  */
 void
-atw_disable(sc)
-       struct atw_softc *sc;
+atw_disable(struct atw_softc *sc)
 {
        if (!ATW_IS_ENABLED(sc))
                return;
@@ -842,8 +840,7 @@
  *     Perform a soft reset on the ADM8211.
  */
 void
-atw_reset(sc)
-       struct atw_softc *sc;
+atw_reset(struct atw_softc *sc)
 {
        int i;
 
@@ -882,8 +879,7 @@
 }
 
 static void
-atw_clear_sram(sc)
-       struct atw_softc *sc;
+atw_clear_sram(struct atw_softc *sc)
 {
 #if 0
        for (addr = 0; addr < 448; addr++) {
@@ -913,8 +909,7 @@
  *     Initialize the interface.  Must be called at splnet().
  */
 int
-atw_init(ifp)
-       struct ifnet *ifp;
+atw_init(struct ifnet *ifp)
 {
        struct atw_softc *sc = ifp->if_softc;
        struct ieee80211com *ic = &sc->sc_ic;
@@ -1293,8 +1288,7 @@
 }
 
 static int
-atw_tune(sc)
-       struct atw_softc *sc;
+atw_tune(struct atw_softc *sc)
 {
        int rc;
        u_int32_t reg;
@@ -1332,8 +1326,7 @@
 
 #ifdef ATW_DEBUG
 static void
-atw_si4126_print(sc)
-       struct atw_softc *sc;
+atw_si4126_print(struct atw_softc *sc)
 {
        struct ifnet *ifp = &sc->sc_ic.ic_if;
        u_int addr, val;
@@ -1370,9 +1363,7 @@
  * works, but I have still programmed for XINDIV2 = 1 to be safe.
  */
 static int
-atw_si4126_tune(sc, chan)
-       struct atw_softc *sc;
-       u_int8_t chan;
+atw_si4126_tune(struct atw_softc *sc, u_int8_t chan)
 {



Home | Main Index | Thread Index | Old Index