Use callout_func_t instead of the deprecated timeout_t.
Reviewed by: kib, imp Differential Revision: https://reviews.freebsd.org/D22752
This commit is contained in:
parent
a8a03706fb
commit
5773ac113c
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=355601
@ -825,7 +825,7 @@ static void adadone(struct cam_periph *periph,
|
||||
union ccb *done_ccb);
|
||||
static int adaerror(union ccb *ccb, u_int32_t cam_flags,
|
||||
u_int32_t sense_flags);
|
||||
static timeout_t adasendorderedtag;
|
||||
static callout_func_t adasendorderedtag;
|
||||
static void adashutdown(void *arg, int howto);
|
||||
static void adasuspend(void *arg);
|
||||
static void adaresume(void *arg);
|
||||
|
@ -247,7 +247,7 @@ static union ccb *xpt_get_ccb_nowait(struct cam_periph *periph);
|
||||
static void xpt_run_allocq(struct cam_periph *periph, int sleep);
|
||||
static void xpt_run_allocq_task(void *context, int pending);
|
||||
static void xpt_run_devq(struct cam_devq *devq);
|
||||
static timeout_t xpt_release_devq_timeout;
|
||||
static callout_func_t xpt_release_devq_timeout;
|
||||
static void xpt_release_simq_timeout(void *arg) __unused;
|
||||
static void xpt_acquire_bus(struct cam_eb *bus);
|
||||
static void xpt_release_bus(struct cam_eb *bus);
|
||||
|
@ -302,7 +302,7 @@ static int cdsendkey(struct cam_periph *periph,
|
||||
struct dvd_authinfo *authinfo);
|
||||
static int cdreaddvdstructure(struct cam_periph *periph,
|
||||
struct dvd_struct *dvdstruct);
|
||||
static timeout_t cdmediapoll;
|
||||
static callout_func_t cdmediapoll;
|
||||
|
||||
static struct periph_driver cddriver =
|
||||
{
|
||||
|
@ -1492,9 +1492,9 @@ static void dasetgeom(struct cam_periph *periph, uint32_t block_len,
|
||||
uint64_t maxsector,
|
||||
struct scsi_read_capacity_data_long *rcaplong,
|
||||
size_t rcap_size);
|
||||
static timeout_t dasendorderedtag;
|
||||
static callout_func_t dasendorderedtag;
|
||||
static void dashutdown(void *arg, int howto);
|
||||
static timeout_t damediapoll;
|
||||
static callout_func_t damediapoll;
|
||||
|
||||
#ifndef DA_DEFAULT_POLL_PERIOD
|
||||
#define DA_DEFAULT_POLL_PERIOD 3
|
||||
|
@ -112,7 +112,7 @@ typedef struct callout aic_timer_t;
|
||||
|
||||
/****************************** Error Recovery ********************************/
|
||||
void aic_set_recoveryscb(struct aic_softc *aic, struct scb *scb);
|
||||
timeout_t aic_platform_timeout;
|
||||
callout_func_t aic_platform_timeout;
|
||||
int aic_spawn_recovery_thread(struct aic_softc *aic);
|
||||
void aic_terminate_recovery_thread(struct aic_softc *aic);
|
||||
|
||||
|
@ -57,8 +57,8 @@ static void isp_loop_changed(ispsoftc_t *isp, int chan);
|
||||
static d_ioctl_t ispioctl;
|
||||
static void isp_cam_async(void *, uint32_t, struct cam_path *, void *);
|
||||
static void isp_poll(struct cam_sim *);
|
||||
static timeout_t isp_watchdog;
|
||||
static timeout_t isp_gdt;
|
||||
static callout_func_t isp_watchdog;
|
||||
static callout_func_t isp_gdt;
|
||||
static task_fn_t isp_gdt_task;
|
||||
static void isp_kthread(void *);
|
||||
static void isp_action(struct cam_sim *, union ccb *);
|
||||
@ -764,8 +764,8 @@ static cam_status create_lun_state(ispsoftc_t *, int, struct cam_path *, tstate_
|
||||
static void destroy_lun_state(ispsoftc_t *, int, tstate_t *);
|
||||
static void isp_enable_lun(ispsoftc_t *, union ccb *);
|
||||
static void isp_disable_lun(ispsoftc_t *, union ccb *);
|
||||
static timeout_t isp_refire_putback_atio;
|
||||
static timeout_t isp_refire_notify_ack;
|
||||
static callout_func_t isp_refire_putback_atio;
|
||||
static callout_func_t isp_refire_notify_ack;
|
||||
static void isp_complete_ctio(union ccb *);
|
||||
static void isp_target_putback_atio(union ccb *);
|
||||
enum Start_Ctio_How { FROM_CAM, FROM_TIMER, FROM_SRR, FROM_CTIO_DONE };
|
||||
|
@ -185,7 +185,7 @@ typedef struct kbdmux_state kbdmux_state_t;
|
||||
*****************************************************************************/
|
||||
|
||||
static task_fn_t kbdmux_kbd_intr;
|
||||
static timeout_t kbdmux_kbd_intr_timo;
|
||||
static callout_func_t kbdmux_kbd_intr_timo;
|
||||
static kbd_callback_func_t kbdmux_kbd_event;
|
||||
|
||||
static void
|
||||
|
@ -113,7 +113,7 @@ __FBSDID("$FreeBSD$");
|
||||
#include <sys/sysctl.h>
|
||||
|
||||
static void mpt_poll(struct cam_sim *);
|
||||
static timeout_t mpt_timeout;
|
||||
static callout_func_t mpt_timeout;
|
||||
static void mpt_action(struct cam_sim *, union ccb *);
|
||||
static int
|
||||
mpt_get_spi_settings(struct mpt_softc *, struct ccb_trans_settings *);
|
||||
|
@ -107,7 +107,7 @@ static int mpt_raid_reply_frame_handler(struct mpt_softc *mpt, request_t *req,
|
||||
static int mpt_spawn_raid_thread(struct mpt_softc *mpt);
|
||||
static void mpt_terminate_raid_thread(struct mpt_softc *mpt);
|
||||
static void mpt_raid_thread(void *arg);
|
||||
static timeout_t mpt_raid_timer;
|
||||
static callout_func_t mpt_raid_timer;
|
||||
#if 0
|
||||
static void mpt_enable_vol(struct mpt_softc *mpt,
|
||||
struct mpt_raid_volume *mpt_vol, int enable);
|
||||
|
@ -45,7 +45,7 @@ static MALLOC_DEFINE(M_OCS, "OCS", "OneCore Storage data");
|
||||
|
||||
#include <machine/bus.h>
|
||||
|
||||
timeout_t __ocs_callout;
|
||||
callout_func_t __ocs_callout;
|
||||
|
||||
uint32_t
|
||||
ocs_config_read32(ocs_os_handle_t os, uint32_t reg)
|
||||
|
@ -140,7 +140,7 @@ struct lpt_data {
|
||||
|
||||
#define LPT_NAME "lpt" /* our official name */
|
||||
|
||||
static timeout_t lptout;
|
||||
static callout_func_t lptout;
|
||||
static int lpt_port_test(device_t dev, u_char data, u_char mask);
|
||||
static int lpt_detect(device_t dev);
|
||||
|
||||
|
@ -116,7 +116,7 @@ static void send_frame_header(struct sbni_softc *, u_int32_t *);
|
||||
static void set_initial_values(struct sbni_softc *, struct sbni_flags);
|
||||
|
||||
static u_int32_t calc_crc32(u_int32_t, caddr_t, u_int);
|
||||
static timeout_t sbni_timeout;
|
||||
static callout_func_t sbni_timeout;
|
||||
|
||||
static __inline u_char sbni_inb(struct sbni_softc *, enum sbni_reg);
|
||||
static __inline void sbni_outb(struct sbni_softc *, enum sbni_reg, u_char);
|
||||
|
@ -122,7 +122,7 @@ static void smc_task_rx(void *, int);
|
||||
static void smc_task_tx(void *, int);
|
||||
|
||||
static driver_filter_t smc_intr;
|
||||
static timeout_t smc_watchdog;
|
||||
static callout_func_t smc_watchdog;
|
||||
#ifdef DEVICE_POLLING
|
||||
static poll_handler_t smc_poll;
|
||||
#endif
|
||||
|
@ -199,7 +199,7 @@ static void sc_puts(scr_stat *scp, u_char *buf, int len);
|
||||
static void sccnupdate(scr_stat *scp);
|
||||
static scr_stat *alloc_scp(sc_softc_t *sc, int vty);
|
||||
static void init_scp(sc_softc_t *sc, int vty, scr_stat *scp);
|
||||
static timeout_t scrn_timer;
|
||||
static callout_func_t scrn_timer;
|
||||
static int and_region(int *s1, int *e1, int s2, int e2);
|
||||
static void scrn_update(scr_stat *scp, int show_cursor);
|
||||
|
||||
@ -232,7 +232,7 @@ static int save_kbd_state(scr_stat *scp);
|
||||
static int update_kbd_state(scr_stat *scp, int state, int mask);
|
||||
static int update_kbd_leds(scr_stat *scp, int which);
|
||||
static int sc_kattr(void);
|
||||
static timeout_t blink_screen;
|
||||
static callout_func_t blink_screen;
|
||||
static struct tty *sc_alloc_tty(int, int);
|
||||
|
||||
static cn_probe_t sc_cnprobe;
|
||||
|
@ -447,7 +447,7 @@ uart_intr(void *arg)
|
||||
|
||||
if (sc->sc_polled) {
|
||||
callout_reset(&sc->sc_timer, hz / uart_poll_freq,
|
||||
(timeout_t *)uart_intr, sc);
|
||||
(callout_func_t *)uart_intr, sc);
|
||||
}
|
||||
|
||||
return ((cnt == 0) ? FILTER_STRAY :
|
||||
@ -712,7 +712,7 @@ uart_bus_attach(device_t dev)
|
||||
sc->sc_polled = 1;
|
||||
callout_init(&sc->sc_timer, 1);
|
||||
callout_reset(&sc->sc_timer, hz / uart_poll_freq,
|
||||
(timeout_t *)uart_intr, sc);
|
||||
(callout_func_t *)uart_intr, sc);
|
||||
}
|
||||
|
||||
if (bootverbose && (sc->sc_fastintr || sc->sc_polled)) {
|
||||
|
@ -522,7 +522,7 @@ void ng_netflow_cache_flush(priv_p);
|
||||
int ng_netflow_fib_init(priv_p priv, int fib);
|
||||
void ng_netflow_copyinfo(priv_p, struct ng_netflow_info *);
|
||||
void ng_netflow_copyv9info(priv_p, struct ng_netflow_v9info *);
|
||||
timeout_t ng_netflow_expire;
|
||||
callout_func_t ng_netflow_expire;
|
||||
int ng_netflow_flow_add(priv_p, fib_export_p, struct ip *, caddr_t,
|
||||
uint8_t, uint8_t, unsigned int);
|
||||
int ng_netflow_flow6_add(priv_p, fib_export_p, struct ip6_hdr *, caddr_t,
|
||||
|
@ -839,7 +839,7 @@ void
|
||||
tcp_timer_activate(struct tcpcb *tp, uint32_t timer_type, u_int delta)
|
||||
{
|
||||
struct callout *t_callout;
|
||||
timeout_t *f_callout;
|
||||
callout_func_t *f_callout;
|
||||
struct inpcb *inp = tp->t_inpcb;
|
||||
int cpu = inp_to_cpuid(inp);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user