From 3264aec746947db8598130cb0ac382cf0b2a10cf Mon Sep 17 00:00:00 2001 From: alfred Date: Wed, 20 Mar 2002 02:08:01 +0000 Subject: Remove __P. --- sys/dev/ct/bshw_machdep.c | 24 ++++++++++++------------ sys/dev/ct/bshwvar.h | 24 ++++++++++++------------ sys/dev/ct/ct.c | 38 +++++++++++++++++++------------------- sys/dev/ct/ct_isa.c | 6 +++--- sys/dev/ct/ct_machdep.h | 16 ++++++++-------- sys/dev/ct/ctvar.h | 22 +++++++++++----------- 6 files changed, 65 insertions(+), 65 deletions(-) (limited to 'sys/dev/ct') diff --git a/sys/dev/ct/bshw_machdep.c b/sys/dev/ct/bshw_machdep.c index c7995ce..199aae5 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 17268f0..9e2259c 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 6c46493..c9c9ef9 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 388ba3f..8098806 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 be10331..f407aa5 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 235990a..4e7ba15 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_ */ -- cgit v1.1