diff options
Diffstat (limited to 'sys/i386')
33 files changed, 438 insertions, 436 deletions
diff --git a/sys/i386/i386/tsc.c b/sys/i386/i386/tsc.c index ae56051..49516028 100644 --- a/sys/i386/i386/tsc.c +++ b/sys/i386/i386/tsc.c @@ -99,8 +99,8 @@ #include <i386/isa/intr_machdep.h> /* The interrupt triggered by the 8254 (timer) chip */ int apic_8254_intr; -static u_long read_intr_count __P((int vec)); -static void setup_8254_mixed_mode __P((void)); +static u_long read_intr_count(int vec); +static void setup_8254_mixed_mode(void); #endif /* @@ -155,7 +155,7 @@ static int i8254_ticked; * timer0_state == 0 case. We should use inthand_add()/inthand_remove() * to switch between clkintr() and a slightly different timerintr(). */ -static void (*new_function) __P((struct clockframe *frame)); +static void (*new_function)(struct clockframe *frame); static u_int new_rate; static u_char rtc_statusa = RTCSA_DIVIDER | RTCSA_NOPROF; static u_char rtc_statusb = RTCSB_24HR | RTCSB_PINTR; @@ -169,10 +169,10 @@ static u_int timer0_prescaler_count; static u_char timer0_state; static u_char timer2_state; -static void (*timer_func) __P((struct clockframe *frame)) = hardclock; +static void (*timer_func)(struct clockframe *frame) = hardclock; -static unsigned i8254_get_timecount __P((struct timecounter *tc)); -static unsigned tsc_get_timecount __P((struct timecounter *tc)); +static unsigned i8254_get_timecount(struct timecounter *tc); +static unsigned tsc_get_timecount(struct timecounter *tc); static void set_timer_freq(u_int freq, int intr_freq); static struct timecounter tsc_timecounter = { @@ -279,7 +279,7 @@ clkintr(struct clockframe frame) * The acquire and release functions must be called at ipl >= splclock(). */ int -acquire_timer0(int rate, void (*function) __P((struct clockframe *frame))) +acquire_timer0(int rate, void (*function)(struct clockframe *frame)) { static int old_rate; diff --git a/sys/i386/isa/bs/bs.c b/sys/i386/isa/bs/bs.c index f091776..27e18cc 100644 --- a/sys/i386/isa/bs/bs.c +++ b/sys/i386/isa/bs/bs.c @@ -53,25 +53,25 @@ * Inline phase funcs *****************************************************************/ /* static inline declare */ -static BS_INLINE struct targ_info *bs_reselect __P((struct bs_softc *)); -static BS_INLINE void bs_sat_continue __P((struct bs_softc *, struct targ_info *, struct bsccb *)); -static BS_INLINE struct targ_info *bs_selected __P((struct bs_softc *, struct targ_info *, struct bsccb *)); -static BS_INLINE u_int8_t bs_read_1byte __P((struct bs_softc *)); -static BS_INLINE void bs_write_1byte __P((struct bs_softc *, u_int8_t)); -static BS_INLINE void bs_commandout __P((struct bs_softc *, struct targ_info *, struct bsccb *)); -static BS_INLINE void bs_status_check __P((struct bs_softc *, struct targ_info *)); -static BS_INLINE void bs_msgin __P((struct bs_softc *, struct targ_info *)); -static BS_INLINE void bs_msgout __P((struct bs_softc *, struct targ_info *, struct bsccb *)); -static BS_INLINE void bs_disconnect_phase __P((struct bs_softc *, struct targ_info *, struct bsccb *)); -static void bs_phase_error __P((struct targ_info *, struct bsccb *)); -static int bs_scsi_cmd_poll_internal __P((struct targ_info *)); -static int bs_xfer __P((struct bs_softc *, char *, int)); -static void bs_io_xfer __P((struct targ_info *)); -static void bs_quick_abort __P((struct targ_info *, u_int)); -static void bs_msgin_error __P((struct targ_info *, u_int)); -static void bs_msgin_ext __P((struct targ_info *)); -static void bs_msg_reject __P((struct targ_info *)); -static void bshoststart __P((struct bs_softc *, struct targ_info *)); +static BS_INLINE struct targ_info *bs_reselect(struct bs_softc *); +static BS_INLINE void bs_sat_continue(struct bs_softc *, struct targ_info *, struct bsccb *); +static BS_INLINE struct targ_info *bs_selected(struct bs_softc *, struct targ_info *, struct bsccb *); +static BS_INLINE u_int8_t bs_read_1byte(struct bs_softc *); +static BS_INLINE void bs_write_1byte(struct bs_softc *, u_int8_t); +static BS_INLINE void bs_commandout(struct bs_softc *, struct targ_info *, struct bsccb *); +static BS_INLINE void bs_status_check(struct bs_softc *, struct targ_info *); +static BS_INLINE void bs_msgin(struct bs_softc *, struct targ_info *); +static BS_INLINE void bs_msgout(struct bs_softc *, struct targ_info *, struct bsccb *); +static BS_INLINE void bs_disconnect_phase(struct bs_softc *, struct targ_info *, struct bsccb *); +static void bs_phase_error(struct targ_info *, struct bsccb *); +static int bs_scsi_cmd_poll_internal(struct targ_info *); +static int bs_xfer(struct bs_softc *, char *, int); +static void bs_io_xfer(struct targ_info *); +static void bs_quick_abort(struct targ_info *, u_int); +static void bs_msgin_error(struct targ_info *, u_int); +static void bs_msgin_ext(struct targ_info *); +static void bs_msg_reject(struct targ_info *); +static void bshoststart(struct bs_softc *, struct targ_info *); /***************************************************************** * SIM interface @@ -1294,7 +1294,7 @@ bs_phase_error(ti, cb) /************************************************** * ### SCSI PHASE SEQUENCER ### **************************************************/ -static BS_INLINE void bs_ack_wait __P((struct bs_softc *, struct targ_info *, struct bsccb *)); +static BS_INLINE void bs_ack_wait(struct bs_softc *, struct targ_info *, struct bsccb *); static BS_INLINE void bs_ack_wait(bsc, ti, cb) diff --git a/sys/i386/isa/bs/bsfunc.c b/sys/i386/isa/bs/bsfunc.c index b23a241..103097e 100644 --- a/sys/i386/isa/bs/bsfunc.c +++ b/sys/i386/isa/bs/bsfunc.c @@ -50,12 +50,12 @@ u_int bs_bounce_used[NTARGETS]; int bs_debug_flag = 0; #endif /* BS_DEBUG */ -static void bs_print_syncmsg __P((struct targ_info *, char*)); -static void bs_timeout_target __P((struct targ_info *)); -static void bs_kill_msg __P((struct bsccb *cb)); +static void bs_print_syncmsg(struct targ_info *, char*); +static void bs_timeout_target(struct targ_info *); +static void bs_kill_msg(struct bsccb *cb); -static int bs_start_target __P((struct targ_info *)); -static int bs_check_target __P((struct targ_info *)); +static int bs_start_target(struct targ_info *); +static int bs_check_target(struct targ_info *); /************************************************************* * CCB diff --git a/sys/i386/isa/bs/bsfunc.h b/sys/i386/isa/bs/bsfunc.h index 13c0686..7cf3d6d 100644 --- a/sys/i386/isa/bs/bsfunc.h +++ b/sys/i386/isa/bs/bsfunc.h @@ -27,6 +27,8 @@ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. + * + * $FreeBSD$ */ /* * Copyright (c) 1994, 1995, 1996 Naofumi HONDA. All rights reserved. @@ -36,50 +38,50 @@ * FUNC **************************************************/ /* timeout */ -void bstimeout __P((void *)); +void bstimeout(void *); /* ctrl setup */ -void bs_setup_ctrl __P((struct targ_info *, u_int, u_int)); -struct targ_info *bs_init_target_info __P((struct bs_softc *, int)); +void bs_setup_ctrl(struct targ_info *, u_int, u_int); +struct targ_info *bs_init_target_info(struct bs_softc *, int); /* msg op */ -int bs_send_msg __P((struct targ_info *, u_int, struct msgbase *, int)); -struct bsccb *bs_request_sense __P((struct targ_info *)); +int bs_send_msg(struct targ_info *, u_int, struct msgbase *, int); +struct bsccb *bs_request_sense(struct targ_info *); /* sync msg op */ -int bs_start_syncmsg __P((struct targ_info *, struct bsccb *, int)); -int bs_send_syncmsg __P((struct targ_info *)); -int bs_analyze_syncmsg __P((struct targ_info *, struct bsccb *)); +int bs_start_syncmsg(struct targ_info *, struct bsccb *, int); +int bs_send_syncmsg(struct targ_info *); +int bs_analyze_syncmsg(struct targ_info *, struct bsccb *); /* reset device */ -void bs_scsibus_start __P((struct bs_softc *)); -void bs_reset_nexus __P((struct bs_softc *)); -struct bsccb *bs_force_abort __P((struct targ_info *)); -void bs_reset_device __P((struct targ_info *)); +void bs_scsibus_start(struct bs_softc *); +void bs_reset_nexus(struct bs_softc *); +struct bsccb *bs_force_abort(struct targ_info *); +void bs_reset_device(struct targ_info *); /* ccb */ -struct bsccb *bs_make_internal_ccb __P((struct targ_info *, u_int, u_int8_t *, u_int, u_int8_t *, u_int, u_int, int)); -struct bsccb *bs_make_msg_ccb __P((struct targ_info *, u_int, struct bsccb *, struct msgbase *, u_int)); +struct bsccb *bs_make_internal_ccb(struct targ_info *, u_int, u_int8_t *, u_int, u_int8_t *, u_int, u_int, int); +struct bsccb *bs_make_msg_ccb(struct targ_info *, u_int, struct bsccb *, struct msgbase *, u_int); /* misc funcs */ -void bs_printf __P((struct targ_info *, char *, char *)); -void bs_panic __P((struct bs_softc *, u_char *)); +void bs_printf(struct targ_info *, char *, char *); +void bs_panic(struct bs_softc *, u_char *); /* misc debug */ -u_int bsr __P((u_int)); -u_int bsw __P((u_int, int)); -void bs_debug_print_all __P((struct bs_softc *)); -void bs_debug_print __P((struct bs_softc *, struct targ_info *)); +u_int bsr(u_int); +u_int bsw(u_int, int); +void bs_debug_print_all(struct bs_softc *); +void bs_debug_print(struct bs_softc *, struct targ_info *); /************************************************** * TARG FLAGS *************************************************/ -static BS_INLINE int bs_check_sat __P((struct targ_info *)); -static BS_INLINE int bs_check_smit __P((struct targ_info *)); -static BS_INLINE int bs_check_disc __P((struct targ_info *)); -static BS_INLINE int bs_check_link __P((struct targ_info *, struct bsccb *)); -static BS_INLINE u_int8_t bs_identify_msg __P((struct targ_info *)); -static BS_INLINE void bs_targ_flags __P((struct targ_info *, struct bsccb *)); +static BS_INLINE int bs_check_sat(struct targ_info *); +static BS_INLINE int bs_check_smit(struct targ_info *); +static BS_INLINE int bs_check_disc(struct targ_info *); +static BS_INLINE int bs_check_link(struct targ_info *, struct bsccb *); +static BS_INLINE u_int8_t bs_identify_msg(struct targ_info *); +static BS_INLINE void bs_targ_flags(struct targ_info *, struct bsccb *); static BS_INLINE int bs_check_disc(ti) @@ -144,10 +146,10 @@ bs_targ_flags(ti, cb) /************************************************** * QUEUE OP **************************************************/ -static BS_INLINE void bs_hostque_init __P((struct bs_softc *)); -static BS_INLINE void bs_hostque_head __P((struct bs_softc *, struct targ_info *)); -static BS_INLINE void bs_hostque_tail __P((struct bs_softc *, struct targ_info *)); -static BS_INLINE void bs_hostque_delete __P((struct bs_softc *, struct targ_info *)); +static BS_INLINE void bs_hostque_init(struct bs_softc *); +static BS_INLINE void bs_hostque_head(struct bs_softc *, struct targ_info *); +static BS_INLINE void bs_hostque_tail(struct bs_softc *, struct targ_info *); +static BS_INLINE void bs_hostque_delete(struct bs_softc *, struct targ_info *); static BS_INLINE void bs_hostque_init(bsc) @@ -202,8 +204,8 @@ bs_hostque_delete(bsc, ti) /************************************************************* * TIMEOUT ************************************************************/ -static BS_INLINE void bs_start_timeout __P((struct bs_softc *)); -static BS_INLINE void bs_terminate_timeout __P((struct bs_softc *)); +static BS_INLINE void bs_start_timeout(struct bs_softc *); +static BS_INLINE void bs_terminate_timeout(struct bs_softc *); static BS_INLINE void bs_start_timeout(bsc) diff --git a/sys/i386/isa/bs/bshw.c b/sys/i386/isa/bs/bshw.c index e5902fe..8514373 100644 --- a/sys/i386/isa/bs/bshw.c +++ b/sys/i386/isa/bs/bshw.c @@ -51,7 +51,7 @@ static struct bs_softc *gbsc; /************************************************** * DECLARATION **************************************************/ -static void bshw_force_bsmode __P((struct bs_softc *)); +static void bshw_force_bsmode(struct bs_softc *); /************************************************** * STATIC VAL @@ -183,7 +183,7 @@ twiddle_wait(void) delay(TWIDDLEWAIT); } -static void bshw_set_vsp __P((struct bs_softc *, u_int, u_int8_t)); +static void bshw_set_vsp(struct bs_softc *, u_int, u_int8_t); static void bshw_set_vsp(bsc, chan, spva) diff --git a/sys/i386/isa/bs/bshw.h b/sys/i386/isa/bs/bshw.h index 8c69843..b58f1a0 100644 --- a/sys/i386/isa/bs/bshw.h +++ b/sys/i386/isa/bs/bshw.h @@ -27,6 +27,8 @@ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. + * + * $FreeBSD$ */ /* * Copyright (c) 1994, 1995, 1996 Naofumi HONDA. All rights reserved. @@ -53,54 +55,54 @@ /********************************************************* * static inline declare. *********************************************************/ -static BS_INLINE void write_wd33c93 __P((struct bs_softc *, u_int, u_int8_t)); -static BS_INLINE u_int8_t read_wd33c93 __P((struct bs_softc *, u_int)); -static BS_INLINE u_int8_t bshw_get_auxstat __P((struct bs_softc *)); -static BS_INLINE u_int8_t bshw_get_busstat __P((struct bs_softc *)); -static BS_INLINE u_int8_t bshw_get_status_insat __P((struct bs_softc *)); -static BS_INLINE u_int8_t bshw_read_data __P((struct bs_softc *)); -static BS_INLINE void bshw_write_data __P((struct bs_softc *, u_int8_t)); -static BS_INLINE void bshw_set_count __P((struct bs_softc *, u_int)); -static BS_INLINE u_int bshw_get_count __P((struct bs_softc *)); -static BS_INLINE void bshw_set_dst_id __P((struct bs_softc *, u_int, u_int)); -static BS_INLINE void bshw_set_lun __P((struct bs_softc *, u_int)); -static BS_INLINE u_int bshw_get_src_id __P((struct bs_softc *)); -static BS_INLINE void bshw_negate_ack __P((struct bs_softc *)); -static BS_INLINE void bshw_assert_atn __P((struct bs_softc *)); -static BS_INLINE void bshw_assert_select __P((struct bs_softc *)); -static BS_INLINE void bshw_start_xfer __P((struct bs_softc *)); -static BS_INLINE void bshw_start_sxfer __P((struct bs_softc *)); -static BS_INLINE void bshw_cmd_pass __P((struct bs_softc *, u_int)); -static BS_INLINE void bshw_start_sat __P((struct bs_softc *, u_int)); -static BS_INLINE void bshw_abort_cmd __P((struct bs_softc *)); -static BS_INLINE void bshw_set_sync_reg __P((struct bs_softc *, u_int)); -static BS_INLINE void bshw_set_poll_trans __P((struct bs_softc *, u_int)); -static BS_INLINE void bshw_set_dma_trans __P((struct bs_softc *, u_int)); +static BS_INLINE void write_wd33c93(struct bs_softc *, u_int, u_int8_t); +static BS_INLINE u_int8_t read_wd33c93(struct bs_softc *, u_int); +static BS_INLINE u_int8_t bshw_get_auxstat(struct bs_softc *); +static BS_INLINE u_int8_t bshw_get_busstat(struct bs_softc *); +static BS_INLINE u_int8_t bshw_get_status_insat(struct bs_softc *); +static BS_INLINE u_int8_t bshw_read_data(struct bs_softc *); +static BS_INLINE void bshw_write_data(struct bs_softc *, u_int8_t); +static BS_INLINE void bshw_set_count(struct bs_softc *, u_int); +static BS_INLINE u_int bshw_get_count(struct bs_softc *); +static BS_INLINE void bshw_set_dst_id(struct bs_softc *, u_int, u_int); +static BS_INLINE void bshw_set_lun(struct bs_softc *, u_int); +static BS_INLINE u_int bshw_get_src_id(struct bs_softc *); +static BS_INLINE void bshw_negate_ack(struct bs_softc *); +static BS_INLINE void bshw_assert_atn(struct bs_softc *); +static BS_INLINE void bshw_assert_select(struct bs_softc *); +static BS_INLINE void bshw_start_xfer(struct bs_softc *); +static BS_INLINE void bshw_start_sxfer(struct bs_softc *); +static BS_INLINE void bshw_cmd_pass(struct bs_softc *, u_int); +static BS_INLINE void bshw_start_sat(struct bs_softc *, u_int); +static BS_INLINE void bshw_abort_cmd(struct bs_softc *); +static BS_INLINE void bshw_set_sync_reg(struct bs_softc *, u_int); +static BS_INLINE void bshw_set_poll_trans(struct bs_softc *, u_int); +static BS_INLINE void bshw_set_dma_trans(struct bs_softc *, u_int); /********************************************************* * global declare *********************************************************/ -void bs_dma_xfer __P((struct targ_info *, u_int)); -void bs_dma_xfer_end __P((struct targ_info *)); -void bshw_dmaabort __P((struct bs_softc *, struct targ_info *)); +void bs_dma_xfer(struct targ_info *, u_int); +void bs_dma_xfer_end(struct targ_info *); +void bshw_dmaabort(struct bs_softc *, struct targ_info *); -void bshw_adj_syncdata __P((struct syncdata *)); -void bshw_set_synchronous __P((struct bs_softc *, struct targ_info *)); +void bshw_adj_syncdata(struct syncdata *); +void bshw_set_synchronous(struct bs_softc *, struct targ_info *); -void bs_smit_xfer_end __P((struct targ_info *)); -void bshw_smitabort __P((struct bs_softc *)); +void bs_smit_xfer_end(struct targ_info *); +void bshw_smitabort(struct bs_softc *); -void bshw_setup_ctrl_reg __P((struct bs_softc *, u_int)); -int bshw_chip_reset __P((struct bs_softc *)); -void bshw_bus_reset __P((struct bs_softc *)); -int bshw_board_probe __P((struct bs_softc *, u_int *, u_int *)); -void bshw_lock __P((struct bs_softc *)); -void bshw_unlock __P((struct bs_softc *)); -void bshw_get_syncreg __P((struct bs_softc *)); -void bshw_issue_satcmd __P((struct bs_softc *, struct bsccb *, int)); -void bshw_print_port __P((struct bs_softc *)); +void bshw_setup_ctrl_reg(struct bs_softc *, u_int); +int bshw_chip_reset(struct bs_softc *); +void bshw_bus_reset(struct bs_softc *); +int bshw_board_probe(struct bs_softc *, u_int *, u_int *); +void bshw_lock(struct bs_softc *); +void bshw_unlock(struct bs_softc *); +void bshw_get_syncreg(struct bs_softc *); +void bshw_issue_satcmd(struct bs_softc *, struct bsccb *, int); +void bshw_print_port(struct bs_softc *); -void bs_lc_smit_xfer __P((struct targ_info *, u_int)); +void bs_lc_smit_xfer(struct targ_info *, u_int); extern struct dvcfg_hwsel bshw_hwsel; extern u_int8_t bshw_cmd[]; @@ -116,9 +118,9 @@ struct bshw { u_int sregaddr; - int ((*dma_init) __P((struct bs_softc *))); - void ((*dma_start) __P((struct bs_softc *))); - void ((*dma_stop) __P((struct bs_softc *))); + int ((*dma_init)(struct bs_softc *)); + void ((*dma_start)(struct bs_softc *)); + void ((*dma_stop)(struct bs_softc *)); }; /********************************************************* diff --git a/sys/i386/isa/bs/bshw_dma.c b/sys/i386/isa/bs/bshw_dma.c index 74cc3ee..7c48818 100644 --- a/sys/i386/isa/bs/bshw_dma.c +++ b/sys/i386/isa/bs/bshw_dma.c @@ -36,8 +36,8 @@ /********************************************************* * static declare. *********************************************************/ -static void bshw_dmastart __P((struct bs_softc *)); -static void bshw_dmadone __P((struct bs_softc *)); +static void bshw_dmastart(struct bs_softc *); +static void bshw_dmadone(struct bs_softc *); /********************************************** * UPPER INTERFACE FUNCS (all funcs exported) diff --git a/sys/i386/isa/bs/bshw_pdma.c b/sys/i386/isa/bs/bshw_pdma.c index a4e4cb7..e63e107 100644 --- a/sys/i386/isa/bs/bshw_pdma.c +++ b/sys/i386/isa/bs/bshw_pdma.c @@ -35,9 +35,9 @@ #define LC_SMIT_TIMEOUT 2 /* 2 sec: timeout for a fifo status ready */ -static BS_INLINE void bshw_lc_smit_start __P((struct bs_softc *, int, u_int)); -static int bshw_lc_smit_fstat __P((struct bs_softc *, int, int)); -static void bshw_lc_smit_stop __P((struct bs_softc *)); +static BS_INLINE void bshw_lc_smit_start(struct bs_softc *, int, u_int); +static int bshw_lc_smit_fstat(struct bs_softc *, int, int); +static void bshw_lc_smit_stop(struct bs_softc *); /********************************************************* * SM FIFO (GENERIC) diff --git a/sys/i386/isa/bs/bsif.c b/sys/i386/isa/bs/bsif.c index d48469d..0c09838 100644 --- a/sys/i386/isa/bs/bsif.c +++ b/sys/i386/isa/bs/bsif.c @@ -60,7 +60,7 @@ * DEVICE DECLARE **************************************************/ #ifdef __NetBSD__ -static void bs_scsi_minphys __P((struct buf *)); +static void bs_scsi_minphys(struct buf *); struct cfdriver bs_cd = { NULL, "bs", DV_DULL @@ -82,11 +82,11 @@ struct scsi_adapter pc98texa55bs = { #endif /* __NetBSD__ */ #ifdef __FreeBSD__ -static int bsprobe __P((struct isa_device *)); +static int bsprobe(struct isa_device *); static void bs_poll(struct cam_sim *sim); static int bsattach(struct isa_device *); static ointhand2_t bsintr; -static int bs_dmarangecheck __P((caddr_t, unsigned)); +static int bs_dmarangecheck(caddr_t, unsigned); struct isa_driver bsdriver = { INTR_TYPE_CAM, diff --git a/sys/i386/isa/bs/bsif.h b/sys/i386/isa/bs/bsif.h index 28daf2e..8b2a882 100644 --- a/sys/i386/isa/bs/bsif.h +++ b/sys/i386/isa/bs/bsif.h @@ -187,10 +187,10 @@ * declare ***************************************************/ /* (I) common declare */ -void bs_alloc_buf __P((struct targ_info *)); +void bs_alloc_buf(struct targ_info *); #ifdef __NetBSD__ -XSBS_INT32T bs_target_open __P((struct scsi_link *, struct cfdata *)); -XSBS_INT32T bs_scsi_cmd __P((struct scsi_xfer *)); +XSBS_INT32T bs_target_open(struct scsi_link *, struct cfdata *); +XSBS_INT32T bs_scsi_cmd(struct scsi_xfer *); #endif #ifdef __FreeBSD__ void bs_scsi_cmd(struct cam_sim *sim, union ccb *ccb); @@ -199,13 +199,13 @@ extern int delaycount; /* (II) os depend declare */ #ifdef __NetBSD__ -int bsintr __P((void *)); -int bsprint __P((void *, const char *)); +int bsintr(void *); +int bsprint(void *, const char *); #endif /* __NetBSD__ */ #ifdef __FreeBSD__ -static BS_INLINE void memcopy __P((void *from, void *to, register size_t len)); -u_int32_t bs_adapter_info __P((int)); +static BS_INLINE void memcopy(void *from, void *to, register size_t len); +u_int32_t bs_adapter_info(int); #define delay(y) DELAY(y) extern int dma_init_flag; diff --git a/sys/i386/isa/bs/bsvar.h b/sys/i386/isa/bs/bsvar.h index 6267c31..7295c06 100644 --- a/sys/i386/isa/bs/bsvar.h +++ b/sys/i386/isa/bs/bsvar.h @@ -502,12 +502,12 @@ extern int bs_debug_flag; /************************************************* * Function declare *************************************************/ -int bs_scsi_cmd_internal __P((struct bsccb *, u_int)); -struct bsccb *bscmddone __P((struct targ_info *)); -int bscmdstart __P((struct targ_info *, int)); -int bs_scsi_cmd_poll __P((struct targ_info *, struct bsccb *)); -int bs_sequencer __P((struct bs_softc *)); -void bs_poll_timeout __P((struct bs_softc *, char *)); +int bs_scsi_cmd_internal(struct bsccb *, u_int); +struct bsccb *bscmddone(struct targ_info *); +int bscmdstart(struct targ_info *, int); +int bs_scsi_cmd_poll(struct targ_info *, struct bsccb *); +int bs_sequencer(struct bs_softc *); +void bs_poll_timeout(struct bs_softc *, char *); /************************************************* * XXX diff --git a/sys/i386/isa/ccbque.h b/sys/i386/isa/ccbque.h index b86a84b..60ab86d 100644 --- a/sys/i386/isa/ccbque.h +++ b/sys/i386/isa/ccbque.h @@ -49,9 +49,9 @@ struct CCBTYPE##que { \ u_int flags; \ }; \ \ -void DEV##_init_ccbque __P((int)); \ -struct CCBTYPE *DEV##_get_ccb __P((void)); \ -void DEV##_free_ccb __P((register struct CCBTYPE *)); +void DEV##_init_ccbque(int); \ +struct CCBTYPE *DEV##_get_ccb(void); \ +void DEV##_free_ccb(register struct CCBTYPE *); /* (II) static allocated memory */ #define GENERIC_CCB_STATIC_ALLOC(DEV, CCBTYPE) \ diff --git a/sys/i386/isa/clock.c b/sys/i386/isa/clock.c index ae56051..49516028 100644 --- a/sys/i386/isa/clock.c +++ b/sys/i386/isa/clock.c @@ -99,8 +99,8 @@ #include <i386/isa/intr_machdep.h> /* The interrupt triggered by the 8254 (timer) chip */ int apic_8254_intr; -static u_long read_intr_count __P((int vec)); -static void setup_8254_mixed_mode __P((void)); +static u_long read_intr_count(int vec); +static void setup_8254_mixed_mode(void); #endif /* @@ -155,7 +155,7 @@ static int i8254_ticked; * timer0_state == 0 case. We should use inthand_add()/inthand_remove() * to switch between clkintr() and a slightly different timerintr(). */ -static void (*new_function) __P((struct clockframe *frame)); +static void (*new_function)(struct clockframe *frame); static u_int new_rate; static u_char rtc_statusa = RTCSA_DIVIDER | RTCSA_NOPROF; static u_char rtc_statusb = RTCSB_24HR | RTCSB_PINTR; @@ -169,10 +169,10 @@ static u_int timer0_prescaler_count; static u_char timer0_state; static u_char timer2_state; -static void (*timer_func) __P((struct clockframe *frame)) = hardclock; +static void (*timer_func)(struct clockframe *frame) = hardclock; -static unsigned i8254_get_timecount __P((struct timecounter *tc)); -static unsigned tsc_get_timecount __P((struct timecounter *tc)); +static unsigned i8254_get_timecount(struct timecounter *tc); +static unsigned tsc_get_timecount(struct timecounter *tc); static void set_timer_freq(u_int freq, int intr_freq); static struct timecounter tsc_timecounter = { @@ -279,7 +279,7 @@ clkintr(struct clockframe frame) * The acquire and release functions must be called at ipl >= splclock(). */ int -acquire_timer0(int rate, void (*function) __P((struct clockframe *frame))) +acquire_timer0(int rate, void (*function)(struct clockframe *frame)) { static int old_rate; diff --git a/sys/i386/isa/ctx.c b/sys/i386/isa/ctx.c index b1e6e44..e70c40e 100644 --- a/sys/i386/isa/ctx.c +++ b/sys/i386/isa/ctx.c @@ -133,8 +133,8 @@ static int waitvb(int port); #define UNIT(x) ((x) & 0x07) -static int ctxprobe __P((struct isa_device *devp)); -static int ctxattach __P((struct isa_device *devp)); +static int ctxprobe(struct isa_device *devp); +static int ctxattach(struct isa_device *devp); struct isa_driver ctxdriver = { INTR_TYPE_MISC, ctxprobe, diff --git a/sys/i386/isa/cy.c b/sys/i386/isa/cy.c index 992dcef..ee164d8 100644 --- a/sys/i386/isa/cy.c +++ b/sys/i386/isa/cy.c @@ -344,38 +344,38 @@ struct com_s { }; /* PCI driver entry point. */ -int cyattach_common __P((cy_addr cy_iobase, int cy_align)); +int cyattach_common (cy_addr cy_iobase, int cy_align); ointhand2_t siointr; -static int cy_units __P((cy_addr cy_iobase, int cy_align)); -static int sioattach __P((struct isa_device *dev)); -static void cd1400_channel_cmd __P((struct com_s *com, int cmd)); -static void cd1400_channel_cmd_wait __P((struct com_s *com)); -static void cd_etc __P((struct com_s *com, int etc)); -static int cd_getreg __P((struct com_s *com, int reg)); -static void cd_setreg __P((struct com_s *com, int reg, int val)); +static int cy_units (cy_addr cy_iobase, int cy_align); +static int sioattach (struct isa_device *dev); +static void cd1400_channel_cmd(struct com_s *com, int cmd); +static void cd1400_channel_cmd_wait(struct com_s *com); +static void cd_etc (struct com_s *com, int etc); +static int cd_getreg (struct com_s *com, int reg); +static void cd_setreg (struct com_s *com, int reg, int val); static timeout_t siodtrwakeup; -static void comhardclose __P((struct com_s *com)); -static void sioinput __P((struct com_s *com)); +static void comhardclose (struct com_s *com); +static void sioinput (struct com_s *com); #if 0 -static void siointr1 __P((struct com_s *com)); -#endif -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 *arg)); -static int sioprobe __P((struct isa_device *dev)); -static void siosettimeout __P((void)); -static int siosetwater __P((struct com_s *com, speed_t speed)); -static int comspeed __P((speed_t speed, u_long cy_clock, - int *prescaler_io)); -static void comstart __P((struct tty *tp)); -static void comstop __P((struct tty *tp, int rw)); +static void siointr1 (struct com_s *com); +#endif +static int commctl (struct com_s *com, int bits, int how); +static int comparam (struct tty *tp, struct termios *t); +static void siopoll (void *arg); +static int sioprobe (struct isa_device *dev); +static void siosettimeout (void); +static int siosetwater (struct com_s *com, speed_t speed); +static int comspeed (speed_t speed, u_long cy_clock, + int *prescaler_io); +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); #ifdef CyDebug -void cystatus __P((int unit)); +void cystatus (int unit); #endif static char driver_name[] = "cy"; diff --git a/sys/i386/isa/elink.h b/sys/i386/isa/elink.h index 881b198..44bf06e 100644 --- a/sys/i386/isa/elink.h +++ b/sys/i386/isa/elink.h @@ -39,5 +39,5 @@ #define ELINK_507_POLY 0xe7 #define ELINK_509_POLY 0xcf -void elink_reset __P((void)); -void elink_idseq __P((u_char p)); +void elink_reset(void); +void elink_idseq(u_char p); diff --git a/sys/i386/isa/icu.h b/sys/i386/isa/icu.h index 4035ac6..36d532a 100644 --- a/sys/i386/isa/icu.h +++ b/sys/i386/isa/icu.h @@ -55,8 +55,8 @@ * DO NOT access imen directly, use INTREN()/INTRDIS(). */ -void INTREN __P((u_int)); -void INTRDIS __P((u_int)); +void INTREN (u_int); +void INTRDIS (u_int); #ifdef APIC_IO extern unsigned apic_imen; /* APIC interrupt mask enable */ diff --git a/sys/i386/isa/if_cx.c b/sys/i386/isa/if_cx.c index 9201fbd..392c9a2 100644 --- a/sys/i386/isa/if_cx.c +++ b/sys/i386/isa/if_cx.c @@ -53,13 +53,13 @@ /* XXX exported. */ void cxswitch (cx_chan_t *c, cx_soft_opt_t new); -static int cxprobe __P((struct isa_device *id)); -static int cxattach __P((struct isa_device *id)); -static void cxput __P((cx_chan_t *c, char b)); -static void cxsend __P((cx_chan_t *c)); -static void cxrinth __P((cx_chan_t *c)); +static int cxprobe(struct isa_device *id); +static int cxattach(struct isa_device *id); +static void cxput(cx_chan_t *c, char b); +static void cxsend(cx_chan_t *c); +static void cxrinth(cx_chan_t *c); static ointhand2_t cxintr; -static int cxtinth __P((cx_chan_t *c)); +static int cxtinth(cx_chan_t *c); #ifdef DEBUG # define print(s) printf s diff --git a/sys/i386/isa/if_le.c b/sys/i386/isa/if_le.c index 56d6e88..8168635 100644 --- a/sys/i386/isa/if_le.c +++ b/sys/i386/isa/if_le.c @@ -195,8 +195,8 @@ static void (*le_intrvec[NLE])(le_softc_t *sc); */ struct le_softc { struct arpcom le_ac; /* Common Ethernet/ARP Structure */ - void (*if_init) __P((le_softc_t *));/* Interface init routine */ - void (*if_reset) __P((le_softc_t *));/* Interface reset routine */ + void (*if_init)(le_softc_t *);/* Interface init routine */ + void (*if_reset)(le_softc_t *);/* Interface reset routine */ caddr_t le_membase; /* Starting memory address (virtual) */ unsigned le_iobase; /* Starting I/O base address */ unsigned le_irq; /* Interrupt Request Value */ diff --git a/sys/i386/isa/if_rdp.c b/sys/i386/isa/if_rdp.c index 3962043..531455f 100644 --- a/sys/i386/isa/if_rdp.c +++ b/sys/i386/isa/if_rdp.c @@ -166,8 +166,8 @@ static u_short allowed_ouis[] = { /* * ISA bus support. */ -static int rdp_probe __P((struct isa_device *)); -static int rdp_attach __P((struct isa_device *)); +static int rdp_probe (struct isa_device *); +static int rdp_attach (struct isa_device *); /* * Required entry points. diff --git a/sys/i386/isa/intr_machdep.h b/sys/i386/isa/intr_machdep.h index 1726635..d674630 100644 --- a/sys/i386/isa/intr_machdep.h +++ b/sys/i386/isa/intr_machdep.h @@ -139,7 +139,7 @@ /* * Type of the first (asm) part of an interrupt handler. */ -typedef void inthand_t __P((u_int cs, u_int ef, u_int esp, u_int ss)); +typedef void inthand_t(u_int cs, u_int ef, u_int esp, u_int ss); #define IDTVEC(name) __CONCAT(X,name) @@ -213,11 +213,10 @@ inthand_t #define NR_INTRNAMES (1 + ICU_LEN + 2 * ICU_LEN) -void isa_defaultirq __P((void)); -int isa_nmi __P((int cd)); -int icu_setup __P((int intr, driver_intr_t *func, void *arg, - int flags)); -int icu_unset __P((int intr, driver_intr_t *handler)); +void isa_defaultirq(void); +int isa_nmi(int cd); +int icu_setup(int intr, driver_intr_t *func, void *arg, int flags); +int icu_unset(int intr, driver_intr_t *handler); void icu_reinit(void); /* diff --git a/sys/i386/isa/isa_dma.c b/sys/i386/isa/isa_dma.c index 38ab398..36bd2e5 100644 --- a/sys/i386/isa/isa_dma.c +++ b/sys/i386/isa/isa_dma.c @@ -79,7 +79,7 @@ #define DMA2_MODE (IO_DMA2 + 2*11) /* mode register */ #define DMA2_FFC (IO_DMA2 + 2*12) /* clear first/last FF */ -static int isa_dmarangecheck __P((caddr_t va, u_int length, int chan)); +static int isa_dmarangecheck(caddr_t va, u_int length, int chan); static caddr_t dma_bouncebuf[8]; static u_int dma_bouncebufsize[8]; diff --git a/sys/i386/isa/isa_dma.h b/sys/i386/isa/isa_dma.h index 60a69bf..a4ac817 100644 --- a/sys/i386/isa/isa_dma.h +++ b/sys/i386/isa/isa_dma.h @@ -43,14 +43,14 @@ #define ISADMA_WRITE 0 #define ISADMA_RAW 0x00080000 -void isa_dmacascade __P((int chan)); -void isa_dmadone __P((int flags, caddr_t addr, int nbytes, int chan)); -void isa_dmainit __P((int chan, u_int bouncebufsize)); -void isa_dmastart __P((int flags, caddr_t addr, u_int nbytes, int chan)); -int isa_dma_acquire __P((int chan)); -void isa_dma_release __P((int chan)); -int isa_dmastatus __P((int chan)); -int isa_dmastop __P((int chan)); +void isa_dmacascade(int chan); +void isa_dmadone(int flags, caddr_t addr, int nbytes, int chan); +void isa_dmainit(int chan, u_int bouncebufsize); +void isa_dmastart(int flags, caddr_t addr, u_int nbytes, int chan); +int isa_dma_acquire(int chan); +void isa_dma_release(int chan); +int isa_dmastatus(int chan); +int isa_dmastop(int chan); #endif #endif /* !_I386_ISA_ISA_DMA_H_ */ diff --git a/sys/i386/isa/mse.c b/sys/i386/isa/mse.c index 915bc3f..258847b 100644 --- a/sys/i386/isa/mse.c +++ b/sys/i386/isa/mse.c @@ -79,13 +79,13 @@ typedef struct mse_softc { bus_space_tag_t sc_iot; bus_space_handle_t sc_ioh; void *sc_ih; - void (*sc_enablemouse) __P((bus_space_tag_t t, - bus_space_handle_t h)); - void (*sc_disablemouse) __P((bus_space_tag_t t, - bus_space_handle_t h)); - void (*sc_getmouse) __P((bus_space_tag_t t, + void (*sc_enablemouse)(bus_space_tag_t t, + bus_space_handle_t h); + void (*sc_disablemouse)(bus_space_tag_t t, + bus_space_handle_t h); + void (*sc_getmouse)(bus_space_tag_t t, bus_space_handle_t h, - int *dx, int *dy, int *but)); + int *dx, int *dy, int *but); int sc_deltax; int sc_deltay; int sc_obuttons; @@ -103,9 +103,9 @@ typedef struct mse_softc { static devclass_t mse_devclass; -static int mse_probe __P((device_t dev)); -static int mse_attach __P((device_t dev)); -static int mse_detach __P((device_t dev)); +static int mse_probe(device_t dev); +static int mse_attach(device_t dev); +static int mse_detach(device_t dev); static device_method_t mse_methods[] = { DEVMETHOD(device_probe, mse_probe), @@ -155,7 +155,7 @@ static struct cdevsw mse_cdevsw = { /* flags */ 0, }; -static void mseintr __P((void *)); +static void mseintr(void *); static timeout_t msetimeout; /* Flags */ @@ -214,14 +214,14 @@ static timeout_t msetimeout; #define MSE_DISINTR 0x10 #define MSE_INTREN 0x00 -static int mse_probelogi __P((device_t dev, mse_softc_t *sc)); -static void mse_disablelogi __P((bus_space_tag_t t, - bus_space_handle_t h)); -static void mse_getlogi __P((bus_space_tag_t t, +static int mse_probelogi(device_t dev, mse_softc_t *sc); +static void mse_disablelogi(bus_space_tag_t t, + bus_space_handle_t h); +static void mse_getlogi(bus_space_tag_t t, bus_space_handle_t h, - int *dx, int *dy, int *but)); -static void mse_enablelogi __P((bus_space_tag_t t, - bus_space_handle_t h)); + int *dx, int *dy, int *but); +static void mse_enablelogi(bus_space_tag_t t, + bus_space_handle_t h); /* * ATI Inport mouse definitions @@ -234,14 +234,14 @@ static void mse_enablelogi __P((bus_space_tag_t t, #define MSE_INPORT_HOLD 0x20 #define MSE_INPORT_INTREN 0x09 -static int mse_probeati __P((device_t dev, mse_softc_t *sc)); -static void mse_enableati __P((bus_space_tag_t t, - bus_space_handle_t h)); -static void mse_disableati __P((bus_space_tag_t t, - bus_space_handle_t h)); -static void mse_getati __P((bus_space_tag_t t, +static int mse_probeati(device_t dev, mse_softc_t *sc); +static void mse_enableati(bus_space_tag_t t, + bus_space_handle_t h); +static void mse_disableati(bus_space_tag_t t, + bus_space_handle_t h); +static void mse_getati(bus_space_tag_t t, bus_space_handle_t h, - int *dx, int *dy, int *but)); + int *dx, int *dy, int *but); #define MSEPRI (PZERO + 3) @@ -252,14 +252,14 @@ static void mse_getati __P((bus_space_tag_t t, */ static struct mse_types { int m_type; /* Type of bus mouse */ - int (*m_probe) __P((device_t dev, mse_softc_t *sc)); + int (*m_probe)(device_t dev, mse_softc_t *sc); /* Probe routine to test for it */ - void (*m_enable) __P((bus_space_tag_t t, bus_space_handle_t h)); + void (*m_enable)(bus_space_tag_t t, bus_space_handle_t h); /* Start routine */ - void (*m_disable) __P((bus_space_tag_t t, bus_space_handle_t h)); + void (*m_disable)(bus_space_tag_t t, bus_space_handle_t h); /* Disable interrupts routine */ - void (*m_get) __P((bus_space_tag_t t, bus_space_handle_t h, - int *dx, int *dy, int *but)); + void (*m_get)(bus_space_tag_t t, bus_space_handle_t h, + int *dx, int *dy, int *but); /* and get mouse status */ mousehw_t m_hw; /* buttons iftype type model hwid */ mousemode_t m_mode; /* proto rate res accel level size mask */ diff --git a/sys/i386/isa/npx.c b/sys/i386/isa/npx.c index 07bd2f5..d3d6a01 100644 --- a/sys/i386/isa/npx.c +++ b/sys/i386/isa/npx.c @@ -118,20 +118,20 @@ #else /* not __GNUC__ */ -void fldcw __P((caddr_t addr)); -void fnclex __P((void)); -void fninit __P((void)); -void fnsave __P((caddr_t addr)); -void fnstcw __P((caddr_t addr)); -void fnstsw __P((caddr_t addr)); -void fp_divide_by_0 __P((void)); -void frstor __P((caddr_t addr)); +void fldcw (caddr_t addr); +void fnclex (void); +void fninit (void); +void fnsave (caddr_t addr); +void fnstcw (caddr_t addr); +void fnstsw (caddr_t addr); +void fp_divide_by_0 (void); +void frstor (caddr_t addr); #ifdef CPU_ENABLE_SSE -void fxsave __P((caddr_t addr)); -void fxrstor __P((caddr_t addr)); +void fxsave (caddr_t addr); +void fxrstor (caddr_t addr); #endif -void start_emulating __P((void)); -void stop_emulating __P((void)); +void start_emulating (void); +void stop_emulating (void); #endif /* __GNUC__ */ @@ -159,17 +159,17 @@ void stop_emulating __P((void)); typedef u_char bool_t; -static int npx_attach __P((device_t dev)); -static void npx_identify __P((driver_t *driver, device_t parent)); +static int npx_attach (device_t dev); +static void npx_identify (driver_t *driver, device_t parent); #ifndef SMP -static void npx_intr __P((void *)); +static void npx_intr (void *); #endif -static int npx_probe __P((device_t dev)); -static void fpusave __P((union savefpu *)); -static void fpurstor __P((union savefpu *)); +static int npx_probe (device_t dev); +static void fpusave (union savefpu *); +static void fpurstor (union savefpu *); #ifdef I586_CPU_XXX -static long timezero __P((const char *funcname, - void (*func)(void *buf, size_t len))); +static long timezero (const char *funcname, + void (*func)(void *buf, size_t len)); #endif /* I586_CPU */ int hw_float; /* XXX currently just alias for npx_exists */ @@ -905,7 +905,7 @@ fpurstor(addr) static long timezero(funcname, func) const char *funcname; - void (*func) __P((void *buf, size_t len)); + void (*func)(void *buf, size_t len); { void *buf; diff --git a/sys/i386/isa/pcaudio.c b/sys/i386/isa/pcaudio.c index e457eed..1417054 100644 --- a/sys/i386/isa/pcaudio.c +++ b/sys/i386/isa/pcaudio.c @@ -170,9 +170,9 @@ static struct cdevsw pca_cdevsw = { /* flags */ 0, }; -static void pca_continue __P((void)); -static void pca_init __P((void)); -static void pca_pause __P((void)); +static void pca_continue(void); +static void pca_init(void); +static void pca_pause(void); static void conv(const unsigned char *table, unsigned char *buff, unsigned n) diff --git a/sys/i386/isa/rc.c b/sys/i386/isa/rc.c index d9bd2ad..63b608f 100644 --- a/sys/i386/isa/rc.c +++ b/sys/i386/isa/rc.c @@ -54,8 +54,8 @@ #include <i386/isa/rcreg.h> /* Prototypes */ -static int rcprobe __P((struct isa_device *)); -static int rcattach __P((struct isa_device *)); +static int rcprobe(struct isa_device *); +static int rcattach(struct isa_device *); #define rcin(port) RC_IN (nec, port) #define rcout(port,v) RC_OUT (nec, port, v) @@ -174,23 +174,23 @@ static void *rc_ih; /* Static prototypes */ static ointhand2_t rcintr; -static void rc_hwreset __P((int, int, unsigned int)); -static int rc_test __P((int, int)); -static void rc_discard_output __P((struct rc_chans *)); -static void rc_hardclose __P((struct rc_chans *)); -static int rc_modctl __P((struct rc_chans *, int, int)); -static void rc_start __P((struct tty *)); -static void rc_stop __P((struct tty *, int rw)); -static int rc_param __P((struct tty *, struct termios *)); -static void rcpoll __P((void *)); -static void rc_reinit __P((struct rc_softc *)); +static void rc_hwreset(int, int, unsigned int); +static int rc_test(int, int); +static void rc_discard_output(struct rc_chans *); +static void rc_hardclose(struct rc_chans *); +static int rc_modctl(struct rc_chans *, int, int); +static void rc_start(struct tty *); +static void rc_stop(struct tty *, int rw); +static int rc_param(struct tty *, struct termios *); +static void rcpoll (void *); +static void rc_reinit(struct rc_softc *); #ifdef RCDEBUG static void printrcflags(); #endif static timeout_t rc_dtrwakeup; static timeout_t rc_wakeup; -static void disc_optim __P((struct tty *tp, struct termios *t, struct rc_chans *)); -static void rc_wait0 __P((int nec, int unit, int chan, int line)); +static void disc_optim (struct tty *tp, struct termios *t, struct rc_chans *); +static void rc_wait0(int nec, int unit, int chan, int line); /**********************************************/ diff --git a/sys/i386/isa/spkr.c b/sys/i386/isa/spkr.c index c457906..67084b6 100644 --- a/sys/i386/isa/spkr.c +++ b/sys/i386/isa/spkr.c @@ -68,12 +68,12 @@ static MALLOC_DEFINE(M_SPKR, "spkr", "Speaker buffer"); #define SPKRPRI PSOCK static char endtone, endrest; -static void tone __P((unsigned int thz, unsigned int ticks)); -static void rest __P((int ticks)); -static void playinit __P((void)); -static void playtone __P((int pitch, int value, int sustain)); -static int abs __P((int n)); -static void playstring __P((char *cp, size_t slen)); +static void tone(unsigned int thz, unsigned int ticks); +static void rest(int ticks); +static void playinit(void); +static void playtone(int pitch, int value, int sustain); +static int abs(int n); +static void playstring(char *cp, size_t slen); /* emit tone of frequency thz for given number of ticks */ static void diff --git a/sys/i386/linux/imgact_linux.c b/sys/i386/linux/imgact_linux.c index 29741d93..dee603d 100644 --- a/sys/i386/linux/imgact_linux.c +++ b/sys/i386/linux/imgact_linux.c @@ -53,7 +53,7 @@ #include <i386/linux/linux.h> -static int exec_linux_imgact __P((struct image_params *iparams)); +static int exec_linux_imgact(struct image_params *iparams); static int exec_linux_imgact(imgp) diff --git a/sys/i386/linux/linux_proto.h b/sys/i386/linux/linux_proto.h index 4919a3f..90c59bd 100644 --- a/sys/i386/linux/linux_proto.h +++ b/sys/i386/linux/linux_proto.h @@ -637,159 +637,159 @@ struct linux_fcntl64_args { char cmd_l_[PADL_(l_uint)]; l_uint cmd; char cmd_r_[PADR_(l_uint)]; char arg_l_[PADL_(l_ulong)]; l_ulong arg; char arg_r_[PADR_(l_ulong)]; }; -int linux_fork __P((struct thread *, struct linux_fork_args *)); -int linux_open __P((struct thread *, struct linux_open_args *)); -int linux_waitpid __P((struct thread *, struct linux_waitpid_args *)); -int linux_creat __P((struct thread *, struct linux_creat_args *)); -int linux_link __P((struct thread *, struct linux_link_args *)); -int linux_unlink __P((struct thread *, struct linux_unlink_args *)); -int linux_execve __P((struct thread *, struct linux_execve_args *)); -int linux_chdir __P((struct thread *, struct linux_chdir_args *)); -int linux_time __P((struct thread *, struct linux_time_args *)); -int linux_mknod __P((struct thread *, struct linux_mknod_args *)); -int linux_chmod __P((struct thread *, struct linux_chmod_args *)); -int linux_lchown16 __P((struct thread *, struct linux_lchown16_args *)); -int linux_stat __P((struct thread *, struct linux_stat_args *)); -int linux_lseek __P((struct thread *, struct linux_lseek_args *)); -int linux_getpid __P((struct thread *, struct linux_getpid_args *)); -int linux_mount __P((struct thread *, struct linux_mount_args *)); -int linux_oldumount __P((struct thread *, struct linux_oldumount_args *)); -int linux_setuid16 __P((struct thread *, struct linux_setuid16_args *)); -int linux_getuid16 __P((struct thread *, struct linux_getuid16_args *)); -int linux_stime __P((struct thread *, struct linux_stime_args *)); -int linux_ptrace __P((struct thread *, struct linux_ptrace_args *)); -int linux_alarm __P((struct thread *, struct linux_alarm_args *)); -int linux_fstat __P((struct thread *, struct linux_fstat_args *)); -int linux_pause __P((struct thread *, struct linux_pause_args *)); -int linux_utime __P((struct thread *, struct linux_utime_args *)); -int linux_access __P((struct thread *, struct linux_access_args *)); -int linux_nice __P((struct thread *, struct linux_nice_args *)); -int linux_kill __P((struct thread *, struct linux_kill_args *)); -int linux_rename __P((struct thread *, struct linux_rename_args *)); -int linux_mkdir __P((struct thread *, struct linux_mkdir_args *)); -int linux_rmdir __P((struct thread *, struct linux_rmdir_args *)); -int linux_pipe __P((struct thread *, struct linux_pipe_args *)); -int linux_times __P((struct thread *, struct linux_times_args *)); -int linux_brk __P((struct thread *, struct linux_brk_args *)); -int linux_setgid16 __P((struct thread *, struct linux_setgid16_args *)); -int linux_getgid16 __P((struct thread *, struct linux_getgid16_args *)); -int linux_signal __P((struct thread *, struct linux_signal_args *)); -int linux_geteuid16 __P((struct thread *, struct linux_geteuid16_args *)); -int linux_getegid16 __P((struct thread *, struct linux_getegid16_args *)); -int linux_umount __P((struct thread *, struct linux_umount_args *)); -int linux_ioctl __P((struct thread *, struct linux_ioctl_args *)); -int linux_fcntl __P((struct thread *, struct linux_fcntl_args *)); -int linux_olduname __P((struct thread *, struct linux_olduname_args *)); -int linux_ustat __P((struct thread *, struct linux_ustat_args *)); -int linux_sigaction __P((struct thread *, struct linux_sigaction_args *)); -int linux_sgetmask __P((struct thread *, struct linux_sgetmask_args *)); -int linux_ssetmask __P((struct thread *, struct linux_ssetmask_args *)); -int linux_setreuid16 __P((struct thread *, struct linux_setreuid16_args *)); -int linux_setregid16 __P((struct thread *, struct linux_setregid16_args *)); -int linux_sigsuspend __P((struct thread *, struct linux_sigsuspend_args *)); -int linux_sigpending __P((struct thread *, struct linux_sigpending_args *)); -int linux_setrlimit __P((struct thread *, struct linux_setrlimit_args *)); -int linux_old_getrlimit __P((struct thread *, struct linux_old_getrlimit_args *)); -int linux_getgroups16 __P((struct thread *, struct linux_getgroups16_args *)); -int linux_setgroups16 __P((struct thread *, struct linux_setgroups16_args *)); -int linux_old_select __P((struct thread *, struct linux_old_select_args *)); -int linux_symlink __P((struct thread *, struct linux_symlink_args *)); -int linux_readlink __P((struct thread *, struct linux_readlink_args *)); -int linux_uselib __P((struct thread *, struct linux_uselib_args *)); -int linux_reboot __P((struct thread *, struct linux_reboot_args *)); -int linux_readdir __P((struct thread *, struct linux_readdir_args *)); -int linux_mmap __P((struct thread *, struct linux_mmap_args *)); -int linux_truncate __P((struct thread *, struct linux_truncate_args *)); -int linux_statfs __P((struct thread *, struct linux_statfs_args *)); -int linux_fstatfs __P((struct thread *, struct linux_fstatfs_args *)); -int linux_ioperm __P((struct thread *, struct linux_ioperm_args *)); -int linux_socketcall __P((struct thread *, struct linux_socketcall_args *)); -int linux_syslog __P((struct thread *, struct linux_syslog_args *)); -int linux_setitimer __P((struct thread *, struct linux_setitimer_args *)); -int linux_getitimer __P((struct thread *, struct linux_getitimer_args *)); -int linux_newstat __P((struct thread *, struct linux_newstat_args *)); -int linux_newlstat __P((struct thread *, struct linux_newlstat_args *)); -int linux_newfstat __P((struct thread *, struct linux_newfstat_args *)); -int linux_uname __P((struct thread *, struct linux_uname_args *)); -int linux_iopl __P((struct thread *, struct linux_iopl_args *)); -int linux_vhangup __P((struct thread *, struct linux_vhangup_args *)); -int linux_vm86old __P((struct thread *, struct linux_vm86old_args *)); -int linux_wait4 __P((struct thread *, struct linux_wait4_args *)); -int linux_swapoff __P((struct thread *, struct linux_swapoff_args *)); -int linux_sysinfo __P((struct thread *, struct linux_sysinfo_args *)); -int linux_ipc __P((struct thread *, struct linux_ipc_args *)); -int linux_sigreturn __P((struct thread *, struct linux_sigreturn_args *)); -int linux_clone __P((struct thread *, struct linux_clone_args *)); -int linux_newuname __P((struct thread *, struct linux_newuname_args *)); -int linux_modify_ldt __P((struct thread *, struct linux_modify_ldt_args *)); -int linux_adjtimex __P((struct thread *, struct linux_adjtimex_args *)); -int linux_sigprocmask __P((struct thread *, struct linux_sigprocmask_args *)); -int linux_create_module __P((struct thread *, struct linux_create_module_args *)); -int linux_init_module __P((struct thread *, struct linux_init_module_args *)); -int linux_delete_module __P((struct thread *, struct linux_delete_module_args *)); -int linux_get_kernel_syms __P((struct thread *, struct linux_get_kernel_syms_args *)); -int linux_quotactl __P((struct thread *, struct linux_quotactl_args *)); -int linux_bdflush __P((struct thread *, struct linux_bdflush_args *)); -int linux_sysfs __P((struct thread *, struct linux_sysfs_args *)); -int linux_personality __P((struct thread *, struct linux_personality_args *)); -int linux_setfsuid16 __P((struct thread *, struct linux_setfsuid16_args *)); -int linux_setfsgid16 __P((struct thread *, struct linux_setfsgid16_args *)); -int linux_llseek __P((struct thread *, struct linux_llseek_args *)); -int linux_getdents __P((struct thread *, struct linux_getdents_args *)); -int linux_select __P((struct thread *, struct linux_select_args *)); -int linux_msync __P((struct thread *, struct linux_msync_args *)); -int linux_getsid __P((struct thread *, struct linux_getsid_args *)); -int linux_fdatasync __P((struct thread *, struct linux_fdatasync_args *)); -int linux_sysctl __P((struct thread *, struct linux_sysctl_args *)); -int linux_sched_setscheduler __P((struct thread *, struct linux_sched_setscheduler_args *)); -int linux_sched_getscheduler __P((struct thread *, struct linux_sched_getscheduler_args *)); -int linux_sched_get_priority_max __P((struct thread *, struct linux_sched_get_priority_max_args *)); -int linux_sched_get_priority_min __P((struct thread *, struct linux_sched_get_priority_min_args *)); -int linux_mremap __P((struct thread *, struct linux_mremap_args *)); -int linux_setresuid16 __P((struct thread *, struct linux_setresuid16_args *)); -int linux_getresuid16 __P((struct thread *, struct linux_getresuid16_args *)); -int linux_vm86 __P((struct thread *, struct linux_vm86_args *)); -int linux_query_module __P((struct thread *, struct linux_query_module_args *)); -int linux_nfsservctl __P((struct thread *, struct linux_nfsservctl_args *)); -int linux_setresgid16 __P((struct thread *, struct linux_setresgid16_args *)); -int linux_getresgid16 __P((struct thread *, struct linux_getresgid16_args *)); -int linux_prctl __P((struct thread *, struct linux_prctl_args *)); -int linux_rt_sigreturn __P((struct thread *, struct linux_rt_sigreturn_args *)); -int linux_rt_sigaction __P((struct thread *, struct linux_rt_sigaction_args *)); -int linux_rt_sigprocmask __P((struct thread *, struct linux_rt_sigprocmask_args *)); -int linux_rt_sigpending __P((struct thread *, struct linux_rt_sigpending_args *)); -int linux_rt_sigtimedwait __P((struct thread *, struct linux_rt_sigtimedwait_args *)); -int linux_rt_sigqueueinfo __P((struct thread *, struct linux_rt_sigqueueinfo_args *)); -int linux_rt_sigsuspend __P((struct thread *, struct linux_rt_sigsuspend_args *)); -int linux_pread __P((struct thread *, struct linux_pread_args *)); -int linux_pwrite __P((struct thread *, struct linux_pwrite_args *)); -int linux_chown16 __P((struct thread *, struct linux_chown16_args *)); -int linux_getcwd __P((struct thread *, struct linux_getcwd_args *)); -int linux_capget __P((struct thread *, struct linux_capget_args *)); -int linux_capset __P((struct thread *, struct linux_capset_args *)); -int linux_sigaltstack __P((struct thread *, struct linux_sigaltstack_args *)); -int linux_sendfile __P((struct thread *, struct linux_sendfile_args *)); -int linux_vfork __P((struct thread *, struct linux_vfork_args *)); -int linux_getrlimit __P((struct thread *, struct linux_getrlimit_args *)); -int linux_mmap2 __P((struct thread *, struct linux_mmap2_args *)); -int linux_truncate64 __P((struct thread *, struct linux_truncate64_args *)); -int linux_ftruncate64 __P((struct thread *, struct linux_ftruncate64_args *)); -int linux_stat64 __P((struct thread *, struct linux_stat64_args *)); -int linux_lstat64 __P((struct thread *, struct linux_lstat64_args *)); -int linux_fstat64 __P((struct thread *, struct linux_fstat64_args *)); -int linux_lchown __P((struct thread *, struct linux_lchown_args *)); -int linux_getuid __P((struct thread *, struct linux_getuid_args *)); -int linux_getgid __P((struct thread *, struct linux_getgid_args *)); -int linux_getgroups __P((struct thread *, struct linux_getgroups_args *)); -int linux_setgroups __P((struct thread *, struct linux_setgroups_args *)); -int linux_chown __P((struct thread *, struct linux_chown_args *)); -int linux_setfsuid __P((struct thread *, struct linux_setfsuid_args *)); -int linux_setfsgid __P((struct thread *, struct linux_setfsgid_args *)); -int linux_pivot_root __P((struct thread *, struct linux_pivot_root_args *)); -int linux_mincore __P((struct thread *, struct linux_mincore_args *)); -int linux_madvise __P((struct thread *, struct linux_madvise_args *)); -int linux_getdents64 __P((struct thread *, struct linux_getdents64_args *)); -int linux_fcntl64 __P((struct thread *, struct linux_fcntl64_args *)); +int linux_fork(struct thread *, struct linux_fork_args *); +int linux_open(struct thread *, struct linux_open_args *); +int linux_waitpid(struct thread *, struct linux_waitpid_args *); +int linux_creat(struct thread *, struct linux_creat_args *); +int linux_link(struct thread *, struct linux_link_args *); +int linux_unlink(struct thread *, struct linux_unlink_args *); +int linux_execve(struct thread *, struct linux_execve_args *); +int linux_chdir(struct thread *, struct linux_chdir_args *); +int linux_time(struct thread *, struct linux_time_args *); +int linux_mknod(struct thread *, struct linux_mknod_args *); +int linux_chmod(struct thread *, struct linux_chmod_args *); +int linux_lchown16(struct thread *, struct linux_lchown16_args *); +int linux_stat(struct thread *, struct linux_stat_args *); +int linux_lseek(struct thread *, struct linux_lseek_args *); +int linux_getpid(struct thread *, struct linux_getpid_args *); +int linux_mount(struct thread *, struct linux_mount_args *); +int linux_oldumount(struct thread *, struct linux_oldumount_args *); +int linux_setuid16(struct thread *, struct linux_setuid16_args *); +int linux_getuid16(struct thread *, struct linux_getuid16_args *); +int linux_stime(struct thread *, struct linux_stime_args *); +int linux_ptrace(struct thread *, struct linux_ptrace_args *); +int linux_alarm(struct thread *, struct linux_alarm_args *); +int linux_fstat(struct thread *, struct linux_fstat_args *); +int linux_pause(struct thread *, struct linux_pause_args *); +int linux_utime(struct thread *, struct linux_utime_args *); +int linux_access(struct thread *, struct linux_access_args *); +int linux_nice(struct thread *, struct linux_nice_args *); +int linux_kill(struct thread *, struct linux_kill_args *); +int linux_rename(struct thread *, struct linux_rename_args *); +int linux_mkdir(struct thread *, struct linux_mkdir_args *); +int linux_rmdir(struct thread *, struct linux_rmdir_args *); +int linux_pipe(struct thread *, struct linux_pipe_args *); +int linux_times(struct thread *, struct linux_times_args *); +int linux_brk(struct thread *, struct linux_brk_args *); +int linux_setgid16(struct thread *, struct linux_setgid16_args *); +int linux_getgid16(struct thread *, struct linux_getgid16_args *); +int linux_signal(struct thread *, struct linux_signal_args *); +int linux_geteuid16(struct thread *, struct linux_geteuid16_args *); +int linux_getegid16(struct thread *, struct linux_getegid16_args *); +int linux_umount(struct thread *, struct linux_umount_args *); +int linux_ioctl(struct thread *, struct linux_ioctl_args *); +int linux_fcntl(struct thread *, struct linux_fcntl_args *); +int linux_olduname(struct thread *, struct linux_olduname_args *); +int linux_ustat(struct thread *, struct linux_ustat_args *); +int linux_sigaction(struct thread *, struct linux_sigaction_args *); +int linux_sgetmask(struct thread *, struct linux_sgetmask_args *); +int linux_ssetmask(struct thread *, struct linux_ssetmask_args *); +int linux_setreuid16(struct thread *, struct linux_setreuid16_args *); +int linux_setregid16(struct thread *, struct linux_setregid16_args *); +int linux_sigsuspend(struct thread *, struct linux_sigsuspend_args *); +int linux_sigpending(struct thread *, struct linux_sigpending_args *); +int linux_setrlimit(struct thread *, struct linux_setrlimit_args *); +int linux_old_getrlimit(struct thread *, struct linux_old_getrlimit_args *); +int linux_getgroups16(struct thread *, struct linux_getgroups16_args *); +int linux_setgroups16(struct thread *, struct linux_setgroups16_args *); +int linux_old_select(struct thread *, struct linux_old_select_args *); +int linux_symlink(struct thread *, struct linux_symlink_args *); +int linux_readlink(struct thread *, struct linux_readlink_args *); +int linux_uselib(struct thread *, struct linux_uselib_args *); +int linux_reboot(struct thread *, struct linux_reboot_args *); +int linux_readdir(struct thread *, struct linux_readdir_args *); +int linux_mmap(struct thread *, struct linux_mmap_args *); +int linux_truncate(struct thread *, struct linux_truncate_args *); +int linux_statfs(struct thread *, struct linux_statfs_args *); +int linux_fstatfs(struct thread *, struct linux_fstatfs_args *); +int linux_ioperm(struct thread *, struct linux_ioperm_args *); +int linux_socketcall(struct thread *, struct linux_socketcall_args *); +int linux_syslog(struct thread *, struct linux_syslog_args *); +int linux_setitimer(struct thread *, struct linux_setitimer_args *); +int linux_getitimer(struct thread *, struct linux_getitimer_args *); +int linux_newstat(struct thread *, struct linux_newstat_args *); +int linux_newlstat(struct thread *, struct linux_newlstat_args *); +int linux_newfstat(struct thread *, struct linux_newfstat_args *); +int linux_uname(struct thread *, struct linux_uname_args *); +int linux_iopl(struct thread *, struct linux_iopl_args *); +int linux_vhangup(struct thread *, struct linux_vhangup_args *); +int linux_vm86old(struct thread *, struct linux_vm86old_args *); +int linux_wait4(struct thread *, struct linux_wait4_args *); +int linux_swapoff(struct thread *, struct linux_swapoff_args *); +int linux_sysinfo(struct thread *, struct linux_sysinfo_args *); +int linux_ipc(struct thread *, struct linux_ipc_args *); +int linux_sigreturn(struct thread *, struct linux_sigreturn_args *); +int linux_clone(struct thread *, struct linux_clone_args *); +int linux_newuname(struct thread *, struct linux_newuname_args *); +int linux_modify_ldt(struct thread *, struct linux_modify_ldt_args *); +int linux_adjtimex(struct thread *, struct linux_adjtimex_args *); +int linux_sigprocmask(struct thread *, struct linux_sigprocmask_args *); +int linux_create_module(struct thread *, struct linux_create_module_args *); +int linux_init_module(struct thread *, struct linux_init_module_args *); +int linux_delete_module(struct thread *, struct linux_delete_module_args *); +int linux_get_kernel_syms(struct thread *, struct linux_get_kernel_syms_args *); +int linux_quotactl(struct thread *, struct linux_quotactl_args *); +int linux_bdflush(struct thread *, struct linux_bdflush_args *); +int linux_sysfs(struct thread *, struct linux_sysfs_args *); +int linux_personality(struct thread *, struct linux_personality_args *); +int linux_setfsuid16(struct thread *, struct linux_setfsuid16_args *); +int linux_setfsgid16(struct thread *, struct linux_setfsgid16_args *); +int linux_llseek(struct thread *, struct linux_llseek_args *); +int linux_getdents(struct thread *, struct linux_getdents_args *); +int linux_select(struct thread *, struct linux_select_args *); +int linux_msync(struct thread *, struct linux_msync_args *); +int linux_getsid(struct thread *, struct linux_getsid_args *); +int linux_fdatasync(struct thread *, struct linux_fdatasync_args *); +int linux_sysctl(struct thread *, struct linux_sysctl_args *); +int linux_sched_setscheduler(struct thread *, struct linux_sched_setscheduler_args *); +int linux_sched_getscheduler(struct thread *, struct linux_sched_getscheduler_args *); +int linux_sched_get_priority_max(struct thread *, struct linux_sched_get_priority_max_args *); +int linux_sched_get_priority_min(struct thread *, struct linux_sched_get_priority_min_args *); +int linux_mremap(struct thread *, struct linux_mremap_args *); +int linux_setresuid16(struct thread *, struct linux_setresuid16_args *); +int linux_getresuid16(struct thread *, struct linux_getresuid16_args *); +int linux_vm86(struct thread *, struct linux_vm86_args *); +int linux_query_module(struct thread *, struct linux_query_module_args *); +int linux_nfsservctl(struct thread *, struct linux_nfsservctl_args *); +int linux_setresgid16(struct thread *, struct linux_setresgid16_args *); +int linux_getresgid16(struct thread *, struct linux_getresgid16_args *); +int linux_prctl(struct thread *, struct linux_prctl_args *); +int linux_rt_sigreturn(struct thread *, struct linux_rt_sigreturn_args *); +int linux_rt_sigaction(struct thread *, struct linux_rt_sigaction_args *); +int linux_rt_sigprocmask(struct thread *, struct linux_rt_sigprocmask_args *); +int linux_rt_sigpending(struct thread *, struct linux_rt_sigpending_args *); +int linux_rt_sigtimedwait(struct thread *, struct linux_rt_sigtimedwait_args *); +int linux_rt_sigqueueinfo(struct thread *, struct linux_rt_sigqueueinfo_args *); +int linux_rt_sigsuspend(struct thread *, struct linux_rt_sigsuspend_args *); +int linux_pread(struct thread *, struct linux_pread_args *); +int linux_pwrite(struct thread *, struct linux_pwrite_args *); +int linux_chown16(struct thread *, struct linux_chown16_args *); +int linux_getcwd(struct thread *, struct linux_getcwd_args *); +int linux_capget(struct thread *, struct linux_capget_args *); +int linux_capset(struct thread *, struct linux_capset_args *); +int linux_sigaltstack(struct thread *, struct linux_sigaltstack_args *); +int linux_sendfile(struct thread *, struct linux_sendfile_args *); +int linux_vfork(struct thread *, struct linux_vfork_args *); +int linux_getrlimit(struct thread *, struct linux_getrlimit_args *); +int linux_mmap2(struct thread *, struct linux_mmap2_args *); +int linux_truncate64(struct thread *, struct linux_truncate64_args *); +int linux_ftruncate64(struct thread *, struct linux_ftruncate64_args *); +int linux_stat64(struct thread *, struct linux_stat64_args *); +int linux_lstat64(struct thread *, struct linux_lstat64_args *); +int linux_fstat64(struct thread *, struct linux_fstat64_args *); +int linux_lchown(struct thread *, struct linux_lchown_args *); +int linux_getuid(struct thread *, struct linux_getuid_args *); +int linux_getgid(struct thread *, struct linux_getgid_args *); +int linux_getgroups(struct thread *, struct linux_getgroups_args *); +int linux_setgroups(struct thread *, struct linux_setgroups_args *); +int linux_chown(struct thread *, struct linux_chown_args *); +int linux_setfsuid(struct thread *, struct linux_setfsuid_args *); +int linux_setfsgid(struct thread *, struct linux_setfsgid_args *); +int linux_pivot_root(struct thread *, struct linux_pivot_root_args *); +int linux_mincore(struct thread *, struct linux_mincore_args *); +int linux_madvise(struct thread *, struct linux_madvise_args *); +int linux_getdents64(struct thread *, struct linux_getdents64_args *); +int linux_fcntl64(struct thread *, struct linux_fcntl64_args *); #ifdef COMPAT_43 diff --git a/sys/i386/linux/linux_sysvec.c b/sys/i386/linux/linux_sysvec.c index 4e273fa..42d150e 100644 --- a/sys/i386/linux/linux_sysvec.c +++ b/sys/i386/linux/linux_sysvec.c @@ -92,14 +92,14 @@ extern struct sysent linux_sysent[LINUX_SYS_MAXSYSCALL]; SET_DECLARE(linux_ioctl_handler_set, struct linux_ioctl_handler); -static int linux_fixup __P((register_t **stack_base, - struct image_params *iparams)); -static int elf_linux_fixup __P((register_t **stack_base, - struct image_params *iparams)); -static void linux_prepsyscall __P((struct trapframe *tf, int *args, - u_int *code, caddr_t *params)); -static void linux_sendsig __P((sig_t catcher, int sig, sigset_t *mask, - u_long code)); +static int linux_fixup(register_t **stack_base, + struct image_params *iparams); +static int elf_linux_fixup(register_t **stack_base, + struct image_params *iparams); +static void linux_prepsyscall(struct trapframe *tf, int *args, + u_int *code, caddr_t *params); +static void linux_sendsig(sig_t catcher, int sig, sigset_t *mask, + u_long code); /* * Linux syscalls return negative errno's, we do positive and map them @@ -717,7 +717,7 @@ linux_prepsyscall(struct trapframe *tf, int *args, u_int *code, caddr_t *params) * be able to modify the interpreter path. We only do this if a linux * binary is doing the exec, so we do not create an EXEC module for it. */ -static int exec_linux_imgact_try __P((struct image_params *iparams)); +static int exec_linux_imgact_try(struct image_params *iparams); static int exec_linux_imgact_try(imgp) diff --git a/sys/i386/svr4/svr4_machdep.c b/sys/i386/svr4/svr4_machdep.c index 42e565c..c82718d 100644 --- a/sys/i386/svr4/svr4_machdep.c +++ b/sys/i386/svr4/svr4_machdep.c @@ -66,7 +66,7 @@ extern int svr4_szsigcode; extern char svr4_sigcode[]; extern int _udatasel, _ucodesel; -static void svr4_getsiginfo __P((union svr4_siginfo *, int, u_long, caddr_t)); +static void svr4_getsiginfo(union svr4_siginfo *, int, u_long, caddr_t); #if !defined(__NetBSD__) /* taken from /sys/arch/i386/include/psl.h on NetBSD-1.3 */ diff --git a/sys/i386/svr4/svr4_machdep.h b/sys/i386/svr4/svr4_machdep.h index f6f58e3..b3d1744 100644 --- a/sys/i386/svr4/svr4_machdep.h +++ b/sys/i386/svr4/svr4_machdep.h @@ -74,9 +74,8 @@ typedef struct { struct thread; struct svr4_ucontext; -void svr4_getcontext __P((struct thread *, struct svr4_ucontext *, - sigset_t *, int)); -int svr4_setcontext __P((struct thread *p, struct svr4_ucontext *)); +void svr4_getcontext(struct thread *, struct svr4_ucontext *, sigset_t *, int); +int svr4_setcontext(struct thread *p, struct svr4_ucontext *); typedef struct { svr4_gregset_t greg; |