diff options
| author | Alfred Perlstein <alfred@FreeBSD.org> | 2002-03-20 02:08:01 +0000 |
|---|---|---|
| committer | Alfred Perlstein <alfred@FreeBSD.org> | 2002-03-20 02:08:01 +0000 |
| commit | e51a25f8505c7f9c6684c928bb59b0bda2fc039b (patch) | |
| tree | 13b2f09af75205c81c286aaf60527ae3de623e14 | |
| parent | c605e9e62f94150fea168cf43328076ea7789885 (diff) | |
| download | src-test2-e51a25f8505c7f9c6684c928bb59b0bda2fc039b.tar.gz src-test2-e51a25f8505c7f9c6684c928bb59b0bda2fc039b.zip | |
Notes
152 files changed, 2256 insertions, 2310 deletions
diff --git a/sys/dev/acpica/acpivar.h b/sys/dev/acpica/acpivar.h index 5a04cf54c8f4..579696dd8978 100644 --- a/sys/dev/acpica/acpivar.h +++ b/sys/dev/acpica/acpivar.h @@ -297,7 +297,7 @@ extern UINT32 acpi_eventhandler_sleep_button_for_wakeup(void *context); #define ACPI_EVENT_PRI_DEFAULT 10000 #define ACPI_EVENT_PRI_LAST 20000 -typedef void (*acpi_event_handler_t) __P((void *, int)); +typedef void (*acpi_event_handler_t)(void *, int); EVENTHANDLER_DECLARE(acpi_sleep_event, acpi_event_handler_t); EVENTHANDLER_DECLARE(acpi_wakeup_event, acpi_event_handler_t); diff --git a/sys/dev/aic/aic.c b/sys/dev/aic/aic.c index 9b60cf810ee4..57ac1124cee4 100644 --- a/sys/dev/aic/aic.c +++ b/sys/dev/aic/aic.c @@ -45,26 +45,26 @@ #include <dev/aic/aic6360reg.h> #include <dev/aic/aicvar.h> -static void aic_action __P((struct cam_sim *sim, union ccb *ccb)); -static void aic_execute_scb __P((void *arg, bus_dma_segment_t *dm_segs, - int nseg, int error)); -static void aic_start __P((struct aic_softc *aic)); -static void aic_select __P((struct aic_softc *aic)); -static void aic_selected __P((struct aic_softc *aic)); -static void aic_reselected __P((struct aic_softc *aic)); -static void aic_reconnect __P((struct aic_softc *aic, int tag)); -static void aic_cmd __P((struct aic_softc *aic)); -static void aic_msgin __P((struct aic_softc *aic)); -static void aic_handle_msgin __P((struct aic_softc *aic)); -static void aic_msgout __P((struct aic_softc *aic)); -static void aic_datain __P((struct aic_softc *aic)); -static void aic_dataout __P((struct aic_softc *aic)); -static void aic_done __P((struct aic_softc *aic, struct aic_scb *scb)); -static void aic_poll __P((struct cam_sim *sim)); -static void aic_timeout __P((void *arg)); -static void aic_scsi_reset __P((struct aic_softc *aic)); -static void aic_chip_reset __P((struct aic_softc *aic)); -static void aic_reset __P((struct aic_softc *aic, int initiate_reset)); +static void aic_action(struct cam_sim *sim, union ccb *ccb); +static void aic_execute_scb(void *arg, bus_dma_segment_t *dm_segs, + int nseg, int error); +static void aic_start(struct aic_softc *aic); +static void aic_select(struct aic_softc *aic); +static void aic_selected(struct aic_softc *aic); +static void aic_reselected(struct aic_softc *aic); +static void aic_reconnect(struct aic_softc *aic, int tag); +static void aic_cmd(struct aic_softc *aic); +static void aic_msgin(struct aic_softc *aic); +static void aic_handle_msgin(struct aic_softc *aic); +static void aic_msgout(struct aic_softc *aic); +static void aic_datain(struct aic_softc *aic); +static void aic_dataout(struct aic_softc *aic); +static void aic_done(struct aic_softc *aic, struct aic_scb *scb); +static void aic_poll(struct cam_sim *sim); +static void aic_timeout(void *arg); +static void aic_scsi_reset(struct aic_softc *aic); +static void aic_chip_reset(struct aic_softc *aic); +static void aic_reset(struct aic_softc *aic, int initiate_reset); devclass_t aic_devclass; diff --git a/sys/dev/aic/aic_cbus.c b/sys/dev/aic/aic_cbus.c index c54ac6709407..4008fe526b72 100644 --- a/sys/dev/aic/aic_cbus.c +++ b/sys/dev/aic/aic_cbus.c @@ -48,10 +48,10 @@ struct aic_isa_softc { void *sc_ih; }; -static int aic_isa_alloc_resources __P((device_t)); -static void aic_isa_release_resources __P((device_t)); -static int aic_isa_probe __P((device_t)); -static int aic_isa_attach __P((device_t)); +static int aic_isa_alloc_resources(device_t); +static void aic_isa_release_resources(device_t); +static int aic_isa_probe(device_t); +static int aic_isa_attach(device_t); #ifdef PC98 static u_int aic_isa_ports[] = { 0x1840 }; diff --git a/sys/dev/aic/aic_isa.c b/sys/dev/aic/aic_isa.c index 64dbafc0ad9a..afcbf85f8b0a 100644 --- a/sys/dev/aic/aic_isa.c +++ b/sys/dev/aic/aic_isa.c @@ -48,10 +48,10 @@ struct aic_isa_softc { void *sc_ih; }; -static int aic_isa_alloc_resources __P((device_t)); -static void aic_isa_release_resources __P((device_t)); -static int aic_isa_probe __P((device_t)); -static int aic_isa_attach __P((device_t)); +static int aic_isa_alloc_resources(device_t); +static void aic_isa_release_resources(device_t); +static int aic_isa_probe(device_t); +static int aic_isa_attach(device_t); static u_int aic_isa_ports[] = { 0x340, 0x140 }; #define AIC_ISA_NUMPORTS (sizeof(aic_isa_ports) / sizeof(aic_isa_ports[0])) diff --git a/sys/dev/aic/aicvar.h b/sys/dev/aic/aicvar.h index cddb027ae867..d834fb64dda4 100644 --- a/sys/dev/aic/aicvar.h +++ b/sys/dev/aic/aicvar.h @@ -153,7 +153,7 @@ struct aic_softc { bus_space_write_multi_4((aic)->tag, (aic)->bsh, (port), \ (u_int32_t *)(addr), (count)) -extern int aic_probe __P((struct aic_softc *)); -extern int aic_attach __P((struct aic_softc *)); -extern int aic_detach __P((struct aic_softc *)); -extern void aic_intr __P((void *)); +extern int aic_probe(struct aic_softc *); +extern int aic_attach(struct aic_softc *); +extern int aic_detach(struct aic_softc *); +extern void aic_intr(void *); diff --git a/sys/dev/an/if_an.c b/sys/dev/an/if_an.c index ad143c934c47..e713796f609f 100644 --- a/sys/dev/an/if_an.c +++ b/sys/dev/an/if_an.c @@ -136,54 +136,52 @@ static const char rcsid[] = #endif /* These are global because we need them in sys/pci/if_an_p.c. */ -static void an_reset __P((struct an_softc *)); -static int an_ioctl __P((struct ifnet *, u_long, caddr_t)); -static void an_init __P((void *)); -static int an_init_tx_ring __P((struct an_softc *)); -static void an_start __P((struct ifnet *)); -static void an_watchdog __P((struct ifnet *)); -static void an_rxeof __P((struct an_softc *)); -static void an_txeof __P((struct an_softc *, int)); - -static void an_promisc __P((struct an_softc *, int)); -static int an_cmd __P((struct an_softc *, int, int)); -static int an_read_record __P((struct an_softc *, struct an_ltv_gen *)); -static int an_write_record __P((struct an_softc *, struct an_ltv_gen *)); -static int an_read_data __P((struct an_softc *, int, - int, caddr_t, int)); -static int an_write_data __P((struct an_softc *, int, - int, caddr_t, int)); -static int an_seek __P((struct an_softc *, int, int, int)); -static int an_alloc_nicmem __P((struct an_softc *, int, int *)); -static void an_stats_update __P((void *)); -static void an_setdef __P((struct an_softc *, struct an_req *)); +static void an_reset (struct an_softc *); +static int an_ioctl (struct ifnet *, u_long, caddr_t); +static void an_init (void *); +static int an_init_tx_ring (struct an_softc *); +static void an_start (struct ifnet *); +static void an_watchdog (struct ifnet *); +static void an_rxeof (struct an_softc *); +static void an_txeof (struct an_softc *, int); + +static void an_promisc (struct an_softc *, int); +static int an_cmd (struct an_softc *, int, int); +static int an_read_record (struct an_softc *, struct an_ltv_gen *); +static int an_write_record (struct an_softc *, struct an_ltv_gen *); +static int an_read_data (struct an_softc *, int, int, caddr_t, int); +static int an_write_data (struct an_softc *, int, int, caddr_t, int); +static int an_seek (struct an_softc *, int, int, int); +static int an_alloc_nicmem (struct an_softc *, int, int *); +static void an_stats_update (void *); +static void an_setdef (struct an_softc *, struct an_req *); #ifdef ANCACHE -static void an_cache_store __P((struct an_softc *, struct ether_header *, - struct mbuf *, unsigned short)); +static void an_cache_store (struct an_softc *, struct ether_header *, + struct mbuf *, unsigned short); #endif /* function definitions for use with the Cisco's Linux configuration utilities */ -static int readrids __P((struct ifnet*, struct aironet_ioctl*)); -static int writerids __P((struct ifnet*, struct aironet_ioctl*)); -static int flashcard __P((struct ifnet*, struct aironet_ioctl*)); +static int readrids(struct ifnet*, struct aironet_ioctl*); +static int writerids(struct ifnet*, struct aironet_ioctl*); +static int flashcard(struct ifnet*, struct aironet_ioctl*); -static int cmdreset __P((struct ifnet *)); -static int setflashmode __P((struct ifnet *)); -static int flashgchar __P((struct ifnet *,int,int)); -static int flashpchar __P((struct ifnet *,int,int)); -static int flashputbuf __P((struct ifnet *)); -static int flashrestart __P((struct ifnet *)); -static int WaitBusy __P((struct ifnet *, int)); -static int unstickbusy __P((struct ifnet *)); +static int cmdreset(struct ifnet *); +static int setflashmode(struct ifnet *); +static int flashgchar(struct ifnet *,int,int); +static int flashpchar(struct ifnet *,int,int); +static int flashputbuf(struct ifnet *); +static int flashrestart(struct ifnet *); +static int WaitBusy(struct ifnet *, int); +static int unstickbusy(struct ifnet *); -static void an_dump_record __P((struct an_softc *,struct an_ltv_gen *, - char *)); +static void an_dump_record (struct an_softc *,struct an_ltv_gen *, + char *); -static int an_media_change __P((struct ifnet *)); -static void an_media_status __P((struct ifnet *, struct ifmediareq *)); +static int an_media_change (struct ifnet *); +static void an_media_status (struct ifnet *, struct ifmediareq *); static int an_dump = 0; diff --git a/sys/dev/an/if_an_isa.c b/sys/dev/an/if_an_isa.c index 54489bcaf500..db879a505f58 100644 --- a/sys/dev/an/if_an_isa.c +++ b/sys/dev/an/if_an_isa.c @@ -81,9 +81,9 @@ static struct isa_pnp_id an_ids[] = { { 0, NULL } }; -static int an_probe_isa __P((device_t)); -static int an_attach_isa __P((device_t)); -static int an_detach_isa __P((device_t)); +static int an_probe_isa (device_t); +static int an_attach_isa (device_t); +static int an_detach_isa (device_t); static int an_probe_isa(dev) diff --git a/sys/dev/an/if_an_pci.c b/sys/dev/an/if_an_pci.c index 3d0223d807b1..f1e320a5c891 100644 --- a/sys/dev/an/if_an_pci.c +++ b/sys/dev/an/if_an_pci.c @@ -112,9 +112,9 @@ static struct an_type an_devs[] = { { 0, 0, NULL } }; -static int an_probe_pci __P((device_t)); -static int an_attach_pci __P((device_t)); -static int an_detach_pci __P((device_t)); +static int an_probe_pci (device_t); +static int an_attach_pci (device_t); +static int an_detach_pci (device_t); static int an_probe_pci(device_t dev) diff --git a/sys/dev/an/if_anreg.h b/sys/dev/an/if_anreg.h index 9d5631479080..70350ee0328a 100644 --- a/sys/dev/an/if_anreg.h +++ b/sys/dev/an/if_anreg.h @@ -368,14 +368,14 @@ struct an_softc { #define AN_LOCK(_sc) mtx_lock(&(_sc)->an_mtx) #define AN_UNLOCK(_sc) mtx_unlock(&(_sc)->an_mtx) -void an_release_resources __P((device_t)); -int an_alloc_port __P((device_t, int, int)); -int an_alloc_memory __P((device_t, int, int)); -int an_alloc_irq __P((device_t, int, int)); -int an_probe __P((device_t)); -void an_shutdown __P((device_t)); -int an_attach __P((struct an_softc *, int, int)); -void an_stop __P((struct an_softc *)); +void an_release_resources (device_t); +int an_alloc_port (device_t, int, int); +int an_alloc_memory (device_t, int, int); +int an_alloc_irq (device_t, int, int); +int an_probe (device_t); +void an_shutdown (device_t); +int an_attach (struct an_softc *, int, int); +void an_stop (struct an_softc *); driver_intr_t an_intr; diff --git a/sys/dev/asr/asr.c b/sys/dev/asr/asr.c index 1dad6b7d8a8a..b26c1a911d3e 100644 --- a/sys/dev/asr/asr.c +++ b/sys/dev/asr/asr.c @@ -443,48 +443,48 @@ STATIC Asr_softc_t * Asr_softc; #define ATTACH_RETURN(retval) return #endif /* I2O HDM interface */ -STATIC PROBE_RET asr_probe __P((PROBE_ARGS)); -STATIC ATTACH_RET asr_attach __P((ATTACH_ARGS)); +STATIC PROBE_RET asr_probe(PROBE_ARGS); +STATIC ATTACH_RET asr_attach(ATTACH_ARGS); /* DOMINO placeholder */ -STATIC PROBE_RET domino_probe __P((PROBE_ARGS)); -STATIC ATTACH_RET domino_attach __P((ATTACH_ARGS)); +STATIC PROBE_RET domino_probe(PROBE_ARGS); +STATIC ATTACH_RET domino_attach(ATTACH_ARGS); /* MODE0 adapter placeholder */ -STATIC PROBE_RET mode0_probe __P((PROBE_ARGS)); -STATIC ATTACH_RET mode0_attach __P((ATTACH_ARGS)); +STATIC PROBE_RET mode0_probe(PROBE_ARGS); +STATIC ATTACH_RET mode0_attach(ATTACH_ARGS); -STATIC Asr_softc_t * ASR_get_sc __P(( - IN dev_t dev)); -STATIC int asr_ioctl __P(( +STATIC Asr_softc_t * ASR_get_sc( + IN dev_t dev); +STATIC int asr_ioctl( IN dev_t dev, IN u_long cmd, INOUT caddr_t data, int flag, - struct thread * td)); -STATIC int asr_open __P(( + struct thread * td); +STATIC int asr_open( IN dev_t dev, int32_t flags, int32_t ifmt, - IN struct thread * td)); -STATIC int asr_close __P(( + IN struct thread * td); +STATIC int asr_close( dev_t dev, int flags, int ifmt, - struct thread * td)); -STATIC int asr_intr __P(( - IN Asr_softc_t * sc)); -STATIC void asr_timeout __P(( - INOUT void * arg)); -STATIC int ASR_init __P(( - IN Asr_softc_t * sc)); -STATIC INLINE int ASR_acquireLct __P(( - INOUT Asr_softc_t * sc)); -STATIC INLINE int ASR_acquireHrt __P(( - INOUT Asr_softc_t * sc)); -STATIC void asr_action __P(( + struct thread * td); +STATIC int asr_intr( + IN Asr_softc_t * sc); +STATIC void asr_timeout( + INOUT void * arg); +STATIC int ASR_init( + IN Asr_softc_t * sc); +STATIC INLINE int ASR_acquireLct( + INOUT Asr_softc_t * sc); +STATIC INLINE int ASR_acquireHrt( + INOUT Asr_softc_t * sc); +STATIC void asr_action( IN struct cam_sim * sim, - IN union ccb * ccb)); -STATIC void asr_poll __P(( - IN struct cam_sim * sim)); + IN union ccb * ccb); +STATIC void asr_poll( + IN struct cam_sim * sim); /* * Here is the auto-probe structure used to nest our tests appropriately @@ -593,8 +593,8 @@ STATIC struct cdevsw asr_cdevsw = { }; #ifdef ASR_MEASURE_PERFORMANCE -STATIC u_int32_t asr_time_delta __P((IN struct timeval start, - IN struct timeval end)); +STATIC u_int32_t asr_time_delta(IN struct timeval start, + IN struct timeval end); #endif #ifdef ASR_VERY_BROKEN @@ -942,9 +942,9 @@ ASR_prstring ( /* * Prototypes */ -STATIC INLINE int ASR_queue __P(( +STATIC INLINE int ASR_queue( IN Asr_softc_t * sc, - IN PI2O_MESSAGE_FRAME Message)); + IN PI2O_MESSAGE_FRAME Message); /* * Send a message synchronously and without Interrupt to a ccb. */ diff --git a/sys/dev/awi/am79c930.c b/sys/dev/awi/am79c930.c index aa9c97f5a538..8cb5ecd35ae7 100644 --- a/sys/dev/awi/am79c930.c +++ b/sys/dev/awi/am79c930.c @@ -88,27 +88,27 @@ #define AM930_DELAY(x) /*nothing*/ -void am79c930_regdump __P((struct am79c930_softc *sc)); - -static void io_write_1 __P((struct am79c930_softc *, u_int32_t, u_int8_t)); -static void io_write_2 __P((struct am79c930_softc *, u_int32_t, u_int16_t)); -static void io_write_4 __P((struct am79c930_softc *, u_int32_t, u_int32_t)); -static void io_write_bytes __P((struct am79c930_softc *, u_int32_t, u_int8_t *, size_t)); - -static u_int8_t io_read_1 __P((struct am79c930_softc *, u_int32_t)); -static u_int16_t io_read_2 __P((struct am79c930_softc *, u_int32_t)); -static u_int32_t io_read_4 __P((struct am79c930_softc *, u_int32_t)); -static void io_read_bytes __P((struct am79c930_softc *, u_int32_t, u_int8_t *, size_t)); - -static void mem_write_1 __P((struct am79c930_softc *, u_int32_t, u_int8_t)); -static void mem_write_2 __P((struct am79c930_softc *, u_int32_t, u_int16_t)); -static void mem_write_4 __P((struct am79c930_softc *, u_int32_t, u_int32_t)); -static void mem_write_bytes __P((struct am79c930_softc *, u_int32_t, u_int8_t *, size_t)); - -static u_int8_t mem_read_1 __P((struct am79c930_softc *, u_int32_t)); -static u_int16_t mem_read_2 __P((struct am79c930_softc *, u_int32_t)); -static u_int32_t mem_read_4 __P((struct am79c930_softc *, u_int32_t)); -static void mem_read_bytes __P((struct am79c930_softc *, u_int32_t, u_int8_t *, size_t)); +void am79c930_regdump(struct am79c930_softc *sc); + +static void io_write_1(struct am79c930_softc *, u_int32_t, u_int8_t); +static void io_write_2(struct am79c930_softc *, u_int32_t, u_int16_t); +static void io_write_4(struct am79c930_softc *, u_int32_t, u_int32_t); +static void io_write_bytes(struct am79c930_softc *, u_int32_t, u_int8_t *, size_t); + +static u_int8_t io_read_1(struct am79c930_softc *, u_int32_t); +static u_int16_t io_read_2(struct am79c930_softc *, u_int32_t); +static u_int32_t io_read_4(struct am79c930_softc *, u_int32_t); +static void io_read_bytes(struct am79c930_softc *, u_int32_t, u_int8_t *, size_t); + +static void mem_write_1(struct am79c930_softc *, u_int32_t, u_int8_t); +static void mem_write_2(struct am79c930_softc *, u_int32_t, u_int16_t); +static void mem_write_4(struct am79c930_softc *, u_int32_t, u_int32_t); +static void mem_write_bytes(struct am79c930_softc *, u_int32_t, u_int8_t *, size_t); + +static u_int8_t mem_read_1(struct am79c930_softc *, u_int32_t); +static u_int16_t mem_read_2(struct am79c930_softc *, u_int32_t); +static u_int32_t mem_read_4(struct am79c930_softc *, u_int32_t); +static void mem_read_bytes(struct am79c930_softc *, u_int32_t, u_int8_t *, size_t); static struct am79c930_ops iospace_ops = { io_write_1, diff --git a/sys/dev/awi/am79c930var.h b/sys/dev/awi/am79c930var.h index 1e45c6817a9d..087ae1a6f70a 100644 --- a/sys/dev/awi/am79c930var.h +++ b/sys/dev/awi/am79c930var.h @@ -55,23 +55,23 @@ struct am79c930_softc struct am79c930_ops { - void (*write_1) __P((struct am79c930_softc *, u_int32_t, u_int8_t)); - void (*write_2) __P((struct am79c930_softc *, u_int32_t, u_int16_t)); - void (*write_4) __P((struct am79c930_softc *, u_int32_t, u_int32_t)); - void (*write_bytes) __P((struct am79c930_softc *, u_int32_t, u_int8_t *, size_t)); + void (*write_1)(struct am79c930_softc *, u_int32_t, u_int8_t); + void (*write_2)(struct am79c930_softc *, u_int32_t, u_int16_t); + void (*write_4)(struct am79c930_softc *, u_int32_t, u_int32_t); + void (*write_bytes)(struct am79c930_softc *, u_int32_t, u_int8_t *, size_t); - u_int8_t (*read_1) __P((struct am79c930_softc *, u_int32_t)); - u_int16_t (*read_2) __P((struct am79c930_softc *, u_int32_t)); - u_int32_t (*read_4) __P((struct am79c930_softc *, u_int32_t)); - void (*read_bytes) __P((struct am79c930_softc *, u_int32_t, u_int8_t *, size_t)); + u_int8_t (*read_1)(struct am79c930_softc *, u_int32_t); + u_int16_t (*read_2)(struct am79c930_softc *, u_int32_t); + u_int32_t (*read_4)(struct am79c930_softc *, u_int32_t); + void (*read_bytes)(struct am79c930_softc *, u_int32_t, u_int8_t *, size_t); }; -void am79c930_chip_init __P((struct am79c930_softc *sc, int)); +void am79c930_chip_init(struct am79c930_softc *sc, int); -void am79c930_gcr_setbits __P((struct am79c930_softc *sc, u_int8_t bits)); -void am79c930_gcr_clearbits __P((struct am79c930_softc *sc, u_int8_t bits)); +void am79c930_gcr_setbits(struct am79c930_softc *sc, u_int8_t bits); +void am79c930_gcr_clearbits(struct am79c930_softc *sc, u_int8_t bits); -u_int8_t am79c930_gcr_read __P((struct am79c930_softc *sc)); +u_int8_t am79c930_gcr_read(struct am79c930_softc *sc); #define am79c930_hard_reset(sc) am79c930_gcr_setbits(sc, AM79C930_GCR_CORESET) #define am79c930_hard_reset_off(sc) am79c930_gcr_clearbits(sc, AM79C930_GCR_CORESET) diff --git a/sys/dev/awi/awi.c b/sys/dev/awi/awi.c index ab76ea07e890..fe764b04e439 100644 --- a/sys/dev/awi/awi.c +++ b/sys/dev/awi/awi.c @@ -160,51 +160,51 @@ #include <dev/awi/awivar.h> #endif -static int awi_ioctl __P((struct ifnet *ifp, u_long cmd, caddr_t data)); +static int awi_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data); #ifdef IFM_IEEE80211 -static int awi_media_rate2opt __P((struct awi_softc *sc, int rate)); -static int awi_media_opt2rate __P((struct awi_softc *sc, int opt)); -static int awi_media_change __P((struct ifnet *ifp)); -static void awi_media_status __P((struct ifnet *ifp, struct ifmediareq *imr)); +static int awi_media_rate2opt(struct awi_softc *sc, int rate); +static int awi_media_opt2rate(struct awi_softc *sc, int opt); +static int awi_media_change(struct ifnet *ifp); +static void awi_media_status(struct ifnet *ifp, struct ifmediareq *imr); #endif -static void awi_watchdog __P((struct ifnet *ifp)); -static void awi_start __P((struct ifnet *ifp)); -static void awi_txint __P((struct awi_softc *sc)); -static struct mbuf * awi_fix_txhdr __P((struct awi_softc *sc, struct mbuf *m0)); -static struct mbuf * awi_fix_rxhdr __P((struct awi_softc *sc, struct mbuf *m0)); -static void awi_input __P((struct awi_softc *sc, struct mbuf *m, u_int32_t rxts, u_int8_t rssi)); -static void awi_rxint __P((struct awi_softc *sc)); -static struct mbuf * awi_devget __P((struct awi_softc *sc, u_int32_t off, u_int16_t len)); -static int awi_init_hw __P((struct awi_softc *sc)); -static int awi_init_mibs __P((struct awi_softc *sc)); -static int awi_init_txrx __P((struct awi_softc *sc)); -static void awi_stop_txrx __P((struct awi_softc *sc)); -static int awi_start_scan __P((struct awi_softc *sc)); -static int awi_next_scan __P((struct awi_softc *sc)); -static void awi_stop_scan __P((struct awi_softc *sc)); -static void awi_recv_beacon __P((struct awi_softc *sc, struct mbuf *m0, u_int32_t rxts, u_int8_t rssi)); -static int awi_set_ss __P((struct awi_softc *sc)); -static void awi_try_sync __P((struct awi_softc *sc)); -static void awi_sync_done __P((struct awi_softc *sc)); -static void awi_send_deauth __P((struct awi_softc *sc)); -static void awi_send_auth __P((struct awi_softc *sc, int seq)); -static void awi_recv_auth __P((struct awi_softc *sc, struct mbuf *m0)); -static void awi_send_asreq __P((struct awi_softc *sc, int reassoc)); -static void awi_recv_asresp __P((struct awi_softc *sc, struct mbuf *m0)); -static int awi_mib __P((struct awi_softc *sc, u_int8_t cmd, u_int8_t mib)); -static int awi_cmd_scan __P((struct awi_softc *sc)); -static int awi_cmd __P((struct awi_softc *sc, u_int8_t cmd)); -static void awi_cmd_done __P((struct awi_softc *sc)); -static int awi_next_txd __P((struct awi_softc *sc, int len, u_int32_t *framep, u_int32_t*ntxdp)); -static int awi_lock __P((struct awi_softc *sc)); -static void awi_unlock __P((struct awi_softc *sc)); -static int awi_intr_lock __P((struct awi_softc *sc)); -static void awi_intr_unlock __P((struct awi_softc *sc)); -static int awi_cmd_wait __P((struct awi_softc *sc)); -static void awi_print_essid __P((u_int8_t *essid)); +static void awi_watchdog(struct ifnet *ifp); +static void awi_start(struct ifnet *ifp); +static void awi_txint(struct awi_softc *sc); +static struct mbuf * awi_fix_txhdr(struct awi_softc *sc, struct mbuf *m0); +static struct mbuf * awi_fix_rxhdr(struct awi_softc *sc, struct mbuf *m0); +static void awi_input(struct awi_softc *sc, struct mbuf *m, u_int32_t rxts, u_int8_t rssi); +static void awi_rxint(struct awi_softc *sc); +static struct mbuf * awi_devget(struct awi_softc *sc, u_int32_t off, u_int16_t len); +static int awi_init_hw(struct awi_softc *sc); +static int awi_init_mibs(struct awi_softc *sc); +static int awi_init_txrx(struct awi_softc *sc); +static void awi_stop_txrx(struct awi_softc *sc); +static int awi_start_scan(struct awi_softc *sc); +static int awi_next_scan(struct awi_softc *sc); +static void awi_stop_scan(struct awi_softc *sc); +static void awi_recv_beacon(struct awi_softc *sc, struct mbuf *m0, u_int32_t rxts, u_int8_t rssi); +static int awi_set_ss(struct awi_softc *sc); +static void awi_try_sync(struct awi_softc *sc); +static void awi_sync_done(struct awi_softc *sc); +static void awi_send_deauth(struct awi_softc *sc); +static void awi_send_auth(struct awi_softc *sc, int seq); +static void awi_recv_auth(struct awi_softc *sc, struct mbuf *m0); +static void awi_send_asreq(struct awi_softc *sc, int reassoc); +static void awi_recv_asresp(struct awi_softc *sc, struct mbuf *m0); +static int awi_mib(struct awi_softc *sc, u_int8_t cmd, u_int8_t mib); +static int awi_cmd_scan(struct awi_softc *sc); +static int awi_cmd(struct awi_softc *sc, u_int8_t cmd); +static void awi_cmd_done(struct awi_softc *sc); +static int awi_next_txd(struct awi_softc *sc, int len, u_int32_t *framep, u_int32_t*ntxdp); +static int awi_lock(struct awi_softc *sc); +static void awi_unlock(struct awi_softc *sc); +static int awi_intr_lock(struct awi_softc *sc); +static void awi_intr_unlock(struct awi_softc *sc); +static int awi_cmd_wait(struct awi_softc *sc); +static void awi_print_essid(u_int8_t *essid); #ifdef AWI_DEBUG -static void awi_dump_pkt __P((struct awi_softc *sc, struct mbuf *m, int rssi)); +static void awi_dump_pkt(struct awi_softc *sc, struct mbuf *m, int rssi); int awi_verbose = 0; int awi_dump = 0; #define AWI_DUMP_MASK(fc0) (1 << (((fc0) & IEEE80211_FC0_SUBTYPE_MASK) >> 4)) @@ -241,7 +241,7 @@ devclass_t awi_devclass; #endif /* NetBSD compatible functions */ -static char * ether_sprintf __P((u_int8_t *)); +static char * ether_sprintf(u_int8_t *); static char * ether_sprintf(enaddr) diff --git a/sys/dev/awi/awi_wep.c b/sys/dev/awi/awi_wep.c index f9347c57d023..750b165d2e2d 100644 --- a/sys/dev/awi/awi_wep.c +++ b/sys/dev/awi/awi_wep.c @@ -116,12 +116,12 @@ arc4_encrypt(void *ctx, u_int8_t *dst, u_int8_t *src, int len) } #endif -static void awi_crc_init __P((void)); -static u_int32_t awi_crc_update __P((u_int32_t crc, u_int8_t *buf, int len)); +static void awi_crc_init(void); +static u_int32_t awi_crc_update(u_int32_t crc, u_int8_t *buf, int len); -static int awi_null_ctxlen __P((void)); -static void awi_null_setkey __P((void *ctx, u_int8_t *key, int keylen)); -static void awi_null_copy __P((void *ctx, u_int8_t *dst, u_int8_t *src, int len)); +static int awi_null_ctxlen(void); +static void awi_null_setkey(void *ctx, u_int8_t *key, int keylen); +static void awi_null_copy(void *ctx, u_int8_t *dst, u_int8_t *src, int len); /* XXX: the order should be known to wiconfig/user */ diff --git a/sys/dev/awi/awi_wicfg.c b/sys/dev/awi/awi_wicfg.c index 97f9fceadef4..80b81600fedd 100644 --- a/sys/dev/awi/awi_wicfg.c +++ b/sys/dev/awi/awi_wicfg.c @@ -91,8 +91,8 @@ #include <dev/awi/awivar.h> #endif -static int awi_cfgget __P((struct ifnet *ifp, u_long cmd, caddr_t data)); -static int awi_cfgset __P((struct ifnet *ifp, u_long cmd, caddr_t data)); +static int awi_cfgget(struct ifnet *ifp, u_long cmd, caddr_t data); +static int awi_cfgset(struct ifnet *ifp, u_long cmd, caddr_t data); int awi_wicfg(ifp, cmd, data) diff --git a/sys/dev/awi/awivar.h b/sys/dev/awi/awivar.h index 8e86f841a006..a55b6a759127 100644 --- a/sys/dev/awi/awivar.h +++ b/sys/dev/awi/awivar.h @@ -81,10 +81,10 @@ struct awi_bss struct awi_wep_algo { char *awa_name; - int (*awa_ctxlen) __P((void)); - void (*awa_setkey) __P((void *, u_char *, int)); - void (*awa_encrypt) __P((void *, u_char *, u_char *, int)); - void (*awa_decrypt) __P((void *, u_char *, u_char *, int)); + int (*awa_ctxlen)(void); + void (*awa_setkey)(void *, u_char *, int); + void (*awa_encrypt)(void *, u_char *, u_char *, int); + void (*awa_decrypt)(void *, u_char *, u_char *, int); }; struct awi_softc @@ -106,8 +106,8 @@ struct awi_softc #endif struct am79c930_softc sc_chip; struct ifnet *sc_ifp; - int (*sc_enable) __P((struct awi_softc *)); - void (*sc_disable) __P((struct awi_softc *)); + int (*sc_enable)(struct awi_softc *); + void (*sc_disable)(struct awi_softc *); struct ifmedia sc_media; enum awi_status sc_status; @@ -199,24 +199,24 @@ struct awi_softc #define AWI_80211_RATE(rate) (((rate) & 0x7f) * 5) -int awi_attach __P((struct awi_softc *)); -int awi_intr __P((void *)); -void awi_reset __P((struct awi_softc *)); +int awi_attach(struct awi_softc *); +int awi_intr(void *); +void awi_reset(struct awi_softc *); #ifdef __NetBSD__ -int awi_activate __P((struct device *, enum devact)); -int awi_detach __P((struct awi_softc *)); -void awi_power __P((struct awi_softc *, int)); +int awi_activate(struct device *, enum devact); +int awi_detach(struct awi_softc *); +void awi_power(struct awi_softc *, int); #endif -void awi_stop __P((struct awi_softc *sc)); -int awi_init __P((struct awi_softc *sc)); -int awi_init_region __P((struct awi_softc *)); -int awi_wicfg __P((struct ifnet *, u_long, caddr_t)); - -int awi_wep_setnwkey __P((struct awi_softc *, struct ieee80211_nwkey *)); -int awi_wep_getnwkey __P((struct awi_softc *, struct ieee80211_nwkey *)); -int awi_wep_getalgo __P((struct awi_softc *)); -int awi_wep_setalgo __P((struct awi_softc *, int)); -int awi_wep_setkey __P((struct awi_softc *, int, unsigned char *, int)); -int awi_wep_getkey __P((struct awi_softc *, int, unsigned char *, int *)); -struct mbuf *awi_wep_encrypt __P((struct awi_softc *, struct mbuf *, int)); +void awi_stop(struct awi_softc *sc); +int awi_init(struct awi_softc *sc); +int awi_init_region(struct awi_softc *); +int awi_wicfg(struct ifnet *, u_long, caddr_t); + +int awi_wep_setnwkey(struct awi_softc *, struct ieee80211_nwkey *); +int awi_wep_getnwkey(struct awi_softc *, struct ieee80211_nwkey *); +int awi_wep_getalgo(struct awi_softc *); +int awi_wep_setalgo(struct awi_softc *, int); +int awi_wep_setkey(struct awi_softc *, int, unsigned char *, int); +int awi_wep_getkey(struct awi_softc *, int, unsigned char *, int *); +struct mbuf *awi_wep_encrypt(struct awi_softc *, struct mbuf *, int); diff --git a/sys/dev/bge/if_bge.c b/sys/dev/bge/if_bge.c index 9abff5027d38..90ef61d6ea7a 100644 --- a/sys/dev/bge/if_bge.c +++ b/sys/dev/bge/if_bge.c @@ -148,75 +148,73 @@ static struct bge_type bge_devs[] = { { 0, 0, NULL } }; -static int bge_probe __P((device_t)); -static int bge_attach __P((device_t)); -static int bge_detach __P((device_t)); +static int bge_probe (device_t); +static int bge_attach (device_t); +static int bge_detach (device_t); static void bge_release_resources - __P((struct bge_softc *)); -static void bge_txeof __P((struct bge_softc *)); -static void bge_rxeof __P((struct bge_softc *)); - -static void bge_tick __P((void *)); -static void bge_stats_update __P((struct bge_softc *)); -static int bge_encap __P((struct bge_softc *, struct mbuf *, - u_int32_t *)); - -static void bge_intr __P((void *)); -static void bge_start __P((struct ifnet *)); -static int bge_ioctl __P((struct ifnet *, u_long, caddr_t)); -static void bge_init __P((void *)); -static void bge_stop __P((struct bge_softc *)); -static void bge_watchdog __P((struct ifnet *)); -static void bge_shutdown __P((device_t)); -static int bge_ifmedia_upd __P((struct ifnet *)); -static void bge_ifmedia_sts __P((struct ifnet *, struct ifmediareq *)); - -static u_int8_t bge_eeprom_getbyte __P((struct bge_softc *, - int, u_int8_t *)); -static int bge_read_eeprom __P((struct bge_softc *, caddr_t, int, int)); - -static u_int32_t bge_crc __P((caddr_t)); -static void bge_setmulti __P((struct bge_softc *)); - -static void bge_handle_events __P((struct bge_softc *)); -static int bge_alloc_jumbo_mem __P((struct bge_softc *)); -static void bge_free_jumbo_mem __P((struct bge_softc *)); -static void *bge_jalloc __P((struct bge_softc *)); -static void bge_jfree __P((caddr_t, void *)); -static int bge_newbuf_std __P((struct bge_softc *, int, struct mbuf *)); -static int bge_newbuf_jumbo __P((struct bge_softc *, int, struct mbuf *)); -static int bge_init_rx_ring_std __P((struct bge_softc *)); -static void bge_free_rx_ring_std __P((struct bge_softc *)); -static int bge_init_rx_ring_jumbo __P((struct bge_softc *)); -static void bge_free_rx_ring_jumbo __P((struct bge_softc *)); -static void bge_free_tx_ring __P((struct bge_softc *)); -static int bge_init_tx_ring __P((struct bge_softc *)); - -static int bge_chipinit __P((struct bge_softc *)); -static int bge_blockinit __P((struct bge_softc *)); + (struct bge_softc *); +static void bge_txeof (struct bge_softc *); +static void bge_rxeof (struct bge_softc *); + +static void bge_tick (void *); +static void bge_stats_update (struct bge_softc *); +static int bge_encap (struct bge_softc *, struct mbuf *, + u_int32_t *); + +static void bge_intr (void *); +static void bge_start (struct ifnet *); +static int bge_ioctl (struct ifnet *, u_long, caddr_t); +static void bge_init (void *); +static void bge_stop (struct bge_softc *); +static void bge_watchdog (struct ifnet *); +static void bge_shutdown (device_t); +static int bge_ifmedia_upd (struct ifnet *); +static void bge_ifmedia_sts (struct ifnet *, struct ifmediareq *); + +static u_int8_t bge_eeprom_getbyte (struct bge_softc *, int, u_int8_t *); +static int bge_read_eeprom (struct bge_softc *, caddr_t, int, int); + +static u_int32_t bge_crc (caddr_t); +static void bge_setmulti (struct bge_softc *); + +static void bge_handle_events (struct bge_softc *); +static int bge_alloc_jumbo_mem (struct bge_softc *); +static void bge_free_jumbo_mem (struct bge_softc *); +static void *bge_jalloc (struct bge_softc *); +static void bge_jfree (caddr_t, void *); +static int bge_newbuf_std (struct bge_softc *, int, struct mbuf *); +static int bge_newbuf_jumbo (struct bge_softc *, int, struct mbuf *); +static int bge_init_rx_ring_std (struct bge_softc *); +static void bge_free_rx_ring_std (struct bge_softc *); +static int bge_init_rx_ring_jumbo (struct bge_softc *); +static void bge_free_rx_ring_jumbo (struct bge_softc *); +static void bge_free_tx_ring (struct bge_softc *); +static int bge_init_tx_ring (struct bge_softc *); + +static int bge_chipinit (struct bge_softc *); +static int bge_blockinit (struct bge_softc *); #ifdef notdef -static u_int8_t bge_vpd_readbyte __P((struct bge_softc *, int)); -static void bge_vpd_read_res __P((struct bge_softc *, - struct vpd_res *, int)); -static void bge_vpd_read __P((struct bge_softc *)); +static u_int8_t bge_vpd_readbyte(struct bge_softc *, int); +static void bge_vpd_read_res (struct bge_softc *, struct vpd_res *, int); +static void bge_vpd_read (struct bge_softc *); #endif static u_int32_t bge_readmem_ind - __P((struct bge_softc *, int)); -static void bge_writemem_ind __P((struct bge_softc *, int, int)); + (struct bge_softc *, int); +static void bge_writemem_ind (struct bge_softc *, int, int); #ifdef notdef static u_int32_t bge_readreg_ind - __P((struct bge_softc *, int)); + (struct bge_softc *, int); #endif -static void bge_writereg_ind __P((struct bge_softc *, int, int)); +static void bge_writereg_ind (struct bge_softc *, int, int); -static int bge_miibus_readreg __P((device_t, int, int)); -static int bge_miibus_writereg __P((device_t, int, int, int)); -static void bge_miibus_statchg __P((device_t)); +static int bge_miibus_readreg (device_t, int, int); +static int bge_miibus_writereg (device_t, int, int, int); +static void bge_miibus_statchg (device_t); -static void bge_reset __P((struct bge_softc *)); -static void bge_phy_hack __P((struct bge_softc *)); +static void bge_reset (struct bge_softc *); +static void bge_phy_hack (struct bge_softc *); static device_method_t bge_methods[] = { /* Device interface */ diff --git a/sys/dev/bktr/bktr_os.c b/sys/dev/bktr/bktr_os.c index 1a3f1525d1d9..0de052fcff38 100644 --- a/sys/dev/bktr/bktr_os.c +++ b/sys/dev/bktr/bktr_os.c @@ -1290,11 +1290,11 @@ 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/cm/if_cm_isa.c b/sys/dev/cm/if_cm_isa.c index 8af2dfff937c..0ad9e4ea9303 100644 --- a/sys/dev/cm/if_cm_isa.c +++ b/sys/dev/cm/if_cm_isa.c @@ -52,8 +52,8 @@ #include <dev/cm/smc90cx6var.h> -static int cm_isa_probe __P((device_t)); -static int cm_isa_attach __P((device_t)); +static int cm_isa_probe (device_t); +static int cm_isa_attach (device_t); static int cm_isa_probe(dev) diff --git a/sys/dev/cm/smc90cx6.c b/sys/dev/cm/smc90cx6.c index a5dfb9c5c029..335ba91c4946 100644 --- a/sys/dev/cm/smc90cx6.c +++ b/sys/dev/cm/smc90cx6.c @@ -146,13 +146,13 @@ devclass_t cm_devclass; * #define fill(i) get mbuf && copy mbuf to chip(i) */ -void cm_init __P((void *)); -void cm_reset __P((struct cm_softc *)); -void cm_start __P((struct ifnet *)); -int cm_ioctl __P((struct ifnet *, unsigned long, caddr_t)); -void cm_watchdog __P((struct ifnet *)); -void cm_srint __P((void *vsc)); -static void cm_tint __P((struct cm_softc *, int)); +void cm_init(void *); +void cm_reset(struct cm_softc *); +void cm_start(struct ifnet *); +int cm_ioctl(struct ifnet *, unsigned long, caddr_t); +void cm_watchdog(struct ifnet *); +void cm_srint(void *vsc); +static void cm_tint(struct cm_softc *, int); void cm_reconwatch(void *); int @@ -336,7 +336,7 @@ cm_attach(sc, unit) #ifdef CMSOFTCOPY sc->sc_rxcookie = softintr_establish(IPL_SOFTNET, cm_srint, sc); sc->sc_txcookie = softintr_establish(IPL_SOFTNET, - (void (*) __P((void *)))cm_start, ifp); + (void (*)(void *))cm_start, ifp); #endif #if __FreeBSD_version < 500000 diff --git a/sys/dev/cm/smc90cx6var.h b/sys/dev/cm/smc90cx6var.h index 6d00b8f3be28..ad6d09a8127c 100644 --- a/sys/dev/cm/smc90cx6var.h +++ b/sys/dev/cm/smc90cx6var.h @@ -87,16 +87,16 @@ struct cm_softc { u_char sc_retransmits[2]; /* unused at the moment */ }; -int cm_attach __P((struct cm_softc *, int unit)); -void cmintr __P((void *)); +int cm_attach(struct cm_softc *, int unit); +void cmintr(void *); -int cm_probe __P((device_t dev)); -void cm_stop __P((struct cm_softc *sc)); +int cm_probe(device_t dev); +void cm_stop(struct cm_softc *sc); -int cm_alloc_port __P((device_t dev, int rid, int size)); -int cm_alloc_memory __P((device_t dev, int rid, int size)); -int cm_alloc_irq __P((device_t dev, int rid)); -void cm_release_resources __P((device_t dev)); +int cm_alloc_port(device_t dev, int rid, int size); +int cm_alloc_memory(device_t dev, int rid, int size); +int cm_alloc_irq(device_t dev, int rid); +void cm_release_resources(device_t dev); extern devclass_t cm_devclass; diff --git a/sys/dev/cnw/if_cnw.c b/sys/dev/cnw/if_cnw.c index 4414fc55e866..d17f6cd45b02 100644 --- a/sys/dev/cnw/if_cnw.c +++ b/sys/dev/cnw/if_cnw.c @@ -184,11 +184,11 @@ int cnw_skey = CNW_SCRAMBLEKEY; /* Scramble key */ */ #define MEMORY_MAPPED -int cnw_match __P((struct device *, struct cfdata *, void *)); -void cnw_attach __P((struct device *, struct device *, void *)); -int cnw_detach __P((struct device *, int)); +int cnw_match(struct device *, struct cfdata *, void *); +void cnw_attach(struct device *, struct device *, void *); +int cnw_detach(struct device *, int); -int cnw_activate __P((struct device *, enum devact)); +int cnw_activate(struct device *, enum devact); struct cnw_softc { struct device sc_dev; /* Device glue (must be first) */ @@ -309,15 +309,15 @@ struct cnw_softc { }; -static void cnw_freebsd_init __P((void *)); -static void cnw_stop __P((struct cnw_softc *)); +static void cnw_freebsd_init (void *); +static void cnw_stop (struct cnw_softc *); -static int cnw_pccard_probe __P((device_t)); -static int cnw_pccard_attach __P((device_t)); -static int cnw_pccard_detach __P((device_t)); -static void cnw_shutdown __P((device_t)); -static int cnw_alloc __P((device_t)); -static void cnw_free __P((device_t)); +static int cnw_pccard_probe (device_t); +static int cnw_pccard_attach (device_t); +static int cnw_pccard_detach (device_t); +static void cnw_shutdown (device_t); +static int cnw_alloc (device_t); +static void cnw_free (device_t); static device_method_t cnw_pccard_methods[] = { /* Device interface */ @@ -341,33 +341,33 @@ DRIVER_MODULE(if_cnw, pccard, cnw_pccard_driver, cnw_pccard_devclass, 0, 0); #endif /* !defined(__FreeBSD__) */ -void cnw_reset __P((struct cnw_softc *)); -void cnw_init __P((struct cnw_softc *)); +void cnw_reset(struct cnw_softc *); +void cnw_init(struct cnw_softc *); #if !defined(__FreeBSD__) -int cnw_enable __P((struct cnw_softc *sc)); -void cnw_disable __P((struct cnw_softc *sc)); -void cnw_config __P((struct cnw_softc *sc, u_int8_t *)); -#endif -void cnw_start __P((struct ifnet *)); -void cnw_transmit __P((struct cnw_softc *, struct mbuf *)); -struct mbuf *cnw_read __P((struct cnw_softc *)); -void cnw_recv __P((struct cnw_softc *)); +int cnw_enable(struct cnw_softc *sc); +void cnw_disable(struct cnw_softc *sc); +void cnw_config(struct cnw_softc *sc, u_int8_t *); +#endif +void cnw_start(struct ifnet *); +void cnw_transmit(struct cnw_softc *, struct mbuf *); +struct mbuf *cnw_read(struct cnw_softc *); +void cnw_recv(struct cnw_softc *); #if !defined(__FreeBSD__) -int cnw_intr __P((void *arg)); +int cnw_intr(void *arg); #else -void cnw_intr __P((void *arg)); +void cnw_intr(void *arg); #endif -int cnw_ioctl __P((struct ifnet *, u_long, caddr_t)); -void cnw_watchdog __P((struct ifnet *)); -static int cnw_setdomain __P((struct cnw_softc *, int)); -static int cnw_setkey __P((struct cnw_softc *, int)); +int cnw_ioctl(struct ifnet *, u_long, caddr_t); +void cnw_watchdog(struct ifnet *); +static int cnw_setdomain(struct cnw_softc *, int); +static int cnw_setkey(struct cnw_softc *, int); /* ---------------------------------------------------------------- */ /* Help routines */ -static int wait_WOC __P((struct cnw_softc *, int)); -static int read16 __P((struct cnw_softc *, int)); -static int cnw_cmd __P((struct cnw_softc *, int, int, int, int)); +static int wait_WOC(struct cnw_softc *, int); +static int read16(struct cnw_softc *, int); +static int cnw_cmd(struct cnw_softc *, int, int, int, int); /* * Wait until the WOC (Write Operation Complete) bit in the diff --git a/sys/dev/ct/bshw_machdep.c b/sys/dev/ct/bshw_machdep.c index c7995ce3862d..199aae5f306e 100644 --- a/sys/dev/ct/bshw_machdep.c +++ b/sys/dev/ct/bshw_machdep.c @@ -210,9 +210,9 @@ bshw_read_settings(chp, bs) #define SF_ABORT 0x08 #define SF_RDY 0x10 -static __inline void bshw_lc_smit_start __P((struct ct_softc *, int, u_int)); -static __inline void bshw_lc_smit_stop __P((struct ct_softc *)); -static int bshw_lc_smit_fstat __P((struct ct_softc *, int, int)); +static __inline void bshw_lc_smit_start(struct ct_softc *, int, u_int); +static __inline void bshw_lc_smit_stop(struct ct_softc *); +static int bshw_lc_smit_fstat(struct ct_softc *, int, int); static __inline void bshw_lc_smit_stop(ct) @@ -422,9 +422,9 @@ bshw_smit_xfer_start(ct) * DMA TRANSFER (BS) *********************************************************/ static __inline void bshw_dma_write_1 \ - __P((struct ct_bus_access_handle *, bus_addr_t, u_int8_t)); -static void bshw_dmastart __P((struct ct_softc *)); -static void bshw_dmadone __P((struct ct_softc *)); + (struct ct_bus_access_handle *, bus_addr_t, u_int8_t); +static void bshw_dmastart(struct ct_softc *); +static void bshw_dmadone(struct ct_softc *); int bshw_dma_xfer_start(ct) @@ -631,12 +631,12 @@ bshw_dmadone(ct) /********************************************** * VENDOR UNIQUE DMA FUNCS **********************************************/ -static int bshw_dma_init_sc98 __P((struct ct_softc *)); -static void bshw_dma_start_sc98 __P((struct ct_softc *)); -static void bshw_dma_stop_sc98 __P((struct ct_softc *)); -static int bshw_dma_init_texa __P((struct ct_softc *)); -static void bshw_dma_start_elecom __P((struct ct_softc *)); -static void bshw_dma_stop_elecom __P((struct ct_softc *)); +static int bshw_dma_init_sc98(struct ct_softc *); +static void bshw_dma_start_sc98(struct ct_softc *); +static void bshw_dma_stop_sc98(struct ct_softc *); +static int bshw_dma_init_texa(struct ct_softc *); +static void bshw_dma_start_elecom(struct ct_softc *); +static void bshw_dma_stop_elecom(struct ct_softc *); static int bshw_dma_init_texa(ct) diff --git a/sys/dev/ct/bshwvar.h b/sys/dev/ct/bshwvar.h index 17268f06e4c4..9e2259c94c76 100644 --- a/sys/dev/ct/bshwvar.h +++ b/sys/dev/ct/bshwvar.h @@ -48,9 +48,9 @@ struct bshw { u_int hw_flags; u_int hw_sregaddr; - int ((*hw_dma_init) __P((struct ct_softc *))); - void ((*hw_dma_start) __P((struct ct_softc *))); - void ((*hw_dma_stop) __P((struct ct_softc *))); + int ((*hw_dma_init)(struct ct_softc *)); + void ((*hw_dma_start)(struct ct_softc *)); + void ((*hw_dma_stop)(struct ct_softc *)); }; struct bshw_softc { @@ -80,17 +80,17 @@ struct bshw_softc { /* hardware */ struct bshw *sc_hw; - void ((*sc_dmasync_before)) __P((struct ct_softc *)); - void ((*sc_dmasync_after)) __P((struct ct_softc *)); + void ((*sc_dmasync_before))(struct ct_softc *); + void ((*sc_dmasync_after))(struct ct_softc *); }; -void bshw_synch_setup __P((struct ct_softc *, struct targ_info *)); -void bshw_bus_reset __P((struct ct_softc *)); -int bshw_read_settings __P((struct ct_bus_access_handle *, struct bshw_softc *)); -int bshw_smit_xfer_start __P((struct ct_softc *)); -void bshw_smit_xfer_stop __P((struct ct_softc *)); -int bshw_dma_xfer_start __P((struct ct_softc *)); -void bshw_dma_xfer_stop __P((struct ct_softc *)); +void bshw_synch_setup(struct ct_softc *, struct targ_info *); +void bshw_bus_reset(struct ct_softc *); +int bshw_read_settings(struct ct_bus_access_handle *, struct bshw_softc *); +int bshw_smit_xfer_start(struct ct_softc *); +void bshw_smit_xfer_stop(struct ct_softc *); +int bshw_dma_xfer_start(struct ct_softc *); +void bshw_dma_xfer_stop(struct ct_softc *); extern struct dvcfg_hwsel bshw_hwsel; #endif /* !_BSHWVAR_H_ */ diff --git a/sys/dev/ct/ct.c b/sys/dev/ct/ct.c index 6c46493d6841..c9c9ef9d16a3 100644 --- a/sys/dev/ct/ct.c +++ b/sys/dev/ct/ct.c @@ -149,25 +149,25 @@ extern struct cfdriver ct_cd; /***************************************************************** * Interface functions *****************************************************************/ -static int ct_xfer __P((struct ct_softc *, u_int8_t *, int, int, u_int *)); -static void ct_io_xfer __P((struct ct_softc *)); -static int ct_reselected __P((struct ct_softc *, u_int8_t)); -static void ct_phase_error __P((struct ct_softc *, u_int8_t)); -static int ct_start_selection __P((struct ct_softc *, struct slccb *)); -static int ct_msg __P((struct ct_softc *, struct targ_info *, u_int)); -static int ct_world_start __P((struct ct_softc *, int)); -static __inline void cthw_phase_bypass __P((struct ct_softc *, u_int8_t)); -static int cthw_chip_reset __P((struct ct_bus_access_handle *, int *, int, int)); -static void cthw_bus_reset __P((struct ct_softc *)); -static int ct_ccb_nexus_establish __P((struct ct_softc *)); -static int ct_lun_nexus_establish __P((struct ct_softc *)); -static int ct_target_nexus_establish __P((struct ct_softc *, int, int)); -static void cthw_attention __P((struct ct_softc *)); -static int ct_targ_init __P((struct ct_softc *, struct targ_info *, int)); -static int ct_unbusy __P((struct ct_softc *)); -static void ct_attention __P((struct ct_softc *)); -static struct ct_synch_data *ct_make_synch_table __P((struct ct_softc *)); -static int ct_catch_intr __P((struct ct_softc *)); +static int ct_xfer(struct ct_softc *, u_int8_t *, int, int, u_int *); +static void ct_io_xfer(struct ct_softc *); +static int ct_reselected(struct ct_softc *, u_int8_t); +static void ct_phase_error(struct ct_softc *, u_int8_t); +static int ct_start_selection(struct ct_softc *, struct slccb *); +static int ct_msg(struct ct_softc *, struct targ_info *, u_int); +static int ct_world_start(struct ct_softc *, int); +static __inline void cthw_phase_bypass(struct ct_softc *, u_int8_t); +static int cthw_chip_reset(struct ct_bus_access_handle *, int *, int, int); +static void cthw_bus_reset(struct ct_softc *); +static int ct_ccb_nexus_establish(struct ct_softc *); +static int ct_lun_nexus_establish(struct ct_softc *); +static int ct_target_nexus_establish(struct ct_softc *, int, int); +static void cthw_attention(struct ct_softc *); +static int ct_targ_init(struct ct_softc *, struct targ_info *, int); +static int ct_unbusy(struct ct_softc *); +static void ct_attention(struct ct_softc *); +static struct ct_synch_data *ct_make_synch_table(struct ct_softc *); +static int ct_catch_intr(struct ct_softc *); struct scsi_low_funcs ct_funcs = { SC_LOW_INIT_T ct_world_start, diff --git a/sys/dev/ct/ct_isa.c b/sys/dev/ct/ct_isa.c index 388ba3fe85e8..8098806094e0 100644 --- a/sys/dev/ct/ct_isa.c +++ b/sys/dev/ct/ct_isa.c @@ -101,9 +101,9 @@ static int ct_space_map(device_t, struct bshw *, static void ct_space_unmap(device_t, struct ct_softc *); static struct bshw *ct_find_hw(device_t); static void ct_dmamap(void *, bus_dma_segment_t *, int, int); -static void ct_isa_bus_access_weight __P((struct ct_bus_access_handle *)); -static void ct_isa_dmasync_before __P((struct ct_softc *)); -static void ct_isa_dmasync_after __P((struct ct_softc *)); +static void ct_isa_bus_access_weight(struct ct_bus_access_handle *); +static void ct_isa_dmasync_before(struct ct_softc *); +static void ct_isa_dmasync_after(struct ct_softc *); struct ct_isa_softc { struct ct_softc sc_ct; diff --git a/sys/dev/ct/ct_machdep.h b/sys/dev/ct/ct_machdep.h index be1033154b03..f407aa5b6cd9 100644 --- a/sys/dev/ct/ct_machdep.h +++ b/sys/dev/ct/ct_machdep.h @@ -73,21 +73,21 @@ * All port accesses primitive methods */ static __inline u_int8_t ct_stat_read_1 - __P((struct ct_bus_access_handle *)); + (struct ct_bus_access_handle *); static __inline u_int8_t ct_cmdp_read_1 - __P((struct ct_bus_access_handle *)); + (struct ct_bus_access_handle *); static __inline void ct_cmdp_write_1 - __P((struct ct_bus_access_handle *, u_int8_t)); + (struct ct_bus_access_handle *, u_int8_t); static __inline u_int8_t ct_cr_read_1 - __P((struct ct_bus_access_handle *, bus_addr_t)); + (struct ct_bus_access_handle *, bus_addr_t); static __inline void ct_cr_write_1 - __P((struct ct_bus_access_handle *, bus_addr_t, u_int8_t)); + (struct ct_bus_access_handle *, bus_addr_t, u_int8_t); static __inline void ct_write_cmds - __P((struct ct_bus_access_handle *, u_int8_t *, int)); + (struct ct_bus_access_handle *, u_int8_t *, int); static __inline u_int cthw_get_count - __P((struct ct_bus_access_handle *)); + (struct ct_bus_access_handle *); static __inline void cthw_set_count - __P((struct ct_bus_access_handle *, u_int)); + (struct ct_bus_access_handle *, u_int); static __inline u_int8_t ct_stat_read_1(chp) diff --git a/sys/dev/ct/ctvar.h b/sys/dev/ct/ctvar.h index 235990a7fb2e..4e7ba1569edc 100644 --- a/sys/dev/ct/ctvar.h +++ b/sys/dev/ct/ctvar.h @@ -54,7 +54,7 @@ struct ct_bus_access_handle { bus_space_handle_t ch_datah; bus_space_handle_t ch_memh; - void (*ch_bus_weight) __P((struct ct_bus_access_handle *)); + void (*ch_bus_weight)(struct ct_bus_access_handle *); #ifdef CT_USE_RELOCATE_OFFSET bus_addr_t ch_offset[4]; @@ -118,12 +118,12 @@ struct ct_softc { * Machdep stuff. */ void *ct_hw; /* point to bshw_softc etc ... */ - int (*ct_dma_xfer_start) __P((struct ct_softc *)); - int (*ct_pio_xfer_start) __P((struct ct_softc *)); - void (*ct_dma_xfer_stop) __P((struct ct_softc *)); - void (*ct_pio_xfer_stop) __P((struct ct_softc *)); - void (*ct_bus_reset) __P((struct ct_softc *)); - void (*ct_synch_setup) __P((struct ct_softc *, struct targ_info *)); + int (*ct_dma_xfer_start)(struct ct_softc *); + int (*ct_pio_xfer_start)(struct ct_softc *); + void (*ct_dma_xfer_stop)(struct ct_softc *); + void (*ct_pio_xfer_stop)(struct ct_softc *); + void (*ct_bus_reset)(struct ct_softc *); + void (*ct_synch_setup)(struct ct_softc *, struct targ_info *); }; /***************************************************************** @@ -138,8 +138,8 @@ struct ct_targ_info { /***************************************************************** * PROTO *****************************************************************/ -int ctprobesubr __P((struct ct_bus_access_handle *, u_int, int, u_int, int *)); -void ctattachsubr __P((struct ct_softc *)); -int ctprint __P((void *, const char *)); -int ctintr __P((void *)); +int ctprobesubr(struct ct_bus_access_handle *, u_int, int, u_int, int *); +void ctattachsubr(struct ct_softc *); +int ctprint(void *, const char *); +int ctintr(void *); #endif /* !_CTVAR_H_ */ diff --git a/sys/dev/cy/cy_pci.c b/sys/dev/cy/cy_pci.c index a806731a460a..72cb9612cf10 100644 --- a/sys/dev/cy/cy_pci.c +++ b/sys/dev/cy/cy_pci.c @@ -68,8 +68,8 @@ extern int cyattach_common(void *, int); /* Not exactly correct */ extern void cyintr(int); -static int cy_pci_attach __P((device_t dev)); -static int cy_pci_probe __P((device_t dev)); +static int cy_pci_attach(device_t dev); +static int cy_pci_probe(device_t dev); static device_method_t cy_pci_methods[] = { /* Device interface. */ diff --git a/sys/dev/dc/dcphy.c b/sys/dev/dc/dcphy.c index 0968d4ab09d9..daf38c78049d 100644 --- a/sys/dev/dc/dcphy.c +++ b/sys/dev/dc/dcphy.c @@ -93,9 +93,9 @@ static const char rcsid[] = */ #define COMPAQ_PRESARIO_ID 0xb0bb0e11 -static int dcphy_probe __P((device_t)); -static int dcphy_attach __P((device_t)); -static int dcphy_detach __P((device_t)); +static int dcphy_probe (device_t); +static int dcphy_attach (device_t); +static int dcphy_detach (device_t); static device_method_t dcphy_methods[] = { /* device interface */ @@ -116,10 +116,10 @@ static driver_t dcphy_driver = { DRIVER_MODULE(dcphy, miibus, dcphy_driver, dcphy_devclass, 0, 0); -static int dcphy_service __P((struct mii_softc *, struct mii_data *, int)); -static void dcphy_status __P((struct mii_softc *)); -static void dcphy_reset __P((struct mii_softc *)); -static int dcphy_auto __P((struct mii_softc *, int)); +static int dcphy_service(struct mii_softc *, struct mii_data *, int); +static void dcphy_status(struct mii_softc *); +static void dcphy_reset(struct mii_softc *); +static int dcphy_auto(struct mii_softc *, int); static int dcphy_probe(dev) device_t dev; diff --git a/sys/dev/dc/if_dc.c b/sys/dev/dc/if_dc.c index abafb7e5e3c2..fa8cd2e55e98 100644 --- a/sys/dev/dc/if_dc.c +++ b/sys/dev/dc/if_dc.c @@ -195,75 +195,70 @@ static struct dc_type dc_devs[] = { { 0, 0, NULL } }; -static int dc_probe __P((device_t)); -static int dc_attach __P((device_t)); -static int dc_detach __P((device_t)); -static void dc_acpi __P((device_t)); -static struct dc_type *dc_devtype __P((device_t)); -static int dc_newbuf __P((struct dc_softc *, int, struct mbuf *)); -static int dc_encap __P((struct dc_softc *, struct mbuf *, - u_int32_t *)); -static int dc_coal __P((struct dc_softc *, struct mbuf **)); -static void dc_pnic_rx_bug_war __P((struct dc_softc *, int)); -static int dc_rx_resync __P((struct dc_softc *)); -static void dc_rxeof __P((struct dc_softc *)); -static void dc_txeof __P((struct dc_softc *)); -static void dc_tick __P((void *)); -static void dc_tx_underrun __P((struct dc_softc *)); -static void dc_intr __P((void *)); -static void dc_start __P((struct ifnet *)); -static int dc_ioctl __P((struct ifnet *, u_long, caddr_t)); -static void dc_init __P((void *)); -static void dc_stop __P((struct dc_softc *)); -static void dc_watchdog __P((struct ifnet *)); -static void dc_shutdown __P((device_t)); -static int dc_ifmedia_upd __P((struct ifnet *)); -static void dc_ifmedia_sts __P((struct ifnet *, struct ifmediareq *)); - -static void dc_delay __P((struct dc_softc *)); -static void dc_eeprom_idle __P((struct dc_softc *)); -static void dc_eeprom_putbyte __P((struct dc_softc *, int)); -static void dc_eeprom_getword __P((struct dc_softc *, int, u_int16_t *)); +static int dc_probe (device_t); +static int dc_attach (device_t); +static int dc_detach (device_t); +static void dc_acpi (device_t); +static struct dc_type *dc_devtype (device_t); +static int dc_newbuf (struct dc_softc *, int, struct mbuf *); +static int dc_encap (struct dc_softc *, struct mbuf *, u_int32_t *); +static int dc_coal (struct dc_softc *, struct mbuf **); +static void dc_pnic_rx_bug_war (struct dc_softc *, int); +static int dc_rx_resync (struct dc_softc *); +static void dc_rxeof (struct dc_softc *); +static void dc_txeof (struct dc_softc *); +static void dc_tick (void *); +static void dc_tx_underrun (struct dc_softc *); +static void dc_intr (void *); +static void dc_start (struct ifnet *); +static int dc_ioctl (struct ifnet *, u_long, caddr_t); +static void dc_init (void *); +static void dc_stop (struct dc_softc *); +static void dc_watchdog (struct ifnet *); +static void dc_shutdown (device_t); +static int dc_ifmedia_upd (struct ifnet *); +static void dc_ifmedia_sts (struct ifnet *, struct ifmediareq *); + +static void dc_delay (struct dc_softc *); +static void dc_eeprom_idle (struct dc_softc *); +static void dc_eeprom_putbyte (struct dc_softc *, int); +static void dc_eeprom_getword (struct dc_softc *, int, u_int16_t *); static void dc_eeprom_getword_pnic - __P((struct dc_softc *, int, u_int16_t *)); + (struct dc_softc *, int, u_int16_t *); static void dc_eeprom_getword_xircom - __P((struct dc_softc *, int, u_int16_t *)); -static void dc_read_eeprom __P((struct dc_softc *, caddr_t, int, - int, int)); - -static void dc_mii_writebit __P((struct dc_softc *, int)); -static int dc_mii_readbit __P((struct dc_softc *)); -static void dc_mii_sync __P((struct dc_softc *)); -static void dc_mii_send __P((struct dc_softc *, u_int32_t, int)); -static int dc_mii_readreg __P((struct dc_softc *, struct dc_mii_frame *)); -static int dc_mii_writereg __P((struct dc_softc *, struct dc_mii_frame *)); -static int dc_miibus_readreg __P((device_t, int, int)); -static int dc_miibus_writereg __P((device_t, int, int, int)); -static void dc_miibus_statchg __P((device_t)); -static void dc_miibus_mediainit __P((device_t)); - -static void dc_setcfg __P((struct dc_softc *, int)); -static u_int32_t dc_crc_le __P((struct dc_softc *, caddr_t)); -static u_int32_t dc_crc_be __P((caddr_t)); -static void dc_setfilt_21143 __P((struct dc_softc *)); -static void dc_setfilt_asix __P((struct dc_softc *)); -static void dc_setfilt_admtek __P((struct dc_softc *)); -static void dc_setfilt_xircom __P((struct dc_softc *)); - -static void dc_setfilt __P((struct dc_softc *)); - -static void dc_reset __P((struct dc_softc *)); -static int dc_list_rx_init __P((struct dc_softc *)); -static int dc_list_tx_init __P((struct dc_softc *)); - -static void dc_parse_21143_srom __P((struct dc_softc *)); -static void dc_decode_leaf_sia __P((struct dc_softc *, - struct dc_eblock_sia *)); -static void dc_decode_leaf_mii __P((struct dc_softc *, - struct dc_eblock_mii *)); -static void dc_decode_leaf_sym __P((struct dc_softc *, - struct dc_eblock_sym *)); -static void dc_apply_fixup __P((struct dc_softc *, int)); + (struct dc_softc *, int, u_int16_t *); +static void dc_read_eeprom (struct dc_softc *, caddr_t, int, int, int); + +static void dc_mii_writebit (struct dc_softc *, int); +static int dc_mii_readbit (struct dc_softc *); +static void dc_mii_sync (struct dc_softc *); +static void dc_mii_send (struct dc_softc *, u_int32_t, int); +static int dc_mii_readreg (struct dc_softc *, struct dc_mii_frame *); +static int dc_mii_writereg (struct dc_softc *, struct dc_mii_frame *); +static int dc_miibus_readreg (device_t, int, int); +static int dc_miibus_writereg (device_t, int, int, int); +static void dc_miibus_statchg (device_t); +static void dc_miibus_mediainit (device_t); + +static void dc_setcfg (struct dc_softc *, int); +static u_int32_t dc_crc_le (struct dc_softc *, caddr_t); +static u_int32_t dc_crc_be (caddr_t); +static void dc_setfilt_21143 (struct dc_softc *); +static void dc_setfilt_asix (struct dc_softc *); +static void dc_setfilt_admtek (struct dc_softc *); +static void dc_setfilt_xircom (struct dc_softc *); + +static void dc_setfilt (struct dc_softc *); + +static void dc_reset (struct dc_softc *); +static int dc_list_rx_init (struct dc_softc *); +static int dc_list_tx_init (struct dc_softc *); + +static void dc_parse_21143_srom (struct dc_softc *); +static void dc_decode_leaf_sia (struct dc_softc *, struct dc_eblock_sia *); +static void dc_decode_leaf_mii (struct dc_softc *, struct dc_eblock_mii *); +static void dc_decode_leaf_sym (struct dc_softc *, struct dc_eblock_sym *); +static void dc_apply_fixup (struct dc_softc *, int); #ifdef DC_USEIOSPACE #define DC_RES SYS_RES_IOPORT diff --git a/sys/dev/dc/pnphy.c b/sys/dev/dc/pnphy.c index dce8282666aa..56a83f4a2875 100644 --- a/sys/dev/dc/pnphy.c +++ b/sys/dev/dc/pnphy.c @@ -80,9 +80,9 @@ static const char rcsid[] = CSR_WRITE_4(sc, reg, \ CSR_READ_4(sc, reg) & ~x) -static int pnphy_probe __P((device_t)); -static int pnphy_attach __P((device_t)); -static int pnphy_detach __P((device_t)); +static int pnphy_probe (device_t); +static int pnphy_attach (device_t); +static int pnphy_detach (device_t); static device_method_t pnphy_methods[] = { /* device interface */ @@ -103,8 +103,8 @@ static driver_t pnphy_driver = { DRIVER_MODULE(pnphy, miibus, pnphy_driver, pnphy_devclass, 0, 0); -static int pnphy_service __P((struct mii_softc *, struct mii_data *, int)); -static void pnphy_status __P((struct mii_softc *)); +static int pnphy_service(struct mii_softc *, struct mii_data *, int); +static void pnphy_status(struct mii_softc *); static int pnphy_probe(dev) device_t dev; diff --git a/sys/dev/dgb/dgb.c b/sys/dev/dgb/dgb.c index bc7137e03b6e..4d36f2e1ade8 100644 --- a/sys/dev/dgb/dgb.c +++ b/sys/dev/dgb/dgb.c @@ -204,28 +204,28 @@ static struct tty dgb_tty[NDGBPORTS]; */ /* Interrupt handling entry points. */ -static void dgbpoll __P((void *unit_c)); +static void dgbpoll (void *unit_c); /* Device switch entry points. */ #define dgbreset noreset #define dgbmmap nommap #define dgbstrategy nostrategy -static int dgbattach __P((struct isa_device *dev)); -static int dgbprobe __P((struct isa_device *dev)); +static int dgbattach (struct isa_device *dev); +static int dgbprobe (struct isa_device *dev); static void fepcmd(struct dgb_p *port, unsigned cmd, unsigned op1, unsigned op2, unsigned ncmds, unsigned bytecmd); -static void dgbstart __P((struct tty *tp)); -static void dgbstop __P((struct tty *tp, int rw)); -static int dgbparam __P((struct tty *tp, struct termios *t)); -static void dgbhardclose __P((struct dgb_p *port)); -static void dgb_drain_or_flush __P((struct dgb_p *port)); -static int dgbdrain __P((struct dgb_p *port)); -static void dgb_pause __P((void *chan)); -static void wakeflush __P((void *p)); -static void disc_optim __P((struct tty *tp, struct termios *t)); +static void dgbstart (struct tty *tp); +static void dgbstop (struct tty *tp, int rw); +static int dgbparam (struct tty *tp, struct termios *t); +static void dgbhardclose (struct dgb_p *port); +static void dgb_drain_or_flush (struct dgb_p *port); +static int dgbdrain (struct dgb_p *port); +static void dgb_pause (void *chan); +static void wakeflush (void *p); +static void disc_optim (struct tty *tp, struct termios *t); struct isa_driver dgbdriver = { @@ -339,10 +339,10 @@ static int dgbdebug=0; SYSCTL_INT(_debug, OID_AUTO, dgb_debug, CTLFLAG_RW, &dgbdebug, 0, ""); #endif -static __inline int setwin __P((struct dgb_softc *sc, unsigned addr)); -static __inline int setinitwin __P((struct dgb_softc *sc, unsigned addr)); -static __inline void hidewin __P((struct dgb_softc *sc)); -static __inline void towin __P((struct dgb_softc *sc, int win)); +static __inline int setwin(struct dgb_softc *sc, unsigned addr); +static __inline int setinitwin(struct dgb_softc *sc, unsigned addr); +static __inline void hidewin(struct dgb_softc *sc); +static __inline void towin(struct dgb_softc *sc, int win); /*Helg: to allow recursive dgb...() calls */ typedef struct diff --git a/sys/dev/ed/if_ed.c b/sys/dev/ed/if_ed.c index 8fb2dc8343d2..99b355ad2e31 100644 --- a/sys/dev/ed/if_ed.c +++ b/sys/dev/ed/if_ed.c @@ -75,37 +75,35 @@ devclass_t ed_devclass; -static void ed_init __P((void *)); -static int ed_ioctl __P((struct ifnet *, u_long, caddr_t)); -static void ed_start __P((struct ifnet *)); -static void ed_reset __P((struct ifnet *)); -static void ed_watchdog __P((struct ifnet *)); +static void ed_init (void *); +static int ed_ioctl (struct ifnet *, u_long, caddr_t); +static void ed_start (struct ifnet *); +static void ed_reset (struct ifnet *); +static void ed_watchdog (struct ifnet *); #ifndef ED_NO_MIIBUS -static void ed_tick __P((void *)); +static void ed_tick (void *); #endif -static void ds_getmcaf __P((struct ed_softc *, u_int32_t *)); +static void ds_getmcaf (struct ed_softc *, u_int32_t *); -static void ed_get_packet __P((struct ed_softc *, char *, /* u_short */ int)); +static void ed_get_packet (struct ed_softc *, char *, /* u_short */ int); -static __inline void ed_rint __P((struct ed_softc *)); -static __inline void ed_xmit __P((struct ed_softc *)); -static __inline char * ed_ring_copy __P((struct ed_softc *, char *, char *, - /* u_short */ int)); -static void ed_hpp_set_physical_link __P((struct ed_softc *)); -static void ed_hpp_readmem __P((struct ed_softc *, int, unsigned char *, - /* u_short */ int)); -static void ed_hpp_writemem __P((struct ed_softc *, unsigned char *, - /* u_short */ int, /* u_short */ int)); -static u_short ed_hpp_write_mbufs __P((struct ed_softc *, struct mbuf *, - int)); +static __inline void ed_rint (struct ed_softc *); +static __inline void ed_xmit (struct ed_softc *); +static __inline char * ed_ring_copy(struct ed_softc *, char *, char *, + /* u_short */ int); +static void ed_hpp_set_physical_link(struct ed_softc *); +static void ed_hpp_readmem (struct ed_softc *, int, unsigned char *, + /* u_short */ int); +static void ed_hpp_writemem (struct ed_softc *, unsigned char *, + /* u_short */ int, /* u_short */ int); +static u_short ed_hpp_write_mbufs(struct ed_softc *, struct mbuf *, int); -static u_short ed_pio_write_mbufs __P((struct ed_softc *, struct mbuf *, - int)); +static u_short ed_pio_write_mbufs(struct ed_softc *, struct mbuf *, int); -static void ed_setrcr __P((struct ed_softc *)); +static void ed_setrcr (struct ed_softc *); -static u_int32_t ds_crc __P((u_char *ep)); +static u_int32_t ds_crc (u_char *ep); /* * Interrupt conversion table for WD/SMC ASIC/83C584 diff --git a/sys/dev/ed/if_ed_cbus.c b/sys/dev/ed/if_ed_cbus.c index 1ea4af82e4f3..307323f83ba5 100644 --- a/sys/dev/ed/if_ed_cbus.c +++ b/sys/dev/ed/if_ed_cbus.c @@ -54,25 +54,25 @@ #include <dev/ed/if_edreg.h> #include <dev/ed/if_ed98.h> -static int ed98_alloc_port __P((device_t, int)); -static int ed98_alloc_memory __P((device_t, int)); -static int ed_pio_testmem __P((struct ed_softc *, int, int, int)); -static int ed_probe_SIC98 __P((device_t, int, int)); -static int ed_probe_CNET98 __P((device_t, int, int)); -static int ed_probe_CNET98EL __P((device_t, int, int)); -static int ed_probe_NEC77 __P((device_t, int, int)); -static int ed_probe_NW98X __P((device_t, int, int)); -static int ed_probe_SB98 __P((device_t, int, int)); -static int ed_probe_EZ98 __P((device_t, int, int)); -static int ed98_probe_Novell __P((device_t, int, int)); -static int ed98_probe_generic8390 __P((struct ed_softc *)); -static void ed_reset_CNET98 __P((struct ed_softc *, int)); -static void ed_winsel_CNET98 __P((struct ed_softc *, u_short)); -static void ed_get_SB98 __P((struct ed_softc *)); +static int ed98_alloc_port (device_t, int); +static int ed98_alloc_memory (device_t, int); +static int ed_pio_testmem (struct ed_softc *, int, int, int); +static int ed_probe_SIC98 (device_t, int, int); +static int ed_probe_CNET98 (device_t, int, int); +static int ed_probe_CNET98EL (device_t, int, int); +static int ed_probe_NEC77 (device_t, int, int); +static int ed_probe_NW98X (device_t, int, int); +static int ed_probe_SB98 (device_t, int, int); +static int ed_probe_EZ98 (device_t, int, int); +static int ed98_probe_Novell (device_t, int, int); +static int ed98_probe_generic8390 (struct ed_softc *); +static void ed_reset_CNET98 (struct ed_softc *, int); +static void ed_winsel_CNET98 (struct ed_softc *, u_short); +static void ed_get_SB98 (struct ed_softc *); #endif -static int ed_isa_probe __P((device_t)); -static int ed_isa_attach __P((device_t)); +static int ed_isa_probe (device_t); +static int ed_isa_attach (device_t); static struct isa_pnp_id ed_ids[] = { #ifdef PC98 diff --git a/sys/dev/ed/if_ed_isa.c b/sys/dev/ed/if_ed_isa.c index fe00356d94e4..a08ae0e87b46 100644 --- a/sys/dev/ed/if_ed_isa.c +++ b/sys/dev/ed/if_ed_isa.c @@ -44,8 +44,8 @@ #include <dev/ed/if_edvar.h> -static int ed_isa_probe __P((device_t)); -static int ed_isa_attach __P((device_t)); +static int ed_isa_probe (device_t); +static int ed_isa_attach (device_t); static struct isa_pnp_id ed_ids[] = { { 0x1684a34d, NULL }, /* SMC8416 */ diff --git a/sys/dev/ed/if_ed_pci.c b/sys/dev/ed/if_ed_pci.c index 144ba8220cc9..a283b6e6f25a 100644 --- a/sys/dev/ed/if_ed_pci.c +++ b/sys/dev/ed/if_ed_pci.c @@ -58,8 +58,8 @@ static struct _pcsid { 0x00000000, NULL } }; -static int ed_pci_probe __P((device_t)); -static int ed_pci_attach __P((device_t)); +static int ed_pci_probe (device_t); +static int ed_pci_attach (device_t); static int ed_pci_probe (device_t dev) diff --git a/sys/dev/ed/if_edvar.h b/sys/dev/ed/if_edvar.h index 06791981cf8e..3855b6dec617 100644 --- a/sys/dev/ed/if_edvar.h +++ b/sys/dev/ed/if_edvar.h @@ -50,8 +50,8 @@ struct ed_softc { struct resource* irq_res; /* resource for irq */ void* irq_handle; /* handle for irq handler */ device_t miibus; /* MII bus for cards with MII. */ - void (*mii_writebits)__P((struct ed_softc *, u_int, int)); - u_int (*mii_readbits)__P((struct ed_softc *, int)); + void (*mii_writebits)(struct ed_softc *, u_int, int); + u_int (*mii_readbits)(struct ed_softc *, int); struct callout_handle tick_ch; /* Callout handle for ed_tick */ int nic_offset; /* NIC (DS8390) I/O bus address offset */ @@ -190,31 +190,31 @@ struct ed_softc { rman_get_bushandle((sc)->port_res), \ (sc)->asic_offset + (port), (u_int32_t *)(addr), (count)) -void ed_release_resources __P((device_t)); -int ed_alloc_port __P((device_t, int, int)); -int ed_alloc_memory __P((device_t, int, int)); -int ed_alloc_irq __P((device_t, int, int)); - -int ed_probe_generic8390 __P((struct ed_softc *)); -int ed_probe_WD80x3 __P((device_t, int, int)); -int ed_probe_WD80x3_generic __P((device_t, int, unsigned short *[])); -int ed_probe_3Com __P((device_t, int, int)); -int ed_probe_Novell __P((device_t, int, int)); -int ed_probe_Novell_generic __P((device_t, int)); -int ed_probe_HP_pclanp __P((device_t, int, int)); - -int ed_attach __P((struct ed_softc *, int, int)); -void ed_stop __P((struct ed_softc *)); -void ed_pio_readmem __P((struct ed_softc *, int, unsigned char *, - unsigned short)); -void ed_pio_writemem __P((struct ed_softc *, char *, - unsigned short, unsigned short)); +void ed_release_resources (device_t); +int ed_alloc_port (device_t, int, int); +int ed_alloc_memory (device_t, int, int); +int ed_alloc_irq (device_t, int, int); + +int ed_probe_generic8390 (struct ed_softc *); +int ed_probe_WD80x3 (device_t, int, int); +int ed_probe_WD80x3_generic (device_t, int, unsigned short *[]); +int ed_probe_3Com (device_t, int, int); +int ed_probe_Novell (device_t, int, int); +int ed_probe_Novell_generic (device_t, int); +int ed_probe_HP_pclanp (device_t, int, int); + +int ed_attach (struct ed_softc *, int, int); +void ed_stop (struct ed_softc *); +void ed_pio_readmem (struct ed_softc *, int, unsigned char *, + unsigned short); +void ed_pio_writemem (struct ed_softc *, char *, + unsigned short, unsigned short); #ifndef ED_NO_MIIBUS -int ed_miibus_readreg __P((device_t, int, int)); -void ed_miibus_writereg __P((device_t, int, int, int)); -int ed_ifmedia_upd __P((struct ifnet *)); -void ed_ifmedia_sts __P((struct ifnet *, struct ifmediareq *)); -void ed_child_detached __P((device_t, device_t)); +int ed_miibus_readreg (device_t, int, int); +void ed_miibus_writereg (device_t, int, int, int); +int ed_ifmedia_upd (struct ifnet *); +void ed_ifmedia_sts (struct ifnet *, struct ifmediareq *); +void ed_child_detached (device_t, device_t); #endif driver_intr_t edintr; diff --git a/sys/dev/eisa/eisaconf.h b/sys/dev/eisa/eisaconf.h index 8330bb4a7353..58a3c5c9b9da 100644 --- a/sys/dev/eisa/eisaconf.h +++ b/sys/dev/eisa/eisaconf.h @@ -78,14 +78,14 @@ EISA_ACCESSOR(slot, SLOT, int) EISA_ACCESSOR(id, ID, eisa_id_t) EISA_ACCESSOR(irq, IRQ, eisa_id_t) -int eisa_add_intr __P((device_t, int, int)); +int eisa_add_intr(device_t, int, int); #define RESVADDR_NONE 0x00 #define RESVADDR_BITMASK 0x01 /* size is a mask of reserved * bits at addr */ #define RESVADDR_RELOCATABLE 0x02 -int eisa_add_iospace __P((device_t, u_long, u_long, int)); -int eisa_add_mspace __P((device_t, u_long, u_long, int)); +int eisa_add_iospace(device_t, u_long, u_long, int); +int eisa_add_mspace(device_t, u_long, u_long, int); #endif /* _I386_EISA_EISACONF_H_ */ diff --git a/sys/dev/em/if_em.c b/sys/dev/em/if_em.c index 8d08b5f89ede..a666dd4f551a 100644 --- a/sys/dev/em/if_em.c +++ b/sys/dev/em/if_em.c @@ -91,53 +91,52 @@ static char *em_strings[] = { /********************************************************************* * Function prototypes *********************************************************************/ -static int em_probe __P((device_t)); -static int em_attach __P((device_t)); -static int em_detach __P((device_t)); -static int em_shutdown __P((device_t)); -static void em_intr __P((void *)); -static void em_start __P((struct ifnet *)); -static int em_ioctl __P((struct ifnet *, IOCTL_CMD_TYPE, caddr_t)); -static void em_watchdog __P((struct ifnet *)); -static void em_init __P((void *)); -static void em_stop __P((void *)); -static void em_media_status __P((struct ifnet *, struct ifmediareq *)); -static int em_media_change __P((struct ifnet *)); -static void em_identify_hardware __P((struct adapter *)); -static int em_allocate_pci_resources __P((struct adapter *)); -static void em_free_pci_resources __P((struct adapter *)); -static void em_local_timer __P((void *)); -static int em_hardware_init __P((struct adapter *)); -static void em_read_mac_address __P((struct adapter *, u_int8_t *)); -static void em_setup_interface __P((device_t, struct adapter *)); -static int em_setup_transmit_structures __P((struct adapter *)); -static void em_initialize_transmit_unit __P((struct adapter *)); -static int em_setup_receive_structures __P((struct adapter *)); -static void em_initialize_receive_unit __P((struct adapter *)); -static void EnableInterrupts __P((struct adapter *)); -static void DisableInterrupts __P((struct adapter *)); -static void em_free_transmit_structures __P((struct adapter *)); -static void em_free_receive_structures __P((struct adapter *)); -static void em_update_stats_counters __P((struct adapter *)); -static void em_clean_transmit_interrupts __P((struct adapter *)); -static int em_allocate_receive_structures __P((struct adapter *)); -static int em_allocate_transmit_structures __P((struct adapter *)); -static void em_process_receive_interrupts __P((struct adapter *)); -static void em_receive_checksum __P((struct adapter *, +static int em_probe(device_t); +static int em_attach(device_t); +static int em_detach(device_t); +static int em_shutdown(device_t); +static void em_intr(void *); +static void em_start(struct ifnet *); +static int em_ioctl(struct ifnet *, IOCTL_CMD_TYPE, caddr_t); +static void em_watchdog(struct ifnet *); +static void em_init(void *); +static void em_stop(void *); +static void em_media_status(struct ifnet *, struct ifmediareq *); +static int em_media_change(struct ifnet *); +static void em_identify_hardware(struct adapter *); +static int em_allocate_pci_resources(struct adapter *); +static void em_free_pci_resources(struct adapter *); +static void em_local_timer(void *); +static int em_hardware_init(struct adapter *); +static void em_read_mac_address(struct adapter *, u_int8_t *); +static void em_setup_interface(device_t, struct adapter *); +static int em_setup_transmit_structures(struct adapter *); +static void em_initialize_transmit_unit(struct adapter *); +static int em_setup_receive_structures(struct adapter *); +static void em_initialize_receive_unit(struct adapter *); +static void EnableInterrupts(struct adapter *); +static void DisableInterrupts(struct adapter *); +static void em_free_transmit_structures(struct adapter *); +static void em_free_receive_structures(struct adapter *); +static void em_update_stats_counters(struct adapter *); +static void em_clean_transmit_interrupts(struct adapter *); +static int em_allocate_receive_structures(struct adapter *); +static int em_allocate_transmit_structures(struct adapter *); +static void em_process_receive_interrupts(struct adapter *); +static void em_receive_checksum(struct adapter *, struct em_rx_desc * RxDescriptor, - struct mbuf *)); -static void em_transmit_checksum_setup __P((struct adapter *, + struct mbuf *); +static void em_transmit_checksum_setup(struct adapter *, struct mbuf *, struct em_tx_buffer *, u_int32_t *, - u_int32_t *)); -static void em_set_promisc __P((struct adapter *)); -static void em_disable_promisc __P((struct adapter *)); -static void em_set_multi __P((struct adapter *)); -static void em_print_hw_stats __P((struct adapter *)); -static void em_print_link_status __P((struct adapter *)); -static int em_get_buf __P((struct em_rx_buffer *, struct adapter *, - struct mbuf *)); + u_int32_t *); +static void em_set_promisc(struct adapter *); +static void em_disable_promisc(struct adapter *); +static void em_set_multi(struct adapter *); +static void em_print_hw_stats(struct adapter *); +static void em_print_link_status(struct adapter *); +static int em_get_buf(struct em_rx_buffer *, struct adapter *, struct mbuf *); /********************************************************************* * FreeBSD Device Interface Entry Points *********************************************************************/ diff --git a/sys/dev/en/if_en_pci.c b/sys/dev/en/if_en_pci.c index f3eecb66788a..4b99da71cccb 100644 --- a/sys/dev/en/if_en_pci.c +++ b/sys/dev/en/if_en_pci.c @@ -67,10 +67,10 @@ * prototypes */ -static int en_pci_probe __P((device_t)); -static int en_pci_attach __P((device_t)); -static int en_pci_detach __P((device_t)); -static int en_pci_shutdown __P((device_t)); +static int en_pci_probe(device_t); +static int en_pci_attach(device_t); +static int en_pci_detach(device_t); +static int en_pci_shutdown(device_t); /* * local structures @@ -87,10 +87,10 @@ struct en_pci_softc { }; #if !defined(MIDWAY_ENIONLY) -static void eni_get_macaddr __P((device_t, struct en_pci_softc *)); +static void eni_get_macaddr(device_t, struct en_pci_softc *); #endif #if !defined(MIDWAY_ADPONLY) -static void adp_get_macaddr __P((struct en_pci_softc *)); +static void adp_get_macaddr(struct en_pci_softc *); #endif /* @@ -136,7 +136,7 @@ static void adp_get_macaddr __P((struct en_pci_softc *)); #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/en/midway.c b/sys/dev/en/midway.c index 0f24ed0a48c8..adb100420475 100644 --- a/sys/dev/en/midway.c +++ b/sys/dev/en/midway.c @@ -265,36 +265,34 @@ static struct en_dmatab *en_dmaplan = en_dma_planB; * prototypes */ -STATIC INLINE int en_b2sz __P((int)) __attribute__ ((unused)); +STATIC INLINE int en_b2sz(int) __attribute__ ((unused)); #ifdef EN_DDBHOOK - int en_dump __P((int,int)); - int en_dumpmem __P((int,int,int)); -#endif -STATIC void en_dmaprobe __P((struct en_softc *)); -STATIC int en_dmaprobe_doit __P((struct en_softc *, u_int8_t *, - u_int8_t *, int)); -STATIC INLINE int en_dqneed __P((struct en_softc *, caddr_t, u_int, - u_int)) __attribute__ ((unused)); -STATIC void en_init __P((struct en_softc *)); -STATIC int en_ioctl __P((struct ifnet *, EN_IOCTL_CMDT, caddr_t)); -STATIC INLINE int en_k2sz __P((int)) __attribute__ ((unused)); -STATIC void en_loadvc __P((struct en_softc *, int)); -STATIC int en_mfix __P((struct en_softc *, struct mbuf **, - struct mbuf *)); -STATIC INLINE struct mbuf *en_mget __P((struct en_softc *, u_int, - u_int *)) __attribute__ ((unused)); -STATIC INLINE u_int32_t en_read __P((struct en_softc *, - u_int32_t)) __attribute__ ((unused)); -STATIC int en_rxctl __P((struct en_softc *, struct atm_pseudoioctl *, - int)); -STATIC void en_txdma __P((struct en_softc *, int)); -STATIC void en_txlaunch __P((struct en_softc *, int, - struct en_launch *)); -STATIC void en_service __P((struct en_softc *)); -STATIC void en_start __P((struct ifnet *)); -STATIC INLINE int en_sz2b __P((int)) __attribute__ ((unused)); -STATIC INLINE void en_write __P((struct en_softc *, u_int32_t, - u_int32_t)) __attribute__ ((unused)); + int en_dump(int,int); + int en_dumpmem(int,int,int); +#endif +STATIC void en_dmaprobe(struct en_softc *); +STATIC int en_dmaprobe_doit(struct en_softc *, u_int8_t *, + u_int8_t *, int); +STATIC INLINE int en_dqneed(struct en_softc *, caddr_t, u_int, + u_int) __attribute__ ((unused)); +STATIC void en_init(struct en_softc *); +STATIC int en_ioctl(struct ifnet *, EN_IOCTL_CMDT, caddr_t); +STATIC INLINE int en_k2sz(int) __attribute__ ((unused)); +STATIC void en_loadvc(struct en_softc *, int); +STATIC int en_mfix(struct en_softc *, struct mbuf **, struct mbuf *); +STATIC INLINE struct mbuf *en_mget(struct en_softc *, u_int, + u_int *) __attribute__ ((unused)); +STATIC INLINE u_int32_t en_read(struct en_softc *, + u_int32_t) __attribute__ ((unused)); +STATIC int en_rxctl(struct en_softc *, struct atm_pseudoioctl *, int); +STATIC void en_txdma(struct en_softc *, int); +STATIC void en_txlaunch(struct en_softc *, int, + struct en_launch *); +STATIC void en_service(struct en_softc *); +STATIC void en_start(struct ifnet *); +STATIC INLINE int en_sz2b(int) __attribute__ ((unused)); +STATIC INLINE void en_write(struct en_softc *, u_int32_t, + u_int32_t) __attribute__ ((unused)); /* * macros/inline diff --git a/sys/dev/en/midwayvar.h b/sys/dev/en/midwayvar.h index fd1db6603cc5..007b91bf744f 100644 --- a/sys/dev/en/midwayvar.h +++ b/sys/dev/en/midwayvar.h @@ -97,7 +97,7 @@ struct en_softc { bus_space_tag_t en_memt; /* for EN_READ/EN_WRITE */ bus_space_handle_t en_base; /* base of en card */ bus_size_t en_obmemsz; /* size of en card (bytes) */ - void (*en_busreset) __P((void *)); + void (*en_busreset)(void *); /* bus specific reset function */ /* serv list */ @@ -195,6 +195,6 @@ struct en_softc { * exported functions */ -void en_attach __P((struct en_softc *)); -EN_INTR_TYPE en_intr __P((void *)); -void en_reset __P((struct en_softc *)); +void en_attach(struct en_softc *); +EN_INTR_TYPE en_intr(void *); +void en_reset(struct en_softc *); diff --git a/sys/dev/ep/if_ep.c b/sys/dev/ep/if_ep.c index 7798325c770d..e0a6795fe822 100644 --- a/sys/dev/ep/if_ep.c +++ b/sys/dev/ep/if_ep.c @@ -95,18 +95,18 @@ static int ep_media2if_media[] = { IFM_10_T, IFM_10_5, IFM_NONE, IFM_10_2, IFM_NONE }; /* if functions */ -static void ep_if_init __P((void *)); -static int ep_if_ioctl __P((struct ifnet *, u_long, caddr_t)); -static void ep_if_start __P((struct ifnet *)); -static void ep_if_watchdog __P((struct ifnet *)); +static void ep_if_init (void *); +static int ep_if_ioctl (struct ifnet *, u_long, caddr_t); +static void ep_if_start (struct ifnet *); +static void ep_if_watchdog (struct ifnet *); /* if_media functions */ -static int ep_ifmedia_upd __P((struct ifnet *)); -static void ep_ifmedia_sts __P((struct ifnet *, struct ifmediareq *)); +static int ep_ifmedia_upd (struct ifnet *); +static void ep_ifmedia_sts (struct ifnet *, struct ifmediareq *); -static void epstop __P((struct ep_softc *)); -static void epread __P((struct ep_softc *)); -static int eeprom_rdy __P((struct ep_softc *)); +static void epstop (struct ep_softc *); +static void epread (struct ep_softc *); +static int eeprom_rdy (struct ep_softc *); #define EP_FTST(sc, f) (sc->stat & (f)) #define EP_FSET(sc, f) (sc->stat |= (f)) diff --git a/sys/dev/ep/if_ep_eisa.c b/sys/dev/ep/if_ep_eisa.c index 63be85c39fae..f0bef6d740a6 100644 --- a/sys/dev/ep/if_ep_eisa.c +++ b/sys/dev/ep/if_ep_eisa.c @@ -70,7 +70,7 @@ #define TRANS_AUI 0x4000 #define TRANS_BNC 0xc000 -static const char *ep_match __P((eisa_id_t type)); +static const char *ep_match(eisa_id_t type); static const char* ep_match(eisa_id_t type) diff --git a/sys/dev/ex/if_ex.c b/sys/dev/ex/if_ex.c index 2a3dcfdd4e71..f457a40457de 100644 --- a/sys/dev/ex/if_ex.c +++ b/sys/dev/ex/if_ex.c @@ -91,21 +91,21 @@ u_char plus_ee2irqmap[] = { 3, 4, 5, 7, 9, 10, 11, 12 }; /* Network Interface Functions */ -static void ex_init __P((void *)); -static void ex_start __P((struct ifnet *)); -static int ex_ioctl __P((struct ifnet *, u_long, caddr_t)); -static void ex_watchdog __P((struct ifnet *)); +static void ex_init (void *); +static void ex_start (struct ifnet *); +static int ex_ioctl (struct ifnet *, u_long, caddr_t); +static void ex_watchdog (struct ifnet *); /* ifmedia Functions */ -static int ex_ifmedia_upd __P((struct ifnet *)); -static void ex_ifmedia_sts __P((struct ifnet *, struct ifmediareq *)); +static int ex_ifmedia_upd (struct ifnet *); +static void ex_ifmedia_sts (struct ifnet *, struct ifmediareq *); -static int ex_get_media __P((u_int32_t iobase)); +static int ex_get_media (u_int32_t iobase); -static void ex_reset __P((struct ex_softc *)); +static void ex_reset (struct ex_softc *); -static void ex_tx_intr __P((struct ex_softc *)); -static void ex_rx_intr __P((struct ex_softc *)); +static void ex_tx_intr (struct ex_softc *); +static void ex_rx_intr (struct ex_softc *); int look_for_card (u_int32_t iobase) diff --git a/sys/dev/ex/if_ex_isa.c b/sys/dev/ex/if_ex_isa.c index 993e4eafc29d..88607957491c 100644 --- a/sys/dev/ex/if_ex_isa.c +++ b/sys/dev/ex/if_ex_isa.c @@ -50,9 +50,9 @@ #include <dev/ex/if_exvar.h> /* Bus Front End Functions */ -static void ex_isa_identify __P((driver_t *, device_t)); -static int ex_isa_probe __P((device_t)); -static int ex_isa_attach __P((device_t)); +static void ex_isa_identify (driver_t *, device_t); +static int ex_isa_probe (device_t); +static int ex_isa_attach (device_t); #if 0 static void ex_pnp_wakeup (void *); diff --git a/sys/dev/ex/if_ex_pccard.c b/sys/dev/ex/if_ex_pccard.c index 5b7f6ff318e5..3f88fed0123f 100644 --- a/sys/dev/ex/if_ex_pccard.c +++ b/sys/dev/ex/if_ex_pccard.c @@ -49,9 +49,9 @@ #include <dev/pccard/pccardvar.h> /* Bus Front End Functions */ -static int ex_pccard_probe __P((device_t)); -static int ex_pccard_attach __P((device_t)); -static int ex_pccard_detach __P((device_t)); +static int ex_pccard_probe (device_t); +static int ex_pccard_attach (device_t); +static int ex_pccard_detach (device_t); static device_method_t ex_pccard_methods[] = { /* Device interface */ diff --git a/sys/dev/gem/if_gem.c b/sys/dev/gem/if_gem.c index f19d649734eb..019dbbbf1002 100644 --- a/sys/dev/gem/if_gem.c +++ b/sys/dev/gem/if_gem.c @@ -60,41 +60,39 @@ #define TRIES 10000 -static void gem_start __P((struct ifnet *)); -static void gem_stop __P((struct ifnet *, int)); -static int gem_ioctl __P((struct ifnet *, u_long, caddr_t)); -static void gem_cddma_callback __P((void *, bus_dma_segment_t *, int, int)); -static void gem_rxdma_callback __P((void *, bus_dma_segment_t *, int, int)); -static void gem_txdma_callback __P((void *, bus_dma_segment_t *, int, int)); -static void gem_tick __P((void *)); -static void gem_watchdog __P((struct ifnet *)); -static void gem_init __P((void *)); -static void gem_init_regs __P((struct gem_softc *sc)); -static int gem_ringsize __P((int sz)); -static int gem_meminit __P((struct gem_softc *)); -static int gem_dmamap_load_mbuf __P((struct gem_softc *, struct mbuf *, - bus_dmamap_callback_t *, struct gem_txjob *, int)); -static void gem_dmamap_unload_mbuf __P((struct gem_softc *, - struct gem_txjob *)); -static void gem_dmamap_commit_mbuf __P((struct gem_softc *, - struct gem_txjob *)); -static void gem_mifinit __P((struct gem_softc *)); -static int gem_bitwait __P((struct gem_softc *sc, bus_addr_t r, - u_int32_t clr, u_int32_t set)); -static int gem_reset_rx __P((struct gem_softc *)); -static int gem_reset_tx __P((struct gem_softc *)); -static int gem_disable_rx __P((struct gem_softc *)); -static int gem_disable_tx __P((struct gem_softc *)); -static void gem_rxdrain __P((struct gem_softc *)); -static int gem_add_rxbuf __P((struct gem_softc *, int)); -static void gem_setladrf __P((struct gem_softc *)); - -struct mbuf *gem_get __P((struct gem_softc *, int, int)); -static void gem_eint __P((struct gem_softc *, u_int)); -static void gem_rint __P((struct gem_softc *)); -static void gem_tint __P((struct gem_softc *)); +static void gem_start(struct ifnet *); +static void gem_stop(struct ifnet *, int); +static int gem_ioctl(struct ifnet *, u_long, caddr_t); +static void gem_cddma_callback(void *, bus_dma_segment_t *, int, int); +static void gem_rxdma_callback(void *, bus_dma_segment_t *, int, int); +static void gem_txdma_callback(void *, bus_dma_segment_t *, int, int); +static void gem_tick(void *); +static void gem_watchdog(struct ifnet *); +static void gem_init(void *); +static void gem_init_regs(struct gem_softc *sc); +static int gem_ringsize(int sz); +static int gem_meminit(struct gem_softc *); +static int gem_dmamap_load_mbuf(struct gem_softc *, struct mbuf *, + bus_dmamap_callback_t *, struct gem_txjob *, int); +static void gem_dmamap_unload_mbuf(struct gem_softc *, struct gem_txjob *); +static void gem_dmamap_commit_mbuf(struct gem_softc *, struct gem_txjob *); +static void gem_mifinit(struct gem_softc *); +static int gem_bitwait(struct gem_softc *sc, bus_addr_t r, + u_int32_t clr, u_int32_t set); +static int gem_reset_rx(struct gem_softc *); +static int gem_reset_tx(struct gem_softc *); +static int gem_disable_rx(struct gem_softc *); +static int gem_disable_tx(struct gem_softc *); +static void gem_rxdrain(struct gem_softc *); +static int gem_add_rxbuf(struct gem_softc *, int); +static void gem_setladrf(struct gem_softc *); + +struct mbuf *gem_get(struct gem_softc *, int, int); +static void gem_eint(struct gem_softc *, u_int); +static void gem_rint(struct gem_softc *); +static void gem_tint(struct gem_softc *); #ifdef notyet -static void gem_power __P((int, void *)); +static void gem_power(int, void *); #endif devclass_t gem_devclass; diff --git a/sys/dev/gem/if_gem_pci.c b/sys/dev/gem/if_gem_pci.c index 0e2544f1e85a..44f945bcf8f4 100644 --- a/sys/dev/gem/if_gem_pci.c +++ b/sys/dev/gem/if_gem_pci.c @@ -75,8 +75,8 @@ struct gem_pci_softc { void *gsc_ih; }; -static int gem_pci_probe __P((device_t)); -static int gem_pci_attach __P((device_t)); +static int gem_pci_probe(device_t); +static int gem_pci_attach(device_t); static device_method_t gem_pci_methods[] = { diff --git a/sys/dev/gem/if_gemvar.h b/sys/dev/gem/if_gemvar.h index 40093503c0ed..8abce88e0eab 100644 --- a/sys/dev/gem/if_gemvar.h +++ b/sys/dev/gem/if_gemvar.h @@ -182,8 +182,8 @@ struct gem_softc { int sc_flags; /* Special hardware hooks */ - void (*sc_hwreset) __P((struct gem_softc *)); - void (*sc_hwinit) __P((struct gem_softc *)); + void (*sc_hwreset)(struct gem_softc *); + void (*sc_hwinit)(struct gem_softc *); }; #define GEM_DMA_READ(sc, v) (((sc)->sc_pci) ? le64toh(v) : be64toh(v)) @@ -222,19 +222,19 @@ do { \ #ifdef _KERNEL extern devclass_t gem_devclass; -int gem_attach __P((struct gem_softc *)); -int gem_detach __P((struct gem_softc *)); -void gem_intr __P((void *)); +int gem_attach(struct gem_softc *); +int gem_detach(struct gem_softc *); +void gem_intr(void *); -int gem_mediachange __P((struct ifnet *)); -void gem_mediastatus __P((struct ifnet *, struct ifmediareq *)); +int gem_mediachange(struct ifnet *); +void gem_mediastatus(struct ifnet *, struct ifmediareq *); -void gem_reset __P((struct gem_softc *)); +void gem_reset(struct gem_softc *); /* MII methods & callbacks */ -int gem_mii_readreg __P((device_t, int, int)); -int gem_mii_writereg __P((device_t, int, int, int)); -void gem_mii_statchg __P((device_t)); +int gem_mii_readreg(device_t, int, int); +int gem_mii_writereg(device_t, int, int, int); +void gem_mii_statchg(device_t); #endif /* _KERNEL */ diff --git a/sys/dev/hea/eni.c b/sys/dev/hea/eni.c index 8a938dfe39eb..c433e925791f 100644 --- a/sys/dev/hea/eni.c +++ b/sys/dev/hea/eni.c @@ -73,17 +73,17 @@ __RCSID("@(#) $FreeBSD$"); /* * Typedef local functions */ -static const char *eni_pci_probe __P((pcici_t, pcidi_t)); -static void eni_pci_attach __P((pcici_t, int)); -static int eni_get_ack __P((Eni_unit *)); -static int eni_get_sebyte __P((Eni_unit *)); -static void eni_read_seeprom __P((Eni_unit *)); +static const char *eni_pci_probe(pcici_t, pcidi_t); +static void eni_pci_attach(pcici_t, int); +static int eni_get_ack(Eni_unit *); +static int eni_get_sebyte(Eni_unit *); +static void eni_read_seeprom(Eni_unit *); #if BSD < 199506 -static int eni_pci_shutdown __P((struct kern_devconf *, int)); +static int eni_pci_shutdown(struct kern_devconf *, int); #else -static void eni_pci_shutdown __P((void *, int)); +static void eni_pci_shutdown(void *, int); #endif -static void eni_pci_reset __P((Eni_unit *)); +static void eni_pci_reset(Eni_unit *); /* * Used by kernel to return number of claimed devices diff --git a/sys/dev/hea/eni_buffer.c b/sys/dev/hea/eni_buffer.c index 5fc9d4800717..89aa901e40f8 100644 --- a/sys/dev/hea/eni_buffer.c +++ b/sys/dev/hea/eni_buffer.c @@ -54,7 +54,7 @@ __RCSID("@(#) $FreeBSD$"); #endif -static int eni_test_memory __P((Eni_unit *)); +static int eni_test_memory(Eni_unit *); /* * The host is going to manage (that is, allocate and free) buffers diff --git a/sys/dev/hea/eni_if.c b/sys/dev/hea/eni_if.c index ce396bf24ccc..f4cd5d700b95 100644 --- a/sys/dev/hea/eni_if.c +++ b/sys/dev/hea/eni_if.c @@ -61,7 +61,7 @@ __RCSID("@(#) $FreeBSD$"); #endif -static void eni_get_stats __P((Eni_unit *)); +static void eni_get_stats(Eni_unit *); /* * SUNI statistics counters take one of three forms: diff --git a/sys/dev/hea/eni_intr.c b/sys/dev/hea/eni_intr.c index f5f2f58537be..76f673f8df02 100644 --- a/sys/dev/hea/eni_intr.c +++ b/sys/dev/hea/eni_intr.c @@ -56,7 +56,7 @@ __RCSID("@(#) $FreeBSD$"); #endif -static void eni_suni_intr __P((Eni_unit *)); +static void eni_suni_intr(Eni_unit *); /* * SUNI Interrupt processing diff --git a/sys/dev/hea/eni_receive.c b/sys/dev/hea/eni_receive.c index 8e8775251495..6ec33a15bf18 100644 --- a/sys/dev/hea/eni_receive.c +++ b/sys/dev/hea/eni_receive.c @@ -64,7 +64,7 @@ __RCSID("@(#) $FreeBSD$"); #endif -static void eni_recv_stack __P((void *, KBuffer *)); +static void eni_recv_stack(void *, KBuffer *); #ifdef DIAGNOSTIC extern int eni_pdu_print; diff --git a/sys/dev/hea/eni_var.h b/sys/dev/hea/eni_var.h index f13a99d94fab..248807a90f3c 100644 --- a/sys/dev/hea/eni_var.h +++ b/sys/dev/hea/eni_var.h @@ -42,37 +42,37 @@ * Global function declarations */ /* eni_buffer.c */ -int eni_init_memory __P((Eni_unit *)); -caddr_t eni_allocate_buffer __P((Eni_unit *, u_long *)); -void eni_free_buffer __P((Eni_unit *, caddr_t)); +int eni_init_memory(Eni_unit *); +caddr_t eni_allocate_buffer(Eni_unit *, u_long *); +void eni_free_buffer(Eni_unit *, caddr_t); /* eni_if.c */ -int eni_atm_ioctl __P((int, caddr_t, caddr_t)); -void eni_zero_stats __P((Eni_unit *)); +int eni_atm_ioctl(int, caddr_t, caddr_t); +void eni_zero_stats(Eni_unit *); /* eni_init.c */ -int eni_init __P((Eni_unit *)); +int eni_init(Eni_unit *); /* eni_intr.c */ #if defined(BSD) && BSD < 199506 -int eni_intr __P((void *)); +int eni_intr(void *); #else -void eni_intr __P((void *)); +void eni_intr(void *); #endif /* eni_receive.c */ -void eni_do_service __P((Eni_unit *)); -void eni_recv_drain __P((Eni_unit *)); +void eni_do_service(Eni_unit *); +void eni_recv_drain(Eni_unit *); /* eni_transmit.c */ -int eni_set_dma __P((Eni_unit *, int, u_long *, int, long *, int, u_long, int )); -void eni_output __P((Cmn_unit *, Cmn_vcc *, KBuffer *)); -void eni_xmit_drain __P((Eni_unit *)); +int eni_set_dma(Eni_unit *, int, u_long *, int, long *, int, u_long, int ); +void eni_output(Cmn_unit *, Cmn_vcc *, KBuffer *); +void eni_xmit_drain(Eni_unit *); /* eni_vcm.c */ -int eni_instvcc __P((Cmn_unit *, Cmn_vcc *)); -int eni_openvcc __P((Cmn_unit *, Cmn_vcc *)); -int eni_closevcc __P((Cmn_unit *, Cmn_vcc *)); +int eni_instvcc(Cmn_unit *, Cmn_vcc *); +int eni_openvcc(Cmn_unit *, Cmn_vcc *); +int eni_closevcc(Cmn_unit *, Cmn_vcc *); /* * Global variable declarations diff --git a/sys/dev/hfa/fore_buffer.c b/sys/dev/hfa/fore_buffer.c index d0e6b1a081d9..74fec2cbd2ca 100644 --- a/sys/dev/hfa/fore_buffer.c +++ b/sys/dev/hfa/fore_buffer.c @@ -71,9 +71,9 @@ __RCSID("@(#) $FreeBSD$"); /* * Local functions */ -static void fore_buf_drain __P((Fore_unit *)); -static void fore_buf_supply_1s __P((Fore_unit *)); -static void fore_buf_supply_1l __P((Fore_unit *)); +static void fore_buf_drain(Fore_unit *); +static void fore_buf_supply_1s(Fore_unit *); +static void fore_buf_supply_1l(Fore_unit *); /* diff --git a/sys/dev/hfa/fore_include.h b/sys/dev/hfa/fore_include.h index a1b63913d16a..0c102f13b2d5 100644 --- a/sys/dev/hfa/fore_include.h +++ b/sys/dev/hfa/fore_include.h @@ -42,56 +42,56 @@ * Global function declarations */ /* fore_buffer.c */ -int fore_buf_allocate __P((Fore_unit *)); -void fore_buf_initialize __P((Fore_unit *)); -void fore_buf_supply __P((Fore_unit *)); -void fore_buf_free __P((Fore_unit *)); +int fore_buf_allocate(Fore_unit *); +void fore_buf_initialize(Fore_unit *); +void fore_buf_supply(Fore_unit *); +void fore_buf_free(Fore_unit *); /* fore_command.c */ -int fore_cmd_allocate __P((Fore_unit *)); -void fore_cmd_initialize __P((Fore_unit *)); -void fore_cmd_drain __P((Fore_unit *)); -void fore_cmd_free __P((Fore_unit *)); +int fore_cmd_allocate(Fore_unit *); +void fore_cmd_initialize(Fore_unit *); +void fore_cmd_drain(Fore_unit *); +void fore_cmd_free(Fore_unit *); /* fore_if.c */ -int fore_atm_ioctl __P((int, caddr_t, caddr_t)); -void fore_interface_free __P((Fore_unit *)); +int fore_atm_ioctl(int, caddr_t, caddr_t); +void fore_interface_free(Fore_unit *); /* fore_init.c */ -void fore_initialize __P((Fore_unit *)); -void fore_initialize_complete __P((Fore_unit *)); +void fore_initialize(Fore_unit *); +void fore_initialize_complete(Fore_unit *); /* fore_intr.c */ -void fore_intr __P((void *)); -void fore_watchdog __P((Fore_unit *)); +void fore_intr(void *); +void fore_watchdog(Fore_unit *); /* fore_load.c */ /* fore_output.c */ -void fore_output __P((Cmn_unit *, Cmn_vcc *, KBuffer *)); +void fore_output(Cmn_unit *, Cmn_vcc *, KBuffer *); /* fore_receive.c */ -int fore_recv_allocate __P((Fore_unit *)); -void fore_recv_initialize __P((Fore_unit *)); -void fore_recv_drain __P((Fore_unit *)); -void fore_recv_free __P((Fore_unit *)); +int fore_recv_allocate(Fore_unit *); +void fore_recv_initialize(Fore_unit *); +void fore_recv_drain(Fore_unit *); +void fore_recv_free(Fore_unit *); /* fore_stats.c */ -int fore_get_stats __P((Fore_unit *)); +int fore_get_stats(Fore_unit *); /* fore_timer.c */ -void fore_timeout __P((struct atm_time *)); +void fore_timeout(struct atm_time *); /* fore_transmit.c */ -int fore_xmit_allocate __P((Fore_unit *)); -void fore_xmit_initialize __P((Fore_unit *)); -void fore_xmit_drain __P((Fore_unit *)); -void fore_xmit_free __P((Fore_unit *)); +int fore_xmit_allocate(Fore_unit *); +void fore_xmit_initialize(Fore_unit *); +void fore_xmit_drain(Fore_unit *); +void fore_xmit_free(Fore_unit *); /* fore_vcm.c */ -int fore_instvcc __P((Cmn_unit *, Cmn_vcc *)); -int fore_openvcc __P((Cmn_unit *, Cmn_vcc *)); -int fore_closevcc __P((Cmn_unit *, Cmn_vcc *)); +int fore_instvcc(Cmn_unit *, Cmn_vcc *); +int fore_openvcc(Cmn_unit *, Cmn_vcc *); +int fore_closevcc(Cmn_unit *, Cmn_vcc *); /* diff --git a/sys/dev/hfa/fore_init.c b/sys/dev/hfa/fore_init.c index edfc4b984a90..35fe207b598e 100644 --- a/sys/dev/hfa/fore_init.c +++ b/sys/dev/hfa/fore_init.c @@ -70,7 +70,7 @@ __RCSID("@(#) $FreeBSD$"); /* * Local functions */ -static void fore_get_prom __P((Fore_unit *)); +static void fore_get_prom(Fore_unit *); /* @@ -105,7 +105,7 @@ fore_initialize(fup) * Try again later */ fup->fu_thandle = - timeout((KTimeout_ret(*) __P((void *)))fore_initialize, + timeout((KTimeout_ret(*)(void *))fore_initialize, (void *)fup, hz); return; } else diff --git a/sys/dev/hfa/fore_load.c b/sys/dev/hfa/fore_load.c index f50e031352c4..4889736598e7 100644 --- a/sys/dev/hfa/fore_load.c +++ b/sys/dev/hfa/fore_load.c @@ -74,12 +74,12 @@ __RCSID("@(#) $FreeBSD$"); /* * Local functions */ -static int fore_start __P((void)); -static const char * fore_pci_probe __P((pcici_t, pcidi_t)); -static void fore_pci_attach __P((pcici_t, int)); -static void fore_pci_shutdown __P((void *, int)); -static void fore_unattach __P((Fore_unit *)); -static void fore_reset __P((Fore_unit *)); +static int fore_start(void); +static const char * fore_pci_probe(pcici_t, pcidi_t); +static void fore_pci_attach(pcici_t, int); +static void fore_pci_shutdown(void *, int); +static void fore_unattach(Fore_unit *); +static void fore_reset(Fore_unit *); #ifndef COMPAT_OLDPCI #error "The fore device requires the old pci compatibility shims" @@ -461,7 +461,7 @@ fore_unattach(fup) /* * Remove any pending timeout()'s */ - (void)untimeout((KTimeout_ret(*) __P((void *)))fore_initialize, + (void)untimeout((KTimeout_ret(*)(void *))fore_initialize, (void *)fup, fup->fu_thandle); diff --git a/sys/dev/hfa/fore_output.c b/sys/dev/hfa/fore_output.c index b18e0dc4fcef..2ff603257ae2 100644 --- a/sys/dev/hfa/fore_output.c +++ b/sys/dev/hfa/fore_output.c @@ -71,9 +71,9 @@ __RCSID("@(#) $FreeBSD$"); /* * Local functions */ -static KBuffer * fore_xmit_segment __P((Fore_unit *, KBuffer *, - H_xmit_queue *, int *, int *)); -static void fore_seg_dma_free __P((H_xmit_queue *, KBuffer *, int)); +static KBuffer * fore_xmit_segment(Fore_unit *, KBuffer *, + H_xmit_queue *, int *, int *); +static void fore_seg_dma_free(H_xmit_queue *, KBuffer *, int); /* diff --git a/sys/dev/hfa/fore_receive.c b/sys/dev/hfa/fore_receive.c index fc718dbe28d0..37a34ab87fcb 100644 --- a/sys/dev/hfa/fore_receive.c +++ b/sys/dev/hfa/fore_receive.c @@ -71,7 +71,7 @@ __RCSID("@(#) $FreeBSD$"); /* * Local functions */ -static void fore_recv_stack __P((void *, KBuffer *)); +static void fore_recv_stack(void *, KBuffer *); /* diff --git a/sys/dev/iir/iir.h b/sys/dev/iir/iir.h index 3b325cb11d70..2f1a487f5c7b 100644 --- a/sys/dev/iir/iir.h +++ b/sys/dev/iir/iir.h @@ -610,12 +610,12 @@ struct gdt_softc { struct cam_sim *sims[GDT_MAXBUS]; struct cam_path *paths[GDT_MAXBUS]; - void (*sc_copy_cmd) __P((struct gdt_softc *, struct gdt_ccb *)); - u_int8_t (*sc_get_status) __P((struct gdt_softc *)); - void (*sc_intr) __P((struct gdt_softc *, struct gdt_intr_ctx *)); - void (*sc_release_event) __P((struct gdt_softc *)); - void (*sc_set_sema0) __P((struct gdt_softc *)); - int (*sc_test_busy) __P((struct gdt_softc *)); + void (*sc_copy_cmd)(struct gdt_softc *, struct gdt_ccb *); + u_int8_t (*sc_get_status)(struct gdt_softc *); + void (*sc_intr)(struct gdt_softc *, struct gdt_intr_ctx *); + void (*sc_release_event)(struct gdt_softc *); + void (*sc_set_sema0)(struct gdt_softc *); + int (*sc_test_busy)(struct gdt_softc *); TAILQ_ENTRY(gdt_softc) links; }; @@ -644,17 +644,17 @@ struct gdt_ccb { }; -int iir_init __P((struct gdt_softc *)); -void iir_free __P((struct gdt_softc *)); -void iir_attach __P((struct gdt_softc *)); -void iir_intr __P((void *arg)); +int iir_init(struct gdt_softc *); +void iir_free(struct gdt_softc *); +void iir_attach(struct gdt_softc *); +void iir_intr(void *arg); #ifdef __GNUC__ /* These all require correctly aligned buffers */ -static __inline__ void gdt_enc16 __P((u_int8_t *, u_int16_t)); -static __inline__ void gdt_enc32 __P((u_int8_t *, u_int32_t)); -static __inline__ u_int16_t gdt_dec16 __P((u_int8_t *)); -static __inline__ u_int32_t gdt_dec32 __P((u_int8_t *)); +static __inline__ void gdt_enc16(u_int8_t *, u_int16_t); +static __inline__ void gdt_enc32(u_int8_t *, u_int32_t); +static __inline__ u_int16_t gdt_dec16(u_int8_t *); +static __inline__ u_int32_t gdt_dec32(u_int8_t *); static __inline__ void gdt_enc16(addr, value) diff --git a/sys/dev/iir/iir_pci.c b/sys/dev/iir/iir_pci.c index d751e3d02266..9c083c27661c 100644 --- a/sys/dev/iir/iir_pci.c +++ b/sys/dev/iir/iir_pci.c @@ -125,17 +125,17 @@ /* DPRAM struct. */ #define GDT_MPR_SZ (0x3000 - GDT_SRAM_SZ) -static int iir_pci_probe __P((device_t dev)); -static int iir_pci_attach __P((device_t dev)); +static int iir_pci_probe(device_t dev); +static int iir_pci_attach(device_t dev); -void gdt_pci_enable_intr __P((struct gdt_softc *)); +void gdt_pci_enable_intr(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 *)); -void gdt_mpr_set_sema0 __P((struct gdt_softc *)); -int gdt_mpr_test_busy __P((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 *); +void gdt_mpr_set_sema0(struct gdt_softc *); +int gdt_mpr_test_busy(struct gdt_softc *); static device_method_t iir_pci_methods[] = { /* Device interface */ diff --git a/sys/dev/isp/isp_freebsd.h b/sys/dev/isp/isp_freebsd.h index 1aa6b8388da3..e1a0cec714c7 100644 --- a/sys/dev/isp/isp_freebsd.h +++ b/sys/dev/isp/isp_freebsd.h @@ -71,7 +71,7 @@ #define HANDLE_LOOPSTATE_IN_OUTER_LAYERS 1 -typedef void ispfwfunc __P((int, int, int, u_int16_t **)); +typedef void ispfwfunc(int, int, int, u_int16_t **); #ifdef ISP_TARGET_MODE #define ISP_TARGET_FUNCTIONS 1 diff --git a/sys/dev/ispfw/ispfw.c b/sys/dev/ispfw/ispfw.c index 3196ba37a169..8f4f2a9339b0 100644 --- a/sys/dev/ispfw/ispfw.c +++ b/sys/dev/ispfw/ispfw.c @@ -50,9 +50,9 @@ #define PCI_PRODUCT_QLOGIC_ISP2300 0x2300 #define PCI_PRODUCT_QLOGIC_ISP2312 0x2312 -typedef void ispfwfunc __P((int, int, int, const u_int16_t **)); +typedef void ispfwfunc(int, int, int, const u_int16_t **); extern ispfwfunc *isp_get_firmware_p; -static void isp_get_firmware __P((int, int, int, const u_int16_t **)); +static void isp_get_firmware(int, int, int, const u_int16_t **); static int ncallers = 0; static const u_int16_t ***callp = NULL; diff --git a/sys/dev/lge/if_lge.c b/sys/dev/lge/if_lge.c index 976beb44adb0..b1ac4262ed77 100644 --- a/sys/dev/lge/if_lge.c +++ b/sys/dev/lge/if_lge.c @@ -125,47 +125,46 @@ static struct lge_type lge_devs[] = { { 0, 0, NULL } }; -static int lge_probe __P((device_t)); -static int lge_attach __P((device_t)); -static int lge_detach __P((device_t)); +static int lge_probe (device_t); +static int lge_attach (device_t); +static int lge_detach (device_t); -static int lge_alloc_jumbo_mem __P((struct lge_softc *)); -static void lge_free_jumbo_mem __P((struct lge_softc *)); -static void *lge_jalloc __P((struct lge_softc *)); -static void lge_jfree __P((caddr_t, void *)); +static int lge_alloc_jumbo_mem (struct lge_softc *); +static void lge_free_jumbo_mem (struct lge_softc *); +static void *lge_jalloc (struct lge_softc *); +static void lge_jfree (caddr_t, void *); -static int lge_newbuf __P((struct lge_softc *, +static int lge_newbuf (struct lge_softc *, struct lge_rx_desc *, - struct mbuf *)); -static int lge_encap __P((struct lge_softc *, - struct mbuf *, u_int32_t *)); -static void lge_rxeof __P((struct lge_softc *, int)); -static void lge_rxeoc __P((struct lge_softc *)); -static void lge_txeof __P((struct lge_softc *)); -static void lge_intr __P((void *)); -static void lge_tick __P((void *)); -static void lge_start __P((struct ifnet *)); -static int lge_ioctl __P((struct ifnet *, u_long, caddr_t)); -static void lge_init __P((void *)); -static void lge_stop __P((struct lge_softc *)); -static void lge_watchdog __P((struct ifnet *)); -static void lge_shutdown __P((device_t)); -static int lge_ifmedia_upd __P((struct ifnet *)); -static void lge_ifmedia_sts __P((struct ifnet *, struct ifmediareq *)); - -static void lge_eeprom_getword __P((struct lge_softc *, int, u_int16_t *)); -static void lge_read_eeprom __P((struct lge_softc *, caddr_t, int, - int, int)); - -static int lge_miibus_readreg __P((device_t, int, int)); -static int lge_miibus_writereg __P((device_t, int, int, int)); -static void lge_miibus_statchg __P((device_t)); - -static void lge_setmulti __P((struct lge_softc *)); -static u_int32_t lge_crc __P((struct lge_softc *, caddr_t)); -static void lge_reset __P((struct lge_softc *)); -static int lge_list_rx_init __P((struct lge_softc *)); -static int lge_list_tx_init __P((struct lge_softc *)); + struct mbuf *); +static int lge_encap (struct lge_softc *, + struct mbuf *, u_int32_t *); +static void lge_rxeof (struct lge_softc *, int); +static void lge_rxeoc (struct lge_softc *); +static void lge_txeof (struct lge_softc *); +static void lge_intr (void *); +static void lge_tick (void *); +static void lge_start (struct ifnet *); +static int lge_ioctl (struct ifnet *, u_long, caddr_t); +static void lge_init (void *); +static void lge_stop (struct lge_softc *); +static void lge_watchdog (struct ifnet *); +static void lge_shutdown (device_t); +static int lge_ifmedia_upd (struct ifnet *); +static void lge_ifmedia_sts (struct ifnet *, struct ifmediareq *); + +static void lge_eeprom_getword (struct lge_softc *, int, u_int16_t *); +static void lge_read_eeprom (struct lge_softc *, caddr_t, int, int, int); + +static int lge_miibus_readreg (device_t, int, int); +static int lge_miibus_writereg (device_t, int, int, int); +static void lge_miibus_statchg (device_t); + +static void lge_setmulti (struct lge_softc *); +static u_int32_t lge_crc (struct lge_softc *, caddr_t); +static void lge_reset (struct lge_softc *); +static int lge_list_rx_init (struct lge_softc *); +static int lge_list_tx_init (struct lge_softc *); #ifdef LGE_USEIOSPACE #define LGE_RES SYS_RES_IOPORT diff --git a/sys/dev/lnc/if_lnc.c b/sys/dev/lnc/if_lnc.c index 163092880f89..1b8030ec9fc0 100644 --- a/sys/dev/lnc/if_lnc.c +++ b/sys/dev/lnc/if_lnc.c @@ -115,29 +115,29 @@ static char const * const ic_ident[] = { "PCnet-Home", }; -static void lnc_setladrf __P((struct lnc_softc *sc)); -static void lnc_reset __P((struct lnc_softc *sc)); -static void lnc_free_mbufs __P((struct lnc_softc *sc)); -static __inline int alloc_mbuf_cluster __P((struct lnc_softc *sc, - struct host_ring_entry *desc)); -static __inline struct mbuf *chain_mbufs __P((struct lnc_softc *sc, +static void lnc_setladrf(struct lnc_softc *sc); +static void lnc_reset(struct lnc_softc *sc); +static void lnc_free_mbufs(struct lnc_softc *sc); +static __inline int alloc_mbuf_cluster(struct lnc_softc *sc, + struct host_ring_entry *desc); +static __inline struct mbuf *chain_mbufs(struct lnc_softc *sc, int start_of_packet, - int pkt_len)); -static __inline struct mbuf *mbuf_packet __P((struct lnc_softc *sc, + int pkt_len); +static __inline struct mbuf *mbuf_packet(struct lnc_softc *sc, int start_of_packet, - int pkt_len)); -static __inline void lnc_rint __P((struct lnc_softc *sc)); -static __inline void lnc_tint __P((struct lnc_softc *sc)); - -static void lnc_init __P((void *)); -static __inline int mbuf_to_buffer __P((struct mbuf *m, char *buffer)); -static __inline struct mbuf *chain_to_cluster __P((struct mbuf *m)); -static void lnc_start __P((struct ifnet *ifp)); -static int lnc_ioctl __P((struct ifnet *ifp, u_long command, caddr_t data)); -static void lnc_watchdog __P((struct ifnet *ifp)); + int pkt_len); +static __inline void lnc_rint(struct lnc_softc *sc); +static __inline void lnc_tint(struct lnc_softc *sc); + +static void lnc_init(void *); +static __inline int mbuf_to_buffer(struct mbuf *m, char *buffer); +static __inline struct mbuf *chain_to_cluster(struct mbuf *m); +static void lnc_start(struct ifnet *ifp); +static int lnc_ioctl(struct ifnet *ifp, u_long command, caddr_t data); +static void lnc_watchdog(struct ifnet *ifp); #ifdef DEBUG -void lnc_dump_state __P((struct lnc_softc *sc)); -void mbuf_dump_chain __P((struct mbuf *m)); +void lnc_dump_state(struct lnc_softc *sc); +void mbuf_dump_chain(struct mbuf *m); #endif u_short diff --git a/sys/dev/lnc/if_lncvar.h b/sys/dev/lnc/if_lncvar.h index 15df77448aab..8c76738500f1 100644 --- a/sys/dev/lnc/if_lncvar.h +++ b/sys/dev/lnc/if_lncvar.h @@ -252,13 +252,13 @@ struct host_ring_entry { bus_space_write_2(sc->lnc_btag, sc->lnc_bhandle, (port), (val)) /* Functional declarations */ -extern int lance_probe __P((struct lnc_softc *)); -extern void lnc_release_resources __P((device_t)); -extern int lnc_attach_common __P((device_t)); -extern void lnc_stop __P((struct lnc_softc *)); +extern int lance_probe(struct lnc_softc *); +extern void lnc_release_resources(device_t); +extern int lnc_attach_common(device_t); +extern void lnc_stop(struct lnc_softc *); -extern void write_csr __P((struct lnc_softc *, u_short, u_short)); -extern u_short read_csr __P((struct lnc_softc *, u_short)); +extern void write_csr(struct lnc_softc *, u_short, u_short); +extern u_short read_csr(struct lnc_softc *, u_short); /* Variable declarations */ extern driver_intr_t lncintr; diff --git a/sys/dev/mii/acphy.c b/sys/dev/mii/acphy.c index 0008ef0b6b8d..e163db71364d 100644 --- a/sys/dev/mii/acphy.c +++ b/sys/dev/mii/acphy.c @@ -92,9 +92,9 @@ static const char rcsid[] = "$FreeBSD$"; #endif -static int acphy_probe __P((device_t)); -static int acphy_attach __P((device_t)); -static int acphy_detach __P((device_t)); +static int acphy_probe (device_t); +static int acphy_attach (device_t); +static int acphy_detach (device_t); static device_method_t acphy_methods[] = { /* device interface */ @@ -115,9 +115,9 @@ static driver_t acphy_driver = { DRIVER_MODULE(acphy, miibus, acphy_driver, acphy_devclass, 0, 0); -static int acphy_service __P((struct mii_softc *, struct mii_data *, int)); -static void acphy_reset __P((struct mii_softc *)); -static void acphy_status __P((struct mii_softc *)); +static int acphy_service(struct mii_softc *, struct mii_data *, int); +static void acphy_reset(struct mii_softc *); +static void acphy_status(struct mii_softc *); static int acphy_probe(dev) device_t dev; diff --git a/sys/dev/mii/amphy.c b/sys/dev/mii/amphy.c index 8c78cf07af28..caba3da53f8d 100644 --- a/sys/dev/mii/amphy.c +++ b/sys/dev/mii/amphy.c @@ -60,9 +60,9 @@ static const char rcsid[] = "$FreeBSD$"; #endif -static int amphy_probe __P((device_t)); -static int amphy_attach __P((device_t)); -static int amphy_detach __P((device_t)); +static int amphy_probe (device_t); +static int amphy_attach (device_t); +static int amphy_detach (device_t); static device_method_t amphy_methods[] = { /* device interface */ @@ -83,8 +83,8 @@ static driver_t amphy_driver = { DRIVER_MODULE(amphy, miibus, amphy_driver, amphy_devclass, 0, 0); -static int amphy_service __P((struct mii_softc *, struct mii_data *, int)); -static void amphy_status __P((struct mii_softc *)); +static int amphy_service(struct mii_softc *, struct mii_data *, int); +static void amphy_status(struct mii_softc *); static int amphy_probe(dev) device_t dev; diff --git a/sys/dev/mii/brgphy.c b/sys/dev/mii/brgphy.c index da71240f2cf2..7cc5bb7d5ade 100644 --- a/sys/dev/mii/brgphy.c +++ b/sys/dev/mii/brgphy.c @@ -62,9 +62,9 @@ static const char rcsid[] = "$FreeBSD$"; #endif -static int brgphy_probe __P((device_t)); -static int brgphy_attach __P((device_t)); -static int brgphy_detach __P((device_t)); +static int brgphy_probe (device_t); +static int brgphy_attach (device_t); +static int brgphy_detach (device_t); static device_method_t brgphy_methods[] = { /* device interface */ @@ -87,8 +87,8 @@ DRIVER_MODULE(brgphy, miibus, brgphy_driver, brgphy_devclass, 0, 0); static int brgphy_service(struct mii_softc *, struct mii_data *, int); static void brgphy_status(struct mii_softc *); -static int brgphy_mii_phy_auto __P((struct mii_softc *, int)); -extern void mii_phy_auto_timeout __P((void *)); +static int brgphy_mii_phy_auto(struct mii_softc *, int); +extern void mii_phy_auto_timeout(void *); static int brgphy_probe(dev) device_t dev; diff --git a/sys/dev/mii/dcphy.c b/sys/dev/mii/dcphy.c index 0968d4ab09d9..daf38c78049d 100644 --- a/sys/dev/mii/dcphy.c +++ b/sys/dev/mii/dcphy.c @@ -93,9 +93,9 @@ static const char rcsid[] = */ #define COMPAQ_PRESARIO_ID 0xb0bb0e11 -static int dcphy_probe __P((device_t)); -static int dcphy_attach __P((device_t)); -static int dcphy_detach __P((device_t)); +static int dcphy_probe (device_t); +static int dcphy_attach (device_t); +static int dcphy_detach (device_t); static device_method_t dcphy_methods[] = { /* device interface */ @@ -116,10 +116,10 @@ static driver_t dcphy_driver = { DRIVER_MODULE(dcphy, miibus, dcphy_driver, dcphy_devclass, 0, 0); -static int dcphy_service __P((struct mii_softc *, struct mii_data *, int)); -static void dcphy_status __P((struct mii_softc *)); -static void dcphy_reset __P((struct mii_softc *)); -static int dcphy_auto __P((struct mii_softc *, int)); +static int dcphy_service(struct mii_softc *, struct mii_data *, int); +static void dcphy_status(struct mii_softc *); +static void dcphy_reset(struct mii_softc *); +static int dcphy_auto(struct mii_softc *, int); static int dcphy_probe(dev) device_t dev; diff --git a/sys/dev/mii/exphy.c b/sys/dev/mii/exphy.c index 39d07429b194..abee3588a0d7 100644 --- a/sys/dev/mii/exphy.c +++ b/sys/dev/mii/exphy.c @@ -91,9 +91,9 @@ static const char rcsid[] = "$FreeBSD$"; #endif -static int exphy_probe __P((device_t)); -static int exphy_attach __P((device_t)); -static int exphy_detach __P((device_t)); +static int exphy_probe (device_t); +static int exphy_attach (device_t); +static int exphy_detach (device_t); static device_method_t exphy_methods[] = { /* device interface */ @@ -114,8 +114,8 @@ static driver_t exphy_driver = { DRIVER_MODULE(xlphy, miibus, exphy_driver, exphy_devclass, 0, 0); -static int exphy_service __P((struct mii_softc *, struct mii_data *, int)); -static void exphy_reset __P((struct mii_softc *)); +static int exphy_service(struct mii_softc *, struct mii_data *, int); +static void exphy_reset(struct mii_softc *); static int exphy_probe(dev) device_t dev; diff --git a/sys/dev/mii/lxtphy.c b/sys/dev/mii/lxtphy.c index 9d28616342d6..1fef9f9de736 100644 --- a/sys/dev/mii/lxtphy.c +++ b/sys/dev/mii/lxtphy.c @@ -96,9 +96,9 @@ static const char rcsid[] = "$FreeBSD$"; #endif -static int lxtphy_probe __P((device_t)); -static int lxtphy_attach __P((device_t)); -static int lxtphy_detach __P((device_t)); +static int lxtphy_probe (device_t); +static int lxtphy_attach (device_t); +static int lxtphy_detach (device_t); static device_method_t lxtphy_methods[] = { /* device interface */ @@ -119,10 +119,10 @@ static driver_t lxtphy_driver = { DRIVER_MODULE(lxtphy, miibus, lxtphy_driver, lxtphy_devclass, 0, 0); -static int lxtphy_service __P((struct mii_softc *, struct mii_data *, int)); -static void lxtphy_status __P((struct mii_softc *)); -static void lxtphy_set_tp __P((struct mii_softc *)); -static void lxtphy_set_fx __P((struct mii_softc *)); +static int lxtphy_service(struct mii_softc *, struct mii_data *, int); +static void lxtphy_status(struct mii_softc *); +static void lxtphy_set_tp(struct mii_softc *); +static void lxtphy_set_fx(struct mii_softc *); static int lxtphy_probe(dev) device_t dev; diff --git a/sys/dev/mii/mii.c b/sys/dev/mii/mii.c index 300727e998d6..078ce4d3a8d7 100644 --- a/sys/dev/mii/mii.c +++ b/sys/dev/mii/mii.c @@ -65,11 +65,11 @@ static const char rcsid[] = "$FreeBSD$"; #endif -static int miibus_readreg __P((device_t, int, int)); -static int miibus_writereg __P((device_t, int, int, int)); -static void miibus_statchg __P((device_t)); -static void miibus_linkchg __P((device_t)); -static void miibus_mediainit __P((device_t)); +static int miibus_readreg (device_t, int, int); +static int miibus_writereg (device_t, int, int, int); +static void miibus_statchg (device_t); +static void miibus_linkchg (device_t); +static void miibus_mediainit (device_t); static device_method_t miibus_methods[] = { /* device interface */ diff --git a/sys/dev/mii/mii_physubr.c b/sys/dev/mii/mii_physubr.c index 303864f99923..36aeaed46544 100644 --- a/sys/dev/mii/mii_physubr.c +++ b/sys/dev/mii/mii_physubr.c @@ -63,7 +63,7 @@ static const char rcsid[] = "$FreeBSD$"; #endif -void mii_phy_auto_timeout __P((void *)); +void mii_phy_auto_timeout(void *); int mii_phy_auto(mii, waitfor) diff --git a/sys/dev/mii/miivar.h b/sys/dev/mii/miivar.h index 548fefd62994..a4c2a2807cb0 100644 --- a/sys/dev/mii/miivar.h +++ b/sys/dev/mii/miivar.h @@ -56,9 +56,9 @@ struct mii_softc; /* * Callbacks from MII layer into network interface device driver. */ -typedef int (*mii_readreg_t) __P((struct device *, int, int)); -typedef void (*mii_writereg_t) __P((struct device *, int, int, int)); -typedef void (*mii_statchg_t) __P((struct device *)); +typedef int (*mii_readreg_t)(struct device *, int, int); +typedef void (*mii_writereg_t)(struct device *, int, int, int); +typedef void (*mii_statchg_t)(struct device *); /* * A network interface driver has one of these structures in its softc. @@ -96,7 +96,7 @@ typedef struct mii_data mii_data_t; * This call is used by the MII layer to call into the PHY driver * to perform a `service request'. */ -typedef int (*mii_downcall_t) __P((struct mii_softc *, struct mii_data *, int)); +typedef int (*mii_downcall_t)(struct mii_softc *, struct mii_data *, int); /* * Requests that can be made to the downcall. @@ -157,27 +157,26 @@ typedef struct mii_attach_args mii_attach_args_t; extern devclass_t miibus_devclass; extern driver_t miibus_driver; -int miibus_probe __P((device_t)); -int miibus_attach __P((device_t)); -int miibus_detach __P((device_t)); +int miibus_probe(device_t); +int miibus_attach(device_t); +int miibus_detach(device_t); -int mii_anar __P((int)); -int mii_mediachg __P((struct mii_data *)); -void mii_tick __P((struct mii_data *)); -void mii_pollstat __P((struct mii_data *)); -int mii_phy_probe __P((device_t, device_t *, - ifm_change_cb_t, ifm_stat_cb_t)); -void mii_add_media __P((struct mii_data *, int, int)); +int mii_anar(int); +int mii_mediachg(struct mii_data *); +void mii_tick(struct mii_data *); +void mii_pollstat(struct mii_data *); +int mii_phy_probe(device_t, device_t *, ifm_change_cb_t, ifm_stat_cb_t); +void mii_add_media(struct mii_data *, int, int); -int mii_media_from_bmcr __P((int)); +int mii_media_from_bmcr(int); -int mii_phy_auto __P((struct mii_softc *, int)); -void mii_phy_auto_stop __P((struct mii_softc *)); -void mii_phy_reset __P((struct mii_softc *)); -void mii_phy_update __P((struct mii_softc *, int)); -int mii_phy_tick __P((struct mii_softc *)); +int mii_phy_auto(struct mii_softc *, int); +void mii_phy_auto_stop(struct mii_softc *); +void mii_phy_reset(struct mii_softc *); +void mii_phy_update(struct mii_softc *, int); +int mii_phy_tick(struct mii_softc *); -void ukphy_status __P((struct mii_softc *)); +void ukphy_status(struct mii_softc *); #endif /* _KERNEL */ #endif /* _DEV_MII_MIIVAR_H_ */ diff --git a/sys/dev/mii/mlphy.c b/sys/dev/mii/mlphy.c index d39362a83de7..266f2624e385 100644 --- a/sys/dev/mii/mlphy.c +++ b/sys/dev/mii/mlphy.c @@ -72,9 +72,9 @@ struct mlphy_softc { int ml_linked; }; -static int mlphy_probe __P((device_t)); -static int mlphy_attach __P((device_t)); -static int mlphy_detach __P((device_t)); +static int mlphy_probe (device_t); +static int mlphy_attach (device_t); +static int mlphy_detach (device_t); static device_method_t mlphy_methods[] = { /* device interface */ @@ -95,9 +95,9 @@ static driver_t mlphy_driver = { DRIVER_MODULE(mlphy, miibus, mlphy_driver, mlphy_devclass, 0, 0); -static int mlphy_service __P((struct mii_softc *, struct mii_data *, int)); -static void mlphy_reset __P((struct mii_softc *)); -static void mlphy_status __P((struct mii_softc *)); +static int mlphy_service(struct mii_softc *, struct mii_data *, int); +static void mlphy_reset(struct mii_softc *); +static void mlphy_status(struct mii_softc *); static int mlphy_probe(dev) device_t dev; diff --git a/sys/dev/mii/nsgphy.c b/sys/dev/mii/nsgphy.c index a272054e40b8..6170fd6d8a74 100644 --- a/sys/dev/mii/nsgphy.c +++ b/sys/dev/mii/nsgphy.c @@ -72,9 +72,9 @@ static const char rcsid[] = "$FreeBSD$"; #endif -static int nsgphy_probe __P((device_t)); -static int nsgphy_attach __P((device_t)); -static int nsgphy_detach __P((device_t)); +static int nsgphy_probe (device_t); +static int nsgphy_attach (device_t); +static int nsgphy_detach (device_t); static device_method_t nsgphy_methods[] = { /* device interface */ @@ -95,10 +95,10 @@ static driver_t nsgphy_driver = { DRIVER_MODULE(nsgphy, miibus, nsgphy_driver, nsgphy_devclass, 0, 0); -static int nsgphy_service __P((struct mii_softc *, struct mii_data *,int)); -static void nsgphy_status __P((struct mii_softc *)); -static int nsgphy_mii_phy_auto __P((struct mii_softc *, int)); -extern void mii_phy_auto_timeout __P((void *)); +static int nsgphy_service(struct mii_softc *, struct mii_data *,int); +static void nsgphy_status(struct mii_softc *); +static int nsgphy_mii_phy_auto(struct mii_softc *, int); +extern void mii_phy_auto_timeout(void *); static int nsgphy_probe(dev) device_t dev; diff --git a/sys/dev/mii/nsphy.c b/sys/dev/mii/nsphy.c index 3b70ac30670c..e7bf367b518d 100644 --- a/sys/dev/mii/nsphy.c +++ b/sys/dev/mii/nsphy.c @@ -95,9 +95,9 @@ static const char rcsid[] = "$FreeBSD$"; #endif -static int nsphy_probe __P((device_t)); -static int nsphy_attach __P((device_t)); -static int nsphy_detach __P((device_t)); +static int nsphy_probe (device_t); +static int nsphy_attach (device_t); +static int nsphy_detach (device_t); static device_method_t nsphy_methods[] = { /* device interface */ @@ -118,8 +118,8 @@ static driver_t nsphy_driver = { DRIVER_MODULE(nsphy, miibus, nsphy_driver, nsphy_devclass, 0, 0); -static int nsphy_service __P((struct mii_softc *, struct mii_data *, int)); -static void nsphy_status __P((struct mii_softc *)); +static int nsphy_service(struct mii_softc *, struct mii_data *, int); +static void nsphy_status(struct mii_softc *); static int nsphy_probe(dev) device_t dev; diff --git a/sys/dev/mii/pnaphy.c b/sys/dev/mii/pnaphy.c index fbb552ad4cf8..596b8997ecb5 100644 --- a/sys/dev/mii/pnaphy.c +++ b/sys/dev/mii/pnaphy.c @@ -66,9 +66,9 @@ static const char rcsid[] = "$FreeBSD$"; #endif -static int pnaphy_probe __P((device_t)); -static int pnaphy_attach __P((device_t)); -static int pnaphy_detach __P((device_t)); +static int pnaphy_probe (device_t); +static int pnaphy_attach (device_t); +static int pnaphy_detach (device_t); static device_method_t pnaphy_methods[] = { /* device interface */ @@ -89,7 +89,7 @@ static driver_t pnaphy_driver = { DRIVER_MODULE(pnaphy, miibus, pnaphy_driver, pnaphy_devclass, 0, 0); -static int pnaphy_service __P((struct mii_softc *, struct mii_data *,int)); +static int pnaphy_service(struct mii_softc *, struct mii_data *,int); static int pnaphy_probe(dev) diff --git a/sys/dev/mii/pnphy.c b/sys/dev/mii/pnphy.c index dce8282666aa..56a83f4a2875 100644 --- a/sys/dev/mii/pnphy.c +++ b/sys/dev/mii/pnphy.c @@ -80,9 +80,9 @@ static const char rcsid[] = CSR_WRITE_4(sc, reg, \ CSR_READ_4(sc, reg) & ~x) -static int pnphy_probe __P((device_t)); -static int pnphy_attach __P((device_t)); -static int pnphy_detach __P((device_t)); +static int pnphy_probe (device_t); +static int pnphy_attach (device_t); +static int pnphy_detach (device_t); static device_method_t pnphy_methods[] = { /* device interface */ @@ -103,8 +103,8 @@ static driver_t pnphy_driver = { DRIVER_MODULE(pnphy, miibus, pnphy_driver, pnphy_devclass, 0, 0); -static int pnphy_service __P((struct mii_softc *, struct mii_data *, int)); -static void pnphy_status __P((struct mii_softc *)); +static int pnphy_service(struct mii_softc *, struct mii_data *, int); +static void pnphy_status(struct mii_softc *); static int pnphy_probe(dev) device_t dev; diff --git a/sys/dev/mii/qsphy.c b/sys/dev/mii/qsphy.c index 10ce9f3e72a4..c419c4b23063 100644 --- a/sys/dev/mii/qsphy.c +++ b/sys/dev/mii/qsphy.c @@ -96,9 +96,9 @@ static const char rcsid[] = "$FreeBSD$"; #endif -static int qsphy_probe __P((device_t)); -static int qsphy_attach __P((device_t)); -static int qsphy_detach __P((device_t)); +static int qsphy_probe (device_t); +static int qsphy_attach (device_t); +static int qsphy_detach (device_t); static device_method_t qsphy_methods[] = { /* device interface */ @@ -119,9 +119,9 @@ static driver_t qsphy_driver = { DRIVER_MODULE(qsphy, miibus, qsphy_driver, qsphy_devclass, 0, 0); -static int qsphy_service __P((struct mii_softc *, struct mii_data *, int)); -static void qsphy_reset __P((struct mii_softc *)); -static void qsphy_status __P((struct mii_softc *)); +static int qsphy_service(struct mii_softc *, struct mii_data *, int); +static void qsphy_reset(struct mii_softc *); +static void qsphy_status(struct mii_softc *); static int qsphy_probe(dev) device_t dev; diff --git a/sys/dev/mii/rlphy.c b/sys/dev/mii/rlphy.c index 27825fa07e7d..1704b1bfc539 100644 --- a/sys/dev/mii/rlphy.c +++ b/sys/dev/mii/rlphy.c @@ -55,9 +55,9 @@ static const char rcsid[] = "$FreeBSD$"; #endif -static int rlphy_probe __P((device_t)); -static int rlphy_attach __P((device_t)); -static int rlphy_detach __P((device_t)); +static int rlphy_probe (device_t); +static int rlphy_attach (device_t); +static int rlphy_detach (device_t); static device_method_t rlphy_methods[] = { /* device interface */ @@ -78,7 +78,7 @@ static driver_t rlphy_driver = { DRIVER_MODULE(rlphy, miibus, rlphy_driver, rlphy_devclass, 0, 0); -static int rlphy_service __P((struct mii_softc *, struct mii_data *, int)); +static int rlphy_service(struct mii_softc *, struct mii_data *, int); static int rlphy_probe(dev) device_t dev; diff --git a/sys/dev/mii/tdkphy.c b/sys/dev/mii/tdkphy.c index 63e8505e9f78..3a98dba5b878 100644 --- a/sys/dev/mii/tdkphy.c +++ b/sys/dev/mii/tdkphy.c @@ -69,9 +69,9 @@ static const char rcsid[] = "$Id: tdkphy.c,v 1.3 2000/10/14 06:20:56 jon Exp $"; #endif -static int tdkphy_probe __P((device_t)); -static int tdkphy_attach __P((device_t)); -static int tdkphy_detach __P((device_t)); +static int tdkphy_probe (device_t); +static int tdkphy_attach (device_t); +static int tdkphy_detach (device_t); static device_method_t tdkphy_methods[] = { /* device interface */ @@ -92,8 +92,8 @@ static driver_t tdkphy_driver = { DRIVER_MODULE(tdkphy, miibus, tdkphy_driver, tdkphy_devclass, 0, 0); -static int tdkphy_service __P((struct mii_softc *, struct mii_data *, int)); -static void tdkphy_status __P((struct mii_softc *)); +static int tdkphy_service(struct mii_softc *, struct mii_data *, int); +static void tdkphy_status(struct mii_softc *); static int tdkphy_probe(device_t dev) diff --git a/sys/dev/mii/tlphy.c b/sys/dev/mii/tlphy.c index c5efc352e182..7457bb166aa5 100644 --- a/sys/dev/mii/tlphy.c +++ b/sys/dev/mii/tlphy.c @@ -102,9 +102,9 @@ struct tlphy_softc { int sc_need_acomp; }; -static int tlphy_probe __P((device_t)); -static int tlphy_attach __P((device_t)); -static int tlphy_detach __P((device_t)); +static int tlphy_probe (device_t); +static int tlphy_attach (device_t); +static int tlphy_detach (device_t); static device_method_t tlphy_methods[] = { /* device interface */ @@ -125,10 +125,10 @@ static driver_t tlphy_driver = { DRIVER_MODULE(tlphy, miibus, tlphy_driver, tlphy_devclass, 0, 0); -static int tlphy_service __P((struct mii_softc *, struct mii_data *, int)); -static int tlphy_auto __P((struct tlphy_softc *, int)); -static void tlphy_acomp __P((struct tlphy_softc *)); -static void tlphy_status __P((struct tlphy_softc *)); +static int tlphy_service(struct mii_softc *, struct mii_data *, int); +static int tlphy_auto(struct tlphy_softc *, int); +static void tlphy_acomp(struct tlphy_softc *); +static void tlphy_status(struct tlphy_softc *); static int tlphy_probe(dev) device_t dev; diff --git a/sys/dev/mii/ukphy.c b/sys/dev/mii/ukphy.c index 13851355a859..64f4411ba6e2 100644 --- a/sys/dev/mii/ukphy.c +++ b/sys/dev/mii/ukphy.c @@ -92,9 +92,9 @@ static const char rcsid[] = "$FreeBSD$"; #endif -static int ukphy_probe __P((device_t)); -static int ukphy_attach __P((device_t)); -static int ukphy_detach __P((device_t)); +static int ukphy_probe (device_t); +static int ukphy_attach (device_t); +static int ukphy_detach (device_t); static device_method_t ukphy_methods[] = { /* device interface */ @@ -115,7 +115,7 @@ static driver_t ukphy_driver = { DRIVER_MODULE(ukphy, miibus, ukphy_driver, ukphy_devclass, 0, 0); -static int ukphy_service __P((struct mii_softc *, struct mii_data *, int)); +static int ukphy_service(struct mii_softc *, struct mii_data *, int); static int ukphy_probe(dev) diff --git a/sys/dev/mii/xmphy.c b/sys/dev/mii/xmphy.c index c8f0e0897bfe..ad1e34cc0c71 100644 --- a/sys/dev/mii/xmphy.c +++ b/sys/dev/mii/xmphy.c @@ -62,9 +62,9 @@ static const char rcsid[] = "$FreeBSD$"; #endif -static int xmphy_probe __P((device_t)); -static int xmphy_attach __P((device_t)); -static int xmphy_detach __P((device_t)); +static int xmphy_probe (device_t); +static int xmphy_attach (device_t); +static int xmphy_detach (device_t); static device_method_t xmphy_methods[] = { /* device interface */ @@ -85,10 +85,10 @@ static driver_t xmphy_driver = { DRIVER_MODULE(xmphy, miibus, xmphy_driver, xmphy_devclass, 0, 0); -static int xmphy_service __P((struct mii_softc *, struct mii_data *, int)); -static void xmphy_status __P((struct mii_softc *)); -static int xmphy_mii_phy_auto __P((struct mii_softc *, int)); -extern void mii_phy_auto_timeout __P((void *)); +static int xmphy_service(struct mii_softc *, struct mii_data *, int); +static void xmphy_status(struct mii_softc *); +static int xmphy_mii_phy_auto(struct mii_softc *, int); +extern void mii_phy_auto_timeout(void *); static int xmphy_probe(dev) device_t dev; diff --git a/sys/dev/ncv/ncr53c500.c b/sys/dev/ncv/ncr53c500.c index 6a9b638dd551..a3980a06d58c 100644 --- a/sys/dev/ncv/ncr53c500.c +++ b/sys/dev/ncv/ncr53c500.c @@ -129,35 +129,35 @@ extern struct cfdriver ncv_cd; * DECLARE **************************************************************/ /* static */ -static void ncv_pio_read __P((struct ncv_softc *, u_int8_t *, u_int)); -static void ncv_pio_write __P((struct ncv_softc *, u_int8_t *, u_int)); -static int ncv_msg __P((struct ncv_softc *, struct targ_info *, u_int)); -static int ncv_reselected __P((struct ncv_softc *)); -static int ncv_disconnected __P((struct ncv_softc *, struct targ_info *)); - -static __inline void ncvhw_set_count __P((bus_space_tag_t, bus_space_handle_t, int)); -static __inline u_int ncvhw_get_count __P((bus_space_tag_t, bus_space_handle_t)); -static __inline void ncvhw_select_register_0 __P((bus_space_tag_t, bus_space_handle_t, struct ncv_hw *)); -static __inline void ncvhw_select_register_1 __P((bus_space_tag_t, bus_space_handle_t, struct ncv_hw *)); -static __inline void ncvhw_fpush __P((bus_space_tag_t, bus_space_handle_t, u_int8_t *, int)); - -static void ncv_pdma_end __P((struct ncv_softc *sc, struct targ_info *)); -static int ncv_world_start __P((struct ncv_softc *, int)); -static void ncvhw_bus_reset __P((struct ncv_softc *)); -static void ncvhw_reset __P((bus_space_tag_t, bus_space_handle_t, struct ncv_hw *)); -static int ncvhw_check __P((bus_space_tag_t, bus_space_handle_t, struct ncv_hw *)); -static void ncvhw_init __P((bus_space_tag_t, bus_space_handle_t, struct ncv_hw *)); -static int ncvhw_start_selection __P((struct ncv_softc *sc, struct slccb *)); -static void ncvhw_attention __P((struct ncv_softc *)); -static int ncv_ccb_nexus_establish __P((struct ncv_softc *)); -static int ncv_lun_nexus_establish __P((struct ncv_softc *)); -static int ncv_target_nexus_establish __P((struct ncv_softc *)); -static int ncv_targ_init __P((struct ncv_softc *, struct targ_info *, int)); -static int ncv_catch_intr __P((struct ncv_softc *)); +static void ncv_pio_read(struct ncv_softc *, u_int8_t *, u_int); +static void ncv_pio_write(struct ncv_softc *, u_int8_t *, u_int); +static int ncv_msg(struct ncv_softc *, struct targ_info *, u_int); +static int ncv_reselected(struct ncv_softc *); +static int ncv_disconnected(struct ncv_softc *, struct targ_info *); + +static __inline void ncvhw_set_count(bus_space_tag_t, bus_space_handle_t, int); +static __inline u_int ncvhw_get_count(bus_space_tag_t, bus_space_handle_t); +static __inline void ncvhw_select_register_0(bus_space_tag_t, bus_space_handle_t, struct ncv_hw *); +static __inline void ncvhw_select_register_1(bus_space_tag_t, bus_space_handle_t, struct ncv_hw *); +static __inline void ncvhw_fpush(bus_space_tag_t, bus_space_handle_t, u_int8_t *, int); + +static void ncv_pdma_end(struct ncv_softc *sc, struct targ_info *); +static int ncv_world_start(struct ncv_softc *, int); +static void ncvhw_bus_reset(struct ncv_softc *); +static void ncvhw_reset(bus_space_tag_t, bus_space_handle_t, struct ncv_hw *); +static int ncvhw_check(bus_space_tag_t, bus_space_handle_t, struct ncv_hw *); +static void ncvhw_init(bus_space_tag_t, bus_space_handle_t, struct ncv_hw *); +static int ncvhw_start_selection(struct ncv_softc *sc, struct slccb *); +static void ncvhw_attention(struct ncv_softc *); +static int ncv_ccb_nexus_establish(struct ncv_softc *); +static int ncv_lun_nexus_establish(struct ncv_softc *); +static int ncv_target_nexus_establish(struct ncv_softc *); +static int ncv_targ_init(struct ncv_softc *, struct targ_info *, int); +static int ncv_catch_intr(struct ncv_softc *); #ifdef NCV_POWER_CONTROL -static int ncvhw_power __P((struct ncv_softc *, u_int)); +static int ncvhw_power(struct ncv_softc *, u_int); #endif /* NCV_POWER_CONTROL */ -static __inline void ncv_setup_and_start_pio __P((struct ncv_softc *, u_int)); +static __inline void ncv_setup_and_start_pio(struct ncv_softc *, u_int); struct scsi_low_funcs ncv_funcs = { SC_LOW_INIT_T ncv_world_start, @@ -571,7 +571,7 @@ ncv_targ_init(sc, ti, action) /************************************************************** * General probe attach **************************************************************/ -static int ncv_setup_img __P((struct ncv_hw *, u_int, int)); +static int ncv_setup_img(struct ncv_hw *, u_int, int); static int ncv_setup_img(hw, dvcfg, hostid) diff --git a/sys/dev/ncv/ncr53c500_pccard.c b/sys/dev/ncv/ncr53c500_pccard.c index 2ff389757ae1..670965fec376 100644 --- a/sys/dev/ncv/ncr53c500_pccard.c +++ b/sys/dev/ncv/ncr53c500_pccard.c @@ -77,7 +77,7 @@ static int ncvprobe(DEVPORT_PDEVICE devi); static int ncvattach(DEVPORT_PDEVICE devi); -static void ncv_card_unload __P((DEVPORT_PDEVICE)); +static void ncv_card_unload(DEVPORT_PDEVICE); /* * Additional code for FreeBSD new-bus PCCard frontend diff --git a/sys/dev/ncv/ncr53c500var.h b/sys/dev/ncv/ncr53c500var.h index 2faa8c8cd08d..fd84b4f791bf 100644 --- a/sys/dev/ncv/ncr53c500var.h +++ b/sys/dev/ncv/ncr53c500var.h @@ -90,10 +90,10 @@ struct ncv_targ_info { /***************************************************************** * Proto *****************************************************************/ -int ncvprobesubr __P((bus_space_tag_t, bus_space_handle_t ioh, u_int, int)); -void ncvattachsubr __P((struct ncv_softc *)); -int ncvprint __P((void *, const char *)); -int ncvintr __P((void *)); +int ncvprobesubr(bus_space_tag_t, bus_space_handle_t ioh, u_int, int); +void ncvattachsubr(struct ncv_softc *); +int ncvprint(void *, const char *); +int ncvintr(void *); #if defined(i386) #define SOFT_INTR_REQUIRED(slp) (softintr((slp)->sl_irq)) diff --git a/sys/dev/nge/if_nge.c b/sys/dev/nge/if_nge.c index 1fcbd6279122..7c7667c0b9a6 100644 --- a/sys/dev/nge/if_nge.c +++ b/sys/dev/nge/if_nge.c @@ -146,59 +146,55 @@ static struct nge_type nge_devs[] = { { 0, 0, NULL } }; -static int nge_probe __P((device_t)); -static int nge_attach __P((device_t)); -static int nge_detach __P((device_t)); - -static int nge_alloc_jumbo_mem __P((struct nge_softc *)); -static void nge_free_jumbo_mem __P((struct nge_softc *)); -static void *nge_jalloc __P((struct nge_softc *)); -static void nge_jfree __P((caddr_t, void *)); - -static int nge_newbuf __P((struct nge_softc *, - struct nge_desc *, - struct mbuf *)); -static int nge_encap __P((struct nge_softc *, - struct mbuf *, u_int32_t *)); -static void nge_rxeof __P((struct nge_softc *)); +static int nge_probe (device_t); +static int nge_attach (device_t); +static int nge_detach (device_t); + +static int nge_alloc_jumbo_mem (struct nge_softc *); +static void nge_free_jumbo_mem (struct nge_softc *); +static void *nge_jalloc (struct nge_softc *); +static void nge_jfree (caddr_t, void *); + +static int nge_newbuf (struct nge_softc *, + struct nge_desc *, struct mbuf *); +static int nge_encap (struct nge_softc *, + struct mbuf *, u_int32_t *); +static void nge_rxeof (struct nge_softc *); #ifdef notdef -static void nge_rxeoc __P((struct nge_softc *)); +static void nge_rxeoc (struct nge_softc *); #endif -static void nge_txeof __P((struct nge_softc *)); -static void nge_intr __P((void *)); -static void nge_tick __P((void *)); -static void nge_start __P((struct ifnet *)); -static int nge_ioctl __P((struct ifnet *, u_long, caddr_t)); -static void nge_init __P((void *)); -static void nge_stop __P((struct nge_softc *)); -static void nge_watchdog __P((struct ifnet *)); -static void nge_shutdown __P((device_t)); -static int nge_ifmedia_upd __P((struct ifnet *)); -static void nge_ifmedia_sts __P((struct ifnet *, struct ifmediareq *)); - -static void nge_delay __P((struct nge_softc *)); -static void nge_eeprom_idle __P((struct nge_softc *)); -static void nge_eeprom_putbyte __P((struct nge_softc *, int)); -static void nge_eeprom_getword __P((struct nge_softc *, int, u_int16_t *)); -static void nge_read_eeprom __P((struct nge_softc *, caddr_t, int, - int, int)); - -static void nge_mii_sync __P((struct nge_softc *)); -static void nge_mii_send __P((struct nge_softc *, u_int32_t, int)); -static int nge_mii_readreg __P((struct nge_softc *, - struct nge_mii_frame *)); -static int nge_mii_writereg __P((struct nge_softc *, - struct nge_mii_frame *)); - -static int nge_miibus_readreg __P((device_t, int, int)); -static int nge_miibus_writereg __P((device_t, int, int, int)); -static void nge_miibus_statchg __P((device_t)); - -static void nge_setmulti __P((struct nge_softc *)); -static u_int32_t nge_crc __P((struct nge_softc *, caddr_t)); -static void nge_reset __P((struct nge_softc *)); -static int nge_list_rx_init __P((struct nge_softc *)); -static int nge_list_tx_init __P((struct nge_softc *)); +static void nge_txeof (struct nge_softc *); +static void nge_intr (void *); +static void nge_tick (void *); +static void nge_start (struct ifnet *); +static int nge_ioctl (struct ifnet *, u_long, caddr_t); +static void nge_init (void *); +static void nge_stop (struct nge_softc *); +static void nge_watchdog (struct ifnet *); +static void nge_shutdown (device_t); +static int nge_ifmedia_upd (struct ifnet *); +static void nge_ifmedia_sts (struct ifnet *, struct ifmediareq *); + +static void nge_delay (struct nge_softc *); +static void nge_eeprom_idle (struct nge_softc *); +static void nge_eeprom_putbyte (struct nge_softc *, int); +static void nge_eeprom_getword (struct nge_softc *, int, u_int16_t *); +static void nge_read_eeprom (struct nge_softc *, caddr_t, int, int, int); + +static void nge_mii_sync (struct nge_softc *); +static void nge_mii_send (struct nge_softc *, u_int32_t, int); +static int nge_mii_readreg (struct nge_softc *, struct nge_mii_frame *); +static int nge_mii_writereg (struct nge_softc *, struct nge_mii_frame *); + +static int nge_miibus_readreg (device_t, int, int); +static int nge_miibus_writereg (device_t, int, int, int); +static void nge_miibus_statchg (device_t); + +static void nge_setmulti (struct nge_softc *); +static u_int32_t nge_crc (struct nge_softc *, caddr_t); +static void nge_reset (struct nge_softc *); +static int nge_list_rx_init (struct nge_softc *); +static int nge_list_tx_init (struct nge_softc *); #ifdef NGE_USEIOSPACE #define NGE_RES SYS_RES_IOPORT diff --git a/sys/dev/nsp/nsp.c b/sys/dev/nsp/nsp.c index c6521551d66c..d66166fb1717 100644 --- a/sys/dev/nsp/nsp.c +++ b/sys/dev/nsp/nsp.c @@ -153,35 +153,35 @@ extern struct cfdriver nsp_cd; **************************************************************/ #define NSP_FIFO_ON 1 #define NSP_FIFO_OFF 0 -static void nsp_pio_read __P((struct nsp_softc *, int)); -static void nsp_pio_write __P((struct nsp_softc *, int)); -static int nsp_xfer __P((struct nsp_softc *, u_int8_t *, int, int, int)); -static int nsp_msg __P((struct nsp_softc *, struct targ_info *, u_int)); -static int nsp_reselected __P((struct nsp_softc *)); -static int nsp_disconnected __P((struct nsp_softc *, struct targ_info *)); -static void nsp_pdma_end __P((struct nsp_softc *, struct targ_info *)); -static void nsphw_init __P((struct nsp_softc *)); -static int nsp_target_nexus_establish __P((struct nsp_softc *)); -static int nsp_lun_nexus_establish __P((struct nsp_softc *)); -static int nsp_ccb_nexus_establish __P((struct nsp_softc *)); -static int nsp_world_start __P((struct nsp_softc *, int)); -static int nsphw_start_selection __P((struct nsp_softc *sc, struct slccb *)); -static void nsphw_bus_reset __P((struct nsp_softc *)); -static void nsphw_attention __P((struct nsp_softc *)); -static u_int nsp_fifo_count __P((struct nsp_softc *)); -static u_int nsp_request_count __P((struct nsp_softc *)); -static int nsp_negate_signal __P((struct nsp_softc *, u_int8_t, u_char *)); -static int nsp_expect_signal __P((struct nsp_softc *, u_int8_t, u_int8_t)); -static void nsp_start_timer __P((struct nsp_softc *, int)); -static void nsp_setup_fifo __P((struct nsp_softc *, int, int, int)); -static int nsp_targ_init __P((struct nsp_softc *, struct targ_info *, int)); -static void nsphw_selection_done_and_expect_msgout __P((struct nsp_softc *)); -static void nsp_data_padding __P((struct nsp_softc *, int, u_int)); -static int nsp_timeout __P((struct nsp_softc *)); -static int nsp_read_fifo __P((struct nsp_softc *, int)); -static int nsp_write_fifo __P((struct nsp_softc *, int)); -static int nsp_phase_match __P((struct nsp_softc *, u_int8_t, u_int8_t)); -static int nsp_wait_interrupt __P((struct nsp_softc *)); +static void nsp_pio_read(struct nsp_softc *, int); +static void nsp_pio_write(struct nsp_softc *, int); +static int nsp_xfer(struct nsp_softc *, u_int8_t *, int, int, int); +static int nsp_msg(struct nsp_softc *, struct targ_info *, u_int); +static int nsp_reselected(struct nsp_softc *); +static int nsp_disconnected(struct nsp_softc *, struct targ_info *); +static void nsp_pdma_end(struct nsp_softc *, struct targ_info *); +static void nsphw_init(struct nsp_softc *); +static int nsp_target_nexus_establish(struct nsp_softc *); +static int nsp_lun_nexus_establish(struct nsp_softc *); +static int nsp_ccb_nexus_establish(struct nsp_softc *); +static int nsp_world_start(struct nsp_softc *, int); +static int nsphw_start_selection(struct nsp_softc *sc, struct slccb *); +static void nsphw_bus_reset(struct nsp_softc *); +static void nsphw_attention(struct nsp_softc *); +static u_int nsp_fifo_count(struct nsp_softc *); +static u_int nsp_request_count(struct nsp_softc *); +static int nsp_negate_signal(struct nsp_softc *, u_int8_t, u_char *); +static int nsp_expect_signal(struct nsp_softc *, u_int8_t, u_int8_t); +static void nsp_start_timer(struct nsp_softc *, int); +static void nsp_setup_fifo(struct nsp_softc *, int, int, int); +static int nsp_targ_init(struct nsp_softc *, struct targ_info *, int); +static void nsphw_selection_done_and_expect_msgout(struct nsp_softc *); +static void nsp_data_padding(struct nsp_softc *, int, u_int); +static int nsp_timeout(struct nsp_softc *); +static int nsp_read_fifo(struct nsp_softc *, int); +static int nsp_write_fifo(struct nsp_softc *, int); +static int nsp_phase_match(struct nsp_softc *, u_int8_t, u_int8_t); +static int nsp_wait_interrupt(struct nsp_softc *); struct scsi_low_funcs nspfuncs = { SC_LOW_INIT_T nsp_world_start, @@ -205,8 +205,8 @@ struct scsi_low_funcs nspfuncs = { /**************************************************** * hwfuncs ****************************************************/ -static __inline u_int8_t nsp_cr_read_1 __P((bus_space_tag_t bst, bus_space_handle_t bsh, bus_addr_t ofs)); -static __inline void nsp_cr_write_1 __P((bus_space_tag_t bst, bus_space_handle_t bsh, bus_addr_t ofs, u_int8_t va)); +static __inline u_int8_t nsp_cr_read_1(bus_space_tag_t bst, bus_space_handle_t bsh, bus_addr_t ofs); +static __inline void nsp_cr_write_1(bus_space_tag_t bst, bus_space_handle_t bsh, bus_addr_t ofs, u_int8_t va); static __inline u_int8_t nsp_cr_read_1(bst, bsh, ofs) @@ -1353,7 +1353,7 @@ nsp_disconnected(sc, ti) /************************************************************** * SEQUENCER **************************************************************/ -static void nsp_error __P((struct nsp_softc *, u_char *, u_int8_t, u_int8_t, u_int8_t)); +static void nsp_error(struct nsp_softc *, u_char *, u_int8_t, u_int8_t, u_int8_t); static void nsp_error(sc, s, isrc, ph, irqphs) diff --git a/sys/dev/nsp/nsp_pccard.c b/sys/dev/nsp/nsp_pccard.c index b8f70fbbbcee..789cec15ae22 100644 --- a/sys/dev/nsp/nsp_pccard.c +++ b/sys/dev/nsp/nsp_pccard.c @@ -74,7 +74,7 @@ static int nspprobe(DEVPORT_PDEVICE devi); static int nspattach(DEVPORT_PDEVICE devi); -static void nsp_card_unload __P((DEVPORT_PDEVICE)); +static void nsp_card_unload (DEVPORT_PDEVICE); /* * Additional code for FreeBSD new-bus PCCard frontend diff --git a/sys/dev/nsp/nspvar.h b/sys/dev/nsp/nspvar.h index 621b7a5c90f6..1d331b1d3b66 100644 --- a/sys/dev/nsp/nspvar.h +++ b/sys/dev/nsp/nspvar.h @@ -100,10 +100,10 @@ struct nsp_targ_info { /***************************************************************** * Proto *****************************************************************/ -int nspprobesubr __P((bus_space_tag_t, bus_space_handle_t, u_int)); -void nspattachsubr __P((struct nsp_softc *)); -int nspprint __P((void *, const char *)); -int nspintr __P((void *)); +int nspprobesubr(bus_space_tag_t, bus_space_handle_t, u_int); +void nspattachsubr(struct nsp_softc *); +int nspprint(void *, const char *); +int nspintr(void *); #if defined(i386) #define SOFT_INTR_REQUIRED(slp) (softintr((slp)->sl_irq)) diff --git a/sys/dev/pdq/if_fea.c b/sys/dev/pdq/if_fea.c index 229fd38a761e..ee4fba3ed4c8 100644 --- a/sys/dev/pdq/if_fea.c +++ b/sys/dev/pdq/if_fea.c @@ -47,13 +47,13 @@ #include <dev/pdq/pdqvar.h> #include <dev/pdq/pdqreg.h> -static void pdq_eisa_subprobe __P((pdq_bus_t, u_int32_t, u_int32_t *, u_int32_t *, u_int32_t *)); -static void pdq_eisa_devinit __P((pdq_softc_t *)); -static const char * pdq_eisa_match __P((eisa_id_t)); -static int pdq_eisa_probe __P((device_t)); -static int pdq_eisa_attach __P((device_t)); -void pdq_eisa_intr __P((void *)); -static int pdq_eisa_shutdown __P((device_t)); +static void pdq_eisa_subprobe (pdq_bus_t, u_int32_t, u_int32_t *, u_int32_t *, u_int32_t *); +static void pdq_eisa_devinit (pdq_softc_t *); +static const char * pdq_eisa_match (eisa_id_t); +static int pdq_eisa_probe (device_t); +static int pdq_eisa_attach (device_t); +void pdq_eisa_intr (void *); +static int pdq_eisa_shutdown (device_t); #define DEFEA_IRQS 0x0000FBA9U diff --git a/sys/dev/puc/puc.c b/sys/dev/puc/puc.c index b0a83338c679..a6d6097114b7 100644 --- a/sys/dev/puc/puc.c +++ b/sys/dev/puc/puc.c @@ -115,7 +115,7 @@ struct puc_softc { struct { struct device *dev; /* filled in by bus_setup_intr() */ - void (*ihand) __P((void *)); + void (*ihand)(void *); void *ihandarg; } sc_ports[PUC_MAX_PORTS]; }; diff --git a/sys/dev/rp/rp.c b/sys/dev/rp/rp.c index 76894fa8c043..53b73686bf6b 100644 --- a/sys/dev/rp/rp.c +++ b/sys/dev/rp/rp.c @@ -619,11 +619,11 @@ static struct rp_port *p_rp_table[MAX_RP_PORTS]; * The top-level routines begin here */ -static int rpparam __P((struct tty *, struct termios *)); -static void rpstart __P((struct tty *)); -static void rpstop __P((struct tty *, int)); -static void rphardclose __P((struct rp_port *)); -static void rp_disc_optim __P((struct tty *tp, struct termios *t)); +static int rpparam(struct tty *, struct termios *); +static void rpstart(struct tty *); +static void rpstop(struct tty *, int); +static void rphardclose (struct rp_port *); +static void rp_disc_optim (struct tty *tp, struct termios *t); static _INLINE_ void rp_do_receive(struct rp_port *rp, struct tty *tp, CHANNEL_t *cp, unsigned int ChanStatus) diff --git a/sys/dev/sf/if_sf.c b/sys/dev/sf/if_sf.c index 8ebc2f5bf0ab..771e69ea8e0b 100644 --- a/sys/dev/sf/if_sf.c +++ b/sys/dev/sf/if_sf.c @@ -130,47 +130,47 @@ static struct sf_type sf_devs[] = { { 0, 0, NULL } }; -static int sf_probe __P((device_t)); -static int sf_attach __P((device_t)); -static int sf_detach __P((device_t)); -static void sf_intr __P((void *)); -static void sf_stats_update __P((void *)); -static void sf_rxeof __P((struct sf_softc *)); -static void sf_txeof __P((struct sf_softc *)); -static int sf_encap __P((struct sf_softc *, +static int sf_probe (device_t); +static int sf_attach (device_t); +static int sf_detach (device_t); +static void sf_intr (void *); +static void sf_stats_update (void *); +static void sf_rxeof (struct sf_softc *); +static void sf_txeof (struct sf_softc *); +static int sf_encap (struct sf_softc *, struct sf_tx_bufdesc_type0 *, - struct mbuf *)); -static void sf_start __P((struct ifnet *)); -static int sf_ioctl __P((struct ifnet *, u_long, caddr_t)); -static void sf_init __P((void *)); -static void sf_stop __P((struct sf_softc *)); -static void sf_watchdog __P((struct ifnet *)); -static void sf_shutdown __P((device_t)); -static int sf_ifmedia_upd __P((struct ifnet *)); -static void sf_ifmedia_sts __P((struct ifnet *, struct ifmediareq *)); -static void sf_reset __P((struct sf_softc *)); -static int sf_init_rx_ring __P((struct sf_softc *)); -static void sf_init_tx_ring __P((struct sf_softc *)); -static int sf_newbuf __P((struct sf_softc *, + struct mbuf *); +static void sf_start (struct ifnet *); +static int sf_ioctl (struct ifnet *, u_long, caddr_t); +static void sf_init (void *); +static void sf_stop (struct sf_softc *); +static void sf_watchdog (struct ifnet *); +static void sf_shutdown (device_t); +static int sf_ifmedia_upd (struct ifnet *); +static void sf_ifmedia_sts (struct ifnet *, struct ifmediareq *); +static void sf_reset (struct sf_softc *); +static int sf_init_rx_ring (struct sf_softc *); +static void sf_init_tx_ring (struct sf_softc *); +static int sf_newbuf (struct sf_softc *, struct sf_rx_bufdesc_type0 *, - struct mbuf *)); -static void sf_setmulti __P((struct sf_softc *)); -static int sf_setperf __P((struct sf_softc *, int, caddr_t)); -static int sf_sethash __P((struct sf_softc *, caddr_t, int)); + struct mbuf *); +static void sf_setmulti (struct sf_softc *); +static int sf_setperf (struct sf_softc *, int, caddr_t); +static int sf_sethash (struct sf_softc *, caddr_t, int); #ifdef notdef -static int sf_setvlan __P((struct sf_softc *, int, u_int32_t)); +static int sf_setvlan (struct sf_softc *, int, u_int32_t); #endif -static u_int8_t sf_read_eeprom __P((struct sf_softc *, int)); -static u_int32_t sf_calchash __P((caddr_t)); +static u_int8_t sf_read_eeprom (struct sf_softc *, int); +static u_int32_t sf_calchash (caddr_t); -static int sf_miibus_readreg __P((device_t, int, int)); -static int sf_miibus_writereg __P((device_t, int, int, int)); -static void sf_miibus_statchg __P((device_t)); +static int sf_miibus_readreg (device_t, int, int); +static int sf_miibus_writereg (device_t, int, int, int); +static void sf_miibus_statchg (device_t); -static u_int32_t csr_read_4 __P((struct sf_softc *, int)); -static void csr_write_4 __P((struct sf_softc *, int, u_int32_t)); -static void sf_txthresh_adjust __P((struct sf_softc *)); +static u_int32_t csr_read_4 (struct sf_softc *, int); +static void csr_write_4 (struct sf_softc *, int, u_int32_t); +static void sf_txthresh_adjust (struct sf_softc *); #ifdef SF_USEIOSPACE #define SF_RES SYS_RES_IOPORT diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c index 33d02fb3c303..b2e75d9565ad 100644 --- a/sys/dev/sio/sio.c +++ b/sys/dev/sio/sio.c @@ -271,26 +271,26 @@ struct com_s { }; #ifdef COM_ESP -static int espattach __P((struct com_s *com, Port_t esp_port)); +static int espattach (struct com_s *com, Port_t esp_port); #endif static timeout_t siobusycheck; -static u_int siodivisor __P((u_long rclk, speed_t speed)); +static u_int siodivisor (u_long rclk, speed_t speed); static timeout_t siodtrwakeup; -static void comhardclose __P((struct com_s *com)); -static void sioinput __P((struct com_s *com)); -static void siointr1 __P((struct com_s *com)); -static void siointr __P((void *arg)); -static int commctl __P((struct com_s *com, int bits, int how)); -static int comparam __P((struct tty *tp, struct termios *t)); -static void siopoll __P((void *)); -static void siosettimeout __P((void)); -static int siosetwater __P((struct com_s *com, speed_t speed)); -static void comstart __P((struct tty *tp)); -static void comstop __P((struct tty *tp, int rw)); +static void comhardclose (struct com_s *com); +static void sioinput (struct com_s *com); +static void siointr1 (struct com_s *com); +static void siointr (void *arg); +static int commctl (struct com_s *com, int bits, int how); +static int comparam (struct tty *tp, struct termios *t); +static void siopoll (void *); +static void siosettimeout (void); +static int siosetwater (struct com_s *com, speed_t speed); +static void comstart (struct tty *tp); +static void comstop (struct tty *tp, int rw); static timeout_t comwakeup; -static void disc_optim __P((struct tty *tp, struct termios *t, - struct com_s *com)); +static void disc_optim (struct tty *tp, struct termios *t, + struct com_s *com); char sio_driver_name[] = "sio"; static struct mtx sio_lock; @@ -2703,17 +2703,17 @@ struct siocnstate { }; #ifndef __alpha__ -static speed_t siocngetspeed __P((Port_t, u_long rclk)); +static speed_t siocngetspeed(Port_t, u_long rclk); #endif -static void siocnclose __P((struct siocnstate *sp, Port_t iobase)); -static void siocnopen __P((struct siocnstate *sp, Port_t iobase, int speed)); -static void siocntxwait __P((Port_t iobase)); +static void siocnclose (struct siocnstate *sp, Port_t iobase); +static void siocnopen (struct siocnstate *sp, Port_t iobase, int speed); +static void siocntxwait (Port_t iobase); #ifdef __alpha__ -int siocnattach __P((int port, int speed)); -int siogdbattach __P((int port, int speed)); -int siogdbgetc __P((void)); -void siogdbputc __P((int c)); +int siocnattach(int port, int speed); +int siogdbattach(int port, int speed); +int siogdbgetc(void); +void siogdbputc(int c); #else static cn_probe_t siocnprobe; static cn_init_t siocninit; diff --git a/sys/dev/sio/sio_isa.c b/sys/dev/sio/sio_isa.c index 916d0f6ed97c..e1a3917faeed 100644 --- a/sys/dev/sio/sio_isa.c +++ b/sys/dev/sio/sio_isa.c @@ -43,8 +43,8 @@ #include <isa/isareg.h> #include <isa/isavar.h> -static int sio_isa_attach __P((device_t dev)); -static int sio_isa_probe __P((device_t dev)); +static int sio_isa_attach (device_t dev); +static int sio_isa_probe (device_t dev); static device_method_t sio_isa_methods[] = { /* Device interface */ diff --git a/sys/dev/sio/sio_pccard.c b/sys/dev/sio/sio_pccard.c index c60631286b63..571e82246186 100644 --- a/sys/dev/sio/sio_pccard.c +++ b/sys/dev/sio/sio_pccard.c @@ -45,10 +45,10 @@ #include <dev/sio/siovar.h> -static int sio_pccard_attach __P((device_t dev)); -static int sio_pccard_detach __P((device_t dev)); -static int sio_pccard_match __P((device_t self)); -static int sio_pccard_probe __P((device_t dev)); +static int sio_pccard_attach(device_t dev); +static int sio_pccard_detach(device_t dev); +static int sio_pccard_match(device_t self); +static int sio_pccard_probe(device_t dev); static device_method_t sio_pccard_methods[] = { /* Device interface */ diff --git a/sys/dev/sio/sio_pci.c b/sys/dev/sio/sio_pci.c index 6ea2930ce4f6..e71b3304b727 100644 --- a/sys/dev/sio/sio_pci.c +++ b/sys/dev/sio/sio_pci.c @@ -42,9 +42,9 @@ #include <pci/pcivar.h> -static int sio_pci_attach __P((device_t dev)); -static void sio_pci_kludge_unit __P((device_t dev)); -static int sio_pci_probe __P((device_t dev)); +static int sio_pci_attach(device_t dev); +static void sio_pci_kludge_unit(device_t dev); +static int sio_pci_probe(device_t dev); static device_method_t sio_pci_methods[] = { /* Device interface */ diff --git a/sys/dev/sio/sio_puc.c b/sys/dev/sio/sio_puc.c index a314de358055..e2c694f435b6 100644 --- a/sys/dev/sio/sio_puc.c +++ b/sys/dev/sio/sio_puc.c @@ -45,8 +45,8 @@ __FBSDID("$FreeBSD$"); #include <dev/sio/siovar.h> #include <dev/sio/sioreg.h> -static int sio_puc_attach __P((device_t dev)); -static int sio_puc_probe __P((device_t dev)); +static int sio_puc_attach(device_t dev); +static int sio_puc_probe(device_t dev); static device_method_t sio_puc_methods[] = { /* Device interface */ diff --git a/sys/dev/sio/siovar.h b/sys/dev/sio/siovar.h index a6ba168e5296..44c84f4f76ae 100644 --- a/sys/dev/sio/siovar.h +++ b/sys/dev/sio/siovar.h @@ -63,9 +63,9 @@ #define CLR_FLAG(dev, bit) device_set_flags(dev, device_get_flags(dev) & ~(bit)) #endif /* PC98 */ -int sioattach __P((device_t dev, int xrid, u_long rclk)); -int siodetach __P((device_t dev)); -int sioprobe __P((device_t dev, int xrid, u_long rclk, int noprobe)); +int sioattach(device_t dev, int xrid, u_long rclk); +int siodetach(device_t dev); +int sioprobe(device_t dev, int xrid, u_long rclk, int noprobe); extern devclass_t sio_devclass; extern char sio_driver_name[]; diff --git a/sys/dev/sk/if_sk.c b/sys/dev/sk/if_sk.c index 5ba23f520826..6c39da2cfc98 100644 --- a/sys/dev/sk/if_sk.c +++ b/sys/dev/sk/if_sk.c @@ -121,55 +121,54 @@ static struct sk_type sk_devs[] = { { 0, 0, NULL } }; -static int sk_probe __P((device_t)); -static int sk_attach __P((device_t)); -static int sk_detach __P((device_t)); -static int sk_detach_xmac __P((device_t)); -static int sk_probe_xmac __P((device_t)); -static int sk_attach_xmac __P((device_t)); -static void sk_tick __P((void *)); -static void sk_intr __P((void *)); -static void sk_intr_xmac __P((struct sk_if_softc *)); -static void sk_intr_bcom __P((struct sk_if_softc *)); -static void sk_rxeof __P((struct sk_if_softc *)); -static void sk_txeof __P((struct sk_if_softc *)); -static int sk_encap __P((struct sk_if_softc *, struct mbuf *, - u_int32_t *)); -static void sk_start __P((struct ifnet *)); -static int sk_ioctl __P((struct ifnet *, u_long, caddr_t)); -static void sk_init __P((void *)); -static void sk_init_xmac __P((struct sk_if_softc *)); -static void sk_stop __P((struct sk_if_softc *)); -static void sk_watchdog __P((struct ifnet *)); -static void sk_shutdown __P((device_t)); -static int sk_ifmedia_upd __P((struct ifnet *)); -static void sk_ifmedia_sts __P((struct ifnet *, struct ifmediareq *)); -static void sk_reset __P((struct sk_softc *)); -static int sk_newbuf __P((struct sk_if_softc *, - struct sk_chain *, struct mbuf *)); -static int sk_alloc_jumbo_mem __P((struct sk_if_softc *)); -static void *sk_jalloc __P((struct sk_if_softc *)); -static void sk_jfree __P((caddr_t, void *)); -static int sk_init_rx_ring __P((struct sk_if_softc *)); -static void sk_init_tx_ring __P((struct sk_if_softc *)); -static u_int32_t sk_win_read_4 __P((struct sk_softc *, int)); -static u_int16_t sk_win_read_2 __P((struct sk_softc *, int)); -static u_int8_t sk_win_read_1 __P((struct sk_softc *, int)); -static void sk_win_write_4 __P((struct sk_softc *, int, u_int32_t)); -static void sk_win_write_2 __P((struct sk_softc *, int, u_int32_t)); -static void sk_win_write_1 __P((struct sk_softc *, int, u_int32_t)); -static u_int8_t sk_vpd_readbyte __P((struct sk_softc *, int)); -static void sk_vpd_read_res __P((struct sk_softc *, - struct vpd_res *, int)); -static void sk_vpd_read __P((struct sk_softc *)); - -static int sk_miibus_readreg __P((device_t, int, int)); -static int sk_miibus_writereg __P((device_t, int, int, int)); -static void sk_miibus_statchg __P((device_t)); - -static u_int32_t sk_calchash __P((caddr_t)); -static void sk_setfilt __P((struct sk_if_softc *, caddr_t, int)); -static void sk_setmulti __P((struct sk_if_softc *)); +static int sk_probe (device_t); +static int sk_attach (device_t); +static int sk_detach (device_t); +static int sk_detach_xmac (device_t); +static int sk_probe_xmac (device_t); +static int sk_attach_xmac (device_t); +static void sk_tick (void *); +static void sk_intr (void *); +static void sk_intr_xmac (struct sk_if_softc *); +static void sk_intr_bcom (struct sk_if_softc *); +static void sk_rxeof (struct sk_if_softc *); +static void sk_txeof (struct sk_if_softc *); +static int sk_encap (struct sk_if_softc *, struct mbuf *, + u_int32_t *); +static void sk_start (struct ifnet *); +static int sk_ioctl (struct ifnet *, u_long, caddr_t); +static void sk_init (void *); +static void sk_init_xmac (struct sk_if_softc *); +static void sk_stop (struct sk_if_softc *); +static void sk_watchdog (struct ifnet *); +static void sk_shutdown (device_t); +static int sk_ifmedia_upd (struct ifnet *); +static void sk_ifmedia_sts (struct ifnet *, struct ifmediareq *); +static void sk_reset (struct sk_softc *); +static int sk_newbuf (struct sk_if_softc *, + struct sk_chain *, struct mbuf *); +static int sk_alloc_jumbo_mem (struct sk_if_softc *); +static void *sk_jalloc (struct sk_if_softc *); +static void sk_jfree (caddr_t, void *); +static int sk_init_rx_ring (struct sk_if_softc *); +static void sk_init_tx_ring (struct sk_if_softc *); +static u_int32_t sk_win_read_4 (struct sk_softc *, int); +static u_int16_t sk_win_read_2 (struct sk_softc *, int); +static u_int8_t sk_win_read_1 (struct sk_softc *, int); +static void sk_win_write_4 (struct sk_softc *, int, u_int32_t); +static void sk_win_write_2 (struct sk_softc *, int, u_int32_t); +static void sk_win_write_1 (struct sk_softc *, int, u_int32_t); +static u_int8_t sk_vpd_readbyte (struct sk_softc *, int); +static void sk_vpd_read_res (struct sk_softc *, struct vpd_res *, int); +static void sk_vpd_read (struct sk_softc *); + +static int sk_miibus_readreg (device_t, int, int); +static int sk_miibus_writereg (device_t, int, int, int); +static void sk_miibus_statchg (device_t); + +static u_int32_t sk_calchash (caddr_t); +static void sk_setfilt (struct sk_if_softc *, caddr_t, int); +static void sk_setmulti (struct sk_if_softc *); #ifdef SK_USEIOSPACE #define SK_RES SYS_RES_IOPORT diff --git a/sys/dev/snc/dp83932.c b/sys/dev/snc/dp83932.c index 70da6498b1fc..fc6a9d6bb1d2 100644 --- a/sys/dev/snc/dp83932.c +++ b/sys/dev/snc/dp83932.c @@ -87,37 +87,35 @@ #include <dev/snc/dp83932reg.h> #include <dev/snc/dp83932var.h> -hide void sncwatchdog __P((struct ifnet *)); -hide void sncinit __P((void *)); -hide int sncstop __P((struct snc_softc *sc)); -hide int sncioctl __P((struct ifnet *ifp, u_long cmd, caddr_t data)); -hide void sncstart __P((struct ifnet *ifp)); -hide void sncreset __P((struct snc_softc *sc)); - -hide void caminitialise __P((struct snc_softc *)); -hide void camentry __P((struct snc_softc *, int, u_char *ea)); -hide void camprogram __P((struct snc_softc *)); -hide void initialise_tda __P((struct snc_softc *)); -hide void initialise_rda __P((struct snc_softc *)); -hide void initialise_rra __P((struct snc_softc *)); +hide void sncwatchdog(struct ifnet *); +hide void sncinit(void *); +hide int sncstop(struct snc_softc *sc); +hide int sncioctl(struct ifnet *ifp, u_long cmd, caddr_t data); +hide void sncstart(struct ifnet *ifp); +hide void sncreset(struct snc_softc *sc); + +hide void caminitialise(struct snc_softc *); +hide void camentry(struct snc_softc *, int, u_char *ea); +hide void camprogram(struct snc_softc *); +hide void initialise_tda(struct snc_softc *); +hide void initialise_rda(struct snc_softc *); +hide void initialise_rra(struct snc_softc *); #ifdef SNCDEBUG -hide void camdump __P((struct snc_softc *sc)); +hide void camdump(struct snc_softc *sc); #endif -hide void sonictxint __P((struct snc_softc *)); -hide void sonicrxint __P((struct snc_softc *)); +hide void sonictxint(struct snc_softc *); +hide void sonicrxint(struct snc_softc *); -hide u_int sonicput __P((struct snc_softc *sc, struct mbuf *m0, - int mtd_next)); -hide int sonic_read __P((struct snc_softc *, u_int32_t, int)); -hide struct mbuf *sonic_get __P((struct snc_softc *, - u_int32_t, int)); +hide u_int sonicput(struct snc_softc *sc, struct mbuf *m0, int mtd_next); +hide int sonic_read(struct snc_softc *, u_int32_t, int); +hide struct mbuf *sonic_get(struct snc_softc *, u_int32_t, int); -int snc_enable __P((struct snc_softc *)); -void snc_disable __P((struct snc_softc *)); +int snc_enable(struct snc_softc *); +void snc_disable(struct snc_softc *); -int snc_mediachange __P((struct ifnet *)); -void snc_mediastatus __P((struct ifnet *, struct ifmediareq *)); +int snc_mediachange(struct ifnet *); +void snc_mediastatus(struct ifnet *, struct ifmediareq *); #ifdef NetBSD #if NetBSD <= 199714 diff --git a/sys/dev/snc/dp83932subr.c b/sys/dev/snc/dp83932subr.c index 5de5bf0f957f..a83b794e9442 100644 --- a/sys/dev/snc/dp83932subr.c +++ b/sys/dev/snc/dp83932subr.c @@ -72,7 +72,7 @@ #include <dev/snc/dp83932subr.h> integrate u_int16_t snc_nec16_select_bank - __P((struct snc_softc *, u_int32_t, u_int32_t)); + (struct snc_softc *, u_int32_t, u_int32_t); /* * Interface exists: make available by filling in network interface diff --git a/sys/dev/snc/dp83932subr.h b/sys/dev/snc/dp83932subr.h index 7bcf50156614..78fa636cc890 100644 --- a/sys/dev/snc/dp83932subr.h +++ b/sys/dev/snc/dp83932subr.h @@ -40,39 +40,39 @@ * and National Semiconductor NS46C46 as (64 * 16 bits) Microwire Serial EEPROM. */ -int sncsetup __P((struct snc_softc *, u_int8_t *)); +int sncsetup(struct snc_softc *, u_int8_t *); -u_int8_t snc_nec16_validate_irq __P((int)); -int snc_nec16_register_irq __P((struct snc_softc *, int)); -int snc_nec16_validate_mem __P((int)); -int snc_nec16_register_mem __P((struct snc_softc *, int)); +u_int8_t snc_nec16_validate_irq(int); +int snc_nec16_register_irq(struct snc_softc *, int); +int snc_nec16_validate_mem(int); +int snc_nec16_register_mem(struct snc_softc *, int); -u_int16_t snc_nec16_nic_get __P((struct snc_softc *, u_int8_t)); -void snc_nec16_nic_put __P((struct snc_softc *, u_int8_t, u_int16_t)); +u_int16_t snc_nec16_nic_get(struct snc_softc *, u_int8_t); +void snc_nec16_nic_put(struct snc_softc *, u_int8_t, u_int16_t); void snc_nec16_writetodesc - __P((struct snc_softc *, u_int32_t, u_int32_t, u_int16_t)); + (struct snc_softc *, u_int32_t, u_int32_t, u_int16_t); u_int16_t snc_nec16_readfromdesc - __P((struct snc_softc *, u_int32_t, u_int32_t)); + (struct snc_softc *, u_int32_t, u_int32_t); -void snc_nec16_copyfrombuf __P((struct snc_softc *, void *, u_int32_t, size_t)); -void snc_nec16_copytobuf __P((struct snc_softc *, void *, u_int32_t, size_t)); -void snc_nec16_zerobuf __P((struct snc_softc *, u_int32_t, size_t)); +void snc_nec16_copyfrombuf(struct snc_softc *, void *, u_int32_t, size_t); +void snc_nec16_copytobuf(struct snc_softc *, void *, u_int32_t, size_t); +void snc_nec16_zerobuf(struct snc_softc *, u_int32_t, size_t); int snc_nec16_detectsubr - __P((bus_space_tag_t, bus_space_handle_t, bus_space_tag_t, - bus_space_handle_t, int, int, u_int8_t)); + (bus_space_tag_t, bus_space_handle_t, bus_space_tag_t, + bus_space_handle_t, int, int, u_int8_t); int snc_nec16_check_memory - __P((bus_space_tag_t, bus_space_handle_t, bus_space_tag_t, - bus_space_handle_t)); + (bus_space_tag_t, bus_space_handle_t, bus_space_tag_t, + bus_space_handle_t); int snc_nec16_get_enaddr - __P((bus_space_tag_t, bus_space_handle_t, u_int8_t *)); -u_int8_t *snc_nec16_detect_type __P((u_int8_t *)); + (bus_space_tag_t, bus_space_handle_t, u_int8_t *); +u_int8_t *snc_nec16_detect_type(u_int8_t *); void snc_nec16_read_eeprom - __P((bus_space_tag_t, bus_space_handle_t, u_int8_t *)); + (bus_space_tag_t, bus_space_handle_t, u_int8_t *); #ifdef SNCDEBUG -void snc_nec16_dump_reg __P((bus_space_tag_t, bus_space_handle_t)); +void snc_nec16_dump_reg(bus_space_tag_t, bus_space_handle_t); #endif /* SNDEBUG */ diff --git a/sys/dev/snc/dp83932var.h b/sys/dev/snc/dp83932var.h index adcf9c823630..2431bb704628 100644 --- a/sys/dev/snc/dp83932var.h +++ b/sys/dev/snc/dp83932var.h @@ -182,9 +182,9 @@ typedef struct snc_softc { * NIC register access functions: */ u_int16_t (*sc_nic_get) - __P((struct snc_softc *, u_int8_t)); + (struct snc_softc *, u_int8_t); void (*sc_nic_put) - __P((struct snc_softc *, u_int8_t, u_int16_t)); + (struct snc_softc *, u_int8_t, u_int16_t); /* * Memory functions: @@ -194,15 +194,15 @@ typedef struct snc_softc { * zero bytes in buffer */ void (*sc_writetodesc) - __P((struct snc_softc *, u_int32_t, u_int32_t, u_int16_t)); + (struct snc_softc *, u_int32_t, u_int32_t, u_int16_t); u_int16_t (*sc_readfromdesc) - __P((struct snc_softc *, u_int32_t, u_int32_t)); + (struct snc_softc *, u_int32_t, u_int32_t); void (*sc_copytobuf) - __P((struct snc_softc *, void *, u_int32_t, size_t)); + (struct snc_softc *, void *, u_int32_t, size_t); void (*sc_copyfrombuf) - __P((struct snc_softc *, void *, u_int32_t, size_t)); + (struct snc_softc *, void *, u_int32_t, size_t); void (*sc_zerobuf) - __P((struct snc_softc *, u_int32_t, size_t)); + (struct snc_softc *, u_int32_t, size_t); /* * Machine-dependent functions: @@ -211,16 +211,15 @@ typedef struct snc_softc { * hardware init hook - may be NULL * media change hook - may be NULL */ - void (*sc_hwreset) __P((struct snc_softc *)); - void (*sc_hwinit) __P((struct snc_softc *)); - int (*sc_mediachange) __P((struct snc_softc *)); - void (*sc_mediastatus) __P((struct snc_softc *, - struct ifmediareq *)); + void (*sc_hwreset)(struct snc_softc *); + void (*sc_hwinit)(struct snc_softc *); + int (*sc_mediachange)(struct snc_softc *); + void (*sc_mediastatus)(struct snc_softc *, struct ifmediareq *); int sc_enabled; /* boolean; power enabled on interface */ - int (*sc_enable) __P((struct snc_softc *)); - void (*sc_disable) __P((struct snc_softc *)); + int (*sc_enable)(struct snc_softc *); + void (*sc_disable)(struct snc_softc *); void *sc_sh; /* shutdownhook cookie */ int gone; @@ -302,6 +301,6 @@ typedef struct snc_softc { #define CDA_ENABLE 64 /* mask enabling CAM entries */ #define CDA_SIZE(sc) ((4*16 + 1) * ((sc->bitmode) ? 4 : 2)) -void sncconfig __P((struct snc_softc *, int *, int, int, u_int8_t *)); -void sncintr __P((void *)); -void sncshutdown __P((void *)); +void sncconfig(struct snc_softc *, int *, int, int, u_int8_t *); +void sncintr(void *); +void sncshutdown(void *); diff --git a/sys/dev/snc/if_snc_cbus.c b/sys/dev/snc/if_snc_cbus.c index 1fc542b66d8a..3d207a78e57d 100644 --- a/sys/dev/snc/if_snc_cbus.c +++ b/sys/dev/snc/if_snc_cbus.c @@ -56,9 +56,9 @@ #include <dev/snc/if_sncreg.h> #include <dev/snc/if_sncvar.h> -static void snc_isapnp_reconfig __P((device_t)); -static int snc_isa_probe __P((device_t)); -static int snc_isa_attach __P((device_t)); +static void snc_isapnp_reconfig (device_t); +static int snc_isa_probe (device_t); +static int snc_isa_attach (device_t); static struct isa_pnp_id snc_ids[] = { { 0x6180a3b8, NULL }, /* NEC8061 NEC PC-9801-104 */ diff --git a/sys/dev/snc/if_sncvar.h b/sys/dev/snc/if_sncvar.h index 98b2d9429960..33e39f32a3bf 100644 --- a/sys/dev/snc/if_sncvar.h +++ b/sys/dev/snc/if_sncvar.h @@ -36,12 +36,12 @@ extern devclass_t snc_devclass; -void snc_release_resources __P((device_t)); -int snc_alloc_port __P((device_t, int)); -int snc_alloc_memory __P((device_t, int)); -int snc_alloc_irq __P((device_t, int, int)); +void snc_release_resources (device_t); +int snc_alloc_port (device_t, int); +int snc_alloc_memory (device_t, int); +int snc_alloc_irq (device_t, int, int); -int snc_probe __P((device_t, int)); -int snc_attach __P((device_t)); +int snc_probe (device_t, int); +int snc_attach (device_t); -void snc_shutdown __P((device_t)); +void snc_shutdown (device_t); diff --git a/sys/dev/snp/snp.c b/sys/dev/snp/snp.c index 78d5cd3c8c52..f0dcc2cfa2a7 100644 --- a/sys/dev/snp/snp.c +++ b/sys/dev/snp/snp.c @@ -109,13 +109,13 @@ static udev_t snpbasedev = NOUDEV; static LIST_HEAD(, snoop) snp_sclist = LIST_HEAD_INITIALIZER(&snp_sclist); -static struct tty *snpdevtotty __P((dev_t dev)); -static void snp_clone __P((void *arg, char *name, - int namelen, dev_t *dev)); -static int snp_detach __P((struct snoop *snp)); -static int snp_down __P((struct snoop *snp)); -static int snp_in __P((struct snoop *snp, char *buf, int n)); -static int snp_modevent __P((module_t mod, int what, void *arg)); +static struct tty *snpdevtotty(dev_t dev); +static void snp_clone(void *arg, char *name, + int namelen, dev_t *dev); +static int snp_detach(struct snoop *snp); +static int snp_down(struct snoop *snp); +static int snp_in(struct snoop *snp, char *buf, int n); +static int snp_modevent(module_t mod, int what, void *arg); static int snplclose(tp, flag) diff --git a/sys/dev/stg/tmc18c30.c b/sys/dev/stg/tmc18c30.c index 39dd222d3a68..2798de487a70 100644 --- a/sys/dev/stg/tmc18c30.c +++ b/sys/dev/stg/tmc18c30.c @@ -145,29 +145,29 @@ extern struct cfdriver stg_cd; * DECLARE **************************************************************/ /* static */ -static void stg_pio_read __P((struct stg_softc *, struct targ_info *, u_int)); -static void stg_pio_write __P((struct stg_softc *, struct targ_info *, u_int)); -static int stg_xfer __P((struct stg_softc *, u_int8_t *, int, int, int)); -static int stg_msg __P((struct stg_softc *, struct targ_info *, u_int)); -static int stg_reselected __P((struct stg_softc *)); -static int stg_disconnected __P((struct stg_softc *, struct targ_info *)); -static __inline void stg_pdma_end __P((struct stg_softc *, struct targ_info *)); -static int stghw_select_targ_wait __P((struct stg_softc *, int)); -static int stghw_check __P((struct stg_softc *)); -static void stghw_init __P((struct stg_softc *)); -static int stg_negate_signal __P((struct stg_softc *, u_int8_t, u_char *)); -static int stg_expect_signal __P((struct stg_softc *, u_int8_t, u_int8_t)); -static int stg_world_start __P((struct stg_softc *, int)); -static int stghw_start_selection __P((struct stg_softc *sc, struct slccb *)); -static void stghw_bus_reset __P((struct stg_softc *)); -static void stghw_attention __P((struct stg_softc *)); -static int stg_target_nexus_establish __P((struct stg_softc *)); -static int stg_lun_nexus_establish __P((struct stg_softc *)); -static int stg_ccb_nexus_establish __P((struct stg_softc *)); -static int stg_targ_init __P((struct stg_softc *, struct targ_info *, int)); -static __inline void stghw_bcr_write_1 __P((struct stg_softc *, u_int8_t)); -static int stg_timeout __P((struct stg_softc *)); -static void stg_selection_done_and_expect_msgout __P((struct stg_softc *)); +static void stg_pio_read(struct stg_softc *, struct targ_info *, u_int); +static void stg_pio_write(struct stg_softc *, struct targ_info *, u_int); +static int stg_xfer(struct stg_softc *, u_int8_t *, int, int, int); +static int stg_msg(struct stg_softc *, struct targ_info *, u_int); +static int stg_reselected(struct stg_softc *); +static int stg_disconnected(struct stg_softc *, struct targ_info *); +static __inline void stg_pdma_end(struct stg_softc *, struct targ_info *); +static int stghw_select_targ_wait(struct stg_softc *, int); +static int stghw_check(struct stg_softc *); +static void stghw_init(struct stg_softc *); +static int stg_negate_signal(struct stg_softc *, u_int8_t, u_char *); +static int stg_expect_signal(struct stg_softc *, u_int8_t, u_int8_t); +static int stg_world_start(struct stg_softc *, int); +static int stghw_start_selection(struct stg_softc *sc, struct slccb *); +static void stghw_bus_reset(struct stg_softc *); +static void stghw_attention(struct stg_softc *); +static int stg_target_nexus_establish(struct stg_softc *); +static int stg_lun_nexus_establish(struct stg_softc *); +static int stg_ccb_nexus_establish(struct stg_softc *); +static int stg_targ_init(struct stg_softc *, struct targ_info *, int); +static __inline void stghw_bcr_write_1(struct stg_softc *, u_int8_t); +static int stg_timeout(struct stg_softc *); +static void stg_selection_done_and_expect_msgout(struct stg_softc *); struct scsi_low_funcs stgfuncs = { SC_LOW_INIT_T stg_world_start, diff --git a/sys/dev/stg/tmc18c30_isa.c b/sys/dev/stg/tmc18c30_isa.c index 97fea9c426a2..6a75ad94e8f3 100644 --- a/sys/dev/stg/tmc18c30_isa.c +++ b/sys/dev/stg/tmc18c30_isa.c @@ -81,7 +81,7 @@ static int stgprobe(device_t devi); static int stgattach(device_t devi); -static void stg_isa_unload __P((device_t)); +static void stg_isa_unload (device_t); static void stg_isa_intr(void * arg) diff --git a/sys/dev/stg/tmc18c30_pccard.c b/sys/dev/stg/tmc18c30_pccard.c index 72d60e905968..a06cc137cf47 100644 --- a/sys/dev/stg/tmc18c30_pccard.c +++ b/sys/dev/stg/tmc18c30_pccard.c @@ -77,7 +77,7 @@ static int stgprobe(DEVPORT_PDEVICE devi); static int stgattach(DEVPORT_PDEVICE devi); -static void stg_card_unload __P((DEVPORT_PDEVICE)); +static void stg_card_unload (DEVPORT_PDEVICE); /* * Additional code for FreeBSD new-bus PCCard frontend diff --git a/sys/dev/stg/tmc18c30var.h b/sys/dev/stg/tmc18c30var.h index 021c62210fce..99707c72594b 100644 --- a/sys/dev/stg/tmc18c30var.h +++ b/sys/dev/stg/tmc18c30var.h @@ -98,10 +98,10 @@ struct stg_targ_info { /***************************************************************** * Proto *****************************************************************/ -int stgprobesubr __P((bus_space_tag_t, bus_space_handle_t, u_int)); -void stgattachsubr __P((struct stg_softc *)); -int stgprint __P((void *, const char *)); -int stgintr __P((void *)); +int stgprobesubr(bus_space_tag_t, bus_space_handle_t, u_int); +void stgattachsubr(struct stg_softc *); +int stgprint(void *, const char *); +int stgintr(void *); #if defined(i386) #define SOFT_INTR_REQUIRED(slp) (softintr((slp)->sl_irq)) diff --git a/sys/dev/streams/streams.c b/sys/dev/streams/streams.c index 1b916a14debf..41adb1a82c32 100644 --- a/sys/dev/streams/streams.c +++ b/sys/dev/streams/streams.c @@ -61,8 +61,8 @@ #include <compat/svr4/svr4_stropts.h> #include <compat/svr4/svr4_socket.h> -static int svr4_soo_close __P((struct file *, struct thread *)); -static int svr4_ptm_alloc __P((struct thread *)); +static int svr4_soo_close(struct file *, struct thread *); +static int svr4_ptm_alloc(struct thread *); static d_open_t streamsopen; struct svr4_sockcache_entry { diff --git a/sys/dev/ti/if_ti.c b/sys/dev/ti/if_ti.c index 0951e389a2c2..79261058f2c7 100644 --- a/sys/dev/ti/if_ti.c +++ b/sys/dev/ti/if_ti.c @@ -145,61 +145,59 @@ static struct ti_type ti_devs[] = { { 0, 0, NULL } }; -static int ti_probe __P((device_t)); -static int ti_attach __P((device_t)); -static int ti_detach __P((device_t)); -static void ti_txeof __P((struct ti_softc *)); -static void ti_rxeof __P((struct ti_softc *)); - -static void ti_stats_update __P((struct ti_softc *)); -static int ti_encap __P((struct ti_softc *, struct mbuf *, - u_int32_t *)); - -static void ti_intr __P((void *)); -static void ti_start __P((struct ifnet *)); -static int ti_ioctl __P((struct ifnet *, u_long, caddr_t)); -static void ti_init __P((void *)); -static void ti_init2 __P((struct ti_softc *)); -static void ti_stop __P((struct ti_softc *)); -static void ti_watchdog __P((struct ifnet *)); -static void ti_shutdown __P((device_t)); -static int ti_ifmedia_upd __P((struct ifnet *)); -static void ti_ifmedia_sts __P((struct ifnet *, struct ifmediareq *)); - -static u_int32_t ti_eeprom_putbyte __P((struct ti_softc *, int)); -static u_int8_t ti_eeprom_getbyte __P((struct ti_softc *, - int, u_int8_t *)); -static int ti_read_eeprom __P((struct ti_softc *, caddr_t, int, int)); - -static void ti_add_mcast __P((struct ti_softc *, struct ether_addr *)); -static void ti_del_mcast __P((struct ti_softc *, struct ether_addr *)); -static void ti_setmulti __P((struct ti_softc *)); - -static void ti_mem __P((struct ti_softc *, u_int32_t, - u_int32_t, caddr_t)); -static void ti_loadfw __P((struct ti_softc *)); -static void ti_cmd __P((struct ti_softc *, struct ti_cmd_desc *)); -static void ti_cmd_ext __P((struct ti_softc *, struct ti_cmd_desc *, - caddr_t, int)); -static void ti_handle_events __P((struct ti_softc *)); -static int ti_alloc_jumbo_mem __P((struct ti_softc *)); -static void *ti_jalloc __P((struct ti_softc *)); -static void ti_jfree __P((caddr_t, void *)); -static int ti_newbuf_std __P((struct ti_softc *, int, struct mbuf *)); -static int ti_newbuf_mini __P((struct ti_softc *, int, struct mbuf *)); -static int ti_newbuf_jumbo __P((struct ti_softc *, int, struct mbuf *)); -static int ti_init_rx_ring_std __P((struct ti_softc *)); -static void ti_free_rx_ring_std __P((struct ti_softc *)); -static int ti_init_rx_ring_jumbo __P((struct ti_softc *)); -static void ti_free_rx_ring_jumbo __P((struct ti_softc *)); -static int ti_init_rx_ring_mini __P((struct ti_softc *)); -static void ti_free_rx_ring_mini __P((struct ti_softc *)); -static void ti_free_tx_ring __P((struct ti_softc *)); -static int ti_init_tx_ring __P((struct ti_softc *)); - -static int ti_64bitslot_war __P((struct ti_softc *)); -static int ti_chipinit __P((struct ti_softc *)); -static int ti_gibinit __P((struct ti_softc *)); +static int ti_probe (device_t); +static int ti_attach (device_t); +static int ti_detach (device_t); +static void ti_txeof (struct ti_softc *); +static void ti_rxeof (struct ti_softc *); + +static void ti_stats_update (struct ti_softc *); +static int ti_encap (struct ti_softc *, struct mbuf *, u_int32_t *); + +static void ti_intr (void *); +static void ti_start (struct ifnet *); +static int ti_ioctl (struct ifnet *, u_long, caddr_t); +static void ti_init (void *); +static void ti_init2 (struct ti_softc *); +static void ti_stop (struct ti_softc *); +static void ti_watchdog (struct ifnet *); +static void ti_shutdown (device_t); +static int ti_ifmedia_upd (struct ifnet *); +static void ti_ifmedia_sts (struct ifnet *, struct ifmediareq *); + +static u_int32_t ti_eeprom_putbyte (struct ti_softc *, int); +static u_int8_t ti_eeprom_getbyte (struct ti_softc *, int, u_int8_t *); +static int ti_read_eeprom (struct ti_softc *, caddr_t, int, int); + +static void ti_add_mcast (struct ti_softc *, struct ether_addr *); +static void ti_del_mcast (struct ti_softc *, struct ether_addr *); +static void ti_setmulti (struct ti_softc *); + +static void ti_mem (struct ti_softc *, u_int32_t, + u_int32_t, caddr_t); +static void ti_loadfw (struct ti_softc *); +static void ti_cmd (struct ti_softc *, struct ti_cmd_desc *); +static void ti_cmd_ext (struct ti_softc *, struct ti_cmd_desc *, + caddr_t, int); +static void ti_handle_events (struct ti_softc *); +static int ti_alloc_jumbo_mem (struct ti_softc *); +static void *ti_jalloc (struct ti_softc *); +static void ti_jfree (caddr_t, void *); +static int ti_newbuf_std (struct ti_softc *, int, struct mbuf *); +static int ti_newbuf_mini (struct ti_softc *, int, struct mbuf *); +static int ti_newbuf_jumbo (struct ti_softc *, int, struct mbuf *); +static int ti_init_rx_ring_std (struct ti_softc *); +static void ti_free_rx_ring_std (struct ti_softc *); +static int ti_init_rx_ring_jumbo (struct ti_softc *); +static void ti_free_rx_ring_jumbo (struct ti_softc *); +static int ti_init_rx_ring_mini (struct ti_softc *); +static void ti_free_rx_ring_mini (struct ti_softc *); +static void ti_free_tx_ring (struct ti_softc *); +static int ti_init_tx_ring (struct ti_softc *); + +static int ti_64bitslot_war (struct ti_softc *); +static int ti_chipinit (struct ti_softc *); +static int ti_gibinit (struct ti_softc *); static device_method_t ti_methods[] = { /* Device interface */ diff --git a/sys/dev/tx/if_tx.c b/sys/dev/tx/if_tx.c index ba4121df291b..61513585fea6 100644 --- a/sys/dev/tx/if_tx.c +++ b/sys/dev/tx/if_tx.c @@ -141,39 +141,39 @@ MODULE_DEPEND(tx, miibus, 1, 1, 1); #define EPIC_INTR_RET_TYPE int #endif -static int epic_ifioctl __P((register struct ifnet *, u_long, caddr_t)); -static EPIC_INTR_RET_TYPE epic_intr __P((void *)); -static int epic_common_attach __P((epic_softc_t *)); -static void epic_ifstart __P((struct ifnet *)); -static void epic_ifwatchdog __P((struct ifnet *)); -static int epic_init __P((epic_softc_t *)); -static void epic_stop __P((epic_softc_t *)); -static void epic_rx_done __P((epic_softc_t *)); -static void epic_tx_done __P((epic_softc_t *)); -static int epic_init_rings __P((epic_softc_t *)); -static void epic_free_rings __P((epic_softc_t *)); -static void epic_stop_activity __P((epic_softc_t *)); -static void epic_start_activity __P((epic_softc_t *)); -static void epic_set_rx_mode __P((epic_softc_t *)); -static void epic_set_tx_mode __P((epic_softc_t *)); -static void epic_set_mc_table __P((epic_softc_t *)); -static int epic_read_eeprom __P((epic_softc_t *,u_int16_t)); -static void epic_output_eepromw __P((epic_softc_t *, u_int16_t)); -static u_int16_t epic_input_eepromw __P((epic_softc_t *)); -static u_int8_t epic_eeprom_clock __P((epic_softc_t *,u_int8_t)); -static void epic_write_eepromreg __P((epic_softc_t *,u_int8_t)); -static u_int8_t epic_read_eepromreg __P((epic_softc_t *)); - -static int epic_read_phy_reg __P((epic_softc_t *, int, int)); -static void epic_write_phy_reg __P((epic_softc_t *, int, int, int)); - -static int epic_miibus_readreg __P((device_t, int, int)); -static int epic_miibus_writereg __P((device_t, int, int, int)); -static void epic_miibus_statchg __P((device_t)); -static void epic_miibus_mediainit __P((device_t)); - -static int epic_ifmedia_upd __P((struct ifnet *)); -static void epic_ifmedia_sts __P((struct ifnet *, struct ifmediareq *)); +static int epic_ifioctl(register struct ifnet *, u_long, caddr_t); +static EPIC_INTR_RET_TYPE epic_intr(void *); +static int epic_common_attach(epic_softc_t *); +static void epic_ifstart(struct ifnet *); +static void epic_ifwatchdog(struct ifnet *); +static int epic_init(epic_softc_t *); +static void epic_stop(epic_softc_t *); +static void epic_rx_done(epic_softc_t *); +static void epic_tx_done(epic_softc_t *); +static int epic_init_rings(epic_softc_t *); +static void epic_free_rings(epic_softc_t *); +static void epic_stop_activity(epic_softc_t *); +static void epic_start_activity(epic_softc_t *); +static void epic_set_rx_mode(epic_softc_t *); +static void epic_set_tx_mode(epic_softc_t *); +static void epic_set_mc_table(epic_softc_t *); +static int epic_read_eeprom(epic_softc_t *,u_int16_t); +static void epic_output_eepromw(epic_softc_t *, u_int16_t); +static u_int16_t epic_input_eepromw(epic_softc_t *); +static u_int8_t epic_eeprom_clock(epic_softc_t *,u_int8_t); +static void epic_write_eepromreg(epic_softc_t *,u_int8_t); +static u_int8_t epic_read_eepromreg(epic_softc_t *); + +static int epic_read_phy_reg(epic_softc_t *, int, int); +static void epic_write_phy_reg(epic_softc_t *, int, int, int); + +static int epic_miibus_readreg(device_t, int, int); +static int epic_miibus_writereg(device_t, int, int, int); +static void epic_miibus_statchg(device_t); +static void epic_miibus_mediainit(device_t); + +static int epic_ifmedia_upd(struct ifnet *); +static void epic_ifmedia_sts(struct ifnet *, struct ifmediareq *); /* ------------------------------------------------------------------------- OS-specific part @@ -182,9 +182,9 @@ static void epic_ifmedia_sts __P((struct ifnet *, struct ifmediareq *)); #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 @@ -333,11 +333,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/txp/if_txp.c b/sys/dev/txp/if_txp.c index 089c88691fa6..d1535ae519fc 100644 --- a/sys/dev/txp/if_txp.c +++ b/sys/dev/txp/if_txp.c @@ -110,50 +110,50 @@ static struct txp_type txp_devs[] = { { 0, 0, NULL } }; -static int txp_probe __P((device_t)); -static int txp_attach __P((device_t)); -static int txp_detach __P((device_t)); -static void txp_intr __P((void *)); -static void txp_tick __P((void *)); -static int txp_shutdown __P((device_t)); -static int txp_ioctl __P((struct ifnet *, u_long, caddr_t)); -static void txp_start __P((struct ifnet *)); -static void txp_stop __P((struct txp_softc *)); -static void txp_init __P((void *)); -static void txp_watchdog __P((struct ifnet *)); - -static void txp_release_resources __P((struct txp_softc *)); -static int txp_chip_init __P((struct txp_softc *)); -static int txp_reset_adapter __P((struct txp_softc *)); -static int txp_download_fw __P((struct txp_softc *)); -static int txp_download_fw_wait __P((struct txp_softc *)); -static int txp_download_fw_section __P((struct txp_softc *, - struct txp_fw_section_header *, int)); -static int txp_alloc_rings __P((struct txp_softc *)); -static int txp_rxring_fill __P((struct txp_softc *)); -static void txp_rxring_empty __P((struct txp_softc *)); -static void txp_set_filter __P((struct txp_softc *)); - -static int txp_cmd_desc_numfree __P((struct txp_softc *)); -static 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)); -static int txp_command2 __P((struct txp_softc *, u_int16_t, u_int16_t, +static int txp_probe (device_t); +static int txp_attach (device_t); +static int txp_detach (device_t); +static void txp_intr (void *); +static void txp_tick (void *); +static int txp_shutdown (device_t); +static int txp_ioctl (struct ifnet *, u_long, caddr_t); +static void txp_start (struct ifnet *); +static void txp_stop (struct txp_softc *); +static void txp_init (void *); +static void txp_watchdog (struct ifnet *); + +static void txp_release_resources(struct txp_softc *); +static int txp_chip_init(struct txp_softc *); +static int txp_reset_adapter(struct txp_softc *); +static int txp_download_fw(struct txp_softc *); +static int txp_download_fw_wait(struct txp_softc *); +static int txp_download_fw_section (struct txp_softc *, + struct txp_fw_section_header *, int); +static int txp_alloc_rings(struct txp_softc *); +static int txp_rxring_fill(struct txp_softc *); +static void txp_rxring_empty(struct txp_softc *); +static void txp_set_filter(struct txp_softc *); + +static int txp_cmd_desc_numfree(struct txp_softc *); +static 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); +static 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)); -static int txp_response __P((struct txp_softc *, u_int32_t, u_int16_t, u_int16_t, - struct txp_rsp_desc **)); -static void txp_rsp_fixup __P((struct txp_softc *, struct txp_rsp_desc *, - struct txp_rsp_desc *)); -static void txp_capabilities __P((struct txp_softc *)); - -static void txp_ifmedia_sts __P((struct ifnet *, struct ifmediareq *)); -static int txp_ifmedia_upd __P((struct ifnet *)); + struct txp_rsp_desc **, int); +static int txp_response (struct txp_softc *, u_int32_t, u_int16_t, u_int16_t, + struct txp_rsp_desc **); +static void txp_rsp_fixup (struct txp_softc *, struct txp_rsp_desc *, + struct txp_rsp_desc *); +static void txp_capabilities(struct txp_softc *); + +static void txp_ifmedia_sts(struct ifnet *, struct ifmediareq *); +static int txp_ifmedia_upd(struct ifnet *); #ifdef TXP_DEBUG -static void txp_show_descriptor __P((void *)); +static void txp_show_descriptor(void *); #endif -static void txp_tx_reclaim __P((struct txp_softc *, struct txp_tx_ring *)); -static void txp_rxbuf_reclaim __P((struct txp_softc *)); -static void txp_rx_reclaim __P((struct txp_softc *, struct txp_rx_ring *)); +static void txp_tx_reclaim(struct txp_softc *, struct txp_tx_ring *); +static void txp_rxbuf_reclaim(struct txp_softc *); +static void txp_rx_reclaim(struct txp_softc *, struct txp_rx_ring *); #ifdef TXP_USEIOSPACE #define TXP_RES SYS_RES_IOPORT diff --git a/sys/dev/usb/if_aue.c b/sys/dev/usb/if_aue.c index 788d7b4239d2..1f1c642f2dd0 100644 --- a/sys/dev/usb/if_aue.c +++ b/sys/dev/usb/if_aue.c @@ -128,50 +128,49 @@ Static struct aue_type aue_devs[] = { Static struct usb_qdat aue_qdat; -Static int aue_match __P((device_t)); -Static int aue_attach __P((device_t)); -Static int aue_detach __P((device_t)); - -Static void aue_reset_pegasus_II __P((struct aue_softc *)); -Static int aue_tx_list_init __P((struct aue_softc *)); -Static int aue_rx_list_init __P((struct aue_softc *)); -Static int aue_newbuf __P((struct aue_softc *, struct aue_chain *, - struct mbuf *)); -Static int aue_encap __P((struct aue_softc *, struct mbuf *, int)); +Static int aue_match (device_t); +Static int aue_attach (device_t); +Static int aue_detach (device_t); + +Static void aue_reset_pegasus_II(struct aue_softc *); +Static int aue_tx_list_init (struct aue_softc *); +Static int aue_rx_list_init (struct aue_softc *); +Static int aue_newbuf (struct aue_softc *, struct aue_chain *, + struct mbuf *); +Static int aue_encap (struct aue_softc *, struct mbuf *, int); #ifdef AUE_INTR_PIPE -Static void aue_intr __P((usbd_xfer_handle, - usbd_private_handle, usbd_status)); +Static void aue_intr (usbd_xfer_handle, + usbd_private_handle, usbd_status); #endif -Static void aue_rxeof __P((usbd_xfer_handle, - usbd_private_handle, usbd_status)); -Static void aue_txeof __P((usbd_xfer_handle, - usbd_private_handle, usbd_status)); -Static void aue_tick __P((void *)); -Static void aue_rxstart __P((struct ifnet *)); -Static void aue_start __P((struct ifnet *)); -Static int aue_ioctl __P((struct ifnet *, u_long, caddr_t)); -Static void aue_init __P((void *)); -Static void aue_stop __P((struct aue_softc *)); -Static void aue_watchdog __P((struct ifnet *)); -Static void aue_shutdown __P((device_t)); -Static int aue_ifmedia_upd __P((struct ifnet *)); -Static void aue_ifmedia_sts __P((struct ifnet *, struct ifmediareq *)); - -Static void aue_eeprom_getword __P((struct aue_softc *, int, u_int16_t *)); -Static void aue_read_eeprom __P((struct aue_softc *, caddr_t, int, - int, int)); -Static int aue_miibus_readreg __P((device_t, int, int)); -Static int aue_miibus_writereg __P((device_t, int, int, int)); -Static void aue_miibus_statchg __P((device_t)); - -Static void aue_setmulti __P((struct aue_softc *)); -Static u_int32_t aue_crc __P((caddr_t)); -Static void aue_reset __P((struct aue_softc *)); - -Static int csr_read_1 __P((struct aue_softc *, int)); -Static int csr_write_1 __P((struct aue_softc *, int, int)); -Static int csr_read_2 __P((struct aue_softc *, int)); -Static int csr_write_2 __P((struct aue_softc *, int, int)); +Static void aue_rxeof (usbd_xfer_handle, + usbd_private_handle, usbd_status); +Static void aue_txeof (usbd_xfer_handle, + usbd_private_handle, usbd_status); +Static void aue_tick (void *); +Static void aue_rxstart (struct ifnet *); +Static void aue_start (struct ifnet *); +Static int aue_ioctl (struct ifnet *, u_long, caddr_t); +Static void aue_init (void *); +Static void aue_stop (struct aue_softc *); +Static void aue_watchdog (struct ifnet *); +Static void aue_shutdown (device_t); +Static int aue_ifmedia_upd (struct ifnet *); +Static void aue_ifmedia_sts (struct ifnet *, struct ifmediareq *); + +Static void aue_eeprom_getword (struct aue_softc *, int, u_int16_t *); +Static void aue_read_eeprom (struct aue_softc *, caddr_t, int, int, int); +Static int aue_miibus_readreg (device_t, int, int); +Static int aue_miibus_writereg (device_t, int, int, int); +Static void aue_miibus_statchg (device_t); + +Static void aue_setmulti (struct aue_softc *); +Static u_int32_t aue_crc (caddr_t); +Static void aue_reset (struct aue_softc *); + +Static int csr_read_1 (struct aue_softc *, int); +Static int csr_write_1 (struct aue_softc *, int, int); +Static int csr_read_2 (struct aue_softc *, int); +Static int csr_write_2 (struct aue_softc *, int, int); Static device_method_t aue_methods[] = { /* Device interface */ diff --git a/sys/dev/usb/if_cue.c b/sys/dev/usb/if_cue.c index d7342b2df617..1a3a69edaa28 100644 --- a/sys/dev/usb/if_cue.c +++ b/sys/dev/usb/if_cue.c @@ -93,41 +93,40 @@ Static struct cue_type cue_devs[] = { Static struct usb_qdat cue_qdat; -Static int cue_match __P((device_t)); -Static int cue_attach __P((device_t)); -Static int cue_detach __P((device_t)); - -Static int cue_tx_list_init __P((struct cue_softc *)); -Static int cue_rx_list_init __P((struct cue_softc *)); -Static int cue_newbuf __P((struct cue_softc *, struct cue_chain *, - struct mbuf *)); -Static int cue_encap __P((struct cue_softc *, struct mbuf *, int)); -Static void cue_rxeof __P((usbd_xfer_handle, - usbd_private_handle, usbd_status)); -Static void cue_txeof __P((usbd_xfer_handle, - usbd_private_handle, usbd_status)); -Static void cue_tick __P((void *)); -Static void cue_rxstart __P((struct ifnet *)); -Static void cue_start __P((struct ifnet *)); -Static int cue_ioctl __P((struct ifnet *, u_long, caddr_t)); -Static void cue_init __P((void *)); -Static void cue_stop __P((struct cue_softc *)); -Static void cue_watchdog __P((struct ifnet *)); -Static void cue_shutdown __P((device_t)); - -Static void cue_setmulti __P((struct cue_softc *)); -Static u_int32_t cue_crc __P((caddr_t)); -Static void cue_reset __P((struct cue_softc *)); - -Static int csr_read_1 __P((struct cue_softc *, int)); -Static int csr_write_1 __P((struct cue_softc *, int, int)); -Static int csr_read_2 __P((struct cue_softc *, int)); +Static int cue_match (device_t); +Static int cue_attach (device_t); +Static int cue_detach (device_t); + +Static int cue_tx_list_init (struct cue_softc *); +Static int cue_rx_list_init (struct cue_softc *); +Static int cue_newbuf (struct cue_softc *, struct cue_chain *, + struct mbuf *); +Static int cue_encap (struct cue_softc *, struct mbuf *, int); +Static void cue_rxeof (usbd_xfer_handle, + usbd_private_handle, usbd_status); +Static void cue_txeof (usbd_xfer_handle, + usbd_private_handle, usbd_status); +Static void cue_tick (void *); +Static void cue_rxstart (struct ifnet *); +Static void cue_start (struct ifnet *); +Static int cue_ioctl (struct ifnet *, u_long, caddr_t); +Static void cue_init (void *); +Static void cue_stop (struct cue_softc *); +Static void cue_watchdog (struct ifnet *); +Static void cue_shutdown (device_t); + +Static void cue_setmulti (struct cue_softc *); +Static u_int32_t cue_crc (caddr_t); +Static void cue_reset (struct cue_softc *); + +Static int csr_read_1 (struct cue_softc *, int); +Static int csr_write_1 (struct cue_softc *, int, int); +Static int csr_read_2 (struct cue_softc *, int); #ifdef notdef -Static int csr_write_2 __P((struct cue_softc *, int, int)); +Static int csr_write_2 (struct cue_softc *, int, int); #endif -Static int cue_mem __P((struct cue_softc *, int, - int, void *, int)); -Static int cue_getmac __P((struct cue_softc *, void *)); +Static int cue_mem (struct cue_softc *, int, int, void *, int); +Static int cue_getmac (struct cue_softc *, void *); Static device_method_t cue_methods[] = { /* Device interface */ diff --git a/sys/dev/usb/if_kue.c b/sys/dev/usb/if_kue.c index 44407cc939f7..8b9261a3a8be 100644 --- a/sys/dev/usb/if_kue.c +++ b/sys/dev/usb/if_kue.c @@ -125,36 +125,36 @@ Static struct kue_type kue_devs[] = { Static struct usb_qdat kue_qdat; -Static int kue_match __P((device_t)); -Static int kue_attach __P((device_t)); -Static int kue_detach __P((device_t)); -Static void kue_shutdown __P((device_t)); -Static int kue_tx_list_init __P((struct kue_softc *)); -Static int kue_rx_list_init __P((struct kue_softc *)); -Static int kue_newbuf __P((struct kue_softc *, struct kue_chain *, - struct mbuf *)); -Static int kue_encap __P((struct kue_softc *, struct mbuf *, int)); -Static void kue_rxeof __P((usbd_xfer_handle, - usbd_private_handle, usbd_status)); -Static void kue_txeof __P((usbd_xfer_handle, - usbd_private_handle, usbd_status)); -Static void kue_start __P((struct ifnet *)); -Static void kue_rxstart __P((struct ifnet *)); -Static int kue_ioctl __P((struct ifnet *, u_long, caddr_t)); -Static void kue_init __P((void *)); -Static void kue_stop __P((struct kue_softc *)); -Static void kue_watchdog __P((struct ifnet *)); - -Static void kue_setmulti __P((struct kue_softc *)); -Static void kue_reset __P((struct kue_softc *)); +Static int kue_match (device_t); +Static int kue_attach (device_t); +Static int kue_detach (device_t); +Static void kue_shutdown (device_t); +Static int kue_tx_list_init (struct kue_softc *); +Static int kue_rx_list_init (struct kue_softc *); +Static int kue_newbuf (struct kue_softc *, struct kue_chain *, + struct mbuf *); +Static int kue_encap (struct kue_softc *, struct mbuf *, int); +Static void kue_rxeof (usbd_xfer_handle, + usbd_private_handle, usbd_status); +Static void kue_txeof (usbd_xfer_handle, + usbd_private_handle, usbd_status); +Static void kue_start (struct ifnet *); +Static void kue_rxstart (struct ifnet *); +Static int kue_ioctl (struct ifnet *, u_long, caddr_t); +Static void kue_init (void *); +Static void kue_stop (struct kue_softc *); +Static void kue_watchdog (struct ifnet *); + +Static void kue_setmulti (struct kue_softc *); +Static void kue_reset (struct kue_softc *); Static usbd_status kue_do_request - __P((usbd_device_handle, - usb_device_request_t *, void *)); -Static usbd_status kue_ctl __P((struct kue_softc *, int, u_int8_t, - u_int16_t, char *, int)); -Static usbd_status kue_setword __P((struct kue_softc *, u_int8_t, u_int16_t)); -Static int kue_load_fw __P((struct kue_softc *)); + (usbd_device_handle, + usb_device_request_t *, void *); +Static usbd_status kue_ctl (struct kue_softc *, int, u_int8_t, + u_int16_t, char *, int); +Static usbd_status kue_setword (struct kue_softc *, u_int8_t, u_int16_t); +Static int kue_load_fw (struct kue_softc *); Static device_method_t kue_methods[] = { /* Device interface */ diff --git a/sys/dev/usb/umass.c b/sys/dev/usb/umass.c index 2ac3fff0dead..47ca6461ed8b 100644 --- a/sys/dev/usb/umass.c +++ b/sys/dev/usb/umass.c @@ -541,9 +541,9 @@ Static int umass_atapi_transform (struct umass_softc *sc, unsigned char **rcmd, int *rcmdlen); /* RBC specific functions */ -Static int umass_rbc_transform __P((struct umass_softc *sc, +Static int umass_rbc_transform (struct umass_softc *sc, unsigned char *cmd, int cmdlen, - unsigned char **rcmd, int *rcmdlen)); + unsigned char **rcmd, int *rcmdlen); #ifdef UMASS_DEBUG /* General debugging functions */ diff --git a/sys/dev/usb/usb_ethersubr.c b/sys/dev/usb/usb_ethersubr.c index 3065c47900b5..395ea6fab46a 100644 --- a/sys/dev/usb/usb_ethersubr.c +++ b/sys/dev/usb/usb_ethersubr.c @@ -76,7 +76,7 @@ Static struct ifqueue usbq_rx; Static struct ifqueue usbq_tx; Static int mtx_inited = 0; -Static void usbintr __P((void)); +Static void usbintr (void); Static void usbintr() { diff --git a/sys/dev/usb/usb_ethersubr.h b/sys/dev/usb/usb_ethersubr.h index d98be8c48443..29cdde5a0c01 100644 --- a/sys/dev/usb/usb_ethersubr.h +++ b/sys/dev/usb/usb_ethersubr.h @@ -41,11 +41,11 @@ struct usb_qdat { struct ifnet *ifp; - void (*if_rxstart) __P((struct ifnet *)); + void (*if_rxstart) (struct ifnet *); }; -void usb_register_netisr __P((void)); -void usb_ether_input __P((struct mbuf *)); -void usb_tx_done __P((struct mbuf *)); +void usb_register_netisr (void); +void usb_ether_input (struct mbuf *); +void usb_tx_done (struct mbuf *); #endif diff --git a/sys/dev/usb/usbdivar.h b/sys/dev/usb/usbdivar.h index 74f5e5e48119..ca0eee948098 100644 --- a/sys/dev/usb/usbdivar.h +++ b/sys/dev/usb/usbdivar.h @@ -53,7 +53,7 @@ struct usbd_endpoint { struct usbd_bus_methods { usbd_status (*open_pipe)(struct usbd_pipe *pipe); - void (*soft_intr)__P((struct usbd_bus *)); + void (*soft_intr)(struct usbd_bus *); void (*do_poll)(struct usbd_bus *); usbd_status (*allocm)(struct usbd_bus *, usb_dma_t *, u_int32_t bufsize); @@ -241,7 +241,7 @@ void usb_disconnect_port(struct usbd_port *up, device_ptr_t); /* Routines from usb.c */ void usb_needs_explore(usbd_bus_handle); -void usb_schedsoftintr __P((struct usbd_bus *)); +void usb_schedsoftintr(struct usbd_bus *); #ifdef DIAGNOSTIC #define SPLUSBCHECK \ diff --git a/sys/dev/vr/if_vr.c b/sys/dev/vr/if_vr.c index 0956396835ac..33a68971fa4f 100644 --- a/sys/dev/vr/if_vr.c +++ b/sys/dev/vr/if_vr.c @@ -121,45 +121,45 @@ static struct vr_type vr_devs[] = { { 0, 0, NULL } }; -static int vr_probe __P((device_t)); -static int vr_attach __P((device_t)); -static int vr_detach __P((device_t)); +static int vr_probe (device_t); +static int vr_attach (device_t); +static int vr_detach (device_t); -static int vr_newbuf __P((struct vr_softc *, +static int vr_newbuf (struct vr_softc *, struct vr_chain_onefrag *, - struct mbuf *)); -static int vr_encap __P((struct vr_softc *, struct vr_chain *, - struct mbuf * )); - -static void vr_rxeof __P((struct vr_softc *)); -static void vr_rxeoc __P((struct vr_softc *)); -static void vr_txeof __P((struct vr_softc *)); -static void vr_txeoc __P((struct vr_softc *)); -static void vr_tick __P((void *)); -static void vr_intr __P((void *)); -static void vr_start __P((struct ifnet *)); -static int vr_ioctl __P((struct ifnet *, u_long, caddr_t)); -static void vr_init __P((void *)); -static void vr_stop __P((struct vr_softc *)); -static void vr_watchdog __P((struct ifnet *)); -static void vr_shutdown __P((device_t)); -static int vr_ifmedia_upd __P((struct ifnet *)); -static void vr_ifmedia_sts __P((struct ifnet *, struct ifmediareq *)); - -static void vr_mii_sync __P((struct vr_softc *)); -static void vr_mii_send __P((struct vr_softc *, u_int32_t, int)); -static int vr_mii_readreg __P((struct vr_softc *, struct vr_mii_frame *)); -static int vr_mii_writereg __P((struct vr_softc *, struct vr_mii_frame *)); -static int vr_miibus_readreg __P((device_t, int, int)); -static int vr_miibus_writereg __P((device_t, int, int, int)); -static void vr_miibus_statchg __P((device_t)); - -static void vr_setcfg __P((struct vr_softc *, int)); -static u_int8_t vr_calchash __P((u_int8_t *)); -static void vr_setmulti __P((struct vr_softc *)); -static void vr_reset __P((struct vr_softc *)); -static int vr_list_rx_init __P((struct vr_softc *)); -static int vr_list_tx_init __P((struct vr_softc *)); + struct mbuf *); +static int vr_encap (struct vr_softc *, struct vr_chain *, + struct mbuf * ); + +static void vr_rxeof (struct vr_softc *); +static void vr_rxeoc (struct vr_softc *); +static void vr_txeof (struct vr_softc *); +static void vr_txeoc (struct vr_softc *); +static void vr_tick (void *); +static void vr_intr (void *); +static void vr_start (struct ifnet *); +static int vr_ioctl (struct ifnet *, u_long, caddr_t); +static void vr_init (void *); +static void vr_stop (struct vr_softc *); +static void vr_watchdog (struct ifnet *); +static void vr_shutdown (device_t); +static int vr_ifmedia_upd (struct ifnet *); +static void vr_ifmedia_sts (struct ifnet *, struct ifmediareq *); + +static void vr_mii_sync (struct vr_softc *); +static void vr_mii_send (struct vr_softc *, u_int32_t, int); +static int vr_mii_readreg (struct vr_softc *, struct vr_mii_frame *); +static int vr_mii_writereg (struct vr_softc *, struct vr_mii_frame *); +static int vr_miibus_readreg (device_t, int, int); +static int vr_miibus_writereg (device_t, int, int, int); +static void vr_miibus_statchg (device_t); + +static void vr_setcfg (struct vr_softc *, int); +static u_int8_t vr_calchash (u_int8_t *); +static void vr_setmulti (struct vr_softc *); +static void vr_reset (struct vr_softc *); +static int vr_list_rx_init (struct vr_softc *); +static int vr_list_tx_init (struct vr_softc *); #ifdef VR_USEIOSPACE #define VR_RES SYS_RES_IOPORT diff --git a/sys/dev/vx/if_vx.c b/sys/dev/vx/if_vx.c index af0e7b09442e..b5ddd7b8ff14 100644 --- a/sys/dev/vx/if_vx.c +++ b/sys/dev/vx/if_vx.c @@ -100,23 +100,23 @@ static struct connector_entry { { 0, "???"} }; -/* int vxattach __P((struct vx_softc *)); */ -static void vxtxstat __P((struct vx_softc *)); -static int vxstatus __P((struct vx_softc *)); -static void vxinit __P((void *)); -static int vxioctl __P((struct ifnet *, u_long, caddr_t)); -static void vxstart __P((struct ifnet *ifp)); -static void vxwatchdog __P((struct ifnet *)); -static void vxreset __P((struct vx_softc *)); -/* void vxstop __P((struct vx_softc *)); */ -static void vxread __P((struct vx_softc *)); -static struct mbuf *vxget __P((struct vx_softc *, u_int)); -static void vxmbuffill __P((void *)); -static void vxmbufempty __P((struct vx_softc *)); -static void vxsetfilter __P((struct vx_softc *)); -static void vxgetlink __P((struct vx_softc *)); -static void vxsetlink __P((struct vx_softc *)); -/* int vxbusyeeprom __P((struct vx_softc *)); */ +/* int vxattach(struct vx_softc *); */ +static void vxtxstat(struct vx_softc *); +static int vxstatus(struct vx_softc *); +static void vxinit(void *); +static int vxioctl(struct ifnet *, u_long, caddr_t); +static void vxstart(struct ifnet *ifp); +static void vxwatchdog(struct ifnet *); +static void vxreset(struct vx_softc *); +/* void vxstop(struct vx_softc *); */ +static void vxread(struct vx_softc *); +static struct mbuf *vxget(struct vx_softc *, u_int); +static void vxmbuffill(void *); +static void vxmbufempty(struct vx_softc *); +static void vxsetfilter(struct vx_softc *); +static void vxgetlink(struct vx_softc *); +static void vxsetlink(struct vx_softc *); +/* int vxbusyeeprom(struct vx_softc *); */ int diff --git a/sys/dev/vx/if_vx_eisa.c b/sys/dev/vx/if_vx_eisa.c index b23124331265..c51c2eff6c62 100644 --- a/sys/dev/vx/if_vx_eisa.c +++ b/sys/dev/vx/if_vx_eisa.c @@ -58,7 +58,7 @@ #define VX_RESOURCE_CONFIG 0x0008 -static const char *vx_match __P((eisa_id_t type)); +static const char *vx_match(eisa_id_t type); static const char* vx_match(eisa_id_t type) diff --git a/sys/dev/vx/if_vxreg.h b/sys/dev/vx/if_vxreg.h index 4d5f19873119..8871c04109fa 100644 --- a/sys/dev/vx/if_vxreg.h +++ b/sys/dev/vx/if_vxreg.h @@ -468,9 +468,9 @@ struct vx_softc { extern struct vx_softc *vx_softc[]; extern u_long vx_count; -extern struct vx_softc *vxalloc __P((int)); -extern void vxfree __P((struct vx_softc *)); -extern int vxattach __P((struct vx_softc *)); -extern void vxstop __P((struct vx_softc *)); -extern void vxintr __P((void *)); -extern int vxbusyeeprom __P((struct vx_softc *)); +extern struct vx_softc *vxalloc(int); +extern void vxfree(struct vx_softc *); +extern int vxattach(struct vx_softc *); +extern void vxstop(struct vx_softc *); +extern void vxintr(void *); +extern int vxbusyeeprom(struct vx_softc *); diff --git a/sys/pci/cy_pci.c b/sys/pci/cy_pci.c index a806731a460a..72cb9612cf10 100644 --- a/sys/pci/cy_pci.c +++ b/sys/pci/cy_pci.c @@ -68,8 +68,8 @@ extern int cyattach_common(void *, int); /* Not exactly correct */ extern void cyintr(int); -static int cy_pci_attach __P((device_t dev)); -static int cy_pci_probe __P((device_t dev)); +static int cy_pci_attach(device_t dev); +static int cy_pci_probe(device_t dev); static device_method_t cy_pci_methods[] = { /* Device interface. */ diff --git a/sys/pci/if_dc.c b/sys/pci/if_dc.c index abafb7e5e3c2..fa8cd2e55e98 100644 --- a/sys/pci/if_dc.c +++ b/sys/pci/if_dc.c @@ -195,75 +195,70 @@ static struct dc_type dc_devs[] = { { 0, 0, NULL } }; -static int dc_probe __P((device_t)); -static int dc_attach __P((device_t)); -static int dc_detach __P((device_t)); -static void dc_acpi __P((device_t)); -static struct dc_type *dc_devtype __P((device_t)); -static int dc_newbuf __P((struct dc_softc *, int, struct mbuf *)); -static int dc_encap __P((struct dc_softc *, struct mbuf *, - u_int32_t *)); -static int dc_coal __P((struct dc_softc *, struct mbuf **)); -static void dc_pnic_rx_bug_war __P((struct dc_softc *, int)); -static int dc_rx_resync __P((struct dc_softc *)); -static void dc_rxeof __P((struct dc_softc *)); -static void dc_txeof __P((struct dc_softc *)); -static void dc_tick __P((void *)); -static void dc_tx_underrun __P((struct dc_softc *)); -static void dc_intr __P((void *)); -static void dc_start __P((struct ifnet *)); -static int dc_ioctl __P((struct ifnet *, u_long, caddr_t)); -static void dc_init __P((void *)); -static void dc_stop __P((struct dc_softc *)); -static void dc_watchdog __P((struct ifnet *)); -static void dc_shutdown __P((device_t)); -static int dc_ifmedia_upd __P((struct ifnet *)); -static void dc_ifmedia_sts __P((struct ifnet *, struct ifmediareq *)); - -static void dc_delay __P((struct dc_softc *)); -static void dc_eeprom_idle __P((struct dc_softc *)); -static void dc_eeprom_putbyte __P((struct dc_softc *, int)); -static void dc_eeprom_getword __P((struct dc_softc *, int, u_int16_t *)); +static int dc_probe (device_t); +static int dc_attach (device_t); +static int dc_detach (device_t); +static void dc_acpi (device_t); +static struct dc_type *dc_devtype (device_t); +static int dc_newbuf (struct dc_softc *, int, struct mbuf *); +static int dc_encap (struct dc_softc *, struct mbuf *, u_int32_t *); +static int dc_coal (struct dc_softc *, struct mbuf **); +static void dc_pnic_rx_bug_war (struct dc_softc *, int); +static int dc_rx_resync (struct dc_softc *); +static void dc_rxeof (struct dc_softc *); +static void dc_txeof (struct dc_softc *); +static void dc_tick (void *); +static void dc_tx_underrun (struct dc_softc *); +static void dc_intr (void *); +static void dc_start (struct ifnet *); +static int dc_ioctl (struct ifnet *, u_long, caddr_t); +static void dc_init (void *); +static void dc_stop (struct dc_softc *); +static void dc_watchdog (struct ifnet *); +static void dc_shutdown (device_t); +static int dc_ifmedia_upd (struct ifnet *); +static void dc_ifmedia_sts (struct ifnet *, struct ifmediareq *); + +static void dc_delay (struct dc_softc *); +static void dc_eeprom_idle (struct dc_softc *); +static void dc_eeprom_putbyte (struct dc_softc *, int); +static void dc_eeprom_getword (struct dc_softc *, int, u_int16_t *); static void dc_eeprom_getword_pnic - __P((struct dc_softc *, int, u_int16_t *)); + (struct dc_softc *, int, u_int16_t *); static void dc_eeprom_getword_xircom - __P((struct dc_softc *, int, u_int16_t *)); -static void dc_read_eeprom __P((struct dc_softc *, caddr_t, int, - int, int)); - -static void dc_mii_writebit __P((struct dc_softc *, int)); -static int dc_mii_readbit __P((struct dc_softc *)); -static void dc_mii_sync __P((struct dc_softc *)); -static void dc_mii_send __P((struct dc_softc *, u_int32_t, int)); -static int dc_mii_readreg __P((struct dc_softc *, struct dc_mii_frame *)); -static int dc_mii_writereg __P((struct dc_softc *, struct dc_mii_frame *)); -static int dc_miibus_readreg __P((device_t, int, int)); -static int dc_miibus_writereg __P((device_t, int, int, int)); -static void dc_miibus_statchg __P((device_t)); -static void dc_miibus_mediainit __P((device_t)); - -static void dc_setcfg __P((struct dc_softc *, int)); -static u_int32_t dc_crc_le __P((struct dc_softc *, caddr_t)); -static u_int32_t dc_crc_be __P((caddr_t)); -static void dc_setfilt_21143 __P((struct dc_softc *)); -static void dc_setfilt_asix __P((struct dc_softc *)); -static void dc_setfilt_admtek __P((struct dc_softc *)); -static void dc_setfilt_xircom __P((struct dc_softc *)); - -static void dc_setfilt __P((struct dc_softc *)); - -static void dc_reset __P((struct dc_softc *)); -static int dc_list_rx_init __P((struct dc_softc *)); -static int dc_list_tx_init __P((struct dc_softc *)); - -static void dc_parse_21143_srom __P((struct dc_softc *)); -static void dc_decode_leaf_sia __P((struct dc_softc *, - struct dc_eblock_sia *)); -static void dc_decode_leaf_mii __P((struct dc_softc *, - struct dc_eblock_mii *)); -static void dc_decode_leaf_sym __P((struct dc_softc *, - struct dc_eblock_sym *)); -static void dc_apply_fixup __P((struct dc_softc *, int)); + (struct dc_softc *, int, u_int16_t *); +static void dc_read_eeprom (struct dc_softc *, caddr_t, int, int, int); + +static void dc_mii_writebit (struct dc_softc *, int); +static int dc_mii_readbit (struct dc_softc *); +static void dc_mii_sync (struct dc_softc *); +static void dc_mii_send (struct dc_softc *, u_int32_t, int); +static int dc_mii_readreg (struct dc_softc *, struct dc_mii_frame *); +static int dc_mii_writereg (struct dc_softc *, struct dc_mii_frame *); +static int dc_miibus_readreg (device_t, int, int); +static int dc_miibus_writereg (device_t, int, int, int); +static void dc_miibus_statchg (device_t); +static void dc_miibus_mediainit (device_t); + +static void dc_setcfg (struct dc_softc *, int); +static u_int32_t dc_crc_le (struct dc_softc *, caddr_t); +static u_int32_t dc_crc_be (caddr_t); +static void dc_setfilt_21143 (struct dc_softc *); +static void dc_setfilt_asix (struct dc_softc *); +static void dc_setfilt_admtek (struct dc_softc *); +static void dc_setfilt_xircom (struct dc_softc *); + +static void dc_setfilt (struct dc_softc *); + +static void dc_reset (struct dc_softc *); +static int dc_list_rx_init (struct dc_softc *); +static int dc_list_tx_init (struct dc_softc *); + +static void dc_parse_21143_srom (struct dc_softc *); +static void dc_decode_leaf_sia (struct dc_softc *, struct dc_eblock_sia *); +static void dc_decode_leaf_mii (struct dc_softc *, struct dc_eblock_mii *); +static void dc_decode_leaf_sym (struct dc_softc *, struct dc_eblock_sym *); +static void dc_apply_fixup (struct dc_softc *, int); #ifdef DC_USEIOSPACE #define DC_RES SYS_RES_IOPORT diff --git a/sys/pci/if_en_pci.c b/sys/pci/if_en_pci.c index f3eecb66788a..4b99da71cccb 100644 --- a/sys/pci/if_en_pci.c +++ b/sys/pci/if_en_pci.c @@ -67,10 +67,10 @@ * prototypes */ -static int en_pci_probe __P((device_t)); -static int en_pci_attach __P((device_t)); -static int en_pci_detach __P((device_t)); -static int en_pci_shutdown __P((device_t)); +static int en_pci_probe(device_t); +static int en_pci_attach(device_t); +static int en_pci_detach(device_t); +static int en_pci_shutdown(device_t); /* * local structures @@ -87,10 +87,10 @@ struct en_pci_softc { }; #if !defined(MIDWAY_ENIONLY) -static void eni_get_macaddr __P((device_t, struct en_pci_softc *)); +static void eni_get_macaddr(device_t, struct en_pci_softc *); #endif #if !defined(MIDWAY_ADPONLY) -static void adp_get_macaddr __P((struct en_pci_softc *)); +static void adp_get_macaddr(struct en_pci_softc *); #endif /* @@ -136,7 +136,7 @@ static void adp_get_macaddr __P((struct en_pci_softc *)); #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/pci/if_pcn.c b/sys/pci/if_pcn.c index 6a177c647cee..c1f42e2d9b45 100644 --- a/sys/pci/if_pcn.c +++ b/sys/pci/if_pcn.c @@ -109,43 +109,43 @@ static struct pcn_type pcn_devs[] = { { 0, 0, NULL } }; -static u_int32_t pcn_csr_read __P((struct pcn_softc *, int)); -static u_int16_t pcn_csr_read16 __P((struct pcn_softc *, int)); -static u_int16_t pcn_bcr_read16 __P((struct pcn_softc *, int)); -static void pcn_csr_write __P((struct pcn_softc *, int, int)); -static u_int32_t pcn_bcr_read __P((struct pcn_softc *, int)); -static void pcn_bcr_write __P((struct pcn_softc *, int, int)); - -static int pcn_probe __P((device_t)); -static int pcn_attach __P((device_t)); -static int pcn_detach __P((device_t)); - -static int pcn_newbuf __P((struct pcn_softc *, int, struct mbuf *)); -static int pcn_encap __P((struct pcn_softc *, - struct mbuf *, u_int32_t *)); -static void pcn_rxeof __P((struct pcn_softc *)); -static void pcn_txeof __P((struct pcn_softc *)); -static void pcn_intr __P((void *)); -static void pcn_tick __P((void *)); -static void pcn_start __P((struct ifnet *)); -static int pcn_ioctl __P((struct ifnet *, u_long, caddr_t)); -static void pcn_init __P((void *)); -static void pcn_stop __P((struct pcn_softc *)); -static void pcn_watchdog __P((struct ifnet *)); -static void pcn_shutdown __P((device_t)); -static int pcn_ifmedia_upd __P((struct ifnet *)); -static void pcn_ifmedia_sts __P((struct ifnet *, struct ifmediareq *)); - -static int pcn_miibus_readreg __P((device_t, int, int)); -static int pcn_miibus_writereg __P((device_t, int, int, int)); -static void pcn_miibus_statchg __P((device_t)); - -static void pcn_setfilt __P((struct ifnet *)); -static void pcn_setmulti __P((struct pcn_softc *)); -static u_int32_t pcn_crc __P((caddr_t)); -static void pcn_reset __P((struct pcn_softc *)); -static int pcn_list_rx_init __P((struct pcn_softc *)); -static int pcn_list_tx_init __P((struct pcn_softc *)); +static u_int32_t pcn_csr_read (struct pcn_softc *, int); +static u_int16_t pcn_csr_read16 (struct pcn_softc *, int); +static u_int16_t pcn_bcr_read16 (struct pcn_softc *, int); +static void pcn_csr_write (struct pcn_softc *, int, int); +static u_int32_t pcn_bcr_read (struct pcn_softc *, int); +static void pcn_bcr_write (struct pcn_softc *, int, int); + +static int pcn_probe (device_t); +static int pcn_attach (device_t); +static int pcn_detach (device_t); + +static int pcn_newbuf (struct pcn_softc *, int, struct mbuf *); +static int pcn_encap (struct pcn_softc *, + struct mbuf *, u_int32_t *); +static void pcn_rxeof (struct pcn_softc *); +static void pcn_txeof (struct pcn_softc *); +static void pcn_intr (void *); +static void pcn_tick (void *); +static void pcn_start (struct ifnet *); +static int pcn_ioctl (struct ifnet *, u_long, caddr_t); +static void pcn_init (void *); +static void pcn_stop (struct pcn_softc *); +static void pcn_watchdog (struct ifnet *); +static void pcn_shutdown (device_t); +static int pcn_ifmedia_upd (struct ifnet *); +static void pcn_ifmedia_sts (struct ifnet *, struct ifmediareq *); + +static int pcn_miibus_readreg (device_t, int, int); +static int pcn_miibus_writereg (device_t, int, int, int); +static void pcn_miibus_statchg (device_t); + +static void pcn_setfilt (struct ifnet *); +static void pcn_setmulti (struct pcn_softc *); +static u_int32_t pcn_crc (caddr_t); +static void pcn_reset (struct pcn_softc *); +static int pcn_list_rx_init (struct pcn_softc *); +static int pcn_list_tx_init (struct pcn_softc *); #ifdef PCN_USEIOSPACE #define PCN_RES SYS_RES_IOPORT diff --git a/sys/pci/if_rl.c b/sys/pci/if_rl.c index be47166ee4a3..aec94209cc5a 100644 --- a/sys/pci/if_rl.c +++ b/sys/pci/if_rl.c @@ -155,49 +155,46 @@ static struct rl_type rl_devs[] = { { 0, 0, NULL } }; -static int rl_probe __P((device_t)); -static int rl_attach __P((device_t)); -static int rl_detach __P((device_t)); - -static int rl_encap __P((struct rl_softc *, struct mbuf * )); - -static void rl_rxeof __P((struct rl_softc *)); -static void rl_txeof __P((struct rl_softc *)); -static void rl_intr __P((void *)); -static void rl_tick __P((void *)); -static void rl_start __P((struct ifnet *)); -static int rl_ioctl __P((struct ifnet *, u_long, caddr_t)); -static void rl_init __P((void *)); -static void rl_stop __P((struct rl_softc *)); -static void rl_watchdog __P((struct ifnet *)); -static int rl_suspend __P((device_t)); -static int rl_resume __P((device_t)); -static void rl_shutdown __P((device_t)); -static int rl_ifmedia_upd __P((struct ifnet *)); -static void rl_ifmedia_sts __P((struct ifnet *, struct ifmediareq *)); - -static void rl_eeprom_putbyte __P((struct rl_softc *, int)); -static void rl_eeprom_getword __P((struct rl_softc *, int, u_int16_t *)); -static void rl_read_eeprom __P((struct rl_softc *, caddr_t, - int, int, int)); -static void rl_mii_sync __P((struct rl_softc *)); -static void rl_mii_send __P((struct rl_softc *, u_int32_t, int)); -static int rl_mii_readreg __P((struct rl_softc *, struct rl_mii_frame *)); -static int rl_mii_writereg __P((struct rl_softc *, struct rl_mii_frame *)); - -static int rl_miibus_readreg __P((device_t, int, int)); -static int rl_miibus_writereg __P((device_t, int, int, int)); -static void rl_miibus_statchg __P((device_t)); - -static u_int8_t rl_calchash __P((caddr_t)); -static void rl_setmulti __P((struct rl_softc *)); -static void rl_reset __P((struct rl_softc *)); -static int rl_list_tx_init __P((struct rl_softc *)); - -static void rl_dma_map_rxbuf __P((void *, bus_dma_segment_t *, - int, int)); -static void rl_dma_map_txbuf __P((void *, bus_dma_segment_t *, - int, int)); +static int rl_probe (device_t); +static int rl_attach (device_t); +static int rl_detach (device_t); + +static int rl_encap (struct rl_softc *, struct mbuf * ); + +static void rl_rxeof (struct rl_softc *); +static void rl_txeof (struct rl_softc *); +static void rl_intr (void *); +static void rl_tick (void *); +static void rl_start (struct ifnet *); +static int rl_ioctl (struct ifnet *, u_long, caddr_t); +static void rl_init (void *); +static void rl_stop (struct rl_softc *); +static void rl_watchdog (struct ifnet *); +static int rl_suspend (device_t); +static int rl_resume (device_t); +static void rl_shutdown (device_t); +static int rl_ifmedia_upd (struct ifnet *); +static void rl_ifmedia_sts (struct ifnet *, struct ifmediareq *); + +static void rl_eeprom_putbyte (struct rl_softc *, int); +static void rl_eeprom_getword (struct rl_softc *, int, u_int16_t *); +static void rl_read_eeprom (struct rl_softc *, caddr_t, int, int, int); +static void rl_mii_sync (struct rl_softc *); +static void rl_mii_send (struct rl_softc *, u_int32_t, int); +static int rl_mii_readreg (struct rl_softc *, struct rl_mii_frame *); +static int rl_mii_writereg (struct rl_softc *, struct rl_mii_frame *); + +static int rl_miibus_readreg (device_t, int, int); +static int rl_miibus_writereg (device_t, int, int, int); +static void rl_miibus_statchg (device_t); + +static u_int8_t rl_calchash (caddr_t); +static void rl_setmulti (struct rl_softc *); +static void rl_reset (struct rl_softc *); +static int rl_list_tx_init (struct rl_softc *); + +static void rl_dma_map_rxbuf (void *, bus_dma_segment_t *, int, int); +static void rl_dma_map_txbuf (void *, bus_dma_segment_t *, int, int); #ifdef RL_USEIOSPACE #define RL_RES SYS_RES_IOPORT diff --git a/sys/pci/if_sf.c b/sys/pci/if_sf.c index 8ebc2f5bf0ab..771e69ea8e0b 100644 --- a/sys/pci/if_sf.c +++ b/sys/pci/if_sf.c @@ -130,47 +130,47 @@ static struct sf_type sf_devs[] = { { 0, 0, NULL } }; -static int sf_probe __P((device_t)); -static int sf_attach __P((device_t)); -static int sf_detach __P((device_t)); -static void sf_intr __P((void *)); -static void sf_stats_update __P((void *)); -static void sf_rxeof __P((struct sf_softc *)); -static void sf_txeof __P((struct sf_softc *)); -static int sf_encap __P((struct sf_softc *, +static int sf_probe (device_t); +static int sf_attach (device_t); +static int sf_detach (device_t); +static void sf_intr (void *); +static void sf_stats_update (void *); +static void sf_rxeof (struct sf_softc *); +static void sf_txeof (struct sf_softc *); +static int sf_encap (struct sf_softc *, struct sf_tx_bufdesc_type0 *, - struct mbuf *)); -static void sf_start __P((struct ifnet *)); -static int sf_ioctl __P((struct ifnet *, u_long, caddr_t)); -static void sf_init __P((void *)); -static void sf_stop __P((struct sf_softc *)); -static void sf_watchdog __P((struct ifnet *)); -static void sf_shutdown __P((device_t)); -static int sf_ifmedia_upd __P((struct ifnet *)); -static void sf_ifmedia_sts __P((struct ifnet *, struct ifmediareq *)); -static void sf_reset __P((struct sf_softc *)); -static int sf_init_rx_ring __P((struct sf_softc *)); -static void sf_init_tx_ring __P((struct sf_softc *)); -static int sf_newbuf __P((struct sf_softc *, + struct mbuf *); +static void sf_start (struct ifnet *); +static int sf_ioctl (struct ifnet *, u_long, caddr_t); +static void sf_init (void *); +static void sf_stop (struct sf_softc *); +static void sf_watchdog (struct ifnet *); +static void sf_shutdown (device_t); +static int sf_ifmedia_upd (struct ifnet *); +static void sf_ifmedia_sts (struct ifnet *, struct ifmediareq *); +static void sf_reset (struct sf_softc *); +static int sf_init_rx_ring (struct sf_softc *); +static void sf_init_tx_ring (struct sf_softc *); +static int sf_newbuf (struct sf_softc *, struct sf_rx_bufdesc_type0 *, - struct mbuf *)); -static void sf_setmulti __P((struct sf_softc *)); -static int sf_setperf __P((struct sf_softc *, int, caddr_t)); -static int sf_sethash __P((struct sf_softc *, caddr_t, int)); + struct mbuf *); +static void sf_setmulti (struct sf_softc *); +static int sf_setperf (struct sf_softc *, int, caddr_t); +static int sf_sethash (struct sf_softc *, caddr_t, int); #ifdef notdef -static int sf_setvlan __P((struct sf_softc *, int, u_int32_t)); +static int sf_setvlan (struct sf_softc *, int, u_int32_t); #endif -static u_int8_t sf_read_eeprom __P((struct sf_softc *, int)); -static u_int32_t sf_calchash __P((caddr_t)); +static u_int8_t sf_read_eeprom (struct sf_softc *, int); +static u_int32_t sf_calchash (caddr_t); -static int sf_miibus_readreg __P((device_t, int, int)); -static int sf_miibus_writereg __P((device_t, int, int, int)); -static void sf_miibus_statchg __P((device_t)); +static int sf_miibus_readreg (device_t, int, int); +static int sf_miibus_writereg (device_t, int, int, int); +static void sf_miibus_statchg (device_t); -static u_int32_t csr_read_4 __P((struct sf_softc *, int)); -static void csr_write_4 __P((struct sf_softc *, int, u_int32_t)); -static void sf_txthresh_adjust __P((struct sf_softc *)); +static u_int32_t csr_read_4 (struct sf_softc *, int); +static void csr_write_4 (struct sf_softc *, int, u_int32_t); +static void sf_txthresh_adjust (struct sf_softc *); #ifdef SF_USEIOSPACE #define SF_RES SYS_RES_IOPORT diff --git a/sys/pci/if_sis.c b/sys/pci/if_sis.c index 645c5e744933..333210cf12a0 100644 --- a/sys/pci/if_sis.c +++ b/sys/pci/if_sis.c @@ -113,60 +113,55 @@ static struct sis_type sis_devs[] = { { 0, 0, NULL } }; -static int sis_probe __P((device_t)); -static int sis_attach __P((device_t)); -static int sis_detach __P((device_t)); - -static int sis_newbuf __P((struct sis_softc *, - struct sis_desc *, - struct mbuf *)); -static int sis_encap __P((struct sis_softc *, - struct mbuf *, u_int32_t *)); -static void sis_rxeof __P((struct sis_softc *)); -static void sis_rxeoc __P((struct sis_softc *)); -static void sis_txeof __P((struct sis_softc *)); -static void sis_intr __P((void *)); -static void sis_tick __P((void *)); -static void sis_start __P((struct ifnet *)); -static int sis_ioctl __P((struct ifnet *, u_long, caddr_t)); -static void sis_init __P((void *)); -static void sis_stop __P((struct sis_softc *)); -static void sis_watchdog __P((struct ifnet *)); -static void sis_shutdown __P((device_t)); -static int sis_ifmedia_upd __P((struct ifnet *)); -static void sis_ifmedia_sts __P((struct ifnet *, struct ifmediareq *)); - -static u_int16_t sis_reverse __P((u_int16_t)); -static void sis_delay __P((struct sis_softc *)); -static void sis_eeprom_idle __P((struct sis_softc *)); -static void sis_eeprom_putbyte __P((struct sis_softc *, int)); -static void sis_eeprom_getword __P((struct sis_softc *, int, u_int16_t *)); -static void sis_read_eeprom __P((struct sis_softc *, caddr_t, int, - int, int)); +static int sis_probe (device_t); +static int sis_attach (device_t); +static int sis_detach (device_t); + +static int sis_newbuf (struct sis_softc *, + struct sis_desc *, struct mbuf *); +static int sis_encap (struct sis_softc *, + struct mbuf *, u_int32_t *); +static void sis_rxeof (struct sis_softc *); +static void sis_rxeoc (struct sis_softc *); +static void sis_txeof (struct sis_softc *); +static void sis_intr (void *); +static void sis_tick (void *); +static void sis_start (struct ifnet *); +static int sis_ioctl (struct ifnet *, u_long, caddr_t); +static void sis_init (void *); +static void sis_stop (struct sis_softc *); +static void sis_watchdog (struct ifnet *); +static void sis_shutdown (device_t); +static int sis_ifmedia_upd (struct ifnet *); +static void sis_ifmedia_sts (struct ifnet *, struct ifmediareq *); + +static u_int16_t sis_reverse (u_int16_t); +static void sis_delay (struct sis_softc *); +static void sis_eeprom_idle (struct sis_softc *); +static void sis_eeprom_putbyte (struct sis_softc *, int); +static void sis_eeprom_getword (struct sis_softc *, int, u_int16_t *); +static void sis_read_eeprom (struct sis_softc *, caddr_t, int, int, int); #ifdef __i386__ -static void sis_read_cmos __P((struct sis_softc *, device_t, caddr_t, - int, int)); -static void sis_read_mac __P((struct sis_softc *, device_t, caddr_t)); -static device_t sis_find_bridge __P((device_t)); +static void sis_read_cmos (struct sis_softc *, device_t, caddr_t, + int, int); +static void sis_read_mac (struct sis_softc *, device_t, caddr_t); +static device_t sis_find_bridge (device_t); #endif -static int sis_miibus_readreg __P((device_t, int, int)); -static int sis_miibus_writereg __P((device_t, int, int, int)); -static void sis_miibus_statchg __P((device_t)); - -static void sis_setmulti_sis __P((struct sis_softc *)); -static void sis_setmulti_ns __P((struct sis_softc *)); -static u_int32_t sis_crc __P((struct sis_softc *, caddr_t)); -static void sis_reset __P((struct sis_softc *)); -static int sis_list_rx_init __P((struct sis_softc *)); -static int sis_list_tx_init __P((struct sis_softc *)); - -static void sis_dma_map_desc_ptr __P((void *, bus_dma_segment_t *, - int, int)); -static void sis_dma_map_desc_next __P((void *, bus_dma_segment_t *, - int, int)); -static void sis_dma_map_ring __P((void *, bus_dma_segment_t *, - int, int)); +static int sis_miibus_readreg (device_t, int, int); +static int sis_miibus_writereg (device_t, int, int, int); +static void sis_miibus_statchg (device_t); + +static void sis_setmulti_sis (struct sis_softc *); +static void sis_setmulti_ns (struct sis_softc *); +static u_int32_t sis_crc (struct sis_softc *, caddr_t); +static void sis_reset (struct sis_softc *); +static int sis_list_rx_init (struct sis_softc *); +static int sis_list_tx_init (struct sis_softc *); + +static void sis_dma_map_desc_ptr (void *, bus_dma_segment_t *, int, int); +static void sis_dma_map_desc_next (void *, bus_dma_segment_t *, int, int); +static void sis_dma_map_ring (void *, bus_dma_segment_t *, int, int); #ifdef SIS_USEIOSPACE #define SIS_RES SYS_RES_IOPORT #define SIS_RID SIS_PCI_LOIO diff --git a/sys/pci/if_sk.c b/sys/pci/if_sk.c index 5ba23f520826..6c39da2cfc98 100644 --- a/sys/pci/if_sk.c +++ b/sys/pci/if_sk.c @@ -121,55 +121,54 @@ static struct sk_type sk_devs[] = { { 0, 0, NULL } }; -static int sk_probe __P((device_t)); -static int sk_attach __P((device_t)); -static int sk_detach __P((device_t)); -static int sk_detach_xmac __P((device_t)); -static int sk_probe_xmac __P((device_t)); -static int sk_attach_xmac __P((device_t)); -static void sk_tick __P((void *)); -static void sk_intr __P((void *)); -static void sk_intr_xmac __P((struct sk_if_softc *)); -static void sk_intr_bcom __P((struct sk_if_softc *)); -static void sk_rxeof __P((struct sk_if_softc *)); -static void sk_txeof __P((struct sk_if_softc *)); -static int sk_encap __P((struct sk_if_softc *, struct mbuf *, - u_int32_t *)); -static void sk_start __P((struct ifnet *)); -static int sk_ioctl __P((struct ifnet *, u_long, caddr_t)); -static void sk_init __P((void *)); -static void sk_init_xmac __P((struct sk_if_softc *)); -static void sk_stop __P((struct sk_if_softc *)); -static void sk_watchdog __P((struct ifnet *)); -static void sk_shutdown __P((device_t)); -static int sk_ifmedia_upd __P((struct ifnet *)); -static void sk_ifmedia_sts __P((struct ifnet *, struct ifmediareq *)); -static void sk_reset __P((struct sk_softc *)); -static int sk_newbuf __P((struct sk_if_softc *, - struct sk_chain *, struct mbuf *)); -static int sk_alloc_jumbo_mem __P((struct sk_if_softc *)); -static void *sk_jalloc __P((struct sk_if_softc *)); -static void sk_jfree __P((caddr_t, void *)); -static int sk_init_rx_ring __P((struct sk_if_softc *)); -static void sk_init_tx_ring __P((struct sk_if_softc *)); -static u_int32_t sk_win_read_4 __P((struct sk_softc *, int)); -static u_int16_t sk_win_read_2 __P((struct sk_softc *, int)); -static u_int8_t sk_win_read_1 __P((struct sk_softc *, int)); -static void sk_win_write_4 __P((struct sk_softc *, int, u_int32_t)); -static void sk_win_write_2 __P((struct sk_softc *, int, u_int32_t)); -static void sk_win_write_1 __P((struct sk_softc *, int, u_int32_t)); -static u_int8_t sk_vpd_readbyte __P((struct sk_softc *, int)); -static void sk_vpd_read_res __P((struct sk_softc *, - struct vpd_res *, int)); -static void sk_vpd_read __P((struct sk_softc *)); - -static int sk_miibus_readreg __P((device_t, int, int)); -static int sk_miibus_writereg __P((device_t, int, int, int)); -static void sk_miibus_statchg __P((device_t)); - -static u_int32_t sk_calchash __P((caddr_t)); -static void sk_setfilt __P((struct sk_if_softc *, caddr_t, int)); -static void sk_setmulti __P((struct sk_if_softc *)); +static int sk_probe (device_t); +static int sk_attach (device_t); +static int sk_detach (device_t); +static int sk_detach_xmac (device_t); +static int sk_probe_xmac (device_t); +static int sk_attach_xmac (device_t); +static void sk_tick (void *); +static void sk_intr (void *); +static void sk_intr_xmac (struct sk_if_softc *); +static void sk_intr_bcom (struct sk_if_softc *); +static void sk_rxeof (struct sk_if_softc *); +static void sk_txeof (struct sk_if_softc *); +static int sk_encap (struct sk_if_softc *, struct mbuf *, + u_int32_t *); +static void sk_start (struct ifnet *); +static int sk_ioctl (struct ifnet *, u_long, caddr_t); +static void sk_init (void *); +static void sk_init_xmac (struct sk_if_softc *); +static void sk_stop (struct sk_if_softc *); +static void sk_watchdog (struct ifnet *); +static void sk_shutdown (device_t); +static int sk_ifmedia_upd (struct ifnet *); +static void sk_ifmedia_sts (struct ifnet *, struct ifmediareq *); +static void sk_reset (struct sk_softc *); +static int sk_newbuf (struct sk_if_softc *, + struct sk_chain *, struct mbuf *); +static int sk_alloc_jumbo_mem (struct sk_if_softc *); +static void *sk_jalloc (struct sk_if_softc *); +static void sk_jfree (caddr_t, void *); +static int sk_init_rx_ring (struct sk_if_softc *); +static void sk_init_tx_ring (struct sk_if_softc *); +static u_int32_t sk_win_read_4 (struct sk_softc *, int); +static u_int16_t sk_win_read_2 (struct sk_softc *, int); +static u_int8_t sk_win_read_1 (struct sk_softc *, int); +static void sk_win_write_4 (struct sk_softc *, int, u_int32_t); +static void sk_win_write_2 (struct sk_softc *, int, u_int32_t); +static void sk_win_write_1 (struct sk_softc *, int, u_int32_t); +static u_int8_t sk_vpd_readbyte (struct sk_softc *, int); +static void sk_vpd_read_res (struct sk_softc *, struct vpd_res *, int); +static void sk_vpd_read (struct sk_softc *); + +static int sk_miibus_readreg (device_t, int, int); +static int sk_miibus_writereg (device_t, int, int, int); +static void sk_miibus_statchg (device_t); + +static u_int32_t sk_calchash (caddr_t); +static void sk_setfilt (struct sk_if_softc *, caddr_t, int); +static void sk_setmulti (struct sk_if_softc *); #ifdef SK_USEIOSPACE #define SK_RES SYS_RES_IOPORT diff --git a/sys/pci/if_ste.c b/sys/pci/if_ste.c index 4088a605c87e..0473ca8603aa 100644 --- a/sys/pci/if_ste.c +++ b/sys/pci/if_ste.c @@ -86,47 +86,44 @@ static struct ste_type ste_devs[] = { { 0, 0, NULL } }; -static int ste_probe __P((device_t)); -static int ste_attach __P((device_t)); -static int ste_detach __P((device_t)); -static void ste_init __P((void *)); -static void ste_intr __P((void *)); -static void ste_rxeof __P((struct ste_softc *)); -static void ste_txeoc __P((struct ste_softc *)); -static void ste_txeof __P((struct ste_softc *)); -static void ste_stats_update __P((void *)); -static void ste_stop __P((struct ste_softc *)); -static void ste_reset __P((struct ste_softc *)); -static int ste_ioctl __P((struct ifnet *, u_long, caddr_t)); -static int ste_encap __P((struct ste_softc *, struct ste_chain *, - struct mbuf *)); -static void ste_start __P((struct ifnet *)); -static void ste_watchdog __P((struct ifnet *)); -static void ste_shutdown __P((device_t)); -static int ste_newbuf __P((struct ste_softc *, +static int ste_probe (device_t); +static int ste_attach (device_t); +static int ste_detach (device_t); +static void ste_init (void *); +static void ste_intr (void *); +static void ste_rxeof (struct ste_softc *); +static void ste_txeoc (struct ste_softc *); +static void ste_txeof (struct ste_softc *); +static void ste_stats_update (void *); +static void ste_stop (struct ste_softc *); +static void ste_reset (struct ste_softc *); +static int ste_ioctl (struct ifnet *, u_long, caddr_t); +static int ste_encap (struct ste_softc *, struct ste_chain *, + struct mbuf *); +static void ste_start (struct ifnet *); +static void ste_watchdog (struct ifnet *); +static void ste_shutdown (device_t); +static int ste_newbuf (struct ste_softc *, struct ste_chain_onefrag *, - struct mbuf *)); -static int ste_ifmedia_upd __P((struct ifnet *)); -static void ste_ifmedia_sts __P((struct ifnet *, struct ifmediareq *)); - -static void ste_mii_sync __P((struct ste_softc *)); -static void ste_mii_send __P((struct ste_softc *, u_int32_t, int)); -static int ste_mii_readreg __P((struct ste_softc *, - struct ste_mii_frame *)); -static int ste_mii_writereg __P((struct ste_softc *, - struct ste_mii_frame *)); -static int ste_miibus_readreg __P((device_t, int, int)); -static int ste_miibus_writereg __P((device_t, int, int, int)); -static void ste_miibus_statchg __P((device_t)); - -static int ste_eeprom_wait __P((struct ste_softc *)); -static int ste_read_eeprom __P((struct ste_softc *, caddr_t, int, - int, int)); -static void ste_wait __P((struct ste_softc *)); -static u_int8_t ste_calchash __P((caddr_t)); -static void ste_setmulti __P((struct ste_softc *)); -static int ste_init_rx_list __P((struct ste_softc *)); -static void ste_init_tx_list __P((struct ste_softc *)); + struct mbuf *); +static int ste_ifmedia_upd (struct ifnet *); +static void ste_ifmedia_sts (struct ifnet *, struct ifmediareq *); + +static void ste_mii_sync (struct ste_softc *); +static void ste_mii_send (struct ste_softc *, u_int32_t, int); +static int ste_mii_readreg (struct ste_softc *, struct ste_mii_frame *); +static int ste_mii_writereg (struct ste_softc *, struct ste_mii_frame *); +static int ste_miibus_readreg (device_t, int, int); +static int ste_miibus_writereg (device_t, int, int, int); +static void ste_miibus_statchg (device_t); + +static int ste_eeprom_wait (struct ste_softc *); +static int ste_read_eeprom (struct ste_softc *, caddr_t, int, int, int); +static void ste_wait (struct ste_softc *); +static u_int8_t ste_calchash (caddr_t); +static void ste_setmulti (struct ste_softc *); +static int ste_init_rx_list (struct ste_softc *); +static void ste_init_tx_list (struct ste_softc *); #ifdef STE_USEIOSPACE #define STE_RES SYS_RES_IOPORT diff --git a/sys/pci/if_ti.c b/sys/pci/if_ti.c index 0951e389a2c2..79261058f2c7 100644 --- a/sys/pci/if_ti.c +++ b/sys/pci/if_ti.c @@ -145,61 +145,59 @@ static struct ti_type ti_devs[] = { { 0, 0, NULL } }; -static int ti_probe __P((device_t)); -static int ti_attach __P((device_t)); -static int ti_detach __P((device_t)); -static void ti_txeof __P((struct ti_softc *)); -static void ti_rxeof __P((struct ti_softc *)); - -static void ti_stats_update __P((struct ti_softc *)); -static int ti_encap __P((struct ti_softc *, struct mbuf *, - u_int32_t *)); - -static void ti_intr __P((void *)); -static void ti_start __P((struct ifnet *)); -static int ti_ioctl __P((struct ifnet *, u_long, caddr_t)); -static void ti_init __P((void *)); -static void ti_init2 __P((struct ti_softc *)); -static void ti_stop __P((struct ti_softc *)); -static void ti_watchdog __P((struct ifnet *)); -static void ti_shutdown __P((device_t)); -static int ti_ifmedia_upd __P((struct ifnet *)); -static void ti_ifmedia_sts __P((struct ifnet *, struct ifmediareq *)); - -static u_int32_t ti_eeprom_putbyte __P((struct ti_softc *, int)); -static u_int8_t ti_eeprom_getbyte __P((struct ti_softc *, - int, u_int8_t *)); -static int ti_read_eeprom __P((struct ti_softc *, caddr_t, int, int)); - -static void ti_add_mcast __P((struct ti_softc *, struct ether_addr *)); -static void ti_del_mcast __P((struct ti_softc *, struct ether_addr *)); -static void ti_setmulti __P((struct ti_softc *)); - -static void ti_mem __P((struct ti_softc *, u_int32_t, - u_int32_t, caddr_t)); -static void ti_loadfw __P((struct ti_softc *)); -static void ti_cmd __P((struct ti_softc *, struct ti_cmd_desc *)); -static void ti_cmd_ext __P((struct ti_softc *, struct ti_cmd_desc *, - caddr_t, int)); -static void ti_handle_events __P((struct ti_softc *)); -static int ti_alloc_jumbo_mem __P((struct ti_softc *)); -static void *ti_jalloc __P((struct ti_softc *)); -static void ti_jfree __P((caddr_t, void *)); -static int ti_newbuf_std __P((struct ti_softc *, int, struct mbuf *)); -static int ti_newbuf_mini __P((struct ti_softc *, int, struct mbuf *)); -static int ti_newbuf_jumbo __P((struct ti_softc *, int, struct mbuf *)); -static int ti_init_rx_ring_std __P((struct ti_softc *)); -static void ti_free_rx_ring_std __P((struct ti_softc *)); -static int ti_init_rx_ring_jumbo __P((struct ti_softc *)); -static void ti_free_rx_ring_jumbo __P((struct ti_softc *)); -static int ti_init_rx_ring_mini __P((struct ti_softc *)); -static void ti_free_rx_ring_mini __P((struct ti_softc *)); -static void ti_free_tx_ring __P((struct ti_softc *)); -static int ti_init_tx_ring __P((struct ti_softc *)); - -static int ti_64bitslot_war __P((struct ti_softc *)); -static int ti_chipinit __P((struct ti_softc *)); -static int ti_gibinit __P((struct ti_softc *)); +static int ti_probe (device_t); +static int ti_attach (device_t); +static int ti_detach (device_t); +static void ti_txeof (struct ti_softc *); +static void ti_rxeof (struct ti_softc *); + +static void ti_stats_update (struct ti_softc *); +static int ti_encap (struct ti_softc *, struct mbuf *, u_int32_t *); + +static void ti_intr (void *); +static void ti_start (struct ifnet *); +static int ti_ioctl (struct ifnet *, u_long, caddr_t); +static void ti_init (void *); +static void ti_init2 (struct ti_softc *); +static void ti_stop (struct ti_softc *); +static void ti_watchdog (struct ifnet *); +static void ti_shutdown (device_t); +static int ti_ifmedia_upd (struct ifnet *); +static void ti_ifmedia_sts (struct ifnet *, struct ifmediareq *); + +static u_int32_t ti_eeprom_putbyte (struct ti_softc *, int); +static u_int8_t ti_eeprom_getbyte (struct ti_softc *, int, u_int8_t *); +static int ti_read_eeprom (struct ti_softc *, caddr_t, int, int); + +static void ti_add_mcast (struct ti_softc *, struct ether_addr *); +static void ti_del_mcast (struct ti_softc *, struct ether_addr *); +static void ti_setmulti (struct ti_softc *); + +static void ti_mem (struct ti_softc *, u_int32_t, + u_int32_t, caddr_t); +static void ti_loadfw (struct ti_softc *); +static void ti_cmd (struct ti_softc *, struct ti_cmd_desc *); +static void ti_cmd_ext (struct ti_softc *, struct ti_cmd_desc *, + caddr_t, int); +static void ti_handle_events (struct ti_softc *); +static int ti_alloc_jumbo_mem (struct ti_softc *); +static void *ti_jalloc (struct ti_softc *); +static void ti_jfree (caddr_t, void *); +static int ti_newbuf_std (struct ti_softc *, int, struct mbuf *); +static int ti_newbuf_mini (struct ti_softc *, int, struct mbuf *); +static int ti_newbuf_jumbo (struct ti_softc *, int, struct mbuf *); +static int ti_init_rx_ring_std (struct ti_softc *); +static void ti_free_rx_ring_std (struct ti_softc *); +static int ti_init_rx_ring_jumbo (struct ti_softc *); +static void ti_free_rx_ring_jumbo (struct ti_softc *); +static int ti_init_rx_ring_mini (struct ti_softc *); +static void ti_free_rx_ring_mini (struct ti_softc *); +static void ti_free_tx_ring (struct ti_softc *); +static int ti_init_tx_ring (struct ti_softc *); + +static int ti_64bitslot_war (struct ti_softc *); +static int ti_chipinit (struct ti_softc *); +static int ti_gibinit (struct ti_softc *); static device_method_t ti_methods[] = { /* Device interface */ diff --git a/sys/pci/if_tl.c b/sys/pci/if_tl.c index 8bc0827a5571..7d19023480d3 100644 --- a/sys/pci/if_tl.c +++ b/sys/pci/if_tl.c @@ -264,64 +264,62 @@ static struct tl_type tl_devs[] = { { 0, 0, NULL } }; -static int tl_probe __P((device_t)); -static int tl_attach __P((device_t)); -static int tl_detach __P((device_t)); -static int tl_intvec_rxeoc __P((void *, u_int32_t)); -static int tl_intvec_txeoc __P((void *, u_int32_t)); -static int tl_intvec_txeof __P((void *, u_int32_t)); -static int tl_intvec_rxeof __P((void *, u_int32_t)); -static int tl_intvec_adchk __P((void *, u_int32_t)); -static int tl_intvec_netsts __P((void *, u_int32_t)); - -static int tl_newbuf __P((struct tl_softc *, - struct tl_chain_onefrag *)); -static void tl_stats_update __P((void *)); -static int tl_encap __P((struct tl_softc *, struct tl_chain *, - struct mbuf *)); - -static void tl_intr __P((void *)); -static void tl_start __P((struct ifnet *)); -static int tl_ioctl __P((struct ifnet *, u_long, caddr_t)); -static void tl_init __P((void *)); -static void tl_stop __P((struct tl_softc *)); -static void tl_watchdog __P((struct ifnet *)); -static void tl_shutdown __P((device_t)); -static int tl_ifmedia_upd __P((struct ifnet *)); -static void tl_ifmedia_sts __P((struct ifnet *, struct ifmediareq *)); - -static u_int8_t tl_eeprom_putbyte __P((struct tl_softc *, int)); -static u_int8_t tl_eeprom_getbyte __P((struct tl_softc *, - int, u_int8_t *)); -static int tl_read_eeprom __P((struct tl_softc *, caddr_t, int, int)); - -static void tl_mii_sync __P((struct tl_softc *)); -static void tl_mii_send __P((struct tl_softc *, u_int32_t, int)); -static int tl_mii_readreg __P((struct tl_softc *, struct tl_mii_frame *)); -static int tl_mii_writereg __P((struct tl_softc *, struct tl_mii_frame *)); -static int tl_miibus_readreg __P((device_t, int, int)); -static int tl_miibus_writereg __P((device_t, int, int, int)); -static void tl_miibus_statchg __P((device_t)); - -static void tl_setmode __P((struct tl_softc *, int)); -static int tl_calchash __P((caddr_t)); -static void tl_setmulti __P((struct tl_softc *)); -static void tl_setfilt __P((struct tl_softc *, caddr_t, int)); -static void tl_softreset __P((struct tl_softc *, int)); -static void tl_hardreset __P((device_t)); -static int tl_list_rx_init __P((struct tl_softc *)); -static int tl_list_tx_init __P((struct tl_softc *)); - -static u_int8_t tl_dio_read8 __P((struct tl_softc *, int)); -static u_int16_t tl_dio_read16 __P((struct tl_softc *, int)); -static u_int32_t tl_dio_read32 __P((struct tl_softc *, int)); -static void tl_dio_write8 __P((struct tl_softc *, int, int)); -static void tl_dio_write16 __P((struct tl_softc *, int, int)); -static void tl_dio_write32 __P((struct tl_softc *, int, int)); -static void tl_dio_setbit __P((struct tl_softc *, int, int)); -static void tl_dio_clrbit __P((struct tl_softc *, int, int)); -static void tl_dio_setbit16 __P((struct tl_softc *, int, int)); -static void tl_dio_clrbit16 __P((struct tl_softc *, int, int)); +static int tl_probe (device_t); +static int tl_attach (device_t); +static int tl_detach (device_t); +static int tl_intvec_rxeoc (void *, u_int32_t); +static int tl_intvec_txeoc (void *, u_int32_t); +static int tl_intvec_txeof (void *, u_int32_t); +static int tl_intvec_rxeof (void *, u_int32_t); +static int tl_intvec_adchk (void *, u_int32_t); +static int tl_intvec_netsts (void *, u_int32_t); + +static int tl_newbuf (struct tl_softc *, struct tl_chain_onefrag *); +static void tl_stats_update (void *); +static int tl_encap (struct tl_softc *, struct tl_chain *, + struct mbuf *); + +static void tl_intr (void *); +static void tl_start (struct ifnet *); +static int tl_ioctl (struct ifnet *, u_long, caddr_t); +static void tl_init (void *); +static void tl_stop (struct tl_softc *); +static void tl_watchdog (struct ifnet *); +static void tl_shutdown (device_t); +static int tl_ifmedia_upd (struct ifnet *); +static void tl_ifmedia_sts (struct ifnet *, struct ifmediareq *); + +static u_int8_t tl_eeprom_putbyte (struct tl_softc *, int); +static u_int8_t tl_eeprom_getbyte (struct tl_softc *, int, u_int8_t *); +static int tl_read_eeprom (struct tl_softc *, caddr_t, int, int); + +static void tl_mii_sync (struct tl_softc *); +static void tl_mii_send (struct tl_softc *, u_int32_t, int); +static int tl_mii_readreg (struct tl_softc *, struct tl_mii_frame *); +static int tl_mii_writereg (struct tl_softc *, struct tl_mii_frame *); +static int tl_miibus_readreg (device_t, int, int); +static int tl_miibus_writereg (device_t, int, int, int); +static void tl_miibus_statchg (device_t); + +static void tl_setmode (struct tl_softc *, int); +static int tl_calchash (caddr_t); +static void tl_setmulti (struct tl_softc *); +static void tl_setfilt (struct tl_softc *, caddr_t, int); +static void tl_softreset (struct tl_softc *, int); +static void tl_hardreset (device_t); +static int tl_list_rx_init (struct tl_softc *); +static int tl_list_tx_init (struct tl_softc *); + +static u_int8_t tl_dio_read8 (struct tl_softc *, int); +static u_int16_t tl_dio_read16 (struct tl_softc *, int); +static u_int32_t tl_dio_read32 (struct tl_softc *, int); +static void tl_dio_write8 (struct tl_softc *, int, int); +static void tl_dio_write16 (struct tl_softc *, int, int); +static void tl_dio_write32 (struct tl_softc *, int, int); +static void tl_dio_setbit (struct tl_softc *, int, int); +static void tl_dio_clrbit (struct tl_softc *, int, int); +static void tl_dio_setbit16 (struct tl_softc *, int, int); +static void tl_dio_clrbit16 (struct tl_softc *, int, int); #ifdef TL_USEIOSPACE #define TL_RES SYS_RES_IOPORT diff --git a/sys/pci/if_tx.c b/sys/pci/if_tx.c index ba4121df291b..61513585fea6 100644 --- a/sys/pci/if_tx.c +++ b/sys/pci/if_tx.c @@ -141,39 +141,39 @@ MODULE_DEPEND(tx, miibus, 1, 1, 1); #define EPIC_INTR_RET_TYPE int #endif -static int epic_ifioctl __P((register struct ifnet *, u_long, caddr_t)); -static EPIC_INTR_RET_TYPE epic_intr __P((void *)); -static int epic_common_attach __P((epic_softc_t *)); -static void epic_ifstart __P((struct ifnet *)); -static void epic_ifwatchdog __P((struct ifnet *)); -static int epic_init __P((epic_softc_t *)); -static void epic_stop __P((epic_softc_t *)); -static void epic_rx_done __P((epic_softc_t *)); -static void epic_tx_done __P((epic_softc_t *)); -static int epic_init_rings __P((epic_softc_t *)); -static void epic_free_rings __P((epic_softc_t *)); -static void epic_stop_activity __P((epic_softc_t *)); -static void epic_start_activity __P((epic_softc_t *)); -static void epic_set_rx_mode __P((epic_softc_t *)); -static void epic_set_tx_mode __P((epic_softc_t *)); -static void epic_set_mc_table __P((epic_softc_t *)); -static int epic_read_eeprom __P((epic_softc_t *,u_int16_t)); -static void epic_output_eepromw __P((epic_softc_t *, u_int16_t)); -static u_int16_t epic_input_eepromw __P((epic_softc_t *)); -static u_int8_t epic_eeprom_clock __P((epic_softc_t *,u_int8_t)); -static void epic_write_eepromreg __P((epic_softc_t *,u_int8_t)); -static u_int8_t epic_read_eepromreg __P((epic_softc_t *)); - -static int epic_read_phy_reg __P((epic_softc_t *, int, int)); -static void epic_write_phy_reg __P((epic_softc_t *, int, int, int)); - -static int epic_miibus_readreg __P((device_t, int, int)); -static int epic_miibus_writereg __P((device_t, int, int, int)); -static void epic_miibus_statchg __P((device_t)); -static void epic_miibus_mediainit __P((device_t)); - -static int epic_ifmedia_upd __P((struct ifnet *)); -static void epic_ifmedia_sts __P((struct ifnet *, struct ifmediareq *)); +static int epic_ifioctl(register struct ifnet *, u_long, caddr_t); +static EPIC_INTR_RET_TYPE epic_intr(void *); +static int epic_common_attach(epic_softc_t *); +static void epic_ifstart(struct ifnet *); +static void epic_ifwatchdog(struct ifnet *); +static int epic_init(epic_softc_t *); +static void epic_stop(epic_softc_t *); +static void epic_rx_done(epic_softc_t *); +static void epic_tx_done(epic_softc_t *); +static int epic_init_rings(epic_softc_t *); +static void epic_free_rings(epic_softc_t *); +static void epic_stop_activity(epic_softc_t *); +static void epic_start_activity(epic_softc_t *); +static void epic_set_rx_mode(epic_softc_t *); +static void epic_set_tx_mode(epic_softc_t *); +static void epic_set_mc_table(epic_softc_t *); +static int epic_read_eeprom(epic_softc_t *,u_int16_t); +static void epic_output_eepromw(epic_softc_t *, u_int16_t); +static u_int16_t epic_input_eepromw(epic_softc_t *); +static u_int8_t epic_eeprom_clock(epic_softc_t *,u_int8_t); +static void epic_write_eepromreg(epic_softc_t *,u_int8_t); +static u_int8_t epic_read_eepromreg(epic_softc_t *); + +static int epic_read_phy_reg(epic_softc_t *, int, int); +static void epic_write_phy_reg(epic_softc_t *, int, int, int); + +static int epic_miibus_readreg(device_t, int, int); +static int epic_miibus_writereg(device_t, int, int, int); +static void epic_miibus_statchg(device_t); +static void epic_miibus_mediainit(device_t); + +static int epic_ifmedia_upd(struct ifnet *); +static void epic_ifmedia_sts(struct ifnet *, struct ifmediareq *); /* ------------------------------------------------------------------------- OS-specific part @@ -182,9 +182,9 @@ static void epic_ifmedia_sts __P((struct ifnet *, struct ifmediareq *)); #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 @@ -333,11 +333,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/pci/if_vr.c b/sys/pci/if_vr.c index 0956396835ac..33a68971fa4f 100644 --- a/sys/pci/if_vr.c +++ b/sys/pci/if_vr.c @@ -121,45 +121,45 @@ static struct vr_type vr_devs[] = { { 0, 0, NULL } }; -static int vr_probe __P((device_t)); -static int vr_attach __P((device_t)); -static int vr_detach __P((device_t)); +static int vr_probe (device_t); +static int vr_attach (device_t); +static int vr_detach (device_t); -static int vr_newbuf __P((struct vr_softc *, +static int vr_newbuf (struct vr_softc *, struct vr_chain_onefrag *, - struct mbuf *)); -static int vr_encap __P((struct vr_softc *, struct vr_chain *, - struct mbuf * )); - -static void vr_rxeof __P((struct vr_softc *)); -static void vr_rxeoc __P((struct vr_softc *)); -static void vr_txeof __P((struct vr_softc *)); -static void vr_txeoc __P((struct vr_softc *)); -static void vr_tick __P((void *)); -static void vr_intr __P((void *)); -static void vr_start __P((struct ifnet *)); -static int vr_ioctl __P((struct ifnet *, u_long, caddr_t)); -static void vr_init __P((void *)); -static void vr_stop __P((struct vr_softc *)); -static void vr_watchdog __P((struct ifnet *)); -static void vr_shutdown __P((device_t)); -static int vr_ifmedia_upd __P((struct ifnet *)); -static void vr_ifmedia_sts __P((struct ifnet *, struct ifmediareq *)); - -static void vr_mii_sync __P((struct vr_softc *)); -static void vr_mii_send __P((struct vr_softc *, u_int32_t, int)); -static int vr_mii_readreg __P((struct vr_softc *, struct vr_mii_frame *)); -static int vr_mii_writereg __P((struct vr_softc *, struct vr_mii_frame *)); -static int vr_miibus_readreg __P((device_t, int, int)); -static int vr_miibus_writereg __P((device_t, int, int, int)); -static void vr_miibus_statchg __P((device_t)); - -static void vr_setcfg __P((struct vr_softc *, int)); -static u_int8_t vr_calchash __P((u_int8_t *)); -static void vr_setmulti __P((struct vr_softc *)); -static void vr_reset __P((struct vr_softc *)); -static int vr_list_rx_init __P((struct vr_softc *)); -static int vr_list_tx_init __P((struct vr_softc *)); + struct mbuf *); +static int vr_encap (struct vr_softc *, struct vr_chain *, + struct mbuf * ); + +static void vr_rxeof (struct vr_softc *); +static void vr_rxeoc (struct vr_softc *); +static void vr_txeof (struct vr_softc *); +static void vr_txeoc (struct vr_softc *); +static void vr_tick (void *); +static void vr_intr (void *); +static void vr_start (struct ifnet *); +static int vr_ioctl (struct ifnet *, u_long, caddr_t); +static void vr_init (void *); +static void vr_stop (struct vr_softc *); +static void vr_watchdog (struct ifnet *); +static void vr_shutdown (device_t); +static int vr_ifmedia_upd (struct ifnet *); +static void vr_ifmedia_sts (struct ifnet *, struct ifmediareq *); + +static void vr_mii_sync (struct vr_softc *); +static void vr_mii_send (struct vr_softc *, u_int32_t, int); +static int vr_mii_readreg (struct vr_softc *, struct vr_mii_frame *); +static int vr_mii_writereg (struct vr_softc *, struct vr_mii_frame *); +static int vr_miibus_readreg (device_t, int, int); +static int vr_miibus_writereg (device_t, int, int, int); +static void vr_miibus_statchg (device_t); + +static void vr_setcfg (struct vr_softc *, int); +static u_int8_t vr_calchash (u_int8_t *); +static void vr_setmulti (struct vr_softc *); +static void vr_reset (struct vr_softc *); +static int vr_list_rx_init (struct vr_softc *); +static int vr_list_tx_init (struct vr_softc *); #ifdef VR_USEIOSPACE #define VR_RES SYS_RES_IOPORT diff --git a/sys/pci/if_wb.c b/sys/pci/if_wb.c index cd1d43f6b3d1..6f104b6f60e7 100644 --- a/sys/pci/if_wb.c +++ b/sys/pci/if_wb.c @@ -142,52 +142,51 @@ static struct wb_type wb_devs[] = { { 0, 0, NULL } }; -static int wb_probe __P((device_t)); -static int wb_attach __P((device_t)); -static int wb_detach __P((device_t)); +static int wb_probe (device_t); +static int wb_attach (device_t); +static int wb_detach (device_t); -static void wb_bfree __P((caddr_t, void *args)); -static int wb_newbuf __P((struct wb_softc *, +static void wb_bfree (caddr_t, void *args); +static int wb_newbuf (struct wb_softc *, struct wb_chain_onefrag *, - struct mbuf *)); -static int wb_encap __P((struct wb_softc *, struct wb_chain *, - struct mbuf *)); - -static void wb_rxeof __P((struct wb_softc *)); -static void wb_rxeoc __P((struct wb_softc *)); -static void wb_txeof __P((struct wb_softc *)); -static void wb_txeoc __P((struct wb_softc *)); -static void wb_intr __P((void *)); -static void wb_tick __P((void *)); -static void wb_start __P((struct ifnet *)); -static int wb_ioctl __P((struct ifnet *, u_long, caddr_t)); -static void wb_init __P((void *)); -static void wb_stop __P((struct wb_softc *)); -static void wb_watchdog __P((struct ifnet *)); -static void wb_shutdown __P((device_t)); -static int wb_ifmedia_upd __P((struct ifnet *)); -static void wb_ifmedia_sts __P((struct ifnet *, struct ifmediareq *)); - -static void wb_eeprom_putbyte __P((struct wb_softc *, int)); -static void wb_eeprom_getword __P((struct wb_softc *, int, u_int16_t *)); -static void wb_read_eeprom __P((struct wb_softc *, caddr_t, int, - int, int)); -static void wb_mii_sync __P((struct wb_softc *)); -static void wb_mii_send __P((struct wb_softc *, u_int32_t, int)); -static int wb_mii_readreg __P((struct wb_softc *, struct wb_mii_frame *)); -static int wb_mii_writereg __P((struct wb_softc *, struct wb_mii_frame *)); - -static void wb_setcfg __P((struct wb_softc *, u_int32_t)); -static u_int8_t wb_calchash __P((caddr_t)); -static void wb_setmulti __P((struct wb_softc *)); -static void wb_reset __P((struct wb_softc *)); -static void wb_fixmedia __P((struct wb_softc *)); -static int wb_list_rx_init __P((struct wb_softc *)); -static int wb_list_tx_init __P((struct wb_softc *)); - -static int wb_miibus_readreg __P((device_t, int, int)); -static int wb_miibus_writereg __P((device_t, int, int, int)); -static void wb_miibus_statchg __P((device_t)); + struct mbuf *); +static int wb_encap (struct wb_softc *, struct wb_chain *, + struct mbuf *); + +static void wb_rxeof (struct wb_softc *); +static void wb_rxeoc (struct wb_softc *); +static void wb_txeof (struct wb_softc *); +static void wb_txeoc (struct wb_softc *); +static void wb_intr (void *); +static void wb_tick (void *); +static void wb_start (struct ifnet *); +static int wb_ioctl (struct ifnet *, u_long, caddr_t); +static void wb_init (void *); +static void wb_stop (struct wb_softc *); +static void wb_watchdog (struct ifnet *); +static void wb_shutdown (device_t); +static int wb_ifmedia_upd (struct ifnet *); +static void wb_ifmedia_sts (struct ifnet *, struct ifmediareq *); + +static void wb_eeprom_putbyte (struct wb_softc *, int); +static void wb_eeprom_getword (struct wb_softc *, int, u_int16_t *); +static void wb_read_eeprom (struct wb_softc *, caddr_t, int, int, int); +static void wb_mii_sync (struct wb_softc *); +static void wb_mii_send (struct wb_softc *, u_int32_t, int); +static int wb_mii_readreg (struct wb_softc *, struct wb_mii_frame *); +static int wb_mii_writereg (struct wb_softc *, struct wb_mii_frame *); + +static void wb_setcfg (struct wb_softc *, u_int32_t); +static u_int8_t wb_calchash (caddr_t); +static void wb_setmulti (struct wb_softc *); +static void wb_reset (struct wb_softc *); +static void wb_fixmedia (struct wb_softc *); +static int wb_list_rx_init (struct wb_softc *); +static int wb_list_tx_init (struct wb_softc *); + +static int wb_miibus_readreg (device_t, int, int); +static int wb_miibus_writereg (device_t, int, int, int); +static void wb_miibus_statchg (device_t); #ifdef WB_USEIOSPACE #define WB_RES SYS_RES_IOPORT diff --git a/sys/pci/if_xl.c b/sys/pci/if_xl.c index 5624e9c5007f..6a7f6c60d84f 100644 --- a/sys/pci/if_xl.c +++ b/sys/pci/if_xl.c @@ -214,65 +214,63 @@ static struct xl_type xl_devs[] = { { 0, 0, NULL } }; -static int xl_probe __P((device_t)); -static int xl_attach __P((device_t)); -static int xl_detach __P((device_t)); - -static int xl_newbuf __P((struct xl_softc *, - struct xl_chain_onefrag *)); -static void xl_stats_update __P((void *)); -static int xl_encap __P((struct xl_softc *, struct xl_chain *, - struct mbuf * )); -static int xl_encap_90xB __P((struct xl_softc *, struct xl_chain *, - struct mbuf * )); - -static void xl_rxeof __P((struct xl_softc *)); -static int xl_rx_resync __P((struct xl_softc *)); -static void xl_txeof __P((struct xl_softc *)); -static void xl_txeof_90xB __P((struct xl_softc *)); -static void xl_txeoc __P((struct xl_softc *)); -static void xl_intr __P((void *)); -static void xl_start __P((struct ifnet *)); -static void xl_start_90xB __P((struct ifnet *)); -static int xl_ioctl __P((struct ifnet *, u_long, caddr_t)); -static void xl_init __P((void *)); -static void xl_stop __P((struct xl_softc *)); -static void xl_watchdog __P((struct ifnet *)); -static void xl_shutdown __P((device_t)); -static int xl_suspend __P((device_t)); -static int xl_resume __P((device_t)); - -static int xl_ifmedia_upd __P((struct ifnet *)); -static void xl_ifmedia_sts __P((struct ifnet *, struct ifmediareq *)); - -static int xl_eeprom_wait __P((struct xl_softc *)); -static int xl_read_eeprom __P((struct xl_softc *, caddr_t, int, - int, int)); -static void xl_mii_sync __P((struct xl_softc *)); -static void xl_mii_send __P((struct xl_softc *, u_int32_t, int)); -static int xl_mii_readreg __P((struct xl_softc *, struct xl_mii_frame *)); -static int xl_mii_writereg __P((struct xl_softc *, struct xl_mii_frame *)); - -static void xl_setcfg __P((struct xl_softc *)); -static void xl_setmode __P((struct xl_softc *, int)); -static u_int8_t xl_calchash __P((caddr_t)); -static void xl_setmulti __P((struct xl_softc *)); -static void xl_setmulti_hash __P((struct xl_softc *)); -static void xl_reset __P((struct xl_softc *)); -static int xl_list_rx_init __P((struct xl_softc *)); -static int xl_list_tx_init __P((struct xl_softc *)); -static int xl_list_tx_init_90xB __P((struct xl_softc *)); -static void xl_wait __P((struct xl_softc *)); -static void xl_mediacheck __P((struct xl_softc *)); -static void xl_choose_xcvr __P((struct xl_softc *, int)); +static int xl_probe (device_t); +static int xl_attach (device_t); +static int xl_detach (device_t); + +static int xl_newbuf (struct xl_softc *, struct xl_chain_onefrag *); +static void xl_stats_update (void *); +static int xl_encap (struct xl_softc *, struct xl_chain *, + struct mbuf *); +static int xl_encap_90xB (struct xl_softc *, struct xl_chain *, + struct mbuf *); + +static void xl_rxeof (struct xl_softc *); +static int xl_rx_resync (struct xl_softc *); +static void xl_txeof (struct xl_softc *); +static void xl_txeof_90xB (struct xl_softc *); +static void xl_txeoc (struct xl_softc *); +static void xl_intr (void *); +static void xl_start (struct ifnet *); +static void xl_start_90xB (struct ifnet *); +static int xl_ioctl (struct ifnet *, u_long, caddr_t); +static void xl_init (void *); +static void xl_stop (struct xl_softc *); +static void xl_watchdog (struct ifnet *); +static void xl_shutdown (device_t); +static int xl_suspend (device_t); +static int xl_resume (device_t); + +static int xl_ifmedia_upd (struct ifnet *); +static void xl_ifmedia_sts (struct ifnet *, struct ifmediareq *); + +static int xl_eeprom_wait (struct xl_softc *); +static int xl_read_eeprom (struct xl_softc *, caddr_t, int, int, int); +static void xl_mii_sync (struct xl_softc *); +static void xl_mii_send (struct xl_softc *, u_int32_t, int); +static int xl_mii_readreg (struct xl_softc *, struct xl_mii_frame *); +static int xl_mii_writereg (struct xl_softc *, struct xl_mii_frame *); + +static void xl_setcfg (struct xl_softc *); +static void xl_setmode (struct xl_softc *, int); +static u_int8_t xl_calchash (caddr_t); +static void xl_setmulti (struct xl_softc *); +static void xl_setmulti_hash (struct xl_softc *); +static void xl_reset (struct xl_softc *); +static int xl_list_rx_init (struct xl_softc *); +static int xl_list_tx_init (struct xl_softc *); +static int xl_list_tx_init_90xB (struct xl_softc *); +static void xl_wait (struct xl_softc *); +static void xl_mediacheck (struct xl_softc *); +static void xl_choose_xcvr (struct xl_softc *, int); #ifdef notdef -static void xl_testpacket __P((struct xl_softc *)); +static void xl_testpacket (struct xl_softc *); #endif -static int xl_miibus_readreg __P((device_t, int, int)); -static int xl_miibus_writereg __P((device_t, int, int, int)); -static void xl_miibus_statchg __P((device_t)); -static void xl_miibus_mediainit __P((device_t)); +static int xl_miibus_readreg (device_t, int, int); +static int xl_miibus_writereg (device_t, int, int, int); +static void xl_miibus_statchg (device_t); +static void xl_miibus_mediainit (device_t); #ifdef XL_USEIOSPACE #define XL_RES SYS_RES_IOPORT diff --git a/sys/pci/intpm.c b/sys/pci/intpm.c index 5aa9c0199309..a3c780f5c14d 100644 --- a/sys/pci/intpm.c +++ b/sys/pci/intpm.c @@ -642,7 +642,7 @@ intsmb_bread(device_t dev, u_char slave, char cmd, u_char count, char *buf) DRIVER_MODULE(intsmb, intpm , intpm_driver, intsmb_devclass, 0, 0); -static void intpm_intr __P((void *arg)); +static void intpm_intr(void *arg); static int intpm_attach(device_t dev) { diff --git a/sys/pci/meteor.c b/sys/pci/meteor.c index 9020d677be3f..340c70969b86 100644 --- a/sys/pci/meteor.c +++ b/sys/pci/meteor.c @@ -179,7 +179,7 @@ #error "The meteor device requires the old pci compatibility shims" #endif -static void meteor_intr __P((void *arg)); +static void meteor_intr(void *arg); /* * Allocate enough memory for: diff --git a/sys/pci/simos.c b/sys/pci/simos.c index bf12f5a0533c..7944d5e7a539 100644 --- a/sys/pci/simos.c +++ b/sys/pci/simos.c @@ -75,10 +75,10 @@ struct simos_softc* simosp[10]; static u_long simos_unit; -static const char *simos_probe __P((pcici_t tag, pcidi_t type)); -static void simos_attach __P((pcici_t config_d, int unit)); -static void simos_action __P((struct cam_sim *sim, union ccb *ccb)); -static void simos_poll __P((struct cam_sim *sim)); +static const char *simos_probe(pcici_t tag, pcidi_t type); +static void simos_attach(pcici_t config_d, int unit); +static void simos_action(struct cam_sim *sim, union ccb *ccb); +static void simos_poll(struct cam_sim *sim); struct pci_device simos_driver = { "simos", |