diff options
Diffstat (limited to 'sys/dev/pci')
81 files changed, 1687 insertions, 1700 deletions
diff --git a/sys/dev/pci/aac_pci.c b/sys/dev/pci/aac_pci.c index 5a89c99d171..ebcd16af979 100644 --- a/sys/dev/pci/aac_pci.c +++ b/sys/dev/pci/aac_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aac_pci.c,v 1.6 2001/09/16 18:31:22 art Exp $ */ +/* $OpenBSD: aac_pci.c,v 1.7 2002/03/14 01:26:58 millert Exp $ */ /*- * Copyright (c) 2000 Michael Smith @@ -59,8 +59,8 @@ #include <dev/ic/aacreg.h> #include <dev/ic/aacvar.h> -int aac_pci_probe __P((struct device *, void *, void *)); -void aac_pci_attach __P((struct device *, struct device *, void *)); +int aac_pci_probe(struct device *, void *, void *); +void aac_pci_attach(struct device *, struct device *, void *); struct aac_ident { u_int16_t vendor; diff --git a/sys/dev/pci/adv_pci.c b/sys/dev/pci/adv_pci.c index 0d2f5c7462a..4530e53dc04 100644 --- a/sys/dev/pci/adv_pci.c +++ b/sys/dev/pci/adv_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: adv_pci.c,v 1.5 2001/08/25 10:13:29 art Exp $ */ +/* $OpenBSD: adv_pci.c,v 1.6 2002/03/14 01:26:58 millert Exp $ */ /* $NetBSD: adv_pci.c,v 1.5 1998/09/26 15:52:55 dante Exp $ */ /* @@ -89,8 +89,8 @@ /******************************************************************************/ -int adv_pci_match __P((struct device *, void *, void *)); -void adv_pci_attach __P((struct device *, struct device *, void *)); +int adv_pci_match(struct device *, void *, void *); +void adv_pci_attach(struct device *, struct device *, void *); struct cfattach adv_pci_ca = { diff --git a/sys/dev/pci/adw_pci.c b/sys/dev/pci/adw_pci.c index b861404d5ef..3a262c46680 100644 --- a/sys/dev/pci/adw_pci.c +++ b/sys/dev/pci/adw_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: adw_pci.c,v 1.10 2001/08/25 10:13:29 art Exp $ */ +/* $OpenBSD: adw_pci.c,v 1.11 2002/03/14 01:26:58 millert Exp $ */ /* $NetBSD: adw_pci.c,v 1.7 2000/05/26 15:13:46 dante Exp $ */ /* @@ -77,8 +77,8 @@ /******************************************************************************/ -int adw_pci_match __P((struct device *, void *, void *)); -void adw_pci_attach __P((struct device *, struct device *, void *)); +int adw_pci_match(struct device *, void *, void *); +void adw_pci_attach(struct device *, struct device *, void *); struct cfattach adw_pci_ca = { diff --git a/sys/dev/pci/ahc_pci.c b/sys/dev/pci/ahc_pci.c index 6516e56df42..e9096c5125e 100644 --- a/sys/dev/pci/ahc_pci.c +++ b/sys/dev/pci/ahc_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ahc_pci.c,v 1.28 2002/02/18 23:25:38 smurph Exp $ */ +/* $OpenBSD: ahc_pci.c,v 1.29 2002/03/14 01:26:58 millert Exp $ */ /* $NetBSD: ahc_pci.c,v 1.9 1996/10/21 22:56:24 thorpej Exp $ */ /* @@ -112,45 +112,45 @@ #define CACHESIZE 0x0000003ful /* only 5 bits */ #define LATTIME 0x0000ff00ul -static int ahc_ext_scbram_present __P((struct ahc_softc *ahc)); -static void ahc_scbram_config __P((struct ahc_softc *ahc, int enable, - int pcheck, int fast, int large)); -static void ahc_probe_ext_scbram __P((struct ahc_softc *ahc)); -static void check_extport __P((struct ahc_softc *ahc, u_int *sxfrctl1)); -static void configure_termination __P((struct ahc_softc *ahc, +static int ahc_ext_scbram_present(struct ahc_softc *ahc); +static void ahc_scbram_config(struct ahc_softc *ahc, int enable, + int pcheck, int fast, int large); +static void ahc_probe_ext_scbram(struct ahc_softc *ahc); +static void check_extport(struct ahc_softc *ahc, u_int *sxfrctl1); +static void configure_termination(struct ahc_softc *ahc, struct seeprom_descriptor *sd, u_int adapter_control, - u_int *sxfrctl1)); -static void ahc_new_term_detect __P((struct ahc_softc *ahc, + u_int *sxfrctl1); +static void ahc_new_term_detect(struct ahc_softc *ahc, int *enableSEC_low, int *enableSEC_high, int *enablePRI_low, int *enablePRI_high, - int *eeprom_present)); -static void aic787X_cable_detect __P((struct ahc_softc *ahc, + int *eeprom_present); +static void aic787X_cable_detect(struct ahc_softc *ahc, int *internal50_present, int *internal68_present, int *externalcable_present, - int *eeprom_present)); -static void aic785X_cable_detect __P((struct ahc_softc *ahc, + int *eeprom_present); +static void aic785X_cable_detect(struct ahc_softc *ahc, int *internal50_present, int *externalcable_present, - int *eeprom_present)); -static void write_brdctl __P((struct ahc_softc *ahc, u_int8_t value)); -static u_int8_t read_brdctl __P((struct ahc_softc *ahc)); + int *eeprom_present); +static void write_brdctl(struct ahc_softc *ahc, u_int8_t value); +static u_int8_t read_brdctl(struct ahc_softc *ahc); -int ahc_do_pci_config __P((struct ahc_softc *ahc)); +int ahc_do_pci_config(struct ahc_softc *ahc); -void load_seeprom __P((struct ahc_softc *ahc)); -static int acquire_seeprom __P((struct ahc_softc *ahc, - struct seeprom_descriptor *sd)); -static void release_seeprom __P((struct seeprom_descriptor *sd)); -int ahc_probe_scbs __P((struct ahc_softc *ahc)); +void load_seeprom(struct ahc_softc *ahc); +static int acquire_seeprom(struct ahc_softc *ahc, + struct seeprom_descriptor *sd); +static void release_seeprom(struct seeprom_descriptor *sd); +int ahc_probe_scbs(struct ahc_softc *ahc); static u_char aic3940_count; -int ahc_pci_probe __P((struct device *, void *, void *)); -void ahc_pci_attach __P((struct device *, struct device *, void *)); +int ahc_pci_probe(struct device *, void *, void *); +void ahc_pci_attach(struct device *, struct device *, void *); struct cfattach ahc_pci_ca = { sizeof(struct ahc_softc), ahc_pci_probe, ahc_pci_attach diff --git a/sys/dev/pci/ami_pci.c b/sys/dev/pci/ami_pci.c index 9efcda526de..07bbcbf48a6 100644 --- a/sys/dev/pci/ami_pci.c +++ b/sys/dev/pci/ami_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ami_pci.c,v 1.8 2001/08/25 10:13:29 art Exp $ */ +/* $OpenBSD: ami_pci.c,v 1.9 2002/03/14 01:26:58 millert Exp $ */ /* * Copyright (c) 2001 Michael Shalayeff @@ -65,8 +65,8 @@ #define AMI_SGL_LHC 0x00000299 #define AMI_SGL_HLC 0x00000199 -int ami_pci_match __P((struct device *, void *, void *)); -void ami_pci_attach __P((struct device *, struct device *, void *)); +int ami_pci_match(struct device *, void *, void *); +void ami_pci_attach(struct device *, struct device *, void *); struct cfattach ami_pci_ca = { sizeof(struct ami_softc), ami_pci_match, ami_pci_attach diff --git a/sys/dev/pci/auich.c b/sys/dev/pci/auich.c index 8c9fcc50f35..6751b8cb754 100644 --- a/sys/dev/pci/auich.c +++ b/sys/dev/pci/auich.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auich.c,v 1.22 2002/01/20 19:56:53 ericj Exp $ */ +/* $OpenBSD: auich.c,v 1.23 2002/03/14 01:26:58 millert Exp $ */ /* * Copyright (c) 2000,2001 Michael Shalayeff @@ -164,10 +164,10 @@ struct auich_softc { int mici_blksize, mici_fifoe; struct auich_dma *sc_dmas; - void (*sc_pintr) __P((void *)); + void (*sc_pintr)(void *); void *sc_parg; - void (*sc_rintr) __P((void *)); + void (*sc_rintr)(void *); void *sc_rarg; void *powerhook; @@ -189,9 +189,9 @@ struct cfdriver auich_cd = { NULL, "auich", DV_DULL }; -int auich_match __P((struct device *, void *, void *)); -void auich_attach __P((struct device *, struct device *, void *)); -int auich_intr __P((void *)); +int auich_match(struct device *, void *, void *); +void auich_attach(struct device *, struct device *, void *); +int auich_intr(void *); struct cfattach auich_ca = { sizeof(struct auich_softc), auich_match, auich_attach @@ -209,29 +209,29 @@ static const struct auich_devtype { { PCI_PRODUCT_INTEL_82440MX_ACA, 0, "440MX" }, }; -int auich_open __P((void *, int)); -void auich_close __P((void *)); -int auich_query_encoding __P((void *, struct audio_encoding *)); -int auich_set_params __P((void *, int, int, struct audio_params *, - struct audio_params *)); -int auich_round_blocksize __P((void *, int)); -int auich_halt_output __P((void *)); -int auich_halt_input __P((void *)); -int auich_getdev __P((void *, struct audio_device *)); -int auich_set_port __P((void *, mixer_ctrl_t *)); -int auich_get_port __P((void *, mixer_ctrl_t *)); -int auich_query_devinfo __P((void *, mixer_devinfo_t *)); -void *auich_allocm __P((void *, int, size_t, int, int)); -void auich_freem __P((void *, void *, int)); -size_t auich_round_buffersize __P((void *, int, size_t)); -paddr_t auich_mappage __P((void *, void *, off_t, int)); -int auich_get_props __P((void *)); +int auich_open(void *, int); +void auich_close(void *); +int auich_query_encoding(void *, struct audio_encoding *); +int auich_set_params(void *, int, int, struct audio_params *, + struct audio_params *); +int auich_round_blocksize(void *, int); +int auich_halt_output(void *); +int auich_halt_input(void *); +int auich_getdev(void *, struct audio_device *); +int auich_set_port(void *, mixer_ctrl_t *); +int auich_get_port(void *, mixer_ctrl_t *); +int auich_query_devinfo(void *, mixer_devinfo_t *); +void *auich_allocm(void *, int, size_t, int, int); +void auich_freem(void *, void *, int); +size_t auich_round_buffersize(void *, int, size_t); +paddr_t auich_mappage(void *, void *, off_t, int); +int auich_get_props(void *); int auich_trigger_output __P((void *, void *, void *, int, void (*)(void *), void *, struct audio_params *)); int auich_trigger_input __P((void *, void *, void *, int, void (*)(void *), void *, struct audio_params *)); -void auich_powerhook __P((int, void *)); +void auich_powerhook(int, void *); struct audio_hw_if auich_hw_if = { auich_open, @@ -262,10 +262,10 @@ struct audio_hw_if auich_hw_if = { auich_trigger_input }; -int auich_attach_codec __P((void *, struct ac97_codec_if *)); -int auich_read_codec __P((void *, u_int8_t, u_int16_t *)); -int auich_write_codec __P((void *, u_int8_t, u_int16_t)); -void auich_reset_codec __P((void *)); +int auich_attach_codec(void *, struct ac97_codec_if *); +int auich_read_codec(void *, u_int8_t, u_int16_t *); +int auich_write_codec(void *, u_int8_t, u_int16_t); +void auich_reset_codec(void *); int auich_match(parent, match, aux) diff --git a/sys/dev/pci/autri.c b/sys/dev/pci/autri.c index 8bb3fffd23e..24b33ed4d9b 100644 --- a/sys/dev/pci/autri.c +++ b/sys/dev/pci/autri.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autri.c,v 1.5 2002/01/20 19:56:53 ericj Exp $ */ +/* $OpenBSD: autri.c,v 1.6 2002/03/14 01:26:58 millert Exp $ */ /* * Copyright (c) 2001 SOMEYA Yoshihiko and KUROSAWA Takahiro. @@ -71,16 +71,15 @@ int autridebug = 0; # define DPRINTFN(n,x) #endif -int autri_match __P((struct device *, void *, void *)); -void autri_attach __P((struct device *, struct device *, void *)); -int autri_intr __P((void *)); +int autri_match(struct device *, void *, void *); +void autri_attach(struct device *, struct device *, void *); +int autri_intr(void *); #define DMAADDR(p) ((p)->map->dm_segs[0].ds_addr) #define KERNADDR(p) ((void *)((p)->addr)) -int autri_allocmem - __P((struct autri_softc *, size_t, size_t, struct autri_dma *)); -int autri_freemem __P((struct autri_softc *, struct autri_dma *)); +int autri_allocmem(struct autri_softc *, size_t, size_t, struct autri_dma *); +int autri_freemem(struct autri_softc *, struct autri_dma *); #define TWRITE1(sc, r, x) bus_space_write_1((sc)->memt, (sc)->memh, (r), (x)) #define TWRITE2(sc, r, x) bus_space_write_2((sc)->memt, (sc)->memh, (r), (x)) @@ -89,31 +88,28 @@ int autri_freemem __P((struct autri_softc *, struct autri_dma *)); #define TREAD2(sc, r) bus_space_read_2((sc)->memt, (sc)->memh, (r)) #define TREAD4(sc, r) bus_space_read_4((sc)->memt, (sc)->memh, (r)) -static __inline void autri_reg_set_1 __P((struct autri_softc *, int, uint8_t)); -static __inline void autri_reg_clear_1 - __P((struct autri_softc *, int, uint8_t)); -static __inline void autri_reg_set_4 - __P((struct autri_softc *, int, uint32_t)); -static __inline void autri_reg_clear_4 - __P((struct autri_softc *, int, uint32_t)); +static __inline void autri_reg_set_1(struct autri_softc *, int, uint8_t); +static __inline void autri_reg_clear_1(struct autri_softc *, int, uint8_t); +static __inline void autri_reg_set_4(struct autri_softc *, int, uint32_t); +static __inline void autri_reg_clear_4(struct autri_softc *, int, uint32_t); -int autri_attach_codec __P((void *sc, struct ac97_codec_if *)); -int autri_read_codec __P((void *sc, u_int8_t a, u_int16_t *d)); -int autri_write_codec __P((void *sc, u_int8_t a, u_int16_t d)); -void autri_reset_codec __P((void *sc)); +int autri_attach_codec(void *sc, struct ac97_codec_if *); +int autri_read_codec(void *sc, u_int8_t a, u_int16_t *d); +int autri_write_codec(void *sc, u_int8_t a, u_int16_t d); +void autri_reset_codec(void *sc); void autri_powerhook(int why,void *addr); -int autri_init __P((void *sc)); -struct autri_dma *autri_find_dma __P((struct autri_softc *, void *)); -void autri_setup_channel __P((struct autri_softc *sc,int mode, - struct audio_params *param)); -void autri_enable_interrupt __P((struct autri_softc *sc, int ch)); -void autri_disable_interrupt __P((struct autri_softc *sc, int ch)); -void autri_startch __P((struct autri_softc *sc, int ch, int ch_intr)); -void autri_stopch __P((struct autri_softc *sc, int ch, int ch_intr)); -void autri_enable_loop_interrupt __P((void *sc)); +int autri_init(void *sc); +struct autri_dma *autri_find_dma(struct autri_softc *, void *); +void autri_setup_channel(struct autri_softc *sc,int mode, + struct audio_params *param); +void autri_enable_interrupt(struct autri_softc *sc, int ch); +void autri_disable_interrupt(struct autri_softc *sc, int ch); +void autri_startch(struct autri_softc *sc, int ch, int ch_intr); +void autri_stopch(struct autri_softc *sc, int ch, int ch_intr); +void autri_enable_loop_interrupt(void *sc); #if 0 -void autri_disable_loop_interrupt __P((void *sc)); +void autri_disable_loop_interrupt(void *sc); #endif struct cfdriver autri_cd = { @@ -124,32 +120,30 @@ struct cfattach autri_ca = { sizeof(struct autri_softc), autri_match, autri_attach }; -int autri_open __P((void *, int)); -void autri_close __P((void *)); -int autri_query_encoding __P((void *, struct audio_encoding *)); -int autri_set_params - __P((void *, int, int, struct audio_params *, struct audio_params *)); -int autri_round_blocksize __P((void *, int)); +int autri_open(void *, int); +void autri_close(void *); +int autri_query_encoding(void *, struct audio_encoding *); +int autri_set_params(void *, int, int, struct audio_params *, struct audio_params *); +int autri_round_blocksize(void *, int); int autri_trigger_output __P((void *, void *, void *, int, void (*)(void *), void *, struct audio_params *)); int autri_trigger_input __P((void *, void *, void *, int, void (*)(void *), void *, struct audio_params *)); -int autri_halt_output __P((void *)); -int autri_halt_input __P((void *)); -int autri_getdev __P((void *, struct audio_device *)); -int autri_mixer_set_port __P((void *, mixer_ctrl_t *)); -int autri_mixer_get_port __P((void *, mixer_ctrl_t *)); -void* autri_malloc __P((void *, int, size_t, int, int)); -void autri_free __P((void *, void *, int)); -size_t autri_round_buffersize __P((void *, int, size_t)); -paddr_t autri_mappage __P((void *, void *, off_t, int)); -int autri_get_props __P((void *)); -int autri_query_devinfo __P((void *addr, mixer_devinfo_t *dip)); - -int autri_get_portnum_by_name - __P((struct autri_softc *, char *, char *, char *)); +int autri_halt_output(void *); +int autri_halt_input(void *); +int autri_getdev(void *, struct audio_device *); +int autri_mixer_set_port(void *, mixer_ctrl_t *); +int autri_mixer_get_port(void *, mixer_ctrl_t *); +void* autri_malloc(void *, int, size_t, int, int); +void autri_free(void *, void *, int); +size_t autri_round_buffersize(void *, int, size_t); +paddr_t autri_mappage(void *, void *, off_t, int); +int autri_get_props(void *); +int autri_query_devinfo(void *addr, mixer_devinfo_t *dip); + +int autri_get_portnum_by_name(struct autri_softc *, char *, char *, char *); struct audio_hw_if autri_hw_if = { autri_open, @@ -1394,7 +1388,7 @@ autri_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; { @@ -1438,7 +1432,7 @@ autri_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/pci/auvia.c b/sys/dev/pci/auvia.c index d081c97325d..6b8695e6694 100644 --- a/sys/dev/pci/auvia.c +++ b/sys/dev/pci/auvia.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auvia.c,v 1.14 2002/01/20 19:56:53 ericj Exp $ */ +/* $OpenBSD: auvia.c,v 1.15 2002/03/14 01:26:58 millert Exp $ */ /* $NetBSD: auvia.c,v 1.7 2000/11/15 21:06:33 jdolecek Exp $ */ /*- @@ -112,7 +112,7 @@ int auvia_trigger_output(void *, void *, void *, int, void (*)(void *), int auvia_trigger_input(void *, void *, void *, int, void (*)(void *), void *, struct audio_params *); -int auvia_intr __P((void *)); +int auvia_intr(void *); struct cfdriver auvia_cd = { NULL, "auvia", DV_DULL diff --git a/sys/dev/pci/bha_pci.c b/sys/dev/pci/bha_pci.c index 81866316401..1c498f7be95 100644 --- a/sys/dev/pci/bha_pci.c +++ b/sys/dev/pci/bha_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bha_pci.c,v 1.1 2002/01/24 22:38:03 mickey Exp $ */ +/* $OpenBSD: bha_pci.c,v 1.2 2002/03/14 01:26:58 millert Exp $ */ /* $NetBSD: bha_pci.c,v 1.16 1998/08/15 10:10:53 mycroft Exp $ */ /*- @@ -56,8 +56,8 @@ #define PCI_CBIO 0x10 -int bha_pci_match __P((struct device *, void *, void *)); -void bha_pci_attach __P((struct device *, struct device *, void *)); +int bha_pci_match(struct device *, void *, void *); +void bha_pci_attach(struct device *, struct device *, void *); struct cfattach bha_pci_ca = { sizeof(struct bha_softc), bha_pci_match, bha_pci_attach diff --git a/sys/dev/pci/bktr/bktr_os.c b/sys/dev/pci/bktr/bktr_os.c index 2d32cb85a06..9526baaec89 100644 --- a/sys/dev/pci/bktr/bktr_os.c +++ b/sys/dev/pci/bktr/bktr_os.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bktr_os.c,v 1.8 2002/01/23 18:41:07 mickey Exp $ */ +/* $OpenBSD: bktr_os.c,v 1.9 2002/03/14 01:27:00 millert Exp $ */ /* $FreeBSD: src/sys/dev/bktr/bktr_os.c,v 1.20 2000/10/20 08:16:53 roger Exp $ */ /* @@ -1302,23 +1302,23 @@ static int bktr_intr(void *arg) { return common_bktr_intr(arg); } #define bktr_mmap bktrmmap #ifdef __OpenBSD__ -int bktr_open __P((dev_t, int, int, struct proc *)); -int bktr_close __P((dev_t, int, int, struct proc *)); -int bktr_read __P((dev_t, struct uio *, int)); -int bktr_write __P((dev_t, struct uio *, int)); -int bktr_ioctl __P((dev_t, ioctl_cmd_t, caddr_t, int, struct proc *)); -paddr_t bktr_mmap __P((dev_t, off_t, int)); +int bktr_open(dev_t, int, int, struct proc *); +int bktr_close(dev_t, int, int, struct proc *); +int bktr_read(dev_t, struct uio *, int); +int bktr_write(dev_t, struct uio *, int); +int bktr_ioctl(dev_t, ioctl_cmd_t, caddr_t, int, struct proc *); +paddr_t bktr_mmap(dev_t, off_t, int); #endif vm_offset_t vm_page_alloc_contig(vm_offset_t, vm_offset_t, vm_offset_t, vm_offset_t); #if defined(__OpenBSD__) -static int bktr_probe __P((struct device *, void *, void *)); +static int bktr_probe(struct device *, void *, void *); #else -static int bktr_probe __P((struct device *, struct cfdata *, void *)); +static int bktr_probe(struct device *, struct cfdata *, void *); #endif -static void bktr_attach __P((struct device *, struct device *, void *)); +static void bktr_attach(struct device *, struct device *, void *); struct cfattach bktr_ca = { sizeof(struct bktr_softc), bktr_probe, bktr_attach diff --git a/sys/dev/pci/cmpci.c b/sys/dev/pci/cmpci.c index 16a7c3b7f3e..8e9626bfef0 100644 --- a/sys/dev/pci/cmpci.c +++ b/sys/dev/pci/cmpci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmpci.c,v 1.6 2002/01/20 19:56:53 ericj Exp $ */ +/* $OpenBSD: cmpci.c,v 1.7 2002/03/14 01:26:58 millert Exp $ */ /* * Copyright (c) 2000 Takuya SHIOZAKI @@ -68,31 +68,31 @@ /* * Low-level HW interface */ -static __inline uint8_t cmpci_mixerreg_read __P((struct cmpci_softc *, - uint8_t)); -static __inline void cmpci_mixerreg_write __P((struct cmpci_softc *, - uint8_t, uint8_t)); -static __inline void cmpci_reg_partial_write_4 __P((struct cmpci_softc *, +static __inline uint8_t cmpci_mixerreg_read(struct cmpci_softc *, + uint8_t); +static __inline void cmpci_mixerreg_write(struct cmpci_softc *, + uint8_t, uint8_t); +static __inline void cmpci_reg_partial_write_4(struct cmpci_softc *, int, int, - uint32_t, uint32_t)); -static __inline void cmpci_reg_set_4 __P((struct cmpci_softc *, - int, uint32_t)); -static __inline void cmpci_reg_clear_4 __P((struct cmpci_softc *, - int, uint32_t)); -static int cmpci_rate_to_index __P((int)); -static __inline int cmpci_index_to_rate __P((int)); -static __inline int cmpci_index_to_divider __P((int)); + uint32_t, uint32_t); +static __inline void cmpci_reg_set_4(struct cmpci_softc *, + int, uint32_t); +static __inline void cmpci_reg_clear_4(struct cmpci_softc *, + int, uint32_t); +static int cmpci_rate_to_index(int); +static __inline int cmpci_index_to_rate(int); +static __inline int cmpci_index_to_divider(int); -static int cmpci_adjust __P((int, int)); -static void cmpci_set_mixer_gain __P((struct cmpci_softc *, int)); -static int cmpci_set_in_ports __P((struct cmpci_softc *, int)); +static int cmpci_adjust(int, int); +static void cmpci_set_mixer_gain(struct cmpci_softc *, int); +static int cmpci_set_in_ports(struct cmpci_softc *, int); /* * autoconf interface */ -int cmpci_match __P((struct device *, void *, void *)); -void cmpci_attach __P((struct device *, struct device *, void *)); +int cmpci_match(struct device *, void *, void *); +void cmpci_attach(struct device *, struct device *, void *); struct cfdriver cmpci_cd = { NULL, "cmpci", DV_DULL @@ -109,39 +109,39 @@ struct audio_device cmpci_device = { }; /* interrupt */ -int cmpci_intr __P((void *)); +int cmpci_intr(void *); /* * DMA stuff */ -int cmpci_alloc_dmamem __P((struct cmpci_softc *, - size_t, int, int, caddr_t *)); -int cmpci_free_dmamem __P((struct cmpci_softc *, caddr_t, int)); -struct cmpci_dmanode * cmpci_find_dmamem __P((struct cmpci_softc *, - caddr_t)); +int cmpci_alloc_dmamem(struct cmpci_softc *, + size_t, int, int, caddr_t *); +int cmpci_free_dmamem(struct cmpci_softc *, caddr_t, int); +struct cmpci_dmanode * cmpci_find_dmamem(struct cmpci_softc *, + caddr_t); /* * Interface to machine independent layer */ -int cmpci_open __P((void *, int)); -void cmpci_close __P((void *)); -int cmpci_query_encoding __P((void *, struct audio_encoding *)); -int cmpci_set_params __P((void *, int, int, +int cmpci_open(void *, int); +void cmpci_close(void *); +int cmpci_query_encoding(void *, struct audio_encoding *); +int cmpci_set_params(void *, int, int, struct audio_params *, - struct audio_params *)); -int cmpci_round_blocksize __P((void *, int)); -int cmpci_halt_output __P((void *)); -int cmpci_halt_input __P((void *)); -int cmpci_getdev __P((void *, struct audio_device *)); -int cmpci_set_port __P((void *, mixer_ctrl_t *)); -int cmpci_get_port __P((void *, mixer_ctrl_t *)); -int cmpci_query_devinfo __P((void *, mixer_devinfo_t *)); -void *cmpci_malloc __P((void *, int, size_t, int, int)); -void cmpci_free __P((void *, void *, int)); -size_t cmpci_round_buffersize __P((void *, int, size_t)); -paddr_t cmpci_mappage __P((void *, void *, off_t, int)); -int cmpci_get_props __P((void *)); + struct audio_params *); +int cmpci_round_blocksize(void *, int); +int cmpci_halt_output(void *); +int cmpci_halt_input(void *); +int cmpci_getdev(void *, struct audio_device *); +int cmpci_set_port(void *, mixer_ctrl_t *); +int cmpci_get_port(void *, mixer_ctrl_t *); +int cmpci_query_devinfo(void *, mixer_devinfo_t *); +void *cmpci_malloc(void *, int, size_t, int, int); +void cmpci_free(void *, void *, int); +size_t cmpci_round_buffersize(void *, int, size_t); +paddr_t cmpci_mappage(void *, void *, off_t, int); +int cmpci_get_props(void *); int cmpci_trigger_output __P((void *, void *, void *, int, void (*)(void *), void *, struct audio_params *)); @@ -1103,7 +1103,7 @@ cmpci_find_dmamem(sc, addr) #if 0 void -cmpci_print_dmamem __P((struct cmpci_dmanode *p)); +cmpci_print_dmamem(struct cmpci_dmanode *p); void cmpci_print_dmamem(p) struct cmpci_dmanode *p; @@ -1498,7 +1498,7 @@ cmpci_trigger_output(handle, start, end, blksize, intr, arg, param) void *handle; void *start, *end; int blksize; - void (*intr) __P((void *)); + void (*intr)(void *); void *arg; struct audio_params *param; { @@ -1540,7 +1540,7 @@ cmpci_trigger_input(handle, start, end, blksize, intr, arg, param) void *handle; void *start, *end; int blksize; - void (*intr) __P((void *)); + void (*intr)(void *); void *arg; struct audio_params *param; { diff --git a/sys/dev/pci/cmpcivar.h b/sys/dev/pci/cmpcivar.h index 623f71b2c26..2ce823052f0 100644 --- a/sys/dev/pci/cmpcivar.h +++ b/sys/dev/pci/cmpcivar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cmpcivar.h,v 1.2 2000/08/26 13:07:50 kevlo Exp $ */ +/* $OpenBSD: cmpcivar.h,v 1.3 2002/03/14 01:26:58 millert Exp $ */ /* * Copyright (c) 2000 Takuya SHIOZAKI @@ -115,7 +115,7 @@ struct cmpci_softc { /* each channel */ struct { - void (*intr) __P((void *)); + void (*intr)(void *); void *intr_arg; } sc_play, sc_rec; diff --git a/sys/dev/pci/cs4280.c b/sys/dev/pci/cs4280.c index c16b0adec06..821f6e669c2 100644 --- a/sys/dev/pci/cs4280.c +++ b/sys/dev/pci/cs4280.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cs4280.c,v 1.13 2002/01/20 19:56:53 ericj Exp $ */ +/* $OpenBSD: cs4280.c,v 1.14 2002/03/14 01:26:58 millert Exp $ */ /* $NetBSD: cs4280.c,v 1.5 2000/06/26 04:56:23 simonb Exp $ */ /* @@ -170,19 +170,19 @@ struct cs4280_softc { #define BA1READ4(sc, r) bus_space_read_4((sc)->ba1t, (sc)->ba1h, (r)) #define BA1WRITE4(sc, r, x) bus_space_write_4((sc)->ba1t, (sc)->ba1h, (r), (x)) -int cs4280_match __P((struct device *, void *, void *)); -void cs4280_attach __P((struct device *, struct device *, void *)); -int cs4280_intr __P((void *)); -void cs4280_reset __P((void *)); -int cs4280_download_image __P((struct cs4280_softc *)); +int cs4280_match(struct device *, void *, void *); +void cs4280_attach(struct device *, struct device *, void *); +int cs4280_intr(void *); +void cs4280_reset(void *); +int cs4280_download_image(struct cs4280_softc *); int cs4280_download(struct cs4280_softc *, const u_int32_t *, u_int32_t, u_int32_t); -int cs4280_allocmem __P((struct cs4280_softc *, size_t, size_t, - struct cs4280_dma *)); -int cs4280_freemem __P((struct cs4280_softc *, struct cs4280_dma *)); +int cs4280_allocmem(struct cs4280_softc *, size_t, size_t, + struct cs4280_dma *); +int cs4280_freemem(struct cs4280_softc *, struct cs4280_dma *); #ifdef CS4280_DEBUG -int cs4280_check_images __P((struct cs4280_softc *)); +int cs4280_check_images(struct cs4280_softc *); int cs4280_checkimage(struct cs4280_softc *, u_int32_t *, u_int32_t, u_int32_t); #endif @@ -195,53 +195,53 @@ struct cfattach clcs_ca = { sizeof(struct cs4280_softc), cs4280_match, cs4280_attach }; -int cs4280_init __P((struct cs4280_softc *, int)); -int cs4280_open __P((void *, int)); -void cs4280_close __P((void *)); +int cs4280_init(struct cs4280_softc *, int); +int cs4280_open(void *, int); +void cs4280_close(void *); -int cs4280_query_encoding __P((void *, struct audio_encoding *)); -int cs4280_set_params __P((void *, int, int, struct audio_params *, struct audio_params *)); -int cs4280_round_blocksize __P((void *, int)); +int cs4280_query_encoding(void *, struct audio_encoding *); +int cs4280_set_params(void *, int, int, struct audio_params *, struct audio_params *); +int cs4280_round_blocksize(void *, int); -int cs4280_halt_output __P((void *)); -int cs4280_halt_input __P((void *)); +int cs4280_halt_output(void *); +int cs4280_halt_input(void *); -int cs4280_getdev __P((void *, struct audio_device *)); +int cs4280_getdev(void *, struct audio_device *); -int cs4280_mixer_set_port __P((void *, mixer_ctrl_t *)); -int cs4280_mixer_get_port __P((void *, mixer_ctrl_t *)); -int cs4280_query_devinfo __P((void *addr, mixer_devinfo_t *dip)); -void *cs4280_malloc __P((void *, int, size_t, int, int)); -void cs4280_free __P((void *, void *, int)); -size_t cs4280_round_buffersize __P((void *, int, size_t)); -paddr_t cs4280_mappage __P((void *, void *, off_t, int)); -int cs4280_get_props __P((void *)); +int cs4280_mixer_set_port(void *, mixer_ctrl_t *); +int cs4280_mixer_get_port(void *, mixer_ctrl_t *); +int cs4280_query_devinfo(void *addr, mixer_devinfo_t *dip); +void *cs4280_malloc(void *, int, size_t, int, int); +void cs4280_free(void *, void *, int); +size_t cs4280_round_buffersize(void *, int, size_t); +paddr_t cs4280_mappage(void *, void *, off_t, int); +int cs4280_get_props(void *); int cs4280_trigger_output __P((void *, void *, void *, int, void (*)(void *), void *, struct audio_params *)); int cs4280_trigger_input __P((void *, void *, void *, int, void (*)(void *), void *, struct audio_params *)); -void cs4280_set_dac_rate __P((struct cs4280_softc *, int )); -void cs4280_set_adc_rate __P((struct cs4280_softc *, int )); -int cs4280_get_portnum_by_name __P((struct cs4280_softc *, char *, char *, - char *)); -int cs4280_src_wait __P((struct cs4280_softc *)); -int cs4280_attach_codec __P((void *sc, struct ac97_codec_if *)); -int cs4280_read_codec __P((void *sc, u_int8_t a, u_int16_t *d)); -int cs4280_write_codec __P((void *sc, u_int8_t a, u_int16_t d)); -void cs4280_reset_codec __P((void *sc)); +void cs4280_set_dac_rate(struct cs4280_softc *, int ); +void cs4280_set_adc_rate(struct cs4280_softc *, int ); +int cs4280_get_portnum_by_name(struct cs4280_softc *, char *, char *, + char *); +int cs4280_src_wait(struct cs4280_softc *); +int cs4280_attach_codec(void *sc, struct ac97_codec_if *); +int cs4280_read_codec(void *sc, u_int8_t a, u_int16_t *d); +int cs4280_write_codec(void *sc, u_int8_t a, u_int16_t d); +void cs4280_reset_codec(void *sc); -void cs4280_power __P((int, void *)); +void cs4280_power(int, void *); -void cs4280_clear_fifos __P((struct cs4280_softc *)); +void cs4280_clear_fifos(struct cs4280_softc *); #if NMIDI > 0 -void cs4280_midi_close __P((void*)); -void cs4280_midi_getinfo __P((void *, struct midi_info *)); +void cs4280_midi_close(void*); +void cs4280_midi_getinfo(void *, struct midi_info *); int cs4280_midi_open __P((void *, int, void (*)(void *, int), void (*)(void *), void *)); -int cs4280_midi_output __P((void *, int)); +int cs4280_midi_output(void *, int); #endif struct audio_hw_if cs4280_hw_if = { @@ -1454,7 +1454,7 @@ cs4280_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; { @@ -1547,7 +1547,7 @@ cs4280_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; { @@ -1865,8 +1865,8 @@ int cs4280_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 cs4280_softc *sc = addr; diff --git a/sys/dev/pci/cs4281.c b/sys/dev/pci/cs4281.c index 5e20267f831..1ba179a80f8 100644 --- a/sys/dev/pci/cs4281.c +++ b/sys/dev/pci/cs4281.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cs4281.c,v 1.10 2002/01/20 19:56:53 ericj Exp $ */ +/* $OpenBSD: cs4281.c,v 1.11 2002/03/14 01:26:58 millert Exp $ */ /* $Tera: cs4281.c,v 1.18 2000/12/27 14:24:45 tacha Exp $ */ /* @@ -112,7 +112,7 @@ struct cs4281_softc { int sc_pi; struct cs4281_dma *sc_pdma; char *sc_pbuf; - int (*halt_output)__P((void *)); + int (*halt_output)(void *); #ifdef DIAGNOSTIC char sc_prun; #endif @@ -126,7 +126,7 @@ struct cs4281_softc { struct cs4281_dma *sc_rdma; char *sc_rbuf; int sc_rparam; /* record format */ - int (*halt_input)__P((void *)); + int (*halt_input)(void *); #ifdef DIAGNOSTIC char sc_rrun; #endif @@ -158,15 +158,15 @@ struct cs4281_softc { #define MAX_FIFO_SIZE 64 /* 128/2 channels */ #endif -int cs4281_match __P((struct device *, void *, void *)); -void cs4281_attach __P((struct device *, struct device *, void *)); -int cs4281_intr __P((void *)); -int cs4281_query_encoding __P((void *, struct audio_encoding *)); -int cs4281_set_params __P((void *, int, int, struct audio_params *, - struct audio_params *)); -int cs4281_halt_output __P((void *)); -int cs4281_halt_input __P((void *)); -int cs4281_getdev __P((void *, struct audio_device *)); +int cs4281_match(struct device *, void *, void *); +void cs4281_attach(struct device *, struct device *, void *); +int cs4281_intr(void *); +int cs4281_query_encoding(void *, struct audio_encoding *); +int cs4281_set_params(void *, int, int, struct audio_params *, + struct audio_params *); +int cs4281_halt_output(void *); +int cs4281_halt_input(void *); +int cs4281_getdev(void *, struct audio_device *); int cs4281_trigger_output __P((void *, void *, void *, int, void (*)(void *), void *, struct audio_params *)); @@ -174,33 +174,33 @@ int cs4281_trigger_input __P((void *, void *, void *, int, void (*)(void *), void *, struct audio_params *)); -u_int8_t cs4281_sr2regval __P((int)); -void cs4281_set_dac_rate __P((struct cs4281_softc *, int)); -void cs4281_set_adc_rate __P((struct cs4281_softc *, int)); -int cs4281_init __P((struct cs4281_softc *)); - -int cs4281_open __P((void *, int)); -void cs4281_close __P((void *)); -int cs4281_round_blocksize __P((void *, int)); -int cs4281_get_props __P((void *)); -int cs4281_attach_codec __P((void *, struct ac97_codec_if *)); -int cs4281_read_codec __P((void *, u_int8_t , u_int16_t *)); -int cs4281_write_codec __P((void *, u_int8_t, u_int16_t)); -void cs4281_reset_codec __P((void *)); - -void cs4281_power __P((int, void *)); - -int cs4281_mixer_set_port __P((void *, mixer_ctrl_t *)); -int cs4281_mixer_get_port __P((void *, mixer_ctrl_t *)); -int cs4281_query_devinfo __P((void *, mixer_devinfo_t *)); -void *cs4281_malloc __P((void *, int, size_t, int, int)); -size_t cs4281_round_buffersize __P((void *, int, size_t)); -void cs4281_free __P((void *, void *, int)); -paddr_t cs4281_mappage __P((void *, void *, off_t, int)); - -int cs4281_allocmem __P((struct cs4281_softc *, size_t, int, int, - struct cs4281_dma *)); -int cs4281_src_wait __P((struct cs4281_softc *)); +u_int8_t cs4281_sr2regval(int); +void cs4281_set_dac_rate(struct cs4281_softc *, int); +void cs4281_set_adc_rate(struct cs4281_softc *, int); +int cs4281_init(struct cs4281_softc *); + +int cs4281_open(void *, int); +void cs4281_close(void *); +int cs4281_round_blocksize(void *, int); +int cs4281_get_props(void *); +int cs4281_attach_codec(void *, struct ac97_codec_if *); +int cs4281_read_codec(void *, u_int8_t , u_int16_t *); +int cs4281_write_codec(void *, u_int8_t, u_int16_t); +void cs4281_reset_codec(void *); + +void cs4281_power(int, void *); + +int cs4281_mixer_set_port(void *, mixer_ctrl_t *); +int cs4281_mixer_get_port(void *, mixer_ctrl_t *); +int cs4281_query_devinfo(void *, mixer_devinfo_t *); +void *cs4281_malloc(void *, int, size_t, int, int); +size_t cs4281_round_buffersize(void *, int, size_t); +void cs4281_free(void *, void *, int); +paddr_t cs4281_mappage(void *, void *, off_t, int); + +int cs4281_allocmem(struct cs4281_softc *, size_t, int, int, + struct cs4281_dma *); +int cs4281_src_wait(struct cs4281_softc *); #if defined(CS4281_DEBUG) #undef DPRINTF @@ -244,11 +244,11 @@ struct audio_hw_if cs4281_hw_if = { #if NMIDI > 0 /* Midi Interface */ -void cs4281_midi_close __P((void *)); -void cs4281_midi_getinfo __P((void *, struct midi_info *)); +void cs4281_midi_close(void *); +void cs4281_midi_getinfo(void *, struct midi_info *); int cs4281_midi_open __P((void *, int, void (*)(void *, int), void (*)(void *), void *)); -int cs4281_midi_output __P((void *, int)); +int cs4281_midi_output(void *, int); struct midi_hw_if cs4281_midi_hw_if = { cs4281_midi_open, @@ -632,7 +632,7 @@ cs4281_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; { @@ -736,7 +736,7 @@ cs4281_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/pci/cy_pci.c b/sys/dev/pci/cy_pci.c index 527214465bd..e1ebbe84975 100644 --- a/sys/dev/pci/cy_pci.c +++ b/sys/dev/pci/cy_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cy_pci.c,v 1.8 2001/08/25 10:13:29 art Exp $ */ +/* $OpenBSD: cy_pci.c,v 1.9 2002/03/14 01:26:58 millert Exp $ */ /* * cy_pci.c @@ -22,8 +22,8 @@ #include <dev/ic/cd1400reg.h> #include <dev/ic/cyreg.h> -int cy_pci_match __P((struct device *, void *, void *)); -void cy_pci_attach __P((struct device *, struct device *, void *)); +int cy_pci_match(struct device *, void *, void *); +void cy_pci_attach(struct device *, struct device *, void *); struct cfattach cy_pci_ca = { sizeof(struct cy_softc), cy_pci_match, cy_pci_attach diff --git a/sys/dev/pci/dpt_pci.c b/sys/dev/pci/dpt_pci.c index 9c58c7b3636..b3eb4591b90 100644 --- a/sys/dev/pci/dpt_pci.c +++ b/sys/dev/pci/dpt_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dpt_pci.c,v 1.3 2001/08/25 10:13:29 art Exp $ */ +/* $OpenBSD: dpt_pci.c,v 1.4 2002/03/14 01:26:58 millert Exp $ */ /* $NetBSD: dpt_pci.c,v 1.2 1999/09/29 17:33:02 ad Exp $ */ /* @@ -67,12 +67,12 @@ __KERNEL_RCSID(0, "$NetBSD: dpt_pci.c,v 1.2 1999/09/29 17:33:02 ad Exp $"); #define PCI_CBIO 0x10 /* Configuration base I/O address */ #ifdef __NetBSD__ -int dpt_pci_match __P((struct device *, struct cfdata *, void *)); +int dpt_pci_match(struct device *, struct cfdata *, void *); #endif /* __NetBSD__ */ #ifdef __OpenBSD__ -int dpt_pci_match __P((struct device *, void *, void *)); +int dpt_pci_match(struct device *, void *, void *); #endif /* __OpenBSD__ */ -void dpt_pci_attach __P((struct device *, struct device *, void *)); +void dpt_pci_attach(struct device *, struct device *, void *); struct cfattach dpt_pci_ca = { sizeof(struct dpt_softc), dpt_pci_match, dpt_pci_attach diff --git a/sys/dev/pci/emuxki.c b/sys/dev/pci/emuxki.c index e7de938eca6..e50518e5f8d 100644 --- a/sys/dev/pci/emuxki.c +++ b/sys/dev/pci/emuxki.c @@ -1,4 +1,4 @@ -/* $OpenBSD: emuxki.c,v 1.8 2002/01/20 19:56:53 ericj Exp $ */ +/* $OpenBSD: emuxki.c,v 1.9 2002/03/14 01:26:58 millert Exp $ */ /* $NetBSD: emuxki.c,v 1.1 2001/10/17 18:39:41 jdolecek Exp $ */ /*- @@ -80,29 +80,29 @@ #include <dev/pci/emuxkivar.h> /* autconf goo */ -int emuxki_match __P((struct device *, void *, void *)); -void emuxki_attach __P((struct device *, struct device *, void *)); -int emuxki_detach __P((struct device *, int)); -int emuxki_scinit __P((struct emuxki_softc *sc)); -void emuxki_pci_shutdown __P((struct emuxki_softc *sc)); +int emuxki_match(struct device *, void *, void *); +void emuxki_attach(struct device *, struct device *, void *); +int emuxki_detach(struct device *, int); +int emuxki_scinit(struct emuxki_softc *sc); +void emuxki_pci_shutdown(struct emuxki_softc *sc); /* dma mem mgmt */ -struct dmamem *emuxki_dmamem_alloc __P((bus_dma_tag_t, size_t, bus_size_t, - int, int, int)); -void emuxki_dmamem_free __P((struct dmamem *, int)); -void emuxki_dmamem_delete __P((struct dmamem *mem, int type)); +struct dmamem *emuxki_dmamem_alloc(bus_dma_tag_t, size_t, bus_size_t, + int, int, int); +void emuxki_dmamem_free(struct dmamem *, int); +void emuxki_dmamem_delete(struct dmamem *mem, int type); -struct emuxki_mem *emuxki_mem_new __P((struct emuxki_softc *sc, int ptbidx, - size_t size, int type, int flags)); -void emuxki_mem_delete __P((struct emuxki_mem *mem, int type)); +struct emuxki_mem *emuxki_mem_new(struct emuxki_softc *sc, int ptbidx, + size_t size, int type, int flags); +void emuxki_mem_delete(struct emuxki_mem *mem, int type); /* Emu10k1 init & shutdown */ -int emuxki_init __P((struct emuxki_softc *)); -void emuxki_shutdown __P((struct emuxki_softc *)); +int emuxki_init(struct emuxki_softc *); +void emuxki_shutdown(struct emuxki_softc *); /* Emu10k1 mem mgmt */ -void *emuxki_pmem_alloc __P((struct emuxki_softc *, size_t,int,int)); -void *emuxki_rmem_alloc __P((struct emuxki_softc *, size_t,int,int)); +void *emuxki_pmem_alloc(struct emuxki_softc *, size_t,int,int); +void *emuxki_rmem_alloc(struct emuxki_softc *, size_t,int,int); /* * Emu10k1 channels funcs : There is no direct access to channels, everything @@ -111,74 +111,67 @@ void *emuxki_rmem_alloc __P((struct emuxki_softc *, size_t,int,int)); */ /* Emu10k1 voice mgmt */ -struct emuxki_voice *emuxki_voice_new __P((struct emuxki_softc *, u_int8_t)); -void emuxki_voice_delete __P((struct emuxki_voice *)); -int emuxki_voice_set_audioparms - __P((struct emuxki_voice *, u_int8_t, u_int8_t, u_int32_t)); +struct emuxki_voice *emuxki_voice_new(struct emuxki_softc *, u_int8_t); +void emuxki_voice_delete(struct emuxki_voice *); +int emuxki_voice_set_audioparms(struct emuxki_voice *, u_int8_t, u_int8_t, u_int32_t); /* emuxki_voice_set_fxparms will come later, it'll need channel distinction */ -int emuxki_voice_set_bufparms - __P((struct emuxki_voice *, void *, u_int32_t, u_int16_t)); -int emuxki_voice_set_stereo __P((struct emuxki_voice *voice, u_int8_t stereo)); -int emuxki_voice_dataloc_create __P((struct emuxki_voice *voice)); -void emuxki_voice_dataloc_destroy __P((struct emuxki_voice *voice)); -void emuxki_voice_commit_parms __P((struct emuxki_voice *)); -void emuxki_voice_recsrc_release - __P((struct emuxki_softc *sc, emuxki_recsrc_t source)); -u_int32_t emuxki_voice_curaddr __P((struct emuxki_voice *)); -int emuxki_set_vparms __P((struct emuxki_voice *voice, struct audio_params *p)); -int emuxki_voice_set_srate __P((struct emuxki_voice *voice, u_int32_t srate)); +int emuxki_voice_set_bufparms(struct emuxki_voice *, void *, u_int32_t, u_int16_t); +int emuxki_voice_set_stereo(struct emuxki_voice *voice, u_int8_t stereo); +int emuxki_voice_dataloc_create(struct emuxki_voice *voice); +void emuxki_voice_dataloc_destroy(struct emuxki_voice *voice); +void emuxki_voice_commit_parms(struct emuxki_voice *); +void emuxki_voice_recsrc_release(struct emuxki_softc *sc, emuxki_recsrc_t source); +u_int32_t emuxki_voice_curaddr(struct emuxki_voice *); +int emuxki_set_vparms(struct emuxki_voice *voice, struct audio_params *p); +int emuxki_voice_set_srate(struct emuxki_voice *voice, u_int32_t srate); void emuxki_voice_start __P((struct emuxki_voice *, void (*) (void *), void *)); -void emuxki_voice_halt __P((struct emuxki_voice *)); -int emuxki_voice_channel_create __P((struct emuxki_voice *voice)); -void emuxki_voice_channel_destroy __P((struct emuxki_voice *voice)); - -struct emuxki_channel *emuxki_channel_new - __P((struct emuxki_voice *voice, u_int8_t num)); -void emuxki_channel_delete __P((struct emuxki_channel *chan)); -void emuxki_channel_start __P((struct emuxki_channel *chan)); -void emuxki_channel_stop __P((struct emuxki_channel *chan)); -void emuxki_channel_commit_parms __P((struct emuxki_channel *chan)); -void emuxki_channel_set_bufparms - __P((struct emuxki_channel *chan, u_int32_t start, u_int32_t end)); -void emuxki_channel_set_srate - __P((struct emuxki_channel *chan, u_int32_t srate)); -void emuxki_channel_set_fxsend __P((struct emuxki_channel *chan, - struct emuxki_chanparms_fxsend *fxsend)); -void emuxki_chanparms_set_defaults __P((struct emuxki_channel *chan)); - -void emuxki_resched_timer __P((struct emuxki_softc *sc)); +void emuxki_voice_halt(struct emuxki_voice *); +int emuxki_voice_channel_create(struct emuxki_voice *voice); +void emuxki_voice_channel_destroy(struct emuxki_voice *voice); + +struct emuxki_channel *emuxki_channel_new(struct emuxki_voice *voice, u_int8_t num); +void emuxki_channel_delete(struct emuxki_channel *chan); +void emuxki_channel_start(struct emuxki_channel *chan); +void emuxki_channel_stop(struct emuxki_channel *chan); +void emuxki_channel_commit_parms(struct emuxki_channel *chan); +void emuxki_channel_set_bufparms(struct emuxki_channel *chan, u_int32_t start, u_int32_t end); +void emuxki_channel_set_srate(struct emuxki_channel *chan, u_int32_t srate); +void emuxki_channel_set_fxsend(struct emuxki_channel *chan, + struct emuxki_chanparms_fxsend *fxsend); +void emuxki_chanparms_set_defaults(struct emuxki_channel *chan); + +void emuxki_resched_timer(struct emuxki_softc *sc); /* * Emu10k1 stream mgmt : not done yet */ #if 0 -struct emuxki_stream *emuxki_stream_new __P((struct emu10k1 *)); -void emuxki_stream_delete __P((struct emuxki_stream *)); -int emuxki_stream_set_audio_params __P((struct emuxki_stream *, u_int8_t, - u_int8_t, u_int8_t, u_int16_t)); -void emuxki_stream_start __P((struct emuxki_stream *)); -void emuxki_stream_halt __P((struct emuxki_stream *)); +struct emuxki_stream *emuxki_stream_new(struct emu10k1 *); +void emuxki_stream_delete(struct emuxki_stream *); +int emuxki_stream_set_audio_params(struct emuxki_stream *, u_int8_t, + u_int8_t, u_int8_t, u_int16_t); +void emuxki_stream_start(struct emuxki_stream *); +void emuxki_stream_halt(struct emuxki_stream *); #endif /* fx interface */ -void emuxki_initfx __P((struct emuxki_softc *sc)); -void emuxki_dsp_addop __P((struct emuxki_softc *sc, u_int16_t *pc, u_int8_t op, - u_int16_t r, u_int16_t a, u_int16_t x, u_int16_t y)); -void emuxki_write_micro - __P((struct emuxki_softc *sc, u_int32_t pc, u_int32_t data)); +void emuxki_initfx(struct emuxki_softc *sc); +void emuxki_dsp_addop(struct emuxki_softc *sc, u_int16_t *pc, u_int8_t op, + u_int16_t r, u_int16_t a, u_int16_t x, u_int16_t y); +void emuxki_write_micro(struct emuxki_softc *sc, u_int32_t pc, u_int32_t data); /* audio interface callbacks */ -int emuxki_open __P((void *, int)); -void emuxki_close __P((void *)); +int emuxki_open(void *, int); +void emuxki_close(void *); -int emuxki_query_encoding __P((void *, struct audio_encoding *)); -int emuxki_set_params __P((void *, int, int, +int emuxki_query_encoding(void *, struct audio_encoding *); +int emuxki_set_params(void *, int, int, struct audio_params *, - struct audio_params *)); + struct audio_params *); -size_t emuxki_round_buffersize __P((void *, int, size_t)); +size_t emuxki_round_buffersize(void *, int, size_t); int emuxki_trigger_output __P((void *, void *, void *, int, void (*)(void *), void *, @@ -186,29 +179,29 @@ int emuxki_trigger_output __P((void *, void *, void *, int, int emuxki_trigger_input __P((void *, void *, void *, int, void (*) (void *), void *, struct audio_params *)); -int emuxki_halt_output __P((void *)); -int emuxki_halt_input __P((void *)); +int emuxki_halt_output(void *); +int emuxki_halt_input(void *); -int emuxki_getdev __P((void *, struct audio_device *)); -int emuxki_set_port __P((void *, mixer_ctrl_t *)); -int emuxki_get_port __P((void *, mixer_ctrl_t *)); -int emuxki_query_devinfo __P((void *, mixer_devinfo_t *)); +int emuxki_getdev(void *, struct audio_device *); +int emuxki_set_port(void *, mixer_ctrl_t *); +int emuxki_get_port(void *, mixer_ctrl_t *); +int emuxki_query_devinfo(void *, mixer_devinfo_t *); -void *emuxki_allocm __P((void *, int, size_t, int, int)); -void emuxki_freem __P((void *, void *, int)); +void *emuxki_allocm(void *, int, size_t, int, int); +void emuxki_freem(void *, void *, int); -paddr_t emuxki_mappage __P((void *, void *, off_t, int)); -int emuxki_get_props __P((void *)); +paddr_t emuxki_mappage(void *, void *, off_t, int); +int emuxki_get_props(void *); /* Interrupt handler */ -int emuxki_intr __P((void *)); +int emuxki_intr(void *); /* Emu10k1 AC97 interface callbacks */ -int emuxki_ac97_init __P((struct emuxki_softc *sc)); -int emuxki_ac97_attach __P((void *, struct ac97_codec_if *)); -int emuxki_ac97_read __P((void *, u_int8_t, u_int16_t *)); -int emuxki_ac97_write __P((void *, u_int8_t, u_int16_t)); -void emuxki_ac97_reset __P((void *)); +int emuxki_ac97_init(struct emuxki_softc *sc); +int emuxki_ac97_attach(void *, struct ac97_codec_if *); +int emuxki_ac97_read(void *, u_int8_t, u_int16_t *); +int emuxki_ac97_write(void *, u_int8_t, u_int16_t); +void emuxki_ac97_reset(void *); /* * Autoconfig goo. diff --git a/sys/dev/pci/eso.c b/sys/dev/pci/eso.c index 6f82e069374..4bc778c2390 100644 --- a/sys/dev/pci/eso.c +++ b/sys/dev/pci/eso.c @@ -1,4 +1,4 @@ -/* $OpenBSD: eso.c,v 1.15 2002/01/20 19:56:53 ericj Exp $ */ +/* $OpenBSD: eso.c,v 1.16 2002/03/14 01:26:58 millert Exp $ */ /* $NetBSD: eso.c,v 1.3 1999/08/02 17:37:43 augustss Exp $ */ /* @@ -101,9 +101,9 @@ struct eso_dma { #define DMAADDR(dma) ((dma)->ed_map->dm_segs[0].ds_addr) /* Autoconfiguration interface */ -HIDE int eso_match __P((struct device *, MATCH_ARG_2_T, void *)); -HIDE void eso_attach __P((struct device *, struct device *, void *)); -HIDE void eso_defer __P((struct device *)); +HIDE int eso_match(struct device *, MATCH_ARG_2_T, void *); +HIDE void eso_attach(struct device *, struct device *, void *); +HIDE void eso_defer(struct device *); struct cfattach eso_ca = { sizeof (struct eso_softc), eso_match, eso_attach @@ -116,26 +116,26 @@ struct cfdriver eso_cd = { #endif /* PCI interface */ -HIDE int eso_intr __P((void *)); +HIDE int eso_intr(void *); /* MI audio layer interface */ -HIDE int eso_open __P((void *, int)); -HIDE void eso_close __P((void *)); -HIDE int eso_query_encoding __P((void *, struct audio_encoding *)); -HIDE int eso_set_params __P((void *, int, int, struct audio_params *, - struct audio_params *)); -HIDE int eso_round_blocksize __P((void *, int)); -HIDE int eso_halt_output __P((void *)); -HIDE int eso_halt_input __P((void *)); -HIDE int eso_getdev __P((void *, struct audio_device *)); -HIDE int eso_set_port __P((void *, mixer_ctrl_t *)); -HIDE int eso_get_port __P((void *, mixer_ctrl_t *)); -HIDE int eso_query_devinfo __P((void *, mixer_devinfo_t *)); -HIDE void * eso_allocm __P((void *, int, size_t, int, int)); -HIDE void eso_freem __P((void *, void *, int)); -HIDE size_t eso_round_buffersize __P((void *, int, size_t)); -HIDE paddr_t eso_mappage __P((void *, void *, off_t, int)); -HIDE int eso_get_props __P((void *)); +HIDE int eso_open(void *, int); +HIDE void eso_close(void *); +HIDE int eso_query_encoding(void *, struct audio_encoding *); +HIDE int eso_set_params(void *, int, int, struct audio_params *, + struct audio_params *); +HIDE int eso_round_blocksize(void *, int); +HIDE int eso_halt_output(void *); +HIDE int eso_halt_input(void *); +HIDE int eso_getdev(void *, struct audio_device *); +HIDE int eso_set_port(void *, mixer_ctrl_t *); +HIDE int eso_get_port(void *, mixer_ctrl_t *); +HIDE int eso_query_devinfo(void *, mixer_devinfo_t *); +HIDE void * eso_allocm(void *, int, size_t, int, int); +HIDE void eso_freem(void *, void *, int); +HIDE size_t eso_round_buffersize(void *, int, size_t); +HIDE paddr_t eso_mappage(void *, void *, off_t, int); +HIDE int eso_get_props(void *); HIDE int eso_trigger_output __P((void *, void *, void *, int, void (*)(void *), void *, struct audio_params *)); HIDE int eso_trigger_input __P((void *, void *, void *, int, @@ -181,19 +181,19 @@ HIDE const char * const eso_rev2model[] = { * Utility routines */ /* Register access etc. */ -HIDE uint8_t eso_read_ctlreg __P((struct eso_softc *, uint8_t)); -HIDE uint8_t eso_read_mixreg __P((struct eso_softc *, uint8_t)); -HIDE uint8_t eso_read_rdr __P((struct eso_softc *)); -HIDE int eso_reset __P((struct eso_softc *)); -HIDE void eso_set_gain __P((struct eso_softc *, unsigned int)); -HIDE int eso_set_recsrc __P((struct eso_softc *, unsigned int)); -HIDE void eso_write_cmd __P((struct eso_softc *, uint8_t)); -HIDE void eso_write_ctlreg __P((struct eso_softc *, uint8_t, uint8_t)); -HIDE void eso_write_mixreg __P((struct eso_softc *, uint8_t, uint8_t)); +HIDE uint8_t eso_read_ctlreg(struct eso_softc *, uint8_t); +HIDE uint8_t eso_read_mixreg(struct eso_softc *, uint8_t); +HIDE uint8_t eso_read_rdr(struct eso_softc *); +HIDE int eso_reset(struct eso_softc *); +HIDE void eso_set_gain(struct eso_softc *, unsigned int); +HIDE int eso_set_recsrc(struct eso_softc *, unsigned int); +HIDE void eso_write_cmd(struct eso_softc *, uint8_t); +HIDE void eso_write_ctlreg(struct eso_softc *, uint8_t, uint8_t); +HIDE void eso_write_mixreg(struct eso_softc *, uint8_t, uint8_t); /* DMA memory allocation */ -HIDE int eso_allocmem __P((struct eso_softc *, size_t, size_t, size_t, - int, struct eso_dma *)); -HIDE void eso_freemem __P((struct eso_softc *, struct eso_dma *)); +HIDE int eso_allocmem(struct eso_softc *, size_t, size_t, size_t, + int, struct eso_dma *); +HIDE void eso_freemem(struct eso_softc *, struct eso_dma *); HIDE int @@ -1604,7 +1604,7 @@ eso_trigger_output(hdl, start, end, blksize, intr, arg, param) void *hdl; void *start, *end; int blksize; - void (*intr) __P((void *)); + void (*intr)(void *); void *arg; struct audio_params *param; { @@ -1679,7 +1679,7 @@ eso_trigger_input(hdl, start, end, blksize, intr, arg, param) void *hdl; void *start, *end; int blksize; - void (*intr) __P((void *)); + void (*intr)(void *); void *arg; struct audio_params *param; { diff --git a/sys/dev/pci/esovar.h b/sys/dev/pci/esovar.h index edca2142725..f0bc97d7d2a 100644 --- a/sys/dev/pci/esovar.h +++ b/sys/dev/pci/esovar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: esovar.h,v 1.1 1999/08/04 23:38:03 niklas Exp $ */ +/* $OpenBSD: esovar.h,v 1.2 2002/03/14 01:26:58 millert Exp $ */ /* $NetBSD: esovar.h,v 1.2 1999/08/02 17:37:43 augustss Exp $ */ /* @@ -118,9 +118,9 @@ struct eso_softc { bus_space_handle_t sc_game_ioh; /* MI audio interface: play/record interrupt callbacks and arguments */ - void (*sc_pintr) __P((void *)); + void (*sc_pintr)(void *); void * sc_parg; - void (*sc_rintr) __P((void *)); + void (*sc_rintr)(void *); void * sc_rarg; /* Audio 2 state */ diff --git a/sys/dev/pci/fms.c b/sys/dev/pci/fms.c index 82852cc41bf..ede1b5da81e 100644 --- a/sys/dev/pci/fms.c +++ b/sys/dev/pci/fms.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fms.c,v 1.6 2002/01/20 19:56:53 ericj Exp $ */ +/* $OpenBSD: fms.c,v 1.7 2002/03/14 01:26:58 millert Exp $ */ /* $NetBSD: fms.c,v 1.5.4.1 2000/06/30 16:27:50 simonb Exp $ */ /*- @@ -76,27 +76,27 @@ struct fms_dma { -int fms_match __P((struct device *, void *, void *)); -void fms_attach __P((struct device *, struct device *, void *)); -int fms_intr __P((void *)); - -int fms_open __P((void *, int)); -void fms_close __P((void *)); -int fms_query_encoding __P((void *, struct audio_encoding *)); -int fms_set_params __P((void *, int, int, struct audio_params *, - struct audio_params *)); -int fms_round_blocksize __P((void *, int)); -int fms_halt_output __P((void *)); -int fms_halt_input __P((void *)); -int fms_getdev __P((void *, struct audio_device *)); -int fms_set_port __P((void *, mixer_ctrl_t *)); -int fms_get_port __P((void *, mixer_ctrl_t *)); -int fms_query_devinfo __P((void *, mixer_devinfo_t *)); -void *fms_malloc __P((void *, int, size_t, int, int)); -void fms_free __P((void *, void *, int)); -size_t fms_round_buffersize __P((void *, int, size_t)); -paddr_t fms_mappage __P((void *, void *, off_t, int)); -int fms_get_props __P((void *)); +int fms_match(struct device *, void *, void *); +void fms_attach(struct device *, struct device *, void *); +int fms_intr(void *); + +int fms_open(void *, int); +void fms_close(void *); +int fms_query_encoding(void *, struct audio_encoding *); +int fms_set_params(void *, int, int, struct audio_params *, + struct audio_params *); +int fms_round_blocksize(void *, int); +int fms_halt_output(void *); +int fms_halt_input(void *); +int fms_getdev(void *, struct audio_device *); +int fms_set_port(void *, mixer_ctrl_t *); +int fms_get_port(void *, mixer_ctrl_t *); +int fms_query_devinfo(void *, mixer_devinfo_t *); +void *fms_malloc(void *, int, size_t, int, int); +void fms_free(void *, void *, int); +size_t fms_round_buffersize(void *, int, size_t); +paddr_t fms_mappage(void *, void *, off_t, int); +int fms_get_props(void *); int fms_trigger_output __P((void *, void *, void *, int, void (*)(void *), void *, struct audio_params *)); int fms_trigger_input __P((void *, void *, void *, int, void (*)(void *), @@ -146,14 +146,14 @@ struct audio_hw_if fms_hw_if = { fms_trigger_input }; -int fms_attach_codec __P((void *, struct ac97_codec_if *)); -int fms_read_codec __P((void *, u_int8_t, u_int16_t *)); -int fms_write_codec __P((void *, u_int8_t, u_int16_t)); -void fms_reset_codec __P((void *)); +int fms_attach_codec(void *, struct ac97_codec_if *); +int fms_read_codec(void *, u_int8_t, u_int16_t *); +int fms_write_codec(void *, u_int8_t, u_int16_t); +void fms_reset_codec(void *); -int fms_allocmem __P((struct fms_softc *, size_t, size_t, - struct fms_dma *)); -int fms_freemem __P((struct fms_softc *, struct fms_dma *)); +int fms_allocmem(struct fms_softc *, size_t, size_t, + struct fms_dma *); +int fms_freemem(struct fms_softc *, struct fms_dma *); #define FM_PCM_VOLUME 0x00 #define FM_FM_VOLUME 0x02 @@ -895,7 +895,7 @@ fms_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; { @@ -933,7 +933,7 @@ fms_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/pci/gdt_pci.c b/sys/dev/pci/gdt_pci.c index 41f816cc580..079bccf0e80 100644 --- a/sys/dev/pci/gdt_pci.c +++ b/sys/dev/pci/gdt_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gdt_pci.c,v 1.13 2001/08/25 10:13:29 art Exp $ */ +/* $OpenBSD: gdt_pci.c,v 1.14 2002/03/14 01:26:58 millert Exp $ */ /* * Copyright (c) 1999, 2000 Niklas Hallqvist. All rights reserved. @@ -119,30 +119,30 @@ /* SRAM structure */ #define GDT_MPR_SZ 0x4000 -int gdt_pci_probe __P((struct device *, void *, void *)); -void gdt_pci_attach __P((struct device *, struct device *, void *)); -void gdt_pci_enable_intr __P((struct gdt_softc *)); - -void gdt_pci_copy_cmd __P((struct gdt_softc *, struct gdt_ccb *)); -u_int8_t gdt_pci_get_status __P((struct gdt_softc *)); -void gdt_pci_intr __P((struct gdt_softc *, struct gdt_intr_ctx *)); -void gdt_pci_release_event __P((struct gdt_softc *, struct gdt_ccb *)); -void gdt_pci_set_sema0 __P((struct gdt_softc *)); -int gdt_pci_test_busy __P((struct gdt_softc *)); - -void gdt_pcinew_copy_cmd __P((struct gdt_softc *, struct gdt_ccb *)); -u_int8_t gdt_pcinew_get_status __P((struct gdt_softc *)); -void gdt_pcinew_intr __P((struct gdt_softc *, struct gdt_intr_ctx *)); -void gdt_pcinew_release_event __P((struct gdt_softc *, struct gdt_ccb *)); -void gdt_pcinew_set_sema0 __P((struct gdt_softc *)); -int gdt_pcinew_test_busy __P((struct gdt_softc *)); - -void gdt_mpr_copy_cmd __P((struct gdt_softc *, struct gdt_ccb *)); -u_int8_t gdt_mpr_get_status __P((struct gdt_softc *)); -void gdt_mpr_intr __P((struct gdt_softc *, struct gdt_intr_ctx *)); -void gdt_mpr_release_event __P((struct gdt_softc *, struct gdt_ccb *)); -void gdt_mpr_set_sema0 __P((struct gdt_softc *)); -int gdt_mpr_test_busy __P((struct gdt_softc *)); +int gdt_pci_probe(struct device *, void *, void *); +void gdt_pci_attach(struct device *, struct device *, void *); +void gdt_pci_enable_intr(struct gdt_softc *); + +void gdt_pci_copy_cmd(struct gdt_softc *, struct gdt_ccb *); +u_int8_t gdt_pci_get_status(struct gdt_softc *); +void gdt_pci_intr(struct gdt_softc *, struct gdt_intr_ctx *); +void gdt_pci_release_event(struct gdt_softc *, struct gdt_ccb *); +void gdt_pci_set_sema0(struct gdt_softc *); +int gdt_pci_test_busy(struct gdt_softc *); + +void gdt_pcinew_copy_cmd(struct gdt_softc *, struct gdt_ccb *); +u_int8_t gdt_pcinew_get_status(struct gdt_softc *); +void gdt_pcinew_intr(struct gdt_softc *, struct gdt_intr_ctx *); +void gdt_pcinew_release_event(struct gdt_softc *, struct gdt_ccb *); +void gdt_pcinew_set_sema0(struct gdt_softc *); +int gdt_pcinew_test_busy(struct gdt_softc *); + +void gdt_mpr_copy_cmd(struct gdt_softc *, struct gdt_ccb *); +u_int8_t gdt_mpr_get_status(struct gdt_softc *); +void gdt_mpr_intr(struct gdt_softc *, struct gdt_intr_ctx *); +void gdt_mpr_release_event(struct gdt_softc *, struct gdt_ccb *); +void gdt_mpr_set_sema0(struct gdt_softc *); +int gdt_mpr_test_busy(struct gdt_softc *); struct cfattach gdt_pci_ca = { sizeof (struct gdt_softc), gdt_pci_probe, gdt_pci_attach diff --git a/sys/dev/pci/hifn7751.c b/sys/dev/pci/hifn7751.c index 3cc2e44666c..0f093f0225a 100644 --- a/sys/dev/pci/hifn7751.c +++ b/sys/dev/pci/hifn7751.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hifn7751.c,v 1.114 2002/01/31 21:17:37 jason Exp $ */ +/* $OpenBSD: hifn7751.c,v 1.115 2002/03/14 01:26:58 millert Exp $ */ /* * Invertex AEON / Hifn 7751 driver @@ -65,8 +65,8 @@ /* * Prototypes and count for the pci_device structure */ -int hifn_probe __P((struct device *, void *, void *)); -void hifn_attach __P((struct device *, struct device *, void *)); +int hifn_probe(struct device *, void *, void *); +void hifn_attach(struct device *, struct device *, void *); struct cfattach hifn_ca = { sizeof(struct hifn_softc), hifn_probe, hifn_attach, @@ -76,34 +76,34 @@ struct cfdriver hifn_cd = { 0, "hifn", DV_DULL }; -void hifn_reset_board __P((struct hifn_softc *, int)); -void hifn_reset_puc __P((struct hifn_softc *)); -void hifn_puc_wait __P((struct hifn_softc *)); -int hifn_enable_crypto __P((struct hifn_softc *, pcireg_t)); -void hifn_init_dma __P((struct hifn_softc *)); -void hifn_init_pci_registers __P((struct hifn_softc *)); -int hifn_sramsize __P((struct hifn_softc *)); -int hifn_dramsize __P((struct hifn_softc *)); -int hifn_ramtype __P((struct hifn_softc *)); -void hifn_sessions __P((struct hifn_softc *)); -int hifn_intr __P((void *)); -u_int hifn_write_command __P((struct hifn_command *, u_int8_t *)); -u_int32_t hifn_next_signature __P((u_int32_t a, u_int cnt)); -int hifn_newsession __P((u_int32_t *, struct cryptoini *)); -int hifn_freesession __P((u_int64_t)); -int hifn_process __P((struct cryptop *)); -void hifn_callback __P((struct hifn_softc *, struct hifn_command *, u_int8_t *)); -int hifn_crypto __P((struct hifn_softc *, struct hifn_command *, struct cryptop *)); -int hifn_readramaddr __P((struct hifn_softc *, int, u_int8_t *)); -int hifn_writeramaddr __P((struct hifn_softc *, int, u_int8_t *)); -int hifn_dmamap_aligned __P((bus_dmamap_t)); -int hifn_dmamap_load_src __P((struct hifn_softc *, struct hifn_command *)); -int hifn_dmamap_load_dst __P((struct hifn_softc *, struct hifn_command *)); -int hifn_init_pubrng __P((struct hifn_softc *)); -void hifn_rng __P((void *)); -void hifn_tick __P((void *)); -void hifn_abort __P((struct hifn_softc *)); -void hifn_alloc_slot __P((struct hifn_softc *, int *, int *, int *, int *)); +void hifn_reset_board(struct hifn_softc *, int); +void hifn_reset_puc(struct hifn_softc *); +void hifn_puc_wait(struct hifn_softc *); +int hifn_enable_crypto(struct hifn_softc *, pcireg_t); +void hifn_init_dma(struct hifn_softc *); +void hifn_init_pci_registers(struct hifn_softc *); +int hifn_sramsize(struct hifn_softc *); +int hifn_dramsize(struct hifn_softc *); +int hifn_ramtype(struct hifn_softc *); +void hifn_sessions(struct hifn_softc *); +int hifn_intr(void *); +u_int hifn_write_command(struct hifn_command *, u_int8_t *); +u_int32_t hifn_next_signature(u_int32_t a, u_int cnt); +int hifn_newsession(u_int32_t *, struct cryptoini *); +int hifn_freesession(u_int64_t); +int hifn_process(struct cryptop *); +void hifn_callback(struct hifn_softc *, struct hifn_command *, u_int8_t *); +int hifn_crypto(struct hifn_softc *, struct hifn_command *, struct cryptop *); +int hifn_readramaddr(struct hifn_softc *, int, u_int8_t *); +int hifn_writeramaddr(struct hifn_softc *, int, u_int8_t *); +int hifn_dmamap_aligned(bus_dmamap_t); +int hifn_dmamap_load_src(struct hifn_softc *, struct hifn_command *); +int hifn_dmamap_load_dst(struct hifn_softc *, struct hifn_command *); +int hifn_init_pubrng(struct hifn_softc *); +void hifn_rng(void *); +void hifn_tick(void *); +void hifn_abort(struct hifn_softc *); +void hifn_alloc_slot(struct hifn_softc *, int *, int *, int *, int *); struct hifn_stats hifnstats; diff --git a/sys/dev/pci/i82365_pci.c b/sys/dev/pci/i82365_pci.c index a6d105ec05e..491758add78 100644 --- a/sys/dev/pci/i82365_pci.c +++ b/sys/dev/pci/i82365_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: i82365_pci.c,v 1.5 2001/09/21 17:55:43 miod Exp $ */ +/* $OpenBSD: i82365_pci.c,v 1.6 2002/03/14 01:26:58 millert Exp $ */ /* $NetBSD: i82365_pci.c,v 1.11 2000/02/24 03:42:44 itohy Exp $ */ /* @@ -57,8 +57,8 @@ */ #define PCI_CBIO 0x10 /* Configuration Base IO Address */ -int pcic_pci_match __P((struct device *, void *, void *)); -void pcic_pci_attach __P((struct device *, struct device *, void *)); +int pcic_pci_match(struct device *, void *, void *); +void pcic_pci_attach(struct device *, struct device *, void *); struct cfattach pcic_pci_ca = { sizeof(struct pcic_pci_softc), pcic_pci_match, pcic_pci_attach @@ -106,7 +106,7 @@ pcic_pci_match(parent, match, aux) return (1); } -void pcic_isa_config_interrupts __P((struct device *)); +void pcic_isa_config_interrupts(struct device *); void pcic_pci_attach(parent, self, aux) diff --git a/sys/dev/pci/i82365_pcivar.h b/sys/dev/pci/i82365_pcivar.h index 6c0eda83b02..0052b3f2a53 100644 --- a/sys/dev/pci/i82365_pcivar.h +++ b/sys/dev/pci/i82365_pcivar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: i82365_pcivar.h,v 1.3 2001/08/17 21:52:16 deraadt Exp $ */ +/* $OpenBSD: i82365_pcivar.h,v 1.4 2002/03/14 01:26:58 millert Exp $ */ /* $NetBSD: i82365_pcivar.h,v 1.2 2000/02/22 16:04:47 thorpej Exp $ */ /* @@ -43,14 +43,14 @@ struct pcic_pci_softc { * Establish/disestablish interrupts for PCMCIA functions. */ -void *pcic_pci_machdep_intr_est __P((pci_chipset_tag_t)); +void *pcic_pci_machdep_intr_est(pci_chipset_tag_t); void *pcic_pci_machdep_pcic_intr_establish __P((struct pcic_softc *, - int (*) __P((void *)))); + int (*)(void *))); void *pcic_pci_machdep_chip_intr_establish __P((pcmcia_chipset_handle_t, struct pcmcia_function *, - int, int (*) __P((void *)), + int, int (*)(void *), void *, char *)); -void pcic_pci_machdep_chip_intr_disestablish __P((pcmcia_chipset_handle_t, - void *)); +void pcic_pci_machdep_chip_intr_disestablish(pcmcia_chipset_handle_t, + void *); diff --git a/sys/dev/pci/if_an_pci.c b/sys/dev/pci/if_an_pci.c index fb70b138608..536e1076177 100644 --- a/sys/dev/pci/if_an_pci.c +++ b/sys/dev/pci/if_an_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_an_pci.c,v 1.6 2001/09/29 21:54:00 mickey Exp $ */ +/* $OpenBSD: if_an_pci.c,v 1.7 2002/03/14 01:26:58 millert Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -80,8 +80,8 @@ #define AN_PCI_PLX_LOIO 0x14 /* PLX chip iobase */ #define AN_PCI_LOIO 0x18 /* Aironet iobase */ -int an_pci_match __P((struct device *, void *, void *)); -void an_pci_attach __P((struct device *, struct device *, void *)); +int an_pci_match(struct device *, void *, void *); +void an_pci_attach(struct device *, struct device *, void *); struct cfattach an_pci_ca = { sizeof (struct an_softc), an_pci_match, an_pci_attach diff --git a/sys/dev/pci/if_bge.c b/sys/dev/pci/if_bge.c index bcd08be204c..9f23a2ea674 100644 --- a/sys/dev/pci/if_bge.c +++ b/sys/dev/pci/if_bge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_bge.c,v 1.7 2002/03/12 09:51:20 kjc Exp $ */ +/* $OpenBSD: if_bge.c,v 1.8 2002/03/14 01:26:58 millert Exp $ */ /* * Copyright (c) 2001 Wind River Systems * Copyright (c) 1997, 1998, 1999, 2001 @@ -117,67 +117,67 @@ /* #define BGE_CHECKSUM */ -int bge_probe __P((struct device *, void *, void *)); -void bge_attach __P((struct device *, struct device *, void *)); -void bge_release_resources __P((struct bge_softc *)); -void bge_txeof __P((struct bge_softc *)); -void bge_rxeof __P((struct bge_softc *)); - -void bge_tick __P((void *)); -void bge_stats_update __P((struct bge_softc *)); -int bge_encap __P((struct bge_softc *, struct mbuf *, u_int32_t *)); - -int bge_intr __P((void *)); -void bge_start __P((struct ifnet *)); -int bge_ioctl __P((struct ifnet *, u_long, caddr_t)); -void bge_init __P((void *)); -void bge_stop __P((struct bge_softc *)); -void bge_watchdog __P((struct ifnet *)); -void bge_shutdown __P((void *)); -int bge_ifmedia_upd __P((struct ifnet *)); -void bge_ifmedia_sts __P((struct ifnet *, struct ifmediareq *)); - -u_int8_t bge_eeprom_getbyte __P((struct bge_softc *, - int, u_int8_t *)); -int bge_read_eeprom __P((struct bge_softc *, caddr_t, int, int)); - -u_int32_t bge_crc __P((struct bge_softc *, caddr_t)); -void bge_setmulti __P((struct bge_softc *)); - -void bge_handle_events __P((struct bge_softc *)); -int bge_alloc_jumbo_mem __P((struct bge_softc *)); -void bge_free_jumbo_mem __P((struct bge_softc *)); -void *bge_jalloc __P((struct bge_softc *)); -void bge_jfree __P((caddr_t, u_int, void *)); -int bge_newbuf_std __P((struct bge_softc *, int, struct mbuf *)); -int bge_newbuf_jumbo __P((struct bge_softc *, int, struct mbuf *)); -int bge_init_rx_ring_std __P((struct bge_softc *)); -void bge_free_rx_ring_std __P((struct bge_softc *)); -int bge_init_rx_ring_jumbo __P((struct bge_softc *)); -void bge_free_rx_ring_jumbo __P((struct bge_softc *)); -void bge_free_tx_ring __P((struct bge_softc *)); -int bge_init_tx_ring __P((struct bge_softc *)); - -int bge_chipinit __P((struct bge_softc *)); -int bge_blockinit __P((struct bge_softc *)); - -u_int8_t bge_vpd_readbyte __P((struct bge_softc *, int)); -void bge_vpd_read_res __P((struct bge_softc *, struct vpd_res *, int)); -void bge_vpd_read __P((struct bge_softc *)); - -u_int32_t bge_readmem_ind __P((struct bge_softc *, int)); -void bge_writemem_ind __P((struct bge_softc *, int, int)); +int bge_probe(struct device *, void *, void *); +void bge_attach(struct device *, struct device *, void *); +void bge_release_resources(struct bge_softc *); +void bge_txeof(struct bge_softc *); +void bge_rxeof(struct bge_softc *); + +void bge_tick(void *); +void bge_stats_update(struct bge_softc *); +int bge_encap(struct bge_softc *, struct mbuf *, u_int32_t *); + +int bge_intr(void *); +void bge_start(struct ifnet *); +int bge_ioctl(struct ifnet *, u_long, caddr_t); +void bge_init(void *); +void bge_stop(struct bge_softc *); +void bge_watchdog(struct ifnet *); +void bge_shutdown(void *); +int bge_ifmedia_upd(struct ifnet *); +void bge_ifmedia_sts(struct ifnet *, struct ifmediareq *); + +u_int8_t bge_eeprom_getbyte(struct bge_softc *, + int, u_int8_t *); +int bge_read_eeprom(struct bge_softc *, caddr_t, int, int); + +u_int32_t bge_crc(struct bge_softc *, caddr_t); +void bge_setmulti(struct bge_softc *); + +void bge_handle_events(struct bge_softc *); +int bge_alloc_jumbo_mem(struct bge_softc *); +void bge_free_jumbo_mem(struct bge_softc *); +void *bge_jalloc(struct bge_softc *); +void bge_jfree(caddr_t, u_int, void *); +int bge_newbuf_std(struct bge_softc *, int, struct mbuf *); +int bge_newbuf_jumbo(struct bge_softc *, int, struct mbuf *); +int bge_init_rx_ring_std(struct bge_softc *); +void bge_free_rx_ring_std(struct bge_softc *); +int bge_init_rx_ring_jumbo(struct bge_softc *); +void bge_free_rx_ring_jumbo(struct bge_softc *); +void bge_free_tx_ring(struct bge_softc *); +int bge_init_tx_ring(struct bge_softc *); + +int bge_chipinit(struct bge_softc *); +int bge_blockinit(struct bge_softc *); + +u_int8_t bge_vpd_readbyte(struct bge_softc *, int); +void bge_vpd_read_res(struct bge_softc *, struct vpd_res *, int); +void bge_vpd_read(struct bge_softc *); + +u_int32_t bge_readmem_ind(struct bge_softc *, int); +void bge_writemem_ind(struct bge_softc *, int, int); #ifdef notdef -u_int32_t bge_readreg_ind __P((struct bge_softc *, int)); +u_int32_t bge_readreg_ind(struct bge_softc *, int); #endif -void bge_writereg_ind __P((struct bge_softc *, int, int)); +void bge_writereg_ind(struct bge_softc *, int, int); -int bge_miibus_readreg __P((struct device *, int, int)); -void bge_miibus_writereg __P((struct device *, int, int, int)); -void bge_miibus_statchg __P((struct device *)); +int bge_miibus_readreg(struct device *, int, int); +void bge_miibus_writereg(struct device *, int, int, int); +void bge_miibus_statchg(struct device *); -void bge_reset __P((struct bge_softc *)); -void bge_phy_hack __P((struct bge_softc *)); +void bge_reset(struct bge_softc *); +void bge_phy_hack(struct bge_softc *); #define BGE_DEBUG #ifdef BGE_DEBUG diff --git a/sys/dev/pci/if_dc_pci.c b/sys/dev/pci/if_dc_pci.c index fdac0cbc589..b89796b6fba 100644 --- a/sys/dev/pci/if_dc_pci.c +++ b/sys/dev/pci/if_dc_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_dc_pci.c,v 1.27 2002/03/06 23:14:17 nate Exp $ */ +/* $OpenBSD: if_dc_pci.c,v 1.28 2002/03/14 01:26:58 millert Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -98,13 +98,13 @@ struct dc_type dc_devs[] = { { 0, 0 } }; -int dc_pci_match __P((struct device *, void *, void *)); -void dc_pci_attach __P((struct device *, struct device *, void *)); -void dc_pci_acpi __P((struct device *, void *)); +int dc_pci_match(struct device *, void *, void *); +void dc_pci_attach(struct device *, struct device *, void *); +void dc_pci_acpi(struct device *, void *); -extern void dc_eeprom_width __P((struct dc_softc *)); -extern void dc_read_srom __P((struct dc_softc *, int)); -extern void dc_parse_21143_srom __P((struct dc_softc *)); +extern void dc_eeprom_width(struct dc_softc *); +extern void dc_read_srom(struct dc_softc *, int); +extern void dc_parse_21143_srom(struct dc_softc *); /* * Probe for a 21143 or clone chip. Check the PCI vendor and device @@ -463,7 +463,7 @@ void dc_pci_attach(parent, self, aux) #ifdef __sparc64__ { - extern void myetheraddr __P((u_char *)); + extern void myetheraddr(u_char *); myetheraddr(sc->arpcom.ac_enaddr); sc->sc_hasmac = 1; } diff --git a/sys/dev/pci/if_en_pci.c b/sys/dev/pci/if_en_pci.c index a95ad7d0093..4797a0f0a1d 100644 --- a/sys/dev/pci/if_en_pci.c +++ b/sys/dev/pci/if_en_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_en_pci.c,v 1.8 2001/08/25 10:13:29 art Exp $ */ +/* $OpenBSD: if_en_pci.c,v 1.9 2002/03/14 01:26:58 millert Exp $ */ /* * @@ -110,11 +110,11 @@ struct en_pci_softc { */ #ifdef __BROKEN_INDIRECT_CONFIG -static int en_pci_match __P((struct device *, void *, void *)); +static int en_pci_match(struct device *, void *, void *); #else -static int en_pci_match __P((struct device *, struct cfdata *, void *)); +static int en_pci_match(struct device *, struct cfdata *, void *); #endif -static void en_pci_attach __P((struct device *, struct device *, void *)); +static void en_pci_attach(struct device *, struct device *, void *); /* * PCI autoconfig attachments @@ -126,7 +126,7 @@ struct cfattach en_pci_ca = { #if !defined(MIDWAY_ENIONLY) -static void adp_busreset __P((void *)); +static void adp_busreset(void *); /* * bus specific reset function [ADP only!] diff --git a/sys/dev/pci/if_ep_pci.c b/sys/dev/pci/if_ep_pci.c index bbbbe43227d..6e778e51824 100644 --- a/sys/dev/pci/if_ep_pci.c +++ b/sys/dev/pci/if_ep_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ep_pci.c,v 1.20 2001/08/25 10:13:29 art Exp $ */ +/* $OpenBSD: if_ep_pci.c,v 1.21 2002/03/14 01:26:58 millert Exp $ */ /* $NetBSD: if_ep_pci.c,v 1.13 1996/10/21 22:56:38 thorpej Exp $ */ /* @@ -82,8 +82,8 @@ #define PCI_CONN 0x48 /* Connector type */ #define PCI_CBIO 0x10 /* Configuration Base IO Address */ -int ep_pci_match __P((struct device *, void *, void *)); -void ep_pci_attach __P((struct device *, struct device *, void *)); +int ep_pci_match(struct device *, void *, void *); +void ep_pci_attach(struct device *, struct device *, void *); struct cfattach ep_pci_ca = { sizeof(struct ep_softc), ep_pci_match, ep_pci_attach diff --git a/sys/dev/pci/if_fpa.c b/sys/dev/pci/if_fpa.c index 421168ccb34..a7eb85fd068 100644 --- a/sys/dev/pci/if_fpa.c +++ b/sys/dev/pci/if_fpa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_fpa.c,v 1.17 2001/11/06 19:53:19 miod Exp $ */ +/* $OpenBSD: if_fpa.c,v 1.18 2002/03/14 01:26:58 millert Exp $ */ /* $NetBSD: if_fpa.c,v 1.15 1996/10/21 22:56:40 thorpej Exp $ */ /*- @@ -73,9 +73,9 @@ #define DEFPA_CBMA (PCI_MAPREG_START + 0) /* Config Base Memory Address */ #define DEFPA_CBIO (PCI_MAPREG_START + 4) /* Config Base I/O Address */ -int pdq_pci_ifintr __P((void *)); -int pdq_pci_match __P((struct device *, void *, void *)); -void pdq_pci_attach __P((struct device *, struct device *, void *aux)); +int pdq_pci_ifintr(void *); +int pdq_pci_match(struct device *, void *, void *); +void pdq_pci_attach(struct device *, struct device *, void *aux); int pdq_pci_ifintr(arg) diff --git a/sys/dev/pci/if_fxp_pci.c b/sys/dev/pci/if_fxp_pci.c index 191d298121f..50de486bb8b 100644 --- a/sys/dev/pci/if_fxp_pci.c +++ b/sys/dev/pci/if_fxp_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_fxp_pci.c,v 1.11 2001/11/06 19:53:19 miod Exp $ */ +/* $OpenBSD: if_fxp_pci.c,v 1.12 2002/03/14 01:26:58 millert Exp $ */ /* * Copyright (c) 1995, David Greenman @@ -79,8 +79,8 @@ #include <dev/pci/pcireg.h> #include <dev/pci/pcidevs.h> -int fxp_pci_match __P((struct device *, void *, void *)); -void fxp_pci_attach __P((struct device *, struct device *, void *)); +int fxp_pci_match(struct device *, void *, void *); +void fxp_pci_attach(struct device *, struct device *, void *); struct cfattach fxp_pci_ca = { sizeof(struct fxp_softc), fxp_pci_match, fxp_pci_attach diff --git a/sys/dev/pci/if_gem_pci.c b/sys/dev/pci/if_gem_pci.c index 135576f4c1a..720f1e70bba 100644 --- a/sys/dev/pci/if_gem_pci.c +++ b/sys/dev/pci/if_gem_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_gem_pci.c,v 1.7 2002/02/22 20:15:28 jason Exp $ */ +/* $OpenBSD: if_gem_pci.c,v 1.8 2002/03/14 01:26:58 millert Exp $ */ /* $NetBSD: if_gem_pci.c,v 1.1 2001/09/16 00:11:42 eeh Exp $ */ /* @@ -80,8 +80,8 @@ struct gem_pci_softc { void *gsc_ih; }; -int gem_match_pci __P((struct device *, void *, void *)); -void gem_attach_pci __P((struct device *, struct device *, void *)); +int gem_match_pci(struct device *, void *, void *); +void gem_attach_pci(struct device *, struct device *, void *); struct cfattach gem_pci_ca = { sizeof(struct gem_pci_softc), gem_match_pci, gem_attach_pci @@ -123,7 +123,7 @@ gem_attach_pci(parent, self, aux) pci_intr_handle_t intrhandle; #ifdef __sparc__ /* XXX the following declarations should be elsewhere */ - extern void myetheraddr __P((u_char *)); + extern void myetheraddr(u_char *); #endif const char *intrstr; int type; diff --git a/sys/dev/pci/if_hme_pci.c b/sys/dev/pci/if_hme_pci.c index 5740d6416f1..215586a9046 100644 --- a/sys/dev/pci/if_hme_pci.c +++ b/sys/dev/pci/if_hme_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_hme_pci.c,v 1.5 2002/03/13 21:02:54 jason Exp $ */ +/* $OpenBSD: if_hme_pci.c,v 1.6 2002/03/14 01:26:58 millert Exp $ */ /* $NetBSD: if_hme_pci.c,v 1.3 2000/12/28 22:59:13 sommerfeld Exp $ */ /* @@ -74,8 +74,8 @@ struct hme_pci_softc { void *hsc_ih; }; -int hmematch_pci __P((struct device *, void *, void *)); -void hmeattach_pci __P((struct device *, struct device *, void *)); +int hmematch_pci(struct device *, void *, void *); +void hmeattach_pci(struct device *, struct device *, void *); struct cfattach hme_pci_ca = { sizeof(struct hme_pci_softc), hmematch_pci, hmeattach_pci @@ -106,7 +106,7 @@ hmeattach_pci(parent, self, aux) struct hme_softc *sc = &hsc->hsc_hme; pci_intr_handle_t intrhandle; /* XXX the following declarations should be elsewhere */ - extern void myetheraddr __P((u_char *)); + extern void myetheraddr(u_char *); pcireg_t csr; const char *intrstr; int type; diff --git a/sys/dev/pci/if_le_pci.c b/sys/dev/pci/if_le_pci.c index 2ec2ba0706e..44eb057ed04 100644 --- a/sys/dev/pci/if_le_pci.c +++ b/sys/dev/pci/if_le_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_le_pci.c,v 1.18 2001/11/06 19:53:19 miod Exp $ */ +/* $OpenBSD: if_le_pci.c,v 1.19 2002/03/14 01:26:58 millert Exp $ */ /* $NetBSD: if_le_pci.c,v 1.13 1996/10/25 21:33:32 cgd Exp $ */ /*- @@ -78,15 +78,15 @@ #define vtophys(va) alpha_XXX_dmamap((vm_offset_t)(va)) #endif -int le_pci_match __P((struct device *, void *, void *)); -void le_pci_attach __P((struct device *, struct device *, void *)); +int le_pci_match(struct device *, void *, void *); +void le_pci_attach(struct device *, struct device *, void *); struct cfattach le_pci_ca = { sizeof(struct le_softc), le_pci_match, le_pci_attach }; -hide void le_pci_wrcsr __P((struct am7990_softc *, u_int16_t, u_int16_t)); -hide u_int16_t le_pci_rdcsr __P((struct am7990_softc *, u_int16_t)); +hide void le_pci_wrcsr(struct am7990_softc *, u_int16_t, u_int16_t); +hide u_int16_t le_pci_rdcsr(struct am7990_softc *, u_int16_t); /* * PCI constants. diff --git a/sys/dev/pci/if_lge.c b/sys/dev/pci/if_lge.c index 44e02520d77..3d619f108e5 100644 --- a/sys/dev/pci/if_lge.c +++ b/sys/dev/pci/if_lge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_lge.c,v 1.8 2002/03/12 09:51:20 kjc Exp $ */ +/* $OpenBSD: if_lge.c,v 1.9 2002/03/14 01:26:58 millert Exp $ */ /* * Copyright (c) 2001 Wind River Systems * Copyright (c) 1997, 1998, 1999, 2000, 2001 @@ -120,43 +120,43 @@ #include <dev/pci/if_lgereg.h> -int lge_probe __P((struct device *, void *, void *)); -void lge_attach __P((struct device *, struct device *, void *)); - -int lge_alloc_jumbo_mem __P((struct lge_softc *)); -void lge_free_jumbo_mem __P((struct lge_softc *)); -void *lge_jalloc __P((struct lge_softc *)); -void lge_jfree __P((caddr_t, u_int, void *)); - -int lge_newbuf __P((struct lge_softc *, struct lge_rx_desc *, - struct mbuf *)); -int lge_encap __P((struct lge_softc *, struct mbuf *, u_int32_t *)); -void lge_rxeof __P((struct lge_softc *, int)); -void lge_rxeoc __P((struct lge_softc *)); -void lge_txeof __P((struct lge_softc *)); -int lge_intr __P((void *)); -void lge_tick __P((void *)); -void lge_start __P((struct ifnet *)); -int lge_ioctl __P((struct ifnet *, u_long, caddr_t)); -void lge_init __P((void *)); -void lge_stop __P((struct lge_softc *)); -void lge_watchdog __P((struct ifnet *)); -void lge_shutdown __P((void *)); -int lge_ifmedia_upd __P((struct ifnet *)); -void lge_ifmedia_sts __P((struct ifnet *, struct ifmediareq *)); - -void lge_eeprom_getword __P((struct lge_softc *, int, u_int16_t *)); -void lge_read_eeprom __P((struct lge_softc *, caddr_t, int, int, int)); - -int lge_miibus_readreg __P((struct device *, int, int)); -void lge_miibus_writereg __P((struct device *, int, int, int)); -void lge_miibus_statchg __P((struct device *)); - -void lge_setmulti __P((struct lge_softc *)); -u_int32_t lge_crc __P((struct lge_softc *, caddr_t)); -void lge_reset __P((struct lge_softc *)); -int lge_list_rx_init __P((struct lge_softc *)); -int lge_list_tx_init __P((struct lge_softc *)); +int lge_probe(struct device *, void *, void *); +void lge_attach(struct device *, struct device *, void *); + +int lge_alloc_jumbo_mem(struct lge_softc *); +void lge_free_jumbo_mem(struct lge_softc *); +void *lge_jalloc(struct lge_softc *); +void lge_jfree(caddr_t, u_int, void *); + +int lge_newbuf(struct lge_softc *, struct lge_rx_desc *, + struct mbuf *); +int lge_encap(struct lge_softc *, struct mbuf *, u_int32_t *); +void lge_rxeof(struct lge_softc *, int); +void lge_rxeoc(struct lge_softc *); +void lge_txeof(struct lge_softc *); +int lge_intr(void *); +void lge_tick(void *); +void lge_start(struct ifnet *); +int lge_ioctl(struct ifnet *, u_long, caddr_t); +void lge_init(void *); +void lge_stop(struct lge_softc *); +void lge_watchdog(struct ifnet *); +void lge_shutdown(void *); +int lge_ifmedia_upd(struct ifnet *); +void lge_ifmedia_sts(struct ifnet *, struct ifmediareq *); + +void lge_eeprom_getword(struct lge_softc *, int, u_int16_t *); +void lge_read_eeprom(struct lge_softc *, caddr_t, int, int, int); + +int lge_miibus_readreg(struct device *, int, int); +void lge_miibus_writereg(struct device *, int, int, int); +void lge_miibus_statchg(struct device *); + +void lge_setmulti(struct lge_softc *); +u_int32_t lge_crc(struct lge_softc *, caddr_t); +void lge_reset(struct lge_softc *); +int lge_list_rx_init(struct lge_softc *); +int lge_list_tx_init(struct lge_softc *); #ifdef LGE_USEIOSPACE #define LGE_RES SYS_RES_IOPORT diff --git a/sys/dev/pci/if_ne_pci.c b/sys/dev/pci/if_ne_pci.c index 0dce398ddbb..703000bad9a 100644 --- a/sys/dev/pci/if_ne_pci.c +++ b/sys/dev/pci/if_ne_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ne_pci.c,v 1.10 2001/08/25 10:13:29 art Exp $ */ +/* $OpenBSD: if_ne_pci.c,v 1.11 2002/03/14 01:26:58 millert Exp $ */ /* $NetBSD: if_ne_pci.c,v 1.8 1998/07/05 00:51:24 jonathan Exp $ */ /*- @@ -87,8 +87,8 @@ struct ne_pci_softc { void *sc_ih; /* interrupt handle */ }; -int ne_pci_match __P((struct device *, void *, void *)); -void ne_pci_attach __P((struct device *, struct device *, void *)); +int ne_pci_match(struct device *, void *, void *); +void ne_pci_attach(struct device *, struct device *, void *); struct cfattach ne_pci_ca = { sizeof(struct ne_pci_softc), ne_pci_match, ne_pci_attach @@ -97,11 +97,11 @@ struct cfattach ne_pci_ca = { const struct ne_pci_product { pci_vendor_id_t npp_vendor; pci_product_id_t npp_product; - int (*npp_mediachange) __P((struct dp8390_softc *)); - void (*npp_mediastatus) __P((struct dp8390_softc *, - struct ifmediareq *)); - void (*npp_init_card) __P((struct dp8390_softc *)); - void (*npp_media_init) __P((struct dp8390_softc *)); + int (*npp_mediachange)(struct dp8390_softc *); + void (*npp_mediastatus)(struct dp8390_softc *, + struct ifmediareq *); + void (*npp_init_card)(struct dp8390_softc *); + void (*npp_media_init)(struct dp8390_softc *); } ne_pci_prod[] = { { PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RT8029, rtl80x9_mediachange, rtl80x9_mediastatus, @@ -145,7 +145,7 @@ const struct ne_pci_product { /* KTI */ }, }; -const struct ne_pci_product *ne_pci_lookup __P((struct pci_attach_args *)); +const struct ne_pci_product *ne_pci_lookup(struct pci_attach_args *); const struct ne_pci_product * ne_pci_lookup(pa) diff --git a/sys/dev/pci/if_nge.c b/sys/dev/pci/if_nge.c index 68ca63f24ff..4e9461820e1 100644 --- a/sys/dev/pci/if_nge.c +++ b/sys/dev/pci/if_nge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_nge.c,v 1.17 2002/03/12 09:51:20 kjc Exp $ */ +/* $OpenBSD: if_nge.c,v 1.18 2002/03/14 01:26:59 millert Exp $ */ /* * Copyright (c) 2001 Wind River Systems * Copyright (c) 1997, 1998, 1999, 2000, 2001 @@ -134,50 +134,50 @@ #include <dev/pci/if_ngereg.h> -int nge_probe __P((struct device *, void *, void *)); -void nge_attach __P((struct device *, struct device *, void *)); - -int nge_alloc_jumbo_mem __P((struct nge_softc *)); -void *nge_jalloc __P((struct nge_softc *)); -void nge_jfree __P((caddr_t, u_int, void *)); - -int nge_newbuf __P((struct nge_softc *, struct nge_desc *, - struct mbuf *)); -int nge_encap __P((struct nge_softc *, struct mbuf *, u_int32_t *)); -void nge_rxeof __P((struct nge_softc *)); -void nge_rxeoc __P((struct nge_softc *)); -void nge_txeof __P((struct nge_softc *)); -int nge_intr __P((void *)); -void nge_tick __P((void *)); -void nge_start __P((struct ifnet *)); -int nge_ioctl __P((struct ifnet *, u_long, caddr_t)); -void nge_init __P((void *)); -void nge_stop __P((struct nge_softc *)); -void nge_watchdog __P((struct ifnet *)); -void nge_shutdown __P((void *)); -int nge_ifmedia_upd __P((struct ifnet *)); -void nge_ifmedia_sts __P((struct ifnet *, struct ifmediareq *)); - -void nge_delay __P((struct nge_softc *)); -void nge_eeprom_idle __P((struct nge_softc *)); -void nge_eeprom_putbyte __P((struct nge_softc *, int)); -void nge_eeprom_getword __P((struct nge_softc *, int, u_int16_t *)); -void nge_read_eeprom __P((struct nge_softc *, caddr_t, int, int, int)); - -void nge_mii_sync __P((struct nge_softc *)); -void nge_mii_send __P((struct nge_softc *, u_int32_t, int)); -int nge_mii_readreg __P((struct nge_softc *, struct nge_mii_frame *)); -int nge_mii_writereg __P((struct nge_softc *, struct nge_mii_frame *)); - -int nge_miibus_readreg __P((struct device *, int, int)); -void nge_miibus_writereg __P((struct device *, int, int, int)); -void nge_miibus_statchg __P((struct device *)); - -void nge_setmulti __P((struct nge_softc *)); -u_int32_t nge_crc __P((struct nge_softc *, caddr_t)); -void nge_reset __P((struct nge_softc *)); -int nge_list_rx_init __P((struct nge_softc *)); -int nge_list_tx_init __P((struct nge_softc *)); +int nge_probe(struct device *, void *, void *); +void nge_attach(struct device *, struct device *, void *); + +int nge_alloc_jumbo_mem(struct nge_softc *); +void *nge_jalloc(struct nge_softc *); +void nge_jfree(caddr_t, u_int, void *); + +int nge_newbuf(struct nge_softc *, struct nge_desc *, + struct mbuf *); +int nge_encap(struct nge_softc *, struct mbuf *, u_int32_t *); +void nge_rxeof(struct nge_softc *); +void nge_rxeoc(struct nge_softc *); +void nge_txeof(struct nge_softc *); +int nge_intr(void *); +void nge_tick(void *); +void nge_start(struct ifnet *); +int nge_ioctl(struct ifnet *, u_long, caddr_t); +void nge_init(void *); +void nge_stop(struct nge_softc *); +void nge_watchdog(struct ifnet *); +void nge_shutdown(void *); +int nge_ifmedia_upd(struct ifnet *); +void nge_ifmedia_sts(struct ifnet *, struct ifmediareq *); + +void nge_delay(struct nge_softc *); +void nge_eeprom_idle(struct nge_softc *); +void nge_eeprom_putbyte(struct nge_softc *, int); +void nge_eeprom_getword(struct nge_softc *, int, u_int16_t *); +void nge_read_eeprom(struct nge_softc *, caddr_t, int, int, int); + +void nge_mii_sync(struct nge_softc *); +void nge_mii_send(struct nge_softc *, u_int32_t, int); +int nge_mii_readreg(struct nge_softc *, struct nge_mii_frame *); +int nge_mii_writereg(struct nge_softc *, struct nge_mii_frame *); + +int nge_miibus_readreg(struct device *, int, int); +void nge_miibus_writereg(struct device *, int, int, int); +void nge_miibus_statchg(struct device *); + +void nge_setmulti(struct nge_softc *); +u_int32_t nge_crc(struct nge_softc *, caddr_t); +void nge_reset(struct nge_softc *); +int nge_list_rx_init(struct nge_softc *); +int nge_list_tx_init(struct nge_softc *); #ifdef NGE_USEIOSPACE #define NGE_RES SYS_RES_IOPORT diff --git a/sys/dev/pci/if_rl_pci.c b/sys/dev/pci/if_rl_pci.c index 2cbdc595b58..6e0631b9d7e 100644 --- a/sys/dev/pci/if_rl_pci.c +++ b/sys/dev/pci/if_rl_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_rl_pci.c,v 1.6 2001/11/06 19:53:19 miod Exp $ */ +/* $OpenBSD: if_rl_pci.c,v 1.7 2002/03/14 01:26:59 millert Exp $ */ /* * Copyright (c) 1997, 1998 @@ -83,8 +83,8 @@ #include <dev/ic/rtl81x9reg.h> -int rl_pci_match __P((struct device *, void *, void *)); -void rl_pci_attach __P((struct device *, struct device *, void *)); +int rl_pci_match(struct device *, void *, void *); +void rl_pci_attach(struct device *, struct device *, void *); struct cfattach rl_pci_ca = { sizeof(struct rl_softc), rl_pci_match, rl_pci_attach, diff --git a/sys/dev/pci/if_sf.c b/sys/dev/pci/if_sf.c index 1e7a8fd8057..0a6995a1c33 100644 --- a/sys/dev/pci/if_sf.c +++ b/sys/dev/pci/if_sf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_sf.c,v 1.16 2002/02/15 20:45:31 nordin Exp $ */ +/* $OpenBSD: if_sf.c,v 1.17 2002/03/14 01:26:59 millert Exp $ */ /* * Copyright (c) 1997, 1998, 1999 * Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved. @@ -124,43 +124,43 @@ #include <dev/pci/if_sfreg.h> -int sf_probe __P((struct device *, void *, void *)); -void sf_attach __P((struct device *, struct device *, void *)); -int sf_intr __P((void *)); -void sf_shutdown __P((void *)); -void sf_stats_update __P((void *)); -void sf_rxeof __P((struct sf_softc *)); -void sf_txeof __P((struct sf_softc *)); -int sf_encap __P((struct sf_softc *, struct sf_tx_bufdesc_type0 *, - struct mbuf *)); -void sf_start __P((struct ifnet *)); -int sf_ioctl __P((struct ifnet *, u_long, caddr_t)); -void sf_init __P((void *)); -void sf_stop __P((struct sf_softc *)); -void sf_watchdog __P((struct ifnet *)); -int sf_ifmedia_upd __P((struct ifnet *)); -void sf_ifmedia_sts __P((struct ifnet *, struct ifmediareq *)); -void sf_reset __P((struct sf_softc *)); -int sf_init_rx_ring __P((struct sf_softc *)); -void sf_init_tx_ring __P((struct sf_softc *)); -int sf_newbuf __P((struct sf_softc *, struct sf_rx_bufdesc_type0 *, - struct mbuf *)); -void sf_setmulti __P((struct sf_softc *)); -int sf_setperf __P((struct sf_softc *, int, caddr_t)); -int sf_sethash __P((struct sf_softc *, caddr_t, int)); +int sf_probe(struct device *, void *, void *); +void sf_attach(struct device *, struct device *, void *); +int sf_intr(void *); +void sf_shutdown(void *); +void sf_stats_update(void *); +void sf_rxeof(struct sf_softc *); +void sf_txeof(struct sf_softc *); +int sf_encap(struct sf_softc *, struct sf_tx_bufdesc_type0 *, + struct mbuf *); +void sf_start(struct ifnet *); +int sf_ioctl(struct ifnet *, u_long, caddr_t); +void sf_init(void *); +void sf_stop(struct sf_softc *); +void sf_watchdog(struct ifnet *); +int sf_ifmedia_upd(struct ifnet *); +void sf_ifmedia_sts(struct ifnet *, struct ifmediareq *); +void sf_reset(struct sf_softc *); +int sf_init_rx_ring(struct sf_softc *); +void sf_init_tx_ring(struct sf_softc *); +int sf_newbuf(struct sf_softc *, struct sf_rx_bufdesc_type0 *, + struct mbuf *); +void sf_setmulti(struct sf_softc *); +int sf_setperf(struct sf_softc *, int, caddr_t); +int sf_sethash(struct sf_softc *, caddr_t, int); #ifdef notdef -int sf_setvlan __P((struct sf_softc *, int, u_int32_t)); +int sf_setvlan(struct sf_softc *, int, u_int32_t); #endif -u_int8_t sf_read_eeprom __P((struct sf_softc *, int)); -u_int32_t sf_calchash __P((caddr_t)); +u_int8_t sf_read_eeprom(struct sf_softc *, int); +u_int32_t sf_calchash(caddr_t); -int sf_miibus_readreg __P((struct device *, int, int)); -void sf_miibus_writereg __P((struct device *, int, int, int)); -void sf_miibus_statchg __P((struct device *)); +int sf_miibus_readreg(struct device *, int, int); +void sf_miibus_writereg(struct device *, int, int, int); +void sf_miibus_statchg(struct device *); -u_int32_t csr_read_4 __P((struct sf_softc *, int)); -void csr_write_4 __P((struct sf_softc *, int, u_int32_t)); +u_int32_t csr_read_4(struct sf_softc *, int); +void csr_write_4(struct sf_softc *, int, u_int32_t); #define SF_SETBIT(sc, reg, x) \ csr_write_4(sc, reg, csr_read_4(sc, reg) | x) diff --git a/sys/dev/pci/if_sis.c b/sys/dev/pci/if_sis.c index 04e35941fd7..efa5a4c7f0e 100644 --- a/sys/dev/pci/if_sis.c +++ b/sys/dev/pci/if_sis.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_sis.c,v 1.21 2002/02/15 20:45:31 nordin Exp $ */ +/* $OpenBSD: if_sis.c,v 1.22 2002/03/14 01:26:59 millert Exp $ */ /* * Copyright (c) 1997, 1998, 1999 * Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved. @@ -105,46 +105,46 @@ #include <dev/pci/if_sisreg.h> -int sis_probe __P((struct device *, void *, void *)); -void sis_attach __P((struct device *, struct device *, void *)); -int sis_intr __P((void *)); -void sis_shutdown __P((void *)); -int sis_newbuf __P((struct sis_softc *, struct sis_desc *, - struct mbuf *)); -int sis_encap __P((struct sis_softc *, struct mbuf *, u_int32_t *)); -void sis_rxeof __P((struct sis_softc *)); -void sis_rxeoc __P((struct sis_softc *)); -void sis_txeof __P((struct sis_softc *)); -void sis_tick __P((void *)); -void sis_start __P((struct ifnet *)); -int sis_ioctl __P((struct ifnet *, u_long, caddr_t)); -void sis_init __P((void *)); -void sis_stop __P((struct sis_softc *)); -void sis_watchdog __P((struct ifnet *)); -int sis_ifmedia_upd __P((struct ifnet *)); -void sis_ifmedia_sts __P((struct ifnet *, struct ifmediareq *)); - -u_int16_t sis_reverse __P((u_int16_t)); -void sis_delay __P((struct sis_softc *)); -void sis_eeprom_idle __P((struct sis_softc *)); -void sis_eeprom_putbyte __P((struct sis_softc *, int)); -void sis_eeprom_getword __P((struct sis_softc *, int, u_int16_t *)); +int sis_probe(struct device *, void *, void *); +void sis_attach(struct device *, struct device *, void *); +int sis_intr(void *); +void sis_shutdown(void *); +int sis_newbuf(struct sis_softc *, struct sis_desc *, + struct mbuf *); +int sis_encap(struct sis_softc *, struct mbuf *, u_int32_t *); +void sis_rxeof(struct sis_softc *); +void sis_rxeoc(struct sis_softc *); +void sis_txeof(struct sis_softc *); +void sis_tick(void *); +void sis_start(struct ifnet *); +int sis_ioctl(struct ifnet *, u_long, caddr_t); +void sis_init(void *); +void sis_stop(struct sis_softc *); +void sis_watchdog(struct ifnet *); +int sis_ifmedia_upd(struct ifnet *); +void sis_ifmedia_sts(struct ifnet *, struct ifmediareq *); + +u_int16_t sis_reverse(u_int16_t); +void sis_delay(struct sis_softc *); +void sis_eeprom_idle(struct sis_softc *); +void sis_eeprom_putbyte(struct sis_softc *, int); +void sis_eeprom_getword(struct sis_softc *, int, u_int16_t *); #ifdef __i386__ -void sis_read_cmos __P((struct sis_softc *, struct pci_attach_args *, caddr_t, int, int)); +void sis_read_cmos(struct sis_softc *, struct pci_attach_args *, caddr_t, int, int); #endif -void sis_read_630ea1_enaddr __P((struct sis_softc *, struct pci_attach_args *)); -void sis_read_eeprom __P((struct sis_softc *, caddr_t, int, int, int)); - -int sis_miibus_readreg __P((struct device *, int, int)); -void sis_miibus_writereg __P((struct device *, int, int, int)); -void sis_miibus_statchg __P((struct device *)); - -void sis_setmulti_sis __P((struct sis_softc *)); -void sis_setmulti_ns __P((struct sis_softc *)); -u_int32_t sis_crc __P((struct sis_softc *, caddr_t)); -void sis_reset __P((struct sis_softc *)); -int sis_list_rx_init __P((struct sis_softc *)); -int sis_list_tx_init __P((struct sis_softc *)); +void sis_read_630ea1_enaddr(struct sis_softc *, struct pci_attach_args *); +void sis_read_eeprom(struct sis_softc *, caddr_t, int, int, int); + +int sis_miibus_readreg(struct device *, int, int); +void sis_miibus_writereg(struct device *, int, int, int); +void sis_miibus_statchg(struct device *); + +void sis_setmulti_sis(struct sis_softc *); +void sis_setmulti_ns(struct sis_softc *); +u_int32_t sis_crc(struct sis_softc *, caddr_t); +void sis_reset(struct sis_softc *); +int sis_list_rx_init(struct sis_softc *); +int sis_list_tx_init(struct sis_softc *); #define SIS_SETBIT(sc, reg, x) \ CSR_WRITE_4(sc, reg, \ diff --git a/sys/dev/pci/if_sk.c b/sys/dev/pci/if_sk.c index f5fede691a0..311bf9ad41b 100644 --- a/sys/dev/pci/if_sk.c +++ b/sys/dev/pci/if_sk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_sk.c,v 1.22 2002/03/12 09:51:20 kjc Exp $ */ +/* $OpenBSD: if_sk.c,v 1.23 2002/03/14 01:26:59 millert Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 @@ -117,51 +117,51 @@ #include <dev/pci/if_skreg.h> #include <dev/pci/xmaciireg.h> -int skc_probe __P((struct device *, void *, void *)); -void skc_attach __P((struct device *, struct device *self, void *aux)); -int sk_probe __P((struct device *, void *, void *)); -void sk_attach __P((struct device *, struct device *self, void *aux)); -int skcprint __P((void *, const char *)); -int sk_attach_xmac __P((struct sk_softc *, int)); -int sk_intr __P((void *)); -void sk_intr_bcom __P((struct sk_if_softc *)); -void sk_intr_xmac __P((struct sk_if_softc *)); -void sk_rxeof __P((struct sk_if_softc *)); -void sk_txeof __P((struct sk_if_softc *)); -int sk_encap __P((struct sk_if_softc *, struct mbuf *, u_int32_t *)); -void sk_start __P((struct ifnet *)); -int sk_ioctl __P((struct ifnet *, u_long, caddr_t)); -void sk_init __P((void *)); -void sk_init_xmac __P((struct sk_if_softc *)); -void sk_stop __P((struct sk_if_softc *)); -void sk_watchdog __P((struct ifnet *)); -void sk_shutdown __P((void *)); -int sk_ifmedia_upd __P((struct ifnet *)); -void sk_ifmedia_sts __P((struct ifnet *, struct ifmediareq *)); -void sk_reset __P((struct sk_softc *)); -int sk_newbuf __P((struct sk_if_softc *, struct sk_chain *, - struct mbuf *)); -int sk_init_rx_ring __P((struct sk_if_softc *)); -void sk_init_tx_ring __P((struct sk_if_softc *)); -u_int32_t sk_win_read_4 __P((struct sk_softc *, int)); -u_int16_t sk_win_read_2 __P((struct sk_softc *, int)); -u_int8_t sk_win_read_1 __P((struct sk_softc *, int)); -void sk_win_write_4 __P((struct sk_softc *, int, u_int32_t)); -void sk_win_write_2 __P((struct sk_softc *, int, u_int32_t)); -void sk_win_write_1 __P((struct sk_softc *, int, u_int32_t)); -u_int8_t sk_vpd_readbyte __P((struct sk_softc *, int)); -void sk_vpd_read_res __P((struct sk_softc *, - struct vpd_res *, int)); -void sk_vpd_read __P((struct sk_softc *)); - -int sk_miibus_readreg __P((struct device *, int, int)); -void sk_miibus_writereg __P((struct device *, int, int, int)); -void sk_miibus_statchg __P((struct device *)); - -u_int32_t sk_calchash __P((caddr_t)); -void sk_setfilt __P((struct sk_if_softc *, caddr_t, int)); -void sk_setmulti __P((struct sk_if_softc *)); -void sk_tick __P((void *)); +int skc_probe(struct device *, void *, void *); +void skc_attach(struct device *, struct device *self, void *aux); +int sk_probe(struct device *, void *, void *); +void sk_attach(struct device *, struct device *self, void *aux); +int skcprint(void *, const char *); +int sk_attach_xmac(struct sk_softc *, int); +int sk_intr(void *); +void sk_intr_bcom(struct sk_if_softc *); +void sk_intr_xmac(struct sk_if_softc *); +void sk_rxeof(struct sk_if_softc *); +void sk_txeof(struct sk_if_softc *); +int sk_encap(struct sk_if_softc *, struct mbuf *, u_int32_t *); +void sk_start(struct ifnet *); +int sk_ioctl(struct ifnet *, u_long, caddr_t); +void sk_init(void *); +void sk_init_xmac(struct sk_if_softc *); +void sk_stop(struct sk_if_softc *); +void sk_watchdog(struct ifnet *); +void sk_shutdown(void *); +int sk_ifmedia_upd(struct ifnet *); +void sk_ifmedia_sts(struct ifnet *, struct ifmediareq *); +void sk_reset(struct sk_softc *); +int sk_newbuf(struct sk_if_softc *, struct sk_chain *, + struct mbuf *); +int sk_init_rx_ring(struct sk_if_softc *); +void sk_init_tx_ring(struct sk_if_softc *); +u_int32_t sk_win_read_4(struct sk_softc *, int); +u_int16_t sk_win_read_2(struct sk_softc *, int); +u_int8_t sk_win_read_1(struct sk_softc *, int); +void sk_win_write_4(struct sk_softc *, int, u_int32_t); +void sk_win_write_2(struct sk_softc *, int, u_int32_t); +void sk_win_write_1(struct sk_softc *, int, u_int32_t); +u_int8_t sk_vpd_readbyte(struct sk_softc *, int); +void sk_vpd_read_res(struct sk_softc *, + struct vpd_res *, int); +void sk_vpd_read(struct sk_softc *); + +int sk_miibus_readreg(struct device *, int, int); +void sk_miibus_writereg(struct device *, int, int, int); +void sk_miibus_statchg(struct device *); + +u_int32_t sk_calchash(caddr_t); +void sk_setfilt(struct sk_if_softc *, caddr_t, int); +void sk_setmulti(struct sk_if_softc *); +void sk_tick(void *); #define SK_SETBIT(sc, reg, x) \ CSR_WRITE_4(sc, reg, CSR_READ_4(sc, reg) | x) diff --git a/sys/dev/pci/if_ste.c b/sys/dev/pci/if_ste.c index a43ff81436e..5ac41f28971 100644 --- a/sys/dev/pci/if_ste.c +++ b/sys/dev/pci/if_ste.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ste.c,v 1.15 2001/11/06 19:53:19 miod Exp $ */ +/* $OpenBSD: if_ste.c,v 1.16 2002/03/14 01:26:59 millert Exp $ */ /* * Copyright (c) 1997, 1998, 1999 * Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved. @@ -79,46 +79,46 @@ #include <dev/pci/if_stereg.h> -int ste_probe __P((struct device *, void *, void *)); -void ste_attach __P((struct device *, struct device *, void *)); -int ste_intr __P((void *)); -void ste_shutdown __P((void *)); -void ste_init __P((void *)); -void ste_rxeof __P((struct ste_softc *)); -void ste_txeoc __P((struct ste_softc *)); -void ste_txeof __P((struct ste_softc *)); -void ste_stats_update __P((void *)); -void ste_stop __P((struct ste_softc *)); -void ste_reset __P((struct ste_softc *)); -int ste_ioctl __P((struct ifnet *, u_long, caddr_t)); -int ste_encap __P((struct ste_softc *, struct ste_chain *, - struct mbuf *)); -void ste_start __P((struct ifnet *)); -void ste_watchdog __P((struct ifnet *)); -int ste_newbuf __P((struct ste_softc *, +int ste_probe(struct device *, void *, void *); +void ste_attach(struct device *, struct device *, void *); +int ste_intr(void *); +void ste_shutdown(void *); +void ste_init(void *); +void ste_rxeof(struct ste_softc *); +void ste_txeoc(struct ste_softc *); +void ste_txeof(struct ste_softc *); +void ste_stats_update(void *); +void ste_stop(struct ste_softc *); +void ste_reset(struct ste_softc *); +int ste_ioctl(struct ifnet *, u_long, caddr_t); +int ste_encap(struct ste_softc *, struct ste_chain *, + struct mbuf *); +void ste_start(struct ifnet *); +void ste_watchdog(struct ifnet *); +int ste_newbuf(struct ste_softc *, struct ste_chain_onefrag *, - struct mbuf *)); -int ste_ifmedia_upd __P((struct ifnet *)); -void ste_ifmedia_sts __P((struct ifnet *, struct ifmediareq *)); - -void ste_mii_sync __P((struct ste_softc *)); -void ste_mii_send __P((struct ste_softc *, u_int32_t, int)); -int ste_mii_readreg __P((struct ste_softc *, - struct ste_mii_frame *)); -int ste_mii_writereg __P((struct ste_softc *, - struct ste_mii_frame *)); -int ste_miibus_readreg __P((struct device *, int, int)); -void ste_miibus_writereg __P((struct device *, int, int, int)); -void ste_miibus_statchg __P((struct device *)); - -int ste_eeprom_wait __P((struct ste_softc *)); -int ste_read_eeprom __P((struct ste_softc *, caddr_t, int, - int, int)); -void ste_wait __P((struct ste_softc *)); -u_int8_t ste_calchash __P((caddr_t)); -void ste_setmulti __P((struct ste_softc *)); -int ste_init_rx_list __P((struct ste_softc *)); -void ste_init_tx_list __P((struct ste_softc *)); + struct mbuf *); +int ste_ifmedia_upd(struct ifnet *); +void ste_ifmedia_sts(struct ifnet *, struct ifmediareq *); + +void ste_mii_sync(struct ste_softc *); +void ste_mii_send(struct ste_softc *, u_int32_t, int); +int ste_mii_readreg(struct ste_softc *, + struct ste_mii_frame *); +int ste_mii_writereg(struct ste_softc *, + struct ste_mii_frame *); +int ste_miibus_readreg(struct device *, int, int); +void ste_miibus_writereg(struct device *, int, int, int); +void ste_miibus_statchg(struct device *); + +int ste_eeprom_wait(struct ste_softc *); +int ste_read_eeprom(struct ste_softc *, caddr_t, int, + int, int); +void ste_wait(struct ste_softc *); +u_int8_t ste_calchash(caddr_t); +void ste_setmulti(struct ste_softc *); +int ste_init_rx_list(struct ste_softc *); +void ste_init_tx_list(struct ste_softc *); #define STE_SETBIT4(sc, reg, x) \ CSR_WRITE_4(sc, reg, CSR_READ_4(sc, reg) | x) diff --git a/sys/dev/pci/if_ti.c b/sys/dev/pci/if_ti.c index cfc7b092c49..49d0f0afe8e 100644 --- a/sys/dev/pci/if_ti.c +++ b/sys/dev/pci/if_ti.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ti.c,v 1.34 2002/02/15 20:45:31 nordin Exp $ */ +/* $OpenBSD: if_ti.c,v 1.35 2002/03/14 01:26:59 millert Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -127,58 +127,58 @@ #define bootverbose 1 -int ti_probe __P((struct device *, void *, void *)); -void ti_attach __P((struct device *, struct device *, void *)); - -void ti_txeof __P((struct ti_softc *)); -void ti_rxeof __P((struct ti_softc *)); - -void ti_stats_update __P((struct ti_softc *)); -int ti_encap __P((struct ti_softc *, struct mbuf *, u_int32_t *)); - -int ti_intr __P((void *)); -void ti_start __P((struct ifnet *)); -int ti_ioctl __P((struct ifnet *, u_long, caddr_t)); -void ti_init __P((void *)); -void ti_init2 __P((struct ti_softc *)); -void ti_stop __P((struct ti_softc *)); -void ti_watchdog __P((struct ifnet *)); -void ti_shutdown __P((void *)); -int ti_ifmedia_upd __P((struct ifnet *)); -void ti_ifmedia_sts __P((struct ifnet *, struct ifmediareq *)); - -u_int32_t ti_eeprom_putbyte __P((struct ti_softc *, int)); -u_int8_t ti_eeprom_getbyte __P((struct ti_softc *, int, u_int8_t *)); -int ti_read_eeprom __P((struct ti_softc *, caddr_t, int, int)); - -void ti_add_mcast __P((struct ti_softc *, struct ether_addr *)); -void ti_del_mcast __P((struct ti_softc *, struct ether_addr *)); -void ti_setmulti __P((struct ti_softc *)); - -void ti_mem __P((struct ti_softc *, u_int32_t, u_int32_t, caddr_t)); -void ti_loadfw __P((struct ti_softc *)); -void ti_cmd __P((struct ti_softc *, struct ti_cmd_desc *)); -void ti_cmd_ext __P((struct ti_softc *, struct ti_cmd_desc *, - caddr_t, int)); -void ti_handle_events __P((struct ti_softc *)); -int ti_alloc_jumbo_mem __P((struct ti_softc *)); -void *ti_jalloc __P((struct ti_softc *)); -void ti_jfree __P((caddr_t, u_int, void *)); -int ti_newbuf_std __P((struct ti_softc *, int, struct mbuf *)); -int ti_newbuf_mini __P((struct ti_softc *, int, struct mbuf *)); -int ti_newbuf_jumbo __P((struct ti_softc *, int, struct mbuf *)); -int ti_init_rx_ring_std __P((struct ti_softc *)); -void ti_free_rx_ring_std __P((struct ti_softc *)); -int ti_init_rx_ring_jumbo __P((struct ti_softc *)); -void ti_free_rx_ring_jumbo __P((struct ti_softc *)); -int ti_init_rx_ring_mini __P((struct ti_softc *)); -void ti_free_rx_ring_mini __P((struct ti_softc *)); -void ti_free_tx_ring __P((struct ti_softc *)); -int ti_init_tx_ring __P((struct ti_softc *)); - -int ti_64bitslot_war __P((struct ti_softc *)); -int ti_chipinit __P((struct ti_softc *)); -int ti_gibinit __P((struct ti_softc *)); +int ti_probe(struct device *, void *, void *); +void ti_attach(struct device *, struct device *, void *); + +void ti_txeof(struct ti_softc *); +void ti_rxeof(struct ti_softc *); + +void ti_stats_update(struct ti_softc *); +int ti_encap(struct ti_softc *, struct mbuf *, u_int32_t *); + +int ti_intr(void *); +void ti_start(struct ifnet *); +int ti_ioctl(struct ifnet *, u_long, caddr_t); +void ti_init(void *); +void ti_init2(struct ti_softc *); +void ti_stop(struct ti_softc *); +void ti_watchdog(struct ifnet *); +void ti_shutdown(void *); +int ti_ifmedia_upd(struct ifnet *); +void ti_ifmedia_sts(struct ifnet *, struct ifmediareq *); + +u_int32_t ti_eeprom_putbyte(struct ti_softc *, int); +u_int8_t ti_eeprom_getbyte(struct ti_softc *, int, u_int8_t *); +int ti_read_eeprom(struct ti_softc *, caddr_t, int, int); + +void ti_add_mcast(struct ti_softc *, struct ether_addr *); +void ti_del_mcast(struct ti_softc *, struct ether_addr *); +void ti_setmulti(struct ti_softc *); + +void ti_mem(struct ti_softc *, u_int32_t, u_int32_t, caddr_t); +void ti_loadfw(struct ti_softc *); +void ti_cmd(struct ti_softc *, struct ti_cmd_desc *); +void ti_cmd_ext(struct ti_softc *, struct ti_cmd_desc *, + caddr_t, int); +void ti_handle_events(struct ti_softc *); +int ti_alloc_jumbo_mem(struct ti_softc *); +void *ti_jalloc(struct ti_softc *); +void ti_jfree(caddr_t, u_int, void *); +int ti_newbuf_std(struct ti_softc *, int, struct mbuf *); +int ti_newbuf_mini(struct ti_softc *, int, struct mbuf *); +int ti_newbuf_jumbo(struct ti_softc *, int, struct mbuf *); +int ti_init_rx_ring_std(struct ti_softc *); +void ti_free_rx_ring_std(struct ti_softc *); +int ti_init_rx_ring_jumbo(struct ti_softc *); +void ti_free_rx_ring_jumbo(struct ti_softc *); +int ti_init_rx_ring_mini(struct ti_softc *); +void ti_free_rx_ring_mini(struct ti_softc *); +void ti_free_tx_ring(struct ti_softc *); +int ti_init_tx_ring(struct ti_softc *); + +int ti_64bitslot_war(struct ti_softc *); +int ti_chipinit(struct ti_softc *); +int ti_gibinit(struct ti_softc *); /* * Send an instruction or address to the EEPROM, check for ACK. diff --git a/sys/dev/pci/if_tl.c b/sys/dev/pci/if_tl.c index c72386ebc7a..8afba651314 100644 --- a/sys/dev/pci/if_tl.c +++ b/sys/dev/pci/if_tl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_tl.c,v 1.25 2002/02/15 20:45:31 nordin Exp $ */ +/* $OpenBSD: if_tl.c,v 1.26 2002/03/14 01:26:59 millert Exp $ */ /* * Copyright (c) 1997, 1998 @@ -241,64 +241,64 @@ const struct tl_products tl_prods[] = { { 0, 0, 0 } }; -int tl_probe __P((struct device *, void *, void *)); -void tl_attach __P((struct device *, struct device *, void *)); -void tl_wait_up __P((void *)); -int tl_intvec_rxeoc __P((void *, u_int32_t)); -int tl_intvec_txeoc __P((void *, u_int32_t)); -int tl_intvec_txeof __P((void *, u_int32_t)); -int tl_intvec_rxeof __P((void *, u_int32_t)); -int tl_intvec_adchk __P((void *, u_int32_t)); -int tl_intvec_netsts __P((void *, u_int32_t)); - -int tl_newbuf __P((struct tl_softc *, - struct tl_chain_onefrag *)); -void tl_stats_update __P((void *)); -int tl_encap __P((struct tl_softc *, struct tl_chain *, - struct mbuf *)); - -int tl_intr __P((void *)); -void tl_start __P((struct ifnet *)); -int tl_ioctl __P((struct ifnet *, u_long, caddr_t)); -void tl_init __P((void *)); -void tl_stop __P((struct tl_softc *)); -void tl_watchdog __P((struct ifnet *)); -void tl_shutdown __P((void *)); -int tl_ifmedia_upd __P((struct ifnet *)); -void tl_ifmedia_sts __P((struct ifnet *, struct ifmediareq *)); - -u_int8_t tl_eeprom_putbyte __P((struct tl_softc *, int)); -u_int8_t tl_eeprom_getbyte __P((struct tl_softc *, - int, u_int8_t *)); -int tl_read_eeprom __P((struct tl_softc *, caddr_t, int, int)); - -void tl_mii_sync __P((struct tl_softc *)); -void tl_mii_send __P((struct tl_softc *, u_int32_t, int)); -int tl_mii_readreg __P((struct tl_softc *, struct tl_mii_frame *)); -int tl_mii_writereg __P((struct tl_softc *, struct tl_mii_frame *)); -int tl_miibus_readreg __P((struct device *, int, int)); -void tl_miibus_writereg __P((struct device *, int, int, int)); -void tl_miibus_statchg __P((struct device *)); - -void tl_setmode __P((struct tl_softc *, int)); -int tl_calchash __P((caddr_t)); -void tl_setmulti __P((struct tl_softc *)); -void tl_setfilt __P((struct tl_softc *, caddr_t, int)); -void tl_softreset __P((struct tl_softc *, int)); -void tl_hardreset __P((struct device *)); -int tl_list_rx_init __P((struct tl_softc *)); -int tl_list_tx_init __P((struct tl_softc *)); - -u_int8_t tl_dio_read8 __P((struct tl_softc *, int)); -u_int16_t tl_dio_read16 __P((struct tl_softc *, int)); -u_int32_t tl_dio_read32 __P((struct tl_softc *, int)); -void tl_dio_write8 __P((struct tl_softc *, int, int)); -void tl_dio_write16 __P((struct tl_softc *, int, int)); -void tl_dio_write32 __P((struct tl_softc *, int, int)); -void tl_dio_setbit __P((struct tl_softc *, int, int)); -void tl_dio_clrbit __P((struct tl_softc *, int, int)); -void tl_dio_setbit16 __P((struct tl_softc *, int, int)); -void tl_dio_clrbit16 __P((struct tl_softc *, int, int)); +int tl_probe(struct device *, void *, void *); +void tl_attach(struct device *, struct device *, void *); +void tl_wait_up(void *); +int tl_intvec_rxeoc(void *, u_int32_t); +int tl_intvec_txeoc(void *, u_int32_t); +int tl_intvec_txeof(void *, u_int32_t); +int tl_intvec_rxeof(void *, u_int32_t); +int tl_intvec_adchk(void *, u_int32_t); +int tl_intvec_netsts(void *, u_int32_t); + +int tl_newbuf(struct tl_softc *, + struct tl_chain_onefrag *); +void tl_stats_update(void *); +int tl_encap(struct tl_softc *, struct tl_chain *, + struct mbuf *); + +int tl_intr(void *); +void tl_start(struct ifnet *); +int tl_ioctl(struct ifnet *, u_long, caddr_t); +void tl_init(void *); +void tl_stop(struct tl_softc *); +void tl_watchdog(struct ifnet *); +void tl_shutdown(void *); +int tl_ifmedia_upd(struct ifnet *); +void tl_ifmedia_sts(struct ifnet *, struct ifmediareq *); + +u_int8_t tl_eeprom_putbyte(struct tl_softc *, int); +u_int8_t tl_eeprom_getbyte(struct tl_softc *, + int, u_int8_t *); +int tl_read_eeprom(struct tl_softc *, caddr_t, int, int); + +void tl_mii_sync(struct tl_softc *); +void tl_mii_send(struct tl_softc *, u_int32_t, int); +int tl_mii_readreg(struct tl_softc *, struct tl_mii_frame *); +int tl_mii_writereg(struct tl_softc *, struct tl_mii_frame *); +int tl_miibus_readreg(struct device *, int, int); +void tl_miibus_writereg(struct device *, int, int, int); +void tl_miibus_statchg(struct device *); + +void tl_setmode(struct tl_softc *, int); +int tl_calchash(caddr_t); +void tl_setmulti(struct tl_softc *); +void tl_setfilt(struct tl_softc *, caddr_t, int); +void tl_softreset(struct tl_softc *, int); +void tl_hardreset(struct device *); +int tl_list_rx_init(struct tl_softc *); +int tl_list_tx_init(struct tl_softc *); + +u_int8_t tl_dio_read8(struct tl_softc *, int); +u_int16_t tl_dio_read16(struct tl_softc *, int); +u_int32_t tl_dio_read32(struct tl_softc *, int); +void tl_dio_write8(struct tl_softc *, int, int); +void tl_dio_write16(struct tl_softc *, int, int); +void tl_dio_write32(struct tl_softc *, int, int); +void tl_dio_setbit(struct tl_softc *, int, int); +void tl_dio_clrbit(struct tl_softc *, int, int); +void tl_dio_setbit16(struct tl_softc *, int, int); +void tl_dio_clrbit16(struct tl_softc *, int, int); u_int8_t tl_dio_read8(sc, reg) struct tl_softc *sc; diff --git a/sys/dev/pci/if_tx.c b/sys/dev/pci/if_tx.c index 44b7eec1bfd..8872afcee54 100644 --- a/sys/dev/pci/if_tx.c +++ b/sys/dev/pci/if_tx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_tx.c,v 1.21 2001/11/06 19:53:19 miod Exp $ */ +/* $OpenBSD: if_tx.c,v 1.22 2002/03/14 01:26:59 millert Exp $ */ /* $FreeBSD: src/sys/pci/if_tx.c,v 1.45 2001/02/07 20:11:02 semenu Exp $ */ /*- @@ -143,41 +143,41 @@ MODULE_DEPEND(tx, miibus, 1, 1, 1); #define EPIC_STATIC #endif -EPIC_STATIC int epic_ifioctl __P((register struct ifnet *, u_long, caddr_t)); -EPIC_STATIC EPIC_INTR_RET_TYPE epic_intr __P((void *)); -EPIC_STATIC int epic_common_attach __P((epic_softc_t *)); -EPIC_STATIC void epic_ifstart __P((struct ifnet *)); -EPIC_STATIC void epic_ifwatchdog __P((struct ifnet *)); -EPIC_STATIC int epic_init __P((epic_softc_t *)); -EPIC_STATIC void epic_stop __P((epic_softc_t *)); -EPIC_STATIC void epic_rx_done __P((epic_softc_t *)); -EPIC_STATIC void epic_tx_done __P((epic_softc_t *)); -EPIC_STATIC int epic_init_rings __P((epic_softc_t *)); -EPIC_STATIC void epic_free_rings __P((epic_softc_t *)); -EPIC_STATIC void epic_stop_activity __P((epic_softc_t *)); -EPIC_STATIC void epic_start_activity __P((epic_softc_t *)); -EPIC_STATIC void epic_set_rx_mode __P((epic_softc_t *)); -EPIC_STATIC void epic_set_tx_mode __P((epic_softc_t *)); -EPIC_STATIC void epic_set_mc_table __P((epic_softc_t *)); -EPIC_STATIC int epic_read_eeprom __P((epic_softc_t *,u_int16_t)); -EPIC_STATIC void epic_output_eepromw __P((epic_softc_t *, u_int16_t)); -EPIC_STATIC u_int16_t epic_input_eepromw __P((epic_softc_t *)); -EPIC_STATIC u_int8_t epic_eeprom_clock __P((epic_softc_t *,u_int8_t)); -EPIC_STATIC void epic_write_eepromreg __P((epic_softc_t *,u_int8_t)); -EPIC_STATIC u_int8_t epic_read_eepromreg __P((epic_softc_t *)); - -EPIC_STATIC int epic_read_phy_reg __P((epic_softc_t *, int, int)); -EPIC_STATIC void epic_write_phy_reg __P((epic_softc_t *, int, int, int)); - -EPIC_STATIC int epic_miibus_readreg __P((struct device*, int, int)); -EPIC_STATIC EPIC_MIIBUS_WRITEREG_RET_TYPE epic_miibus_writereg __P((struct device*, int, int, int)); -EPIC_STATIC void epic_miibus_statchg __P((struct device *)); -EPIC_STATIC void epic_miibus_mediainit __P((struct device *)); - - -EPIC_STATIC int epic_ifmedia_upd __P((struct ifnet *)); -EPIC_STATIC void epic_ifmedia_sts __P((struct ifnet *, struct ifmediareq *)); -EPIC_STATIC void epic_tick __P((void *)); +EPIC_STATIC int epic_ifioctl(register struct ifnet *, u_long, caddr_t); +EPIC_STATIC EPIC_INTR_RET_TYPE epic_intr(void *); +EPIC_STATIC int epic_common_attach(epic_softc_t *); +EPIC_STATIC void epic_ifstart(struct ifnet *); +EPIC_STATIC void epic_ifwatchdog(struct ifnet *); +EPIC_STATIC int epic_init(epic_softc_t *); +EPIC_STATIC void epic_stop(epic_softc_t *); +EPIC_STATIC void epic_rx_done(epic_softc_t *); +EPIC_STATIC void epic_tx_done(epic_softc_t *); +EPIC_STATIC int epic_init_rings(epic_softc_t *); +EPIC_STATIC void epic_free_rings(epic_softc_t *); +EPIC_STATIC void epic_stop_activity(epic_softc_t *); +EPIC_STATIC void epic_start_activity(epic_softc_t *); +EPIC_STATIC void epic_set_rx_mode(epic_softc_t *); +EPIC_STATIC void epic_set_tx_mode(epic_softc_t *); +EPIC_STATIC void epic_set_mc_table(epic_softc_t *); +EPIC_STATIC int epic_read_eeprom(epic_softc_t *,u_int16_t); +EPIC_STATIC void epic_output_eepromw(epic_softc_t *, u_int16_t); +EPIC_STATIC u_int16_t epic_input_eepromw(epic_softc_t *); +EPIC_STATIC u_int8_t epic_eeprom_clock(epic_softc_t *,u_int8_t); +EPIC_STATIC void epic_write_eepromreg(epic_softc_t *,u_int8_t); +EPIC_STATIC u_int8_t epic_read_eepromreg(epic_softc_t *); + +EPIC_STATIC int epic_read_phy_reg(epic_softc_t *, int, int); +EPIC_STATIC void epic_write_phy_reg(epic_softc_t *, int, int, int); + +EPIC_STATIC int epic_miibus_readreg(struct device*, int, int); +EPIC_STATIC EPIC_MIIBUS_WRITEREG_RET_TYPE epic_miibus_writereg(struct device*, int, int, int); +EPIC_STATIC void epic_miibus_statchg(struct device *); +EPIC_STATIC void epic_miibus_mediainit(struct device *); + + +EPIC_STATIC int epic_ifmedia_upd(struct ifnet *); +EPIC_STATIC void epic_ifmedia_sts(struct ifnet *, struct ifmediareq *); +EPIC_STATIC void epic_tick(void *); /* ------------------------------------------------------------------------- OS-specific part @@ -186,9 +186,9 @@ EPIC_STATIC void epic_tick __P((void *)); #if defined(__OpenBSD__) /* -----------------------------OpenBSD------------------------------------- */ -int epic_openbsd_probe __P((struct device *,void *,void *)); -void epic_openbsd_attach __P((struct device *, struct device *, void *)); -void epic_openbsd_shutdown __P((void *)); +int epic_openbsd_probe(struct device *,void *,void *); +void epic_openbsd_attach(struct device *, struct device *, void *); +void epic_openbsd_shutdown(void *); struct cfattach tx_ca = { sizeof(epic_softc_t), epic_openbsd_probe, epic_openbsd_attach @@ -323,11 +323,11 @@ epic_openbsd_shutdown( #else /* __FreeBSD__ */ /* -----------------------------FreeBSD------------------------------------- */ -static int epic_freebsd_probe __P((device_t)); -static int epic_freebsd_attach __P((device_t)); -static void epic_freebsd_shutdown __P((device_t)); -static int epic_freebsd_detach __P((device_t)); -static struct epic_type *epic_devtype __P((device_t)); +static int epic_freebsd_probe(device_t); +static int epic_freebsd_attach(device_t); +static void epic_freebsd_shutdown(device_t); +static int epic_freebsd_detach(device_t); +static struct epic_type *epic_devtype(device_t); static device_method_t epic_methods[] = { /* Device interface */ diff --git a/sys/dev/pci/if_txp.c b/sys/dev/pci/if_txp.c index 64938b4300b..0cf7afa7bdb 100644 --- a/sys/dev/pci/if_txp.c +++ b/sys/dev/pci/if_txp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_txp.c,v 1.62 2002/03/12 09:51:20 kjc Exp $ */ +/* $OpenBSD: if_txp.c,v 1.63 2002/03/14 01:26:59 millert Exp $ */ /* * Copyright (c) 2001 @@ -93,48 +93,48 @@ #undef TRY_TX_UDP_CSUM #undef TRY_TX_TCP_CSUM -int txp_probe __P((struct device *, void *, void *)); -void txp_attach __P((struct device *, struct device *, void *)); -int txp_intr __P((void *)); -void txp_tick __P((void *)); -void txp_shutdown __P((void *)); -int txp_ioctl __P((struct ifnet *, u_long, caddr_t)); -void txp_start __P((struct ifnet *)); -void txp_stop __P((struct txp_softc *)); -void txp_init __P((struct txp_softc *)); -void txp_watchdog __P((struct ifnet *)); - -int txp_chip_init __P((struct txp_softc *)); -int txp_reset_adapter __P((struct txp_softc *)); -int txp_download_fw __P((struct txp_softc *)); -int txp_download_fw_wait __P((struct txp_softc *)); -int txp_download_fw_section __P((struct txp_softc *, - struct txp_fw_section_header *, int)); -int txp_alloc_rings __P((struct txp_softc *)); -void txp_dma_free __P((struct txp_softc *, struct txp_dma_alloc *)); -int txp_dma_malloc __P((struct txp_softc *, bus_size_t, struct txp_dma_alloc *, int)); -void txp_set_filter __P((struct txp_softc *)); - -int txp_cmd_desc_numfree __P((struct txp_softc *)); -int txp_command __P((struct txp_softc *, u_int16_t, u_int16_t, u_int32_t, - u_int32_t, u_int16_t *, u_int32_t *, u_int32_t *, int)); -int txp_command2 __P((struct txp_softc *, u_int16_t, u_int16_t, +int txp_probe(struct device *, void *, void *); +void txp_attach(struct device *, struct device *, void *); +int txp_intr(void *); +void txp_tick(void *); +void txp_shutdown(void *); +int txp_ioctl(struct ifnet *, u_long, caddr_t); +void txp_start(struct ifnet *); +void txp_stop(struct txp_softc *); +void txp_init(struct txp_softc *); +void txp_watchdog(struct ifnet *); + +int txp_chip_init(struct txp_softc *); +int txp_reset_adapter(struct txp_softc *); +int txp_download_fw(struct txp_softc *); +int txp_download_fw_wait(struct txp_softc *); +int txp_download_fw_section(struct txp_softc *, + struct txp_fw_section_header *, int); +int txp_alloc_rings(struct txp_softc *); +void txp_dma_free(struct txp_softc *, struct txp_dma_alloc *); +int txp_dma_malloc(struct txp_softc *, bus_size_t, struct txp_dma_alloc *, int); +void txp_set_filter(struct txp_softc *); + +int txp_cmd_desc_numfree(struct txp_softc *); +int txp_command(struct txp_softc *, u_int16_t, u_int16_t, u_int32_t, + u_int32_t, u_int16_t *, u_int32_t *, u_int32_t *, int); +int txp_command2(struct txp_softc *, u_int16_t, u_int16_t, u_int32_t, u_int32_t, struct txp_ext_desc *, u_int8_t, - struct txp_rsp_desc **, int)); -int txp_response __P((struct txp_softc *, u_int32_t, u_int16_t, u_int16_t, - struct txp_rsp_desc **)); -void txp_rsp_fixup __P((struct txp_softc *, struct txp_rsp_desc *, - struct txp_rsp_desc *)); -void txp_capabilities __P((struct txp_softc *)); - -void txp_ifmedia_sts __P((struct ifnet *, struct ifmediareq *)); -int txp_ifmedia_upd __P((struct ifnet *)); -void txp_show_descriptor __P((void *)); -void txp_tx_reclaim __P((struct txp_softc *, struct txp_tx_ring *, - struct txp_dma_alloc *)); -void txp_rxbuf_reclaim __P((struct txp_softc *)); -void txp_rx_reclaim __P((struct txp_softc *, struct txp_rx_ring *, - struct txp_dma_alloc *)); + struct txp_rsp_desc **, int); +int txp_response(struct txp_softc *, u_int32_t, u_int16_t, u_int16_t, + struct txp_rsp_desc **); +void txp_rsp_fixup(struct txp_softc *, struct txp_rsp_desc *, + struct txp_rsp_desc *); +void txp_capabilities(struct txp_softc *); + +void txp_ifmedia_sts(struct ifnet *, struct ifmediareq *); +int txp_ifmedia_upd(struct ifnet *); +void txp_show_descriptor(void *); +void txp_tx_reclaim(struct txp_softc *, struct txp_tx_ring *, + struct txp_dma_alloc *); +void txp_rxbuf_reclaim(struct txp_softc *); +void txp_rx_reclaim(struct txp_softc *, struct txp_rx_ring *, + struct txp_dma_alloc *); struct cfattach txp_ca = { sizeof(struct txp_softc), txp_probe, txp_attach, diff --git a/sys/dev/pci/if_vr.c b/sys/dev/pci/if_vr.c index e6781c06346..34c6593281c 100644 --- a/sys/dev/pci/if_vr.c +++ b/sys/dev/pci/if_vr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_vr.c,v 1.23 2002/03/12 09:51:20 kjc Exp $ */ +/* $OpenBSD: if_vr.c,v 1.24 2002/03/14 01:26:59 millert Exp $ */ /* * Copyright (c) 1997, 1998 @@ -100,8 +100,8 @@ #include <dev/pci/if_vrreg.h> -int vr_probe __P((struct device *, void *, void *)); -void vr_attach __P((struct device *, struct device *, void *)); +int vr_probe(struct device *, void *, void *); +void vr_attach(struct device *, struct device *, void *); struct cfattach vr_ca = { sizeof(struct vr_softc), vr_probe, vr_attach @@ -110,41 +110,41 @@ struct cfdriver vr_cd = { 0, "vr", DV_IFNET }; -int vr_newbuf __P((struct vr_softc *, +int vr_newbuf(struct vr_softc *, struct vr_chain_onefrag *, - struct mbuf *)); -int vr_encap __P((struct vr_softc *, struct vr_chain *, - struct mbuf * )); - -void vr_rxeof __P((struct vr_softc *)); -void vr_rxeoc __P((struct vr_softc *)); -void vr_txeof __P((struct vr_softc *)); -void vr_txeoc __P((struct vr_softc *)); -void vr_tick __P((void *)); -int vr_intr __P((void *)); -void vr_start __P((struct ifnet *)); -int vr_ioctl __P((struct ifnet *, u_long, caddr_t)); -void vr_init __P((void *)); -void vr_stop __P((struct vr_softc *)); -void vr_watchdog __P((struct ifnet *)); -void vr_shutdown __P((void *)); -int vr_ifmedia_upd __P((struct ifnet *)); -void vr_ifmedia_sts __P((struct ifnet *, struct ifmediareq *)); - -void vr_mii_sync __P((struct vr_softc *)); -void vr_mii_send __P((struct vr_softc *, u_int32_t, int)); -int vr_mii_readreg __P((struct vr_softc *, struct vr_mii_frame *)); -int vr_mii_writereg __P((struct vr_softc *, struct vr_mii_frame *)); -int vr_miibus_readreg __P((struct device *, int, int)); -void vr_miibus_writereg __P((struct device *, int, int, int)); -void vr_miibus_statchg __P((struct device *)); - -void vr_setcfg __P((struct vr_softc *, int)); -u_int8_t vr_calchash __P((u_int8_t *)); -void vr_setmulti __P((struct vr_softc *)); -void vr_reset __P((struct vr_softc *)); -int vr_list_rx_init __P((struct vr_softc *)); -int vr_list_tx_init __P((struct vr_softc *)); + struct mbuf *); +int vr_encap(struct vr_softc *, struct vr_chain *, + struct mbuf * ); + +void vr_rxeof(struct vr_softc *); +void vr_rxeoc(struct vr_softc *); +void vr_txeof(struct vr_softc *); +void vr_txeoc(struct vr_softc *); +void vr_tick(void *); +int vr_intr(void *); +void vr_start(struct ifnet *); +int vr_ioctl(struct ifnet *, u_long, caddr_t); +void vr_init(void *); +void vr_stop(struct vr_softc *); +void vr_watchdog(struct ifnet *); +void vr_shutdown(void *); +int vr_ifmedia_upd(struct ifnet *); +void vr_ifmedia_sts(struct ifnet *, struct ifmediareq *); + +void vr_mii_sync(struct vr_softc *); +void vr_mii_send(struct vr_softc *, u_int32_t, int); +int vr_mii_readreg(struct vr_softc *, struct vr_mii_frame *); +int vr_mii_writereg(struct vr_softc *, struct vr_mii_frame *); +int vr_miibus_readreg(struct device *, int, int); +void vr_miibus_writereg(struct device *, int, int, int); +void vr_miibus_statchg(struct device *); + +void vr_setcfg(struct vr_softc *, int); +u_int8_t vr_calchash(u_int8_t *); +void vr_setmulti(struct vr_softc *); +void vr_reset(struct vr_softc *); +int vr_list_rx_init(struct vr_softc *); +int vr_list_tx_init(struct vr_softc *); #define VR_SETBIT(sc, reg, x) \ CSR_WRITE_1(sc, reg, \ diff --git a/sys/dev/pci/if_wb.c b/sys/dev/pci/if_wb.c index 1d39af67bbd..55fd0f1e423 100644 --- a/sys/dev/pci/if_wb.c +++ b/sys/dev/pci/if_wb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_wb.c,v 1.16 2002/02/15 20:45:31 nordin Exp $ */ +/* $OpenBSD: if_wb.c,v 1.17 2002/03/14 01:26:59 millert Exp $ */ /* * Copyright (c) 1997, 1998 @@ -130,49 +130,49 @@ #include <dev/pci/if_wbreg.h> -int wb_probe __P((struct device *, void *, void *)); -void wb_attach __P((struct device *, struct device *, void *)); - -void wb_bfree __P((caddr_t, u_int, void *)); -int wb_newbuf __P((struct wb_softc *, struct wb_chain_onefrag *, - struct mbuf *)); -int wb_encap __P((struct wb_softc *, struct wb_chain *, - struct mbuf *)); - -void wb_rxeof __P((struct wb_softc *)); -void wb_rxeoc __P((struct wb_softc *)); -void wb_txeof __P((struct wb_softc *)); -void wb_txeoc __P((struct wb_softc *)); -int wb_intr __P((void *)); -void wb_tick __P((void *)); -void wb_start __P((struct ifnet *)); -int wb_ioctl __P((struct ifnet *, u_long, caddr_t)); -void wb_init __P((void *)); -void wb_stop __P((struct wb_softc *)); -void wb_watchdog __P((struct ifnet *)); -void wb_shutdown __P((void *)); -int wb_ifmedia_upd __P((struct ifnet *)); -void wb_ifmedia_sts __P((struct ifnet *, struct ifmediareq *)); - -void wb_eeprom_putbyte __P((struct wb_softc *, int)); -void wb_eeprom_getword __P((struct wb_softc *, int, u_int16_t *)); -void wb_read_eeprom __P((struct wb_softc *, caddr_t, int, int, int)); -void wb_mii_sync __P((struct wb_softc *)); -void wb_mii_send __P((struct wb_softc *, u_int32_t, int)); -int wb_mii_readreg __P((struct wb_softc *, struct wb_mii_frame *)); -int wb_mii_writereg __P((struct wb_softc *, struct wb_mii_frame *)); - -void wb_setcfg __P((struct wb_softc *, u_int32_t)); -u_int8_t wb_calchash __P((caddr_t)); -void wb_setmulti __P((struct wb_softc *)); -void wb_reset __P((struct wb_softc *)); -void wb_fixmedia __P((struct wb_softc *)); -int wb_list_rx_init __P((struct wb_softc *)); -int wb_list_tx_init __P((struct wb_softc *)); - -int wb_miibus_readreg __P((struct device *, int, int)); -void wb_miibus_writereg __P((struct device *, int, int, int)); -void wb_miibus_statchg __P((struct device *)); +int wb_probe(struct device *, void *, void *); +void wb_attach(struct device *, struct device *, void *); + +void wb_bfree(caddr_t, u_int, void *); +int wb_newbuf(struct wb_softc *, struct wb_chain_onefrag *, + struct mbuf *); +int wb_encap(struct wb_softc *, struct wb_chain *, + struct mbuf *); + +void wb_rxeof(struct wb_softc *); +void wb_rxeoc(struct wb_softc *); +void wb_txeof(struct wb_softc *); +void wb_txeoc(struct wb_softc *); +int wb_intr(void *); +void wb_tick(void *); +void wb_start(struct ifnet *); +int wb_ioctl(struct ifnet *, u_long, caddr_t); +void wb_init(void *); +void wb_stop(struct wb_softc *); +void wb_watchdog(struct ifnet *); +void wb_shutdown(void *); +int wb_ifmedia_upd(struct ifnet *); +void wb_ifmedia_sts(struct ifnet *, struct ifmediareq *); + +void wb_eeprom_putbyte(struct wb_softc *, int); +void wb_eeprom_getword(struct wb_softc *, int, u_int16_t *); +void wb_read_eeprom(struct wb_softc *, caddr_t, int, int, int); +void wb_mii_sync(struct wb_softc *); +void wb_mii_send(struct wb_softc *, u_int32_t, int); +int wb_mii_readreg(struct wb_softc *, struct wb_mii_frame *); +int wb_mii_writereg(struct wb_softc *, struct wb_mii_frame *); + +void wb_setcfg(struct wb_softc *, u_int32_t); +u_int8_t wb_calchash(caddr_t); +void wb_setmulti(struct wb_softc *); +void wb_reset(struct wb_softc *); +void wb_fixmedia(struct wb_softc *); +int wb_list_rx_init(struct wb_softc *); +int wb_list_tx_init(struct wb_softc *); + +int wb_miibus_readreg(struct device *, int, int); +void wb_miibus_writereg(struct device *, int, int, int); +void wb_miibus_statchg(struct device *); #define WB_SETBIT(sc, reg, x) \ CSR_WRITE_4(sc, reg, \ diff --git a/sys/dev/pci/if_wi_pci.c b/sys/dev/pci/if_wi_pci.c index 963dbdb4f50..245f3755ace 100644 --- a/sys/dev/pci/if_wi_pci.c +++ b/sys/dev/pci/if_wi_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_wi_pci.c,v 1.13 2002/01/28 21:42:40 mickey Exp $ */ +/* $OpenBSD: if_wi_pci.c,v 1.14 2002/03/14 01:26:59 millert Exp $ */ /* * Copyright (c) 2001 Todd C. Miller <Todd.Miller@courtesan.com> @@ -114,11 +114,11 @@ #define WI_PCI_LOMEM 0x18 /* ISA membase */ #define WI_PCI_LOIO 0x1C /* ISA iobase */ -const struct wi_pci_product *wi_pci_lookup __P((struct pci_attach_args *pa)); -int wi_pci_match __P((struct device *, void *, void *)); -void wi_pci_attach __P((struct device *, struct device *, void *)); -int wi_intr __P((void *)); -int wi_attach __P((struct wi_softc *, int)); +const struct wi_pci_product *wi_pci_lookup(struct pci_attach_args *pa); +int wi_pci_match(struct device *, void *, void *); +void wi_pci_attach(struct device *, struct device *, void *); +int wi_intr(void *); +int wi_attach(struct wi_softc *, int); struct cfattach wi_pci_ca = { sizeof (struct wi_softc), wi_pci_match, wi_pci_attach diff --git a/sys/dev/pci/if_xl_pci.c b/sys/dev/pci/if_xl_pci.c index f0a28143e70..8c9cec8817f 100644 --- a/sys/dev/pci/if_xl_pci.c +++ b/sys/dev/pci/if_xl_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_xl_pci.c,v 1.10 2001/11/06 19:53:19 miod Exp $ */ +/* $OpenBSD: if_xl_pci.c,v 1.11 2002/03/14 01:26:59 millert Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -91,9 +91,9 @@ #include <dev/ic/xlreg.h> -int xl_pci_match __P((struct device *, void *, void *)); -void xl_pci_attach __P((struct device *, struct device *, void *)); -void xl_pci_intr_ack __P((struct xl_softc *)); +int xl_pci_match(struct device *, void *, void *); +void xl_pci_attach(struct device *, struct device *, void *); +void xl_pci_intr_ack(struct xl_softc *); struct cfattach xl_pci_ca = { sizeof(struct xl_softc), xl_pci_match, xl_pci_attach, diff --git a/sys/dev/pci/iha_pci.c b/sys/dev/pci/iha_pci.c index 541e7b77ebe..7df779578bf 100644 --- a/sys/dev/pci/iha_pci.c +++ b/sys/dev/pci/iha_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: iha_pci.c,v 1.6 2001/10/07 23:19:55 jason Exp $ */ +/* $OpenBSD: iha_pci.c,v 1.7 2002/03/14 01:26:59 millert Exp $ */ /* * Initio INI-9xxxU/UW SCSI Device Driver * @@ -53,8 +53,8 @@ #include <dev/ic/iha.h> -int iha_pci_probe __P((struct device *, void *, void *)); -void iha_pci_attach __P((struct device *, struct device *, void *)); +int iha_pci_probe(struct device *, void *, void *); +void iha_pci_attach(struct device *, struct device *, void *); struct cfattach iha_pci_ca = { sizeof(struct iha_softc), iha_pci_probe, iha_pci_attach diff --git a/sys/dev/pci/ises.c b/sys/dev/pci/ises.c index 32a4f5450f1..f57772514b3 100644 --- a/sys/dev/pci/ises.c +++ b/sys/dev/pci/ises.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ises.c,v 1.18 2001/11/09 03:11:38 deraadt Exp $ */ +/* $OpenBSD: ises.c,v 1.19 2002/03/14 01:26:59 millert Exp $ */ /* * Copyright (c) 2000, 2001 Håkan Olsson (ho@crt.se) @@ -61,30 +61,30 @@ /* * Prototypes and count for the pci_device structure */ -int ises_match __P((struct device *, void *, void *)); -void ises_attach __P((struct device *, struct device *, void *)); +int ises_match(struct device *, void *, void *); +void ises_attach(struct device *, struct device *, void *); -void ises_initstate __P((void *)); -void ises_hrng_init __P((struct ises_softc *)); -void ises_hrng __P((void *)); -void ises_process_oqueue __P((struct ises_softc *)); +void ises_initstate(void *); +void ises_hrng_init(struct ises_softc *); +void ises_hrng(void *); +void ises_process_oqueue(struct ises_softc *); int ises_queue_cmd __P((struct ises_softc *, u_int32_t, u_int32_t *, u_int32_t (*)(struct ises_softc *, struct ises_cmd *))); -u_int32_t ises_get_fwversion __P((struct ises_softc *)); -int ises_assert_cmd_mode __P((struct ises_softc *)); +u_int32_t ises_get_fwversion(struct ises_softc *); +int ises_assert_cmd_mode(struct ises_softc *); -int ises_intr __P((void *)); -int ises_newsession __P((u_int32_t *, struct cryptoini *)); -int ises_freesession __P((u_int64_t)); -int ises_process __P((struct cryptop *)); -void ises_callback __P((struct ises_q *)); -int ises_feed __P((struct ises_softc *)); -int ises_bchu_switch_session __P((struct ises_softc *, - struct ises_session *, int)); -u_int32_t ises_bchu_switch_final __P((struct ises_softc *, struct ises_cmd *)); +int ises_intr(void *); +int ises_newsession(u_int32_t *, struct cryptoini *); +int ises_freesession(u_int64_t); +int ises_process(struct cryptop *); +void ises_callback(struct ises_q *); +int ises_feed(struct ises_softc *); +int ises_bchu_switch_session(struct ises_softc *, + struct ises_session *, int); +u_int32_t ises_bchu_switch_final(struct ises_softc *, struct ises_cmd *); -void ises_read_dma __P((struct ises_softc *)); +void ises_read_dma(struct ises_softc *); #define READ_REG(sc,r) \ bus_space_read_4((sc)->sc_memt, (sc)->sc_memh,r) @@ -102,12 +102,12 @@ void ises_read_dma __P((struct ises_softc *)); #endif #ifdef ISESDEBUG -void ises_debug_init __P((struct ises_softc *)); -void ises_debug_2 __P((void)); -void ises_debug_loop __P((void *)); -void ises_showreg __P((void)); -void ises_debug_parse_omr __P((struct ises_softc *)); -void ises_debug_simple_cmd __P((struct ises_softc *, u_int32_t, u_int32_t)); +void ises_debug_init(struct ises_softc *); +void ises_debug_2(void); +void ises_debug_loop(void *); +void ises_showreg(void); +void ises_debug_parse_omr(struct ises_softc *); +void ises_debug_simple_cmd(struct ises_softc *, u_int32_t, u_int32_t); struct ises_softc *ises_sc; struct timeout ises_db_timeout; int ises_db; diff --git a/sys/dev/pci/lofn.c b/sys/dev/pci/lofn.c index 71d4f8c342d..ac75b9bb6df 100644 --- a/sys/dev/pci/lofn.c +++ b/sys/dev/pci/lofn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lofn.c,v 1.11 2001/11/06 19:53:19 miod Exp $ */ +/* $OpenBSD: lofn.c,v 1.12 2002/03/14 01:26:59 millert Exp $ */ /* * Copyright (c) 2001 Jason L. Wright (jason@thought.net) @@ -59,8 +59,8 @@ /* * Prototypes and count for the pci_device structure */ -int lofn_probe __P((struct device *, void *, void *)); -void lofn_attach __P((struct device *, struct device *, void *)); +int lofn_probe(struct device *, void *, void *); +void lofn_attach(struct device *, struct device *, void *); struct cfattach lofn_ca = { sizeof(struct lofn_softc), lofn_probe, lofn_attach, @@ -70,12 +70,12 @@ struct cfdriver lofn_cd = { 0, "lofn", DV_DULL }; -int lofn_intr __P((void *)); +int lofn_intr(void *); -void lofn_putnum __P((struct lofn_softc *, u_int32_t, u_int32_t, - u_int32_t *, u_int32_t)); -int lofn_getnum __P((struct lofn_softc *, u_int32_t, u_int32_t, - u_int32_t *num, u_int32_t *numlen)); +void lofn_putnum(struct lofn_softc *, u_int32_t, u_int32_t, + u_int32_t *, u_int32_t); +int lofn_getnum(struct lofn_softc *, u_int32_t, u_int32_t, + u_int32_t *num, u_int32_t *numlen); int lofn_probe(parent, match, aux) diff --git a/sys/dev/pci/maestro.c b/sys/dev/pci/maestro.c index 3446651cbfb..21b6eba422a 100644 --- a/sys/dev/pci/maestro.c +++ b/sys/dev/pci/maestro.c @@ -1,4 +1,4 @@ -/* $OpenBSD: maestro.c,v 1.13 2002/01/20 19:56:53 ericj Exp $ */ +/* $OpenBSD: maestro.c,v 1.14 2002/03/14 01:26:59 millert Exp $ */ /* $FreeBSD: /c/ncvs/src/sys/dev/sound/pci/maestro.c,v 1.3 2000/11/21 12:22:11 julian Exp $ */ /* * FreeBSD's ESS Agogo/Maestro driver @@ -115,7 +115,7 @@ struct maestro_channel { u_int16_t end; u_int16_t current; u_int wpwa; - void (*intr) __P((void *)); + void (*intr)(void *); void *intr_arg; }; @@ -154,75 +154,75 @@ struct maestro_softc { typedef u_int16_t wpreg_t; typedef u_int16_t wcreg_t; -salloc_t salloc_new __P((caddr_t, size_t, int)); -void salloc_destroy __P((salloc_t)); -caddr_t salloc_alloc __P((salloc_t, size_t)); -void salloc_free __P((salloc_t, caddr_t)); -void salloc_insert __P((salloc_t, struct salloc_head *, - struct salloc_zone *, int)); - -int maestro_match __P((struct device *, void *, void *)); -void maestro_attach __P((struct device *, struct device *, void *)); -int maestro_intr __P((void *)); - -int maestro_open __P((void *, int)); -void maestro_close __P((void *)); -int maestro_query_encoding __P((void *, struct audio_encoding *)); -int maestro_set_params __P((void *, int, int, struct audio_params *, - struct audio_params *)); -int maestro_round_blocksize __P((void *, int)); -int maestro_halt_output __P((void *)); -int maestro_halt_input __P((void *)); -int maestro_getdev __P((void *, struct audio_device *)); -int maestro_set_port __P((void *, mixer_ctrl_t *)); -int maestro_get_port __P((void *, mixer_ctrl_t *)); -int maestro_query_devinfo __P((void *, mixer_devinfo_t *)); -void *maestro_malloc __P((void *, int, size_t, int, int)); -void maestro_free __P((void *, void *, int)); -size_t maestro_round_buffersize __P((void *, int, size_t)); -paddr_t maestro_mappage __P((void *, void *, off_t, int)); -int maestro_get_props __P((void *)); +salloc_t salloc_new(caddr_t, size_t, int); +void salloc_destroy(salloc_t); +caddr_t salloc_alloc(salloc_t, size_t); +void salloc_free(salloc_t, caddr_t); +void salloc_insert(salloc_t, struct salloc_head *, + struct salloc_zone *, int); + +int maestro_match(struct device *, void *, void *); +void maestro_attach(struct device *, struct device *, void *); +int maestro_intr(void *); + +int maestro_open(void *, int); +void maestro_close(void *); +int maestro_query_encoding(void *, struct audio_encoding *); +int maestro_set_params(void *, int, int, struct audio_params *, + struct audio_params *); +int maestro_round_blocksize(void *, int); +int maestro_halt_output(void *); +int maestro_halt_input(void *); +int maestro_getdev(void *, struct audio_device *); +int maestro_set_port(void *, mixer_ctrl_t *); +int maestro_get_port(void *, mixer_ctrl_t *); +int maestro_query_devinfo(void *, mixer_devinfo_t *); +void *maestro_malloc(void *, int, size_t, int, int); +void maestro_free(void *, void *, int); +size_t maestro_round_buffersize(void *, int, size_t); +paddr_t maestro_mappage(void *, void *, off_t, int); +int maestro_get_props(void *); int maestro_trigger_output __P((void *, void *, void *, int, void (*)(void *), void *, struct audio_params *)); int maestro_trigger_input __P((void *, void *, void *, int, void (*)(void *), void *, struct audio_params *)); -int maestro_attach_codec __P((void *, struct ac97_codec_if *)); -int maestro_read_codec __P((void *, u_int8_t, u_int16_t *)); -int maestro_write_codec __P((void *, u_int8_t, u_int16_t)); -void maestro_reset_codec __P((void *)); +int maestro_attach_codec(void *, struct ac97_codec_if *); +int maestro_read_codec(void *, u_int8_t, u_int16_t *); +int maestro_write_codec(void *, u_int8_t, u_int16_t); +void maestro_reset_codec(void *); -void maestro_initcodec __P((void *)); +void maestro_initcodec(void *); -void maestro_set_speed __P((struct maestro_channel *, u_long *)); -void maestro_init __P((struct maestro_softc *)); -void maestro_power __P((struct maestro_softc *, int)); -void maestro_powerhook __P((int, void *)); +void maestro_set_speed(struct maestro_channel *, u_long *); +void maestro_init(struct maestro_softc *); +void maestro_power(struct maestro_softc *, int); +void maestro_powerhook(int, void *); -void maestro_channel_start __P((struct maestro_channel *)); -void maestro_channel_stop __P((struct maestro_channel *)); -void maestro_channel_advance_dma __P((struct maestro_channel *)); -void maestro_channel_suppress_jitter __P((struct maestro_channel *)); +void maestro_channel_start(struct maestro_channel *); +void maestro_channel_stop(struct maestro_channel *); +void maestro_channel_advance_dma(struct maestro_channel *); +void maestro_channel_suppress_jitter(struct maestro_channel *); -int maestro_get_flags __P((struct pci_attach_args *)); +int maestro_get_flags(struct pci_attach_args *); -void ringbus_setdest __P((struct maestro_softc *, int, int)); +void ringbus_setdest(struct maestro_softc *, int, int); -wpreg_t wp_reg_read __P((struct maestro_softc *, int)); -void wp_reg_write __P((struct maestro_softc *, int, wpreg_t)); -wpreg_t wp_apu_read __P((struct maestro_softc *, int, int)); -void wp_apu_write __P((struct maestro_softc *, int, int, wpreg_t)); -void wp_settimer __P((struct maestro_softc *, u_int)); -void wp_starttimer __P((struct maestro_softc *)); -void wp_stoptimer __P((struct maestro_softc *)); +wpreg_t wp_reg_read(struct maestro_softc *, int); +void wp_reg_write(struct maestro_softc *, int, wpreg_t); +wpreg_t wp_apu_read(struct maestro_softc *, int, int); +void wp_apu_write(struct maestro_softc *, int, int, wpreg_t); +void wp_settimer(struct maestro_softc *, u_int); +void wp_starttimer(struct maestro_softc *); +void wp_stoptimer(struct maestro_softc *); -wcreg_t wc_reg_read __P((struct maestro_softc *, int)); -void wc_reg_write __P((struct maestro_softc *, int, wcreg_t)); -wcreg_t wc_ctrl_read __P((struct maestro_softc *, int)); -void wc_ctrl_write __P((struct maestro_softc *, int, wcreg_t)); +wcreg_t wc_reg_read(struct maestro_softc *, int); +void wc_reg_write(struct maestro_softc *, int, wcreg_t); +wcreg_t wc_ctrl_read(struct maestro_softc *, int); +void wc_ctrl_write(struct maestro_softc *, int, wcreg_t); -u_int maestro_calc_timer_freq __P((struct maestro_channel *)); -void maestro_update_timer __P((struct maestro_softc *)); +u_int maestro_calc_timer_freq(struct maestro_channel *); +void maestro_update_timer(struct maestro_softc *); struct cfdriver maestro_cd = { NULL, "maestro", DV_DULL @@ -896,7 +896,7 @@ maestro_trigger_input(hdl, start, end, blksize, intr, arg, param) void *hdl; void *start, *end; int blksize; - void (*intr) __P((void *)); + void (*intr)(void *); void *arg; struct audio_params *param; { @@ -996,7 +996,7 @@ maestro_trigger_output(hdl, start, end, blksize, intr, arg, param) void *hdl; void *start, *end; int blksize; - void (*intr) __P((void *)); + void (*intr)(void *); void *arg; struct audio_params *param; { diff --git a/sys/dev/pci/neo.c b/sys/dev/pci/neo.c index 8683e65c21c..7028678630a 100644 --- a/sys/dev/pci/neo.c +++ b/sys/dev/pci/neo.c @@ -1,4 +1,4 @@ -/* $OpenBSD: neo.c,v 1.10 2002/01/20 19:56:53 ericj Exp $ */ +/* $OpenBSD: neo.c,v 1.11 2002/03/14 01:26:59 millert Exp $ */ /* * Copyright (c) 1999 Cameron Grant <gandalf@vilnya.demon.co.uk> @@ -174,35 +174,35 @@ static void nm_wr(struct neo_softc *, int, u_int32_t, int); static u_int32_t nm_rdbuf(struct neo_softc *, int, int); static void nm_wrbuf(struct neo_softc *, int, u_int32_t, int); -int neo_match __P((struct device *, void *, void *)); -void neo_attach __P((struct device *, struct device *, void *)); -int neo_intr __P((void *)); +int neo_match(struct device *, void *, void *); +void neo_attach(struct device *, struct device *, void *); +int neo_intr(void *); -int neo_open __P((void *, int)); -void neo_close __P((void *)); -int neo_query_encoding __P((void *, struct audio_encoding *)); -int neo_set_params __P((void *, int, int, struct audio_params *, struct audio_params *)); -int neo_round_blocksize __P((void *, int)); +int neo_open(void *, int); +void neo_close(void *); +int neo_query_encoding(void *, struct audio_encoding *); +int neo_set_params(void *, int, int, struct audio_params *, struct audio_params *); +int neo_round_blocksize(void *, int); int neo_trigger_output __P((void *, void *, void *, int, void (*)(void *), void *, struct audio_params *)); int neo_trigger_input __P((void *, void *, void *, int, void (*)(void *), void *, struct audio_params *)); -int neo_halt_output __P((void *)); -int neo_halt_input __P((void *)); -int neo_getdev __P((void *, struct audio_device *)); -int neo_mixer_set_port __P((void *, mixer_ctrl_t *)); -int neo_mixer_get_port __P((void *, mixer_ctrl_t *)); -int neo_attach_codec __P((void *sc, struct ac97_codec_if *)); -int neo_read_codec __P((void *sc, u_int8_t a, u_int16_t *d)); -int neo_write_codec __P((void *sc, u_int8_t a, u_int16_t d)); -void neo_reset_codec __P((void *sc)); -enum ac97_host_flags neo_flags_codec __P((void *sc)); -int neo_query_devinfo __P((void *, mixer_devinfo_t *)); -void *neo_malloc __P((void *, int, size_t, int, int)); -void neo_free __P((void *, void *, int)); -size_t neo_round_buffersize __P((void *, int, size_t)); -int neo_get_props __P((void *)); -void neo_set_mixer __P((struct neo_softc *sc, int a, int d)); +int neo_halt_output(void *); +int neo_halt_input(void *); +int neo_getdev(void *, struct audio_device *); +int neo_mixer_set_port(void *, mixer_ctrl_t *); +int neo_mixer_get_port(void *, mixer_ctrl_t *); +int neo_attach_codec(void *sc, struct ac97_codec_if *); +int neo_read_codec(void *sc, u_int8_t a, u_int16_t *d); +int neo_write_codec(void *sc, u_int8_t a, u_int16_t d); +void neo_reset_codec(void *sc); +enum ac97_host_flags neo_flags_codec(void *sc); +int neo_query_devinfo(void *, mixer_devinfo_t *); +void *neo_malloc(void *, int, size_t, int, int); +void neo_free(void *, void *, int); +size_t neo_round_buffersize(void *, int, size_t); +int neo_get_props(void *); +void neo_set_mixer(struct neo_softc *sc, int a, int d); @@ -908,7 +908,7 @@ neo_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; { @@ -944,7 +944,7 @@ neo_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/pci/ohci_pci.c b/sys/dev/pci/ohci_pci.c index 77aed422458..f548ccad245 100644 --- a/sys/dev/pci/ohci_pci.c +++ b/sys/dev/pci/ohci_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ohci_pci.c,v 1.14 2001/09/15 20:57:33 drahn Exp $ */ +/* $OpenBSD: ohci_pci.c,v 1.15 2002/03/14 01:26:59 millert Exp $ */ /* $NetBSD: ohci_pci.c,v 1.9 1999/05/20 09:52:35 augustss Exp $ */ /* @@ -64,9 +64,9 @@ #include <dev/usb/ohcireg.h> #include <dev/usb/ohcivar.h> -int ohci_pci_match __P((struct device *, void *, void *)); -void ohci_pci_attach __P((struct device *, struct device *, void *)); -int ohci_pci_detach __P((device_ptr_t, int)); +int ohci_pci_match(struct device *, void *, void *); +void ohci_pci_attach(struct device *, struct device *, void *); +int ohci_pci_detach(device_ptr_t, int); struct ohci_pci_softc { ohci_softc_t sc; diff --git a/sys/dev/pci/opl_eso.c b/sys/dev/pci/opl_eso.c index 1cc612b3c34..e5469e47516 100644 --- a/sys/dev/pci/opl_eso.c +++ b/sys/dev/pci/opl_eso.c @@ -1,4 +1,4 @@ -/* $OpenBSD: opl_eso.c,v 1.2 1999/08/05 05:32:41 deraadt Exp $ */ +/* $OpenBSD: opl_eso.c,v 1.3 2002/03/14 01:26:59 millert Exp $ */ /* $NetBSD: opl_eso.c,v 1.1 1999/07/12 15:13:31 kleink Exp $ */ /* @@ -70,8 +70,8 @@ #include <dev/ic/mpuvar.h> #include <dev/pci/esovar.h> -HIDE int opl_eso_match __P((struct device *, MATCH_ARG_2_T, void *)); -HIDE void opl_eso_attach __P((struct device *, struct device *, void *)); +HIDE int opl_eso_match(struct device *, MATCH_ARG_2_T, void *); +HIDE void opl_eso_attach(struct device *, struct device *, void *); struct cfattach opl_eso_ca = { sizeof (struct opl_softc), opl_eso_match, opl_eso_attach diff --git a/sys/dev/pci/opl_yds.c b/sys/dev/pci/opl_yds.c index 27731f5f2e1..5835c03a586 100644 --- a/sys/dev/pci/opl_yds.c +++ b/sys/dev/pci/opl_yds.c @@ -1,4 +1,4 @@ -/* $OpenBSD: opl_yds.c,v 1.2 2001/07/08 06:43:27 fgsch Exp $ */ +/* $OpenBSD: opl_yds.c,v 1.3 2002/03/14 01:26:59 millert Exp $ */ /* $NetBSD$ */ /* @@ -63,8 +63,8 @@ #include <dev/pci/ydsreg.h> #include <dev/pci/ydsvar.h> -int opl_yds_match __P((struct device *, void *, void *)); -void opl_yds_attach __P((struct device *, struct device *, void *)); +int opl_yds_match(struct device *, void *, void *); +void opl_yds_attach(struct device *, struct device *, void *); struct cfdriver opl_yds_cd = { NULL, "opl_yds", DV_DULL diff --git a/sys/dev/pci/pccbb.c b/sys/dev/pci/pccbb.c index d5d60067985..b00de73180b 100644 --- a/sys/dev/pci/pccbb.c +++ b/sys/dev/pci/pccbb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pccbb.c,v 1.28 2002/01/30 13:23:32 fgsch Exp $ */ +/* $OpenBSD: pccbb.c,v 1.29 2002/03/14 01:26:59 millert Exp $ */ /* $NetBSD: pccbb.c,v 1.42 2000/06/16 23:41:35 cgd Exp $ */ /* @@ -86,117 +86,117 @@ struct cfdriver cbb_cd = { #define DPRINTF(x) #endif -int pcicbbmatch __P((struct device *, void *, void *)); -void pccbbattach __P((struct device *, struct device *, void *)); -int pccbbintr __P((void *)); -void pccbb_shutdown __P((void *)); -void pci113x_insert __P((void *)); -int pccbbintr_function __P((struct pccbb_softc *)); +int pcicbbmatch(struct device *, void *, void *); +void pccbbattach(struct device *, struct device *, void *); +int pccbbintr(void *); +void pccbb_shutdown(void *); +void pci113x_insert(void *); +int pccbbintr_function(struct pccbb_softc *); -int pccbb_detect_card __P((struct pccbb_softc *)); +int pccbb_detect_card(struct pccbb_softc *); -void pccbb_pcmcia_write __P((struct pcic_handle *, int, int)); -u_int8_t pccbb_pcmcia_read __P((struct pcic_handle *, int)); +void pccbb_pcmcia_write(struct pcic_handle *, int, int); +u_int8_t pccbb_pcmcia_read(struct pcic_handle *, int); #define Pcic_read(ph, reg) ((ph)->ph_read((ph), (reg))) #define Pcic_write(ph, reg, val) ((ph)->ph_write((ph), (reg), (val))) -int cb_reset __P((struct pccbb_softc *)); -int cb_detect_voltage __P((struct pccbb_softc *)); -int cbbprint __P((void *, const char *)); +int cb_reset(struct pccbb_softc *); +int cb_detect_voltage(struct pccbb_softc *); +int cbbprint(void *, const char *); -int cb_chipset __P((u_int32_t, int *)); -void pccbb_pcmcia_attach_setup __P((struct pccbb_softc *, - struct pcmciabus_attach_args *)); +int cb_chipset(u_int32_t, int *); +void pccbb_pcmcia_attach_setup(struct pccbb_softc *, + struct pcmciabus_attach_args *); #if 0 -void pccbb_pcmcia_attach_card __P((struct pcic_handle *)); -void pccbb_pcmcia_detach_card __P((struct pcic_handle *, int)); -void pccbb_pcmcia_deactivate_card __P((struct pcic_handle *)); +void pccbb_pcmcia_attach_card(struct pcic_handle *); +void pccbb_pcmcia_detach_card(struct pcic_handle *, int); +void pccbb_pcmcia_deactivate_card(struct pcic_handle *); #endif -int pccbb_ctrl __P((cardbus_chipset_tag_t, int)); -int pccbb_power __P((cardbus_chipset_tag_t, int)); -int pccbb_cardenable __P((struct pccbb_softc * sc, int function)); +int pccbb_ctrl(cardbus_chipset_tag_t, int); +int pccbb_power(cardbus_chipset_tag_t, int); +int pccbb_cardenable(struct pccbb_softc * sc, int function); #if !rbus -int pccbb_io_open __P((cardbus_chipset_tag_t, int, u_int32_t, u_int32_t)); -int pccbb_io_close __P((cardbus_chipset_tag_t, int)); -int pccbb_mem_open __P((cardbus_chipset_tag_t, int, u_int32_t, u_int32_t)); -int pccbb_mem_close __P((cardbus_chipset_tag_t, int)); +int pccbb_io_open(cardbus_chipset_tag_t, int, u_int32_t, u_int32_t); +int pccbb_io_close(cardbus_chipset_tag_t, int); +int pccbb_mem_open(cardbus_chipset_tag_t, int, u_int32_t, u_int32_t); +int pccbb_mem_close(cardbus_chipset_tag_t, int); #endif /* !rbus */ void *pccbb_intr_establish __P((struct pccbb_softc *, int irq, int level, int (*ih) (void *), void *sc)); -void pccbb_intr_disestablish __P((struct pccbb_softc *, void *ih)); +void pccbb_intr_disestablish(struct pccbb_softc *, void *ih); void *pccbb_cb_intr_establish __P((cardbus_chipset_tag_t, int irq, int level, int (*ih) (void *), void *sc)); -void pccbb_cb_intr_disestablish __P((cardbus_chipset_tag_t ct, void *ih)); - -cardbustag_t pccbb_make_tag __P((cardbus_chipset_tag_t, int, int, int)); -void pccbb_free_tag __P((cardbus_chipset_tag_t, cardbustag_t)); -cardbusreg_t pccbb_conf_read __P((cardbus_chipset_tag_t, cardbustag_t, int)); -void pccbb_conf_write __P((cardbus_chipset_tag_t, cardbustag_t, int, - cardbusreg_t)); -void pccbb_chipinit __P((struct pccbb_softc *)); - -int pccbb_pcmcia_mem_alloc __P((pcmcia_chipset_handle_t, bus_size_t, - struct pcmcia_mem_handle *)); -void pccbb_pcmcia_mem_free __P((pcmcia_chipset_handle_t, - struct pcmcia_mem_handle *)); -int pccbb_pcmcia_mem_map __P((pcmcia_chipset_handle_t, int, bus_addr_t, - bus_size_t, struct pcmcia_mem_handle *, bus_addr_t *, int *)); -void pccbb_pcmcia_mem_unmap __P((pcmcia_chipset_handle_t, int)); -int pccbb_pcmcia_io_alloc __P((pcmcia_chipset_handle_t, bus_addr_t, - bus_size_t, bus_size_t, struct pcmcia_io_handle *)); -void pccbb_pcmcia_io_free __P((pcmcia_chipset_handle_t, - struct pcmcia_io_handle *)); -int pccbb_pcmcia_io_map __P((pcmcia_chipset_handle_t, int, bus_addr_t, - bus_size_t, struct pcmcia_io_handle *, int *)); -void pccbb_pcmcia_io_unmap __P((pcmcia_chipset_handle_t, int)); +void pccbb_cb_intr_disestablish(cardbus_chipset_tag_t ct, void *ih); + +cardbustag_t pccbb_make_tag(cardbus_chipset_tag_t, int, int, int); +void pccbb_free_tag(cardbus_chipset_tag_t, cardbustag_t); +cardbusreg_t pccbb_conf_read(cardbus_chipset_tag_t, cardbustag_t, int); +void pccbb_conf_write(cardbus_chipset_tag_t, cardbustag_t, int, + cardbusreg_t); +void pccbb_chipinit(struct pccbb_softc *); + +int pccbb_pcmcia_mem_alloc(pcmcia_chipset_handle_t, bus_size_t, + struct pcmcia_mem_handle *); +void pccbb_pcmcia_mem_free(pcmcia_chipset_handle_t, + struct pcmcia_mem_handle *); +int pccbb_pcmcia_mem_map(pcmcia_chipset_handle_t, int, bus_addr_t, + bus_size_t, struct pcmcia_mem_handle *, bus_addr_t *, int *); +void pccbb_pcmcia_mem_unmap(pcmcia_chipset_handle_t, int); +int pccbb_pcmcia_io_alloc(pcmcia_chipset_handle_t, bus_addr_t, + bus_size_t, bus_size_t, struct pcmcia_io_handle *); +void pccbb_pcmcia_io_free(pcmcia_chipset_handle_t, + struct pcmcia_io_handle *); +int pccbb_pcmcia_io_map(pcmcia_chipset_handle_t, int, bus_addr_t, + bus_size_t, struct pcmcia_io_handle *, int *); +void pccbb_pcmcia_io_unmap(pcmcia_chipset_handle_t, int); void *pccbb_pcmcia_intr_establish __P((pcmcia_chipset_handle_t, struct pcmcia_function *, int, int (*)(void *), void *, char *)); -void pccbb_pcmcia_intr_disestablish __P((pcmcia_chipset_handle_t, - void *)); -void pccbb_pcmcia_socket_enable __P((pcmcia_chipset_handle_t)); -void pccbb_pcmcia_socket_disable __P((pcmcia_chipset_handle_t)); -int pccbb_pcmcia_card_detect __P((pcmcia_chipset_handle_t pch)); +void pccbb_pcmcia_intr_disestablish(pcmcia_chipset_handle_t, + void *); +void pccbb_pcmcia_socket_enable(pcmcia_chipset_handle_t); +void pccbb_pcmcia_socket_disable(pcmcia_chipset_handle_t); +int pccbb_pcmcia_card_detect(pcmcia_chipset_handle_t pch); -void pccbb_pcmcia_do_io_map __P((struct pcic_handle *, int)); -void pccbb_pcmcia_wait_ready __P((struct pcic_handle *)); -void pccbb_pcmcia_do_mem_map __P((struct pcic_handle *, int)); -void pccbb_powerhook __P((int, void *)); +void pccbb_pcmcia_do_io_map(struct pcic_handle *, int); +void pccbb_pcmcia_wait_ready(struct pcic_handle *); +void pccbb_pcmcia_do_mem_map(struct pcic_handle *, int); +void pccbb_powerhook(int, void *); /* bus-space allocation and deallocation functions */ #if rbus -int pccbb_rbus_cb_space_alloc __P((cardbus_chipset_tag_t, rbus_tag_t, +int pccbb_rbus_cb_space_alloc(cardbus_chipset_tag_t, rbus_tag_t, bus_addr_t addr, bus_size_t size, bus_addr_t mask, bus_size_t align, - int flags, bus_addr_t * addrp, bus_space_handle_t * bshp)); -int pccbb_rbus_cb_space_free __P((cardbus_chipset_tag_t, rbus_tag_t, - bus_space_handle_t, bus_size_t)); + int flags, bus_addr_t * addrp, bus_space_handle_t * bshp); +int pccbb_rbus_cb_space_free(cardbus_chipset_tag_t, rbus_tag_t, + bus_space_handle_t, bus_size_t); #endif /* rbus */ #if rbus -int pccbb_open_win __P((struct pccbb_softc *, bus_space_tag_t, - bus_addr_t, bus_size_t, bus_space_handle_t, int flags)); -int pccbb_close_win __P((struct pccbb_softc *, bus_space_tag_t, - bus_space_handle_t, bus_size_t)); -int pccbb_winlist_insert __P((struct pccbb_win_chain_head *, bus_addr_t, - bus_size_t, bus_space_handle_t, int)); -int pccbb_winlist_delete __P((struct pccbb_win_chain_head *, - bus_space_handle_t, bus_size_t)); -void pccbb_winset __P((bus_addr_t align, struct pccbb_softc *, - bus_space_tag_t)); +int pccbb_open_win(struct pccbb_softc *, bus_space_tag_t, + bus_addr_t, bus_size_t, bus_space_handle_t, int flags); +int pccbb_close_win(struct pccbb_softc *, bus_space_tag_t, + bus_space_handle_t, bus_size_t); +int pccbb_winlist_insert(struct pccbb_win_chain_head *, bus_addr_t, + bus_size_t, bus_space_handle_t, int); +int pccbb_winlist_delete(struct pccbb_win_chain_head *, + bus_space_handle_t, bus_size_t); +void pccbb_winset(bus_addr_t align, struct pccbb_softc *, + bus_space_tag_t); void pccbb_winlist_show(struct pccbb_win_chain *); #endif /* rbus */ /* for config_defer */ -void pccbb_pci_callback __P((struct device *)); +void pccbb_pci_callback(struct device *); #if defined SHOW_REGS -void cb_show_regs __P((pci_chipset_tag_t, pcitag_t, bus_space_tag_t, - bus_space_handle_t memh)); +void cb_show_regs(pci_chipset_tag_t, pcitag_t, bus_space_tag_t, + bus_space_handle_t memh); #endif struct cfattach cbb_pci_ca = { @@ -1273,7 +1273,7 @@ pccbb_power(ct, command) #if defined CB_PCMCIA_POLL struct cb_poll_str { void *arg; - int (*func) __P((void *)); + int (*func)(void *); int level; pccard_chipset_tag_t ct; int count; @@ -1283,7 +1283,7 @@ static struct cb_poll_str cb_poll[10]; static int cb_poll_n = 0; static struct timeout cb_poll_timeout; -void cb_pcmcia_poll __P((void *arg)); +void cb_pcmcia_poll(void *arg); void cb_pcmcia_poll(arg) @@ -1605,7 +1605,7 @@ pccbb_mem_close(ct, win) * void *pccbb_cb_intr_establish(cardbus_chipset_tag_t ct, * int irq, * int level, - * int (* func) __P((void *)), + * int (* func)(void *), * void *arg) * * This function registers an interrupt handler at the bridge, in @@ -1618,7 +1618,7 @@ void * pccbb_cb_intr_establish(ct, irq, level, func, arg) cardbus_chipset_tag_t ct; int irq, level; - int (*func) __P((void *)); + int (*func)(void *); void *arg; { struct pccbb_softc *sc = (struct pccbb_softc *)ct; @@ -1648,7 +1648,7 @@ pccbb_cb_intr_disestablish(ct, ih) * void *pccbb_intr_establish(struct pccbb_softc *sc, * int irq, * int level, - * int (* func) __P((void *)), + * int (* func)(void *), * void *arg) * * This function registers an interrupt handler at the bridge, in @@ -1661,7 +1661,7 @@ void * pccbb_intr_establish(sc, irq, level, func, arg) struct pccbb_softc *sc; int irq, level; - int (*func) __P((void *)); + int (*func)(void *); void *arg; { struct pccbb_intrhand_list *pil, *newpil; @@ -2671,7 +2671,7 @@ pccbb_pcmcia_mem_unmap(pch, window) #if defined PCCBB_PCMCIA_POLL struct pccbb_poll_str { void *arg; - int (*func) __P((void *)); + int (*func)(void *); int level; struct pcic_handle *ph; int count; @@ -2682,7 +2682,7 @@ static struct pccbb_poll_str pccbb_poll[10]; static int pccbb_poll_n = 0; static struct timeout pccbb_poll_timeout; -void pccbb_pcmcia_poll __P((void *arg)); +void pccbb_pcmcia_poll(void *arg); void pccbb_pcmcia_poll(arg) @@ -2746,7 +2746,7 @@ pccbb_pcmcia_intr_establish(pch, pf, ipl, func, arg, xname) pcmcia_chipset_handle_t pch; struct pcmcia_function *pf; int ipl; - int (*func) __P((void *)); + int (*func)(void *); void *arg; char *xname; { diff --git a/sys/dev/pci/pccbbvar.h b/sys/dev/pci/pccbbvar.h index c54804b189e..389d70a5813 100644 --- a/sys/dev/pci/pccbbvar.h +++ b/sys/dev/pci/pccbbvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pccbbvar.h,v 1.5 2001/05/01 02:19:46 mickey Exp $ */ +/* $OpenBSD: pccbbvar.h,v 1.6 2002/03/14 01:26:59 millert Exp $ */ /* $NetBSD: pccbbvar.h,v 1.13 2000/06/08 10:28:29 haya Exp $ */ /* * Copyright (c) 1999 HAYAKAWA Koichi. All rights reserved. @@ -70,8 +70,8 @@ struct cbb_pcic_handle { struct device *ph_parent; bus_space_tag_t ph_base_t; bus_space_handle_t ph_base_h; - u_int8_t (*ph_read) __P((struct cbb_pcic_handle *, int)); - void (*ph_write) __P((struct cbb_pcic_handle *, int, u_int8_t)); + u_int8_t (*ph_read)(struct cbb_pcic_handle *, int); + void (*ph_write)(struct cbb_pcic_handle *, int, u_int8_t); int sock; int vendor; @@ -173,7 +173,7 @@ struct pccbb_softc { */ struct pccbb_intrhand_list { - int (*pil_func) __P((void *)); + int (*pil_func)(void *); void *pil_arg; int pil_level; struct pccbb_intrhand_list *pil_next; diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c index bbe7dac8142..31ab04831bd 100644 --- a/sys/dev/pci/pci.c +++ b/sys/dev/pci/pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pci.c,v 1.26 2002/02/23 16:59:36 matthieu Exp $ */ +/* $OpenBSD: pci.c,v 1.27 2002/03/14 01:26:59 millert Exp $ */ /* $NetBSD: pci.c,v 1.31 1997/06/06 23:48:04 thorpej Exp $ */ /* @@ -43,8 +43,8 @@ #include <dev/pci/pcivar.h> #include <dev/pci/pcidevs.h> -int pcimatch __P((struct device *, void *, void *)); -void pciattach __P((struct device *, struct device *, void *)); +int pcimatch(struct device *, void *, void *); +void pciattach(struct device *, struct device *, void *); #ifdef USER_PCICONF struct pci_softc { @@ -70,8 +70,8 @@ struct cfdriver pci_cd = { NULL, "pci", DV_DULL }; -int pciprint __P((void *, const char *)); -int pcisubmatch __P((struct device *, void *, void *)); +int pciprint(void *, const char *); +int pcisubmatch(struct device *, void *, void *); /* * Callback so that ISA/EISA bridges can attach their child busses @@ -94,7 +94,7 @@ int pcisubmatch __P((struct device *, void *, void *)); * up as an ISA device, and that can (bogusly) complicate the PCI device's * attach code, or make the PCI device not be properly attached at all. */ -static void (*pci_isa_bridge_callback) __P((void *)); +static void (*pci_isa_bridge_callback)(void *); static void *pci_isa_bridge_callback_arg; int @@ -321,7 +321,7 @@ pcisubmatch(parent, match, aux) void set_pci_isa_bridge_callback(fn, arg) - void (*fn) __P((void *)); + void (*fn)(void *); void *arg; { @@ -381,9 +381,9 @@ pci_get_capability(pc, tag, capid, offset, value) #endif -int pciopen __P((dev_t dev, int oflags, int devtype, struct proc *p)); -int pciclose __P((dev_t dev, int flag, int devtype, struct proc *p)); -int pciioctl __P((dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)); +int pciopen(dev_t dev, int oflags, int devtype, struct proc *p); +int pciclose(dev_t dev, int flag, int devtype, struct proc *p); +int pciioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p); int pciopen(dev_t dev, int oflags, int devtype, struct proc *p) diff --git a/sys/dev/pci/pci_map.c b/sys/dev/pci/pci_map.c index 6e383b0e7fc..6051d25d016 100644 --- a/sys/dev/pci/pci_map.c +++ b/sys/dev/pci/pci_map.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pci_map.c,v 1.6 2001/06/13 08:25:25 niklas Exp $ */ +/* $OpenBSD: pci_map.c,v 1.7 2002/03/14 01:26:59 millert Exp $ */ /* $NetBSD: pci_map.c,v 1.7 2000/05/10 16:58:42 thorpej Exp $ */ /*- @@ -49,10 +49,10 @@ #include <dev/pci/pcivar.h> -static int nbsd_pci_io_find __P((pci_chipset_tag_t, pcitag_t, int, pcireg_t, - bus_addr_t *, bus_size_t *, int *)); -static int nbsd_pci_mem_find __P((pci_chipset_tag_t, pcitag_t, int, pcireg_t, - bus_addr_t *, bus_size_t *, int *)); +static int nbsd_pci_io_find(pci_chipset_tag_t, pcitag_t, int, pcireg_t, + bus_addr_t *, bus_size_t *, int *); +static int nbsd_pci_mem_find(pci_chipset_tag_t, pcitag_t, int, pcireg_t, + bus_addr_t *, bus_size_t *, int *); static int nbsd_pci_io_find(pc, tag, reg, type, basep, sizep, flagsp) diff --git a/sys/dev/pci/pciide.c b/sys/dev/pci/pciide.c index b77fd0907c3..74ef9444af7 100644 --- a/sys/dev/pci/pciide.c +++ b/sys/dev/pci/pciide.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pciide.c,v 1.79 2002/03/01 20:01:35 chris Exp $ */ +/* $OpenBSD: pciide.c,v 1.80 2002/03/14 01:26:59 millert Exp $ */ /* $NetBSD: pciide.c,v 1.127 2001/08/03 01:31:08 tsutsui Exp $ */ /* @@ -120,10 +120,10 @@ int wdcdebug_pciide_mask = 0; #include <dev/ic/wdcvar.h> /* inlines for reading/writing 8-bit PCI registers */ -static __inline u_int8_t pciide_pci_read __P((pci_chipset_tag_t, pcitag_t, - int)); -static __inline void pciide_pci_write __P((pci_chipset_tag_t, pcitag_t, - int, u_int8_t)); +static __inline u_int8_t pciide_pci_read(pci_chipset_tag_t, pcitag_t, + int); +static __inline void pciide_pci_write(pci_chipset_tag_t, pcitag_t, + int, u_int8_t); static __inline u_int8_t pciide_pci_read(pc, pa, reg) @@ -188,74 +188,74 @@ struct pciide_softc { } pciide_channels[PCIIDE_NUM_CHANNELS]; }; -void default_chip_map __P((struct pciide_softc*, struct pci_attach_args*)); +void default_chip_map(struct pciide_softc*, struct pci_attach_args*); -void piix_chip_map __P((struct pciide_softc*, struct pci_attach_args*)); -void piix_setup_channel __P((struct channel_softc*)); -void piix3_4_setup_channel __P((struct channel_softc*)); +void piix_chip_map(struct pciide_softc*, struct pci_attach_args*); +void piix_setup_channel(struct channel_softc*); +void piix3_4_setup_channel(struct channel_softc*); -static u_int32_t piix_setup_idetim_timings __P((u_int8_t, u_int8_t, u_int8_t)); -static u_int32_t piix_setup_idetim_drvs __P((struct ata_drive_datas*)); -static u_int32_t piix_setup_sidetim_timings __P((u_int8_t, u_int8_t, u_int8_t)); +static u_int32_t piix_setup_idetim_timings(u_int8_t, u_int8_t, u_int8_t); +static u_int32_t piix_setup_idetim_drvs(struct ata_drive_datas*); +static u_int32_t piix_setup_sidetim_timings(u_int8_t, u_int8_t, u_int8_t); -void amd756_chip_map __P((struct pciide_softc*, struct pci_attach_args*)); -void amd756_setup_channel __P((struct channel_softc*)); +void amd756_chip_map(struct pciide_softc*, struct pci_attach_args*); +void amd756_setup_channel(struct channel_softc*); -void apollo_chip_map __P((struct pciide_softc*, struct pci_attach_args*)); -void apollo_setup_channel __P((struct channel_softc*)); +void apollo_chip_map(struct pciide_softc*, struct pci_attach_args*); +void apollo_setup_channel(struct channel_softc*); -void cmd_chip_map __P((struct pciide_softc*, struct pci_attach_args*)); -void cmd0643_9_chip_map __P((struct pciide_softc*, struct pci_attach_args*)); -void cmd0643_9_setup_channel __P((struct channel_softc*)); -void cmd_channel_map __P((struct pci_attach_args *, - struct pciide_softc *, int)); -int cmd_pci_intr __P((void *)); -void cmd646_9_irqack __P((struct channel_softc *)); +void cmd_chip_map(struct pciide_softc*, struct pci_attach_args*); +void cmd0643_9_chip_map(struct pciide_softc*, struct pci_attach_args*); +void cmd0643_9_setup_channel(struct channel_softc*); +void cmd_channel_map(struct pci_attach_args *, + struct pciide_softc *, int); +int cmd_pci_intr(void *); +void cmd646_9_irqack(struct channel_softc *); -void cy693_chip_map __P((struct pciide_softc*, struct pci_attach_args*)); -void cy693_setup_channel __P((struct channel_softc*)); +void cy693_chip_map(struct pciide_softc*, struct pci_attach_args*); +void cy693_setup_channel(struct channel_softc*); -void sis_chip_map __P((struct pciide_softc*, struct pci_attach_args*)); -void sis_setup_channel __P((struct channel_softc*)); +void sis_chip_map(struct pciide_softc*, struct pci_attach_args*); +void sis_setup_channel(struct channel_softc*); -void natsemi_chip_map __P((struct pciide_softc*, struct pci_attach_args*)); -void natsemi_setup_channel __P((struct channel_softc*)); -int natsemi_pci_intr __P((void *)); +void natsemi_chip_map(struct pciide_softc*, struct pci_attach_args*); +void natsemi_setup_channel(struct channel_softc*); +int natsemi_pci_intr(void *); -void acer_chip_map __P((struct pciide_softc*, struct pci_attach_args*)); -void acer_setup_channel __P((struct channel_softc*)); -int acer_pci_intr __P((void *)); +void acer_chip_map(struct pciide_softc*, struct pci_attach_args*); +void acer_setup_channel(struct channel_softc*); +int acer_pci_intr(void *); -void pdc202xx_chip_map __P((struct pciide_softc*, struct pci_attach_args*)); -void pdc202xx_setup_channel __P((struct channel_softc*)); -int pdc202xx_pci_intr __P((void *)); -int pdc20265_pci_intr __P((void *)); +void pdc202xx_chip_map(struct pciide_softc*, struct pci_attach_args*); +void pdc202xx_setup_channel(struct channel_softc*); +int pdc202xx_pci_intr(void *); +int pdc20265_pci_intr(void *); -void opti_chip_map __P((struct pciide_softc*, struct pci_attach_args*)); -void opti_setup_channel __P((struct channel_softc*)); +void opti_chip_map(struct pciide_softc*, struct pci_attach_args*); +void opti_setup_channel(struct channel_softc*); -void hpt_chip_map __P((struct pciide_softc*, struct pci_attach_args*)); -void hpt_setup_channel __P((struct channel_softc*)); -int hpt_pci_intr __P((void *)); +void hpt_chip_map(struct pciide_softc*, struct pci_attach_args*); +void hpt_setup_channel(struct channel_softc*); +int hpt_pci_intr(void *); -void acard_chip_map __P((struct pciide_softc*, struct pci_attach_args*)); -void acard_setup_channel __P((struct channel_softc*)); -int acard_pci_intr __P((void *)); +void acard_chip_map(struct pciide_softc*, struct pci_attach_args*); +void acard_setup_channel(struct channel_softc*); +int acard_pci_intr(void *); -void pciide_channel_dma_setup __P((struct pciide_channel *)); -int pciide_dma_table_setup __P((struct pciide_softc*, int, int)); -int pciide_dma_init __P((void*, int, int, void *, size_t, int)); -void pciide_dma_start __P((void*, int, int)); -int pciide_dma_finish __P((void*, int, int)); -void pciide_irqack __P((struct channel_softc *)); -void pciide_print_modes __P((struct pciide_channel *)); -void pciide_print_channels __P((int, pcireg_t));; +void pciide_channel_dma_setup(struct pciide_channel *); +int pciide_dma_table_setup(struct pciide_softc*, int, int); +int pciide_dma_init(void*, int, int, void *, size_t, int); +void pciide_dma_start(void*, int, int); +int pciide_dma_finish(void*, int, int); +void pciide_irqack(struct channel_softc *); +void pciide_print_modes(struct pciide_channel *); +void pciide_print_channels(int, pcireg_t);; struct pciide_product_desc { u_int32_t ide_product; u_short ide_flags; /* map and setup chip, probe drives */ - void (*chip_map) __P((struct pciide_softc*, struct pci_attach_args*)); + void (*chip_map)(struct pciide_softc*, struct pci_attach_args*); }; /* Flags for ide_flags */ @@ -483,11 +483,11 @@ const struct pciide_vendor_desc pciide_vendors[] = { #define PCIIDE_OPTIONS_DMA 0x01 #ifndef __OpenBSD__ -int pciide_match __P((struct device *, struct cfdata *, void *)); +int pciide_match(struct device *, struct cfdata *, void *); #else -int pciide_match __P((struct device *, void *, void *)); +int pciide_match(struct device *, void *, void *); #endif -void pciide_attach __P((struct device *, struct device *, void *)); +void pciide_attach(struct device *, struct device *, void *); struct cfattach pciide_ca = { sizeof(struct pciide_softc), pciide_match, pciide_attach @@ -498,28 +498,28 @@ struct cfdriver pciide_cd = { NULL, "pciide", DV_DULL }; #endif -int pciide_chipen __P((struct pciide_softc *, struct pci_attach_args *)); -int pciide_mapregs_compat __P(( struct pci_attach_args *, - struct pciide_channel *, int, bus_size_t *, bus_size_t*)); +int pciide_chipen(struct pciide_softc *, struct pci_attach_args *); +int pciide_mapregs_compat( struct pci_attach_args *, + struct pciide_channel *, int, bus_size_t *, bus_size_t*); int pciide_mapregs_native __P((struct pci_attach_args *, struct pciide_channel *, bus_size_t *, bus_size_t *, - int (*pci_intr) __P((void *)))); -void pciide_mapreg_dma __P((struct pciide_softc *, - struct pci_attach_args *)); -int pciide_chansetup __P((struct pciide_softc *, int, pcireg_t)); + int (*pci_intr)(void *))); +void pciide_mapreg_dma(struct pciide_softc *, + struct pci_attach_args *); +int pciide_chansetup(struct pciide_softc *, int, pcireg_t); void pciide_mapchan __P((struct pci_attach_args *, struct pciide_channel *, pcireg_t, bus_size_t *, bus_size_t *, - int (*pci_intr) __P((void *)))); -int pciide_chan_candisable __P((struct pciide_channel *)); -void pciide_map_compat_intr __P(( struct pci_attach_args *, - struct pciide_channel *, int, int)); -void pciide_unmap_compat_intr __P(( struct pci_attach_args *, - struct pciide_channel *, int, int)); -int pciide_compat_intr __P((void *)); -int pciide_pci_intr __P((void *)); + int (*pci_intr)(void *))); +int pciide_chan_candisable(struct pciide_channel *); +void pciide_map_compat_intr( struct pci_attach_args *, + struct pciide_channel *, int, int); +void pciide_unmap_compat_intr( struct pci_attach_args *, + struct pciide_channel *, int, int); +int pciide_compat_intr(void *); +int pciide_pci_intr(void *); int pciide_intr_flag(struct pciide_channel *); -const struct pciide_product_desc* pciide_lookup_product __P((u_int32_t)); +const struct pciide_product_desc* pciide_lookup_product(u_int32_t); const struct pciide_product_desc * pciide_lookup_product(id) @@ -689,7 +689,7 @@ pciide_mapregs_native(pa, cp, cmdsizep, ctlsizep, pci_intr) struct pci_attach_args * pa; struct pciide_channel *cp; bus_size_t *cmdsizep, *ctlsizep; - int (*pci_intr) __P((void *)); + int (*pci_intr)(void *); { struct pciide_softc *sc = (struct pciide_softc *)cp->wdc_channel.wdc; struct channel_softc *wdc_cp = &cp->wdc_channel; @@ -1218,7 +1218,7 @@ pciide_mapchan(pa, cp, interface, cmdsizep, ctlsizep, pci_intr) struct pciide_channel *cp; pcireg_t interface; bus_size_t *cmdsizep, *ctlsizep; - int (*pci_intr) __P((void *)); + int (*pci_intr)(void *); { struct channel_softc *wdc_cp = &cp->wdc_channel; diff --git a/sys/dev/pci/pciidevar.h b/sys/dev/pci/pciidevar.h index 5a454786193..4afc1188cae 100644 --- a/sys/dev/pci/pciidevar.h +++ b/sys/dev/pci/pciidevar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pciidevar.h,v 1.4 2001/06/25 21:40:20 csapuntz Exp $ */ +/* $OpenBSD: pciidevar.h,v 1.5 2002/03/14 01:26:59 millert Exp $ */ /* $NetBSD: pciidevar.h,v 1.6 2001/01/12 16:04:00 bouyer Exp $ */ /* @@ -46,5 +46,5 @@ struct device; /* Attach compat interrupt handler, returning handle or NULL if failed. */ void *pciide_machdep_compat_intr_establish __P((struct device *, struct pci_attach_args *, int, int (*)(void *), void *)); -void pciide_machdep_compat_intr_disestablish __P((pci_chipset_tag_t pc, - void *)); +void pciide_machdep_compat_intr_disestablish(pci_chipset_tag_t pc, + void *); diff --git a/sys/dev/pci/pcivar.h b/sys/dev/pci/pcivar.h index 7367b63991b..3759041e5dc 100644 --- a/sys/dev/pci/pcivar.h +++ b/sys/dev/pci/pcivar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pcivar.h,v 1.22 2002/01/03 20:52:24 nate Exp $ */ +/* $OpenBSD: pcivar.h,v 1.23 2002/03/14 01:26:59 millert Exp $ */ /* $NetBSD: pcivar.h,v 1.23 1997/06/06 23:48:05 thorpej Exp $ */ /* @@ -166,33 +166,33 @@ struct pci_quirkdata { * Configuration space access and utility functions. (Note that most, * e.g. make_tag, conf_read, conf_write are declared by pci_machdep.h.) */ -pcireg_t pci_mapreg_type __P((pci_chipset_tag_t, pcitag_t, int)); -int pci_mapreg_info __P((pci_chipset_tag_t, pcitag_t, int, pcireg_t, - bus_addr_t *, bus_size_t *, int *)); -int pci_mapreg_map __P((struct pci_attach_args *, int, pcireg_t, int, +pcireg_t pci_mapreg_type(pci_chipset_tag_t, pcitag_t, int); +int pci_mapreg_info(pci_chipset_tag_t, pcitag_t, int, pcireg_t, + bus_addr_t *, bus_size_t *, int *); +int pci_mapreg_map(struct pci_attach_args *, int, pcireg_t, int, bus_space_tag_t *, bus_space_handle_t *, bus_addr_t *, - bus_size_t *, bus_size_t)); + bus_size_t *, bus_size_t); -int pci_io_find __P((pci_chipset_tag_t, pcitag_t, int, bus_addr_t *, - bus_size_t *)); -int pci_mem_find __P((pci_chipset_tag_t, pcitag_t, int, bus_addr_t *, - bus_size_t *, int *)); +int pci_io_find(pci_chipset_tag_t, pcitag_t, int, bus_addr_t *, + bus_size_t *); +int pci_mem_find(pci_chipset_tag_t, pcitag_t, int, bus_addr_t *, + bus_size_t *, int *); -int pci_get_capability __P((pci_chipset_tag_t, pcitag_t, int, - int *, pcireg_t *)); +int pci_get_capability(pci_chipset_tag_t, pcitag_t, int, + int *, pcireg_t *); /* * Helper functions for autoconfiguration. */ -void pci_devinfo __P((pcireg_t, pcireg_t, int, char *)); +void pci_devinfo(pcireg_t, pcireg_t, int, char *); void set_pci_isa_bridge_callback __P((void (*)(void *), void *)); const struct pci_quirkdata * - pci_lookup_quirkdata __P((pci_vendor_id_t, pci_product_id_t)); + pci_lookup_quirkdata(pci_vendor_id_t, pci_product_id_t); /* * Misc. */ -const char *pci_findvendor __P((pcireg_t)); +const char *pci_findvendor(pcireg_t); #endif /* _DEV_PCI_PCIVAR_H_ */ diff --git a/sys/dev/pci/pcscp.c b/sys/dev/pci/pcscp.c index 493fbfe09b7..e747437fca8 100644 --- a/sys/dev/pci/pcscp.c +++ b/sys/dev/pci/pcscp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pcscp.c,v 1.8 2001/11/05 17:25:58 art Exp $ */ +/* $OpenBSD: pcscp.c,v 1.9 2002/03/14 01:26:59 millert Exp $ */ /* $NetBSD: pcscp.c,v 1.11 2000/11/14 18:42:58 thorpej Exp $ */ /*- @@ -103,8 +103,8 @@ struct pcscp_softc { #undef NCR_WRITE_REG #define NCR_WRITE_REG(sc, reg, val) pcscp_write_reg((sc), (reg), (val)) -int pcscp_match __P((struct device *, void *, void *)); -void pcscp_attach __P((struct device *, struct device *, void *)); +int pcscp_match(struct device *, void *, void *); +void pcscp_attach(struct device *, struct device *, void *); struct cfattach pcscp_ca = { sizeof(struct pcscp_softc), pcscp_match, pcscp_attach @@ -118,16 +118,16 @@ struct cfdriver pcscp_cd = { * Functions and the switch for the MI code. */ -u_char pcscp_read_reg __P((struct ncr53c9x_softc *, int)); -void pcscp_write_reg __P((struct ncr53c9x_softc *, int, u_char)); -int pcscp_dma_isintr __P((struct ncr53c9x_softc *)); -void pcscp_dma_reset __P((struct ncr53c9x_softc *)); -int pcscp_dma_intr __P((struct ncr53c9x_softc *)); -int pcscp_dma_setup __P((struct ncr53c9x_softc *, caddr_t *, - size_t *, int, size_t *)); -void pcscp_dma_go __P((struct ncr53c9x_softc *)); -void pcscp_dma_stop __P((struct ncr53c9x_softc *)); -int pcscp_dma_isactive __P((struct ncr53c9x_softc *)); +u_char pcscp_read_reg(struct ncr53c9x_softc *, int); +void pcscp_write_reg(struct ncr53c9x_softc *, int, u_char); +int pcscp_dma_isintr(struct ncr53c9x_softc *); +void pcscp_dma_reset(struct ncr53c9x_softc *); +int pcscp_dma_intr(struct ncr53c9x_softc *); +int pcscp_dma_setup(struct ncr53c9x_softc *, caddr_t *, + size_t *, int, size_t *); +void pcscp_dma_go(struct ncr53c9x_softc *); +void pcscp_dma_stop(struct ncr53c9x_softc *); +int pcscp_dma_isactive(struct ncr53c9x_softc *); struct scsi_adapter pcscp_adapter = { ncr53c9x_scsi_cmd, /* cmd */ diff --git a/sys/dev/pci/plx9060var.h b/sys/dev/pci/plx9060var.h index d8dfc952456..4a86794cfb0 100644 --- a/sys/dev/pci/plx9060var.h +++ b/sys/dev/pci/plx9060var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: plx9060var.h,v 1.1 2001/06/21 13:21:50 nate Exp $ */ +/* $OpenBSD: plx9060var.h,v 1.2 2002/03/14 01:26:59 millert Exp $ */ /* $NetBSD$ */ /*- @@ -49,9 +49,9 @@ struct plx9060_config { }; #ifdef notyet -void plx9060_read_eeprom __P((struct plx9060_config *, int, int, void *)); -void plx9060_write_eeprom __P((struct plx9060_config *, int, int, - const void *)); +void plx9060_read_eeprom(struct plx9060_config *, int, int, void *); +void plx9060_write_eeprom(struct plx9060_config *, int, int, + const void *); #endif #endif /* _DEV_PCI_PLX9060VAR_H_ */ diff --git a/sys/dev/pci/ppb.c b/sys/dev/pci/ppb.c index 80602a7bdf1..04461506a9a 100644 --- a/sys/dev/pci/ppb.c +++ b/sys/dev/pci/ppb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ppb.c,v 1.10 2000/01/15 08:16:24 deraadt Exp $ */ +/* $OpenBSD: ppb.c,v 1.11 2002/03/14 01:26:59 millert Exp $ */ /* $NetBSD: ppb.c,v 1.16 1997/06/06 23:48:05 thorpej Exp $ */ /* @@ -50,8 +50,8 @@ #include <dev/pci/pcidevs.h> #include <dev/pci/ppbreg.h> -int ppbmatch __P((struct device *, void *, void *)); -void ppbattach __P((struct device *, struct device *, void *)); +int ppbmatch(struct device *, void *, void *); +void ppbattach(struct device *, struct device *, void *); struct cfattach ppb_ca = { sizeof(struct device), ppbmatch, ppbattach @@ -61,7 +61,7 @@ struct cfdriver ppb_cd = { NULL, "ppb", DV_DULL }; -int ppbprint __P((void *, const char *pnp)); +int ppbprint(void *, const char *pnp); int ppbmatch(parent, match, aux) diff --git a/sys/dev/pci/puc.c b/sys/dev/pci/puc.c index d2949b183bc..27e963414f6 100644 --- a/sys/dev/pci/puc.c +++ b/sys/dev/pci/puc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: puc.c,v 1.5 2001/08/25 10:13:30 art Exp $ */ +/* $OpenBSD: puc.c,v 1.6 2002/03/14 01:26:59 millert Exp $ */ /* $NetBSD: puc.c,v 1.3 1999/02/06 06:29:54 cgd Exp $ */ /* @@ -82,15 +82,15 @@ struct puc_softc { struct device *dev; /* filled in by port attachments */ - int (*ihand) __P((void *)); + int (*ihand)(void *); void *ihandarg; } sc_ports[PUC_MAX_PORTS]; }; -int puc_match __P((struct device *, void *, void *)); -void puc_attach __P((struct device *, struct device *, void *)); -int puc_print __P((void *, const char *)); -int puc_submatch __P((struct device *, void *, void *)); +int puc_match(struct device *, void *, void *); +void puc_attach(struct device *, struct device *, void *); +int puc_print(void *, const char *); +int puc_submatch(struct device *, void *, void *); struct cfattach puc_ca = { sizeof(struct puc_softc), puc_match, puc_attach @@ -101,9 +101,9 @@ struct cfdriver puc_cd = { }; static const struct puc_device_description * - puc_find_description __P((pcireg_t, pcireg_t, pcireg_t, pcireg_t)); + puc_find_description(pcireg_t, pcireg_t, pcireg_t, pcireg_t); static const char * - puc_port_type_name __P((int)); + puc_port_type_name(int); int puc_match(parent, match, aux) diff --git a/sys/dev/pci/siop_pci.c b/sys/dev/pci/siop_pci.c index f43b6b0aa8d..8225c743bad 100644 --- a/sys/dev/pci/siop_pci.c +++ b/sys/dev/pci/siop_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: siop_pci.c,v 1.2 2001/03/01 17:14:28 krw Exp $ */ +/* $OpenBSD: siop_pci.c,v 1.3 2002/03/14 01:27:00 millert Exp $ */ /* $NetBSD: siop_pci.c,v 1.8 2000/05/15 07:53:17 bouyer Exp $ */ /* @@ -46,8 +46,8 @@ #include <dev/ic/siopvar.h> #include <dev/pci/siop_pci_common.h> -int siop_pci_match __P((struct device *, void *, void *)); -void siop_pci_attach __P((struct device *, struct device *, void *)); +int siop_pci_match(struct device *, void *, void *); +void siop_pci_attach(struct device *, struct device *, void *); struct cfattach siop_pci_ca = { sizeof(struct siop_pci_softc), siop_pci_match, siop_pci_attach diff --git a/sys/dev/pci/siop_pci_common.h b/sys/dev/pci/siop_pci_common.h index 39d640250fd..0dc24a7c4b2 100644 --- a/sys/dev/pci/siop_pci_common.h +++ b/sys/dev/pci/siop_pci_common.h @@ -1,4 +1,4 @@ -/* $OpenBSD: siop_pci_common.h,v 1.3 2001/04/15 06:01:31 krw Exp $ */ +/* $OpenBSD: siop_pci_common.h,v 1.4 2002/03/14 01:27:00 millert Exp $ */ /* $NetBSD: siop_pci_common.h,v 1.2 2000/10/23 14:57:23 bouyer Exp $ */ /* @@ -47,7 +47,7 @@ struct siop_product_desc { int ram_size; /* size of RAM, if appropriate */ }; -const struct siop_product_desc * siop_lookup_product __P((u_int32_t, int)); +const struct siop_product_desc * siop_lookup_product(u_int32_t, int); /* Driver internal state */ struct siop_pci_softc { @@ -58,6 +58,6 @@ struct siop_pci_softc { const struct siop_product_desc *sc_pp; /* Adapter description */ }; -int siop_pci_attach_common __P((struct siop_pci_softc *, - struct pci_attach_args *)); -void siop_pci_reset __P((struct siop_softc *)); +int siop_pci_attach_common(struct siop_pci_softc *, + struct pci_attach_args *); +void siop_pci_reset(struct siop_softc *); diff --git a/sys/dev/pci/sv.c b/sys/dev/pci/sv.c index 2e25b57afa0..94be98d11a6 100644 --- a/sys/dev/pci/sv.c +++ b/sys/dev/pci/sv.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sv.c,v 1.11 2002/01/20 19:56:53 ericj Exp $ */ +/* $OpenBSD: sv.c,v 1.12 2002/03/14 01:27:00 millert Exp $ */ /* * Copyright (c) 1998 Constantine Paul Sapuntzakis @@ -74,12 +74,12 @@ static int svdebug = 100; #define __BROKEN_INDIRECT_CONFIG #ifdef __BROKEN_INDIRECT_CONFIG -int sv_match __P((struct device *, void *, void *)); +int sv_match(struct device *, void *, void *); #else -int sv_match __P((struct device *, struct cfdata *, void *)); +int sv_match(struct device *, struct cfdata *, void *); #endif -static void sv_attach __P((struct device *, struct device *, void *)); -int sv_intr __P((void *)); +static void sv_attach(struct device *, struct device *, void *); +int sv_intr(void *); struct sv_dma { bus_dmamap_t map; @@ -139,31 +139,31 @@ struct audio_device sv_device = { #define ARRAY_SIZE(foo) ((sizeof(foo)) / sizeof(foo[0])) -int sv_allocmem __P((struct sv_softc *, size_t, size_t, struct sv_dma *)); -int sv_freemem __P((struct sv_softc *, struct sv_dma *)); +int sv_allocmem(struct sv_softc *, size_t, size_t, struct sv_dma *); +int sv_freemem(struct sv_softc *, struct sv_dma *); -int sv_open __P((void *, int)); -void sv_close __P((void *)); -int sv_query_encoding __P((void *, struct audio_encoding *)); -int sv_set_params __P((void *, int, int, struct audio_params *, struct audio_params *)); -int sv_round_blocksize __P((void *, int)); -int sv_dma_init_output __P((void *, void *, int)); -int sv_dma_init_input __P((void *, void *, int)); +int sv_open(void *, int); +void sv_close(void *); +int sv_query_encoding(void *, struct audio_encoding *); +int sv_set_params(void *, int, int, struct audio_params *, struct audio_params *); +int sv_round_blocksize(void *, int); +int sv_dma_init_output(void *, void *, int); +int sv_dma_init_input(void *, void *, int); int sv_dma_output __P((void *, void *, int, void (*)(void *), void*)); int sv_dma_input __P((void *, void *, int, void (*)(void *), void*)); -int sv_halt_in_dma __P((void *)); -int sv_halt_out_dma __P((void *)); -int sv_getdev __P((void *, struct audio_device *)); -int sv_mixer_set_port __P((void *, mixer_ctrl_t *)); -int sv_mixer_get_port __P((void *, mixer_ctrl_t *)); -int sv_query_devinfo __P((void *, mixer_devinfo_t *)); -void *sv_malloc __P((void *, int, size_t, int, int)); -void sv_free __P((void *, void *, int)); -size_t sv_round __P((void *, int, size_t)); -paddr_t sv_mappage __P((void *, void *, off_t, int)); -int sv_get_props __P((void *)); - -void sv_dumpregs __P((struct sv_softc *sc)); +int sv_halt_in_dma(void *); +int sv_halt_out_dma(void *); +int sv_getdev(void *, struct audio_device *); +int sv_mixer_set_port(void *, mixer_ctrl_t *); +int sv_mixer_get_port(void *, mixer_ctrl_t *); +int sv_query_devinfo(void *, mixer_devinfo_t *); +void *sv_malloc(void *, int, size_t, int, int); +void sv_free(void *, void *, int); +size_t sv_round(void *, int, size_t); +paddr_t sv_mappage(void *, void *, off_t, int); +int sv_get_props(void *); + +void sv_dumpregs(struct sv_softc *sc); struct audio_hw_if sv_hw_if = { sv_open, @@ -195,11 +195,11 @@ struct audio_hw_if sv_hw_if = { }; -static __inline__ u_int8_t sv_read __P((struct sv_softc *, u_int8_t)); -static __inline__ u_int8_t sv_read_indirect __P((struct sv_softc *, u_int8_t)); -static __inline__ void sv_write __P((struct sv_softc *, u_int8_t, u_int8_t )); -static __inline__ void sv_write_indirect __P((struct sv_softc *, u_int8_t, u_int8_t )); -static void sv_init_mixer __P((struct sv_softc *)); +static __inline__ u_int8_t sv_read(struct sv_softc *, u_int8_t); +static __inline__ u_int8_t sv_read_indirect(struct sv_softc *, u_int8_t); +static __inline__ void sv_write(struct sv_softc *, u_int8_t, u_int8_t ); +static __inline__ void sv_write_indirect(struct sv_softc *, u_int8_t, u_int8_t ); +static void sv_init_mixer(struct sv_softc *); static __inline__ void sv_write (sc, reg, val) @@ -683,8 +683,8 @@ sv_set_params(addr, setmode, usemode, p, r) struct audio_params *p, *r; { struct sv_softc *sc = addr; - 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); u_int32_t mode, val; u_int8_t reg; @@ -884,7 +884,7 @@ sv_dma_output(addr, p, cc, intr, arg) void *addr; void *p; int cc; - void (*intr) __P((void *)); + void (*intr)(void *); void *arg; { struct sv_softc *sc = addr; @@ -915,7 +915,7 @@ sv_dma_input(addr, p, cc, intr, arg) void *addr; void *p; int cc; - void (*intr) __P((void *)); + void (*intr)(void *); void *arg; { struct sv_softc *sc = addr; diff --git a/sys/dev/pci/tga.c b/sys/dev/pci/tga.c index c050c47632a..977aa824287 100644 --- a/sys/dev/pci/tga.c +++ b/sys/dev/pci/tga.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tga.c,v 1.10 2001/11/06 19:53:19 miod Exp $ */ +/* $OpenBSD: tga.c,v 1.11 2002/03/14 01:27:00 millert Exp $ */ /* $NetBSD: tga.c,v 1.31 2001/02/11 19:34:58 nathanw Exp $ */ /* @@ -64,9 +64,9 @@ #include <mips/pte.h> #endif -int tgamatch __P((struct device *, struct cfdata *, void *)); -void tgaattach __P((struct device *, struct device *, void *)); -int tgaprint __P((void *, const char *)); +int tgamatch(struct device *, struct cfdata *, void *); +void tgaattach(struct device *, struct device *, void *); +int tgaprint(void *, const char *); struct cfdriver tga_cd = { NULL, "tga", DV_DULL @@ -76,45 +76,45 @@ struct cfattach tga_ca = { sizeof(struct tga_softc), (cfmatch_t)tgamatch, tgaattach, }; -int tga_identify __P((struct tga_devconfig *)); -const struct tga_conf *tga_getconf __P((int)); -void tga_getdevconfig __P((bus_space_tag_t memt, pci_chipset_tag_t pc, - pcitag_t tag, struct tga_devconfig *dc)); +int tga_identify(struct tga_devconfig *); +const struct tga_conf *tga_getconf(int); +void tga_getdevconfig(bus_space_tag_t memt, pci_chipset_tag_t pc, + pcitag_t tag, struct tga_devconfig *dc); struct tga_devconfig tga_console_dc; -int tga_ioctl __P((void *, u_long, caddr_t, int, struct proc *)); -paddr_t tga_mmap __P((void *, off_t, int)); -static void tga_copyrows __P((void *, int, int, int)); -static void tga_copycols __P((void *, int, int, int, int)); -static int tga_alloc_screen __P((void *, const struct wsscreen_descr *, - void **, int *, int *, long *)); -static void tga_free_screen __P((void *, void *)); +int tga_ioctl(void *, u_long, caddr_t, int, struct proc *); +paddr_t tga_mmap(void *, off_t, int); +static void tga_copyrows(void *, int, int, int); +static void tga_copycols(void *, int, int, int, int); +static int tga_alloc_screen(void *, const struct wsscreen_descr *, + void **, int *, int *, long *); +static void tga_free_screen(void *, void *); static int tga_show_screen __P((void *, void *, int, void (*) (void *, int, int), void *)); -static int tga_rop __P((struct rasops_info *, int, int, int, int, int, - struct rasops_info *, int, int)); -static int tga_rop_vtov __P((struct rasops_info *, int, int, int, int, - int, struct rasops_info *, int, int )); -static void tga_putchar __P((void *c, int row, int col, - u_int uc, long attr)); -static void tga_eraserows __P((void *, int, int, long)); -static void tga_erasecols __P((void *, int, int, int, long)); -void tga2_init __P((struct tga_devconfig *, int)); - -void tga_config_interrupts __P((struct device *)); +static int tga_rop(struct rasops_info *, int, int, int, int, int, + struct rasops_info *, int, int); +static int tga_rop_vtov(struct rasops_info *, int, int, int, int, + int, struct rasops_info *, int, int ); +static void tga_putchar(void *c, int row, int col, + u_int uc, long attr); +static void tga_eraserows(void *, int, int, long); +static void tga_erasecols(void *, int, int, int, long); +void tga2_init(struct tga_devconfig *, int); + +void tga_config_interrupts(struct device *); /* RAMDAC interface functions */ int tga_sched_update __P((void *, void (*)(void *))); -void tga_ramdac_wr __P((void *, u_int, u_int8_t)); -u_int8_t tga_ramdac_rd __P((void *, u_int)); -void tga_bt463_wr __P((void *, u_int, u_int8_t)); -u_int8_t tga_bt463_rd __P((void *, u_int)); -void tga2_ramdac_wr __P((void *, u_int, u_int8_t)); -u_int8_t tga2_ramdac_rd __P((void *, u_int)); +void tga_ramdac_wr(void *, u_int, u_int8_t); +u_int8_t tga_ramdac_rd(void *, u_int); +void tga_bt463_wr(void *, u_int, u_int8_t); +u_int8_t tga_bt463_rd(void *, u_int); +void tga2_ramdac_wr(void *, u_int, u_int8_t); +u_int8_t tga2_ramdac_rd(void *, u_int); /* Interrupt handler */ -int tga_intr __P((void *)); +int tga_intr(void *); /* The NULL entries will get filled in by rasops_init(). * XXX and the non-NULL ones will be overwritten; reset after calling it. @@ -157,8 +157,8 @@ struct wsdisplay_accessops tga_accessops = { NULL /* scrollback */ }; -void tga_blank __P((struct tga_devconfig *)); -void tga_unblank __P((struct tga_devconfig *)); +void tga_blank(struct tga_devconfig *); +void tga_unblank(struct tga_devconfig *); #ifdef TGA_DEBUG #define DPRINTF(...) printf (__VA_ARGS__) @@ -621,7 +621,7 @@ tga_ioctl(v, cmd, data, flag, p) int tga_sched_update(v, f) void *v; - void (*f) __P((void *)); + void (*f)(void *); { struct tga_devconfig *dc = v; @@ -743,7 +743,7 @@ tga_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; { @@ -1525,10 +1525,10 @@ tga2_ramdac_rd(v, btreg) } #include <dev/ic/decmonitors.c> -void tga2_ics9110_wr __P(( +void tga2_ics9110_wr( struct tga_devconfig *dc, int dotclock -)); +); void tga2_init(dc, m) diff --git a/sys/dev/pci/tgavar.h b/sys/dev/pci/tgavar.h index 068452f513b..f29f81616f3 100644 --- a/sys/dev/pci/tgavar.h +++ b/sys/dev/pci/tgavar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tgavar.h,v 1.4 2001/03/18 04:37:21 nate Exp $ */ +/* $OpenBSD: tgavar.h,v 1.5 2002/03/14 01:27:00 millert Exp $ */ /* $NetBSD: tgavar.h,v 1.8 2000/04/02 19:01:11 nathanw Exp $ */ /* @@ -43,7 +43,7 @@ struct fbcurpos; struct tga_conf { char *tgac_name; /* name for this board type */ - struct ramdac_funcs *(*ramdac_funcs) __P((void)); + struct ramdac_funcs *(*ramdac_funcs)(void); int tgac_phys_depth; /* physical frame buffer depth */ vsize_t tgac_cspace_size; /* core space size */ @@ -90,7 +90,7 @@ struct tga_devconfig { int dc_blanked; /* currently had video disabled */ void *dc_ramdac_private; /* RAMDAC private storage */ - void (*dc_ramdac_intr) __P((void *)); + void (*dc_ramdac_intr)(void *); int dc_intrenabled; /* can we depend on interrupts yet? */ }; @@ -118,22 +118,22 @@ struct tga_softc { PCI_PRODUCT(id) == PCI_PRODUCT_DEC_21030) || \ PCI_PRODUCT(id) == PCI_PRODUCT_DEC_PBXGB) ? 10 : 0) -int tga_cnattach __P((bus_space_tag_t, bus_space_tag_t, pci_chipset_tag_t, - int, int, int)); - -int tga_identify __P((struct tga_devconfig *)); -const struct tga_conf *tga_getconf __P((int)); - -int tga_builtin_set_cursor __P((struct tga_devconfig *, - struct wsdisplay_cursor *)); -int tga_builtin_get_cursor __P((struct tga_devconfig *, - struct wsdisplay_cursor *)); -int tga_builtin_set_curpos __P((struct tga_devconfig *, - struct wsdisplay_curpos *)); -int tga_builtin_get_curpos __P((struct tga_devconfig *, - struct wsdisplay_curpos *)); -int tga_builtin_get_curmax __P((struct tga_devconfig *, - struct wsdisplay_curpos *)); +int tga_cnattach(bus_space_tag_t, bus_space_tag_t, pci_chipset_tag_t, + int, int, int); + +int tga_identify(struct tga_devconfig *); +const struct tga_conf *tga_getconf(int); + +int tga_builtin_set_cursor(struct tga_devconfig *, + struct wsdisplay_cursor *); +int tga_builtin_get_cursor(struct tga_devconfig *, + struct wsdisplay_cursor *); +int tga_builtin_set_curpos(struct tga_devconfig *, + struct wsdisplay_curpos *); +int tga_builtin_get_curpos(struct tga_devconfig *, + struct wsdisplay_curpos *); +int tga_builtin_get_curmax(struct tga_devconfig *, + struct wsdisplay_curpos *); /* Read a TGA register */ #define TGARREG(dc,reg) (bus_space_read_4((dc)->dc_memt, (dc)->dc_regs, \ diff --git a/sys/dev/pci/twe_pci.c b/sys/dev/pci/twe_pci.c index 306317d9d23..5357100f6f3 100644 --- a/sys/dev/pci/twe_pci.c +++ b/sys/dev/pci/twe_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: twe_pci.c,v 1.5 2001/08/25 10:13:30 art Exp $ */ +/* $OpenBSD: twe_pci.c,v 1.6 2002/03/14 01:27:00 millert Exp $ */ /* * Copyright (c) 2000 Michael Shalayeff @@ -51,8 +51,8 @@ #define TWE_BAR 0x10 -int twe_pci_match __P((struct device *, void *, void *)); -void twe_pci_attach __P((struct device *, struct device *, void *)); +int twe_pci_match(struct device *, void *, void *); +void twe_pci_attach(struct device *, struct device *, void *); struct cfattach twe_pci_ca = { sizeof(struct twe_softc), twe_pci_match, twe_pci_attach diff --git a/sys/dev/pci/ubsec.c b/sys/dev/pci/ubsec.c index 02658a8701d..f7a6e8c02af 100644 --- a/sys/dev/pci/ubsec.c +++ b/sys/dev/pci/ubsec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ubsec.c,v 1.82 2002/01/28 17:10:11 jason Exp $ */ +/* $OpenBSD: ubsec.c,v 1.83 2002/03/14 01:27:00 millert Exp $ */ /* * Copyright (c) 2000 Jason L. Wright (jason@thought.net) @@ -68,14 +68,14 @@ /* * Prototypes and count for the pci_device structure */ -int ubsec_probe __P((struct device *, void *, void *)); -void ubsec_attach __P((struct device *, struct device *, void *)); -void ubsec_reset_board __P((struct ubsec_softc *)); -void ubsec_init_board __P((struct ubsec_softc *)); -void ubsec_init_pciregs __P((struct pci_attach_args *pa)); -void ubsec_cleanchip __P((struct ubsec_softc *)); -void ubsec_totalreset __P((struct ubsec_softc *)); -int ubsec_free_q __P((struct ubsec_softc*, struct ubsec_q *)); +int ubsec_probe(struct device *, void *, void *); +void ubsec_attach(struct device *, struct device *, void *); +void ubsec_reset_board(struct ubsec_softc *); +void ubsec_init_board(struct ubsec_softc *); +void ubsec_init_pciregs(struct pci_attach_args *pa); +void ubsec_cleanchip(struct ubsec_softc *); +void ubsec_totalreset(struct ubsec_softc *); +int ubsec_free_q(struct ubsec_softc*, struct ubsec_q *); struct cfattach ubsec_ca = { sizeof(struct ubsec_softc), ubsec_probe, ubsec_attach, @@ -85,20 +85,20 @@ struct cfdriver ubsec_cd = { 0, "ubsec", DV_DULL }; -int ubsec_intr __P((void *)); -int ubsec_newsession __P((u_int32_t *, struct cryptoini *)); -int ubsec_freesession __P((u_int64_t)); -int ubsec_process __P((struct cryptop *)); -void ubsec_callback __P((struct ubsec_softc *, struct ubsec_q *)); -int ubsec_feed __P((struct ubsec_softc *)); -void ubsec_mcopy __P((struct mbuf *, struct mbuf *, int, int)); -void ubsec_callback2 __P((struct ubsec_softc *, struct ubsec_q2 *)); -int ubsec_feed2 __P((struct ubsec_softc *)); -void ubsec_rng __P((void *)); -int ubsec_dma_malloc __P((struct ubsec_softc *, bus_size_t, - struct ubsec_dma_alloc *, int)); -void ubsec_dma_free __P((struct ubsec_softc *, struct ubsec_dma_alloc *)); -int ubsec_dmamap_aligned __P((bus_dmamap_t)); +int ubsec_intr(void *); +int ubsec_newsession(u_int32_t *, struct cryptoini *); +int ubsec_freesession(u_int64_t); +int ubsec_process(struct cryptop *); +void ubsec_callback(struct ubsec_softc *, struct ubsec_q *); +int ubsec_feed(struct ubsec_softc *); +void ubsec_mcopy(struct mbuf *, struct mbuf *, int, int); +void ubsec_callback2(struct ubsec_softc *, struct ubsec_q2 *); +int ubsec_feed2(struct ubsec_softc *); +void ubsec_rng(void *); +int ubsec_dma_malloc(struct ubsec_softc *, bus_size_t, + struct ubsec_dma_alloc *, int); +void ubsec_dma_free(struct ubsec_softc *, struct ubsec_dma_alloc *); +int ubsec_dmamap_aligned(bus_dmamap_t); #define READ_REG(sc,r) \ bus_space_read_4((sc)->sc_st, (sc)->sc_sh, (r)) diff --git a/sys/dev/pci/uhci_pci.c b/sys/dev/pci/uhci_pci.c index 8e49e420dd9..7d61e247e7d 100644 --- a/sys/dev/pci/uhci_pci.c +++ b/sys/dev/pci/uhci_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uhci_pci.c,v 1.12 2001/08/25 10:13:30 art Exp $ */ +/* $OpenBSD: uhci_pci.c,v 1.13 2002/03/14 01:27:00 millert Exp $ */ /* $NetBSD: uhci_pci.c,v 1.14 2000/01/25 11:26:06 augustss Exp $ */ /* @@ -57,9 +57,9 @@ #include <dev/usb/uhcireg.h> #include <dev/usb/uhcivar.h> -int uhci_pci_match __P((struct device *, void *, void *)); -void uhci_pci_attach __P((struct device *, struct device *, void *)); -int uhci_pci_detach __P((device_ptr_t, int)); +int uhci_pci_match(struct device *, void *, void *); +void uhci_pci_attach(struct device *, struct device *, void *); +int uhci_pci_detach(device_ptr_t, int); struct uhci_pci_softc { uhci_softc_t sc; diff --git a/sys/dev/pci/vga_pci.c b/sys/dev/pci/vga_pci.c index f91902a359e..dc1b323da24 100644 --- a/sys/dev/pci/vga_pci.c +++ b/sys/dev/pci/vga_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vga_pci.c,v 1.10 2001/05/08 16:16:11 mickey Exp $ */ +/* $OpenBSD: vga_pci.c,v 1.11 2002/03/14 01:27:00 millert Exp $ */ /* $NetBSD: vga_pci.c,v 1.3 1998/06/08 06:55:58 thorpej Exp $ */ /* @@ -58,8 +58,8 @@ struct vga_pci_softc { #endif }; -int vga_pci_match __P((struct device *, void *, void *)); -void vga_pci_attach __P((struct device *, struct device *, void *)); +int vga_pci_match(struct device *, void *, void *); +void vga_pci_attach(struct device *, struct device *, void *); struct cfattach vga_pci_ca = { sizeof(struct vga_pci_softc), vga_pci_match, vga_pci_attach, diff --git a/sys/dev/pci/vga_pcivar.h b/sys/dev/pci/vga_pcivar.h index 6e968d5f1c9..58b934d5169 100644 --- a/sys/dev/pci/vga_pcivar.h +++ b/sys/dev/pci/vga_pcivar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: vga_pcivar.h,v 1.3 2000/11/15 20:17:38 aaron Exp $ */ +/* $OpenBSD: vga_pcivar.h,v 1.4 2002/03/14 01:27:00 millert Exp $ */ /* $NetBSD: vga_pcivar.h,v 1.1 1998/03/22 15:16:19 drochner Exp $ */ /* @@ -34,5 +34,5 @@ (PCI_CLASS(class) == PCI_CLASS_PREHISTORIC && \ PCI_SUBCLASS(class) == PCI_SUBCLASS_PREHISTORIC_VGA)) ? 1 : 0) -int vga_pci_cnattach __P((bus_space_tag_t, bus_space_tag_t, - pci_chipset_tag_t, int, int, int)); +int vga_pci_cnattach(bus_space_tag_t, bus_space_tag_t, + pci_chipset_tag_t, int, int, int); diff --git a/sys/dev/pci/wdt.c b/sys/dev/pci/wdt.c index 573d1f39b28..9d1a8f33afa 100644 --- a/sys/dev/pci/wdt.c +++ b/sys/dev/pci/wdt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wdt.c,v 1.3 2001/02/03 06:19:13 mickey Exp $ */ +/* $OpenBSD: wdt.c,v 1.4 2002/03/14 01:27:00 millert Exp $ */ /*- * Copyright (c) 1998,1999 Alex Nash @@ -67,32 +67,32 @@ struct wdt_softc { }; /* externally visible functions */ -int wdtprobe __P((struct device *, void *, void *)); -void wdtattach __P((struct device *, struct device *, void *)); -int wdtopen __P((dev_t, int, int, struct proc *)); -int wdtclose __P((dev_t, int, int, struct proc *)); -int wdtioctl __P((dev_t, u_long, caddr_t, int, struct proc *)); +int wdtprobe(struct device *, void *, void *); +void wdtattach(struct device *, struct device *, void *); +int wdtopen(dev_t, int, int, struct proc *); +int wdtclose(dev_t, int, int, struct proc *); +int wdtioctl(dev_t, u_long, caddr_t, int, struct proc *); /* static functions */ -static int wdt_is501 __P((struct wdt_softc *wdt)); -static void wdt_8254_count __P((struct wdt_softc *wdt, int counter, u_int16_t v)); -static void wdt_8254_mode __P((struct wdt_softc *wdt, int counter, int mode)); -static void wdt_set_timeout __P((struct wdt_softc *wdt, unsigned seconds)); -static void wdt_timeout __P((void *arg)); -static void wdt_init_timer __P((struct wdt_softc *wdt)); -static void wdt_buzzer_off __P((struct wdt_softc *wdt)); -static int wdt_read_temperature __P((struct wdt_softc *wdt)); -static int wdt_read_status __P((struct wdt_softc *wdt)); -static void wdt_display_status __P((struct wdt_softc *wdt)); -static int wdt_get_state __P((struct wdt_softc *wdt, struct wdt_state *state)); -static void wdt_shutdown __P((void *arg)); -static int wdt_sched __P((struct wdt_softc *wdt, struct proc *p)); -static void wdt_timer_disable __P((struct wdt_softc *wdt)); -static void wdt_timer_enable __P((struct wdt_softc *wdt, unsigned seconds)); +static int wdt_is501(struct wdt_softc *wdt); +static void wdt_8254_count(struct wdt_softc *wdt, int counter, u_int16_t v); +static void wdt_8254_mode(struct wdt_softc *wdt, int counter, int mode); +static void wdt_set_timeout(struct wdt_softc *wdt, unsigned seconds); +static void wdt_timeout(void *arg); +static void wdt_init_timer(struct wdt_softc *wdt); +static void wdt_buzzer_off(struct wdt_softc *wdt); +static int wdt_read_temperature(struct wdt_softc *wdt); +static int wdt_read_status(struct wdt_softc *wdt); +static void wdt_display_status(struct wdt_softc *wdt); +static int wdt_get_state(struct wdt_softc *wdt, struct wdt_state *state); +static void wdt_shutdown(void *arg); +static int wdt_sched(struct wdt_softc *wdt, struct proc *p); +static void wdt_timer_disable(struct wdt_softc *wdt); +static void wdt_timer_enable(struct wdt_softc *wdt, unsigned seconds); #if WDT_DISABLE_BUZZER -static void wdt_buzzer_disable __P((struct wdt_softc *wdt)); +static void wdt_buzzer_disable(struct wdt_softc *wdt); #else -static void wdt_buzzer_enable __P((struct wdt_softc *wdt)); +static void wdt_buzzer_enable(struct wdt_softc *wdt); #endif struct cfattach wdt_ca = { diff --git a/sys/dev/pci/yds.c b/sys/dev/pci/yds.c index 80c8b54f82f..973bd7b461c 100644 --- a/sys/dev/pci/yds.c +++ b/sys/dev/pci/yds.c @@ -1,4 +1,4 @@ -/* $OpenBSD: yds.c,v 1.13 2002/01/20 19:56:53 ericj Exp $ */ +/* $OpenBSD: yds.c,v 1.14 2002/03/14 01:27:00 millert Exp $ */ /* $NetBSD: yds.c,v 1.5 2001/05/21 23:55:04 minoura Exp $ */ /* @@ -92,16 +92,16 @@ int ydsdebug = 0; # define YDS_INPUT_SLOT 1 /* ADC slot */ #endif -int yds_match __P((struct device *, void *, void *)); -void yds_attach __P((struct device *, struct device *, void *)); -int yds_intr __P((void *)); +int yds_match(struct device *, void *, void *); +void yds_attach(struct device *, struct device *, void *); +int yds_intr(void *); #define DMAADDR(p) ((p)->map->dm_segs[0].ds_addr) #define KERNADDR(p) ((void *)((p)->addr)) -int yds_allocmem __P((struct yds_softc *, size_t, size_t, - struct yds_dma *)); -int yds_freemem __P((struct yds_softc *, struct yds_dma *)); +int yds_allocmem(struct yds_softc *, size_t, size_t, + struct yds_dma *); +int yds_freemem(struct yds_softc *, struct yds_dma *); #ifndef AUDIO_DEBUG #define YWRITE1(sc, r, x) bus_space_write_1((sc)->memt, (sc)->memh, (r), (x)) @@ -156,52 +156,52 @@ struct cfdriver yds_cd = { NULL, "yds", DV_DULL }; -int yds_open __P((void *, int)); -void yds_close __P((void *)); -int yds_query_encoding __P((void *, struct audio_encoding *)); -int yds_set_params __P((void *, int, int, - struct audio_params *, struct audio_params *)); -int yds_round_blocksize __P((void *, int)); +int yds_open(void *, int); +void yds_close(void *); +int yds_query_encoding(void *, struct audio_encoding *); +int yds_set_params(void *, int, int, + struct audio_params *, struct audio_params *); +int yds_round_blocksize(void *, int); int yds_trigger_output __P((void *, void *, void *, int, void (*)(void *), void *, struct audio_params *)); int yds_trigger_input __P((void *, void *, void *, int, void (*)(void *), void *, struct audio_params *)); -int yds_halt_output __P((void *)); -int yds_halt_input __P((void *)); -int yds_getdev __P((void *, struct audio_device *)); -int yds_mixer_set_port __P((void *, mixer_ctrl_t *)); -int yds_mixer_get_port __P((void *, mixer_ctrl_t *)); -void *yds_malloc __P((void *, int, size_t, int, int)); -void yds_free __P((void *, void *, int)); -size_t yds_round_buffersize __P((void *, int, size_t)); -paddr_t yds_mappage __P((void *, void *, off_t, int)); -int yds_get_props __P((void *)); -int yds_query_devinfo __P((void *addr, mixer_devinfo_t *dip)); - -int yds_attach_codec __P((void *sc, struct ac97_codec_if *)); -int yds_read_codec __P((void *sc, u_int8_t a, u_int16_t *d)); -int yds_write_codec __P((void *sc, u_int8_t a, u_int16_t d)); -void yds_reset_codec __P((void *sc)); -int yds_get_portnum_by_name __P((struct yds_softc *, char *, char *, - char *)); - -static u_int yds_get_dstype __P((int)); -static int yds_download_mcode __P((struct yds_softc *)); -static int yds_allocate_slots __P((struct yds_softc *)); -static void yds_configure_legacy __P((struct device *arg)); -static void yds_enable_dsp __P((struct yds_softc *)); -static int yds_disable_dsp __P((struct yds_softc *)); -static int yds_ready_codec __P((struct yds_codec_softc *)); -static int yds_halt __P((struct yds_softc *)); -static u_int32_t yds_get_lpfq __P((u_int)); -static u_int32_t yds_get_lpfk __P((u_int)); -static struct yds_dma *yds_find_dma __P((struct yds_softc *, void *)); - -void yds_powerhook __P((int, void *)); -int yds_init __P((void *sc)); +int yds_halt_output(void *); +int yds_halt_input(void *); +int yds_getdev(void *, struct audio_device *); +int yds_mixer_set_port(void *, mixer_ctrl_t *); +int yds_mixer_get_port(void *, mixer_ctrl_t *); +void *yds_malloc(void *, int, size_t, int, int); +void yds_free(void *, void *, int); +size_t yds_round_buffersize(void *, int, size_t); +paddr_t yds_mappage(void *, void *, off_t, int); +int yds_get_props(void *); +int yds_query_devinfo(void *addr, mixer_devinfo_t *dip); + +int yds_attach_codec(void *sc, struct ac97_codec_if *); +int yds_read_codec(void *sc, u_int8_t a, u_int16_t *d); +int yds_write_codec(void *sc, u_int8_t a, u_int16_t d); +void yds_reset_codec(void *sc); +int yds_get_portnum_by_name(struct yds_softc *, char *, char *, + char *); + +static u_int yds_get_dstype(int); +static int yds_download_mcode(struct yds_softc *); +static int yds_allocate_slots(struct yds_softc *); +static void yds_configure_legacy(struct device *arg); +static void yds_enable_dsp(struct yds_softc *); +static int yds_disable_dsp(struct yds_softc *); +static int yds_ready_codec(struct yds_codec_softc *); +static int yds_halt(struct yds_softc *); +static u_int32_t yds_get_lpfq(u_int); +static u_int32_t yds_get_lpfk(u_int); +static struct yds_dma *yds_find_dma(struct yds_softc *, void *); + +void yds_powerhook(int, void *); +int yds_init(void *sc); #ifdef AUDIO_DEBUG -static void yds_dump_play_slot __P((struct yds_softc *, int)); +static void yds_dump_play_slot(struct yds_softc *, int); #define YDS_DUMP_PLAY_SLOT(n,sc,bank) \ if (ydsdebug > (n)) yds_dump_play_slot(sc, bank) #else @@ -1311,7 +1311,7 @@ yds_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; #define P44 (sc->sc_flags & YDS_CAP_HAS_P44) @@ -1452,7 +1452,7 @@ yds_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; { |