From 3264aec746947db8598130cb0ac382cf0b2a10cf Mon Sep 17 00:00:00 2001 From: alfred Date: Wed, 20 Mar 2002 02:08:01 +0000 Subject: Remove __P. --- sys/dev/awi/am79c930.c | 42 ++++++++++++------------ sys/dev/awi/am79c930var.h | 24 +++++++------- sys/dev/awi/awi.c | 84 +++++++++++++++++++++++------------------------ sys/dev/awi/awi_wep.c | 10 +++--- sys/dev/awi/awi_wicfg.c | 4 +-- sys/dev/awi/awivar.h | 48 +++++++++++++-------------- 6 files changed, 106 insertions(+), 106 deletions(-) (limited to 'sys/dev/awi') diff --git a/sys/dev/awi/am79c930.c b/sys/dev/awi/am79c930.c index aa9c97f..8cb5ecd 100644 --- a/sys/dev/awi/am79c930.c +++ b/sys/dev/awi/am79c930.c @@ -88,27 +88,27 @@ #define AM930_DELAY(x) /*nothing*/ -void am79c930_regdump __P((struct am79c930_softc *sc)); - -static void io_write_1 __P((struct am79c930_softc *, u_int32_t, u_int8_t)); -static void io_write_2 __P((struct am79c930_softc *, u_int32_t, u_int16_t)); -static void io_write_4 __P((struct am79c930_softc *, u_int32_t, u_int32_t)); -static void io_write_bytes __P((struct am79c930_softc *, u_int32_t, u_int8_t *, size_t)); - -static u_int8_t io_read_1 __P((struct am79c930_softc *, u_int32_t)); -static u_int16_t io_read_2 __P((struct am79c930_softc *, u_int32_t)); -static u_int32_t io_read_4 __P((struct am79c930_softc *, u_int32_t)); -static void io_read_bytes __P((struct am79c930_softc *, u_int32_t, u_int8_t *, size_t)); - -static void mem_write_1 __P((struct am79c930_softc *, u_int32_t, u_int8_t)); -static void mem_write_2 __P((struct am79c930_softc *, u_int32_t, u_int16_t)); -static void mem_write_4 __P((struct am79c930_softc *, u_int32_t, u_int32_t)); -static void mem_write_bytes __P((struct am79c930_softc *, u_int32_t, u_int8_t *, size_t)); - -static u_int8_t mem_read_1 __P((struct am79c930_softc *, u_int32_t)); -static u_int16_t mem_read_2 __P((struct am79c930_softc *, u_int32_t)); -static u_int32_t mem_read_4 __P((struct am79c930_softc *, u_int32_t)); -static void mem_read_bytes __P((struct am79c930_softc *, u_int32_t, u_int8_t *, size_t)); +void am79c930_regdump(struct am79c930_softc *sc); + +static void io_write_1(struct am79c930_softc *, u_int32_t, u_int8_t); +static void io_write_2(struct am79c930_softc *, u_int32_t, u_int16_t); +static void io_write_4(struct am79c930_softc *, u_int32_t, u_int32_t); +static void io_write_bytes(struct am79c930_softc *, u_int32_t, u_int8_t *, size_t); + +static u_int8_t io_read_1(struct am79c930_softc *, u_int32_t); +static u_int16_t io_read_2(struct am79c930_softc *, u_int32_t); +static u_int32_t io_read_4(struct am79c930_softc *, u_int32_t); +static void io_read_bytes(struct am79c930_softc *, u_int32_t, u_int8_t *, size_t); + +static void mem_write_1(struct am79c930_softc *, u_int32_t, u_int8_t); +static void mem_write_2(struct am79c930_softc *, u_int32_t, u_int16_t); +static void mem_write_4(struct am79c930_softc *, u_int32_t, u_int32_t); +static void mem_write_bytes(struct am79c930_softc *, u_int32_t, u_int8_t *, size_t); + +static u_int8_t mem_read_1(struct am79c930_softc *, u_int32_t); +static u_int16_t mem_read_2(struct am79c930_softc *, u_int32_t); +static u_int32_t mem_read_4(struct am79c930_softc *, u_int32_t); +static void mem_read_bytes(struct am79c930_softc *, u_int32_t, u_int8_t *, size_t); static struct am79c930_ops iospace_ops = { io_write_1, diff --git a/sys/dev/awi/am79c930var.h b/sys/dev/awi/am79c930var.h index 1e45c68..087ae1a 100644 --- a/sys/dev/awi/am79c930var.h +++ b/sys/dev/awi/am79c930var.h @@ -55,23 +55,23 @@ struct am79c930_softc struct am79c930_ops { - void (*write_1) __P((struct am79c930_softc *, u_int32_t, u_int8_t)); - void (*write_2) __P((struct am79c930_softc *, u_int32_t, u_int16_t)); - void (*write_4) __P((struct am79c930_softc *, u_int32_t, u_int32_t)); - void (*write_bytes) __P((struct am79c930_softc *, u_int32_t, u_int8_t *, size_t)); + void (*write_1)(struct am79c930_softc *, u_int32_t, u_int8_t); + void (*write_2)(struct am79c930_softc *, u_int32_t, u_int16_t); + void (*write_4)(struct am79c930_softc *, u_int32_t, u_int32_t); + void (*write_bytes)(struct am79c930_softc *, u_int32_t, u_int8_t *, size_t); - u_int8_t (*read_1) __P((struct am79c930_softc *, u_int32_t)); - u_int16_t (*read_2) __P((struct am79c930_softc *, u_int32_t)); - u_int32_t (*read_4) __P((struct am79c930_softc *, u_int32_t)); - void (*read_bytes) __P((struct am79c930_softc *, u_int32_t, u_int8_t *, size_t)); + u_int8_t (*read_1)(struct am79c930_softc *, u_int32_t); + u_int16_t (*read_2)(struct am79c930_softc *, u_int32_t); + u_int32_t (*read_4)(struct am79c930_softc *, u_int32_t); + void (*read_bytes)(struct am79c930_softc *, u_int32_t, u_int8_t *, size_t); }; -void am79c930_chip_init __P((struct am79c930_softc *sc, int)); +void am79c930_chip_init(struct am79c930_softc *sc, int); -void am79c930_gcr_setbits __P((struct am79c930_softc *sc, u_int8_t bits)); -void am79c930_gcr_clearbits __P((struct am79c930_softc *sc, u_int8_t bits)); +void am79c930_gcr_setbits(struct am79c930_softc *sc, u_int8_t bits); +void am79c930_gcr_clearbits(struct am79c930_softc *sc, u_int8_t bits); -u_int8_t am79c930_gcr_read __P((struct am79c930_softc *sc)); +u_int8_t am79c930_gcr_read(struct am79c930_softc *sc); #define am79c930_hard_reset(sc) am79c930_gcr_setbits(sc, AM79C930_GCR_CORESET) #define am79c930_hard_reset_off(sc) am79c930_gcr_clearbits(sc, AM79C930_GCR_CORESET) diff --git a/sys/dev/awi/awi.c b/sys/dev/awi/awi.c index ab76ea0..fe764b0 100644 --- a/sys/dev/awi/awi.c +++ b/sys/dev/awi/awi.c @@ -160,51 +160,51 @@ #include #endif -static int awi_ioctl __P((struct ifnet *ifp, u_long cmd, caddr_t data)); +static int awi_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data); #ifdef IFM_IEEE80211 -static int awi_media_rate2opt __P((struct awi_softc *sc, int rate)); -static int awi_media_opt2rate __P((struct awi_softc *sc, int opt)); -static int awi_media_change __P((struct ifnet *ifp)); -static void awi_media_status __P((struct ifnet *ifp, struct ifmediareq *imr)); +static int awi_media_rate2opt(struct awi_softc *sc, int rate); +static int awi_media_opt2rate(struct awi_softc *sc, int opt); +static int awi_media_change(struct ifnet *ifp); +static void awi_media_status(struct ifnet *ifp, struct ifmediareq *imr); #endif -static void awi_watchdog __P((struct ifnet *ifp)); -static void awi_start __P((struct ifnet *ifp)); -static void awi_txint __P((struct awi_softc *sc)); -static struct mbuf * awi_fix_txhdr __P((struct awi_softc *sc, struct mbuf *m0)); -static struct mbuf * awi_fix_rxhdr __P((struct awi_softc *sc, struct mbuf *m0)); -static void awi_input __P((struct awi_softc *sc, struct mbuf *m, u_int32_t rxts, u_int8_t rssi)); -static void awi_rxint __P((struct awi_softc *sc)); -static struct mbuf * awi_devget __P((struct awi_softc *sc, u_int32_t off, u_int16_t len)); -static int awi_init_hw __P((struct awi_softc *sc)); -static int awi_init_mibs __P((struct awi_softc *sc)); -static int awi_init_txrx __P((struct awi_softc *sc)); -static void awi_stop_txrx __P((struct awi_softc *sc)); -static int awi_start_scan __P((struct awi_softc *sc)); -static int awi_next_scan __P((struct awi_softc *sc)); -static void awi_stop_scan __P((struct awi_softc *sc)); -static void awi_recv_beacon __P((struct awi_softc *sc, struct mbuf *m0, u_int32_t rxts, u_int8_t rssi)); -static int awi_set_ss __P((struct awi_softc *sc)); -static void awi_try_sync __P((struct awi_softc *sc)); -static void awi_sync_done __P((struct awi_softc *sc)); -static void awi_send_deauth __P((struct awi_softc *sc)); -static void awi_send_auth __P((struct awi_softc *sc, int seq)); -static void awi_recv_auth __P((struct awi_softc *sc, struct mbuf *m0)); -static void awi_send_asreq __P((struct awi_softc *sc, int reassoc)); -static void awi_recv_asresp __P((struct awi_softc *sc, struct mbuf *m0)); -static int awi_mib __P((struct awi_softc *sc, u_int8_t cmd, u_int8_t mib)); -static int awi_cmd_scan __P((struct awi_softc *sc)); -static int awi_cmd __P((struct awi_softc *sc, u_int8_t cmd)); -static void awi_cmd_done __P((struct awi_softc *sc)); -static int awi_next_txd __P((struct awi_softc *sc, int len, u_int32_t *framep, u_int32_t*ntxdp)); -static int awi_lock __P((struct awi_softc *sc)); -static void awi_unlock __P((struct awi_softc *sc)); -static int awi_intr_lock __P((struct awi_softc *sc)); -static void awi_intr_unlock __P((struct awi_softc *sc)); -static int awi_cmd_wait __P((struct awi_softc *sc)); -static void awi_print_essid __P((u_int8_t *essid)); +static void awi_watchdog(struct ifnet *ifp); +static void awi_start(struct ifnet *ifp); +static void awi_txint(struct awi_softc *sc); +static struct mbuf * awi_fix_txhdr(struct awi_softc *sc, struct mbuf *m0); +static struct mbuf * awi_fix_rxhdr(struct awi_softc *sc, struct mbuf *m0); +static void awi_input(struct awi_softc *sc, struct mbuf *m, u_int32_t rxts, u_int8_t rssi); +static void awi_rxint(struct awi_softc *sc); +static struct mbuf * awi_devget(struct awi_softc *sc, u_int32_t off, u_int16_t len); +static int awi_init_hw(struct awi_softc *sc); +static int awi_init_mibs(struct awi_softc *sc); +static int awi_init_txrx(struct awi_softc *sc); +static void awi_stop_txrx(struct awi_softc *sc); +static int awi_start_scan(struct awi_softc *sc); +static int awi_next_scan(struct awi_softc *sc); +static void awi_stop_scan(struct awi_softc *sc); +static void awi_recv_beacon(struct awi_softc *sc, struct mbuf *m0, u_int32_t rxts, u_int8_t rssi); +static int awi_set_ss(struct awi_softc *sc); +static void awi_try_sync(struct awi_softc *sc); +static void awi_sync_done(struct awi_softc *sc); +static void awi_send_deauth(struct awi_softc *sc); +static void awi_send_auth(struct awi_softc *sc, int seq); +static void awi_recv_auth(struct awi_softc *sc, struct mbuf *m0); +static void awi_send_asreq(struct awi_softc *sc, int reassoc); +static void awi_recv_asresp(struct awi_softc *sc, struct mbuf *m0); +static int awi_mib(struct awi_softc *sc, u_int8_t cmd, u_int8_t mib); +static int awi_cmd_scan(struct awi_softc *sc); +static int awi_cmd(struct awi_softc *sc, u_int8_t cmd); +static void awi_cmd_done(struct awi_softc *sc); +static int awi_next_txd(struct awi_softc *sc, int len, u_int32_t *framep, u_int32_t*ntxdp); +static int awi_lock(struct awi_softc *sc); +static void awi_unlock(struct awi_softc *sc); +static int awi_intr_lock(struct awi_softc *sc); +static void awi_intr_unlock(struct awi_softc *sc); +static int awi_cmd_wait(struct awi_softc *sc); +static void awi_print_essid(u_int8_t *essid); #ifdef AWI_DEBUG -static void awi_dump_pkt __P((struct awi_softc *sc, struct mbuf *m, int rssi)); +static void awi_dump_pkt(struct awi_softc *sc, struct mbuf *m, int rssi); int awi_verbose = 0; int awi_dump = 0; #define AWI_DUMP_MASK(fc0) (1 << (((fc0) & IEEE80211_FC0_SUBTYPE_MASK) >> 4)) @@ -241,7 +241,7 @@ devclass_t awi_devclass; #endif /* NetBSD compatible functions */ -static char * ether_sprintf __P((u_int8_t *)); +static char * ether_sprintf(u_int8_t *); static char * ether_sprintf(enaddr) diff --git a/sys/dev/awi/awi_wep.c b/sys/dev/awi/awi_wep.c index f9347c5..750b165 100644 --- a/sys/dev/awi/awi_wep.c +++ b/sys/dev/awi/awi_wep.c @@ -116,12 +116,12 @@ arc4_encrypt(void *ctx, u_int8_t *dst, u_int8_t *src, int len) } #endif -static void awi_crc_init __P((void)); -static u_int32_t awi_crc_update __P((u_int32_t crc, u_int8_t *buf, int len)); +static void awi_crc_init(void); +static u_int32_t awi_crc_update(u_int32_t crc, u_int8_t *buf, int len); -static int awi_null_ctxlen __P((void)); -static void awi_null_setkey __P((void *ctx, u_int8_t *key, int keylen)); -static void awi_null_copy __P((void *ctx, u_int8_t *dst, u_int8_t *src, int len)); +static int awi_null_ctxlen(void); +static void awi_null_setkey(void *ctx, u_int8_t *key, int keylen); +static void awi_null_copy(void *ctx, u_int8_t *dst, u_int8_t *src, int len); /* XXX: the order should be known to wiconfig/user */ diff --git a/sys/dev/awi/awi_wicfg.c b/sys/dev/awi/awi_wicfg.c index 97f9fce..80b8160 100644 --- a/sys/dev/awi/awi_wicfg.c +++ b/sys/dev/awi/awi_wicfg.c @@ -91,8 +91,8 @@ #include #endif -static int awi_cfgget __P((struct ifnet *ifp, u_long cmd, caddr_t data)); -static int awi_cfgset __P((struct ifnet *ifp, u_long cmd, caddr_t data)); +static int awi_cfgget(struct ifnet *ifp, u_long cmd, caddr_t data); +static int awi_cfgset(struct ifnet *ifp, u_long cmd, caddr_t data); int awi_wicfg(ifp, cmd, data) diff --git a/sys/dev/awi/awivar.h b/sys/dev/awi/awivar.h index 8e86f84..a55b6a7 100644 --- a/sys/dev/awi/awivar.h +++ b/sys/dev/awi/awivar.h @@ -81,10 +81,10 @@ struct awi_bss struct awi_wep_algo { char *awa_name; - int (*awa_ctxlen) __P((void)); - void (*awa_setkey) __P((void *, u_char *, int)); - void (*awa_encrypt) __P((void *, u_char *, u_char *, int)); - void (*awa_decrypt) __P((void *, u_char *, u_char *, int)); + int (*awa_ctxlen)(void); + void (*awa_setkey)(void *, u_char *, int); + void (*awa_encrypt)(void *, u_char *, u_char *, int); + void (*awa_decrypt)(void *, u_char *, u_char *, int); }; struct awi_softc @@ -106,8 +106,8 @@ struct awi_softc #endif struct am79c930_softc sc_chip; struct ifnet *sc_ifp; - int (*sc_enable) __P((struct awi_softc *)); - void (*sc_disable) __P((struct awi_softc *)); + int (*sc_enable)(struct awi_softc *); + void (*sc_disable)(struct awi_softc *); struct ifmedia sc_media; enum awi_status sc_status; @@ -199,24 +199,24 @@ struct awi_softc #define AWI_80211_RATE(rate) (((rate) & 0x7f) * 5) -int awi_attach __P((struct awi_softc *)); -int awi_intr __P((void *)); -void awi_reset __P((struct awi_softc *)); +int awi_attach(struct awi_softc *); +int awi_intr(void *); +void awi_reset(struct awi_softc *); #ifdef __NetBSD__ -int awi_activate __P((struct device *, enum devact)); -int awi_detach __P((struct awi_softc *)); -void awi_power __P((struct awi_softc *, int)); +int awi_activate(struct device *, enum devact); +int awi_detach(struct awi_softc *); +void awi_power(struct awi_softc *, int); #endif -void awi_stop __P((struct awi_softc *sc)); -int awi_init __P((struct awi_softc *sc)); -int awi_init_region __P((struct awi_softc *)); -int awi_wicfg __P((struct ifnet *, u_long, caddr_t)); - -int awi_wep_setnwkey __P((struct awi_softc *, struct ieee80211_nwkey *)); -int awi_wep_getnwkey __P((struct awi_softc *, struct ieee80211_nwkey *)); -int awi_wep_getalgo __P((struct awi_softc *)); -int awi_wep_setalgo __P((struct awi_softc *, int)); -int awi_wep_setkey __P((struct awi_softc *, int, unsigned char *, int)); -int awi_wep_getkey __P((struct awi_softc *, int, unsigned char *, int *)); -struct mbuf *awi_wep_encrypt __P((struct awi_softc *, struct mbuf *, int)); +void awi_stop(struct awi_softc *sc); +int awi_init(struct awi_softc *sc); +int awi_init_region(struct awi_softc *); +int awi_wicfg(struct ifnet *, u_long, caddr_t); + +int awi_wep_setnwkey(struct awi_softc *, struct ieee80211_nwkey *); +int awi_wep_getnwkey(struct awi_softc *, struct ieee80211_nwkey *); +int awi_wep_getalgo(struct awi_softc *); +int awi_wep_setalgo(struct awi_softc *, int); +int awi_wep_setkey(struct awi_softc *, int, unsigned char *, int); +int awi_wep_getkey(struct awi_softc *, int, unsigned char *, int *); +struct mbuf *awi_wep_encrypt(struct awi_softc *, struct mbuf *, int); -- cgit v1.1