diff options
Diffstat (limited to 'sys/dev/isa')
101 files changed, 1203 insertions, 1204 deletions
diff --git a/sys/dev/isa/ad1848.c b/sys/dev/isa/ad1848.c index e0bbc384ed8..0c243868cf3 100644 --- a/sys/dev/isa/ad1848.c +++ b/sys/dev/isa/ad1848.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ad1848.c,v 1.24 2002/01/20 19:56:53 ericj Exp $ */ +/* $OpenBSD: ad1848.c,v 1.25 2002/03/14 01:26:56 millert Exp $ */ /* $NetBSD: ad1848.c,v 1.45 1998/01/30 02:02:38 augustss Exp $ */ /* @@ -146,14 +146,14 @@ static int ad1848_init_values[] = { 0 /* lower record count */ }; -void ad1848_reset __P((struct ad1848_softc *)); -int ad1848_set_speed __P((struct ad1848_softc *, u_long *)); -void ad1848_mute_monitor __P((void *, int)); +void ad1848_reset(struct ad1848_softc *); +int ad1848_set_speed(struct ad1848_softc *, u_long *); +void ad1848_mute_monitor(void *, int); -static int ad_read __P((struct ad1848_softc *, int)); -static void ad_write __P((struct ad1848_softc *, int, int)); -static void ad_set_MCE __P((struct ad1848_softc *, int)); -static void wait_for_calibration __P((struct ad1848_softc *)); +static int ad_read(struct ad1848_softc *, int); +static void ad_write(struct ad1848_softc *, int, int); +static void ad_set_MCE(struct ad1848_softc *, int); +static void wait_for_calibration(struct ad1848_softc *); #define ADREAD(sc, addr) bus_space_read_1((sc)->sc_iot, (sc)->sc_ioh, (sc)->sc_iooffs+(addr)) #define ADWRITE(sc, addr, data) bus_space_write_1((sc)->sc_iot, (sc)->sc_ioh, (sc)->sc_iooffs+(addr), (data)) @@ -245,7 +245,7 @@ wait_for_calibration(sc) } #ifdef AUDIO_DEBUG -void ad1848_dump_regs __P((struct ad1848_softc *)); +void ad1848_dump_regs(struct ad1848_softc *); void ad1848_dump_regs(sc) @@ -771,7 +771,7 @@ ad1848_get_mic_gain(sc, gp) } -static ad1848_devmap_t *ad1848_mixer_find_dev __P((ad1848_devmap_t *, int, mixer_ctrl_t *)); +static ad1848_devmap_t *ad1848_mixer_find_dev(ad1848_devmap_t *, int, mixer_ctrl_t *); static ad1848_devmap_t * ad1848_mixer_find_dev(map, cnt, cp) @@ -1017,8 +1017,8 @@ ad1848_set_params(addr, setmode, usemode, p, r) { struct ad1848_softc *sc = addr; int error, bits, enc; - void (*pswcode) __P((void *, u_char *buf, int cnt)); - void (*rswcode) __P((void *, u_char *buf, int cnt)); + void (*pswcode)(void *, u_char *buf, int cnt); + void (*rswcode)(void *, u_char *buf, int cnt); DPRINTF(("ad1848_set_params: %d %d %d %ld\n", p->encoding, p->precision, p->channels, p->sample_rate)); @@ -1465,7 +1465,7 @@ ad1848_dma_input(addr, p, cc, intr, arg) void *addr; void *p; int cc; - void (*intr) __P((void *)); + void (*intr)(void *); void *arg; { struct ad1848_softc *sc = addr; @@ -1550,7 +1550,7 @@ ad1848_dma_output(addr, p, cc, intr, arg) void *addr; void *p; int cc; - void (*intr) __P((void *)); + void (*intr)(void *); void *arg; { struct ad1848_softc *sc = addr; diff --git a/sys/dev/isa/ad1848var.h b/sys/dev/isa/ad1848var.h index 0a776ce2df4..00687e6eda8 100644 --- a/sys/dev/isa/ad1848var.h +++ b/sys/dev/isa/ad1848var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ad1848var.h,v 1.10 2002/01/20 19:56:53 ericj Exp $ */ +/* $OpenBSD: ad1848var.h,v 1.11 2002/03/14 01:26:56 millert Exp $ */ /* $NetBSD: ad1848var.h,v 1.22 1998/01/19 22:18:26 augustss Exp $ */ /* @@ -139,8 +139,8 @@ typedef struct ad1848_devmap { int dev; } ad1848_devmap_t; -static __inline int ad1848_to_vol __P((mixer_ctrl_t *, struct ad1848_volume *)); -static __inline int ad1848_from_vol __P((mixer_ctrl_t *, struct ad1848_volume *)); +static __inline int ad1848_to_vol(mixer_ctrl_t *, struct ad1848_volume *); +static __inline int ad1848_from_vol(mixer_ctrl_t *, struct ad1848_volume *); static __inline int ad1848_to_vol(cp, vol) @@ -177,52 +177,52 @@ ad1848_from_vol(cp, vol) } -int ad1848_mixer_get_port __P((struct ad1848_softc *, ad1848_devmap_t *, int cnt, mixer_ctrl_t *)); -int ad1848_mixer_set_port __P((struct ad1848_softc *, ad1848_devmap_t *, int, mixer_ctrl_t *)); -int ad1848_mapprobe __P((struct ad1848_softc *, int)); -int ad1848_probe __P((struct ad1848_softc *)); -void ad1848_unmap __P((struct ad1848_softc *)); -void ad1848_attach __P((struct ad1848_softc *)); +int ad1848_mixer_get_port(struct ad1848_softc *, ad1848_devmap_t *, int cnt, mixer_ctrl_t *); +int ad1848_mixer_set_port(struct ad1848_softc *, ad1848_devmap_t *, int, mixer_ctrl_t *); +int ad1848_mapprobe(struct ad1848_softc *, int); +int ad1848_probe(struct ad1848_softc *); +void ad1848_unmap(struct ad1848_softc *); +void ad1848_attach(struct ad1848_softc *); -int ad1848_open __P((void *, int)); -void ad1848_close __P((void *)); +int ad1848_open(void *, int); +void ad1848_close(void *); -void ad1848_forceintr __P((struct ad1848_softc *)); +void ad1848_forceintr(struct ad1848_softc *); -int ad1848_query_encoding __P((void *, struct audio_encoding *)); -int ad1848_set_params __P((void *, int, int, struct audio_params *, struct audio_params *)); +int ad1848_query_encoding(void *, struct audio_encoding *); +int ad1848_set_params(void *, int, int, struct audio_params *, struct audio_params *); -int ad1848_round_blocksize __P((void *, int)); +int ad1848_round_blocksize(void *, int); -int ad1848_dma_init_output __P((void *, void *, int)); -int ad1848_dma_init_input __P((void *, void *, int)); +int ad1848_dma_init_output(void *, void *, int); +int ad1848_dma_init_input(void *, void *, int); int ad1848_dma_output __P((void *, void *, int, void (*)(void *), void*)); int ad1848_dma_input __P((void *, void *, int, void (*)(void *), void*)); -int ad1848_commit_settings __P((void *)); +int ad1848_commit_settings(void *); -int ad1848_halt_in_dma __P((void *)); -int ad1848_halt_out_dma __P((void *)); +int ad1848_halt_in_dma(void *); +int ad1848_halt_out_dma(void *); -int ad1848_intr __P((void *)); +int ad1848_intr(void *); -int ad1848_set_rec_port __P((struct ad1848_softc *, int)); -int ad1848_get_rec_port __P((struct ad1848_softc *)); +int ad1848_set_rec_port(struct ad1848_softc *, int); +int ad1848_get_rec_port(struct ad1848_softc *); -int ad1848_set_channel_gain __P((struct ad1848_softc *, int, struct ad1848_volume *)); -int ad1848_get_device_gain __P((struct ad1848_softc *, int, struct ad1848_volume *)); -int ad1848_set_rec_gain __P((struct ad1848_softc *, struct ad1848_volume *)); -int ad1848_get_rec_gain __P((struct ad1848_softc *, struct ad1848_volume *)); +int ad1848_set_channel_gain(struct ad1848_softc *, int, struct ad1848_volume *); +int ad1848_get_device_gain(struct ad1848_softc *, int, struct ad1848_volume *); +int ad1848_set_rec_gain(struct ad1848_softc *, struct ad1848_volume *); +int ad1848_get_rec_gain(struct ad1848_softc *, struct ad1848_volume *); /* Note: The mic pre-MUX gain is not a variable gain, it's 20dB or 0dB */ -int ad1848_set_mic_gain __P((struct ad1848_softc *, struct ad1848_volume *)); -int ad1848_get_mic_gain __P((struct ad1848_softc *, struct ad1848_volume *)); -void ad1848_mute_channel __P((struct ad1848_softc *, int device, int mute)); +int ad1848_set_mic_gain(struct ad1848_softc *, struct ad1848_volume *); +int ad1848_get_mic_gain(struct ad1848_softc *, struct ad1848_volume *); +void ad1848_mute_channel(struct ad1848_softc *, int device, int mute); -void *ad1848_malloc __P((void *, int, size_t, int, int)); -void ad1848_free __P((void *, void *, int)); -size_t ad1848_round __P((void *, int, size_t)); -paddr_t ad1848_mappage __P((void *, void *, off_t, int)); +void *ad1848_malloc(void *, int, size_t, int, int); +void ad1848_free(void *, void *, int); +size_t ad1848_round(void *, int, size_t); +paddr_t ad1848_mappage(void *, void *, off_t, int); -int ad1848_get_props __P((void *)); +int ad1848_get_props(void *); #endif diff --git a/sys/dev/isa/addcom_isa.c b/sys/dev/isa/addcom_isa.c index c199492935b..35a91988e73 100644 --- a/sys/dev/isa/addcom_isa.c +++ b/sys/dev/isa/addcom_isa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: addcom_isa.c,v 1.5 2001/08/22 05:26:37 jason Exp $ */ +/* $OpenBSD: addcom_isa.c,v 1.6 2002/03/14 01:26:56 millert Exp $ */ /* $NetBSD: addcom_isa.c,v 1.2 2000/04/21 20:13:41 explorer Exp $ */ /* @@ -106,10 +106,10 @@ static int slave_iobases[8] = { 0x208 }; -int addcomprobe __P((struct device *, void *, void *)); -void addcomattach __P((struct device *, struct device *, void *)); -int addcomintr __P((void *)); -int addcomprint __P((void *, const char *)); +int addcomprobe(struct device *, void *, void *); +void addcomattach(struct device *, struct device *, void *); +int addcomintr(void *); +int addcomprint(void *, const char *); struct cfattach addcom_isa_ca = { sizeof(struct addcom_softc), addcomprobe, addcomattach, diff --git a/sys/dev/isa/aha.c b/sys/dev/isa/aha.c index fbc80a59965..71850dada37 100644 --- a/sys/dev/isa/aha.c +++ b/sys/dev/isa/aha.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aha.c,v 1.42 2002/01/24 22:38:03 mickey Exp $ */ +/* $OpenBSD: aha.c,v 1.43 2002/03/14 01:26:56 millert Exp $ */ /* $NetBSD: aha.c,v 1.11 1996/05/12 23:51:23 mycroft Exp $ */ #undef AHADIAG @@ -139,25 +139,25 @@ struct aha_softc { int aha_debug = 1; #endif /* AHADEBUG */ -int aha_cmd __P((int, struct aha_softc *, int, u_char *, int, u_char *)); -integrate void aha_finish_ccbs __P((struct aha_softc *)); -int ahaintr __P((void *)); -integrate void aha_reset_ccb __P((struct aha_softc *, struct aha_ccb *)); -void aha_free_ccb __P((struct aha_softc *, struct aha_ccb *)); -integrate void aha_init_ccb __P((struct aha_softc *, struct aha_ccb *)); -struct aha_ccb *aha_get_ccb __P((struct aha_softc *, int)); -struct aha_ccb *aha_ccb_phys_kv __P((struct aha_softc *, u_long)); -void aha_queue_ccb __P((struct aha_softc *, struct aha_ccb *)); -void aha_collect_mbo __P((struct aha_softc *)); -void aha_start_ccbs __P((struct aha_softc *)); -void aha_done __P((struct aha_softc *, struct aha_ccb *)); -int aha_find __P((struct isa_attach_args *, struct aha_softc *, int)); -void aha_init __P((struct aha_softc *)); -void aha_inquire_setup_information __P((struct aha_softc *)); -void ahaminphys __P((struct buf *)); -int aha_scsi_cmd __P((struct scsi_xfer *)); -int aha_poll __P((struct aha_softc *, struct scsi_xfer *, int)); -void aha_timeout __P((void *arg)); +int aha_cmd(int, struct aha_softc *, int, u_char *, int, u_char *); +integrate void aha_finish_ccbs(struct aha_softc *); +int ahaintr(void *); +integrate void aha_reset_ccb(struct aha_softc *, struct aha_ccb *); +void aha_free_ccb(struct aha_softc *, struct aha_ccb *); +integrate void aha_init_ccb(struct aha_softc *, struct aha_ccb *); +struct aha_ccb *aha_get_ccb(struct aha_softc *, int); +struct aha_ccb *aha_ccb_phys_kv(struct aha_softc *, u_long); +void aha_queue_ccb(struct aha_softc *, struct aha_ccb *); +void aha_collect_mbo(struct aha_softc *); +void aha_start_ccbs(struct aha_softc *); +void aha_done(struct aha_softc *, struct aha_ccb *); +int aha_find(struct isa_attach_args *, struct aha_softc *, int); +void aha_init(struct aha_softc *); +void aha_inquire_setup_information(struct aha_softc *); +void ahaminphys(struct buf *); +int aha_scsi_cmd(struct scsi_xfer *); +int aha_poll(struct aha_softc *, struct scsi_xfer *, int); +void aha_timeout(void *arg); struct scsi_adapter aha_switch = { aha_scsi_cmd, @@ -174,9 +174,9 @@ struct scsi_device aha_dev = { NULL, /* Use default 'done' routine */ }; -int aha_isapnp_probe __P((struct device *, void *, void *)); -int ahaprobe __P((struct device *, void *, void *)); -void ahaattach __P((struct device *, struct device *, void *)); +int aha_isapnp_probe(struct device *, void *, void *); +int ahaprobe(struct device *, void *, void *); +void ahaattach(struct device *, struct device *, void *); struct cfattach aha_isapnp_ca = { sizeof(struct aha_softc), aha_isapnp_probe, ahaattach diff --git a/sys/dev/isa/aic_isa.c b/sys/dev/isa/aic_isa.c index a6e19bc68e5..3245b152a69 100644 --- a/sys/dev/isa/aic_isa.c +++ b/sys/dev/isa/aic_isa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aic_isa.c,v 1.3 1999/01/07 06:14:47 niklas Exp $ */ +/* $OpenBSD: aic_isa.c,v 1.4 2002/03/14 01:26:56 millert Exp $ */ /* $NetBSD: aic6360.c,v 1.52 1996/12/10 21:27:51 thorpej Exp $ */ /* @@ -75,8 +75,8 @@ #include <dev/ic/aic6360reg.h> #include <dev/ic/aic6360var.h> -int aic_isa_probe __P((struct device *, void *, void *)); -void aic_isa_attach __P((struct device *, struct device *, void *)); +int aic_isa_probe(struct device *, void *, void *); +void aic_isa_attach(struct device *, struct device *, void *); struct cfattach aic_isa_ca = { sizeof(struct aic_softc), aic_isa_probe, aic_isa_attach diff --git a/sys/dev/isa/aria.c b/sys/dev/isa/aria.c index 3e650286d76..228ce00a0e2 100644 --- a/sys/dev/isa/aria.c +++ b/sys/dev/isa/aria.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aria.c,v 1.6 2001/11/06 19:53:19 miod Exp $ */ +/* $OpenBSD: aria.c,v 1.7 2002/03/14 01:26:56 millert Exp $ */ /* * Copyright (c) 1995, 1996 Roland C. Dowdeswell. All rights reserved. @@ -85,7 +85,7 @@ #define FWRITE 2 #ifdef AUDIO_DEBUG -extern void Dprintf __P((const char *, ...)); +extern void Dprintf(const char *, ...); #define DPRINTF(x) if (ariadebug) Dprintf x int ariadebug = 0; #else @@ -154,53 +154,53 @@ struct { int ariaprobe(); -void ariaattach __P((struct device *, struct device *, void *)); -void ariaclose __P((void *)); -int ariaopen __P((dev_t, int)); -int aria_getdev __P((void *, struct audio_device *)); - -void aria_do_kludge __P((u_short, u_short, u_short, u_short, u_short)); -void aria_prometheus_kludge __P((struct isa_attach_args *)); - -int aria_set_sr __P((void *, u_long)); -u_long aria_get_sr __P((void *)); -int aria_query_encoding __P((void *, struct audio_encoding *)); -int aria_set_format __P((void *, u_int, u_int)); -int aria_get_encoding __P((void *)); -int aria_get_precision __P((void *)); -int aria_set_channels __P((void *, int)); -int aria_get_channels __P((void *)); -int aria_round_blocksize __P((void *, int)); -int aria_set_out_port __P((void *, int)); -int aria_get_out_port __P((void *)); -int aria_set_in_port __P((void *, int)); -int aria_get_in_port __P((void *)); -int aria_speaker_ctl __P((void *, int)); -int aria_commit_settings __P((void *)); +void ariaattach(struct device *, struct device *, void *); +void ariaclose(void *); +int ariaopen(dev_t, int); +int aria_getdev(void *, struct audio_device *); + +void aria_do_kludge(u_short, u_short, u_short, u_short, u_short); +void aria_prometheus_kludge(struct isa_attach_args *); + +int aria_set_sr(void *, u_long); +u_long aria_get_sr(void *); +int aria_query_encoding(void *, struct audio_encoding *); +int aria_set_format(void *, u_int, u_int); +int aria_get_encoding(void *); +int aria_get_precision(void *); +int aria_set_channels(void *, int); +int aria_get_channels(void *); +int aria_round_blocksize(void *, int); +int aria_set_out_port(void *, int); +int aria_get_out_port(void *); +int aria_set_in_port(void *, int); +int aria_get_in_port(void *); +int aria_speaker_ctl(void *, int); +int aria_commit_settings(void *); int aria_start_output __P((void *, void *, int, void (*)(), void*)); int aria_start_input __P((void *, void *, int, void (*)(), void*)); -int aria_halt_input __P((void *)); -int aria_halt_output __P((void *)); -int aria_cont __P((void *)); +int aria_halt_input(void *); +int aria_halt_output(void *); +int aria_cont(void *); -int aria_sendcmd __P((u_short, u_short, int, int, int)); +int aria_sendcmd(u_short, u_short, int, int, int); -u_short aria_getdspmem __P((u_short, u_short)); -u_short aria_putdspmem __P((u_short, u_short, u_short)); +u_short aria_getdspmem(u_short, u_short); +u_short aria_putdspmem(u_short, u_short, u_short); -int aria_intr __P((void *)); -short ariaversion __P((struct aria_softc *)); +int aria_intr(void *); +short ariaversion(struct aria_softc *); -int aria_setfd __P((void *, int)); +int aria_setfd(void *, int); -void aria_mix_write __P((struct aria_softc *, int, int)); -int aria_mix_read __P((struct aria_softc *, int)); +void aria_mix_write(struct aria_softc *, int, int); +int aria_mix_read(struct aria_softc *, int); -int aria_mixer_set_port __P((void *, mixer_ctrl_t *)); -int aria_mixer_get_port __P((void *, mixer_ctrl_t *)); -int aria_mixer_query_devinfo __P((void *, mixer_devinfo_t *)); +int aria_mixer_set_port(void *, mixer_ctrl_t *); +int aria_mixer_get_port(void *, mixer_ctrl_t *); +int aria_mixer_query_devinfo(void *, mixer_devinfo_t *); /* * Mixer defines... diff --git a/sys/dev/isa/ast.c b/sys/dev/isa/ast.c index fb51817eee6..20a498c404f 100644 --- a/sys/dev/isa/ast.c +++ b/sys/dev/isa/ast.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ast.c,v 1.17 1997/07/07 16:38:22 niklas Exp $ */ +/* $OpenBSD: ast.c,v 1.18 2002/03/14 01:26:56 millert Exp $ */ /* $NetBSD: ast.c,v 1.28 1996/05/12 23:51:45 mycroft Exp $ */ /* @@ -60,10 +60,10 @@ struct ast_softc { bus_space_handle_t sc_slaveioh[NSLAVES]; }; -int astprobe __P((struct device *, void *, void *)); -void astattach __P((struct device *, struct device *, void *)); -int astintr __P((void *)); -int astprint __P((void *, const char *)); +int astprobe(struct device *, void *, void *); +void astattach(struct device *, struct device *, void *); +int astintr(void *); +int astprint(void *, const char *); struct cfattach ast_ca = { sizeof(struct ast_softc), astprobe, astattach diff --git a/sys/dev/isa/bha_isa.c b/sys/dev/isa/bha_isa.c index a920acf974a..e63b9c2d742 100644 --- a/sys/dev/isa/bha_isa.c +++ b/sys/dev/isa/bha_isa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bha_isa.c,v 1.1 2002/01/24 22:38:03 mickey Exp $ */ +/* $OpenBSD: bha_isa.c,v 1.2 2002/03/14 01:26:56 millert Exp $ */ /* $NetBSD: bha_isa.c,v 1.14 1998/08/15 10:10:51 mycroft Exp $ */ /*- @@ -62,8 +62,8 @@ int nbtports; #define BHA_ISA_IOSIZE 4 -int bha_isa_probe __P((struct device *, void *, void *)); -void bha_isa_attach __P((struct device *, struct device *, void *)); +int bha_isa_probe(struct device *, void *, void *); +void bha_isa_attach(struct device *, struct device *, void *); struct cfattach bha_isa_ca = { sizeof(struct bha_softc), bha_isa_probe, bha_isa_attach diff --git a/sys/dev/isa/boca.c b/sys/dev/isa/boca.c index fe8ec586830..06ce953f5b5 100644 --- a/sys/dev/isa/boca.c +++ b/sys/dev/isa/boca.c @@ -1,4 +1,4 @@ -/* $OpenBSD: boca.c,v 1.15 1997/07/07 16:38:23 niklas Exp $ */ +/* $OpenBSD: boca.c,v 1.16 2002/03/14 01:26:56 millert Exp $ */ /* $NetBSD: boca.c,v 1.15 1996/05/12 23:51:50 mycroft Exp $ */ /* @@ -60,10 +60,10 @@ struct boca_softc { bus_space_handle_t sc_slaveioh[NSLAVES]; }; -int bocaprobe __P((struct device *, void *, void *)); -void bocaattach __P((struct device *, struct device *, void *)); -int bocaintr __P((void *)); -int bocaprint __P((void *, const char *)); +int bocaprobe(struct device *, void *, void *); +void bocaattach(struct device *, struct device *, void *); +int bocaintr(void *); +int bocaprint(void *, const char *); struct cfattach boca_ca = { sizeof(struct boca_softc), bocaprobe, bocaattach, diff --git a/sys/dev/isa/cs4231var.h b/sys/dev/isa/cs4231var.h index 9ae2b516d61..d6d5f294dd0 100644 --- a/sys/dev/isa/cs4231var.h +++ b/sys/dev/isa/cs4231var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cs4231var.h,v 1.2 1996/03/08 16:42:53 niklas Exp $ */ +/* $OpenBSD: cs4231var.h,v 1.3 2002/03/14 01:26:56 millert Exp $ */ /* $NetBSD: cs4231var.h,v 1.2 1996/02/05 02:21:51 jtc Exp $ */ /*- @@ -49,10 +49,10 @@ struct cs4231_softc { #define CS4231_MUX_LINE_IN 3 }; -int cs4231_set_linein_gain __P((struct ad1848_softc *, struct ad1848_volume *)); -int cs4231_get_linein_gain __P((struct ad1848_softc *, struct ad1848_volume *)); -int cs4231_set_mono_gain __P((struct ad1848_softc *, struct ad1848_volume *)); -int cs4231_get_mono_gain __P((struct ad1848_softc *, struct ad1848_volume *)); -void cs4231_mute_mono __P((struct ad1848_softc *, int /* onoff */)); -void cs4231_mute_line __P((struct ad1848_softc *, int /* onoff */)); -void cs4231_mute_monitor __P((struct ad1848_softc *, int /* onoff */)); +int cs4231_set_linein_gain(struct ad1848_softc *, struct ad1848_volume *); +int cs4231_get_linein_gain(struct ad1848_softc *, struct ad1848_volume *); +int cs4231_set_mono_gain(struct ad1848_softc *, struct ad1848_volume *); +int cs4231_get_mono_gain(struct ad1848_softc *, struct ad1848_volume *); +void cs4231_mute_mono(struct ad1848_softc *, int /* onoff */); +void cs4231_mute_line(struct ad1848_softc *, int /* onoff */); +void cs4231_mute_monitor(struct ad1848_softc *, int /* onoff */); diff --git a/sys/dev/isa/cy_isa.c b/sys/dev/isa/cy_isa.c index 363e883215a..e151e8f2a88 100644 --- a/sys/dev/isa/cy_isa.c +++ b/sys/dev/isa/cy_isa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cy_isa.c,v 1.6 2001/08/20 04:41:39 smart Exp $ */ +/* $OpenBSD: cy_isa.c,v 1.7 2002/03/14 01:26:56 millert Exp $ */ /* * cy_isa.c @@ -21,8 +21,8 @@ #include <dev/ic/cd1400reg.h> #include <dev/ic/cyreg.h> -static int cy_isa_probe __P((struct device *, void *, void *)); -void cy_isa_attach __P((struct device *, struct device *, void *)); +static int cy_isa_probe(struct device *, void *, void *); +void cy_isa_attach(struct device *, struct device *, void *); struct cfattach cy_isa_ca = { sizeof(struct cy_softc), cy_isa_probe, cy_isa_attach diff --git a/sys/dev/isa/ega.c b/sys/dev/isa/ega.c index 85105dc5cc2..0484b14c20f 100644 --- a/sys/dev/isa/ega.c +++ b/sys/dev/isa/ega.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ega.c,v 1.2 2001/02/02 20:25:39 aaron Exp $ */ +/* $OpenBSD: ega.c,v 1.3 2002/03/14 01:26:56 millert Exp $ */ /* $NetBSD: ega.c,v 1.4.4.1 2000/06/30 16:27:47 simonb Exp $ */ /* @@ -87,7 +87,7 @@ struct ega_config { struct egafont *vc_fonts[4]; struct egascreen *wantedscreen; - void (*switchcb) __P((void *, int, int)); + void (*switchcb)(void *, int, int); void *switchcbarg; struct callout switch_callout; @@ -103,22 +103,22 @@ static int egaconsole, ega_console_attached; static struct egascreen ega_console_screen; static struct ega_config ega_console_dc; -int ega_match __P((struct device *, struct cfdata *, void *)); -void ega_attach __P((struct device *, struct device *, void *)); +int ega_match(struct device *, struct cfdata *, void *); +void ega_attach(struct device *, struct device *, void *); -static int ega_is_console __P((bus_space_tag_t)); -static int ega_probe_col __P((bus_space_tag_t, bus_space_tag_t)); -static int ega_probe_mono __P((bus_space_tag_t, bus_space_tag_t)); -int ega_selectfont __P((struct ega_config *, struct egascreen *, - char *, char *)); -void ega_init_screen __P((struct ega_config *, struct egascreen *, +static int ega_is_console(bus_space_tag_t); +static int ega_probe_col(bus_space_tag_t, bus_space_tag_t); +static int ega_probe_mono(bus_space_tag_t, bus_space_tag_t); +int ega_selectfont(struct ega_config *, struct egascreen *, + char *, char *); +void ega_init_screen(struct ega_config *, struct egascreen *, const struct wsscreen_descr *, - int, long *)); -static void ega_init __P((struct ega_config *, - bus_space_tag_t, bus_space_tag_t, int)); -static void ega_setfont __P((struct ega_config *, struct egascreen *)); -static int ega_alloc_attr __P((void *, int, int, int, long *)); -void ega_copyrows __P((void *, int, int, int)); + int, long *); +static void ega_init(struct ega_config *, + bus_space_tag_t, bus_space_tag_t, int); +static void ega_setfont(struct ega_config *, struct egascreen *); +static int ega_alloc_attr(void *, int, int, int, long *); +void ega_copyrows(void *, int, int, int); struct cfattach ega_ca = { sizeof(struct ega_softc), ega_match, ega_attach, @@ -217,16 +217,16 @@ const struct wsscreen_list ega_screenlist = { _ega_scrlist_mono }; -static int ega_ioctl __P((void *, u_long, caddr_t, int, struct proc *)); -static paddr_t ega_mmap __P((void *, off_t, int)); -static int ega_alloc_screen __P((void *, const struct wsscreen_descr *, - void **, int *, int *, long *)); -static void ega_free_screen __P((void *, void *)); +static int ega_ioctl(void *, u_long, caddr_t, int, struct proc *); +static paddr_t ega_mmap(void *, off_t, int); +static int ega_alloc_screen(void *, const struct wsscreen_descr *, + void **, int *, int *, long *); +static void ega_free_screen(void *, void *); static int ega_show_screen __P((void *, void *, int, void (*) (void *, int, int), void *)); -static int ega_load_font __P((void *, void *, struct wsdisplay_font *)); +static int ega_load_font(void *, void *, struct wsdisplay_font *); -void ega_doswitch __P((struct ega_config *)); +void ega_doswitch(struct ega_config *); const struct wsdisplay_accessops ega_accessops = { ega_ioctl, @@ -673,7 +673,7 @@ ega_show_screen(v, cookie, waitok, cb, cbarg) void *v; void *cookie; int waitok; - void (*cb) __P((void *, int, int)); + void (*cb)(void *, int, int); void *cbarg; { struct egascreen *scr = cookie, *oldscr; diff --git a/sys/dev/isa/egavar.h b/sys/dev/isa/egavar.h index d77447e9f95..73ff9ca52a4 100644 --- a/sys/dev/isa/egavar.h +++ b/sys/dev/isa/egavar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: egavar.h,v 1.2 2001/02/02 20:25:39 aaron Exp $ */ +/* $OpenBSD: egavar.h,v 1.3 2002/03/14 01:26:56 millert Exp $ */ /* $NetBSD: egavar.h,v 1.1 1999/12/13 16:28:57 drochner Exp $ */ /* @@ -33,4 +33,4 @@ * */ -int ega_cnattach __P((bus_space_tag_t, bus_space_tag_t)); +int ega_cnattach(bus_space_tag_t, bus_space_tag_t); diff --git a/sys/dev/isa/elink.h b/sys/dev/isa/elink.h index 97204228ff0..582baed9472 100644 --- a/sys/dev/isa/elink.h +++ b/sys/dev/isa/elink.h @@ -1,4 +1,4 @@ -/* $OpenBSD: elink.h,v 1.5 1999/12/27 21:34:40 fgsch Exp $ */ +/* $OpenBSD: elink.h,v 1.6 2002/03/14 01:26:56 millert Exp $ */ /* $NetBSD: elink.h,v 1.4 1996/04/30 22:16:31 thorpej Exp $ */ /* @@ -37,5 +37,5 @@ #define ELINK_509_POLY 0xcf #define TLINK_619_POLY 0x63 -void elink_reset __P((bus_space_tag_t, bus_space_handle_t, int)); -void elink_idseq __P((bus_space_tag_t, bus_space_handle_t, u_char p)); +void elink_reset(bus_space_tag_t, bus_space_handle_t, int); +void elink_idseq(bus_space_tag_t, bus_space_handle_t, u_char p); diff --git a/sys/dev/isa/ess.c b/sys/dev/isa/ess.c index 8f096e7afcc..88753c9e062 100644 --- a/sys/dev/isa/ess.c +++ b/sys/dev/isa/ess.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ess.c,v 1.6 2002/01/20 19:56:53 ericj Exp $ */ +/* $OpenBSD: ess.c,v 1.7 2002/03/14 01:26:56 millert Exp $ */ /* $NetBSD: ess.c,v 1.44.4.1 1999/06/21 01:18:00 thorpej Exp $ */ /* @@ -113,20 +113,20 @@ struct cfdriver ess_cd = { NULL, "ess", DV_DULL }; -int ess_setup_sc __P((struct ess_softc *, int)); +int ess_setup_sc(struct ess_softc *, int); -int ess_open __P((void *, int)); -void ess_1788_close __P((void *)); -void ess_1888_close __P((void *)); -int ess_getdev __P((void *, struct audio_device *)); -int ess_drain __P((void *)); +int ess_open(void *, int); +void ess_1788_close(void *); +void ess_1888_close(void *); +int ess_getdev(void *, struct audio_device *); +int ess_drain(void *); -int ess_query_encoding __P((void *, struct audio_encoding *)); +int ess_query_encoding(void *, struct audio_encoding *); -int ess_set_params __P((void *, int, int, struct audio_params *, - struct audio_params *)); +int ess_set_params(void *, int, int, struct audio_params *, + struct audio_params *); -int ess_round_blocksize __P((void *, int)); +int ess_round_blocksize(void *, int); int ess_audio1_trigger_output __P((void *, void *, void *, int, void (*)(void *), void *, struct audio_params *)); @@ -134,59 +134,59 @@ int ess_audio2_trigger_output __P((void *, void *, void *, int, void (*)(void *), void *, struct audio_params *)); int ess_audio1_trigger_input __P((void *, void *, void *, int, void (*)(void *), void *, struct audio_params *)); -int ess_audio1_halt __P((void *)); -int ess_audio2_halt __P((void *)); -int ess_audio1_intr __P((void *)); -int ess_audio2_intr __P((void *)); -void ess_audio1_poll __P((void *)); -void ess_audio2_poll __P((void *)); - -int ess_speaker_ctl __P((void *, int)); - -int ess_getdev __P((void *, struct audio_device *)); - -int ess_set_port __P((void *, mixer_ctrl_t *)); -int ess_get_port __P((void *, mixer_ctrl_t *)); - -void *ess_malloc __P((void *, int, size_t, int, int)); -void ess_free __P((void *, void *, int)); -size_t ess_round_buffersize __P((void *, int, size_t)); -paddr_t ess_mappage __P((void *, void *, off_t, int)); - - -int ess_query_devinfo __P((void *, mixer_devinfo_t *)); -int ess_1788_get_props __P((void *)); -int ess_1888_get_props __P((void *)); - -void ess_speaker_on __P((struct ess_softc *)); -void ess_speaker_off __P((struct ess_softc *)); - -int ess_config_addr __P((struct ess_softc *)); -void ess_config_irq __P((struct ess_softc *)); -void ess_config_drq __P((struct ess_softc *)); -void ess_setup __P((struct ess_softc *)); -int ess_identify __P((struct ess_softc *)); - -int ess_reset __P((struct ess_softc *)); -void ess_set_gain __P((struct ess_softc *, int, int)); -int ess_set_in_port __P((struct ess_softc *, int)); -int ess_set_in_ports __P((struct ess_softc *, int)); -u_int ess_srtotc __P((u_int)); -u_int ess_srtofc __P((u_int)); -u_char ess_get_dsp_status __P((struct ess_softc *)); -u_char ess_dsp_read_ready __P((struct ess_softc *)); -u_char ess_dsp_write_ready __P((struct ess_softc *)); -int ess_rdsp __P((struct ess_softc *)); -int ess_wdsp __P((struct ess_softc *, u_char)); -u_char ess_read_x_reg __P((struct ess_softc *, u_char)); -int ess_write_x_reg __P((struct ess_softc *, u_char, u_char)); -void ess_clear_xreg_bits __P((struct ess_softc *, u_char, u_char)); -void ess_set_xreg_bits __P((struct ess_softc *, u_char, u_char)); -u_char ess_read_mix_reg __P((struct ess_softc *, u_char)); -void ess_write_mix_reg __P((struct ess_softc *, u_char, u_char)); -void ess_clear_mreg_bits __P((struct ess_softc *, u_char, u_char)); -void ess_set_mreg_bits __P((struct ess_softc *, u_char, u_char)); -void ess_read_multi_mix_reg __P((struct ess_softc *, u_char, u_int8_t *, bus_size_t)); +int ess_audio1_halt(void *); +int ess_audio2_halt(void *); +int ess_audio1_intr(void *); +int ess_audio2_intr(void *); +void ess_audio1_poll(void *); +void ess_audio2_poll(void *); + +int ess_speaker_ctl(void *, int); + +int ess_getdev(void *, struct audio_device *); + +int ess_set_port(void *, mixer_ctrl_t *); +int ess_get_port(void *, mixer_ctrl_t *); + +void *ess_malloc(void *, int, size_t, int, int); +void ess_free(void *, void *, int); +size_t ess_round_buffersize(void *, int, size_t); +paddr_t ess_mappage(void *, void *, off_t, int); + + +int ess_query_devinfo(void *, mixer_devinfo_t *); +int ess_1788_get_props(void *); +int ess_1888_get_props(void *); + +void ess_speaker_on(struct ess_softc *); +void ess_speaker_off(struct ess_softc *); + +int ess_config_addr(struct ess_softc *); +void ess_config_irq(struct ess_softc *); +void ess_config_drq(struct ess_softc *); +void ess_setup(struct ess_softc *); +int ess_identify(struct ess_softc *); + +int ess_reset(struct ess_softc *); +void ess_set_gain(struct ess_softc *, int, int); +int ess_set_in_port(struct ess_softc *, int); +int ess_set_in_ports(struct ess_softc *, int); +u_int ess_srtotc(u_int); +u_int ess_srtofc(u_int); +u_char ess_get_dsp_status(struct ess_softc *); +u_char ess_dsp_read_ready(struct ess_softc *); +u_char ess_dsp_write_ready(struct ess_softc *); +int ess_rdsp(struct ess_softc *); +int ess_wdsp(struct ess_softc *, u_char); +u_char ess_read_x_reg(struct ess_softc *, u_char); +int ess_write_x_reg(struct ess_softc *, u_char, u_char); +void ess_clear_xreg_bits(struct ess_softc *, u_char, u_char); +void ess_set_xreg_bits(struct ess_softc *, u_char, u_char); +u_char ess_read_mix_reg(struct ess_softc *, u_char); +void ess_write_mix_reg(struct ess_softc *, u_char, u_char); +void ess_clear_mreg_bits(struct ess_softc *, u_char, u_char); +void ess_set_mreg_bits(struct ess_softc *, u_char, u_char); +void ess_read_multi_mix_reg(struct ess_softc *, u_char, u_int8_t *, bus_size_t); static char *essmodel[] = { "unsupported", @@ -269,8 +269,8 @@ struct audio_hw_if ess_1888_hw_if = { }; #ifdef AUDIO_DEBUG -void ess_printsc __P((struct ess_softc *)); -void ess_dump_mixer __P((struct ess_softc *)); +void ess_printsc(struct ess_softc *); +void ess_dump_mixer(struct ess_softc *); void ess_printsc(sc) @@ -1282,7 +1282,7 @@ ess_audio1_trigger_output(addr, start, end, blksize, intr, arg, param) void *addr; void *start, *end; int blksize; - void (*intr) __P((void *)); + void (*intr)(void *); void *arg; struct audio_params *param; { @@ -1360,7 +1360,7 @@ ess_audio2_trigger_output(addr, start, end, blksize, intr, arg, param) void *addr; void *start, *end; int blksize; - void (*intr) __P((void *)); + void (*intr)(void *); void *arg; struct audio_params *param; { @@ -1429,7 +1429,7 @@ ess_audio1_trigger_input(addr, start, end, blksize, intr, arg, param) void *addr; void *start, *end; int blksize; - void (*intr) __P((void *)); + void (*intr)(void *); void *arg; struct audio_params *param; { diff --git a/sys/dev/isa/ess_isapnp.c b/sys/dev/isa/ess_isapnp.c index 56784874d01..08f767cb688 100644 --- a/sys/dev/isa/ess_isapnp.c +++ b/sys/dev/isa/ess_isapnp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ess_isapnp.c,v 1.4 2001/09/21 17:55:43 miod Exp $ */ +/* $OpenBSD: ess_isapnp.c,v 1.5 2002/03/14 01:26:56 millert Exp $ */ /* $NetBSD: ess_isa.c,v 1.4 1999/03/18 20:57:11 mycroft Exp $ */ /*- @@ -57,8 +57,8 @@ #define DPRINTF(x) #endif -int ess_isapnp_probe __P((struct device *, void *, void *)); -void ess_isapnp_attach __P((struct device *, struct device *, void *)); +int ess_isapnp_probe(struct device *, void *, void *); +void ess_isapnp_attach(struct device *, struct device *, void *); struct cfattach ess_isapnp_ca = { sizeof(struct ess_softc), ess_isapnp_probe, ess_isapnp_attach diff --git a/sys/dev/isa/essvar.h b/sys/dev/isa/essvar.h index a3530f682b0..b2163842d7c 100644 --- a/sys/dev/isa/essvar.h +++ b/sys/dev/isa/essvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: essvar.h,v 1.3 2001/01/29 06:27:59 mickey Exp $ */ +/* $OpenBSD: essvar.h,v 1.4 2002/03/14 01:26:56 millert Exp $ */ /* $NetBSD: essvar.h,v 1.14 1999/03/18 06:03:31 mycroft Exp $ */ /* * Copyright 1997 @@ -34,7 +34,7 @@ */ /* -** @(#) $RCSfile: essvar.h,v $ $Revision: 1.3 $ (SHARK) $Date: 2001/01/29 06:27:59 $ +** @(#) $RCSfile: essvar.h,v $ $Revision: 1.4 $ (SHARK) $Date: 2002/03/14 01:26:56 $ ** **++ ** @@ -103,7 +103,7 @@ struct ess_audio_channel int ist; void *ih; /* interrupt vectoring */ u_long nintr; /* number of interrupts taken */ - void (*intr)__P((void*)); /* ISR for DMA complete */ + void (*intr)(void*); /* ISR for DMA complete */ void *arg; /* arg for intr() */ /* Status information */ @@ -159,6 +159,6 @@ struct ess_softc u_int sc_version; /* Legacy ES688/ES1688 ID */ }; -int essmatch __P((struct ess_softc *)); -void essattach __P((struct ess_softc *)); +int essmatch(struct ess_softc *); +void essattach(struct ess_softc *); diff --git a/sys/dev/isa/fd.c b/sys/dev/isa/fd.c index 5e7883f13fa..33af8f328e9 100644 --- a/sys/dev/isa/fd.c +++ b/sys/dev/isa/fd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fd.c,v 1.43 2001/10/26 01:28:06 nate Exp $ */ +/* $OpenBSD: fd.c,v 1.44 2002/03/14 01:26:56 millert Exp $ */ /* $NetBSD: fd.c,v 1.90 1996/05/12 23:12:03 mycroft Exp $ */ /*- @@ -133,8 +133,8 @@ struct fd_softc { }; /* floppy driver configuration */ -int fdprobe __P((struct device *, void *, void *)); -void fdattach __P((struct device *, struct device *, void *)); +int fdprobe(struct device *, void *, void *); +void fdattach(struct device *, struct device *, void *); struct cfattach fd_ca = { sizeof(struct fd_softc), fdprobe, fdattach @@ -144,22 +144,22 @@ struct cfdriver fd_cd = { NULL, "fd", DV_DISK }; -void fdgetdisklabel __P((struct fd_softc *)); -int fd_get_parms __P((struct fd_softc *)); -void fdstrategy __P((struct buf *)); -void fdstart __P((struct fd_softc *)); -int fdintr __P((struct fdc_softc *)); +void fdgetdisklabel(struct fd_softc *); +int fd_get_parms(struct fd_softc *); +void fdstrategy(struct buf *); +void fdstart(struct fd_softc *); +int fdintr(struct fdc_softc *); struct dkdriver fddkdriver = { fdstrategy }; -void fd_set_motor __P((struct fdc_softc *fdc, int reset)); -void fd_motor_off __P((void *arg)); -void fd_motor_on __P((void *arg)); -void fdfinish __P((struct fd_softc *fd, struct buf *bp)); -int fdformat __P((dev_t, struct fd_formb *, struct proc *)); -__inline struct fd_type *fd_dev_to_type __P((struct fd_softc *, dev_t)); -void fdretry __P((struct fd_softc *)); -void fdtimeout __P((void *)); +void fd_set_motor(struct fdc_softc *fdc, int reset); +void fd_motor_off(void *arg); +void fd_motor_on(void *arg); +void fdfinish(struct fd_softc *fd, struct buf *bp); +int fdformat(dev_t, struct fd_formb *, struct proc *); +__inline struct fd_type *fd_dev_to_type(struct fd_softc *, dev_t); +void fdretry(struct fd_softc *); +void fdtimeout(void *); int fdprobe(parent, match, aux) diff --git a/sys/dev/isa/fdc.c b/sys/dev/isa/fdc.c index e78bb96bb99..b6945dbfb0b 100644 --- a/sys/dev/isa/fdc.c +++ b/sys/dev/isa/fdc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fdc.c,v 1.14 2001/03/06 13:55:02 ho Exp $ */ +/* $OpenBSD: fdc.c,v 1.15 2002/03/14 01:26:56 millert Exp $ */ /* $NetBSD: fd.c,v 1.90 1996/05/12 23:12:03 mycroft Exp $ */ /*- @@ -83,8 +83,8 @@ #include "fd.h" /* controller driver configuration */ -int fdcprobe __P((struct device *, void *, void *)); -void fdcattach __P((struct device *, struct device *, void *)); +int fdcprobe(struct device *, void *, void *); +void fdcattach(struct device *, struct device *, void *); struct cfattach fdc_ca = { sizeof(struct fdc_softc), fdcprobe, fdcattach @@ -94,8 +94,8 @@ struct cfdriver fdc_cd = { NULL, "fdc", DV_DULL }; -int fddprint __P((void *, const char *)); -int fdcintr __P((void *)); +int fddprint(void *, const char *); +int fdcintr(void *); int fdcprobe(parent, match, aux) @@ -339,7 +339,7 @@ fdcintr(arg) { #if NFD > 0 struct fdc_softc *fdc = arg; - extern int fdintr __P((struct fdc_softc *)); + extern int fdintr(struct fdc_softc *); /* Will switch on device type, shortly. */ return (fdintr(fdc)); diff --git a/sys/dev/isa/fdlink.h b/sys/dev/isa/fdlink.h index d088738b400..cf970313e49 100644 --- a/sys/dev/isa/fdlink.h +++ b/sys/dev/isa/fdlink.h @@ -1,4 +1,4 @@ -/* $OpenBSD: fdlink.h,v 1.5 2001/03/06 13:55:02 ho Exp $ */ +/* $OpenBSD: fdlink.h,v 1.6 2002/03/14 01:26:56 millert Exp $ */ /*- * Copyright (c) 1993, 1994, 1995 Charles Hannum. @@ -118,11 +118,11 @@ struct fdc_attach_args { }; /* Functions from fdc.c. */ -int fdcresult __P((struct fdc_softc *)); -int out_fdc __P((bus_space_tag_t, bus_space_handle_t, u_char)); -void fdcstart __P((struct fdc_softc *)); -void fdcstatus __P((struct device *, int, char *)); -void fdcpseudointr __P((void *)); +int fdcresult(struct fdc_softc *); +int out_fdc(bus_space_tag_t, bus_space_handle_t, u_char); +void fdcstart(struct fdc_softc *); +void fdcstatus(struct device *, int, char *); +void fdcpseudointr(void *); /* Functions from fd.c. */ -struct fd_type *fd_nvtotype __P((char *, int, int)); +struct fd_type *fd_nvtotype(char *, int, int); diff --git a/sys/dev/isa/gus.c b/sys/dev/isa/gus.c index 4143292f8a6..b440b140d41 100644 --- a/sys/dev/isa/gus.c +++ b/sys/dev/isa/gus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gus.c,v 1.23 2001/01/29 05:30:30 mickey Exp $ */ +/* $OpenBSD: gus.c,v 1.24 2002/03/14 01:26:56 millert Exp $ */ /* $NetBSD: gus.c,v 1.51 1998/01/25 23:48:06 mycroft Exp $ */ /*- @@ -466,7 +466,7 @@ gusmax_dma_output(addr, buf, size, intr, arg) void * addr; void *buf; int size; - void (*intr) __P((void *)); + void (*intr)(void *); void *arg; { struct ad1848_softc *ac = addr; @@ -524,7 +524,7 @@ gus_dma_output(addr, buf, size, intr, arg) void * addr; void *buf; int size; - void (*intr) __P((void *)); + void (*intr)(void *); void *arg; { struct gus_softc *sc = addr; @@ -918,7 +918,7 @@ gus_dmaout_dointr(sc) */ if (sc->sc_dmaoutintr && sc->sc_bufcnt < sc->sc_nbufs) { /* clean out to prevent double calls */ - void (*pfunc) __P((void *)) = sc->sc_dmaoutintr; + void (*pfunc)(void *) = sc->sc_dmaoutintr; void *arg = sc->sc_outarg; sc->sc_outarg = 0; @@ -1063,7 +1063,7 @@ gus_voice_intr(sc) printf("gusdmaout botch?\n"); else { /* clean out to avoid double calls */ - void (*pfunc) __P((void *)) = sc->sc_dmaoutintr; + void (*pfunc)(void *) = sc->sc_dmaoutintr; void *arg = sc->sc_outarg; sc->sc_outarg = 0; @@ -2268,7 +2268,7 @@ gusmax_dma_input(addr, buf, size, callback, arg) void * addr; void *buf; int size; - void (*callback) __P((void *)); + void (*callback)(void *); void *arg; { struct ad1848_softc *sc = addr; @@ -2284,7 +2284,7 @@ gus_dma_input(addr, buf, size, callback, arg) void * addr; void *buf; int size; - void (*callback) __P((void *)); + void (*callback)(void *); void *arg; { struct gus_softc *sc = addr; @@ -2334,7 +2334,7 @@ int gus_dmain_intr(sc) struct gus_softc *sc; { - void (*callback) __P((void *)); + void (*callback)(void *); void *arg; DMAPRINTF(("gus_dmain_intr called\n")); diff --git a/sys/dev/isa/gus_isa.c b/sys/dev/isa/gus_isa.c index 3bba9839f1d..5144a526691 100644 --- a/sys/dev/isa/gus_isa.c +++ b/sys/dev/isa/gus_isa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gus_isa.c,v 1.2 2001/01/29 05:30:31 mickey Exp $ */ +/* $OpenBSD: gus_isa.c,v 1.3 2002/03/14 01:26:56 millert Exp $ */ /* $NetBSD: gus.c,v 1.51 1998/01/25 23:48:06 mycroft Exp $ */ /*- @@ -134,8 +134,8 @@ * ISA bus driver routines */ -int gus_isa_match __P((struct device *, void *, void *)); -void gus_isa_attach __P((struct device *, struct device *, void *)); +int gus_isa_match(struct device *, void *, void *); +void gus_isa_attach(struct device *, struct device *, void *); struct cfattach gus_isa_ca = { sizeof(struct gus_softc), gus_isa_match, gus_isa_attach, diff --git a/sys/dev/isa/gus_isapnp.c b/sys/dev/isa/gus_isapnp.c index be932a64d2c..0700ce4745f 100644 --- a/sys/dev/isa/gus_isapnp.c +++ b/sys/dev/isa/gus_isapnp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gus_isapnp.c,v 1.2 2001/01/29 05:30:31 mickey Exp $ */ +/* $OpenBSD: gus_isapnp.c,v 1.3 2002/03/14 01:26:56 millert Exp $ */ /* $NetBSD: gus.c,v 1.51 1998/01/25 23:48:06 mycroft Exp $ */ /*- @@ -130,8 +130,8 @@ #include "gusreg.h" #include "gusvar.h" -int gus_isapnp_match __P((struct device *, void *, void *)); -void gus_isapnp_attach __P((struct device *, struct device *, void *)); +int gus_isapnp_match(struct device *, void *, void *); +void gus_isapnp_attach(struct device *, struct device *, void *); struct cfattach gus_isapnp_ca = { sizeof(struct gus_softc), gus_isapnp_match, gus_isapnp_attach diff --git a/sys/dev/isa/gusvar.h b/sys/dev/isa/gusvar.h index 155154dad82..167bded51ba 100644 --- a/sys/dev/isa/gusvar.h +++ b/sys/dev/isa/gusvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: gusvar.h,v 1.3 2001/01/29 05:30:31 mickey Exp $ */ +/* $OpenBSD: gusvar.h,v 1.4 2002/03/14 01:26:56 millert Exp $ */ /* $NetBSD: gus.c,v 1.51 1998/01/25 23:48:06 mycroft Exp $ */ /*- @@ -178,19 +178,19 @@ struct gus_softc { u_char sc_out_port; /* Current out port (generic only) */ u_char sc_in_port; /* keep track of it when no codec */ - void (*sc_dmaoutintr) __P((void*)); /* DMA completion intr handler */ + void (*sc_dmaoutintr)(void*); /* DMA completion intr handler */ void *sc_outarg; /* argument for sc_dmaoutintr() */ u_char *sc_dmaoutaddr; /* for isadma_done */ u_long sc_gusaddr; /* where did we just put it? */ int sc_dmaoutcnt; /* for isadma_done */ - void (*sc_dmainintr) __P((void*)); /* DMA completion intr handler */ + void (*sc_dmainintr)(void*); /* DMA completion intr handler */ void *sc_inarg; /* argument for sc_dmaoutintr() */ u_char *sc_dmainaddr; /* for isadma_done */ int sc_dmaincnt; /* for isadma_done */ struct stereo_dma_intr { - void (*intr)__P((void *)); + void (*intr)(void *); void *arg; u_char *buffer; u_long dmabuf; @@ -311,82 +311,82 @@ extern int dmarecord_index; * local routines */ -int gusopen __P((void *, int)); -void gusclose __P((void *)); -void gusmax_close __P((void *)); -int gusintr __P((void *)); -int gus_set_in_gain __P((caddr_t, u_int, u_char)); -int gus_get_in_gain __P((caddr_t)); -int gus_set_out_gain __P((caddr_t, u_int, u_char)); -int gus_get_out_gain __P((caddr_t)); -int gus_set_params __P((void *, int, int, struct audio_params *, struct audio_params *)); -int gusmax_set_params __P((void *, int, int, struct audio_params *, struct audio_params *)); -int gus_round_blocksize __P((void *, int)); -int gus_commit_settings __P((void *)); +int gusopen(void *, int); +void gusclose(void *); +void gusmax_close(void *); +int gusintr(void *); +int gus_set_in_gain(caddr_t, u_int, u_char); +int gus_get_in_gain(caddr_t); +int gus_set_out_gain(caddr_t, u_int, u_char); +int gus_get_out_gain(caddr_t); +int gus_set_params(void *, int, int, struct audio_params *, struct audio_params *); +int gusmax_set_params(void *, int, int, struct audio_params *, struct audio_params *); +int gus_round_blocksize(void *, int); +int gus_commit_settings(void *); int gus_dma_output __P((void *, void *, int, void (*)(void *), void *)); int gus_dma_input __P((void *, void *, int, void (*)(void *), void *)); -int gus_halt_out_dma __P((void *)); -int gus_halt_in_dma __P((void *)); -int gus_speaker_ctl __P((void *, int)); -int gusmaxopen __P((void *, int)); -int gusmax_round_blocksize __P((void *, int)); -int gusmax_commit_settings __P((void *)); +int gus_halt_out_dma(void *); +int gus_halt_in_dma(void *); +int gus_speaker_ctl(void *, int); +int gusmaxopen(void *, int); +int gusmax_round_blocksize(void *, int); +int gusmax_commit_settings(void *); int gusmax_dma_output __P((void *, void *, int, void (*)(void *), void *)); int gusmax_dma_input __P((void *, void *, int, void (*)(void *), void *)); -int gusmax_halt_out_dma __P((void *)); -int gusmax_halt_in_dma __P((void *)); -int gusmax_speaker_ctl __P((void *, int)); -int gus_getdev __P((void *, struct audio_device *)); - -void gus_deinterleave __P((struct gus_softc *, void *, int)); - -int gus_mic_ctl __P((void *, int)); -int gus_linein_ctl __P((void *, int)); -int gus_test_iobase __P((bus_space_tag_t, int)); -void guspoke __P((bus_space_tag_t, bus_space_handle_t, long, u_char)); -void gusdmaout __P((struct gus_softc *, int, u_long, caddr_t, int)); -int gus_init_cs4231 __P((struct gus_softc *)); -void gus_init_ics2101 __P((struct gus_softc *)); - -void gus_set_chan_addrs __P((struct gus_softc *)); -void gusreset __P((struct gus_softc *, int)); -void gus_set_voices __P((struct gus_softc *, int)); -void gus_set_volume __P((struct gus_softc *, int, int)); -void gus_set_samprate __P((struct gus_softc *, int, int)); -void gus_set_recrate __P((struct gus_softc *, u_long)); -void gus_start_voice __P((struct gus_softc *, int, int)); -void gus_stop_voice __P((struct gus_softc *, int, int)); -void gus_set_endaddr __P((struct gus_softc *, int, u_long)); +int gusmax_halt_out_dma(void *); +int gusmax_halt_in_dma(void *); +int gusmax_speaker_ctl(void *, int); +int gus_getdev(void *, struct audio_device *); + +void gus_deinterleave(struct gus_softc *, void *, int); + +int gus_mic_ctl(void *, int); +int gus_linein_ctl(void *, int); +int gus_test_iobase(bus_space_tag_t, int); +void guspoke(bus_space_tag_t, bus_space_handle_t, long, u_char); +void gusdmaout(struct gus_softc *, int, u_long, caddr_t, int); +int gus_init_cs4231(struct gus_softc *); +void gus_init_ics2101(struct gus_softc *); + +void gus_set_chan_addrs(struct gus_softc *); +void gusreset(struct gus_softc *, int); +void gus_set_voices(struct gus_softc *, int); +void gus_set_volume(struct gus_softc *, int, int); +void gus_set_samprate(struct gus_softc *, int, int); +void gus_set_recrate(struct gus_softc *, u_long); +void gus_start_voice(struct gus_softc *, int, int); +void gus_stop_voice(struct gus_softc *, int, int); +void gus_set_endaddr(struct gus_softc *, int, u_long); #ifdef GUSPLAYDEBUG -void gus_set_curaddr __P((struct gus_softc *, int, u_long)); -u_long gus_get_curaddr __P((struct gus_softc *, int)); +void gus_set_curaddr(struct gus_softc *, int, u_long); +u_long gus_get_curaddr(struct gus_softc *, int); #endif -int gus_dmaout_intr __P((struct gus_softc *)); -void gus_dmaout_dointr __P((struct gus_softc *)); -void gus_dmaout_timeout __P((void *)); -int gus_dmain_intr __P((struct gus_softc *)); -int gus_voice_intr __P((struct gus_softc *)); -void gus_start_playing __P((struct gus_softc *, int)); -int gus_continue_playing __P((struct gus_softc *, int)); -u_char guspeek __P((bus_space_tag_t, bus_space_handle_t, u_long)); -u_long convert_to_16bit __P((u_long)); -int gus_mixer_set_port __P((void *, mixer_ctrl_t *)); -int gus_mixer_get_port __P((void *, mixer_ctrl_t *)); -int gusmax_mixer_set_port __P((void *, mixer_ctrl_t *)); -int gusmax_mixer_get_port __P((void *, mixer_ctrl_t *)); -int gus_mixer_query_devinfo __P((void *, mixer_devinfo_t *)); -int gusmax_mixer_query_devinfo __P((void *, mixer_devinfo_t *)); -int gus_query_encoding __P((void *, struct audio_encoding *)); -int gus_get_props __P((void *)); -int gusmax_get_props __P((void *)); - -void gusics_master_mute __P((struct ics2101_softc *, int)); -void gusics_dac_mute __P((struct ics2101_softc *, int)); -void gusics_mic_mute __P((struct ics2101_softc *, int)); -void gusics_linein_mute __P((struct ics2101_softc *, int)); -void gusics_cd_mute __P((struct ics2101_softc *, int)); - -void stereo_dmaintr __P((void *)); +int gus_dmaout_intr(struct gus_softc *); +void gus_dmaout_dointr(struct gus_softc *); +void gus_dmaout_timeout(void *); +int gus_dmain_intr(struct gus_softc *); +int gus_voice_intr(struct gus_softc *); +void gus_start_playing(struct gus_softc *, int); +int gus_continue_playing(struct gus_softc *, int); +u_char guspeek(bus_space_tag_t, bus_space_handle_t, u_long); +u_long convert_to_16bit(u_long); +int gus_mixer_set_port(void *, mixer_ctrl_t *); +int gus_mixer_get_port(void *, mixer_ctrl_t *); +int gusmax_mixer_set_port(void *, mixer_ctrl_t *); +int gusmax_mixer_get_port(void *, mixer_ctrl_t *); +int gus_mixer_query_devinfo(void *, mixer_devinfo_t *); +int gusmax_mixer_query_devinfo(void *, mixer_devinfo_t *); +int gus_query_encoding(void *, struct audio_encoding *); +int gus_get_props(void *); +int gusmax_get_props(void *); + +void gusics_master_mute(struct ics2101_softc *, int); +void gusics_dac_mute(struct ics2101_softc *, int); +void gusics_mic_mute(struct ics2101_softc *, int); +void gusics_linein_mute(struct ics2101_softc *, int); +void gusics_cd_mute(struct ics2101_softc *, int); + +void stereo_dmaintr(void *); extern const int gus_irq_map[]; extern const int gus_drq_map[]; @@ -421,4 +421,4 @@ extern struct audio_device gus_device; #define FLIP_REV 5 /* This rev has flipped mixer chans */ -void gus_subattach __P((struct gus_softc *, struct isa_attach_args *)); +void gus_subattach(struct gus_softc *, struct isa_attach_args *); diff --git a/sys/dev/isa/hsq.c b/sys/dev/isa/hsq.c index 9164925a74e..997b48c0465 100644 --- a/sys/dev/isa/hsq.c +++ b/sys/dev/isa/hsq.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hsq.c,v 1.1 1999/11/28 12:15:08 downsj Exp $ */ +/* $OpenBSD: hsq.c,v 1.2 2002/03/14 01:26:56 millert Exp $ */ /*- * Copyright (c) 1999 Denis A. Doroshenko. All rights reserved. @@ -114,10 +114,10 @@ struct hsq_softc { bus_space_handle_t sc_slaveioh[NSLAVES]; }; -int hsqprobe __P((struct device *, void *, void *)); -void hsqattach __P((struct device *, struct device *, void *)); -int hsqintr __P((void *)); -int hsqprint __P((void *, const char *)); +int hsqprobe(struct device *, void *, void *); +void hsqattach(struct device *, struct device *, void *); +int hsqintr(void *); +int hsqprint(void *, const char *); struct cfattach hsq_ca = { sizeof(struct hsq_softc), hsqprobe, hsqattach diff --git a/sys/dev/isa/i82365_isa.c b/sys/dev/isa/i82365_isa.c index 5ecec8e568c..91b7e6be9a6 100644 --- a/sys/dev/isa/i82365_isa.c +++ b/sys/dev/isa/i82365_isa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: i82365_isa.c,v 1.15 2001/11/06 19:53:19 miod Exp $ */ +/* $OpenBSD: i82365_isa.c,v 1.16 2002/03/14 01:26:56 millert Exp $ */ /* $NetBSD: i82365_isa.c,v 1.11 1998/06/09 07:25:00 thorpej Exp $ */ /* @@ -60,12 +60,12 @@ #define DPRINTF(arg) #endif -int pcic_isa_probe __P((struct device *, void *, void *)); -void pcic_isa_attach __P((struct device *, struct device *, void *)); +int pcic_isa_probe(struct device *, void *, void *); +void pcic_isa_attach(struct device *, struct device *, void *); void *pcic_isa_chip_intr_establish __P((pcmcia_chipset_handle_t, struct pcmcia_function *, int, int (*) (void *), void *, char *)); -void pcic_isa_chip_intr_disestablish __P((pcmcia_chipset_handle_t, void *)); +void pcic_isa_chip_intr_disestablish(pcmcia_chipset_handle_t, void *); struct cfattach pcic_isa_ca = { sizeof(struct pcic_softc), pcic_isa_probe, pcic_isa_attach diff --git a/sys/dev/isa/i82365_isapnp.c b/sys/dev/isa/i82365_isapnp.c index ad9f8a8f6ab..99bcc42861e 100644 --- a/sys/dev/isa/i82365_isapnp.c +++ b/sys/dev/isa/i82365_isapnp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: i82365_isapnp.c,v 1.3 2001/11/06 19:53:19 miod Exp $ */ +/* $OpenBSD: i82365_isapnp.c,v 1.4 2002/03/14 01:26:56 millert Exp $ */ /* $NetBSD: i82365_isapnp.c,v 1.8 2000/02/23 17:22:11 soren Exp $ */ /* @@ -66,8 +66,8 @@ int pcicisapnp_debug = 0 /* XXX */ ; #define DPRINTF(arg) #endif -int pcic_isapnp_match __P((struct device *, void *, void *)); -void pcic_isapnp_attach __P((struct device *, struct device *, void *)); +int pcic_isapnp_match(struct device *, void *, void *); +void pcic_isapnp_attach(struct device *, struct device *, void *); struct cfattach pcic_isapnp_ca = { sizeof(struct pcic_softc), pcic_isapnp_match, pcic_isapnp_attach diff --git a/sys/dev/isa/i82365_isasubr.c b/sys/dev/isa/i82365_isasubr.c index 944e9ab7817..4f7d08fba9f 100644 --- a/sys/dev/isa/i82365_isasubr.c +++ b/sys/dev/isa/i82365_isasubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: i82365_isasubr.c,v 1.16 2001/11/06 19:53:19 miod Exp $ */ +/* $OpenBSD: i82365_isasubr.c,v 1.17 2002/03/14 01:26:56 millert Exp $ */ /* $NetBSD: i82365_isasubr.c,v 1.1 1998/06/07 18:28:31 sommerfe Exp $ */ /* @@ -188,7 +188,7 @@ pcic_isa_chip_intr_establish(pch, pf, ipl, fct, arg, xname) pcmcia_chipset_handle_t pch; struct pcmcia_function *pf; int ipl; - int (*fct) __P((void *)); + int (*fct)(void *); void *arg; char *xname; { diff --git a/sys/dev/isa/i82365_isavar.h b/sys/dev/isa/i82365_isavar.h index c1951b4afa0..d1b854c0493 100644 --- a/sys/dev/isa/i82365_isavar.h +++ b/sys/dev/isa/i82365_isavar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: i82365_isavar.h,v 1.4 2001/08/17 21:52:16 deraadt Exp $ */ +/* $OpenBSD: i82365_isavar.h,v 1.5 2002/03/14 01:26:56 millert Exp $ */ /* $NetBSD: i82365_isavar.h,v 1.1 1998/06/07 18:28:31 sommerfe Exp $ */ /* @@ -40,14 +40,14 @@ extern int npcic_isa_intr_list; void *pcic_isa_chip_intr_establish __P((pcmcia_chipset_handle_t, struct pcmcia_function *, int, int (*) (void *), void *, char *)); -void pcic_isa_chip_intr_disestablish __P((pcmcia_chipset_handle_t, void *)); +void pcic_isa_chip_intr_disestablish(pcmcia_chipset_handle_t, void *); /* * Figure out how wide the ISA bus is... */ -void pcic_isa_bus_width_probe __P((struct pcic_softc *, bus_space_tag_t, - bus_space_handle_t, bus_addr_t, u_int32_t)); +void pcic_isa_bus_width_probe(struct pcic_softc *, bus_space_tag_t, + bus_space_handle_t, bus_addr_t, u_int32_t); -int pcic_intr_probe __P((void *)); -int pcic_intr_find __P((struct pcic_softc *, int)); +int pcic_intr_probe(void *); +int pcic_intr_find(struct pcic_softc *, int); diff --git a/sys/dev/isa/ics2101.c b/sys/dev/isa/ics2101.c index 88049e3e56d..9a9019849cf 100644 --- a/sys/dev/isa/ics2101.c +++ b/sys/dev/isa/ics2101.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ics2101.c,v 1.4 1998/04/26 21:02:44 provos Exp $ */ +/* $OpenBSD: ics2101.c,v 1.5 2002/03/14 01:26:56 millert Exp $ */ /* $NetBSD: ics2101.c,v 1.6 1997/10/09 07:57:23 jtc Exp $ */ /*- @@ -68,8 +68,8 @@ #define cvt_value(val) ((val) >> 1) -static void ics2101_mix_doit __P((struct ics2101_softc *, u_int, u_int, u_int, - u_int)); +static void ics2101_mix_doit(struct ics2101_softc *, u_int, u_int, u_int, + u_int); /* * Program one channel of the ICS mixer */ diff --git a/sys/dev/isa/ics2101var.h b/sys/dev/isa/ics2101var.h index 26d88f71717..8c7a4797281 100644 --- a/sys/dev/isa/ics2101var.h +++ b/sys/dev/isa/ics2101var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ics2101var.h,v 1.3 1998/04/26 21:02:45 provos Exp $ */ +/* $OpenBSD: ics2101var.h,v 1.4 2002/03/14 01:26:56 millert Exp $ */ /* $NetBSD: ics2101var.h,v 1.5 1997/10/09 07:57:24 jtc Exp $ */ /*- @@ -52,5 +52,5 @@ struct ics2101_softc { u_char sc_mute[ICSMIX_CHAN_5+1][2];/* muted? */ }; -void ics2101_mix_attenuate __P((struct ics2101_softc *, u_int, u_int, u_int)); -void ics2101_mix_mute __P((struct ics2101_softc *, u_int, u_int, u_int)); +void ics2101_mix_attenuate(struct ics2101_softc *, u_int, u_int, u_int); +void ics2101_mix_mute(struct ics2101_softc *, u_int, u_int, u_int); diff --git a/sys/dev/isa/if_ec.c b/sys/dev/isa/if_ec.c index df1c7e576ee..9cc75ebc668 100644 --- a/sys/dev/isa/if_ec.c +++ b/sys/dev/isa/if_ec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ec.c,v 1.3 2001/03/12 05:36:59 aaron Exp $ */ +/* $OpenBSD: if_ec.c,v 1.4 2002/03/14 01:26:56 millert Exp $ */ /* $NetBSD: if_ec.c,v 1.9 1998/07/05 06:49:12 jonathan Exp $ */ /*- @@ -117,28 +117,28 @@ struct ec_softc { void *sc_ih; /* interrupt handle */ }; -int ec_probe __P((struct device *, void *, void *)); -void ec_attach __P((struct device *, struct device *, void *)); +int ec_probe(struct device *, void *, void *); +void ec_attach(struct device *, struct device *, void *); struct cfattach ec_ca = { sizeof(struct ec_softc), ec_probe, ec_attach }; -int ec_set_media __P((struct ec_softc *, int)); +int ec_set_media(struct ec_softc *, int); -void ec_media_init __P((struct dp8390_softc *)); +void ec_media_init(struct dp8390_softc *); -int ec_mediachange __P((struct dp8390_softc *)); -void ec_mediastatus __P((struct dp8390_softc *, struct ifmediareq *)); +int ec_mediachange(struct dp8390_softc *); +void ec_mediastatus(struct dp8390_softc *, struct ifmediareq *); -void ec_init_card __P((struct dp8390_softc *)); -int ec_write_mbuf __P((struct dp8390_softc *, struct mbuf *, int)); -int ec_ring_copy __P((struct dp8390_softc *, int, caddr_t, u_short)); -void ec_read_hdr __P((struct dp8390_softc *, int, struct dp8390_ring *)); -int ec_fake_test_mem __P((struct dp8390_softc *)); -int ec_test_mem __P((struct dp8390_softc *)); +void ec_init_card(struct dp8390_softc *); +int ec_write_mbuf(struct dp8390_softc *, struct mbuf *, int); +int ec_ring_copy(struct dp8390_softc *, int, caddr_t, u_short); +void ec_read_hdr(struct dp8390_softc *, int, struct dp8390_ring *); +int ec_fake_test_mem(struct dp8390_softc *); +int ec_test_mem(struct dp8390_softc *); -__inline void ec_readmem __P((struct ec_softc *, int, u_int8_t *, int)); +__inline void ec_readmem(struct ec_softc *, int, u_int8_t *, int); static const int ec_iobase[] = { 0x2e0, 0x2a0, 0x280, 0x250, 0x350, 0x330, 0x310, 0x300, diff --git a/sys/dev/isa/if_ed.c b/sys/dev/isa/if_ed.c index 62cd5336b2f..34d68a82a67 100644 --- a/sys/dev/isa/if_ed.c +++ b/sys/dev/isa/if_ed.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ed.c,v 1.48 2001/09/20 17:02:31 mpech Exp $ */ +/* $OpenBSD: if_ed.c,v 1.49 2002/03/14 01:26:56 millert Exp $ */ /* $NetBSD: if_ed.c,v 1.105 1996/10/21 22:40:45 thorpej Exp $ */ /* @@ -117,41 +117,41 @@ struct ed_softc { u_char next_packet; /* pointer to next unread RX packet */ }; -int edprobe __P((struct device *, void *, void *)); -void edattach __P((struct device *, struct device *, void *)); -int ed_find __P((struct ed_softc *, struct cfdata *, - struct isa_attach_args *ia)); -int ed_probe_generic8390 __P((bus_space_tag_t, bus_space_handle_t, int)); -int ed_find_WD80x3 __P((struct ed_softc *, struct cfdata *, - struct isa_attach_args *ia)); -int ed_find_3Com __P((struct ed_softc *, struct cfdata *, - struct isa_attach_args *ia)); -int ed_find_Novell __P((struct ed_softc *, struct cfdata *, - struct isa_attach_args *ia)); -int edintr __P((void *)); -int edioctl __P((struct ifnet *, u_long, caddr_t)); -void edstart __P((struct ifnet *)); -void edwatchdog __P((struct ifnet *)); -void edreset __P((struct ed_softc *)); -void edinit __P((struct ed_softc *)); -void edstop __P((struct ed_softc *)); - -void ed_shared_writemem __P((struct ed_softc *, caddr_t, int, int)); -void ed_shared_readmem __P((struct ed_softc *, int, caddr_t, int)); +int edprobe(struct device *, void *, void *); +void edattach(struct device *, struct device *, void *); +int ed_find(struct ed_softc *, struct cfdata *, + struct isa_attach_args *ia); +int ed_probe_generic8390(bus_space_tag_t, bus_space_handle_t, int); +int ed_find_WD80x3(struct ed_softc *, struct cfdata *, + struct isa_attach_args *ia); +int ed_find_3Com(struct ed_softc *, struct cfdata *, + struct isa_attach_args *ia); +int ed_find_Novell(struct ed_softc *, struct cfdata *, + struct isa_attach_args *ia); +int edintr(void *); +int edioctl(struct ifnet *, u_long, caddr_t); +void edstart(struct ifnet *); +void edwatchdog(struct ifnet *); +void edreset(struct ed_softc *); +void edinit(struct ed_softc *); +void edstop(struct ed_softc *); + +void ed_shared_writemem(struct ed_softc *, caddr_t, int, int); +void ed_shared_readmem(struct ed_softc *, int, caddr_t, int); #define inline /* XXX for debugging porpoises */ -void ed_getmcaf __P((struct arpcom *, u_int32_t *)); -void edread __P((struct ed_softc *, int, int)); -struct mbuf *edget __P((struct ed_softc *, int, int)); -static __inline void ed_rint __P((struct ed_softc *)); -static __inline void ed_xmit __P((struct ed_softc *)); -static __inline int ed_ring_copy __P((struct ed_softc *, int, caddr_t, - u_int16_t)); +void ed_getmcaf(struct arpcom *, u_int32_t *); +void edread(struct ed_softc *, int, int); +struct mbuf *edget(struct ed_softc *, int, int); +static __inline void ed_rint(struct ed_softc *); +static __inline void ed_xmit(struct ed_softc *); +static __inline int ed_ring_copy(struct ed_softc *, int, caddr_t, + u_int16_t); -void ed_pio_readmem __P((struct ed_softc *, u_int16_t, caddr_t, u_int16_t)); -void ed_pio_writemem __P((struct ed_softc *, caddr_t, u_int16_t, u_int16_t)); -u_int16_t ed_pio_write_mbufs __P((struct ed_softc *, struct mbuf *, u_int16_t)); +void ed_pio_readmem(struct ed_softc *, u_int16_t, caddr_t, u_int16_t); +void ed_pio_writemem(struct ed_softc *, caddr_t, u_int16_t, u_int16_t); +u_int16_t ed_pio_write_mbufs(struct ed_softc *, struct mbuf *, u_int16_t); #if NED_ISA > 0 struct cfattach ed_isa_ca = { @@ -171,19 +171,19 @@ struct cfdriver ed_cd = { #if NED_PCMCIA > 0 #include <dev/pcmcia/pcmciavar.h> -int ed_pcmcia_match __P((struct device *, void *, void *)); -void ed_pcmcia_attach __P((struct device *, struct device *, void *)); -int ed_pcmcia_detach __P((struct device *)); +int ed_pcmcia_match(struct device *, void *, void *); +void ed_pcmcia_attach(struct device *, struct device *, void *); +int ed_pcmcia_detach(struct device *); struct cfattach ed_pcmcia_ca = { sizeof(struct ed_softc), ed_pcmcia_match, edattach, ed_pcmcia_detach }; -int ed_pcmcia_isa_attach __P((struct device *, void *, void *, - struct pcmcia_link *)); -int edmod __P((struct pcmcia_link *, struct device *, struct pcmcia_conf *, - struct cfdata *cf)); -int ed_remove __P((struct pcmcia_link *, struct device *)); +int ed_pcmcia_isa_attach(struct device *, void *, void *, + struct pcmcia_link *); +int edmod(struct pcmcia_link *, struct device *, struct pcmcia_conf *, + struct cfdata *cf); +int ed_remove(struct pcmcia_link *, struct device *); /* additional setup needed for pcmcia devices */ int @@ -371,8 +371,8 @@ ed_pcmcia_detach(self) #define PCI_CBIO 0x10 /* Configuration Base IO Address */ -int ed_pci_match __P((struct device *, void *, void *)); -void ed_pci_attach __P((struct device *, struct device *, void *)); +int ed_pci_match(struct device *, void *, void *); +void ed_pci_attach(struct device *, struct device *, void *); struct cfattach ed_pci_ca = { sizeof(struct ed_softc), ed_pci_match, ed_pci_attach diff --git a/sys/dev/isa/if_ef_isapnp.c b/sys/dev/isa/if_ef_isapnp.c index b0d3e74a82d..6be6acfc40c 100644 --- a/sys/dev/isa/if_ef_isapnp.c +++ b/sys/dev/isa/if_ef_isapnp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ef_isapnp.c,v 1.13 2001/06/27 06:34:45 kjc Exp $ */ +/* $OpenBSD: if_ef_isapnp.c,v 1.14 2002/03/14 01:26:56 millert Exp $ */ /* * Copyright (c) 1999 Jason L. Wright (jason@thought.net) @@ -113,31 +113,31 @@ struct ef_softc { #define EF_MII_DATA 0x02 /* data bit */ #define EF_MII_DIR 0x04 /* direction */ -int ef_isapnp_match __P((struct device *, void *, void *)); -void ef_isapnp_attach __P((struct device *, struct device *, void *)); - -void efstart __P((struct ifnet *)); -int efioctl __P((struct ifnet *, u_long, caddr_t)); -void efwatchdog __P((struct ifnet *)); -void efreset __P((struct ef_softc *)); -void efstop __P((struct ef_softc *)); -void efsetmulti __P((struct ef_softc *)); -int efbusyeeprom __P((struct ef_softc *)); -int efintr __P((void *)); -void efinit __P((struct ef_softc *)); -void efcompletecmd __P((struct ef_softc *, u_int, u_int)); -void eftxstat __P((struct ef_softc *)); -void efread __P((struct ef_softc *)); -struct mbuf *efget __P((struct ef_softc *, int totlen)); - -void ef_miibus_writereg __P((struct device *, int, int, int)); -void ef_miibus_statchg __P((struct device *)); -int ef_miibus_readreg __P((struct device *, int, int)); -void ef_mii_writeb __P((struct ef_softc *, int)); -void ef_mii_sync __P((struct ef_softc *)); -int ef_ifmedia_upd __P((struct ifnet *)); -void ef_ifmedia_sts __P((struct ifnet *, struct ifmediareq *)); -void ef_tick __P((void *)); +int ef_isapnp_match(struct device *, void *, void *); +void ef_isapnp_attach(struct device *, struct device *, void *); + +void efstart(struct ifnet *); +int efioctl(struct ifnet *, u_long, caddr_t); +void efwatchdog(struct ifnet *); +void efreset(struct ef_softc *); +void efstop(struct ef_softc *); +void efsetmulti(struct ef_softc *); +int efbusyeeprom(struct ef_softc *); +int efintr(void *); +void efinit(struct ef_softc *); +void efcompletecmd(struct ef_softc *, u_int, u_int); +void eftxstat(struct ef_softc *); +void efread(struct ef_softc *); +struct mbuf *efget(struct ef_softc *, int totlen); + +void ef_miibus_writereg(struct device *, int, int, int); +void ef_miibus_statchg(struct device *); +int ef_miibus_readreg(struct device *, int, int); +void ef_mii_writeb(struct ef_softc *, int); +void ef_mii_sync(struct ef_softc *); +int ef_ifmedia_upd(struct ifnet *); +void ef_ifmedia_sts(struct ifnet *, struct ifmediareq *); +void ef_tick(void *); struct cfdriver ef_cd = { NULL, "ef", DV_IFNET diff --git a/sys/dev/isa/if_eg.c b/sys/dev/isa/if_eg.c index 800575e9023..c5c34b3c64f 100644 --- a/sys/dev/isa/if_eg.c +++ b/sys/dev/isa/if_eg.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_eg.c,v 1.21 2001/06/27 06:34:45 kjc Exp $ */ +/* $OpenBSD: if_eg.c,v 1.22 2002/03/14 01:26:56 millert Exp $ */ /* $NetBSD: if_eg.c,v 1.26 1996/05/12 23:52:27 mycroft Exp $ */ /* @@ -105,8 +105,8 @@ struct eg_softc { u_char *eg_outbuf; /* Outgoing packet buffer */ }; -int egprobe __P((struct device *, void *, void *)); -void egattach __P((struct device *, struct device *, void *)); +int egprobe(struct device *, void *, void *); +void egattach(struct device *, struct device *, void *); struct cfattach eg_ca = { sizeof(struct eg_softc), egprobe, egattach @@ -116,24 +116,24 @@ struct cfdriver eg_cd = { NULL, "eg", DV_IFNET }; -int egintr __P((void *)); -void eginit __P((struct eg_softc *)); -int egioctl __P((struct ifnet *, u_long, caddr_t)); -void egrecv __P((struct eg_softc *)); -void egstart __P((struct ifnet *)); -void egwatchdog __P((struct ifnet *)); -void egreset __P((struct eg_softc *)); -void egread __P((struct eg_softc *, caddr_t, int)); -struct mbuf *egget __P((struct eg_softc *, caddr_t, int)); -void egstop __P((struct eg_softc *)); - -static __inline void egprintpcb __P((struct eg_softc *)); -static __inline void egprintstat __P((u_char)); -static int egoutPCB __P((struct eg_softc *, u_char)); -static int egreadPCBstat __P((struct eg_softc *, u_char)); -static int egreadPCBready __P((struct eg_softc *)); -static int egwritePCB __P((struct eg_softc *)); -static int egreadPCB __P((struct eg_softc *)); +int egintr(void *); +void eginit(struct eg_softc *); +int egioctl(struct ifnet *, u_long, caddr_t); +void egrecv(struct eg_softc *); +void egstart(struct ifnet *); +void egwatchdog(struct ifnet *); +void egreset(struct eg_softc *); +void egread(struct eg_softc *, caddr_t, int); +struct mbuf *egget(struct eg_softc *, caddr_t, int); +void egstop(struct eg_softc *); + +static __inline void egprintpcb(struct eg_softc *); +static __inline void egprintstat(u_char); +static int egoutPCB(struct eg_softc *, u_char); +static int egreadPCBstat(struct eg_softc *, u_char); +static int egreadPCBready(struct eg_softc *); +static int egwritePCB(struct eg_softc *); +static int egreadPCB(struct eg_softc *); /* * Support stuff diff --git a/sys/dev/isa/if_el.c b/sys/dev/isa/if_el.c index cc79f9c35c1..e12ba02a476 100644 --- a/sys/dev/isa/if_el.c +++ b/sys/dev/isa/if_el.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_el.c,v 1.16 2001/06/27 06:34:45 kjc Exp $ */ +/* $OpenBSD: if_el.c,v 1.17 2002/03/14 01:26:56 millert Exp $ */ /* $NetBSD: if_el.c,v 1.39 1996/05/12 23:52:32 mycroft Exp $ */ /* @@ -75,20 +75,20 @@ struct el_softc { /* * prototypes */ -int elintr __P((void *)); -void elinit __P((struct el_softc *)); -int elioctl __P((struct ifnet *, u_long, caddr_t)); -void elstart __P((struct ifnet *)); -void elwatchdog __P((struct ifnet *)); -void elreset __P((struct el_softc *)); -void elstop __P((struct el_softc *)); -static int el_xmit __P((struct el_softc *)); -void elread __P((struct el_softc *, int)); -struct mbuf *elget __P((struct el_softc *sc, int)); -static inline void el_hardreset __P((struct el_softc *)); - -int elprobe __P((struct device *, void *, void *)); -void elattach __P((struct device *, struct device *, void *)); +int elintr(void *); +void elinit(struct el_softc *); +int elioctl(struct ifnet *, u_long, caddr_t); +void elstart(struct ifnet *); +void elwatchdog(struct ifnet *); +void elreset(struct el_softc *); +void elstop(struct el_softc *); +static int el_xmit(struct el_softc *); +void elread(struct el_softc *, int); +struct mbuf *elget(struct el_softc *sc, int); +static inline void el_hardreset(struct el_softc *); + +int elprobe(struct device *, void *, void *); +void elattach(struct device *, struct device *, void *); struct cfattach el_ca = { sizeof(struct el_softc), elprobe, elattach diff --git a/sys/dev/isa/if_ep_isa.c b/sys/dev/isa/if_ep_isa.c index 21440801c95..f9fc2e62477 100644 --- a/sys/dev/isa/if_ep_isa.c +++ b/sys/dev/isa/if_ep_isa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ep_isa.c,v 1.19 2000/05/29 18:04:08 aaron Exp $ */ +/* $OpenBSD: if_ep_isa.c,v 1.20 2002/03/14 01:26:56 millert Exp $ */ /* $NetBSD: if_ep_isa.c,v 1.5 1996/05/12 23:52:36 mycroft Exp $ */ /* @@ -81,14 +81,14 @@ #include <dev/isa/isavar.h> #include <dev/isa/elink.h> -int ep_isa_probe __P((struct device *, void *, void *)); -void ep_isa_attach __P((struct device *, struct device *, void *)); +int ep_isa_probe(struct device *, void *, void *); +void ep_isa_attach(struct device *, struct device *, void *); struct cfattach ep_isa_ca = { sizeof(struct ep_softc), ep_isa_probe, ep_isa_attach }; -static void epaddcard __P((int, int, int, u_short)); +static void epaddcard(int, int, int, u_short); /* * This keeps track of which ISAs have been through an ep probe sequence. diff --git a/sys/dev/isa/if_ep_isapnp.c b/sys/dev/isa/if_ep_isapnp.c index d1e10c4636b..0c7b4606de3 100644 --- a/sys/dev/isa/if_ep_isapnp.c +++ b/sys/dev/isa/if_ep_isapnp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ep_isapnp.c,v 1.6 2000/05/29 18:04:08 aaron Exp $ */ +/* $OpenBSD: if_ep_isapnp.c,v 1.7 2002/03/14 01:26:56 millert Exp $ */ /* $NetBSD: if_ep_isapnp.c,v 1.5 1996/05/12 23:52:36 mycroft Exp $ */ /* @@ -81,8 +81,8 @@ #include <dev/isa/isavar.h> #include <dev/isa/elink.h> -int ep_isapnp_match __P((struct device *, void *, void *)); -void ep_isapnp_attach __P((struct device *, struct device *, void *)); +int ep_isapnp_match(struct device *, void *, void *); +void ep_isapnp_attach(struct device *, struct device *, void *); struct cfattach ep_isapnp_ca = { sizeof(struct ep_softc), ep_isapnp_match, ep_isapnp_attach diff --git a/sys/dev/isa/if_ex.c b/sys/dev/isa/if_ex.c index b8541856ae1..baf08cb2a5a 100644 --- a/sys/dev/isa/if_ex.c +++ b/sys/dev/isa/if_ex.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ex.c,v 1.7 2001/06/27 06:34:46 kjc Exp $ */ +/* $OpenBSD: if_ex.c,v 1.8 2002/03/14 01:26:56 millert Exp $ */ /* * Copyright (c) 1997, Donald A. Schmidt * Copyright (c) 1996, Javier Martín Rueda (jmrueda@diatel.upm.es) @@ -122,20 +122,20 @@ static char irq2eemap[] = { -1, -1, 0, 1, -1, 2, -1, -1, -1, 0, 3, 4, -1, -1, -1, -1 }; static u_char ee2irqmap[] = { 9, 3, 5, 10, 11, 0, 0, 0 }; -static int ex_probe __P((struct device *, void *, void *)); -static void ex_attach __P((struct device *, struct device *, void *)); -static void ex_init __P((struct ex_softc *)); -static void ex_start __P((struct ifnet *)); -static void ex_stop __P((struct ex_softc *)); -static int ex_ioctl __P((struct ifnet *, u_long, caddr_t)); -static void ex_reset __P((struct ex_softc *)); -static void ex_watchdog __P((struct ifnet *)); - -static u_short eeprom_read __P((struct ex_softc *, int)); -static int look_for_card __P((struct isa_attach_args *, struct ex_softc *sc)); -static int exintr __P((void *)); -static void ex_tx_intr __P((struct ex_softc *)); -static void ex_rx_intr __P((struct ex_softc *)); +static int ex_probe(struct device *, void *, void *); +static void ex_attach(struct device *, struct device *, void *); +static void ex_init(struct ex_softc *); +static void ex_start(struct ifnet *); +static void ex_stop(struct ex_softc *); +static int ex_ioctl(struct ifnet *, u_long, caddr_t); +static void ex_reset(struct ex_softc *); +static void ex_watchdog(struct ifnet *); + +static u_short eeprom_read(struct ex_softc *, int); +static int look_for_card(struct isa_attach_args *, struct ex_softc *sc); +static int exintr(void *); +static void ex_tx_intr(struct ex_softc *); +static void ex_rx_intr(struct ex_softc *); struct cfattach ex_ca = { diff --git a/sys/dev/isa/if_fe.c b/sys/dev/isa/if_fe.c index 3d7e4d561ca..9c893a52980 100644 --- a/sys/dev/isa/if_fe.c +++ b/sys/dev/isa/if_fe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_fe.c,v 1.18 2001/09/20 17:02:31 mpech Exp $ */ +/* $OpenBSD: if_fe.c,v 1.19 2002/03/14 01:26:56 millert Exp $ */ /* * All Rights Reserved, Copyright (C) Fujitsu Limited 1995 @@ -178,8 +178,8 @@ struct fe_softc { u_char proto_bmpr13; /* BMPR13 prototype. */ /* Vendor specific hooks. */ - void (*init) __P((struct fe_softc *)); /* Just before fe_init(). */ - void (*stop) __P((struct fe_softc *)); /* Just after fe_stop(). */ + void (*init)(struct fe_softc *); /* Just before fe_init(). */ + void (*stop)(struct fe_softc *); /* Just after fe_stop(). */ /* Transmission buffer management. */ u_short txb_size; /* total bytes in TX buffer */ @@ -197,32 +197,32 @@ struct fe_softc { #define sc_enaddr sc_arpcom.ac_enaddr /* Standard driver entry points. These can be static. */ -int feprobe __P((struct device *, void *, void *)); -void feattach __P((struct device *, struct device *, void *)); -int feintr __P((void *)); -void fe_init __P((struct fe_softc *)); -int fe_ioctl __P((struct ifnet *, u_long, caddr_t)); -void fe_start __P((struct ifnet *)); -void fe_reset __P((struct fe_softc *)); -void fe_watchdog __P((struct ifnet *)); +int feprobe(struct device *, void *, void *); +void feattach(struct device *, struct device *, void *); +int feintr(void *); +void fe_init(struct fe_softc *); +int fe_ioctl(struct ifnet *, u_long, caddr_t); +void fe_start(struct ifnet *); +void fe_reset(struct fe_softc *); +void fe_watchdog(struct ifnet *); /* Local functions. Order of declaration is confused. FIXME. */ -int fe_probe_fmv __P((struct fe_softc *, struct isa_attach_args *)); -int fe_probe_ati __P((struct fe_softc *, struct isa_attach_args *)); -int fe_probe_mbh __P((struct fe_softc *, struct isa_attach_args *)); -void fe_init_mbh __P((struct fe_softc *)); -int fe_get_packet __P((struct fe_softc *, int)); -void fe_stop __P((struct fe_softc *)); -void fe_tint __P((/*struct fe_softc *, u_char*/)); -void fe_rint __P((/*struct fe_softc *, u_char*/)); +int fe_probe_fmv(struct fe_softc *, struct isa_attach_args *); +int fe_probe_ati(struct fe_softc *, struct isa_attach_args *); +int fe_probe_mbh(struct fe_softc *, struct isa_attach_args *); +void fe_init_mbh(struct fe_softc *); +int fe_get_packet(struct fe_softc *, int); +void fe_stop(struct fe_softc *); +void fe_tint(/*struct fe_softc *, u_char*/); +void fe_rint(/*struct fe_softc *, u_char*/); static inline -void fe_xmit __P((struct fe_softc *)); -void fe_write_mbufs __P((struct fe_softc *, struct mbuf *)); -void fe_getmcaf __P((struct arpcom *, u_char *)); -void fe_setmode __P((struct fe_softc *)); -void fe_loadmar __P((struct fe_softc *)); +void fe_xmit(struct fe_softc *); +void fe_write_mbufs(struct fe_softc *, struct mbuf *); +void fe_getmcaf(struct arpcom *, u_char *); +void fe_setmode(struct fe_softc *); +void fe_loadmar(struct fe_softc *); #if FE_DEBUG >= 1 -void fe_dump __P((int, struct fe_softc *)); +void fe_dump(int, struct fe_softc *); #endif struct cfattach fe_ca = { diff --git a/sys/dev/isa/if_ie.c b/sys/dev/isa/if_ie.c index ec7dac44f7b..387f168ca9b 100644 --- a/sys/dev/isa/if_ie.c +++ b/sys/dev/isa/if_ie.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ie.c,v 1.23 2001/11/06 19:53:19 miod Exp $ */ +/* $OpenBSD: if_ie.c,v 1.24 2002/03/14 01:26:56 millert Exp $ */ /* $NetBSD: if_ie.c,v 1.51 1996/05/12 23:52:48 mycroft Exp $ */ /*- @@ -227,8 +227,8 @@ struct ie_softc { struct arpcom sc_arpcom; - void (*reset_586) __P((struct ie_softc *)); - void (*chan_attn) __P((struct ie_softc *)); + void (*reset_586)(struct ie_softc *); + void (*chan_attn)(struct ie_softc *); enum ie_hardware hard_type; int hard_vers; @@ -259,65 +259,65 @@ struct ie_softc { #endif }; -void iewatchdog __P((struct ifnet *)); -int ieintr __P((void *)); -void iestop __P((struct ie_softc *)); -int ieinit __P((struct ie_softc *)); -int ieioctl __P((struct ifnet *, u_long, caddr_t)); -void iestart __P((struct ifnet *)); -static void el_reset_586 __P((struct ie_softc *)); -static void sl_reset_586 __P((struct ie_softc *)); -static void el_chan_attn __P((struct ie_softc *)); -static void sl_chan_attn __P((struct ie_softc *)); -static void slel_get_address __P((struct ie_softc *)); - -static void ee16_reset_586 __P((struct ie_softc *)); -static void ee16_chan_attn __P((struct ie_softc *)); -static void ee16_interrupt_enable __P((struct ie_softc *)); -void ee16_eeprom_outbits __P((struct ie_softc *, int, int)); -void ee16_eeprom_clock __P((struct ie_softc *, int)); -u_short ee16_read_eeprom __P((struct ie_softc *, int)); -int ee16_eeprom_inbits __P((struct ie_softc *)); - -void iereset __P((struct ie_softc *)); -void ie_readframe __P((struct ie_softc *, int)); -void ie_drop_packet_buffer __P((struct ie_softc *)); -void ie_find_mem_size __P((struct ie_softc *)); -static int command_and_wait __P((struct ie_softc *, int, - void volatile *, int)); -void ierint __P((struct ie_softc *)); -void ietint __P((struct ie_softc *)); -void iexmit __P((struct ie_softc *)); -struct mbuf *ieget __P((struct ie_softc *, - struct ether_header *, int *)); -void iememinit __P((void *, struct ie_softc *)); -static int mc_setup __P((struct ie_softc *, void *)); -static void mc_reset __P((struct ie_softc *)); +void iewatchdog(struct ifnet *); +int ieintr(void *); +void iestop(struct ie_softc *); +int ieinit(struct ie_softc *); +int ieioctl(struct ifnet *, u_long, caddr_t); +void iestart(struct ifnet *); +static void el_reset_586(struct ie_softc *); +static void sl_reset_586(struct ie_softc *); +static void el_chan_attn(struct ie_softc *); +static void sl_chan_attn(struct ie_softc *); +static void slel_get_address(struct ie_softc *); + +static void ee16_reset_586(struct ie_softc *); +static void ee16_chan_attn(struct ie_softc *); +static void ee16_interrupt_enable(struct ie_softc *); +void ee16_eeprom_outbits(struct ie_softc *, int, int); +void ee16_eeprom_clock(struct ie_softc *, int); +u_short ee16_read_eeprom(struct ie_softc *, int); +int ee16_eeprom_inbits(struct ie_softc *); + +void iereset(struct ie_softc *); +void ie_readframe(struct ie_softc *, int); +void ie_drop_packet_buffer(struct ie_softc *); +void ie_find_mem_size(struct ie_softc *); +static int command_and_wait(struct ie_softc *, int, + void volatile *, int); +void ierint(struct ie_softc *); +void ietint(struct ie_softc *); +void iexmit(struct ie_softc *); +struct mbuf *ieget(struct ie_softc *, + struct ether_header *, int *); +void iememinit(void *, struct ie_softc *); +static int mc_setup(struct ie_softc *, void *); +static void mc_reset(struct ie_softc *); #ifdef IEDEBUG -void print_rbd __P((volatile struct ie_recv_buf_desc *)); +void print_rbd(volatile struct ie_recv_buf_desc *); int in_ierint = 0; int in_ietint = 0; #endif -int ieprobe __P((struct device *, void *, void *)); -void ieattach __P((struct device *, struct device *, void *)); -int sl_probe __P((struct ie_softc *, struct isa_attach_args *)); -int el_probe __P((struct ie_softc *, struct isa_attach_args *)); -int ee16_probe __P((struct ie_softc *, struct isa_attach_args *)); -int check_ie_present __P((struct ie_softc *, caddr_t, u_int)); - -static __inline void ie_setup_config __P((volatile struct ie_config_cmd *, - int, int)); -static __inline void ie_ack __P((struct ie_softc *, u_int)); -static __inline int ether_equal __P((u_char *, u_char *)); -static __inline int check_eh __P((struct ie_softc *, struct ether_header *, - int *)); -static __inline int ie_buflen __P((struct ie_softc *, int)); -static __inline int ie_packet_len __P((struct ie_softc *)); - -static void run_tdr __P((struct ie_softc *, struct ie_tdr_cmd *)); +int ieprobe(struct device *, void *, void *); +void ieattach(struct device *, struct device *, void *); +int sl_probe(struct ie_softc *, struct isa_attach_args *); +int el_probe(struct ie_softc *, struct isa_attach_args *); +int ee16_probe(struct ie_softc *, struct isa_attach_args *); +int check_ie_present(struct ie_softc *, caddr_t, u_int); + +static __inline void ie_setup_config(volatile struct ie_config_cmd *, + int, int); +static __inline void ie_ack(struct ie_softc *, u_int); +static __inline int ether_equal(u_char *, u_char *); +static __inline int check_eh(struct ie_softc *, struct ether_header *, + int *); +static __inline int ie_buflen(struct ie_softc *, int); +static __inline int ie_packet_len(struct ie_softc *); + +static void run_tdr(struct ie_softc *, struct ie_tdr_cmd *); struct cfattach ie_isa_ca = { sizeof(struct ie_softc), ieprobe, ieattach diff --git a/sys/dev/isa/if_iy.c b/sys/dev/isa/if_iy.c index 9857cf2391a..45cc15d1c8f 100644 --- a/sys/dev/isa/if_iy.c +++ b/sys/dev/isa/if_iy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_iy.c,v 1.15 2001/11/06 19:53:19 miod Exp $ */ +/* $OpenBSD: if_iy.c,v 1.16 2002/03/14 01:26:56 millert Exp $ */ /* $NetBSD: if_iy.c,v 1.4 1996/05/12 23:52:53 mycroft Exp $ */ /* #define IYDEBUG */ /* #define IYMEMDEBUG */ @@ -113,50 +113,50 @@ struct iy_softc { #endif }; -void iywatchdog __P((struct ifnet *)); -int iyioctl __P((struct ifnet *, u_long, caddr_t)); -int iyintr __P((void *)); -void iyinit __P((struct iy_softc *)); -void iystop __P((struct iy_softc *)); -void iystart __P((struct ifnet *)); - -void iy_intr_rx __P((struct iy_softc *)); -void iy_intr_tx __P((struct iy_softc *)); -void eepro_reset_595 __P((struct iy_softc *)); -int eepro_probe __P((struct iy_softc *, struct isa_attach_args *)); -void eepro_eeprom_outbits __P((struct iy_softc *, int, int)); -void eepro_eeprom_clock __P((struct iy_softc *, int)); -u_short eepro_read_eeprom __P((struct iy_softc *, int)); -int eepro_eeprom_inbits __P((struct iy_softc *)); - -void iyreset __P((struct iy_softc *)); -void iy_readframe __P((struct iy_softc *, int)); -void iy_drop_packet_buffer __P((struct iy_softc *)); -void iy_find_mem_size __P((struct iy_softc *)); -void iyrint __P((struct iy_softc *)); -void iytint __P((struct iy_softc *)); -void iyxmit __P((struct iy_softc *)); -void iyget __P((struct iy_softc *, int, int)); -void iymbuffill __P((void *)); -void iymbufempty __P((void *)); -void iyprobemem __P((struct iy_softc *)); +void iywatchdog(struct ifnet *); +int iyioctl(struct ifnet *, u_long, caddr_t); +int iyintr(void *); +void iyinit(struct iy_softc *); +void iystop(struct iy_softc *); +void iystart(struct ifnet *); + +void iy_intr_rx(struct iy_softc *); +void iy_intr_tx(struct iy_softc *); +void eepro_reset_595(struct iy_softc *); +int eepro_probe(struct iy_softc *, struct isa_attach_args *); +void eepro_eeprom_outbits(struct iy_softc *, int, int); +void eepro_eeprom_clock(struct iy_softc *, int); +u_short eepro_read_eeprom(struct iy_softc *, int); +int eepro_eeprom_inbits(struct iy_softc *); + +void iyreset(struct iy_softc *); +void iy_readframe(struct iy_softc *, int); +void iy_drop_packet_buffer(struct iy_softc *); +void iy_find_mem_size(struct iy_softc *); +void iyrint(struct iy_softc *); +void iytint(struct iy_softc *); +void iyxmit(struct iy_softc *); +void iyget(struct iy_softc *, int, int); +void iymbuffill(void *); +void iymbufempty(void *); +void iyprobemem(struct iy_softc *); /* - * void iymeminit __P((void *, struct iy_softc *)); - * static int iy_mc_setup __P((struct iy_softc *, void *)); - * static void iy_mc_reset __P((struct iy_softc *)); + * void iymeminit(void *, struct iy_softc *); + * static int iy_mc_setup(struct iy_softc *, void *); + * static void iy_mc_reset(struct iy_softc *); */ #ifdef IYDEBUGX -void print_rbd __P((volatile struct iy_recv_buf_desc *)); +void print_rbd(volatile struct iy_recv_buf_desc *); int in_ifrint = 0; int in_iftint = 0; #endif -int iyprobe __P((struct device *, void *, void *)); -void iyattach __P((struct device *, struct device *, void *)); +int iyprobe(struct device *, void *, void *); +void iyattach(struct device *, struct device *, void *); -static u_int16_t eepromread __P((int, int)); +static u_int16_t eepromread(int, int); struct cfattach iy_ca = { sizeof(struct iy_softc), iyprobe, iyattach diff --git a/sys/dev/isa/if_lc_isa.c b/sys/dev/isa/if_lc_isa.c index c50940103b9..b87a2155b41 100644 --- a/sys/dev/isa/if_lc_isa.c +++ b/sys/dev/isa/if_lc_isa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_lc_isa.c,v 1.1 2001/07/13 17:26:44 niklas Exp $ */ +/* $OpenBSD: if_lc_isa.c,v 1.2 2002/03/14 01:26:56 millert Exp $ */ /* $NetBSD: if_lc_isa.c,v 1.10 2001/06/13 10:46:03 wiz Exp $ */ /*- @@ -79,10 +79,10 @@ extern struct cfdriver lc_cd; -int lemac_isa_find __P((struct lemac_softc *, struct isa_attach_args *, - int)); -int lemac_isa_probe __P((struct device *, void *, void *)); -void lemac_isa_attach __P((struct device *, struct device *, void *)); +int lemac_isa_find(struct lemac_softc *, struct isa_attach_args *, + int); +int lemac_isa_probe(struct device *, void *, void *); +void lemac_isa_attach(struct device *, struct device *, void *); struct cfattach lc_isa_ca = { sizeof(struct lemac_softc), lemac_isa_probe, lemac_isa_attach diff --git a/sys/dev/isa/if_le_isa.c b/sys/dev/isa/if_le_isa.c index 22cd36720be..1bcd07aa611 100644 --- a/sys/dev/isa/if_le_isa.c +++ b/sys/dev/isa/if_le_isa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_le_isa.c,v 1.15 2001/11/06 19:53:19 miod Exp $ */ +/* $OpenBSD: if_le_isa.c,v 1.16 2002/03/14 01:26:56 millert Exp $ */ /* $NetBSD: if_le_isa.c,v 1.2 1996/05/12 23:52:56 mycroft Exp $ */ /*- @@ -75,17 +75,17 @@ static char *card_type[] = { "unknown", "BICC Isolan", "NE2100", "DEPCA", "PCnet-ISA" }; -int le_isa_probe __P((struct device *, void *, void *)); -void le_isa_attach __P((struct device *, struct device *, void *)); +int le_isa_probe(struct device *, void *, void *); +void le_isa_attach(struct device *, struct device *, void *); struct cfattach le_isa_ca = { sizeof(struct le_softc), le_isa_probe, le_isa_attach }; -int depca_isa_probe __P((struct le_softc *, struct isa_attach_args *)); -int ne2100_isa_probe __P((struct le_softc *, struct isa_attach_args *)); -int bicc_isa_probe __P((struct le_softc *, struct isa_attach_args *)); -int lance_isa_probe __P((struct am7990_softc *)); +int depca_isa_probe(struct le_softc *, struct isa_attach_args *); +int ne2100_isa_probe(struct le_softc *, struct isa_attach_args *); +int bicc_isa_probe(struct le_softc *, struct isa_attach_args *); +int lance_isa_probe(struct am7990_softc *); int le_isa_probe(parent, match, aux) diff --git a/sys/dev/isa/if_le_isapnp.c b/sys/dev/isa/if_le_isapnp.c index 86dfacd3800..c6279ea59f7 100644 --- a/sys/dev/isa/if_le_isapnp.c +++ b/sys/dev/isa/if_le_isapnp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_le_isapnp.c,v 1.8 2001/11/06 19:53:19 miod Exp $ */ +/* $OpenBSD: if_le_isapnp.c,v 1.9 2002/03/14 01:26:56 millert Exp $ */ /* $NetBSD: if_le_isa.c,v 1.2 1996/05/12 23:52:56 mycroft Exp $ */ /*- @@ -72,8 +72,8 @@ #include <dev/isa/if_levar.h> -int le_isapnp_match __P((struct device *, void *, void *)); -void le_isapnp_attach __P((struct device *, struct device *, void *)); +int le_isapnp_match(struct device *, void *, void *); +void le_isapnp_attach(struct device *, struct device *, void *); struct cfattach le_isapnp_ca = { sizeof(struct le_softc), le_isapnp_match, le_isapnp_attach diff --git a/sys/dev/isa/if_levar.h b/sys/dev/isa/if_levar.h index c67ca4ee317..0c5aef5d8e1 100644 --- a/sys/dev/isa/if_levar.h +++ b/sys/dev/isa/if_levar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_levar.h,v 1.7 1997/12/26 23:44:23 deraadt Exp $ */ +/* $OpenBSD: if_levar.h,v 1.8 2002/03/14 01:26:56 millert Exp $ */ /* $NetBSD: if_levar.h,v 1.5 1996/05/07 01:50:07 thorpej Exp $ */ /* @@ -55,6 +55,6 @@ struct le_softc { bus_space_handle_t sc_ioh; }; -void le_isa_wrcsr __P((struct am7990_softc *, u_int16_t, u_int16_t)); -u_int16_t le_isa_rdcsr __P((struct am7990_softc *, u_int16_t)); -int le_isa_intredge __P((void *)); +void le_isa_wrcsr(struct am7990_softc *, u_int16_t, u_int16_t); +u_int16_t le_isa_rdcsr(struct am7990_softc *, u_int16_t); +int le_isa_intredge(void *); diff --git a/sys/dev/isa/if_ne_isa.c b/sys/dev/isa/if_ne_isa.c index 025ae84abdb..1855856a8ea 100644 --- a/sys/dev/isa/if_ne_isa.c +++ b/sys/dev/isa/if_ne_isa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ne_isa.c,v 1.5 2001/03/12 05:36:59 aaron Exp $ */ +/* $OpenBSD: if_ne_isa.c,v 1.6 2002/03/14 01:26:56 millert Exp $ */ /* $NetBSD: if_ne_isa.c,v 1.6 1998/07/05 06:49:13 jonathan Exp $ */ /*- @@ -93,8 +93,8 @@ #include <dev/isa/isavar.h> -int ne_isa_match __P((struct device *, void *, void *)); -void ne_isa_attach __P((struct device *, struct device *, void *)); +int ne_isa_match(struct device *, void *, void *); +void ne_isa_attach(struct device *, struct device *, void *); struct ne_isa_softc { struct ne2000_softc sc_ne2000; /* real "ne2000" softc */ diff --git a/sys/dev/isa/if_ne_isapnp.c b/sys/dev/isa/if_ne_isapnp.c index eacb4830aa1..000ab3f4297 100644 --- a/sys/dev/isa/if_ne_isapnp.c +++ b/sys/dev/isa/if_ne_isapnp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ne_isapnp.c,v 1.4 2001/03/12 05:37:00 aaron Exp $ */ +/* $OpenBSD: if_ne_isapnp.c,v 1.5 2002/03/14 01:26:56 millert Exp $ */ /* $NetBSD: if_ne_isapnp.c,v 1.7 1998/07/23 19:30:45 christos Exp $ */ /*- @@ -99,8 +99,8 @@ #include <dev/isa/isapnpdevs.h> #endif -static int ne_isapnp_match __P((struct device *, void *, void *)); -static void ne_isapnp_attach __P((struct device *, struct device *, void *)); +static int ne_isapnp_match(struct device *, void *, void *); +static void ne_isapnp_attach(struct device *, struct device *, void *); struct ne_isapnp_softc { struct ne2000_softc sc_ne2000; /* real "ne2000" softc */ diff --git a/sys/dev/isa/if_rln_isa.c b/sys/dev/isa/if_rln_isa.c index 4898f44746d..874df69165c 100644 --- a/sys/dev/isa/if_rln_isa.c +++ b/sys/dev/isa/if_rln_isa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_rln_isa.c,v 1.1 1999/07/31 06:10:04 d Exp $ */ +/* $OpenBSD: if_rln_isa.c,v 1.2 2002/03/14 01:26:56 millert Exp $ */ /* * David Leonard <d@openbsd.org>, 1999. Public domain. @@ -54,8 +54,8 @@ #include <dev/isa/isavar.h> -static int rln_isa_probe __P((struct device *, void *, void *)); -static void rln_isa_attach __P((struct device *, struct device *, void *)); +static int rln_isa_probe(struct device *, void *, void *); +static void rln_isa_attach(struct device *, struct device *, void *); struct cfattach rln_isa_ca = { sizeof(struct rln_softc), rln_isa_probe, rln_isa_attach diff --git a/sys/dev/isa/if_sm_isa.c b/sys/dev/isa/if_sm_isa.c index 8bd46293d1a..853beb92045 100644 --- a/sys/dev/isa/if_sm_isa.c +++ b/sys/dev/isa/if_sm_isa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_sm_isa.c,v 1.1 1998/09/26 19:09:15 fgsch Exp $ */ +/* $OpenBSD: if_sm_isa.c,v 1.2 2002/03/14 01:26:56 millert Exp $ */ /* $NetBSD: if_sm_isa.c,v 1.4 1998/07/05 06:49:14 jonathan Exp $ */ /*- @@ -87,8 +87,8 @@ #include <dev/isa/isavar.h> -int sm_isa_match __P((struct device *, void *, void *)); -void sm_isa_attach __P((struct device *, struct device *, void *)); +int sm_isa_match(struct device *, void *, void *); +void sm_isa_attach(struct device *, struct device *, void *); struct sm_isa_softc { struct smc91cxx_softc sc_smc; /* real "smc" softc */ diff --git a/sys/dev/isa/if_tr_isa.c b/sys/dev/isa/if_tr_isa.c index 48e1452366f..b20b451fb58 100644 --- a/sys/dev/isa/if_tr_isa.c +++ b/sys/dev/isa/if_tr_isa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_tr_isa.c,v 1.2 2001/11/05 17:25:58 art Exp $ */ +/* $OpenBSD: if_tr_isa.c,v 1.3 2002/03/14 01:26:56 millert Exp $ */ /* $NetBSD: if_tr_isa.c,v 1.4 1999/04/30 15:29:24 bad Exp $ */ #undef TRISADEBUG @@ -59,18 +59,18 @@ #include <dev/ic/tropicvar.h> -int tr_isa_probe __P((struct device *, void *, void *)); -int trtcm_isa_probe __P((struct device *, void *, void *)); -int tribm_isa_probe __P((struct device *, void *, void *)); -void tr_isa_attach __P((struct device *, struct device *, void *)); -int tr_isa_map_io __P((struct isa_attach_args *, bus_space_handle_t *, - bus_space_handle_t *)); -void tr_isa_unmap_io __P((struct isa_attach_args *, bus_space_handle_t, - bus_space_handle_t)); -int trtcm_isa_mediachange __P((struct tr_softc *)); -void trtcm_isa_mediastatus __P((struct tr_softc *, struct ifmediareq *)); +int tr_isa_probe(struct device *, void *, void *); +int trtcm_isa_probe(struct device *, void *, void *); +int tribm_isa_probe(struct device *, void *, void *); +void tr_isa_attach(struct device *, struct device *, void *); +int tr_isa_map_io(struct isa_attach_args *, bus_space_handle_t *, + bus_space_handle_t *); +void tr_isa_unmap_io(struct isa_attach_args *, bus_space_handle_t, + bus_space_handle_t); +int trtcm_isa_mediachange(struct tr_softc *); +void trtcm_isa_mediastatus(struct tr_softc *, struct ifmediareq *); #ifdef TRISADEBUG -void tr_isa_dumpaip __P((bus_space_tag_t, bus_space_handle_t)); +void tr_isa_dumpaip(bus_space_tag_t, bus_space_handle_t); #endif /* diff --git a/sys/dev/isa/if_tribm_isa.c b/sys/dev/isa/if_tribm_isa.c index c07d221a102..57cfc1c5b94 100644 --- a/sys/dev/isa/if_tribm_isa.c +++ b/sys/dev/isa/if_tribm_isa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_tribm_isa.c,v 1.2 2001/11/05 17:25:58 art Exp $ */ +/* $OpenBSD: if_tribm_isa.c,v 1.3 2002/03/14 01:26:56 millert Exp $ */ /* $NetBSD: if_tribm_isa.c,v 1.2 1999/03/22 23:01:37 bad Exp $ */ /* @@ -55,11 +55,11 @@ #include <dev/ic/tropicreg.h> #include <dev/ic/tropicvar.h> -int tribm_isa_probe __P((struct device *, void *, void *)); -int tr_isa_map_io __P((struct isa_attach_args *, bus_space_handle_t *, - bus_space_handle_t *)); -void tr_isa_unmap_io __P((struct isa_attach_args *, bus_space_handle_t, - bus_space_handle_t)); +int tribm_isa_probe(struct device *, void *, void *); +int tr_isa_map_io(struct isa_attach_args *, bus_space_handle_t *, + bus_space_handle_t *); +void tr_isa_unmap_io(struct isa_attach_args *, bus_space_handle_t, + bus_space_handle_t); int tribm_isa_probe(parent, match, aux) diff --git a/sys/dev/isa/if_trtcm_isa.c b/sys/dev/isa/if_trtcm_isa.c index cef9b1cfa85..98bf3ea64bc 100644 --- a/sys/dev/isa/if_trtcm_isa.c +++ b/sys/dev/isa/if_trtcm_isa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_trtcm_isa.c,v 1.2 2001/11/05 17:25:58 art Exp $ */ +/* $OpenBSD: if_trtcm_isa.c,v 1.3 2002/03/14 01:26:56 millert Exp $ */ /* $NetBSD: if_trtcm_isa.c,v 1.3 1999/04/30 15:29:24 bad Exp $ */ #undef TRTCMISADEBUG @@ -60,15 +60,15 @@ #include <dev/ic/elink3reg.h> -u_int16_t tcmreadeeprom __P((bus_space_tag_t, bus_space_handle_t, int)); +u_int16_t tcmreadeeprom(bus_space_tag_t, bus_space_handle_t, int); #ifdef TRTCMISADEBUG -void tcmdumpeeprom __P((bus_space_tag_t, bus_space_handle_t)); +void tcmdumpeeprom(bus_space_tag_t, bus_space_handle_t); #endif -int trtcm_isa_probe __P((struct device *, void *, void *)); +int trtcm_isa_probe(struct device *, void *, void *); -int trtcm_isa_mediachange __P((struct tr_softc *)); -void trtcm_isa_mediastatus __P((struct tr_softc *, struct ifmediareq *)); +int trtcm_isa_mediachange(struct tr_softc *); +void trtcm_isa_mediastatus(struct tr_softc *, struct ifmediareq *); /* * TODO: @@ -79,7 +79,7 @@ void trtcm_isa_mediastatus __P((struct tr_softc *, struct ifmediareq *)); * DIR_SET_DEFAULT_RING_SPEED or set the speed in the eeprom ?? */ -static void tcmaddcard __P((int, int, int, int, u_int, int, int)); +static void tcmaddcard(int, int, int, int, u_int, int, int); /* * This keeps track of which ISAs have been through a 3com probe sequence. diff --git a/sys/dev/isa/if_we.c b/sys/dev/isa/if_we.c index 4bb11ff8fb1..73f5e452df4 100644 --- a/sys/dev/isa/if_we.c +++ b/sys/dev/isa/if_we.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_we.c,v 1.9 2001/03/12 05:37:00 aaron Exp $ */ +/* $OpenBSD: if_we.c,v 1.10 2002/03/14 01:26:56 millert Exp $ */ /* $NetBSD: if_we.c,v 1.11 1998/07/05 06:49:14 jonathan Exp $ */ /*- @@ -130,8 +130,8 @@ struct we_softc { void *sc_ih; /* interrupt handle */ }; -int we_probe __P((struct device *, void *, void *)); -void we_attach __P((struct device *, struct device *, void *)); +int we_probe(struct device *, void *, void *); +void we_attach(struct device *, struct device *, void *); struct cfattach we_isa_ca = { sizeof(struct we_softc), we_probe, we_attach @@ -151,23 +151,23 @@ struct cfdriver we_cd = { }; #endif -const char *we_params __P((bus_space_tag_t, bus_space_handle_t, u_int8_t *, - bus_size_t *, int *, int *)); -void we_set_media __P((struct we_softc *, int)); +const char *we_params(bus_space_tag_t, bus_space_handle_t, u_int8_t *, + bus_size_t *, int *, int *); +void we_set_media(struct we_softc *, int); -void we_media_init __P((struct dp8390_softc *)); +void we_media_init(struct dp8390_softc *); -int we_mediachange __P((struct dp8390_softc *)); -void we_mediastatus __P((struct dp8390_softc *, struct ifmediareq *)); +int we_mediachange(struct dp8390_softc *); +void we_mediastatus(struct dp8390_softc *, struct ifmediareq *); -void we_recv_int __P((struct dp8390_softc *)); -void we_init_card __P((struct dp8390_softc *)); -int we_write_mbuf __P((struct dp8390_softc *, struct mbuf *, int)); -int we_ring_copy __P((struct dp8390_softc *, int, caddr_t, u_short)); -void we_read_hdr __P((struct dp8390_softc *, int, struct dp8390_ring *)); -int we_test_mem __P((struct dp8390_softc *)); +void we_recv_int(struct dp8390_softc *); +void we_init_card(struct dp8390_softc *); +int we_write_mbuf(struct dp8390_softc *, struct mbuf *, int); +int we_ring_copy(struct dp8390_softc *, int, caddr_t, u_short); +void we_read_hdr(struct dp8390_softc *, int, struct dp8390_ring *); +int we_test_mem(struct dp8390_softc *); -__inline void we_readmem __P((struct we_softc *, int, u_int8_t *, int)); +__inline void we_readmem(struct we_softc *, int, u_int8_t *, int); static const int we_584_irq[] = { 9, 3, 5, 7, 10, 11, 15, 4, diff --git a/sys/dev/isa/isa.c b/sys/dev/isa/isa.c index 778bee68431..3c61be07e01 100644 --- a/sys/dev/isa/isa.c +++ b/sys/dev/isa/isa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: isa.c,v 1.37 1999/07/30 17:12:56 deraadt Exp $ */ +/* $OpenBSD: isa.c,v 1.38 2002/03/14 01:26:56 millert Exp $ */ /* $NetBSD: isa.c,v 1.85 1996/05/14 00:31:04 thorpej Exp $ */ /* @@ -76,8 +76,8 @@ #include <dev/isa/isavar.h> #include <dev/isa/isadmareg.h> -int isamatch __P((struct device *, void *, void *)); -void isaattach __P((struct device *, struct device *, void *)); +int isamatch(struct device *, void *, void *); +void isaattach(struct device *, struct device *, void *); extern int autoconf_verbose; diff --git a/sys/dev/isa/isadma.c b/sys/dev/isa/isadma.c index f27817e64be..219909fb340 100644 --- a/sys/dev/isa/isadma.c +++ b/sys/dev/isa/isadma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: isadma.c,v 1.25 2001/11/06 19:53:19 miod Exp $ */ +/* $OpenBSD: isadma.c,v 1.26 2002/03/14 01:26:56 millert Exp $ */ /* $NetBSD: isadma.c,v 1.32 1997/09/05 01:48:33 thorpej Exp $ */ /*- @@ -90,8 +90,8 @@ static u_int8_t dmamode[4] = { DMA37MD_WRITE | DMA37MD_SINGLE | DMA37MD_LOOP }; -int isadmamatch __P((struct device *, void *, void *)); -void isadmaattach __P((struct device *, struct device *, void *)); +int isadmamatch(struct device *, void *, void *); +void isadmaattach(struct device *, struct device *, void *); struct cfattach isadma_ca = { sizeof(struct device), isadmamatch, isadmaattach @@ -138,8 +138,8 @@ isadmaattach(parent, self, aux) printf("\n"); } -static inline void isa_dmaunmask __P((struct isa_softc *, int)); -static inline void isa_dmamask __P((struct isa_softc *, int)); +static inline void isa_dmaunmask(struct isa_softc *, int); +static inline void isa_dmamask(struct isa_softc *, int); static inline void isa_dmaunmask(sc, chan) diff --git a/sys/dev/isa/isadmavar.h b/sys/dev/isa/isadmavar.h index 829fd6cbad7..69b6ec4093a 100644 --- a/sys/dev/isa/isadmavar.h +++ b/sys/dev/isa/isadmavar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: isadmavar.h,v 1.12 2001/10/31 11:00:24 art Exp $ */ +/* $OpenBSD: isadmavar.h,v 1.13 2002/03/14 01:26:56 millert Exp $ */ /* $NetBSD: isadmavar.h,v 1.10 1997/08/04 22:13:33 augustss Exp $ */ /*- @@ -60,10 +60,10 @@ struct isadma_seg { /* a physical contiguous segment */ bus_dmamap_t dmam; /* DMA handle for bus_dma routines. */ }; -int isadma_map __P((caddr_t, vm_size_t, struct isadma_seg *, int)); -void isadma_unmap __P((caddr_t, vm_size_t, int, struct isadma_seg *)); -void isadma_copytobuf __P((caddr_t, vm_size_t, int, struct isadma_seg *)); -void isadma_copyfrombuf __P((caddr_t, vm_size_t, int, struct isadma_seg *)); +int isadma_map(caddr_t, vm_size_t, struct isadma_seg *, int); +void isadma_unmap(caddr_t, vm_size_t, int, struct isadma_seg *); +void isadma_copytobuf(caddr_t, vm_size_t, int, struct isadma_seg *); +void isadma_copyfrombuf(caddr_t, vm_size_t, int, struct isadma_seg *); #define isadma_acquire(c) isa_dma_acquire(isa_dev, (c)) #define isadma_release(c) isa_dma_release(isa_dev, (c)) @@ -84,29 +84,29 @@ void isadma_copyfrombuf __P((caddr_t, vm_size_t, int, struct isadma_seg *)); struct proc; -void isa_dmacascade __P((struct device *, int)); +void isa_dmacascade(struct device *, int); -int isa_dmamap_create __P((struct device *, int, bus_size_t, int)); -void isa_dmamap_destroy __P((struct device *, int)); +int isa_dmamap_create(struct device *, int, bus_size_t, int); +void isa_dmamap_destroy(struct device *, int); -int isa_dmastart __P((struct device *, int, void *, bus_size_t, - struct proc *, int, int)); -void isa_dmaabort __P((struct device *, int)); -bus_size_t isa_dmacount __P((struct device *, int)); -int isa_dmafinished __P((struct device *, int)); -void isa_dmadone __P((struct device *, int)); +int isa_dmastart(struct device *, int, void *, bus_size_t, + struct proc *, int, int); +void isa_dmaabort(struct device *, int); +bus_size_t isa_dmacount(struct device *, int); +int isa_dmafinished(struct device *, int); +void isa_dmadone(struct device *, int); -int isa_dmamem_alloc __P((struct device *, int, bus_size_t, - bus_addr_t *, int)); -void isa_dmamem_free __P((struct device *, int, bus_addr_t, bus_size_t)); -int isa_dmamem_map __P((struct device *, int, bus_addr_t, bus_size_t, - caddr_t *, int)); -void isa_dmamem_unmap __P((struct device *, int, caddr_t, size_t)); -int isa_dmamem_mmap __P((struct device *, int, bus_addr_t, bus_size_t, - int, int, int)); +int isa_dmamem_alloc(struct device *, int, bus_size_t, + bus_addr_t *, int); +void isa_dmamem_free(struct device *, int, bus_addr_t, bus_size_t); +int isa_dmamem_map(struct device *, int, bus_addr_t, bus_size_t, + caddr_t *, int); +void isa_dmamem_unmap(struct device *, int, caddr_t, size_t); +int isa_dmamem_mmap(struct device *, int, bus_addr_t, bus_size_t, + int, int, int); -int isa_drq_isfree __P((struct device *, int)); +int isa_drq_isfree(struct device *, int); -void *isa_malloc __P((struct device *, int, size_t, int, int)); -void isa_free __P((void *, int)); -paddr_t isa_mappage __P((void *, off_t, int)); +void *isa_malloc(struct device *, int, size_t, int, int); +void isa_free(void *, int); +paddr_t isa_mappage(void *, off_t, int); diff --git a/sys/dev/isa/isapnp.c b/sys/dev/isa/isapnp.c index ac39fa08f81..1664d719990 100644 --- a/sys/dev/isa/isapnp.c +++ b/sys/dev/isa/isapnp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: isapnp.c,v 1.31 2001/09/21 17:55:43 miod Exp $ */ +/* $OpenBSD: isapnp.c,v 1.32 2002/03/14 01:26:56 millert Exp $ */ /* $NetBSD: isapnp.c,v 1.9.4.3 1997/10/29 00:40:43 thorpej Exp $ */ /* @@ -48,28 +48,28 @@ #include <dev/isa/pnpdevs.h> -void isapnp_init __P((struct isapnp_softc *)); -static __inline u_char isapnp_shift_bit __P((struct isapnp_softc *)); -int isapnp_findcard __P((struct isapnp_softc *)); -void isapnp_free_region __P((bus_space_tag_t, struct isapnp_region *)); -int isapnp_alloc_region __P((bus_space_tag_t, struct isapnp_region *)); -int isapnp_alloc_irq __P((isa_chipset_tag_t, struct isapnp_pin *)); -int isapnp_alloc_drq __P((struct device *, struct isapnp_pin *)); -int isapnp_testconfig __P((bus_space_tag_t, bus_space_tag_t, - struct isa_attach_args *, int)); -struct isa_attach_args *isapnp_bestconfig __P((struct device *, - struct isapnp_softc *, struct isa_attach_args **)); -void isapnp_print_region __P((const char *, struct isapnp_region *, - size_t)); -void isapnp_configure __P((struct isapnp_softc *, - const struct isa_attach_args *)); -void isapnp_print_pin __P((const char *, struct isapnp_pin *, size_t)); -int isapnp_print __P((void *, const char *)); -int isapnp_submatch __P((struct device *, void *, void *)); -int isapnp_com_submatch __P((struct device *, void *, void *)); -int isapnp_find __P((struct isapnp_softc *, int)); -int isapnp_match __P((struct device *, void *, void *)); -void isapnp_attach __P((struct device *, struct device *, void *)); +void isapnp_init(struct isapnp_softc *); +static __inline u_char isapnp_shift_bit(struct isapnp_softc *); +int isapnp_findcard(struct isapnp_softc *); +void isapnp_free_region(bus_space_tag_t, struct isapnp_region *); +int isapnp_alloc_region(bus_space_tag_t, struct isapnp_region *); +int isapnp_alloc_irq(isa_chipset_tag_t, struct isapnp_pin *); +int isapnp_alloc_drq(struct device *, struct isapnp_pin *); +int isapnp_testconfig(bus_space_tag_t, bus_space_tag_t, + struct isa_attach_args *, int); +struct isa_attach_args *isapnp_bestconfig(struct device *, + struct isapnp_softc *, struct isa_attach_args **); +void isapnp_print_region(const char *, struct isapnp_region *, + size_t); +void isapnp_configure(struct isapnp_softc *, + const struct isa_attach_args *); +void isapnp_print_pin(const char *, struct isapnp_pin *, size_t); +int isapnp_print(void *, const char *); +int isapnp_submatch(struct device *, void *, void *); +int isapnp_com_submatch(struct device *, void *, void *); +int isapnp_find(struct isapnp_softc *, int); +int isapnp_match(struct device *, void *, void *); +void isapnp_attach(struct device *, struct device *, void *); #ifdef DEBUG_ISAPNP # define DPRINTF(a) printf a diff --git a/sys/dev/isa/isapnpres.c b/sys/dev/isa/isapnpres.c index 16d4493c990..09d434fd82b 100644 --- a/sys/dev/isa/isapnpres.c +++ b/sys/dev/isa/isapnpres.c @@ -1,4 +1,4 @@ -/* $OpenBSD: isapnpres.c,v 1.4 1997/12/26 23:43:51 deraadt Exp $ */ +/* $OpenBSD: isapnpres.c,v 1.5 2002/03/14 01:26:56 millert Exp $ */ /* $NetBSD: isapnpres.c,v 1.7.4.1 1997/11/20 07:46:13 mellon Exp $ */ /* @@ -45,18 +45,18 @@ #include <dev/isa/isavar.h> -int isapnp_wait_status __P((struct isapnp_softc *)); +int isapnp_wait_status(struct isapnp_softc *); struct isa_attach_args * - isapnp_newdev __P((struct isa_attach_args *)); + isapnp_newdev(struct isa_attach_args *); struct isa_attach_args * - isapnp_newconf __P((struct isa_attach_args *)); -void isapnp_merge __P((struct isa_attach_args *, - const struct isa_attach_args *)); + isapnp_newconf(struct isa_attach_args *); +void isapnp_merge(struct isa_attach_args *, + const struct isa_attach_args *); struct isa_attach_args * - isapnp_flatten __P((struct isa_attach_args *)); -int isapnp_process_tag __P((u_char, u_char, u_char *, + isapnp_flatten(struct isa_attach_args *); +int isapnp_process_tag(u_char, u_char, u_char *, struct isa_attach_args **, struct isa_attach_args **, - struct isa_attach_args **)); + struct isa_attach_args **); #ifdef DEBUG_ISAPNP # define DPRINTF(a) printf a diff --git a/sys/dev/isa/isavar.h b/sys/dev/isa/isavar.h index d3adcd646eb..40c407f2a98 100644 --- a/sys/dev/isa/isavar.h +++ b/sys/dev/isa/isavar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: isavar.h,v 1.42 2001/07/06 00:23:09 smurph Exp $ */ +/* $OpenBSD: isavar.h,v 1.43 2002/03/14 01:26:56 millert Exp $ */ /* $NetBSD: isavar.h,v 1.26 1997/06/06 23:43:57 thorpej Exp $ */ /*- @@ -407,10 +407,10 @@ struct isa_softc { */ /* ISA interrupt sharing types */ -char *isa_intr_typename __P((int type)); +char *isa_intr_typename(int type); -void isascan __P((struct device *parent, void *match)); -int isaprint __P((void *, const char *)); +void isascan(struct device *parent, void *match); +int isaprint(void *, const char *); /* * Some ISA devices (e.g. on a VLB) can perform 32-bit DMA. This @@ -421,8 +421,8 @@ int isaprint __P((void *, const char *)); /* * ISA PnP prototypes and support macros. */ -static __inline void isapnp_write_reg __P((struct isapnp_softc *, int, u_char)); -static __inline u_char isapnp_read_reg __P((struct isapnp_softc *, int)); +static __inline void isapnp_write_reg(struct isapnp_softc *, int, u_char); +static __inline u_char isapnp_read_reg(struct isapnp_softc *, int); static __inline void isapnp_write_reg(sc, r, v) @@ -443,24 +443,24 @@ isapnp_read_reg(sc, r) } struct isa_attach_args * - isapnp_get_resource __P((struct isapnp_softc *, int)); -char *isapnp_id_to_vendor __P((char *, const u_char *)); + isapnp_get_resource(struct isapnp_softc *, int); +char *isapnp_id_to_vendor(char *, const u_char *); -int isapnp_config __P((bus_space_tag_t, bus_space_tag_t, - struct isa_attach_args *)); -void isapnp_unconfig __P((bus_space_tag_t, bus_space_tag_t, - struct isa_attach_args *)); +int isapnp_config(bus_space_tag_t, bus_space_tag_t, + struct isa_attach_args *); +void isapnp_unconfig(bus_space_tag_t, bus_space_tag_t, + struct isa_attach_args *); -void isapnp_isa_attach_hook __P((struct isa_softc *)); +void isapnp_isa_attach_hook(struct isa_softc *); #ifdef DEBUG_ISAPNP -void isapnp_print_mem __P((const char *, const struct isapnp_region *)); -void isapnp_print_io __P((const char *, const struct isapnp_region *)); -void isapnp_print_irq __P((const char *, const struct isapnp_pin *)); -void isapnp_print_drq __P((const char *, const struct isapnp_pin *)); -void isapnp_print_dep_start __P((const char *, const u_char)); -void isapnp_print_attach __P((const struct isa_attach_args *)); -void isapnp_get_config __P((struct isapnp_softc *, - struct isa_attach_args *)); -void isapnp_print_config __P((const struct isa_attach_args *)); +void isapnp_print_mem(const char *, const struct isapnp_region *); +void isapnp_print_io(const char *, const struct isapnp_region *); +void isapnp_print_irq(const char *, const struct isapnp_pin *); +void isapnp_print_drq(const char *, const struct isapnp_pin *); +void isapnp_print_dep_start(const char *, const u_char); +void isapnp_print_attach(const struct isa_attach_args *); +void isapnp_get_config(struct isapnp_softc *, + struct isa_attach_args *); +void isapnp_print_config(const struct isa_attach_args *); #endif /* DEBUG_ISAPNP */ #endif /* _DEV_ISA_ISAVAR_H_ */ diff --git a/sys/dev/isa/lpt_isa.c b/sys/dev/isa/lpt_isa.c index ac7356c2064..0d7a1b8689b 100644 --- a/sys/dev/isa/lpt_isa.c +++ b/sys/dev/isa/lpt_isa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lpt_isa.c,v 1.11 2000/07/21 17:41:03 mickey Exp $ */ +/* $OpenBSD: lpt_isa.c,v 1.12 2002/03/14 01:26:56 millert Exp $ */ /* * Copyright (c) 1993, 1994 Charles Hannum. @@ -64,8 +64,8 @@ #include <dev/ic/lptreg.h> #include <dev/ic/lptvar.h> -int lpt_isa_probe __P((struct device *, void *, void *)); -void lpt_isa_attach __P((struct device *, struct device *, void *)); +int lpt_isa_probe(struct device *, void *, void *); +void lpt_isa_attach(struct device *, struct device *, void *); struct cfattach lpt_isa_ca = { sizeof(struct lpt_softc), lpt_isa_probe, lpt_isa_attach diff --git a/sys/dev/isa/mcd.c b/sys/dev/isa/mcd.c index 52391910118..9486395ff64 100644 --- a/sys/dev/isa/mcd.c +++ b/sys/dev/isa/mcd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mcd.c,v 1.29 2000/11/11 23:55:57 mickey Exp $ */ +/* $OpenBSD: mcd.c,v 1.30 2002/03/14 01:26:56 millert Exp $ */ /* $NetBSD: mcd.c,v 1.60 1998/01/14 12:14:41 drochner Exp $ */ /* @@ -156,43 +156,43 @@ struct mcd_softc { cdev_decl(mcd); bdev_decl(mcd); -static void hsg2msf __P((int, bcd_t *)); -static daddr_t msf2hsg __P((bcd_t *, int)); - -int mcd_playtracks __P((struct mcd_softc *, struct ioc_play_track *)); -int mcd_playmsf __P((struct mcd_softc *, struct ioc_play_msf *)); -int mcd_playblocks __P((struct mcd_softc *, struct ioc_play_blocks *)); -int mcd_stop __P((struct mcd_softc *)); -int mcd_eject __P((struct mcd_softc *)); -int mcd_read_subchannel __P((struct mcd_softc *, struct ioc_read_subchannel *)); -int mcd_pause __P((struct mcd_softc *)); -int mcd_resume __P((struct mcd_softc *)); -int mcd_toc_header __P((struct mcd_softc *, struct ioc_toc_header *)); -int mcd_toc_entries __P((struct mcd_softc *, struct ioc_read_toc_entry *)); - -int mcd_getreply __P((struct mcd_softc *)); -int mcd_getstat __P((struct mcd_softc *)); -int mcd_getresult __P((struct mcd_softc *, struct mcd_result *)); -void mcd_setflags __P((struct mcd_softc *)); -int mcd_get __P((struct mcd_softc *, char *, int)); -int mcd_send __P((struct mcd_softc *, struct mcd_mbox *, int)); -int mcdintr __P((void *)); -void mcd_soft_reset __P((struct mcd_softc *)); -int mcd_hard_reset __P((struct mcd_softc *)); -int mcd_setmode __P((struct mcd_softc *, int)); -int mcd_setupc __P((struct mcd_softc *, int)); -int mcd_read_toc __P((struct mcd_softc *)); -int mcd_getqchan __P((struct mcd_softc *, union mcd_qchninfo *, int)); -int mcd_setlock __P((struct mcd_softc *, int)); - -int mcd_find __P((bus_space_tag_t, bus_space_handle_t, struct mcd_softc *)); +static void hsg2msf(int, bcd_t *); +static daddr_t msf2hsg(bcd_t *, int); + +int mcd_playtracks(struct mcd_softc *, struct ioc_play_track *); +int mcd_playmsf(struct mcd_softc *, struct ioc_play_msf *); +int mcd_playblocks(struct mcd_softc *, struct ioc_play_blocks *); +int mcd_stop(struct mcd_softc *); +int mcd_eject(struct mcd_softc *); +int mcd_read_subchannel(struct mcd_softc *, struct ioc_read_subchannel *); +int mcd_pause(struct mcd_softc *); +int mcd_resume(struct mcd_softc *); +int mcd_toc_header(struct mcd_softc *, struct ioc_toc_header *); +int mcd_toc_entries(struct mcd_softc *, struct ioc_read_toc_entry *); + +int mcd_getreply(struct mcd_softc *); +int mcd_getstat(struct mcd_softc *); +int mcd_getresult(struct mcd_softc *, struct mcd_result *); +void mcd_setflags(struct mcd_softc *); +int mcd_get(struct mcd_softc *, char *, int); +int mcd_send(struct mcd_softc *, struct mcd_mbox *, int); +int mcdintr(void *); +void mcd_soft_reset(struct mcd_softc *); +int mcd_hard_reset(struct mcd_softc *); +int mcd_setmode(struct mcd_softc *, int); +int mcd_setupc(struct mcd_softc *, int); +int mcd_read_toc(struct mcd_softc *); +int mcd_getqchan(struct mcd_softc *, union mcd_qchninfo *, int); +int mcd_setlock(struct mcd_softc *, int); + +int mcd_find(bus_space_tag_t, bus_space_handle_t, struct mcd_softc *); #define __BROKEN_INDIRECT_CONFIG #ifdef __BROKEN_INDIRECT_CONFIG -int mcdprobe __P((struct device *, void *, void *)); +int mcdprobe(struct device *, void *, void *); #else -int mcdprobe __P((struct device *, struct cfdata *, void *)); +int mcdprobe(struct device *, struct cfdata *, void *); #endif -void mcdattach __P((struct device *, struct device *, void *)); +void mcdattach(struct device *, struct device *, void *); struct cfattach mcd_ca = { sizeof(struct mcd_softc), mcdprobe, mcdattach @@ -202,14 +202,14 @@ struct cfdriver mcd_cd = { NULL, "mcd", DV_DISK }; -void mcdgetdisklabel __P((dev_t, struct mcd_softc *, struct disklabel *, - struct cpu_disklabel *, int)); -int mcd_get_parms __P((struct mcd_softc *)); -void mcdstrategy __P((struct buf *)); -void mcdstart __P((struct mcd_softc *)); -int mcdlock __P((struct mcd_softc *)); -void mcdunlock __P((struct mcd_softc *)); -void mcd_pseudointr __P((void *)); +void mcdgetdisklabel(dev_t, struct mcd_softc *, struct disklabel *, + struct cpu_disklabel *, int); +int mcd_get_parms(struct mcd_softc *); +void mcdstrategy(struct buf *); +void mcdstart(struct mcd_softc *); +int mcdlock(struct mcd_softc *); +void mcdunlock(struct mcd_softc *); +void mcd_pseudointr(void *); struct dkdriver mcddkdriver = { mcdstrategy }; diff --git a/sys/dev/isa/midi_pcppi.c b/sys/dev/isa/midi_pcppi.c index c42ae87fe5d..394085a3d4f 100644 --- a/sys/dev/isa/midi_pcppi.c +++ b/sys/dev/isa/midi_pcppi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: midi_pcppi.c,v 1.1 1999/01/02 00:02:42 niklas Exp $ */ +/* $OpenBSD: midi_pcppi.c,v 1.2 2002/03/14 01:26:56 millert Exp $ */ /* $NetBSD: midi_pcppi.c,v 1.4 1998/11/25 22:17:06 augustss Exp $ */ /* @@ -65,15 +65,15 @@ struct midi_pcppi_softc { #define __BROKEN_INDIRECT_CONFIG /* XXX */ #ifdef __BROKEN_INDIRECT_CONFIG -int midi_pcppi_match __P((struct device *, void *, void *)); +int midi_pcppi_match(struct device *, void *, void *); #else -int midi_pcppi_match __P((struct device *, struct cfdata *, void *)); +int midi_pcppi_match(struct device *, struct cfdata *, void *); #endif -void midi_pcppi_attach __P((struct device *, struct device *, void *)); +void midi_pcppi_attach(struct device *, struct device *, void *); -void midi_pcppi_on __P((midisyn *, u_int32_t, u_int32_t, u_int32_t)); -void midi_pcppi_off __P((midisyn *, u_int32_t, u_int32_t, u_int32_t)); -void midi_pcppi_close __P((midisyn *)); +void midi_pcppi_on(midisyn *, u_int32_t, u_int32_t, u_int32_t); +void midi_pcppi_off(midisyn *, u_int32_t, u_int32_t, u_int32_t); +void midi_pcppi_close(midisyn *); struct cfattach midi_pcppi_ca = { sizeof(struct midi_pcppi_softc), midi_pcppi_match, midi_pcppi_attach diff --git a/sys/dev/isa/mpu401.c b/sys/dev/isa/mpu401.c index 82079d04863..3c72e004bb2 100644 --- a/sys/dev/isa/mpu401.c +++ b/sys/dev/isa/mpu401.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mpu401.c,v 1.5 2001/11/06 19:53:19 miod Exp $ */ +/* $OpenBSD: mpu401.c,v 1.6 2002/03/14 01:26:56 millert Exp $ */ /* $NetBSD: mpu401.c,v 1.3 1998/11/25 22:17:06 augustss Exp $ */ /* @@ -160,8 +160,8 @@ int mpu_open(v, flags, iintr, ointr, arg) void *v; int flags; - void (*iintr)__P((void *, int)); - void (*ointr)__P((void *)); + void (*iintr)(void *, int); + void (*ointr)(void *); void *arg; { struct mpu_softc *sc = v; diff --git a/sys/dev/isa/mpu_isapnp.c b/sys/dev/isa/mpu_isapnp.c index 8c258661466..40abd16938e 100644 --- a/sys/dev/isa/mpu_isapnp.c +++ b/sys/dev/isa/mpu_isapnp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mpu_isapnp.c,v 1.4 2001/07/08 06:41:38 fgsch Exp $ */ +/* $OpenBSD: mpu_isapnp.c,v 1.5 2002/03/14 01:26:56 millert Exp $ */ #include "midi.h" @@ -22,8 +22,8 @@ #include <dev/ic/mpuvar.h> -int mpu_isapnp_match __P((struct device *, void *, void *)); -void mpu_isapnp_attach __P((struct device *, struct device *, void *)); +int mpu_isapnp_match(struct device *, void *, void *); +void mpu_isapnp_attach(struct device *, struct device *, void *); struct mpu_isapnp_softc { struct device sc_dev; diff --git a/sys/dev/isa/opl_ess.c b/sys/dev/isa/opl_ess.c index 9dc327fb938..f395b953852 100644 --- a/sys/dev/isa/opl_ess.c +++ b/sys/dev/isa/opl_ess.c @@ -1,4 +1,4 @@ -/* $OpenBSD: opl_ess.c,v 1.1 1999/06/22 16:20:04 niklas Exp $ */ +/* $OpenBSD: opl_ess.c,v 1.2 2002/03/14 01:26:56 millert Exp $ */ /* $NetBSD: opl_ess.c,v 1.3 1998/12/08 14:26:57 augustss Exp $ */ /* @@ -58,10 +58,10 @@ #include <dev/isa/isavar.h> #include <dev/isa/essvar.h> -extern int ess_speaker_ctl __P((void *, int)); +extern int ess_speaker_ctl(void *, int); -int opl_ess_match __P((struct device *, void *, void *)); -void opl_ess_attach __P((struct device *, struct device *, void *)); +int opl_ess_match(struct device *, void *, void *); +void opl_ess_attach(struct device *, struct device *, void *); struct cfattach opl_ess_ca = { sizeof (struct opl_softc), opl_ess_match, opl_ess_attach diff --git a/sys/dev/isa/opl_isa.c b/sys/dev/isa/opl_isa.c index 3c3e92ba61f..24c0ed1de09 100644 --- a/sys/dev/isa/opl_isa.c +++ b/sys/dev/isa/opl_isa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: opl_isa.c,v 1.2 1999/08/09 03:29:45 fgsch Exp $ */ +/* $OpenBSD: opl_isa.c,v 1.3 2002/03/14 01:26:56 millert Exp $ */ /* $NetBSD: opl_isa.c,v 1.1 1998/08/26 13:33:59 augustss Exp $ */ /* @@ -60,8 +60,8 @@ #define OPL_SIZE 4 -int opl_isa_match __P((struct device *, void *, void *)); -void opl_isa_attach __P((struct device *, struct device *, void *)); +int opl_isa_match(struct device *, void *, void *); +void opl_isa_attach(struct device *, struct device *, void *); struct cfattach opl_isa_ca = { sizeof (struct opl_softc), opl_isa_match, opl_isa_attach diff --git a/sys/dev/isa/opl_sb.c b/sys/dev/isa/opl_sb.c index b2a41c3fe92..0e69cceff8c 100644 --- a/sys/dev/isa/opl_sb.c +++ b/sys/dev/isa/opl_sb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: opl_sb.c,v 1.1 1999/01/02 00:02:45 niklas Exp $ */ +/* $OpenBSD: opl_sb.c,v 1.2 2002/03/14 01:26:56 millert Exp $ */ /* $NetBSD: opl_sb.c,v 1.4 1998/12/08 14:26:57 augustss Exp $ */ /* @@ -61,11 +61,11 @@ #define __BROKEN_INDIRECT_CONFIG /* XXX */ #ifdef __BROKEN_INDIRECT_CONFIG -int opl_sb_match __P((struct device *, void *, void *)); +int opl_sb_match(struct device *, void *, void *); #else -int opl_sb_match __P((struct device *, struct cfdata *, void *)); +int opl_sb_match(struct device *, struct cfdata *, void *); #endif -void opl_sb_attach __P((struct device *, struct device *, void *)); +void opl_sb_attach(struct device *, struct device *, void *); struct cfattach opl_sb_ca = { sizeof (struct opl_softc), opl_sb_match, opl_sb_attach diff --git a/sys/dev/isa/opti.c b/sys/dev/isa/opti.c index fac35d21424..56a591bdb1b 100644 --- a/sys/dev/isa/opti.c +++ b/sys/dev/isa/opti.c @@ -1,4 +1,4 @@ -/* $OpenBSD: opti.c,v 1.5 1996/10/16 12:32:48 deraadt Exp $ */ +/* $OpenBSD: opti.c,v 1.6 2002/03/14 01:26:56 millert Exp $ */ /* * Copyright (c) 1996 Michael Shalayeff @@ -63,15 +63,15 @@ int opti_type = OPTI_C929; /* XXX only one card can be installed */ #define OPTI_cd_valid_ift(i) ((i)==OPTI_SONY||(i)==OPTI_PANASONIC||\ (i)==OPTI_MITSUMI||(i)==OPTI_IDE) -static __inline int OPTI_cd_addr __P((int)); -static __inline int OPTI_cd_irq __P((int)); -static __inline int OPTI_cd_drq __P((int)); -static __inline int OPTI_snd_addr __P((int)); -static __inline int OPTI_snd_irq __P((int)); -static __inline int OPTI_snd_drq __P((int)); -static __inline void opti_outb __P((u_short, u_char)); -static __inline u_char opti_inb __P((u_short)); -static int opti_present __P((void)); +static __inline int OPTI_cd_addr(int); +static __inline int OPTI_cd_irq(int); +static __inline int OPTI_cd_drq(int); +static __inline int OPTI_snd_addr(int); +static __inline int OPTI_snd_irq(int); +static __inline int OPTI_snd_drq(int); +static __inline void opti_outb(u_short, u_char); +static __inline u_char opti_inb(u_short); +static int opti_present(void); static __inline int OPTI_cd_addr(a) diff --git a/sys/dev/isa/opti.h b/sys/dev/isa/opti.h index 6f84fea1305..915edf2442b 100644 --- a/sys/dev/isa/opti.h +++ b/sys/dev/isa/opti.h @@ -1,4 +1,4 @@ -/* $OpenBSD: opti.h,v 1.4 1996/11/29 22:55:05 niklas Exp $ */ +/* $OpenBSD: opti.h,v 1.5 2002/03/14 01:26:56 millert Exp $ */ /* * Copyright (c) 1996 Michael Shalayeff @@ -69,8 +69,8 @@ #define OPTI_SB (1) /* Sound Blaster Pro(tm) compatible */ #ifdef _KERNEL -int opti_cd_setup __P(( int, int, int, int )); -int opti_snd_setup __P(( int, int, int, int )); +int opti_cd_setup( int, int, int, int ); +int opti_snd_setup( int, int, int, int ); #endif #endif /* __OPTI_HEADER__ */ diff --git a/sys/dev/isa/pas.c b/sys/dev/isa/pas.c index 0a8982fd413..df407777a5e 100644 --- a/sys/dev/isa/pas.c +++ b/sys/dev/isa/pas.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pas.c,v 1.21 2001/06/06 10:18:57 d Exp $ */ +/* $OpenBSD: pas.c,v 1.22 2002/03/14 01:26:56 millert Exp $ */ /* $NetBSD: pas.c,v 1.37 1998/01/12 09:43:43 thorpej Exp $ */ /* @@ -102,8 +102,8 @@ struct pas_softc { }; -int pas_getdev __P((void *, struct audio_device *)); -void pasconf __P((int, int, int, int)); +int pas_getdev(void *, struct audio_device *); +void pasconf(int, int, int, int); /* @@ -240,8 +240,8 @@ pasconf(model, sbbase, sbirq, sbdrq) paswrite(P_M_MV508_INPUTMIX | 30, PARALLEL_MIXER); } -int pasprobe __P((struct device *, void *, void *)); -void pasattach __P((struct device *, struct device *, void *)); +int pasprobe(struct device *, void *, void *); +void pasattach(struct device *, struct device *, void *); struct cfattach pas_ca = { sizeof(struct pas_softc), pasprobe, pasattach diff --git a/sys/dev/isa/pcdisplay.c b/sys/dev/isa/pcdisplay.c index d6cd3b99d60..d69ce80ad55 100644 --- a/sys/dev/isa/pcdisplay.c +++ b/sys/dev/isa/pcdisplay.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pcdisplay.c,v 1.4 2001/02/02 20:25:40 aaron Exp $ */ +/* $OpenBSD: pcdisplay.c,v 1.5 2002/03/14 01:26:56 millert Exp $ */ /* $NetBSD: pcdisplay.c,v 1.9.4.1 2000/06/30 16:27:48 simonb Exp $ */ /* @@ -67,16 +67,16 @@ struct pcdisplay_softc { static int pcdisplayconsole, pcdisplay_console_attached; static struct pcdisplay_config pcdisplay_console_dc; -int pcdisplay_match __P((struct device *, void *, void *)); -void pcdisplay_attach __P((struct device *, struct device *, void *)); +int pcdisplay_match(struct device *, void *, void *); +void pcdisplay_attach(struct device *, struct device *, void *); -static int pcdisplay_is_console __P((bus_space_tag_t)); -static int pcdisplay_probe_col __P((bus_space_tag_t, bus_space_tag_t)); -static int pcdisplay_probe_mono __P((bus_space_tag_t, bus_space_tag_t)); -static void pcdisplay_init __P((struct pcdisplay_config *, +static int pcdisplay_is_console(bus_space_tag_t); +static int pcdisplay_probe_col(bus_space_tag_t, bus_space_tag_t); +static int pcdisplay_probe_mono(bus_space_tag_t, bus_space_tag_t); +static void pcdisplay_init(struct pcdisplay_config *, bus_space_tag_t, bus_space_tag_t, - int)); -static int pcdisplay_alloc_attr __P((void *, int, int, int, long *)); + int); +static int pcdisplay_alloc_attr(void *, int, int, int, long *); struct cfattach pcdisplay_ca = { sizeof(struct pcdisplay_softc), pcdisplay_match, pcdisplay_attach, @@ -109,11 +109,11 @@ const struct wsscreen_list pcdisplay_screenlist = { _pcdisplay_scrlist }; -static int pcdisplay_ioctl __P((void *, u_long, caddr_t, int, struct proc *)); -static paddr_t pcdisplay_mmap __P((void *, off_t, int)); -static int pcdisplay_alloc_screen __P((void *, const struct wsscreen_descr *, - void **, int *, int *, long *)); -static void pcdisplay_free_screen __P((void *, void *)); +static int pcdisplay_ioctl(void *, u_long, caddr_t, int, struct proc *); +static paddr_t pcdisplay_mmap(void *, off_t, int); +static int pcdisplay_alloc_screen(void *, const struct wsscreen_descr *, + void **, int *, int *, long *); +static void pcdisplay_free_screen(void *, void *); static int pcdisplay_show_screen __P((void *, void *, int, void (*) (void *, int, int), void *)); @@ -395,7 +395,7 @@ pcdisplay_show_screen(v, cookie, waitok, cb, cbarg) void *v; void *cookie; int waitok; - void (*cb) __P((void *, int, int)); + void (*cb)(void *, int, int); void *cbarg; { #ifdef DIAGNOSTIC diff --git a/sys/dev/isa/pcdisplayvar.h b/sys/dev/isa/pcdisplayvar.h index 0c7e4a24144..26c96e20ea1 100644 --- a/sys/dev/isa/pcdisplayvar.h +++ b/sys/dev/isa/pcdisplayvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pcdisplayvar.h,v 1.2 2001/02/02 20:25:40 aaron Exp $ */ +/* $OpenBSD: pcdisplayvar.h,v 1.3 2002/03/14 01:26:56 millert Exp $ */ /* $NetBSD: pcdisplayvar.h,v 1.1 1998/05/28 16:51:51 drochner Exp $ */ /* @@ -33,4 +33,4 @@ * */ -int pcdisplay_cnattach __P((bus_space_tag_t, bus_space_tag_t)); +int pcdisplay_cnattach(bus_space_tag_t, bus_space_tag_t); diff --git a/sys/dev/isa/pckbc_isa.c b/sys/dev/isa/pckbc_isa.c index e9d29939272..6bac96e1322 100644 --- a/sys/dev/isa/pckbc_isa.c +++ b/sys/dev/isa/pckbc_isa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pckbc_isa.c,v 1.2 2001/07/08 06:41:38 fgsch Exp $ */ +/* $OpenBSD: pckbc_isa.c,v 1.3 2002/03/14 01:26:56 millert Exp $ */ /* $NetBSD: pckbc_isa.c,v 1.2 2000/03/23 07:01:35 thorpej Exp $ */ /* @@ -50,8 +50,8 @@ #include <dev/ic/i8042reg.h> #include <dev/ic/pckbcvar.h> -int pckbc_isa_match __P((struct device *, void *, void *)); -void pckbc_isa_attach __P((struct device *, struct device *, void *)); +int pckbc_isa_match(struct device *, void *, void *); +void pckbc_isa_attach(struct device *, struct device *, void *); struct pckbc_isa_softc { struct pckbc_softc sc_pckbc; @@ -64,7 +64,7 @@ struct cfattach pckbc_isa_ca = { sizeof(struct pckbc_isa_softc), pckbc_isa_match, pckbc_isa_attach, }; -void pckbc_isa_intr_establish __P((struct pckbc_softc *, pckbc_slot_t)); +void pckbc_isa_intr_establish(struct pckbc_softc *, pckbc_slot_t); int pckbc_isa_match(parent, match, aux) diff --git a/sys/dev/isa/pcppi.c b/sys/dev/isa/pcppi.c index f8e71d388db..3997193ad91 100644 --- a/sys/dev/isa/pcppi.c +++ b/sys/dev/isa/pcppi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pcppi.c,v 1.3 2001/04/17 04:30:50 aaron Exp $ */ +/* $OpenBSD: pcppi.c,v 1.4 2002/03/14 01:26:56 millert Exp $ */ /* $NetBSD: pcppi.c,v 1.1 1998/04/15 20:26:18 drochner Exp $ */ /* @@ -49,7 +49,7 @@ #include <dev/ic/pckbcvar.h> #include <dev/pckbc/pckbdvar.h> -void pcppi_pckbd_bell __P((void *, u_int, u_int, u_int, int)); +void pcppi_pckbd_bell(void *, u_int, u_int, u_int, int); #endif struct pcppi_softc { @@ -67,11 +67,11 @@ struct pcppi_softc { #define __BROKEN_INDIRECT_CONFIG /* XXX */ #ifdef __BROKEN_INDIRECT_CONFIG -int pcppi_match __P((struct device *, void *, void *)); +int pcppi_match(struct device *, void *, void *); #else -int pcppi_match __P((struct device *, struct cfdata *, void *)); +int pcppi_match(struct device *, struct cfdata *, void *); #endif -void pcppi_attach __P((struct device *, struct device *, void *)); +void pcppi_attach(struct device *, struct device *, void *); struct cfattach pcppi_ca = { sizeof(struct pcppi_softc), pcppi_match, pcppi_attach, @@ -81,7 +81,7 @@ struct cfdriver pcppi_cd = { NULL, "pcppi", DV_DULL }; -static void pcppi_bell_stop __P((void*)); +static void pcppi_bell_stop(void*); #define PCPPIPRI (PZERO - 1) diff --git a/sys/dev/isa/pcppivar.h b/sys/dev/isa/pcppivar.h index 9d705616070..3ddf41955e4 100644 --- a/sys/dev/isa/pcppivar.h +++ b/sys/dev/isa/pcppivar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pcppivar.h,v 1.2 2001/04/17 04:30:50 aaron Exp $ */ +/* $OpenBSD: pcppivar.h,v 1.3 2002/03/14 01:26:56 millert Exp $ */ /* $NetBSD: pcppivar.h,v 1.1 1998/04/15 20:26:18 drochner Exp $ */ /* @@ -37,4 +37,4 @@ struct pcppi_attach_args { #define PCPPI_BELL_SLEEP 0x01 /* synchronous; sleep for complete */ #define PCPPI_BELL_POLL 0x02 /* synchronous; poll for complete */ -void pcppi_bell __P((pcppi_tag_t, int, int, int)); +void pcppi_bell(pcppi_tag_t, int, int, int); diff --git a/sys/dev/isa/pss.c b/sys/dev/isa/pss.c index 6f2c5ef0e91..8c21abfe361 100644 --- a/sys/dev/isa/pss.c +++ b/sys/dev/isa/pss.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pss.c,v 1.20 2001/02/03 05:26:47 mickey Exp $ */ +/* $OpenBSD: pss.c,v 1.21 2002/03/14 01:26:56 millert Exp $ */ /* $NetBSD: pss.c,v 1.38 1998/01/12 09:43:44 thorpej Exp $ */ /* @@ -152,59 +152,59 @@ int pssdebug = 0; #define DPRINTF(x) #endif -int pssprobe __P((struct device *, void *, void *)); -void pssattach __P((struct device *, struct device *, void *)); +int pssprobe(struct device *, void *, void *); +void pssattach(struct device *, struct device *, void *); -int spprobe __P((struct device *, void *, void *)); -void spattach __P((struct device *, struct device *, void *)); +int spprobe(struct device *, void *, void *); +void spattach(struct device *, struct device *, void *); #ifdef notyet -int mpuprobe __P((struct device *, void *, void *)); -void mpuattach __P((struct device *, struct device *, void *)); +int mpuprobe(struct device *, void *, void *); +void mpuattach(struct device *, struct device *, void *); -int pcdprobe __P((struct device *, void *, void *)); -void pcdattach __P((struct device *, struct device *, void *)); +int pcdprobe(struct device *, void *, void *); +void pcdattach(struct device *, struct device *, void *); #endif -int pssintr __P((void *)); +int pssintr(void *); #ifdef notyet -int mpuintr __P((void *)); +int mpuintr(void *); #endif -int pss_speaker_ctl __P((void *, int)); +int pss_speaker_ctl(void *, int); -int pss_getdev __P((void *, struct audio_device *)); +int pss_getdev(void *, struct audio_device *); -int pss_mixer_set_port __P((void *, mixer_ctrl_t *)); -int pss_mixer_get_port __P((void *, mixer_ctrl_t *)); -int pss_query_devinfo __P((void *, mixer_devinfo_t *)); +int pss_mixer_set_port(void *, mixer_ctrl_t *); +int pss_mixer_get_port(void *, mixer_ctrl_t *); +int pss_query_devinfo(void *, mixer_devinfo_t *); #ifdef PSS_DSP -void pss_dspwrite __P((struct pss_softc *, int)); +void pss_dspwrite(struct pss_softc *, int); #endif -void pss_setaddr __P((int, int)); -int pss_setint __P((int, int)); -int pss_setdma __P((int, int)); -int pss_testirq __P((struct pss_softc *, int)); -int pss_testdma __P((struct pss_softc *, int)); +void pss_setaddr(int, int); +int pss_setint(int, int); +int pss_setdma(int, int); +int pss_testirq(struct pss_softc *, int); +int pss_testdma(struct pss_softc *, int); #ifdef notyet -int pss_reset_dsp __P((struct pss_softc *)); -int pss_download_dsp __P((struct pss_softc *, u_char *, int)); +int pss_reset_dsp(struct pss_softc *); +int pss_download_dsp(struct pss_softc *, u_char *, int); #endif #ifdef AUDIO_DEBUG -void pss_dump_regs __P((struct pss_softc *)); +void pss_dump_regs(struct pss_softc *); #endif -int pss_set_master_gain __P((struct pss_softc *, struct ad1848_volume *)); -int pss_set_master_mode __P((struct pss_softc *, int)); -int pss_set_treble __P((struct pss_softc *, u_int)); -int pss_set_bass __P((struct pss_softc *, u_int)); -int pss_get_master_gain __P((struct pss_softc *, struct ad1848_volume *)); -int pss_get_master_mode __P((struct pss_softc *, u_int *)); -int pss_get_treble __P((struct pss_softc *, u_char *)); -int pss_get_bass __P((struct pss_softc *, u_char *)); +int pss_set_master_gain(struct pss_softc *, struct ad1848_volume *); +int pss_set_master_mode(struct pss_softc *, int); +int pss_set_treble(struct pss_softc *, u_int); +int pss_set_bass(struct pss_softc *, u_int); +int pss_get_master_gain(struct pss_softc *, struct ad1848_volume *); +int pss_get_master_mode(struct pss_softc *, u_int *); +int pss_get_treble(struct pss_softc *, u_char *); +int pss_get_bass(struct pss_softc *, u_char *); #ifdef AUDIO_DEBUG -void wss_dump_regs __P((struct ad1848_softc *)); +void wss_dump_regs(struct ad1848_softc *); #endif /* diff --git a/sys/dev/isa/rtfps.c b/sys/dev/isa/rtfps.c index 479c8afccd2..d45c6e57442 100644 --- a/sys/dev/isa/rtfps.c +++ b/sys/dev/isa/rtfps.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rtfps.c,v 1.18 1999/01/11 01:57:52 millert Exp $ */ +/* $OpenBSD: rtfps.c,v 1.19 2002/03/14 01:26:56 millert Exp $ */ /* $NetBSD: rtfps.c,v 1.27 1996/10/21 22:41:18 thorpej Exp $ */ /* @@ -62,10 +62,10 @@ struct rtfps_softc { bus_space_handle_t sc_slaveioh[NSLAVES]; }; -int rtfpsprobe __P((struct device *, void *, void *)); -void rtfpsattach __P((struct device *, struct device *, void *)); -int rtfpsintr __P((void *)); -int rtfpsprint __P((void *, const char *)); +int rtfpsprobe(struct device *, void *, void *); +void rtfpsattach(struct device *, struct device *, void *); +int rtfpsintr(void *); +int rtfpsprint(void *, const char *); struct cfattach rtfps_ca = { sizeof(struct rtfps_softc), rtfpsprobe, rtfpsattach diff --git a/sys/dev/isa/sb.c b/sys/dev/isa/sb.c index abbd6f1f7fa..481bb1905bd 100644 --- a/sys/dev/isa/sb.c +++ b/sys/dev/isa/sb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sb.c,v 1.20 1999/07/20 16:36:05 deraadt Exp $ */ +/* $OpenBSD: sb.c,v 1.21 2002/03/14 01:26:56 millert Exp $ */ /* $NetBSD: sb.c,v 1.57 1998/01/12 09:43:46 thorpej Exp $ */ /* @@ -66,11 +66,11 @@ struct cfdriver sb_cd = { #if NMIDI > 0 int sb_mpu401_open __P((void *, int, - void (*iintr)__P((void *, int)), - void (*ointr)__P((void *)), void *arg)); -void sb_mpu401_close __P((void *)); -int sb_mpu401_output __P((void *, int)); -void sb_mpu401_getinfo __P((void *, struct midi_info *)); + void (*iintr)(void *, int), + void (*ointr)(void *), void *arg)); +void sb_mpu401_close(void *); +int sb_mpu401_output(void *, int); +void sb_mpu401_getinfo(void *, struct midi_info *); struct midi_hw_if sb_midi_hw_if = { sbdsp_midi_open, @@ -95,7 +95,7 @@ struct audio_device sb_device = { "sb" }; -int sb_getdev __P((void *, struct audio_device *)); +int sb_getdev(void *, struct audio_device *); /* * Define our interface to the higher level audio driver. @@ -322,8 +322,8 @@ int sb_mpu401_open(addr, flags, iintr, ointr, arg) void *addr; int flags; - void (*iintr)__P((void *, int)); - void (*ointr)__P((void *)); + void (*iintr)(void *, int); + void (*ointr)(void *); void *arg; { return mpu_open(SBMPU(addr), flags, iintr, ointr, arg); diff --git a/sys/dev/isa/sb_isa.c b/sys/dev/isa/sb_isa.c index 7d00586ca90..a4ced78c864 100644 --- a/sys/dev/isa/sb_isa.c +++ b/sys/dev/isa/sb_isa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sb_isa.c,v 1.5 2001/11/01 17:14:10 millert Exp $ */ +/* $OpenBSD: sb_isa.c,v 1.6 2002/03/14 01:26:56 millert Exp $ */ /* $NetBSD: sb_isa.c,v 1.15 1997/11/30 15:32:25 drochner Exp $ */ /* @@ -58,15 +58,15 @@ #include <dev/isa/sbdspvar.h> -static int sbfind __P((struct device *, struct sbdsp_softc *, struct isa_attach_args *)); +static int sbfind(struct device *, struct sbdsp_softc *, struct isa_attach_args *); #define __BROKEN_INDIRECT_CONFIG /* XXX */ #ifdef __BROKEN_INDIRECT_CONFIG -int sb_isa_match __P((struct device *, void *, void *)); +int sb_isa_match(struct device *, void *, void *); #else -int sb_isa_match __P((struct device *, struct cfdata *, void *)); +int sb_isa_match(struct device *, struct cfdata *, void *); #endif -void sb_isa_attach __P((struct device *, struct device *, void *)); +void sb_isa_attach(struct device *, struct device *, void *); struct cfattach sb_isa_ca = { sizeof(struct sbdsp_softc), sb_isa_match, sb_isa_attach diff --git a/sys/dev/isa/sb_isapnp.c b/sys/dev/isa/sb_isapnp.c index 819bd71ae90..9d251bff7f9 100644 --- a/sys/dev/isa/sb_isapnp.c +++ b/sys/dev/isa/sb_isapnp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sb_isapnp.c,v 1.12 1999/03/16 17:56:13 deraadt Exp $ */ +/* $OpenBSD: sb_isapnp.c,v 1.13 2002/03/14 01:26:56 millert Exp $ */ /* $NetBSD: sb_isa.c,v 1.3 1997/03/20 11:03:11 mycroft Exp $ */ /* @@ -56,8 +56,8 @@ #include <dev/isa/sbdspvar.h> -int sb_isapnp_match __P((struct device *, void *, void *)); -void sb_isapnp_attach __P((struct device *, struct device *, void *)); +int sb_isapnp_match(struct device *, void *, void *); +void sb_isapnp_attach(struct device *, struct device *, void *); struct cfattach sb_isapnp_ca = { sizeof(struct sbdsp_softc), sb_isapnp_match, sb_isapnp_attach diff --git a/sys/dev/isa/sbdsp.c b/sys/dev/isa/sbdsp.c index bfacce8bf19..558ecd96efa 100644 --- a/sys/dev/isa/sbdsp.c +++ b/sys/dev/isa/sbdsp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sbdsp.c,v 1.20 2002/02/12 22:31:01 fgsch Exp $ */ +/* $OpenBSD: sbdsp.c,v 1.21 2002/03/14 01:26:56 millert Exp $ */ /* * Copyright (c) 1991-1993 Regents of the University of California. @@ -174,25 +174,25 @@ static struct sbmode sbrmodes[] = { { -1 } }; -void sbversion __P((struct sbdsp_softc *)); -void sbdsp_jazz16_probe __P((struct sbdsp_softc *)); -void sbdsp_set_mixer_gain __P((struct sbdsp_softc *sc, int port)); -void sbdsp_to __P((void *)); -void sbdsp_pause __P((struct sbdsp_softc *)); -int sbdsp_set_timeconst __P((struct sbdsp_softc *, int)); -int sbdsp16_set_rate __P((struct sbdsp_softc *, int, int)); -int sbdsp_set_in_ports __P((struct sbdsp_softc *, int)); -void sbdsp_set_ifilter __P((void *, int)); -int sbdsp_get_ifilter __P((void *)); +void sbversion(struct sbdsp_softc *); +void sbdsp_jazz16_probe(struct sbdsp_softc *); +void sbdsp_set_mixer_gain(struct sbdsp_softc *sc, int port); +void sbdsp_to(void *); +void sbdsp_pause(struct sbdsp_softc *); +int sbdsp_set_timeconst(struct sbdsp_softc *, int); +int sbdsp16_set_rate(struct sbdsp_softc *, int, int); +int sbdsp_set_in_ports(struct sbdsp_softc *, int); +void sbdsp_set_ifilter(void *, int); +int sbdsp_get_ifilter(void *); -int sbdsp_block_output __P((void *)); -int sbdsp_block_input __P((void *)); -static int sbdsp_adjust __P((int, int)); +int sbdsp_block_output(void *); +int sbdsp_block_input(void *); +static int sbdsp_adjust(int, int); -int sbdsp_midi_intr __P((void *)); +int sbdsp_midi_intr(void *); #ifdef AUDIO_DEBUG -void sb_printsc __P((struct sbdsp_softc *)); +void sb_printsc(struct sbdsp_softc *); void sb_printsc(sc) @@ -525,7 +525,7 @@ sbdsp_set_params(addr, setmode, usemode, play, rec) struct sbdsp_softc *sc = addr; struct sbmode *m; u_int rate, tc, bmode; - void (*swcode) __P((void *, u_char *buf, int cnt)); + void (*swcode)(void *, u_char *buf, int cnt); int factor; int model; int chan; @@ -1168,7 +1168,7 @@ sbdsp_trigger_input(addr, start, end, blksize, intr, arg, param) void *addr; void *start, *end; int blksize; - void (*intr) __P((void *)); + void (*intr)(void *); void *arg; struct audio_params *param; { @@ -1302,7 +1302,7 @@ sbdsp_trigger_output(addr, start, end, blksize, intr, arg, param) void *addr; void *start, *end; int blksize; - void (*intr) __P((void *)); + void (*intr)(void *); void *arg; struct audio_params *param; { @@ -2256,8 +2256,8 @@ int sbdsp_midi_open(addr, flags, iintr, ointr, arg) void *addr; int flags; - void (*iintr)__P((void *, int)); - void (*ointr)__P((void *)); + void (*iintr)(void *, int); + void (*ointr)(void *); void *arg; { struct sbdsp_softc *sc = addr; diff --git a/sys/dev/isa/sbdspvar.h b/sys/dev/isa/sbdspvar.h index 8efd819f077..66693dd6ba5 100644 --- a/sys/dev/isa/sbdspvar.h +++ b/sys/dev/isa/sbdspvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sbdspvar.h,v 1.14 2002/01/20 19:56:53 ericj Exp $ */ +/* $OpenBSD: sbdspvar.h,v 1.15 2002/03/14 01:26:56 millert Exp $ */ /* $NetBSD: sbdspvar.h,v 1.37 1998/08/10 00:20:39 mycroft Exp $ */ /* @@ -190,68 +190,68 @@ struct sbdsp_softc { #define ISSB16CLASS(sc) ((sc)->sc_model >= SB_16) #ifdef _KERNEL -int sbdsp_open __P((void *, int)); -void sbdsp_close __P((void *)); - -int sbdsp_probe __P((struct sbdsp_softc *)); -void sbdsp_attach __P((struct sbdsp_softc *)); - -int sbdsp_set_in_gain __P((void *, u_int, u_char)); -int sbdsp_set_in_gain_real __P((void *, u_int, u_char)); -int sbdsp_get_in_gain __P((void *)); -int sbdsp_set_out_gain __P((void *, u_int, u_char)); -int sbdsp_set_out_gain_real __P((void *, u_int, u_char)); -int sbdsp_get_out_gain __P((void *)); -int sbdsp_set_monitor_gain __P((void *, u_int)); -int sbdsp_get_monitor_gain __P((void *)); -int sbdsp_query_encoding __P((void *, struct audio_encoding *)); -int sbdsp_set_params __P((void *, int, int, struct audio_params *, struct audio_params *)); -int sbdsp_round_blocksize __P((void *, int)); -int sbdsp_get_avail_in_ports __P((void *)); -int sbdsp_get_avail_out_ports __P((void *)); -int sbdsp_speaker_ctl __P((void *, int)); - -int sbdsp_commit __P((void *)); +int sbdsp_open(void *, int); +void sbdsp_close(void *); + +int sbdsp_probe(struct sbdsp_softc *); +void sbdsp_attach(struct sbdsp_softc *); + +int sbdsp_set_in_gain(void *, u_int, u_char); +int sbdsp_set_in_gain_real(void *, u_int, u_char); +int sbdsp_get_in_gain(void *); +int sbdsp_set_out_gain(void *, u_int, u_char); +int sbdsp_set_out_gain_real(void *, u_int, u_char); +int sbdsp_get_out_gain(void *); +int sbdsp_set_monitor_gain(void *, u_int); +int sbdsp_get_monitor_gain(void *); +int sbdsp_query_encoding(void *, struct audio_encoding *); +int sbdsp_set_params(void *, int, int, struct audio_params *, struct audio_params *); +int sbdsp_round_blocksize(void *, int); +int sbdsp_get_avail_in_ports(void *); +int sbdsp_get_avail_out_ports(void *); +int sbdsp_speaker_ctl(void *, int); + +int sbdsp_commit(void *); int sbdsp_trigger_output __P((void *, void *, void *, int, void (*)(void *), void *, struct audio_params *)); int sbdsp_trigger_input __P((void *, void *, void *, int, void (*)(void *), void *, struct audio_params *)); -int sbdsp_haltdma __P((void *)); +int sbdsp_haltdma(void *); -void sbdsp_compress __P((int, u_char *, int)); -void sbdsp_expand __P((int, u_char *, int)); +void sbdsp_compress(int, u_char *, int); +void sbdsp_expand(int, u_char *, int); -int sbdsp_reset __P((struct sbdsp_softc *)); -void sbdsp_spkron __P((struct sbdsp_softc *)); -void sbdsp_spkroff __P((struct sbdsp_softc *)); +int sbdsp_reset(struct sbdsp_softc *); +void sbdsp_spkron(struct sbdsp_softc *); +void sbdsp_spkroff(struct sbdsp_softc *); -int sbdsp_wdsp __P((struct sbdsp_softc *, int v)); -int sbdsp_rdsp __P((struct sbdsp_softc *)); +int sbdsp_wdsp(struct sbdsp_softc *, int v); +int sbdsp_rdsp(struct sbdsp_softc *); -int sbdsp_intr __P((void *)); +int sbdsp_intr(void *); -int sbdsp_set_sr __P((struct sbdsp_softc *, u_long *, int)); +int sbdsp_set_sr(struct sbdsp_softc *, u_long *, int); -void sbdsp_mix_write __P((struct sbdsp_softc *, int, int)); -int sbdsp_mix_read __P((struct sbdsp_softc *, int)); +void sbdsp_mix_write(struct sbdsp_softc *, int, int); +int sbdsp_mix_read(struct sbdsp_softc *, int); -int sbdsp_mixer_set_port __P((void *, mixer_ctrl_t *)); -int sbdsp_mixer_get_port __P((void *, mixer_ctrl_t *)); -int sbdsp_mixer_query_devinfo __P((void *, mixer_devinfo_t *)); +int sbdsp_mixer_set_port(void *, mixer_ctrl_t *); +int sbdsp_mixer_get_port(void *, mixer_ctrl_t *); +int sbdsp_mixer_query_devinfo(void *, mixer_devinfo_t *); -void *sb_malloc __P((void *, int, size_t, int, int)); -void sb_free __P((void *, void *, int)); -size_t sb_round __P((void *, int, size_t)); -paddr_t sb_mappage __P((void *, void *, off_t, int)); +void *sb_malloc(void *, int, size_t, int, int); +void sb_free(void *, void *, int); +size_t sb_round(void *, int, size_t); +paddr_t sb_mappage(void *, void *, off_t, int); -int sbdsp_get_props __P((void *)); +int sbdsp_get_props(void *); int sbdsp_midi_open __P((void *, int, - void (*iintr)__P((void *, int)), - void (*ointr)__P((void *)), void *arg)); -void sbdsp_midi_close __P((void *)); -int sbdsp_midi_output __P((void *, int)); -void sbdsp_midi_getinfo __P((void *, struct midi_info *)); + void (*iintr)(void *, int), + void (*ointr)(void *), void *arg)); +void sbdsp_midi_close(void *); +int sbdsp_midi_output(void *, int); +void sbdsp_midi_getinfo(void *, struct midi_info *); #endif diff --git a/sys/dev/isa/sbvar.h b/sys/dev/isa/sbvar.h index 82f600f29c4..728ca965630 100644 --- a/sys/dev/isa/sbvar.h +++ b/sys/dev/isa/sbvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sbvar.h,v 1.1 1997/07/10 23:06:39 provos Exp $ */ +/* $OpenBSD: sbvar.h,v 1.2 2002/03/14 01:26:56 millert Exp $ */ /* $NetBSD: sbvar.h,v 1.1 1997/01/16 21:03:38 christos Exp $ */ /* @@ -32,5 +32,5 @@ struct sbdsp_softc; -int sbmatch __P((struct sbdsp_softc *)); -void sbattach __P((struct sbdsp_softc *)); +int sbmatch(struct sbdsp_softc *); +void sbattach(struct sbdsp_softc *); diff --git a/sys/dev/isa/seagate.c b/sys/dev/isa/seagate.c index 179db398aba..7a7c8143671 100644 --- a/sys/dev/isa/seagate.c +++ b/sys/dev/isa/seagate.c @@ -1,4 +1,4 @@ -/* $OpenBSD: seagate.c,v 1.16 2001/08/26 00:45:08 fgsch Exp $ */ +/* $OpenBSD: seagate.c,v 1.17 2002/03/14 01:26:56 millert Exp $ */ /* * ST01/02, Future Domain TMC-885, TMC-950 SCSI driver @@ -272,22 +272,22 @@ static const char *bases[] = { #define nbases (sizeof(bases) / sizeof(bases[0])) #endif -int seaintr __P((void *)); -int sea_scsi_cmd __P((struct scsi_xfer *)); -void sea_timeout __P((void *)); -void sea_done __P((struct sea_softc *, struct sea_scb *)); -struct sea_scb *sea_get_scb __P((struct sea_softc *, int)); -void sea_free_scb __P((struct sea_softc *, struct sea_scb *, int)); -static void sea_main __P((void)); -static void sea_information_transfer __P((struct sea_softc *)); -int sea_poll __P((struct sea_softc *, struct scsi_xfer *, int)); -void sea_init __P((struct sea_softc *)); -void sea_send_scb __P((struct sea_softc *sea, struct sea_scb *scb)); -void sea_reselect __P((struct sea_softc *sea)); -int sea_select __P((struct sea_softc *sea, struct sea_scb *scb)); -int sea_transfer_pio __P((struct sea_softc *sea, u_char *phase, - int *count, u_char **data)); -int sea_abort __P((struct sea_softc *, struct sea_scb *scb)); +int seaintr(void *); +int sea_scsi_cmd(struct scsi_xfer *); +void sea_timeout(void *); +void sea_done(struct sea_softc *, struct sea_scb *); +struct sea_scb *sea_get_scb(struct sea_softc *, int); +void sea_free_scb(struct sea_softc *, struct sea_scb *, int); +static void sea_main(void); +static void sea_information_transfer(struct sea_softc *); +int sea_poll(struct sea_softc *, struct scsi_xfer *, int); +void sea_init(struct sea_softc *); +void sea_send_scb(struct sea_softc *sea, struct sea_scb *scb); +void sea_reselect(struct sea_softc *sea); +int sea_select(struct sea_softc *sea, struct sea_scb *scb); +int sea_transfer_pio(struct sea_softc *sea, u_char *phase, + int *count, u_char **data); +int sea_abort(struct sea_softc *, struct sea_scb *scb); struct scsi_adapter sea_switch = { sea_scsi_cmd, @@ -304,9 +304,9 @@ struct scsi_device sea_dev = { NULL, /* Use default 'done' routine */ }; -int seaprobe __P((struct device *, void *, void *)); -void seaattach __P((struct device *, struct device *, void *)); -int seaprint __P((void *, const char *)); +int seaprobe(struct device *, void *, void *); +void seaattach(struct device *, struct device *, void *); +int seaprint(void *, const char *); struct cfattach sea_ca = { sizeof(struct sea_softc), seaprobe, seaattach diff --git a/sys/dev/isa/spkr.c b/sys/dev/isa/spkr.c index 9c197792d8e..9abf79210e7 100644 --- a/sys/dev/isa/spkr.c +++ b/sys/dev/isa/spkr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: spkr.c,v 1.6 2001/07/31 22:08:14 pvalchev Exp $ */ +/* $OpenBSD: spkr.c,v 1.7 2002/03/14 01:26:56 millert Exp $ */ /* $NetBSD: spkr.c,v 1.1 1998/04/15 20:26:18 drochner Exp $ */ /* @@ -62,11 +62,11 @@ cdev_decl(spkr); #define __BROKEN_INDIRECT_CONFIG /* XXX */ #ifdef __BROKEN_INDIRECT_CONFIG -int spkrprobe __P((struct device *, void *, void *)); +int spkrprobe(struct device *, void *, void *); #else -int spkrprobe __P((struct device *, struct cfdata *, void *)); +int spkrprobe(struct device *, struct cfdata *, void *); #endif -void spkrattach __P((struct device *, struct device *, void *)); +void spkrattach(struct device *, struct device *, void *); struct spkr_softc { struct device sc_dev; @@ -84,11 +84,11 @@ static pcppi_tag_t ppicookie; #define SPKRPRI (PZERO - 1) -static void tone __P((u_int, u_int)); -static void rest __P((int)); -static void playinit __P((void)); -static void playtone __P((int, int, int)); -static void playstring __P((char *, int)); +static void tone(u_int, u_int); +static void rest(int); +static void playinit(void); +static void playtone(int, int, int); +static void playstring(char *, int); static void tone(hz, ticks) diff --git a/sys/dev/isa/tcic2_isa.c b/sys/dev/isa/tcic2_isa.c index d5f20b5c65b..d6706b5f1b9 100644 --- a/sys/dev/isa/tcic2_isa.c +++ b/sys/dev/isa/tcic2_isa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tcic2_isa.c,v 1.3 2001/11/06 19:53:19 miod Exp $ */ +/* $OpenBSD: tcic2_isa.c,v 1.4 2002/03/14 01:26:56 millert Exp $ */ /* $NetBSD: tcic2_isa.c,v 1.2 1999/04/08 16:14:29 bad Exp $ */ #undef TCICISADEBUG @@ -108,12 +108,12 @@ int tcic_isa_debug = 1; #define DPRINTF(arg) #endif -int tcic_isa_probe __P((struct device *, void *, void *)); -void tcic_isa_attach __P((struct device *, struct device *, void *)); +int tcic_isa_probe(struct device *, void *, void *); +void tcic_isa_attach(struct device *, struct device *, void *); void *tcic_isa_chip_intr_establish __P((pcmcia_chipset_handle_t, struct pcmcia_function *, int, int (*) (void *), void *, char *)); -void tcic_isa_chip_intr_disestablish __P((pcmcia_chipset_handle_t, void *)); +void tcic_isa_chip_intr_disestablish(pcmcia_chipset_handle_t, void *); struct cfattach tcic_isa_ca = { sizeof(struct tcic_softc), tcic_isa_probe, tcic_isa_attach @@ -312,7 +312,7 @@ tcic_isa_chip_intr_establish(pch, pf, ipl, fct, arg, xname) pcmcia_chipset_handle_t pch; struct pcmcia_function *pf; int ipl; - int (*fct) __P((void *)); + int (*fct)(void *); void *arg; char *xname; { diff --git a/sys/dev/isa/uha_isa.c b/sys/dev/isa/uha_isa.c index 6de42d23347..371c2d30f4d 100644 --- a/sys/dev/isa/uha_isa.c +++ b/sys/dev/isa/uha_isa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uha_isa.c,v 1.5 2001/02/03 07:29:29 mickey Exp $ */ +/* $OpenBSD: uha_isa.c,v 1.6 2002/03/14 01:26:56 millert Exp $ */ /* $NetBSD: uha_isa.c,v 1.5 1996/10/21 22:41:21 thorpej Exp $ */ /* @@ -56,8 +56,8 @@ #define Debugger() panic("should call debugger here (uha_isa.c)") #endif -int uha_isa_probe __P((struct device *, void *, void *)); -void uha_isa_attach __P((struct device *, struct device *, void *)); +int uha_isa_probe(struct device *, void *, void *); +void uha_isa_attach(struct device *, struct device *, void *); struct cfattach uha_isa_ca = { sizeof(struct uha_softc), uha_isa_probe, uha_isa_attach @@ -65,11 +65,11 @@ struct cfattach uha_isa_ca = { #define KVTOPHYS(x) vtophys(x) -int u14_find __P((bus_space_tag_t, bus_space_handle_t, struct uha_softc *)); -void u14_start_mbox __P((struct uha_softc *, struct uha_mscp *)); -int u14_poll __P((struct uha_softc *, struct scsi_xfer *, int)); -int u14_intr __P((void *)); -void u14_init __P((struct uha_softc *)); +int u14_find(bus_space_tag_t, bus_space_handle_t, struct uha_softc *); +void u14_start_mbox(struct uha_softc *, struct uha_mscp *); +int u14_poll(struct uha_softc *, struct scsi_xfer *, int); +int u14_intr(void *); +void u14_init(struct uha_softc *); /* * Check the slots looking for a board we recognise diff --git a/sys/dev/isa/vga_isa.c b/sys/dev/isa/vga_isa.c index 67b1d1cc9c1..fe53673f45c 100644 --- a/sys/dev/isa/vga_isa.c +++ b/sys/dev/isa/vga_isa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vga_isa.c,v 1.7 2000/11/15 20:17:38 aaron Exp $ */ +/* $OpenBSD: vga_isa.c,v 1.8 2002/03/14 01:26:56 millert Exp $ */ /* $NetBSD: vga_isa.c,v 1.3 1998/06/12 18:45:48 drochner Exp $ */ /* @@ -52,8 +52,8 @@ struct vga_isa_softc { #endif }; -int vga_isa_match __P((struct device *, void *, void *)); -void vga_isa_attach __P((struct device *, struct device *, void *)); +int vga_isa_match(struct device *, void *, void *); +void vga_isa_attach(struct device *, struct device *, void *); struct cfattach vga_isa_ca = { sizeof(struct vga_isa_softc), vga_isa_match, vga_isa_attach, diff --git a/sys/dev/isa/vga_isavar.h b/sys/dev/isa/vga_isavar.h index 5eabb16ad61..6b84fbbac79 100644 --- a/sys/dev/isa/vga_isavar.h +++ b/sys/dev/isa/vga_isavar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: vga_isavar.h,v 1.3 2000/11/15 20:17:38 aaron Exp $ */ +/* $OpenBSD: vga_isavar.h,v 1.4 2002/03/14 01:26:56 millert Exp $ */ /* $NetBSD: vga_isavar.h,v 1.1 1998/03/22 15:14:36 drochner Exp $ */ /* @@ -28,4 +28,4 @@ * rights to redistribute these changes. */ -int vga_isa_cnattach __P((bus_space_tag_t, bus_space_tag_t)); +int vga_isa_cnattach(bus_space_tag_t, bus_space_tag_t); diff --git a/sys/dev/isa/wdc_isa.c b/sys/dev/isa/wdc_isa.c index 41781ef665e..fce6ec30fd8 100644 --- a/sys/dev/isa/wdc_isa.c +++ b/sys/dev/isa/wdc_isa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wdc_isa.c,v 1.7 2001/03/25 13:11:58 csapuntz Exp $ */ +/* $OpenBSD: wdc_isa.c,v 1.8 2002/03/14 01:26:56 millert Exp $ */ /* $NetBSD: wdc_isa.c,v 1.15 1999/05/19 14:41:25 bouyer Exp $ */ /*- @@ -78,21 +78,21 @@ struct wdc_isa_softc { }; #ifndef __OpenBSD__ -int wdc_isa_probe __P((struct device *, struct cfdata *, void *)); +int wdc_isa_probe(struct device *, struct cfdata *, void *); #else -int wdc_isa_probe __P((struct device *, void *, void *)); +int wdc_isa_probe(struct device *, void *, void *); #endif -void wdc_isa_attach __P((struct device *, struct device *, void *)); +void wdc_isa_attach(struct device *, struct device *, void *); struct cfattach wdc_isa_ca = { sizeof(struct wdc_isa_softc), wdc_isa_probe, wdc_isa_attach }; #if NISADMA > 0 -static void wdc_isa_dma_setup __P((struct wdc_isa_softc *)); -static int wdc_isa_dma_init __P((void*, int, int, void *, size_t, int)); -static void wdc_isa_dma_start __P((void*, int, int)); -static int wdc_isa_dma_finish __P((void*, int, int)); +static void wdc_isa_dma_setup(struct wdc_isa_softc *); +static int wdc_isa_dma_init(void*, int, int, void *, size_t, int); +static void wdc_isa_dma_start(void*, int, int); +static int wdc_isa_dma_finish(void*, int, int); #endif /* NISADMA > 0 */ int diff --git a/sys/dev/isa/wdc_isapnp.c b/sys/dev/isa/wdc_isapnp.c index b3ceb5adb2f..cf151f30091 100644 --- a/sys/dev/isa/wdc_isapnp.c +++ b/sys/dev/isa/wdc_isapnp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wdc_isapnp.c,v 1.6 2001/07/08 06:41:37 fgsch Exp $ */ +/* $OpenBSD: wdc_isapnp.c,v 1.7 2002/03/14 01:26:56 millert Exp $ */ /* $NetBSD: wdc_isapnp.c,v 1.13 1999/03/22 10:00:12 mycroft Exp $ */ /*- @@ -62,17 +62,17 @@ struct wdc_isapnp_softc { int sc_drq; }; -int wdc_isapnp_match __P((struct device *, void *, void *)); -void wdc_isapnp_attach __P((struct device *, struct device *, void *)); +int wdc_isapnp_match(struct device *, void *, void *); +void wdc_isapnp_attach(struct device *, struct device *, void *); struct cfattach wdc_isapnp_ca = { sizeof(struct wdc_isapnp_softc), wdc_isapnp_match, wdc_isapnp_attach }; #ifdef notyet -static void wdc_isapnp_dma_setup __P((struct wdc_isapnp_softc *)); -static void wdc_isapnp_dma_start __P((void *, void *, size_t, int)); -static void wdc_isapnp_dma_finish __P((void *)); +static void wdc_isapnp_dma_setup(struct wdc_isapnp_softc *); +static void wdc_isapnp_dma_start(void *, void *, size_t, int); +static void wdc_isapnp_dma_finish(void *); #endif int diff --git a/sys/dev/isa/wds.c b/sys/dev/isa/wds.c index 0efed9cec7b..5ee674d3fd8 100644 --- a/sys/dev/isa/wds.c +++ b/sys/dev/isa/wds.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wds.c,v 1.17 2001/01/29 07:04:10 mickey Exp $ */ +/* $OpenBSD: wds.c,v 1.18 2002/03/14 01:26:56 millert Exp $ */ /* $NetBSD: wds.c,v 1.13 1996/11/03 16:20:31 mycroft Exp $ */ #undef WDSDIAG @@ -145,32 +145,31 @@ TAILQ_HEAD(, wds_buf) wds_free_buffer; int wds_debug = WDSDEBUG; #endif -integrate void wds_wait - __P((bus_space_tag_t, bus_space_handle_t, int, int, int)); -int wds_cmd __P((struct wds_softc *, u_char *, int)); -integrate void wds_finish_scbs __P((struct wds_softc *)); -int wdsintr __P((void *)); -integrate void wds_reset_scb __P((struct wds_softc *, struct wds_scb *)); -void wds_free_scb __P((struct wds_softc *, struct wds_scb *)); -void wds_free_buf __P((struct wds_softc *, struct wds_buf *)); -integrate void wds_init_scb __P((struct wds_softc *, struct wds_scb *)); -struct wds_scb *wds_get_scb __P((struct wds_softc *, int, int)); -struct wds_buf *wds_get_buf __P((struct wds_softc *, int)); -struct wds_scb *wds_scb_phys_kv __P((struct wds_softc *, u_long)); -void wds_queue_scb __P((struct wds_softc *, struct wds_scb *)); -void wds_collect_mbo __P((struct wds_softc *)); -void wds_start_scbs __P((struct wds_softc *)); -void wds_done __P((struct wds_softc *, struct wds_scb *, u_char)); -int wds_find __P((struct isa_attach_args *, struct wds_softc *)); -void wds_init __P((struct wds_softc *)); -void wds_inquire_setup_information __P((struct wds_softc *)); -void wdsminphys __P((struct buf *)); -int wds_scsi_cmd __P((struct scsi_xfer *)); -void wds_sense __P((struct wds_softc *, struct wds_scb *)); -int wds_poll __P((struct wds_softc *, struct scsi_xfer *, int)); -int wds_ipoll __P((struct wds_softc *, struct wds_scb *, int)); -void wds_timeout __P((void *)); -int wdsprint __P((void *, const char *)); +integrate void wds_wait(bus_space_tag_t, bus_space_handle_t, int, int, int); +int wds_cmd(struct wds_softc *, u_char *, int); +integrate void wds_finish_scbs(struct wds_softc *); +int wdsintr(void *); +integrate void wds_reset_scb(struct wds_softc *, struct wds_scb *); +void wds_free_scb(struct wds_softc *, struct wds_scb *); +void wds_free_buf(struct wds_softc *, struct wds_buf *); +integrate void wds_init_scb(struct wds_softc *, struct wds_scb *); +struct wds_scb *wds_get_scb(struct wds_softc *, int, int); +struct wds_buf *wds_get_buf(struct wds_softc *, int); +struct wds_scb *wds_scb_phys_kv(struct wds_softc *, u_long); +void wds_queue_scb(struct wds_softc *, struct wds_scb *); +void wds_collect_mbo(struct wds_softc *); +void wds_start_scbs(struct wds_softc *); +void wds_done(struct wds_softc *, struct wds_scb *, u_char); +int wds_find(struct isa_attach_args *, struct wds_softc *); +void wds_init(struct wds_softc *); +void wds_inquire_setup_information(struct wds_softc *); +void wdsminphys(struct buf *); +int wds_scsi_cmd(struct scsi_xfer *); +void wds_sense(struct wds_softc *, struct wds_scb *); +int wds_poll(struct wds_softc *, struct scsi_xfer *, int); +int wds_ipoll(struct wds_softc *, struct wds_scb *, int); +void wds_timeout(void *); +int wdsprint(void *, const char *); struct scsi_adapter wds_switch = { wds_scsi_cmd, @@ -187,8 +186,8 @@ struct scsi_device wds_dev = { NULL, /* Use default 'done' routine */ }; -int wdsprobe __P((struct device *, void *, void *)); -void wdsattach __P((struct device *, struct device *, void *)); +int wdsprobe(struct device *, void *, void *); +void wdsattach(struct device *, struct device *, void *); struct cfattach wds_ca = { sizeof(struct wds_softc), wdsprobe, wdsattach diff --git a/sys/dev/isa/wss.c b/sys/dev/isa/wss.c index fff2a74ef84..bc9003dace5 100644 --- a/sys/dev/isa/wss.c +++ b/sys/dev/isa/wss.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wss.c,v 1.20 1999/01/24 15:58:54 mickey Exp $ */ +/* $OpenBSD: wss.c,v 1.21 2002/03/14 01:26:56 millert Exp $ */ /* $NetBSD: wss.c,v 1.42 1998/01/19 22:18:23 augustss Exp $ */ /* @@ -74,11 +74,11 @@ struct audio_device wss_device = { "WSS" }; -int wss_getdev __P((void *, struct audio_device *)); +int wss_getdev(void *, struct audio_device *); -int wss_mixer_set_port __P((void *, mixer_ctrl_t *)); -int wss_mixer_get_port __P((void *, mixer_ctrl_t *)); -int wss_query_devinfo __P((void *, mixer_devinfo_t *)); +int wss_mixer_set_port(void *, mixer_ctrl_t *); +int wss_mixer_get_port(void *, mixer_ctrl_t *); +int wss_query_devinfo(void *, mixer_devinfo_t *); /* * Define our interface to the higher level audio driver. diff --git a/sys/dev/isa/wss_isa.c b/sys/dev/isa/wss_isa.c index 41cf817f120..1a4410150e5 100644 --- a/sys/dev/isa/wss_isa.c +++ b/sys/dev/isa/wss_isa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wss_isa.c,v 1.3 2000/03/28 14:07:42 espie Exp $ */ +/* $OpenBSD: wss_isa.c,v 1.4 2002/03/14 01:26:57 millert Exp $ */ /* $NetBSD: wss_isa.c,v 1.1 1998/01/19 22:18:24 augustss Exp $ */ /* @@ -72,14 +72,14 @@ extern int wssdebug; #define DPRINTF(x) #endif -static int wssfind __P((struct device *, struct wss_softc *, struct isa_attach_args *)); +static int wssfind(struct device *, struct wss_softc *, struct isa_attach_args *); -static void madprobe __P((struct wss_softc *, int)); -static void madunmap __P((struct wss_softc *)); -static int detect_mad16 __P((struct wss_softc *, int)); +static void madprobe(struct wss_softc *, int); +static void madunmap(struct wss_softc *); +static int detect_mad16(struct wss_softc *, int); -int wss_isa_probe __P((struct device *, void *, void *)); -void wss_isa_attach __P((struct device *, struct device *, void *)); +int wss_isa_probe(struct device *, void *, void *); +void wss_isa_attach(struct device *, struct device *, void *); struct cfattach wss_isa_ca = { sizeof(struct wss_softc), wss_isa_probe, wss_isa_attach diff --git a/sys/dev/isa/wss_isapnp.c b/sys/dev/isa/wss_isapnp.c index 1cf51eb5e41..5229b6c7649 100644 --- a/sys/dev/isa/wss_isapnp.c +++ b/sys/dev/isa/wss_isapnp.c @@ -61,8 +61,8 @@ #include <dev/isa/wssreg.h> #include <dev/isa/wssvar.h> -int wss_isapnp_match __P((struct device *, void *, void *)); -void wss_isapnp_attach __P((struct device *, struct device *, void *)); +int wss_isapnp_match(struct device *, void *, void *); +void wss_isapnp_attach(struct device *, struct device *, void *); struct cfattach wss_isapnp_ca = { sizeof(struct wss_softc), wss_isapnp_match, wss_isapnp_attach diff --git a/sys/dev/isa/wssvar.h b/sys/dev/isa/wssvar.h index bd290f89476..c1ef7bd7cb8 100644 --- a/sys/dev/isa/wssvar.h +++ b/sys/dev/isa/wssvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: wssvar.h,v 1.1 1998/04/26 21:02:38 provos Exp $ */ +/* $OpenBSD: wssvar.h,v 1.2 2002/03/14 01:26:57 millert Exp $ */ /* $NetBSD: wssvar.h,v 1.1 1998/01/19 22:18:25 augustss Exp $ */ /* @@ -76,8 +76,8 @@ struct wss_softc { bus_space_handle_t mad_ioh1, mad_ioh2, mad_ioh3; }; -void wssattach __P((struct wss_softc *)); +void wssattach(struct wss_softc *); -u_int mad_read __P((struct wss_softc *, int)); -void mad_write __P((struct wss_softc *, int, int)); -void madattach __P((struct wss_softc *)); +u_int mad_read(struct wss_softc *, int); +void mad_write(struct wss_softc *, int, int); +void madattach(struct wss_softc *); diff --git a/sys/dev/isa/wt.c b/sys/dev/isa/wt.c index 526468cf5e8..21b56da722e 100644 --- a/sys/dev/isa/wt.c +++ b/sys/dev/isa/wt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wt.c,v 1.14 2001/11/06 00:30:38 art Exp $ */ +/* $OpenBSD: wt.c,v 1.15 2002/03/14 01:26:57 millert Exp $ */ /* $NetBSD: wt.c,v 1.33 1996/05/12 23:54:22 mycroft Exp $ */ /* @@ -159,23 +159,23 @@ struct wt_softc { cdev_decl(wt); bdev_decl(wt); -int wtwait __P((struct wt_softc *sc, int catch, char *msg)); -int wtcmd __P((struct wt_softc *sc, int cmd)); -int wtstart __P((struct wt_softc *sc, int flag, void *vaddr, size_t len)); -void wtdma __P((struct wt_softc *sc)); -void wttimer __P((void *arg)); -void wtclock __P((struct wt_softc *sc)); -int wtreset __P((struct wt_softc *sc)); -int wtsense __P((struct wt_softc *sc, int verbose, int ignore)); -int wtstatus __P((struct wt_softc *sc)); -void wtrewind __P((struct wt_softc *sc)); -int wtreadfm __P((struct wt_softc *sc)); -int wtwritefm __P((struct wt_softc *sc)); -u_char wtpoll __P((struct wt_softc *sc, int mask, int bits)); - -int wtprobe __P((struct device *, void *, void *)); -void wtattach __P((struct device *, struct device *, void *)); -int wtintr __P((void *sc)); +int wtwait(struct wt_softc *sc, int catch, char *msg); +int wtcmd(struct wt_softc *sc, int cmd); +int wtstart(struct wt_softc *sc, int flag, void *vaddr, size_t len); +void wtdma(struct wt_softc *sc); +void wttimer(void *arg); +void wtclock(struct wt_softc *sc); +int wtreset(struct wt_softc *sc); +int wtsense(struct wt_softc *sc, int verbose, int ignore); +int wtstatus(struct wt_softc *sc); +void wtrewind(struct wt_softc *sc); +int wtreadfm(struct wt_softc *sc); +int wtwritefm(struct wt_softc *sc); +u_char wtpoll(struct wt_softc *sc, int mask, int bits); + +int wtprobe(struct device *, void *, void *); +void wtattach(struct device *, struct device *, void *); +int wtintr(void *sc); struct cfattach wt_ca = { sizeof(struct wt_softc), wtprobe, wtattach diff --git a/sys/dev/isa/ym.c b/sys/dev/isa/ym.c index 6d5fd33190d..fb90979d07f 100644 --- a/sys/dev/isa/ym.c +++ b/sys/dev/isa/ym.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ym.c,v 1.9 1999/10/06 12:48:33 fgsch Exp $ */ +/* $OpenBSD: ym.c,v 1.10 2002/03/14 01:26:57 millert Exp $ */ /* @@ -55,17 +55,17 @@ #include <dev/ic/mpuvar.h> #include <dev/isa/ymvar.h> -int ym_getdev __P((void *, struct audio_device *)); -int ym_mixer_set_port __P((void *, mixer_ctrl_t *)); -int ym_mixer_get_port __P((void *, mixer_ctrl_t *)); -int ym_query_devinfo __P((void *, mixer_devinfo_t *)); -int ym_intr __P((void *)); +int ym_getdev(void *, struct audio_device *); +int ym_mixer_set_port(void *, mixer_ctrl_t *); +int ym_mixer_get_port(void *, mixer_ctrl_t *); +int ym_query_devinfo(void *, mixer_devinfo_t *); +int ym_intr(void *); -static void ym_mute __P((struct ym_softc *, int, int)); -static void ym_set_master_gain __P((struct ym_softc *, struct ad1848_volume *)); -static void ym_set_mic_gain __P((struct ym_softc *, int)); -static void ym_set_3d __P((struct ym_softc *, mixer_ctrl_t *, - struct ad1848_volume *, int)); +static void ym_mute(struct ym_softc *, int, int); +static void ym_set_master_gain(struct ym_softc *, struct ad1848_volume *); +static void ym_set_mic_gain(struct ym_softc *, int); +static void ym_set_3d(struct ym_softc *, mixer_ctrl_t *, + struct ad1848_volume *, int); struct audio_hw_if ym_hw_if = { ad1848_open, @@ -107,15 +107,15 @@ struct audio_device ym_device = { "ym" }; -static __inline int ym_read __P((struct ym_softc *, int)); -static __inline void ym_write __P((struct ym_softc *, int, int)); +static __inline int ym_read(struct ym_softc *, int); +static __inline void ym_write(struct ym_softc *, int, int); #if NMIDI > 0 -int ym_mpu401_open __P((void *, int, void (*iintr) __P((void *, int)), - void (*ointr) __P((void *)), void *arg)); -void ym_mpu401_close __P((void *)); -int ym_mpu401_output __P((void *, int)); -void ym_mpu401_getinfo __P((void *, struct midi_info *)); +int ym_mpu401_open __P((void *, int, void (*iintr)(void *, int), + void (*ointr)(void *), void *arg)); +void ym_mpu401_close(void *); +int ym_mpu401_output(void *, int); +void ym_mpu401_getinfo(void *, struct midi_info *); struct midi_hw_if ym_mpu401_hw_if = { ym_mpu401_open, @@ -602,8 +602,8 @@ int ym_mpu401_open(addr, flags, iintr, ointr, arg) void *addr; int flags; - void (*iintr) __P((void *, int)); - void (*ointr) __P((void *)); + void (*iintr)(void *, int); + void (*ointr)(void *); void *arg; { return mpu_open(YMMPU(addr), flags, iintr, ointr, arg); diff --git a/sys/dev/isa/ym_isapnp.c b/sys/dev/isa/ym_isapnp.c index 90d49707ac3..79ec91cd594 100644 --- a/sys/dev/isa/ym_isapnp.c +++ b/sys/dev/isa/ym_isapnp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ym_isapnp.c,v 1.7 1999/08/05 05:32:41 deraadt Exp $ */ +/* $OpenBSD: ym_isapnp.c,v 1.8 2002/03/14 01:26:57 millert Exp $ */ /* @@ -59,8 +59,8 @@ #include <dev/isa/wssreg.h> #include <dev/isa/ymvar.h> -int ym_isapnp_match __P((struct device *, void *, void *)); -void ym_isapnp_attach __P((struct device *, struct device *, void *)); +int ym_isapnp_match(struct device *, void *, void *); +void ym_isapnp_attach(struct device *, struct device *, void *); struct cfattach ym_isapnp_ca = { sizeof(struct ym_softc), ym_isapnp_match, ym_isapnp_attach diff --git a/sys/dev/isa/ymvar.h b/sys/dev/isa/ymvar.h index 34a2dd4f1d2..b53272c8ef2 100644 --- a/sys/dev/isa/ymvar.h +++ b/sys/dev/isa/ymvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ymvar.h,v 1.4 1999/10/06 12:48:33 fgsch Exp $ */ +/* $OpenBSD: ymvar.h,v 1.5 2002/03/14 01:26:57 millert Exp $ */ /* $NetBSD: wssvar.h,v 1.1 1998/01/19 22:18:25 augustss Exp $ */ /* @@ -98,4 +98,4 @@ struct ym_softc { #endif }; -void ym_attach __P((struct ym_softc *)); +void ym_attach(struct ym_softc *); |