diff --git a/Documentation/NuttxPortingGuide.html b/Documentation/NuttxPortingGuide.html index 5338d87b916..eaabd9e9b31 100644 --- a/Documentation/NuttxPortingGuide.html +++ b/Documentation/NuttxPortingGuide.html @@ -3042,7 +3042,7 @@ VxWorks provides the following comparable interface: When a watchdog expires, the callback function with this type is called: 

-    typedef void (*wdentry_t)(int argc, ...);
+    typedef void (*wdentry_t)(int argc, wdparm_t arg1, ...);

Where argc is the number of wdparm_t type arguments that follow. diff --git a/arch/arm/src/c5471/c5471_ethernet.c b/arch/arm/src/c5471/c5471_ethernet.c index 993319eb12d..9e21d88f846 100644 --- a/arch/arm/src/c5471/c5471_ethernet.c +++ b/arch/arm/src/c5471/c5471_ethernet.c @@ -408,10 +408,10 @@ static int c5471_interrupt(int irq, FAR void *context, FAR void *arg); /* Watchdog timer expirations */ static void c5471_txtimeout_work(FAR void *arg); -static void c5471_txtimeout_expiry(int argc, uint32_t arg, ...); +static void c5471_txtimeout_expiry(int argc, wdparm_t arg, ...); static void c5471_poll_work(FAR void *arg); -static void c5471_poll_expiry(int argc, uint32_t arg, ...); +static void c5471_poll_expiry(int argc, wdparm_t arg, ...); /* NuttX callback functions */ diff --git a/arch/arm/src/cxd56xx/cxd56_i2c.c b/arch/arm/src/cxd56xx/cxd56_i2c.c index 3a1610c998c..47a8b90b3c1 100644 --- a/arch/arm/src/cxd56xx/cxd56_i2c.c +++ b/arch/arm/src/cxd56xx/cxd56_i2c.c @@ -162,7 +162,7 @@ static int cxd56_i2c_disable(struct cxd56_i2cdev_s *priv); static void cxd56_i2c_enable(struct cxd56_i2cdev_s *priv); static int cxd56_i2c_interrupt(int irq, FAR void *context, FAR void *arg); -static void cxd56_i2c_timeout(int argc, uint32_t arg, ...); +static void cxd56_i2c_timeout(int argc, wdparm_t arg, ...); static void cxd56_i2c_setfrequency(struct cxd56_i2cdev_s *priv, uint32_t frequency); static int cxd56_i2c_transfer(FAR struct i2c_master_s *dev, @@ -383,7 +383,7 @@ static void cxd56_i2c_setfrequency(struct cxd56_i2cdev_s *priv, * ****************************************************************************/ -static void cxd56_i2c_timeout(int argc, uint32_t arg, ...) +static void cxd56_i2c_timeout(int argc, wdparm_t arg, ...) { struct cxd56_i2cdev_s *priv = (struct cxd56_i2cdev_s *)arg; irqstate_t flags = enter_critical_section(); @@ -550,8 +550,8 @@ static int cxd56_i2c_receive(struct cxd56_i2cdev_s *priv, int last) } flags = enter_critical_section(); - wd_start(priv->timeout, I2C_TIMEOUT, cxd56_i2c_timeout, 1, - (uint32_t)priv); + wd_start(priv->timeout, I2C_TIMEOUT, + cxd56_i2c_timeout, 1, (wdparm_t)priv); /* Set stop flag for indicate the last data */ @@ -596,7 +596,8 @@ static int cxd56_i2c_send(struct cxd56_i2cdev_s *priv, int last) while (!(i2c_reg_read(priv, CXD56_IC_STATUS) & STATUS_TFNF)); flags = enter_critical_section(); - wd_start(priv->timeout, I2C_TIMEOUT, cxd56_i2c_timeout, 1, (uint32_t)priv); + wd_start(priv->timeout, I2C_TIMEOUT, + cxd56_i2c_timeout, 1, (wdparm_t)priv); i2c_reg_write(priv, CXD56_IC_DATA_CMD, (uint32_t)msg->buffer[i] | (last ? CMD_STOP : 0)); diff --git a/arch/arm/src/cxd56xx/cxd56_icc.c b/arch/arm/src/cxd56xx/cxd56_icc.c index 92dcdc903a1..5ff9b3fc7cc 100644 --- a/arch/arm/src/cxd56xx/cxd56_icc.c +++ b/arch/arm/src/cxd56xx/cxd56_icc.c @@ -307,7 +307,7 @@ static int icc_msghandler(int cpuid, int protoid, uint32_t pdata, return -1; } -static void icc_rxtimeout(int argc, uint32_t arg, ...) +static void icc_rxtimeout(int argc, wdparm_t arg, ...) { FAR struct iccdev_s *priv = (FAR struct iccdev_s *)arg; icc_semgive(&priv->rxwait); @@ -338,7 +338,7 @@ static int icc_recv(FAR struct iccdev_s *priv, FAR iccmsg_t *msg, int32_t ms) { int32_t timo; timo = ms * 1000 / CONFIG_USEC_PER_TICK; - wd_start(priv->rxtimeout, timo, icc_rxtimeout, 1, (uint32_t)priv); + wd_start(priv->rxtimeout, timo, icc_rxtimeout, 1, (wdparm_t)priv); icc_semtake(&priv->rxwait); diff --git a/arch/arm/src/cxd56xx/cxd56_rtc.c b/arch/arm/src/cxd56xx/cxd56_rtc.c index 44513d4125c..4b416a3d6a6 100644 --- a/arch/arm/src/cxd56xx/cxd56_rtc.c +++ b/arch/arm/src/cxd56xx/cxd56_rtc.c @@ -250,7 +250,7 @@ static int cxd56_rtc_interrupt(int irq, FAR void *context, FAR void *arg) * ****************************************************************************/ -static void cxd56_rtc_initialize(int argc, uint32_t arg, ...) +static void cxd56_rtc_initialize(int argc, ...) { struct timespec ts; #ifdef CONFIG_CXD56_RTC_LATEINIT @@ -279,7 +279,7 @@ static void cxd56_rtc_initialize(int argc, uint32_t arg, ...) rtcinfo("retry count: %d\n", s_retry); if (OK == wd_start(s_wdog, MSEC2TICK(RTC_CLOCK_CHECK_INTERVAL), - cxd56_rtc_initialize, 1, (wdparm_t)NULL)) + (wdentry_t)cxd56_rtc_initialize, 0)) { /* Again, this function is called recursively */ diff --git a/arch/arm/src/cxd56xx/cxd56_sdhci.c b/arch/arm/src/cxd56xx/cxd56_sdhci.c index 8de702a6c0d..538db00808f 100644 --- a/arch/arm/src/cxd56xx/cxd56_sdhci.c +++ b/arch/arm/src/cxd56xx/cxd56_sdhci.c @@ -359,7 +359,7 @@ static void cxd56_datadisable(void); static void cxd56_transmit(struct cxd56_sdiodev_s *priv); static void cxd56_receive(struct cxd56_sdiodev_s *priv); #endif -static void cxd56_eventtimeout(int argc, uint32_t arg, ...); +static void cxd56_eventtimeout(int argc, wdparm_t arg, ...); static void cxd56_endwait(struct cxd56_sdiodev_s *priv, sdio_eventset_t wkupevent); static void cxd56_endtransfer(struct cxd56_sdiodev_s *priv, @@ -971,7 +971,7 @@ static void cxd56_receive(struct cxd56_sdiodev_s *priv) * ****************************************************************************/ -static void cxd56_eventtimeout(int argc, uint32_t arg, ...) +static void cxd56_eventtimeout(int argc, wdparm_t arg, ...) { struct cxd56_sdiodev_s *priv = (struct cxd56_sdiodev_s *)arg; @@ -2594,8 +2594,8 @@ static sdio_eventset_t cxd56_sdio_eventwait(FAR struct sdio_dev_s *dev, /* Start the watchdog timer */ delay = MSEC2TICK(timeout); - ret = wd_start(priv->waitwdog, delay, cxd56_eventtimeout, - 1, (uint32_t)priv); + ret = wd_start(priv->waitwdog, delay, + cxd56_eventtimeout, 1, (wdparm_t)priv); if (ret != OK) { mcerr("ERROR: wd_start failed: %d\n", ret); diff --git a/arch/arm/src/efm32/efm32_spi.c b/arch/arm/src/efm32/efm32_spi.c index 5be0432f34f..a1c278417c2 100644 --- a/arch/arm/src/efm32/efm32_spi.c +++ b/arch/arm/src/efm32/efm32_spi.c @@ -161,7 +161,7 @@ static void spi_wait_status(const struct efm32_spiconfig_s *config, /* DMA support */ #ifdef CONFIG_EFM32_SPI_DMA -static void spi_dma_timeout(int argc, uint32_t arg1, ...); +static void spi_dma_timeout(int argc, wdparm_t arg1, ...); static void spi_dmarxwait(struct efm32_spidev_s *priv); static void spi_dmatxwait(struct efm32_spidev_s *priv); static inline void spi_dmarxwakeup(struct efm32_spidev_s *priv); @@ -407,7 +407,7 @@ static void spi_wait_status(const struct efm32_spiconfig_s *config, ****************************************************************************/ #ifdef CONFIG_EFM32_SPI_DMA -static void spi_dma_timeout(int argc, uint32_t arg1, ...) +static void spi_dma_timeout(int argc, wdparm_t arg1, ...) { struct efm32_spidev_s *priv = (struct efm32_spidev_s *)((uintptr_t)arg1); @@ -1465,8 +1465,8 @@ static void spi_exchange(struct spi_dev_s *dev, const void *txbuffer, * when both RX and TX transfers complete. */ - ret = wd_start(priv->wdog, (int)ticks, spi_dma_timeout, 1, - (uint32_t)priv); + ret = wd_start(priv->wdog, (int)ticks, + spi_dma_timeout, 1, (wdparm_t)priv); if (ret < 0) { spierr("ERROR: Failed to start timeout: %d\n", ret); diff --git a/arch/arm/src/imxrt/imxrt_enet.c b/arch/arm/src/imxrt/imxrt_enet.c index b1b8105d110..3b745520c92 100644 --- a/arch/arm/src/imxrt/imxrt_enet.c +++ b/arch/arm/src/imxrt/imxrt_enet.c @@ -336,10 +336,10 @@ static int imxrt_enet_interrupt(int irq, FAR void *context, FAR void *arg); /* Watchdog timer expirations */ static void imxrt_txtimeout_work(FAR void *arg); -static void imxrt_txtimeout_expiry(int argc, uint32_t arg, ...); +static void imxrt_txtimeout_expiry(int argc, wdparm_t arg, ...); static void imxrt_poll_work(FAR void *arg); -static void imxrt_polltimer_expiry(int argc, uint32_t arg, ...); +static void imxrt_polltimer_expiry(int argc, wdparm_t arg, ...); /* NuttX callback functions */ @@ -565,8 +565,8 @@ static int imxrt_transmit(FAR struct imxrt_driver_s *priv) /* Setup the TX timeout watchdog (perhaps restarting the timer) */ - wd_start(priv->txtimeout, IMXRT_TXTIMEOUT, imxrt_txtimeout_expiry, 1, - (wdparm_t)priv); + wd_start(priv->txtimeout, IMXRT_TXTIMEOUT, + imxrt_txtimeout_expiry, 1, (wdparm_t)priv); /* Start the TX transfer (if it was not already waiting for buffers) */ @@ -1182,7 +1182,7 @@ static void imxrt_txtimeout_work(FAR void *arg) * ****************************************************************************/ -static void imxrt_txtimeout_expiry(int argc, uint32_t arg, ...) +static void imxrt_txtimeout_expiry(int argc, wdparm_t arg, ...) { FAR struct imxrt_driver_s *priv = (FAR struct imxrt_driver_s *)arg; @@ -1239,8 +1239,8 @@ static void imxrt_poll_work(FAR void *arg) /* Setup the watchdog poll timer again in any case */ - wd_start(priv->txpoll, IMXRT_WDDELAY, imxrt_polltimer_expiry, - 1, (wdparm_t)priv); + wd_start(priv->txpoll, IMXRT_WDDELAY, + imxrt_polltimer_expiry, 1, (wdparm_t)priv); net_unlock(); } @@ -1262,7 +1262,7 @@ static void imxrt_poll_work(FAR void *arg) * ****************************************************************************/ -static void imxrt_polltimer_expiry(int argc, uint32_t arg, ...) +static void imxrt_polltimer_expiry(int argc, wdparm_t arg, ...) { FAR struct imxrt_driver_s *priv = (FAR struct imxrt_driver_s *)arg; @@ -1371,8 +1371,8 @@ static int imxrt_ifup_action(struct net_driver_s *dev, bool resetphy) /* Set and activate a timer process */ - wd_start(priv->txpoll, IMXRT_WDDELAY, imxrt_polltimer_expiry, 1, - (wdparm_t)priv); + wd_start(priv->txpoll, IMXRT_WDDELAY, + imxrt_polltimer_expiry, 1, (wdparm_t)priv); /* Clear all pending ENET interrupt */ diff --git a/arch/arm/src/imxrt/imxrt_usdhc.c b/arch/arm/src/imxrt/imxrt_usdhc.c index b3da9035a90..b6a154ea39f 100644 --- a/arch/arm/src/imxrt/imxrt_usdhc.c +++ b/arch/arm/src/imxrt/imxrt_usdhc.c @@ -288,7 +288,7 @@ static void imxrt_transmit(struct imxrt_dev_s *priv); static void imxrt_receive(struct imxrt_dev_s *priv); #endif -static void imxrt_eventtimeout(int argc, uint32_t arg, ...); +static void imxrt_eventtimeout(int argc, wdparm_t arg, ...); static void imxrt_endwait(struct imxrt_dev_s *priv, sdio_eventset_t wkupevent); static void imxrt_endtransfer(struct imxrt_dev_s *priv, @@ -1017,7 +1017,7 @@ static void imxrt_receive(struct imxrt_dev_s *priv) * ****************************************************************************/ -static void imxrt_eventtimeout(int argc, uint32_t arg, ...) +static void imxrt_eventtimeout(int argc, wdparm_t arg, ...) { struct imxrt_dev_s *priv = (struct imxrt_dev_s *)arg; @@ -2708,8 +2708,8 @@ static sdio_eventset_t imxrt_eventwait(FAR struct sdio_dev_s *dev, /* Start the watchdog timer */ delay = MSEC2TICK(timeout); - ret = wd_start(priv->waitwdog, delay, imxrt_eventtimeout, - 1, (uint32_t) priv); + ret = wd_start(priv->waitwdog, delay, + imxrt_eventtimeout, 1, (wdparm_t)priv); if (ret < 0) { diff --git a/arch/arm/src/kinetis/kinetis_enet.c b/arch/arm/src/kinetis/kinetis_enet.c index ff3cdf173f0..2e62a8ab00c 100644 --- a/arch/arm/src/kinetis/kinetis_enet.c +++ b/arch/arm/src/kinetis/kinetis_enet.c @@ -306,10 +306,10 @@ static int kinetis_interrupt(int irq, FAR void *context, FAR void *arg); /* Watchdog timer expirations */ static void kinetis_txtimeout_work(FAR void *arg); -static void kinetis_txtimeout_expiry(int argc, uint32_t arg, ...); +static void kinetis_txtimeout_expiry(int argc, wdparm_t arg, ...); static void kinetis_poll_work(FAR void *arg); -static void kinetis_polltimer_expiry(int argc, uint32_t arg, ...); +static void kinetis_polltimer_expiry(int argc, wdparm_t arg, ...); /* NuttX callback functions */ @@ -520,8 +520,8 @@ static int kinetis_transmit(FAR struct kinetis_driver_s *priv) /* Setup the TX timeout watchdog (perhaps restarting the timer) */ - wd_start(priv->txtimeout, KINETIS_TXTIMEOUT, kinetis_txtimeout_expiry, - 1, (wdparm_t)priv); + wd_start(priv->txtimeout, KINETIS_TXTIMEOUT, + kinetis_txtimeout_expiry, 1, (wdparm_t)priv); return OK; } @@ -1044,7 +1044,7 @@ static void kinetis_txtimeout_work(FAR void *arg) * ****************************************************************************/ -static void kinetis_txtimeout_expiry(int argc, uint32_t arg, ...) +static void kinetis_txtimeout_expiry(int argc, wdparm_t arg, ...) { FAR struct kinetis_driver_s *priv = (FAR struct kinetis_driver_s *)arg; @@ -1102,8 +1102,8 @@ static void kinetis_poll_work(FAR void *arg) /* Setup the watchdog poll timer again in any case */ - wd_start(priv->txpoll, KINETIS_WDDELAY, kinetis_polltimer_expiry, - 1, (wdparm_t)priv); + wd_start(priv->txpoll, KINETIS_WDDELAY, + kinetis_polltimer_expiry, 1, (wdparm_t)priv); net_unlock(); } @@ -1125,7 +1125,7 @@ static void kinetis_poll_work(FAR void *arg) * ****************************************************************************/ -static void kinetis_polltimer_expiry(int argc, uint32_t arg, ...) +static void kinetis_polltimer_expiry(int argc, wdparm_t arg, ...) { FAR struct kinetis_driver_s *priv = (FAR struct kinetis_driver_s *)arg; @@ -1245,8 +1245,8 @@ static int kinetis_ifup(struct net_driver_s *dev) /* Set and activate a timer process */ - wd_start(priv->txpoll, KINETIS_WDDELAY, kinetis_polltimer_expiry, 1, - (wdparm_t)priv); + wd_start(priv->txpoll, KINETIS_WDDELAY, + kinetis_polltimer_expiry, 1, (wdparm_t)priv); putreg32(0, KINETIS_ENET_EIMR); diff --git a/arch/arm/src/kinetis/kinetis_flexcan.c b/arch/arm/src/kinetis/kinetis_flexcan.c index e50f13ab7ba..16c30636347 100644 --- a/arch/arm/src/kinetis/kinetis_flexcan.c +++ b/arch/arm/src/kinetis/kinetis_flexcan.c @@ -519,7 +519,7 @@ static int kinetis_flexcan_interrupt(int irq, FAR void *context, /* Watchdog timer expirations */ #ifdef TX_TIMEOUT_WQ static void kinetis_txtimeout_work(FAR void *arg); -static void kinetis_txtimeout_expiry(int argc, uint32_t arg, ...); +static void kinetis_txtimeout_expiry(int argc, wdparm_t arg, ...); #endif /* NuttX callback functions */ @@ -751,8 +751,8 @@ static int kinetis_transmit(FAR struct kinetis_driver_s *priv) if (timeout > 0) { - wd_start(priv->txtimeout[mbi], timeout + 1, kinetis_txtimeout_expiry, - 1, (wdparm_t)priv); + wd_start(priv->txtimeout[mbi], timeout + 1, + kinetis_txtimeout_expiry, 1, (wdparm_t)priv); } #endif @@ -1142,7 +1142,7 @@ static void kinetis_txtimeout_work(FAR void *arg) * ****************************************************************************/ -static void kinetis_txtimeout_expiry(int argc, uint32_t arg, ...) +static void kinetis_txtimeout_expiry(int argc, wdparm_t arg, ...) { FAR struct kinetis_driver_s *priv = (FAR struct kinetis_driver_s *)arg; diff --git a/arch/arm/src/kinetis/kinetis_i2c.c b/arch/arm/src/kinetis/kinetis_i2c.c index e732a766b95..6b89b14f774 100644 --- a/arch/arm/src/kinetis/kinetis_i2c.c +++ b/arch/arm/src/kinetis/kinetis_i2c.c @@ -171,7 +171,7 @@ static void kinetis_i2c_setfrequency(struct kinetis_i2cdev_s *priv, static int kinetis_i2c_start(struct kinetis_i2cdev_s *priv); static void kinetis_i2c_stop(struct kinetis_i2cdev_s *priv); static int kinetis_i2c_interrupt(int irq, void *context, void *arg); -static void kinetis_i2c_timeout(int argc, uint32_t arg, ...); +static void kinetis_i2c_timeout(int argc, wdparm_t arg, ...); static void kinetis_i2c_setfrequency(struct kinetis_i2cdev_s *priv, uint32_t frequency); @@ -901,7 +901,7 @@ static void kinetis_i2c_stop(struct kinetis_i2cdev_s *priv) * ****************************************************************************/ -static void kinetis_i2c_timeout(int argc, uint32_t arg, ...) +static void kinetis_i2c_timeout(int argc, wdparm_t arg, ...) { struct kinetis_i2cdev_s *priv = (struct kinetis_i2cdev_s *)arg; @@ -1222,8 +1222,8 @@ static int kinetis_i2c_transfer(struct i2c_master_s *dev, /* Wait for transfer complete */ - wd_start(priv->timeout, I2C_TIMEOUT, kinetis_i2c_timeout, 1, - (uint32_t)priv); + wd_start(priv->timeout, I2C_TIMEOUT, + kinetis_i2c_timeout, 1, (wdparm_t)priv); kinetis_i2c_wait(priv); wd_cancel(priv->timeout); diff --git a/arch/arm/src/kinetis/kinetis_sdhc.c b/arch/arm/src/kinetis/kinetis_sdhc.c index a1e0bff31c1..823ce47f2e3 100644 --- a/arch/arm/src/kinetis/kinetis_sdhc.c +++ b/arch/arm/src/kinetis/kinetis_sdhc.c @@ -264,7 +264,7 @@ static void kinetis_datadisable(void); static void kinetis_transmit(struct kinetis_dev_s *priv); static void kinetis_receive(struct kinetis_dev_s *priv); #endif -static void kinetis_eventtimeout(int argc, uint32_t arg, ...); +static void kinetis_eventtimeout(int argc, wdparm_t arg, ...); static void kinetis_endwait(struct kinetis_dev_s *priv, sdio_eventset_t wkupevent); static void kinetis_endtransfer(struct kinetis_dev_s *priv, @@ -934,7 +934,7 @@ static void kinetis_receive(struct kinetis_dev_s *priv) * ****************************************************************************/ -static void kinetis_eventtimeout(int argc, uint32_t arg, ...) +static void kinetis_eventtimeout(int argc, wdparm_t arg, ...) { struct kinetis_dev_s *priv = (struct kinetis_dev_s *)arg; @@ -2507,8 +2507,7 @@ static sdio_eventset_t kinetis_eventwait(FAR struct sdio_dev_s *dev, delay = MSEC2TICK(timeout); ret = wd_start(priv->waitwdog, delay, - kinetis_eventtimeout, - 1, (uint32_t)priv); + kinetis_eventtimeout, 1, (wdparm_t)priv); if (ret < 0) { mcerr("ERROR: wd_start failed: %d\n", ret); diff --git a/arch/arm/src/kinetis/kinetis_usbdev.c b/arch/arm/src/kinetis/kinetis_usbdev.c index 77a3cb131a8..b163c6b938e 100644 --- a/arch/arm/src/kinetis/kinetis_usbdev.c +++ b/arch/arm/src/kinetis/kinetis_usbdev.c @@ -547,7 +547,7 @@ static void khci_epwrite(struct khci_ep_s *privep, const uint8_t *src, uint32_t nbytes); static void khci_wrcomplete(struct khci_usbdev_s *priv, struct khci_ep_s *privep); -static void khci_rqrestart(int argc, uint32_t arg1, ...); +static void khci_rqrestart(int argc, wdparm_t arg1, ...); static void khci_delayedrestart(struct khci_usbdev_s *priv, uint8_t epno); static void khci_rqstop(struct khci_ep_s *privep); @@ -1050,7 +1050,7 @@ static void khci_wrcomplete(struct khci_usbdev_s *priv, * Name: khci_rqrestart ******************************************************************************************/ -static void khci_rqrestart(int argc, uint32_t arg1, ...) +static void khci_rqrestart(int argc, wdparm_t arg1, ...) { struct khci_usbdev_s *priv; struct khci_ep_s *privep; @@ -1118,8 +1118,8 @@ static void khci_delayedrestart(struct khci_usbdev_s *priv, uint8_t epno) /* And start (or re-start) the watchdog timer */ - wd_start(priv->wdog, RESTART_DELAY, khci_rqrestart, 1, - (uint32_t)priv); + wd_start(priv->wdog, RESTART_DELAY, + khci_rqrestart, 1, (wdparm_t)priv); } /****************************************************************************************** diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_ethernet.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_ethernet.c index 62539be69a7..73f04682bbe 100644 --- a/arch/arm/src/lpc17xx_40xx/lpc17_40_ethernet.c +++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_ethernet.c @@ -380,10 +380,10 @@ static int lpc17_40_interrupt(int irq, void *context, FAR void *arg); /* Watchdog timer expirations */ static void lpc17_40_txtimeout_work(FAR void *arg); -static void lpc17_40_txtimeout_expiry(int argc, uint32_t arg, ...); +static void lpc17_40_txtimeout_expiry(int argc, wdparm_t arg, ...); static void lpc17_40_poll_work(FAR void *arg); -static void lpc17_40_poll_expiry(int argc, uint32_t arg, ...); +static void lpc17_40_poll_expiry(int argc, wdparm_t arg, ...); /* NuttX callback functions */ @@ -700,7 +700,7 @@ static int lpc17_40_transmit(struct lpc17_40_driver_s *priv) /* Setup the TX timeout watchdog (perhaps restarting the timer) */ wd_start(priv->lp_txtimeout, LPC17_40_TXTIMEOUT, - lpc17_40_txtimeout_expiry, 1, (uint32_t)priv); + lpc17_40_txtimeout_expiry, 1, (wdparm_t)priv); return OK; } @@ -1424,7 +1424,7 @@ static void lpc17_40_txtimeout_work(FAR void *arg) * ****************************************************************************/ -static void lpc17_40_txtimeout_expiry(int argc, uint32_t arg, ...) +static void lpc17_40_txtimeout_expiry(int argc, wdparm_t arg, ...) { struct lpc17_40_driver_s *priv = (struct lpc17_40_driver_s *)arg; @@ -1503,8 +1503,8 @@ static void lpc17_40_poll_work(FAR void *arg) /* Setup the watchdog poll timer again */ - wd_start(priv->lp_txpoll, LPC17_40_WDDELAY, lpc17_40_poll_expiry, - 1, priv); + wd_start(priv->lp_txpoll, LPC17_40_WDDELAY, + lpc17_40_poll_expiry, 1, (wdparm_t)priv); net_unlock(); } @@ -1526,7 +1526,7 @@ static void lpc17_40_poll_work(FAR void *arg) * ****************************************************************************/ -static void lpc17_40_poll_expiry(int argc, uint32_t arg, ...) +static void lpc17_40_poll_expiry(int argc, wdparm_t arg, ...) { FAR struct lpc17_40_driver_s *priv = (FAR struct lpc17_40_driver_s *)arg; @@ -1756,8 +1756,8 @@ static int lpc17_40_ifup(struct net_driver_s *dev) /* Set and activate a timer process */ - wd_start(priv->lp_txpoll, LPC17_40_WDDELAY, lpc17_40_poll_expiry, 1, - (uint32_t)priv); + wd_start(priv->lp_txpoll, LPC17_40_WDDELAY, + lpc17_40_poll_expiry, 1, (wdparm_t)priv); /* Finally, make the interface up and enable the Ethernet interrupt at * the interrupt controller diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_i2c.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_i2c.c index f022c4e3d22..c7c317c5c93 100644 --- a/arch/arm/src/lpc17xx_40xx/lpc17_40_i2c.c +++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_i2c.c @@ -129,7 +129,7 @@ struct lpc17_40_i2cdev_s static int lpc17_40_i2c_start(struct lpc17_40_i2cdev_s *priv); static void lpc17_40_i2c_stop(struct lpc17_40_i2cdev_s *priv); static int lpc17_40_i2c_interrupt(int irq, FAR void *context, void *arg); -static void lpc17_40_i2c_timeout(int argc, uint32_t arg, ...); +static void lpc17_40_i2c_timeout(int argc, wdparm_t arg, ...); static void lpc17_40_i2c_setfrequency(struct lpc17_40_i2cdev_s *priv, uint32_t frequency); static void lpc17_40_stopnext(struct lpc17_40_i2cdev_s *priv); @@ -238,8 +238,8 @@ static int lpc17_40_i2c_start(struct lpc17_40_i2cdev_s *priv) priv->state = 0x00; - wd_start(priv->timeout, timeout, lpc17_40_i2c_timeout, 1, - (uint32_t)priv); + wd_start(priv->timeout, timeout, + lpc17_40_i2c_timeout, 1, (wdparm_t)priv); nxsem_wait(&priv->wait); return priv->nmsg; @@ -273,7 +273,7 @@ static void lpc17_40_i2c_stop(struct lpc17_40_i2cdev_s *priv) * ****************************************************************************/ -static void lpc17_40_i2c_timeout(int argc, uint32_t arg, ...) +static void lpc17_40_i2c_timeout(int argc, wdparm_t arg, ...) { struct lpc17_40_i2cdev_s *priv = (struct lpc17_40_i2cdev_s *)arg; diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_sdcard.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_sdcard.c index c51af148a9f..0668e2dacb6 100644 --- a/arch/arm/src/lpc17xx_40xx/lpc17_40_sdcard.c +++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_sdcard.c @@ -347,7 +347,7 @@ static void lpc17_40_dataconfig(uint32_t timeout, uint32_t dlen, static void lpc17_40_datadisable(void); static void lpc17_40_sendfifo(struct lpc17_40_dev_s *priv); static void lpc17_40_recvfifo(struct lpc17_40_dev_s *priv); -static void lpc17_40_eventtimeout(int argc, uint32_t arg, ...); +static void lpc17_40_eventtimeout(int argc, wdparm_t arg, ...); static void lpc17_40_endwait(struct lpc17_40_dev_s *priv, sdio_eventset_t wkupevent); static void lpc17_40_endtransfer(struct lpc17_40_dev_s *priv, @@ -1088,7 +1088,7 @@ static void lpc17_40_recvfifo(struct lpc17_40_dev_s *priv) * ****************************************************************************/ -static void lpc17_40_eventtimeout(int argc, uint32_t arg, ...) +static void lpc17_40_eventtimeout(int argc, wdparm_t arg, ...) { struct lpc17_40_dev_s *priv = (struct lpc17_40_dev_s *)arg; @@ -2345,8 +2345,7 @@ static sdio_eventset_t lpc17_40_eventwait(FAR struct sdio_dev_s *dev, delay = MSEC2TICK(timeout); ret = wd_start(priv->waitwdog, delay, - lpc17_40_eventtimeout, - 1, (uint32_t)priv); + lpc17_40_eventtimeout, 1, (wdparm_t)priv); if (ret < 0) { mcerr("ERROR: wd_start failed: %d\n", ret); diff --git a/arch/arm/src/lpc2378/lpc23xx_i2c.c b/arch/arm/src/lpc2378/lpc23xx_i2c.c index 8bfb7a11bb6..222cdf95dc1 100644 --- a/arch/arm/src/lpc2378/lpc23xx_i2c.c +++ b/arch/arm/src/lpc2378/lpc23xx_i2c.c @@ -135,7 +135,7 @@ struct lpc2378_i2cdev_s static int lpc2378_i2c_start(struct lpc2378_i2cdev_s *priv); static void lpc2378_i2c_stop(struct lpc2378_i2cdev_s *priv); static int lpc2378_i2c_interrupt(int irq, FAR void *context, FAR void *arg); -static void lpc2378_i2c_timeout(int argc, uint32_t arg, ...); +static void lpc2378_i2c_timeout(int argc, wdparm_t arg, ...); static void lpc2378_i2c_setfrequency(struct lpc2378_i2cdev_s *priv, uint32_t frequency); static void lpc2378_stopnext(struct lpc2378_i2cdev_s *priv); @@ -220,8 +220,8 @@ static int lpc2378_i2c_start(struct lpc2378_i2cdev_s *priv) priv->base + I2C_CONCLR_OFFSET); putreg32(I2C_CONSET_STA, priv->base + I2C_CONSET_OFFSET); - wd_start(priv->timeout, I2C_TIMEOUT, lpc2378_i2c_timeout, 1, - (uint32_t)priv); + wd_start(priv->timeout, I2C_TIMEOUT, + lpc2378_i2c_timeout, 1, (wdparm_t)priv); nxsem_wait(&priv->wait); wd_cancel(priv->timeout); @@ -256,7 +256,7 @@ static void lpc2378_i2c_stop(struct lpc2378_i2cdev_s *priv) * ****************************************************************************/ -static void lpc2378_i2c_timeout(int argc, uint32_t arg, ...) +static void lpc2378_i2c_timeout(int argc, wdparm_t arg, ...) { struct lpc2378_i2cdev_s *priv = (struct lpc2378_i2cdev_s *)arg; diff --git a/arch/arm/src/lpc31xx/lpc31_i2c.c b/arch/arm/src/lpc31xx/lpc31_i2c.c index 71f1cafcfa4..1488931653a 100644 --- a/arch/arm/src/lpc31xx/lpc31_i2c.c +++ b/arch/arm/src/lpc31xx/lpc31_i2c.c @@ -114,7 +114,7 @@ static struct lpc31_i2cdev_s i2cdevices[2]; static int i2c_interrupt(int irq, FAR void *context, FAR void *arg); static void i2c_progress(struct lpc31_i2cdev_s *priv); -static void i2c_timeout(int argc, uint32_t arg, ...); +static void i2c_timeout(int argc, wdparm_t arg, ...); static void i2c_hwreset(struct lpc31_i2cdev_s *priv); static void i2c_setfrequency(struct lpc31_i2cdev_s *priv, uint32_t frequency); static int i2c_transfer(FAR struct i2c_master_s *dev, @@ -400,7 +400,7 @@ out: * ****************************************************************************/ -static void i2c_timeout(int argc, uint32_t arg, ...) +static void i2c_timeout(int argc, wdparm_t arg, ...) { struct lpc31_i2cdev_s *priv = (struct lpc31_i2cdev_s *) arg; @@ -490,7 +490,7 @@ static int i2c_transfer(FAR struct i2c_master_s *dev, FAR struct i2c_msg_s *msgs /* Start a watchdog to timeout the transfer if the bus is locked up... */ - wd_start(priv->timeout, I2C_TIMEOUT, i2c_timeout, 1, (uint32_t)priv); + wd_start(priv->timeout, I2C_TIMEOUT, i2c_timeout, 1, (wdparm_t)priv); /* Wait for the transfer to complete */ diff --git a/arch/arm/src/lpc43xx/lpc43_ethernet.c b/arch/arm/src/lpc43xx/lpc43_ethernet.c index 1d94614f751..59fd20a1583 100644 --- a/arch/arm/src/lpc43xx/lpc43_ethernet.c +++ b/arch/arm/src/lpc43xx/lpc43_ethernet.c @@ -602,10 +602,10 @@ static int lpc43_interrupt(int irq, FAR void *context, FAR void *arg); /* Watchdog timer expirations */ static void lpc43_txtimeout_work(FAR void *arg); -static void lpc43_txtimeout_expiry(int argc, uint32_t arg, ...); +static void lpc43_txtimeout_expiry(int argc, wdparm_t arg, ...); static void lpc43_poll_work(FAR void *arg); -static void lpc43_poll_expiry(int argc, uint32_t arg, ...); +static void lpc43_poll_expiry(int argc, wdparm_t arg, ...); /* NuttX callback functions */ @@ -1103,7 +1103,8 @@ static int lpc43_transmit(FAR struct lpc43_ethmac_s *priv) /* Setup the TX timeout watchdog (perhaps restarting the timer) */ - wd_start(priv->txtimeout, LPC43_TXTIMEOUT, lpc43_txtimeout_expiry, 1, (uint32_t)priv); + wd_start(priv->txtimeout, LPC43_TXTIMEOUT, + lpc43_txtimeout_expiry, 1, (wdparm_t)priv); return OK; } @@ -2096,7 +2097,7 @@ static void lpc43_txtimeout_work(FAR void *arg) * ****************************************************************************/ -static void lpc43_txtimeout_expiry(int argc, uint32_t arg, ...) +static void lpc43_txtimeout_expiry(int argc, wdparm_t arg, ...) { FAR struct lpc43_ethmac_s *priv = (FAR struct lpc43_ethmac_s *)arg; @@ -2186,7 +2187,8 @@ static void lpc43_poll_work(FAR void *arg) /* Setup the watchdog poll timer again */ - wd_start(priv->txpoll, LPC43_WDDELAY, lpc43_poll_expiry, 1, priv); + wd_start(priv->txpoll, LPC43_WDDELAY, + lpc43_poll_expiry, 1, (wdparm_t)priv); net_unlock(); } @@ -2208,7 +2210,7 @@ static void lpc43_poll_work(FAR void *arg) * ****************************************************************************/ -static void lpc43_poll_expiry(int argc, uint32_t arg, ...) +static void lpc43_poll_expiry(int argc, wdparm_t arg, ...) { FAR struct lpc43_ethmac_s *priv = (FAR struct lpc43_ethmac_s *)arg; @@ -2261,8 +2263,8 @@ static int lpc43_ifup(struct net_driver_s *dev) /* Set and activate a timer process */ - wd_start(priv->txpoll, LPC43_WDDELAY, lpc43_poll_expiry, 1, - (uint32_t)priv); + wd_start(priv->txpoll, LPC43_WDDELAY, + lpc43_poll_expiry, 1, (wdparm_t)priv); /* Enable the Ethernet interrupt */ diff --git a/arch/arm/src/lpc43xx/lpc43_i2c.c b/arch/arm/src/lpc43xx/lpc43_i2c.c index ec31bcfddf3..95d7b255874 100644 --- a/arch/arm/src/lpc43xx/lpc43_i2c.c +++ b/arch/arm/src/lpc43xx/lpc43_i2c.c @@ -131,7 +131,7 @@ static struct lpc43_i2cdev_s g_i2c1dev; static int lpc43_i2c_start(struct lpc43_i2cdev_s *priv); static void lpc43_i2c_stop(struct lpc43_i2cdev_s *priv); static int lpc43_i2c_interrupt(int irq, FAR void *context, FAR void *arg); -static void lpc43_i2c_timeout(int argc, uint32_t arg, ...); +static void lpc43_i2c_timeout(int argc, wdparm_t arg, ...); static void lpc43_i2c_setfrequency(struct lpc43_i2cdev_s *priv, uint32_t frequency); static int lpc43_i2c_transfer(FAR struct i2c_master_s *dev, @@ -202,8 +202,8 @@ static int lpc43_i2c_start(struct lpc43_i2cdev_s *priv) priv->base + LPC43_I2C_CONCLR_OFFSET); putreg32(I2C_CONSET_STA, priv->base + LPC43_I2C_CONSET_OFFSET); - wd_start(priv->timeout, I2C_TIMEOUT, lpc43_i2c_timeout, 1, - (uint32_t)priv); + wd_start(priv->timeout, I2C_TIMEOUT, + lpc43_i2c_timeout, 1, (wdparm_t)priv); nxsem_wait(&priv->wait); wd_cancel(priv->timeout); @@ -237,7 +237,7 @@ static void lpc43_i2c_stop(struct lpc43_i2cdev_s *priv) * ****************************************************************************/ -static void lpc43_i2c_timeout(int argc, uint32_t arg, ...) +static void lpc43_i2c_timeout(int argc, wdparm_t arg, ...) { struct lpc43_i2cdev_s *priv = (struct lpc43_i2cdev_s *)arg; diff --git a/arch/arm/src/lpc43xx/lpc43_sdmmc.c b/arch/arm/src/lpc43xx/lpc43_sdmmc.c index 18c7e8552f2..87c96a739be 100644 --- a/arch/arm/src/lpc43xx/lpc43_sdmmc.c +++ b/arch/arm/src/lpc43xx/lpc43_sdmmc.c @@ -291,7 +291,7 @@ static void lpc43_config_dmaints(struct lpc43_dev_s *priv, uint32_t xfrmask, /* Data Transfer Helpers ****************************************************/ -static void lpc43_eventtimeout(int argc, uint32_t arg, ...); +static void lpc43_eventtimeout(int argc, wdparm_t arg, ...); static void lpc43_endwait(struct lpc43_dev_s *priv, sdio_eventset_t wkupevent); static void lpc43_endtransfer(struct lpc43_dev_s *priv, @@ -838,7 +838,7 @@ static void lpc43_config_dmaints(struct lpc43_dev_s *priv, uint32_t xfrmask, * ****************************************************************************/ -static void lpc43_eventtimeout(int argc, uint32_t arg, ...) +static void lpc43_eventtimeout(int argc, wdparm_t arg, ...) { struct lpc43_dev_s *priv = (struct lpc43_dev_s *)arg; @@ -2313,8 +2313,8 @@ static sdio_eventset_t lpc43_eventwait(FAR struct sdio_dev_s *dev, /* Start the watchdog timer */ delay = MSEC2TICK(timeout); - ret = wd_start(priv->waitwdog, delay, lpc43_eventtimeout, - 1, (uint32_t)priv); + ret = wd_start(priv->waitwdog, delay, + lpc43_eventtimeout, 1, (wdparm_t)priv); if (ret < 0) { mcerr("ERROR: wd_start failed: %d\n", ret); diff --git a/arch/arm/src/lpc54xx/lpc54_ethernet.c b/arch/arm/src/lpc54xx/lpc54_ethernet.c index 79f5fc3abf3..2f3cea446f2 100644 --- a/arch/arm/src/lpc54xx/lpc54_ethernet.c +++ b/arch/arm/src/lpc54xx/lpc54_ethernet.c @@ -1848,8 +1848,8 @@ static void lpc54_eth_poll_work(void *arg) /* Setup the watchdog poll timer again */ - wd_start(priv->eth_txpoll, LPC54_WDDELAY, lpc54_eth_poll_expiry, 1, - (wdparm_t)priv); + wd_start(priv->eth_txpoll, LPC54_WDDELAY, + lpc54_eth_poll_expiry, 1, (wdparm_t)priv); net_unlock(); } @@ -2156,8 +2156,8 @@ static int lpc54_eth_ifup(struct net_driver_s *dev) /* Set and activate a timer process */ - wd_start(priv->eth_txpoll, LPC54_WDDELAY, lpc54_eth_poll_expiry, 1, - (wdparm_t)priv); + wd_start(priv->eth_txpoll, LPC54_WDDELAY, + lpc54_eth_poll_expiry, 1, (wdparm_t)priv); /* Enable the Ethernet interrupt */ diff --git a/arch/arm/src/lpc54xx/lpc54_i2c_master.c b/arch/arm/src/lpc54xx/lpc54_i2c_master.c index 4c3d7a0cb54..7ab5626b7ca 100644 --- a/arch/arm/src/lpc54xx/lpc54_i2c_master.c +++ b/arch/arm/src/lpc54xx/lpc54_i2c_master.c @@ -156,7 +156,7 @@ static inline uint32_t lpc54_i2c_getreg(struct lpc54_i2cdev_s *priv, static void lpc54_i2c_setfrequency(struct lpc54_i2cdev_s *priv, uint32_t frequency); -static void lpc54_i2c_timeout(int argc, uint32_t arg, ...); +static void lpc54_i2c_timeout(int argc, wdparm_t arg, ...); static void lpc54_i2c_xfrsetup(struct lpc54_i2cdev_s *priv); static bool lpc54_i2c_nextmsg(struct lpc54_i2cdev_s *priv); static bool lpc54_i2c_statemachine(struct lpc54_i2cdev_s *priv); @@ -336,7 +336,7 @@ static void lpc54_i2c_setfrequency(struct lpc54_i2cdev_s *priv, * ****************************************************************************/ -static void lpc54_i2c_timeout(int argc, uint32_t arg, ...) +static void lpc54_i2c_timeout(int argc, wdparm_t arg, ...) { struct lpc54_i2cdev_s *priv = (struct lpc54_i2cdev_s *)arg; @@ -767,7 +767,7 @@ static int lpc54_i2c_transfer(FAR struct i2c_master_s *dev, /* Set up the transfer timeout */ wd_start(priv->timeout, priv->nmsgs * I2C_WDOG_TIMEOUT, - lpc54_i2c_timeout, 1, (uint32_t)priv); + lpc54_i2c_timeout, 1, (wdparm_t)priv); /* Initiate the transfer */ diff --git a/arch/arm/src/lpc54xx/lpc54_sdmmc.c b/arch/arm/src/lpc54xx/lpc54_sdmmc.c index 7cba59d7ebd..c7acedcfa1c 100644 --- a/arch/arm/src/lpc54xx/lpc54_sdmmc.c +++ b/arch/arm/src/lpc54xx/lpc54_sdmmc.c @@ -295,7 +295,7 @@ static void lpc54_config_dmaints(struct lpc54_dev_s *priv, uint32_t xfrmask, /* Data Transfer Helpers ****************************************************/ -static void lpc54_eventtimeout(int argc, uint32_t arg, ...); +static void lpc54_eventtimeout(int argc, wdparm_t arg, ...); static void lpc54_endwait(struct lpc54_dev_s *priv, sdio_eventset_t wkupevent); static void lpc54_endtransfer(struct lpc54_dev_s *priv, @@ -838,7 +838,7 @@ static void lpc54_config_dmaints(struct lpc54_dev_s *priv, uint32_t xfrmask, * ****************************************************************************/ -static void lpc54_eventtimeout(int argc, uint32_t arg, ...) +static void lpc54_eventtimeout(int argc, wdparm_t arg, ...) { struct lpc54_dev_s *priv = (struct lpc54_dev_s *)arg; @@ -2313,8 +2313,8 @@ static sdio_eventset_t lpc54_eventwait(FAR struct sdio_dev_s *dev, /* Start the watchdog timer */ delay = MSEC2TICK(timeout); - ret = wd_start(priv->waitwdog, delay, lpc54_eventtimeout, - 1, (uint32_t)priv); + ret = wd_start(priv->waitwdog, delay, + lpc54_eventtimeout, 1, (wdparm_t)priv); if (ret < 0) { mcerr("ERROR: wd_start failed: %d\n", ret); diff --git a/arch/arm/src/s32k1xx/s32k1xx_enet.c b/arch/arm/src/s32k1xx/s32k1xx_enet.c index 52f6f8c074a..9c8933cf284 100644 --- a/arch/arm/src/s32k1xx/s32k1xx_enet.c +++ b/arch/arm/src/s32k1xx/s32k1xx_enet.c @@ -343,10 +343,10 @@ static int s32k1xx_enet_interrupt(int irq, FAR void *context, /* Watchdog timer expirations */ static void s32k1xx_txtimeout_work(FAR void *arg); -static void s32k1xx_txtimeout_expiry(int argc, uint32_t arg, ...); +static void s32k1xx_txtimeout_expiry(int argc, wdparm_t arg, ...); static void s32k1xx_poll_work(FAR void *arg); -static void s32k1xx_polltimer_expiry(int argc, uint32_t arg, ...); +static void s32k1xx_polltimer_expiry(int argc, wdparm_t arg, ...); /* NuttX callback functions */ @@ -572,8 +572,8 @@ static int s32k1xx_transmit(FAR struct s32k1xx_driver_s *priv) /* Setup the TX timeout watchdog (perhaps restarting the timer) */ - wd_start(priv->txtimeout, S32K1XX_TXTIMEOUT, s32k1xx_txtimeout_expiry, 1, - (wdparm_t)priv); + wd_start(priv->txtimeout, S32K1XX_TXTIMEOUT, + s32k1xx_txtimeout_expiry, 1, (wdparm_t)priv); /* Start the TX transfer (if it was not already waiting for buffers) */ @@ -1192,7 +1192,7 @@ static void s32k1xx_txtimeout_work(FAR void *arg) * ****************************************************************************/ -static void s32k1xx_txtimeout_expiry(int argc, uint32_t arg, ...) +static void s32k1xx_txtimeout_expiry(int argc, wdparm_t arg, ...) { FAR struct s32k1xx_driver_s *priv = (FAR struct s32k1xx_driver_s *)arg; @@ -1250,8 +1250,8 @@ static void s32k1xx_poll_work(FAR void *arg) /* Setup the watchdog poll timer again in any case */ - wd_start(priv->txpoll, S32K1XX_WDDELAY, s32k1xx_polltimer_expiry, - 1, (wdparm_t)priv); + wd_start(priv->txpoll, S32K1XX_WDDELAY, + s32k1xx_polltimer_expiry, 1, (wdparm_t)priv); net_unlock(); } @@ -1273,7 +1273,7 @@ static void s32k1xx_poll_work(FAR void *arg) * ****************************************************************************/ -static void s32k1xx_polltimer_expiry(int argc, uint32_t arg, ...) +static void s32k1xx_polltimer_expiry(int argc, wdparm_t arg, ...) { FAR struct s32k1xx_driver_s *priv = (FAR struct s32k1xx_driver_s *)arg; @@ -1382,8 +1382,8 @@ static int s32k1xx_ifup_action(struct net_driver_s *dev, bool resetphy) /* Set and activate a timer process */ - wd_start(priv->txpoll, S32K1XX_WDDELAY, s32k1xx_polltimer_expiry, 1, - (wdparm_t)priv); + wd_start(priv->txpoll, S32K1XX_WDDELAY, + s32k1xx_polltimer_expiry, 1, (wdparm_t)priv); /* Clear all pending ENET interrupt */ diff --git a/arch/arm/src/s32k1xx/s32k1xx_flexcan.c b/arch/arm/src/s32k1xx/s32k1xx_flexcan.c index abc4c22d50f..b7ab4a52475 100644 --- a/arch/arm/src/s32k1xx/s32k1xx_flexcan.c +++ b/arch/arm/src/s32k1xx/s32k1xx_flexcan.c @@ -520,7 +520,7 @@ static int s32k1xx_flexcan_interrupt(int irq, FAR void *context, /* Watchdog timer expirations */ #ifdef TX_TIMEOUT_WQ static void s32k1xx_txtimeout_work(FAR void *arg); -static void s32k1xx_txtimeout_expiry(int argc, uint32_t arg, ...); +static void s32k1xx_txtimeout_expiry(int argc, wdparm_t arg, ...); #endif /* NuttX callback functions */ @@ -752,8 +752,8 @@ static int s32k1xx_transmit(FAR struct s32k1xx_driver_s *priv) if (timeout >= 0) { - wd_start(priv->txtimeout[mbi], timeout + 1, s32k1xx_txtimeout_expiry, - 1, (wdparm_t)priv); + wd_start(priv->txtimeout[mbi], timeout + 1, + s32k1xx_txtimeout_expiry, 1, (wdparm_t)priv); } #endif @@ -1143,7 +1143,7 @@ static void s32k1xx_txtimeout_work(FAR void *arg) * ****************************************************************************/ -static void s32k1xx_txtimeout_expiry(int argc, uint32_t arg, ...) +static void s32k1xx_txtimeout_expiry(int argc, wdparm_t arg, ...) { FAR struct s32k1xx_driver_s *priv = (FAR struct s32k1xx_driver_s *)arg; diff --git a/arch/arm/src/sam34/sam_emac.c b/arch/arm/src/sam34/sam_emac.c index c7ea72a10c2..09b9d5ae939 100644 --- a/arch/arm/src/sam34/sam_emac.c +++ b/arch/arm/src/sam34/sam_emac.c @@ -387,10 +387,10 @@ static int sam_emac_interrupt(int irq, void *context, FAR void *arg); /* Watchdog timer expirations */ static void sam_txtimeout_work(FAR void *arg); -static void sam_txtimeout_expiry(int argc, uint32_t arg, ...); +static void sam_txtimeout_expiry(int argc, wdparm_t arg, ...); static void sam_poll_work(FAR void *arg); -static void sam_poll_expiry(int argc, uint32_t arg, ...); +static void sam_poll_expiry(int argc, wdparm_t arg, ...); /* NuttX callback functions */ @@ -808,8 +808,8 @@ static int sam_transmit(struct sam_emac_s *priv) /* Setup the TX timeout watchdog (perhaps restarting the timer) */ - wd_start(priv->txtimeout, SAM_TXTIMEOUT, sam_txtimeout_expiry, 1, - (uint32_t)priv); + wd_start(priv->txtimeout, SAM_TXTIMEOUT, + sam_txtimeout_expiry, 1, (wdparm_t)priv); /* Set d_len to zero meaning that the d_buf[] packet buffer is again * available. @@ -1726,7 +1726,7 @@ static void sam_txtimeout_work(FAR void *arg) * ****************************************************************************/ -static void sam_txtimeout_expiry(int argc, uint32_t arg, ...) +static void sam_txtimeout_expiry(int argc, wdparm_t arg, ...) { FAR struct sam_emac_s *priv = (FAR struct sam_emac_s *)arg; @@ -1778,7 +1778,7 @@ static void sam_poll_work(FAR void *arg) /* Setup the watchdog poll timer again */ - wd_start(priv->txpoll, SAM_WDDELAY, sam_poll_expiry, 1, priv); + wd_start(priv->txpoll, SAM_WDDELAY, sam_poll_expiry, 1, (wdparm_t)priv); net_unlock(); } @@ -1800,7 +1800,7 @@ static void sam_poll_work(FAR void *arg) * ****************************************************************************/ -static void sam_poll_expiry(int argc, uint32_t arg, ...) +static void sam_poll_expiry(int argc, wdparm_t arg, ...) { FAR struct sam_emac_s *priv = (FAR struct sam_emac_s *)arg; @@ -1877,7 +1877,7 @@ static int sam_ifup(struct net_driver_s *dev) /* Set and activate a timer process */ - wd_start(priv->txpoll, SAM_WDDELAY, sam_poll_expiry, 1, (uint32_t)priv); + wd_start(priv->txpoll, SAM_WDDELAY, sam_poll_expiry, 1, (wdparm_t)priv); /* Enable the EMAC interrupt */ diff --git a/arch/arm/src/sam34/sam_hsmci.c b/arch/arm/src/sam34/sam_hsmci.c index 45f7a84b53b..2b6495848b2 100644 --- a/arch/arm/src/sam34/sam_hsmci.c +++ b/arch/arm/src/sam34/sam_hsmci.c @@ -448,7 +448,7 @@ static void sam_dmacallback(DMA_HANDLE handle, void *arg, int result); /* Data Transfer Helpers ****************************************************/ -static void sam_eventtimeout(int argc, uint32_t arg, ...); +static void sam_eventtimeout(int argc, wdparm_t arg, ...); static void sam_endwait(struct sam_dev_s *priv, sdio_eventset_t wkupevent); static void sam_endtransfer(struct sam_dev_s *priv, sdio_eventset_t wkupevent); @@ -1088,7 +1088,7 @@ static void sam_dmacallback(DMA_HANDLE handle, void *arg, int result) * ****************************************************************************/ -static void sam_eventtimeout(int argc, uint32_t arg, ...) +static void sam_eventtimeout(int argc, wdparm_t arg, ...) { struct sam_dev_s *priv = (struct sam_dev_s *)arg; @@ -2328,8 +2328,8 @@ static sdio_eventset_t sam_eventwait(FAR struct sdio_dev_s *dev, /* Start the watchdog timer */ delay = MSEC2TICK(timeout); - ret = wd_start(priv->waitwdog, delay, sam_eventtimeout, - 1, (uint32_t)priv); + ret = wd_start(priv->waitwdog, delay, + sam_eventtimeout, 1, (wdparm_t)priv); if (ret < 0) { mcerr("ERROR: wd_start failed: %d\n", ret); diff --git a/arch/arm/src/sam34/sam_spi.c b/arch/arm/src/sam34/sam_spi.c index 54852b209c9..985a5e1ab79 100644 --- a/arch/arm/src/sam34/sam_spi.c +++ b/arch/arm/src/sam34/sam_spi.c @@ -736,7 +736,7 @@ static void spi_dma_sampledone(struct sam_spics_s *spics) ****************************************************************************/ #ifdef CONFIG_SAM34_SPI_DMA -static void spi_dmatimeout(int argc, uint32_t arg, ...) +static void spi_dmatimeout(int argc, wdparm_t arg, ...) { struct sam_spics_s *spics = (struct sam_spics_s *)arg; DEBUGASSERT(spics != NULL); @@ -1590,7 +1590,7 @@ static void spi_exchange(struct spi_dev_s *dev, const void *txbuffer, /* Start (or re-start) the watchdog timeout */ ret = wd_start(spics->dmadog, DMA_TIMEOUT_TICKS, - spi_dmatimeout, 1, (uint32_t)spics); + spi_dmatimeout, 1, (wdparm_t)spics); if (ret < 0) { spierr("ERROR: wd_start failed: %d\n", ret); diff --git a/arch/arm/src/sam34/sam_twi.c b/arch/arm/src/sam34/sam_twi.c index aa67833253a..31d5de09d2a 100644 --- a/arch/arm/src/sam34/sam_twi.c +++ b/arch/arm/src/sam34/sam_twi.c @@ -166,7 +166,7 @@ static inline void twi_putrel(struct twi_dev_s *priv, unsigned int offset, static int twi_wait(struct twi_dev_s *priv); static void twi_wakeup(struct twi_dev_s *priv, int result); static int twi_interrupt(int irq, FAR void *context, FAR void *arg); -static void twi_timeout(int argc, uint32_t arg, ...); +static void twi_timeout(int argc, wdparm_t arg, ...); static void twi_startread(struct twi_dev_s *priv, struct i2c_msg_s *msg); static void twi_startwrite(struct twi_dev_s *priv, struct i2c_msg_s *msg); @@ -376,7 +376,7 @@ static int twi_wait(struct twi_dev_s *priv) /* Start a timeout to avoid hangs */ - wd_start(priv->timeout, TWI_TIMEOUT, twi_timeout, 1, (uint32_t)priv); + wd_start(priv->timeout, TWI_TIMEOUT, twi_timeout, 1, (wdparm_t)priv); /* Wait for either the TWI transfer or the timeout to complete */ @@ -565,7 +565,7 @@ static int twi_interrupt(int irq, FAR void *context, FAR void *arg) * ****************************************************************************/ -static void twi_timeout(int argc, uint32_t arg, ...) +static void twi_timeout(int argc, wdparm_t arg, ...) { struct twi_dev_s *priv = (struct twi_dev_s *)arg; diff --git a/arch/arm/src/sama5/sam_emaca.c b/arch/arm/src/sama5/sam_emaca.c index 6e9a6e4162e..4152ef7b05b 100644 --- a/arch/arm/src/sama5/sam_emaca.c +++ b/arch/arm/src/sama5/sam_emaca.c @@ -391,10 +391,10 @@ static int sam_emac_interrupt(int irq, void *context, FAR void *arg); /* Watchdog timer expirations */ static void sam_txtimeout_work(FAR void *arg); -static void sam_txtimeout_expiry(int argc, uint32_t arg, ...); +static void sam_txtimeout_expiry(int argc, wdparm_t arg, ...); static void sam_poll_work(FAR void *arg); -static void sam_poll_expiry(int argc, uint32_t arg, ...); +static void sam_poll_expiry(int argc, wdparm_t arg, ...); /* NuttX callback functions */ @@ -816,8 +816,8 @@ static int sam_transmit(struct sam_emac_s *priv) /* Setup the TX timeout watchdog (perhaps restarting the timer) */ - wd_start(priv->txtimeout, SAM_TXTIMEOUT, sam_txtimeout_expiry, 1, - (uint32_t)priv); + wd_start(priv->txtimeout, SAM_TXTIMEOUT, + sam_txtimeout_expiry, 1, (wdparm_t)priv); /* Set d_len to zero meaning that the d_buf[] packet buffer is again * available. @@ -1761,7 +1761,7 @@ static void sam_txtimeout_work(FAR void *arg) * ****************************************************************************/ -static void sam_txtimeout_expiry(int argc, uint32_t arg, ...) +static void sam_txtimeout_expiry(int argc, wdparm_t arg, ...) { FAR struct sam_emac_s *priv = (FAR struct sam_emac_s *)arg; @@ -1813,7 +1813,7 @@ static void sam_poll_work(FAR void *arg) /* Setup the watchdog poll timer again */ - wd_start(priv->txpoll, SAM_WDDELAY, sam_poll_expiry, 1, priv); + wd_start(priv->txpoll, SAM_WDDELAY, sam_poll_expiry, 1, (wdparm_t)priv); net_unlock(); } @@ -1835,7 +1835,7 @@ static void sam_poll_work(FAR void *arg) * ****************************************************************************/ -static void sam_poll_expiry(int argc, uint32_t arg, ...) +static void sam_poll_expiry(int argc, wdparm_t arg, ...) { FAR struct sam_emac_s *priv = (FAR struct sam_emac_s *)arg; @@ -1912,7 +1912,7 @@ static int sam_ifup(struct net_driver_s *dev) /* Set and activate a timer process */ - wd_start(priv->txpoll, SAM_WDDELAY, sam_poll_expiry, 1, (uint32_t)priv); + wd_start(priv->txpoll, SAM_WDDELAY, sam_poll_expiry, 1, (wdparm_t)priv); /* Enable the EMAC interrupt */ diff --git a/arch/arm/src/sama5/sam_emacb.c b/arch/arm/src/sama5/sam_emacb.c index cddf3b5d820..32ffaac4dc8 100644 --- a/arch/arm/src/sama5/sam_emacb.c +++ b/arch/arm/src/sama5/sam_emacb.c @@ -485,10 +485,10 @@ static int sam_emac_interrupt(int irq, void *context, FAR void *arg); /* Watchdog timer expirations */ static void sam_txtimeout_work(FAR void *arg); -static void sam_txtimeout_expiry(int argc, uint32_t arg, ...); +static void sam_txtimeout_expiry(int argc, wdparm_t arg, ...); static void sam_poll_work(FAR void *arg); -static void sam_poll_expiry(int argc, uint32_t arg, ...); +static void sam_poll_expiry(int argc, wdparm_t arg, ...); /* NuttX callback functions */ @@ -1151,8 +1151,8 @@ static int sam_transmit(struct sam_emac_s *priv) /* Setup the TX timeout watchdog (perhaps restarting the timer) */ - wd_start(priv->txtimeout, SAM_TXTIMEOUT, sam_txtimeout_expiry, 1, - (uint32_t)priv); + wd_start(priv->txtimeout, SAM_TXTIMEOUT, + sam_txtimeout_expiry, 1, (wdparm_t)priv); /* Set d_len to zero meaning that the d_buf[] packet buffer is again * available. @@ -2122,7 +2122,7 @@ static void sam_txtimeout_work(FAR void *arg) * ****************************************************************************/ -static void sam_txtimeout_expiry(int argc, uint32_t arg, ...) +static void sam_txtimeout_expiry(int argc, wdparm_t arg, ...) { FAR struct sam_emac_s *priv = (FAR struct sam_emac_s *)arg; @@ -2174,7 +2174,7 @@ static void sam_poll_work(FAR void *arg) /* Setup the watchdog poll timer again */ - wd_start(priv->txpoll, SAM_WDDELAY, sam_poll_expiry, 1, priv); + wd_start(priv->txpoll, SAM_WDDELAY, sam_poll_expiry, 1, (wdparm_t)priv); net_unlock(); } @@ -2196,7 +2196,7 @@ static void sam_poll_work(FAR void *arg) * ****************************************************************************/ -static void sam_poll_expiry(int argc, uint32_t arg, ...) +static void sam_poll_expiry(int argc, wdparm_t arg, ...) { FAR struct sam_emac_s *priv = (FAR struct sam_emac_s *)arg; @@ -2281,7 +2281,7 @@ static int sam_ifup(struct net_driver_s *dev) /* Set and activate a timer process */ - wd_start(priv->txpoll, SAM_WDDELAY, sam_poll_expiry, 1, (uint32_t)priv); + wd_start(priv->txpoll, SAM_WDDELAY, sam_poll_expiry, 1, (wdparm_t)priv); /* Enable the EMAC interrupt */ diff --git a/arch/arm/src/sama5/sam_gmac.c b/arch/arm/src/sama5/sam_gmac.c index 4e74192f511..376ea95ab67 100644 --- a/arch/arm/src/sama5/sam_gmac.c +++ b/arch/arm/src/sama5/sam_gmac.c @@ -322,10 +322,10 @@ static int sam_gmac_interrupt(int irq, void *context, FAR void *arg); /* Watchdog timer expirations */ static void sam_txtimeout_work(FAR void *arg); -static void sam_txtimeout_expiry(int argc, uint32_t arg, ...); +static void sam_txtimeout_expiry(int argc, wdparm_t arg, ...); static void sam_poll_work(FAR void *arg); -static void sam_poll_expiry(int argc, uint32_t arg, ...); +static void sam_poll_expiry(int argc, wdparm_t arg, ...); /* NuttX callback functions */ @@ -764,8 +764,8 @@ static int sam_transmit(struct sam_gmac_s *priv) /* Setup the TX timeout watchdog (perhaps restarting the timer) */ - wd_start(priv->txtimeout, SAM_TXTIMEOUT, sam_txtimeout_expiry, 1, - (uint32_t)priv); + wd_start(priv->txtimeout, SAM_TXTIMEOUT, + sam_txtimeout_expiry, 1, (wdparm_t)priv); /* Set d_len to zero meaning that the d_buf[] packet buffer is again * available. @@ -1756,7 +1756,7 @@ static void sam_txtimeout_work(FAR void *arg) * ****************************************************************************/ -static void sam_txtimeout_expiry(int argc, uint32_t arg, ...) +static void sam_txtimeout_expiry(int argc, wdparm_t arg, ...) { FAR struct sam_gmac_s *priv = (FAR struct sam_gmac_s *)arg; @@ -1808,7 +1808,7 @@ static void sam_poll_work(FAR void *arg) /* Setup the watchdog poll timer again */ - wd_start(priv->txpoll, SAM_WDDELAY, sam_poll_expiry, 1, priv); + wd_start(priv->txpoll, SAM_WDDELAY, sam_poll_expiry, 1, (wdparm_t)priv); net_unlock(); } @@ -1830,7 +1830,7 @@ static void sam_poll_work(FAR void *arg) * ****************************************************************************/ -static void sam_poll_expiry(int argc, uint32_t arg, ...) +static void sam_poll_expiry(int argc, wdparm_t arg, ...) { FAR struct sam_gmac_s *priv = (FAR struct sam_gmac_s *)arg; @@ -1910,7 +1910,7 @@ static int sam_ifup(struct net_driver_s *dev) /* Set and activate a timer process */ - wd_start(priv->txpoll, SAM_WDDELAY, sam_poll_expiry, 1, (uint32_t)priv); + wd_start(priv->txpoll, SAM_WDDELAY, sam_poll_expiry, 1, (wdparm_t)priv); /* Enable the GMAC interrupt */ diff --git a/arch/arm/src/sama5/sam_hsmci.c b/arch/arm/src/sama5/sam_hsmci.c index dbf725099ef..10b471a2238 100644 --- a/arch/arm/src/sama5/sam_hsmci.c +++ b/arch/arm/src/sama5/sam_hsmci.c @@ -527,7 +527,7 @@ static inline uintptr_t hsmci_physregaddr(struct sam_dev_s *priv, /* Data Transfer Helpers ****************************************************/ -static void sam_eventtimeout(int argc, uint32_t arg, ...); +static void sam_eventtimeout(int argc, wdparm_t arg, ...); static void sam_endwait(struct sam_dev_s *priv, sdio_eventset_t wkupevent); static void sam_endtransfer(struct sam_dev_s *priv, sdio_eventset_t wkupevent); @@ -1310,7 +1310,7 @@ static inline uintptr_t hsmci_physregaddr(struct sam_dev_s *priv, * ****************************************************************************/ -static void sam_eventtimeout(int argc, uint32_t arg, ...) +static void sam_eventtimeout(int argc, wdparm_t arg, ...) { struct sam_dev_s *priv = (struct sam_dev_s *)arg; @@ -2755,8 +2755,8 @@ static sdio_eventset_t sam_eventwait(FAR struct sdio_dev_s *dev, } delay = MSEC2TICK(timeout); - ret = wd_start(priv->waitwdog, delay, sam_eventtimeout, - 1, (uint32_t)priv); + ret = wd_start(priv->waitwdog, delay, + sam_eventtimeout, 1, (wdparm_t)priv); if (ret < 0) { lcderr("ERROR: wd_start failed: %d\n", ret); diff --git a/arch/arm/src/sama5/sam_sdmmc.c b/arch/arm/src/sama5/sam_sdmmc.c index 4dc6f7f9a73..d4b1d4e161e 100644 --- a/arch/arm/src/sama5/sam_sdmmc.c +++ b/arch/arm/src/sama5/sam_sdmmc.c @@ -281,7 +281,7 @@ static void sam_transmit(struct sam_dev_s *priv); static void sam_receive(struct sam_dev_s *priv); #endif -static void sam_eventtimeout(int argc, uint32_t arg); +static void sam_eventtimeout(int argc, wdparm_t arg, ...); static void sam_endwait(struct sam_dev_s *priv, sdio_eventset_t wkupevent); static void sam_endtransfer(struct sam_dev_s *priv, @@ -1171,7 +1171,7 @@ static void sam_receive(struct sam_dev_s *priv) * ****************************************************************************/ -static void sam_eventtimeout(int argc, uint32_t arg) +static void sam_eventtimeout(int argc, wdparm_t arg, ...) { struct sam_dev_s *priv = (struct sam_dev_s *)arg; @@ -2912,8 +2912,8 @@ static sdio_eventset_t sam_eventwait(FAR struct sdio_dev_s *dev, /* Start the watchdog timer */ delay = MSEC2TICK(timeout); - ret = wd_start(priv->waitwdog, delay, (wdentry_t) sam_eventtimeout, - 1, (uint32_t) priv); + ret = wd_start(priv->waitwdog, delay, + sam_eventtimeout, 1, (wdparm_t)priv); if (ret < 0) { diff --git a/arch/arm/src/sama5/sam_spi.c b/arch/arm/src/sama5/sam_spi.c index c16ec80cdf7..4dac81b580a 100644 --- a/arch/arm/src/sama5/sam_spi.c +++ b/arch/arm/src/sama5/sam_spi.c @@ -724,7 +724,7 @@ static void spi_dma_sampledone(struct sam_spics_s *spics) ****************************************************************************/ #ifdef CONFIG_SAMA5_SPI_DMA -static void spi_dmatimeout(int argc, uint32_t arg, ...) +static void spi_dmatimeout(int argc, wdparm_t arg, ...) { struct sam_spics_s *spics = (struct sam_spics_s *)arg; DEBUGASSERT(spics != NULL); @@ -1518,7 +1518,7 @@ static void spi_exchange(struct spi_dev_s *dev, const void *txbuffer, /* Start (or re-start) the watchdog timeout */ ret = wd_start(spics->dmadog, DMA_TIMEOUT_TICKS, - spi_dmatimeout, 1, (uint32_t)spics); + spi_dmatimeout, 1, (wdparm_t)spics); if (ret < 0) { spierr("ERROR: wd_start failed: %d\n", ret); diff --git a/arch/arm/src/sama5/sam_ssc.c b/arch/arm/src/sama5/sam_ssc.c index cd3ef0adc5e..184b0a9d7dc 100644 --- a/arch/arm/src/sama5/sam_ssc.c +++ b/arch/arm/src/sama5/sam_ssc.c @@ -580,14 +580,14 @@ static void ssc_txdma_sampledone(struct sam_ssc_s *priv, int result); #endif #ifdef SSC_HAVE_RX -static void ssc_rxdma_timeout(int argc, uint32_t arg, ...); +static void ssc_rxdma_timeout(int argc, wdparm_t arg, ...); static int ssc_rxdma_setup(struct sam_ssc_s *priv); static void ssc_rx_worker(void *arg); static void ssc_rx_schedule(struct sam_ssc_s *priv, int result); static void ssc_rxdma_callback(DMA_HANDLE handle, void *arg, int result); #endif #ifdef SSC_HAVE_TX -static void ssc_txdma_timeout(int argc, uint32_t arg, ...); +static void ssc_txdma_timeout(int argc, wdparm_t arg, ...); static int ssc_txdma_setup(struct sam_ssc_s *priv); static void ssc_tx_worker(void *arg); static void ssc_tx_schedule(struct sam_ssc_s *priv, int result); @@ -1195,7 +1195,7 @@ static void ssc_txdma_sampledone(struct sam_ssc_s *priv, int result) ****************************************************************************/ #ifdef SSC_HAVE_RX -static void ssc_rxdma_timeout(int argc, uint32_t arg, ...) +static void ssc_rxdma_timeout(int argc, wdparm_t arg, ...) { struct sam_ssc_s *priv = (struct sam_ssc_s *)arg; DEBUGASSERT(priv != NULL); @@ -1344,8 +1344,8 @@ static int ssc_rxdma_setup(struct sam_ssc_s *priv) if (!notimeout) { - ret = wd_start(priv->rx.dog, timeout, ssc_rxdma_timeout, - 1, (uint32_t)priv); + ret = wd_start(priv->rx.dog, timeout, + ssc_rxdma_timeout, 1, (wdparm_t)priv); /* Check if we have successfully started the watchdog timer. Note * that we do nothing in the case of failure to start the timer. We @@ -1611,7 +1611,7 @@ static void ssc_rxdma_callback(DMA_HANDLE handle, void *arg, int result) ****************************************************************************/ #ifdef SSC_HAVE_TX -static void ssc_txdma_timeout(int argc, uint32_t arg, ...) +static void ssc_txdma_timeout(int argc, wdparm_t arg, ...) { struct sam_ssc_s *priv = (struct sam_ssc_s *)arg; DEBUGASSERT(priv != NULL); @@ -1761,8 +1761,8 @@ static int ssc_txdma_setup(struct sam_ssc_s *priv) if (!notimeout) { - ret = wd_start(priv->tx.dog, timeout, ssc_txdma_timeout, - 1, (uint32_t)priv); + ret = wd_start(priv->tx.dog, timeout, + ssc_txdma_timeout, 1, (wdparm_t)priv); /* Check if we have successfully started the watchdog timer. Note * that we do nothing in the case of failure to start the timer. We diff --git a/arch/arm/src/sama5/sam_tsd.c b/arch/arm/src/sama5/sam_tsd.c index 89fd58552f5..abcd1641881 100644 --- a/arch/arm/src/sama5/sam_tsd.c +++ b/arch/arm/src/sama5/sam_tsd.c @@ -202,7 +202,7 @@ static int sam_tsd_waitsample(struct sam_tsd_s *priv, struct sam_sample_s *sample); static void sam_tsd_bottomhalf(void *arg); static int sam_tsd_schedule(struct sam_tsd_s *priv); -static void sam_tsd_expiry(int argc, uint32_t arg1, ...); +static void sam_tsd_expiry(int argc, wdparm_t arg1, ...); /* Character driver methods */ @@ -586,8 +586,8 @@ static void sam_tsd_bottomhalf(void *arg) * this case; we rely on the timer expiry to get us going again. */ - wd_start(priv->wdog, TSD_WDOG_DELAY, sam_tsd_expiry, 1, - (uint32_t)priv); + wd_start(priv->wdog, TSD_WDOG_DELAY, + sam_tsd_expiry, 1, (wdparm_t)priv); ier = 0; goto ignored; } @@ -665,8 +665,8 @@ static void sam_tsd_bottomhalf(void *arg) /* Continue to sample the position while the pen is down */ - wd_start(priv->wdog, TSD_WDOG_DELAY, sam_tsd_expiry, 1, - (uint32_t)priv); + wd_start(priv->wdog, TSD_WDOG_DELAY, + sam_tsd_expiry, 1, (wdparm_t)priv); /* Check the thresholds. Bail if (1) this is not the first * measurement and (2) there is no significant difference from @@ -806,7 +806,7 @@ static int sam_tsd_schedule(struct sam_tsd_s *priv) * ****************************************************************************/ -static void sam_tsd_expiry(int argc, uint32_t arg1, ...) +static void sam_tsd_expiry(int argc, wdparm_t arg1, ...) { struct sam_tsd_s *priv = (struct sam_tsd_s *)((uintptr_t)arg1); diff --git a/arch/arm/src/sama5/sam_twi.c b/arch/arm/src/sama5/sam_twi.c index 4e1896201df..a9fa0a9cee4 100644 --- a/arch/arm/src/sama5/sam_twi.c +++ b/arch/arm/src/sama5/sam_twi.c @@ -206,7 +206,7 @@ static inline void twi_putrel(struct twi_dev_s *priv, unsigned int offset, static int twi_wait(struct twi_dev_s *priv, unsigned int size); static void twi_wakeup(struct twi_dev_s *priv, int result); static int twi_interrupt(int irq, FAR void *context, FAR void *arg); -static void twi_timeout(int argc, uint32_t arg, ...); +static void twi_timeout(int argc, wdparm_t arg, ...); static void twi_startread(struct twi_dev_s *priv, struct i2c_msg_s *msg); static void twi_startwrite(struct twi_dev_s *priv, struct i2c_msg_s *msg); @@ -480,7 +480,7 @@ static int twi_wait(struct twi_dev_s *priv, unsigned int size) * a TWI transfer stalls. */ - wd_start(priv->timeout, timeout, twi_timeout, 1, (uint32_t)priv); + wd_start(priv->timeout, timeout, twi_timeout, 1, (wdparm_t)priv); /* Wait for either the TWI transfer or the timeout to complete */ @@ -669,7 +669,7 @@ static int twi_interrupt(int irq, FAR void *context, FAR void *arg) * ****************************************************************************/ -static void twi_timeout(int argc, uint32_t arg, ...) +static void twi_timeout(int argc, wdparm_t arg, ...) { struct twi_dev_s *priv = (struct twi_dev_s *)arg; diff --git a/arch/arm/src/samd5e5/sam_gmac.c b/arch/arm/src/samd5e5/sam_gmac.c index b829ed2ece9..f5198d10e68 100644 --- a/arch/arm/src/samd5e5/sam_gmac.c +++ b/arch/arm/src/samd5e5/sam_gmac.c @@ -319,10 +319,10 @@ static int sam_gmac_interrupt(int irq, void *context, FAR void *arg); /* Watchdog timer expirations */ static void sam_txtimeout_work(FAR void *arg); -static void sam_txtimeout_expiry(int argc, uint32_t arg, ...); +static void sam_txtimeout_expiry(int argc, wdparm_t arg, ...); static void sam_poll_work(FAR void *arg); -static void sam_poll_expiry(int argc, uint32_t arg, ...); +static void sam_poll_expiry(int argc, wdparm_t arg, ...); /* NuttX callback functions */ @@ -752,8 +752,8 @@ static int sam_transmit(struct sam_gmac_s *priv) /* Setup the TX timeout watchdog (perhaps restarting the timer) */ - wd_start(priv->txtimeout, SAM_TXTIMEOUT, sam_txtimeout_expiry, 1, - (uint32_t)priv); + wd_start(priv->txtimeout, SAM_TXTIMEOUT, + sam_txtimeout_expiry, 1, (wdparm_t)priv); /* Set d_len to zero meaning that the d_buf[] packet buffer is again * available. @@ -1717,7 +1717,7 @@ static void sam_txtimeout_work(FAR void *arg) * ****************************************************************************/ -static void sam_txtimeout_expiry(int argc, uint32_t arg, ...) +static void sam_txtimeout_expiry(int argc, wdparm_t arg, ...) { FAR struct sam_gmac_s *priv = (FAR struct sam_gmac_s *)arg; @@ -1769,7 +1769,7 @@ static void sam_poll_work(FAR void *arg) /* Setup the watchdog poll timer again */ - wd_start(priv->txpoll, SAM_WDDELAY, sam_poll_expiry, 1, priv); + wd_start(priv->txpoll, SAM_WDDELAY, sam_poll_expiry, 1, (wdparm_t)priv); net_unlock(); } @@ -1791,7 +1791,7 @@ static void sam_poll_work(FAR void *arg) * ****************************************************************************/ -static void sam_poll_expiry(int argc, uint32_t arg, ...) +static void sam_poll_expiry(int argc, wdparm_t arg, ...) { FAR struct sam_gmac_s *priv = (FAR struct sam_gmac_s *)arg; @@ -1871,7 +1871,7 @@ static int sam_ifup(struct net_driver_s *dev) /* Set and activate a timer process */ - wd_start(priv->txpoll, SAM_WDDELAY, sam_poll_expiry, 1, (uint32_t)priv); + wd_start(priv->txpoll, SAM_WDDELAY, sam_poll_expiry, 1, (wdparm_t)priv); /* Enable the GMAC interrupt */ diff --git a/arch/arm/src/samv7/sam_emac.c b/arch/arm/src/samv7/sam_emac.c index 0dab03ab9b8..a1be02d71a7 100644 --- a/arch/arm/src/samv7/sam_emac.c +++ b/arch/arm/src/samv7/sam_emac.c @@ -598,10 +598,10 @@ static int sam_emac_interrupt(int irq, void *context, FAR void *arg); /* Watchdog timer expirations */ static void sam_txtimeout_work(FAR void *arg); -static void sam_txtimeout_expiry(int argc, uint32_t arg, ...); +static void sam_txtimeout_expiry(int argc, wdparm_t arg, ...); static void sam_poll_work(FAR void *arg); -static void sam_poll_expiry(int argc, uint32_t arg, ...); +static void sam_poll_expiry(int argc, wdparm_t arg, ...); /* NuttX callback functions */ @@ -1460,8 +1460,8 @@ static int sam_transmit(struct sam_emac_s *priv, int qid) /* Setup the TX timeout watchdog (perhaps restarting the timer) */ - wd_start(priv->txtimeout, SAM_TXTIMEOUT, sam_txtimeout_expiry, 1, - (uint32_t)priv); + wd_start(priv->txtimeout, SAM_TXTIMEOUT, + sam_txtimeout_expiry, 1, (wdparm_t)priv); /* Set d_len to zero meaning that the d_buf[] packet buffer is again * available. @@ -2589,7 +2589,7 @@ static void sam_txtimeout_work(FAR void *arg) * ****************************************************************************/ -static void sam_txtimeout_expiry(int argc, uint32_t arg, ...) +static void sam_txtimeout_expiry(int argc, wdparm_t arg, ...) { FAR struct sam_emac_s *priv = (FAR struct sam_emac_s *)arg; @@ -2641,7 +2641,7 @@ static void sam_poll_work(FAR void *arg) /* Setup the watchdog poll timer again */ - wd_start(priv->txpoll, SAM_WDDELAY, sam_poll_expiry, 1, priv); + wd_start(priv->txpoll, SAM_WDDELAY, sam_poll_expiry, 1, (wdparm_t)priv); net_unlock(); } @@ -2663,7 +2663,7 @@ static void sam_poll_work(FAR void *arg) * ****************************************************************************/ -static void sam_poll_expiry(int argc, uint32_t arg, ...) +static void sam_poll_expiry(int argc, wdparm_t arg, ...) { FAR struct sam_emac_s *priv = (FAR struct sam_emac_s *)arg; @@ -2759,7 +2759,7 @@ static int sam_ifup(struct net_driver_s *dev) /* Set and activate a timer process */ - wd_start(priv->txpoll, SAM_WDDELAY, sam_poll_expiry, 1, (uint32_t)priv); + wd_start(priv->txpoll, SAM_WDDELAY, sam_poll_expiry, 1, (wdparm_t)priv); /* Enable the EMAC interrupt */ diff --git a/arch/arm/src/samv7/sam_hsmci.c b/arch/arm/src/samv7/sam_hsmci.c index 8e71273ca18..eb27aa8a14c 100644 --- a/arch/arm/src/samv7/sam_hsmci.c +++ b/arch/arm/src/samv7/sam_hsmci.c @@ -462,7 +462,7 @@ static inline uintptr_t hsmci_regaddr(struct sam_dev_s *priv, /* Data Transfer Helpers ****************************************************/ -static void sam_eventtimeout(int argc, uint32_t arg, ...); +static void sam_eventtimeout(int argc, wdparm_t arg, ...); static void sam_endwait(struct sam_dev_s *priv, sdio_eventset_t wkupevent); static void sam_endtransfer(struct sam_dev_s *priv, sdio_eventset_t wkupevent); @@ -1246,7 +1246,7 @@ static inline uintptr_t hsmci_regaddr(struct sam_dev_s *priv, * ****************************************************************************/ -static void sam_eventtimeout(int argc, uint32_t arg, ...) +static void sam_eventtimeout(int argc, wdparm_t arg, ...) { struct sam_dev_s *priv = (struct sam_dev_s *)arg; @@ -2803,8 +2803,8 @@ static sdio_eventset_t sam_eventwait(FAR struct sdio_dev_s *dev, } delay = MSEC2TICK(timeout); - ret = wd_start(priv->waitwdog, delay, sam_eventtimeout, - 1, (uint32_t)priv); + ret = wd_start(priv->waitwdog, delay, + sam_eventtimeout, 1, (wdparm_t)priv); if (ret < 0) { mcerr("ERROR: wd_start failed: %d\n", ret); diff --git a/arch/arm/src/samv7/sam_qspi.c b/arch/arm/src/samv7/sam_qspi.c index 1bc9c8e1015..044b2d07fab 100644 --- a/arch/arm/src/samv7/sam_qspi.c +++ b/arch/arm/src/samv7/sam_qspi.c @@ -590,7 +590,7 @@ static void qspi_dma_sampledone(struct sam_qspidev_s *priv) ****************************************************************************/ #ifdef CONFIG_SAMV7_QSPI_DMA -static void qspi_dma_timeout(int argc, uint32_t arg, ...) +static void qspi_dma_timeout(int argc, wdparm_t arg, ...) { struct sam_qspidev_s *priv = (struct sam_qspidev_s *)arg; DEBUGASSERT(priv != NULL); @@ -891,7 +891,7 @@ static int qspi_memory_dma(struct sam_qspidev_s *priv, /* Start (or re-start) the watchdog timeout */ ret = wd_start(priv->dmadog, DMA_TIMEOUT_TICKS, - qspi_dma_timeout, 1, (uint32_t)priv); + qspi_dma_timeout, 1, (wdparm_t)priv); if (ret < 0) { spierr("ERROR: wd_start failed: %d\n", ret); diff --git a/arch/arm/src/samv7/sam_spi.c b/arch/arm/src/samv7/sam_spi.c index eb1effcd166..a1b463214c6 100644 --- a/arch/arm/src/samv7/sam_spi.c +++ b/arch/arm/src/samv7/sam_spi.c @@ -765,7 +765,7 @@ static void spi_dma_sampledone(struct sam_spics_s *spics) ****************************************************************************/ #ifdef CONFIG_SAMV7_SPI_DMA -static void spi_dmatimeout(int argc, uint32_t arg, ...) +static void spi_dmatimeout(int argc, wdparm_t arg, ...) { struct sam_spics_s *spics = (struct sam_spics_s *)arg; DEBUGASSERT(spics != NULL); @@ -1865,7 +1865,7 @@ static void spi_exchange(struct spi_dev_s *dev, const void *txbuffer, /* Start (or re-start) the watchdog timeout */ ret = wd_start(spics->dmadog, DMA_TIMEOUT_TICKS, - spi_dmatimeout, 1, (uint32_t)spics); + spi_dmatimeout, 1, (wdparm_t)spics); if (ret < 0) { spierr("ERROR: wd_start failed: %d\n", ret); diff --git a/arch/arm/src/samv7/sam_ssc.c b/arch/arm/src/samv7/sam_ssc.c index bea20276291..55ce8d1d0e4 100644 --- a/arch/arm/src/samv7/sam_ssc.c +++ b/arch/arm/src/samv7/sam_ssc.c @@ -555,14 +555,14 @@ static void ssc_txdma_sampledone(struct sam_ssc_s *priv, int result); #endif #ifdef SSC_HAVE_RX -static void ssc_rxdma_timeout(int argc, uint32_t arg, ...); +static void ssc_rxdma_timeout(int argc, wdparm_t arg, ...); static int ssc_rxdma_setup(struct sam_ssc_s *priv); static void ssc_rx_worker(void *arg); static void ssc_rx_schedule(struct sam_ssc_s *priv, int result); static void ssc_rxdma_callback(DMA_HANDLE handle, void *arg, int result); #endif #ifdef SSC_HAVE_TX -static void ssc_txdma_timeout(int argc, uint32_t arg, ...); +static void ssc_txdma_timeout(int argc, wdparm_t arg, ...); static int ssc_txdma_setup(struct sam_ssc_s *priv); static void ssc_tx_worker(void *arg); static void ssc_tx_schedule(struct sam_ssc_s *priv, int result); @@ -1170,7 +1170,7 @@ static void ssc_txdma_sampledone(struct sam_ssc_s *priv, int result) ****************************************************************************/ #ifdef SSC_HAVE_RX -static void ssc_rxdma_timeout(int argc, uint32_t arg, ...) +static void ssc_rxdma_timeout(int argc, wdparm_t arg, ...) { struct sam_ssc_s *priv = (struct sam_ssc_s *)arg; DEBUGASSERT(priv != NULL); @@ -1321,8 +1321,8 @@ static int ssc_rxdma_setup(struct sam_ssc_s *priv) if (!notimeout) { - ret = wd_start(priv->rx.dog, timeout, ssc_rxdma_timeout, - 1, (uint32_t)priv); + ret = wd_start(priv->rx.dog, timeout, + ssc_rxdma_timeout, 1, (wdparm_t)priv); /* Check if we have successfully started the watchdog timer. Note * that we do nothing in the case of failure to start the timer. We @@ -1588,7 +1588,7 @@ static void ssc_rxdma_callback(DMA_HANDLE handle, void *arg, int result) ****************************************************************************/ #ifdef SSC_HAVE_TX -static void ssc_txdma_timeout(int argc, uint32_t arg, ...) +static void ssc_txdma_timeout(int argc, wdparm_t arg, ...) { struct sam_ssc_s *priv = (struct sam_ssc_s *)arg; DEBUGASSERT(priv != NULL); @@ -1742,8 +1742,8 @@ static int ssc_txdma_setup(struct sam_ssc_s *priv) if (!notimeout) { - ret = wd_start(priv->tx.dog, timeout, ssc_txdma_timeout, - 1, (uint32_t)priv); + ret = wd_start(priv->tx.dog, timeout, + ssc_txdma_timeout, 1, (wdparm_t)priv); /* Check if we have successfully started the watchdog timer. Note * that we do nothing in the case of failure to start the timer. We diff --git a/arch/arm/src/samv7/sam_twihs.c b/arch/arm/src/samv7/sam_twihs.c index 743b15aa305..cab7ac57016 100644 --- a/arch/arm/src/samv7/sam_twihs.c +++ b/arch/arm/src/samv7/sam_twihs.c @@ -205,7 +205,7 @@ static inline void twi_putrel(struct twi_dev_s *priv, unsigned int offset, static int twi_wait(struct twi_dev_s *priv, unsigned int size); static void twi_wakeup(struct twi_dev_s *priv, int result); static int twi_interrupt(int irq, FAR void *context, FAR void *arg); -static void twi_timeout(int argc, uint32_t arg, ...); +static void twi_timeout(int argc, wdparm_t arg, ...); static void twi_startread(struct twi_dev_s *priv, struct i2c_msg_s *msg); static void twi_startwrite(struct twi_dev_s *priv, struct i2c_msg_s *msg); @@ -484,8 +484,8 @@ static int twi_wait(struct twi_dev_s *priv, unsigned int size) * a TWIHS transfer stalls. */ - wd_start(priv->timeout, (timeout * size), twi_timeout, 1, - (uint32_t)priv); + wd_start(priv->timeout, (timeout * size), + twi_timeout, 1, (wdparm_t)priv); /* Wait for either the TWIHS transfer or the timeout to complete */ @@ -769,7 +769,7 @@ static int twi_interrupt(int irq, FAR void *context, FAR void *arg) * ****************************************************************************/ -static void twi_timeout(int argc, uint32_t arg, ...) +static void twi_timeout(int argc, wdparm_t arg, ...) { struct twi_dev_s *priv = (struct twi_dev_s *)arg; diff --git a/arch/arm/src/stm32/stm32_eth.c b/arch/arm/src/stm32/stm32_eth.c index d2c19371000..22cde7cae6a 100644 --- a/arch/arm/src/stm32/stm32_eth.c +++ b/arch/arm/src/stm32/stm32_eth.c @@ -705,10 +705,10 @@ static int stm32_interrupt(int irq, FAR void *context, FAR void *arg); /* Watchdog timer expirations */ static void stm32_txtimeout_work(FAR void *arg); -static void stm32_txtimeout_expiry(int argc, uint32_t arg, ...); +static void stm32_txtimeout_expiry(int argc, wdparm_t arg, ...); static void stm32_poll_work(FAR void *arg); -static void stm32_poll_expiry(int argc, uint32_t arg, ...); +static void stm32_poll_expiry(int argc, wdparm_t arg, ...); /* NuttX callback functions */ @@ -1211,7 +1211,8 @@ static int stm32_transmit(FAR struct stm32_ethmac_s *priv) /* Setup the TX timeout watchdog (perhaps restarting the timer) */ - wd_start(priv->txtimeout, STM32_TXTIMEOUT, stm32_txtimeout_expiry, 1, (uint32_t)priv); + wd_start(priv->txtimeout, STM32_TXTIMEOUT, + stm32_txtimeout_expiry, 1, (wdparm_t)priv); return OK; } @@ -2202,7 +2203,7 @@ static void stm32_txtimeout_work(FAR void *arg) * ****************************************************************************/ -static void stm32_txtimeout_expiry(int argc, uint32_t arg, ...) +static void stm32_txtimeout_expiry(int argc, wdparm_t arg, ...) { FAR struct stm32_ethmac_s *priv = (FAR struct stm32_ethmac_s *)arg; @@ -2292,7 +2293,8 @@ static void stm32_poll_work(FAR void *arg) /* Setup the watchdog poll timer again */ - wd_start(priv->txpoll, STM32_WDDELAY, stm32_poll_expiry, 1, priv); + wd_start(priv->txpoll, STM32_WDDELAY, + stm32_poll_expiry, 1, (wdparm_t)priv); net_unlock(); } @@ -2314,7 +2316,7 @@ static void stm32_poll_work(FAR void *arg) * ****************************************************************************/ -static void stm32_poll_expiry(int argc, uint32_t arg, ...) +static void stm32_poll_expiry(int argc, wdparm_t arg, ...) { FAR struct stm32_ethmac_s *priv = (FAR struct stm32_ethmac_s *)arg; @@ -2368,7 +2370,8 @@ static int stm32_ifup(struct net_driver_s *dev) /* Set and activate a timer process */ - wd_start(priv->txpoll, STM32_WDDELAY, stm32_poll_expiry, 1, (uint32_t)priv); + wd_start(priv->txpoll, STM32_WDDELAY, + stm32_poll_expiry, 1, (wdparm_t)priv); /* Enable the Ethernet interrupt */ diff --git a/arch/arm/src/stm32/stm32_i2s.c b/arch/arm/src/stm32/stm32_i2s.c index e2dea335a89..c52649a50e3 100644 --- a/arch/arm/src/stm32/stm32_i2s.c +++ b/arch/arm/src/stm32/stm32_i2s.c @@ -409,7 +409,7 @@ static void i2s_txdma_sampledone(struct stm32_i2s_s *priv, int result); #endif #ifdef I2S_HAVE_RX -static void i2s_rxdma_timeout(int argc, uint32_t arg, ...); +static void i2s_rxdma_timeout(int argc, wdparm_t arg, ...); static int i2s_rxdma_setup(struct stm32_i2s_s *priv); static void i2s_rx_worker(void *arg); static void i2s_rx_schedule(struct stm32_i2s_s *priv, int result); @@ -417,7 +417,7 @@ static void i2s_rxdma_callback(DMA_HANDLE handle, uint8_t result, void *arg); #endif #ifdef I2S_HAVE_TX -static void i2s_txdma_timeout(int argc, uint32_t arg, ...); +static void i2s_txdma_timeout(int argc, wdparm_t arg, ...); static int i2s_txdma_setup(struct stm32_i2s_s *priv); static void i2s_tx_worker(void *arg); static void i2s_tx_schedule(struct stm32_i2s_s *priv, int result); @@ -957,7 +957,7 @@ static void i2s_txdma_sampledone(struct stm32_i2s_s *priv, int result) ****************************************************************************/ #ifdef I2S_HAVE_RX -static void i2s_rxdma_timeout(int argc, uint32_t arg, ...) +static void i2s_rxdma_timeout(int argc, wdparm_t arg, ...) { struct stm32_i2s_s *priv = (struct stm32_i2s_s *)arg; DEBUGASSERT(priv != NULL); @@ -1095,8 +1095,8 @@ static int i2s_rxdma_setup(struct stm32_i2s_s *priv) if (!notimeout) { - ret = wd_start(priv->rx.dog, timeout, i2s_rxdma_timeout, - 1, (uint32_t)priv); + ret = wd_start(priv->rx.dog, timeout, + i2s_rxdma_timeout, 1, (wdparm_t)priv); /* Check if we have successfully started the watchdog timer. Note * that we do nothing in the case of failure to start the timer. We @@ -1357,7 +1357,7 @@ static void i2s_rxdma_callback(DMA_HANDLE handle, uint8_t result, void *arg) ****************************************************************************/ #ifdef I2S_HAVE_TX -static void i2s_txdma_timeout(int argc, uint32_t arg, ...) +static void i2s_txdma_timeout(int argc, wdparm_t arg, ...) { struct stm32_i2s_s *priv = (struct stm32_i2s_s *)arg; DEBUGASSERT(priv != NULL); @@ -1495,8 +1495,8 @@ static int i2s_txdma_setup(struct stm32_i2s_s *priv) if (!notimeout) { - ret = wd_start(priv->tx.dog, timeout, i2s_txdma_timeout, - 1, (uint32_t)priv); + ret = wd_start(priv->tx.dog, timeout, + i2s_txdma_timeout, 1, (wdparm_t)priv); /* Check if we have successfully started the watchdog timer. Note * that we do nothing in the case of failure to start the timer. We diff --git a/arch/arm/src/stm32/stm32_sdio.c b/arch/arm/src/stm32/stm32_sdio.c index e67c5cb985e..37e94fafd6d 100644 --- a/arch/arm/src/stm32/stm32_sdio.c +++ b/arch/arm/src/stm32/stm32_sdio.c @@ -416,7 +416,7 @@ static void stm32_dataconfig(uint32_t timeout, uint32_t dlen, static void stm32_datadisable(void); static void stm32_sendfifo(struct stm32_dev_s *priv); static void stm32_recvfifo(struct stm32_dev_s *priv); -static void stm32_eventtimeout(int argc, uint32_t arg, ...); +static void stm32_eventtimeout(int argc, wdparm_t arg, ...); static void stm32_endwait(struct stm32_dev_s *priv, sdio_eventset_t wkupevent); static void stm32_endtransfer(struct stm32_dev_s *priv, @@ -1201,7 +1201,7 @@ static void stm32_recvfifo(struct stm32_dev_s *priv) * ****************************************************************************/ -static void stm32_eventtimeout(int argc, uint32_t arg, ...) +static void stm32_eventtimeout(int argc, wdparm_t arg, ...) { struct stm32_dev_s *priv = (struct stm32_dev_s *)arg; @@ -2545,8 +2545,8 @@ static sdio_eventset_t stm32_eventwait(FAR struct sdio_dev_s *dev, /* Start the watchdog timer */ delay = MSEC2TICK(timeout); - ret = wd_start(priv->waitwdog, delay, stm32_eventtimeout, - 1, (uint32_t)priv); + ret = wd_start(priv->waitwdog, delay, + stm32_eventtimeout, 1, (wdparm_t)priv); if (ret < 0) { mcerr("ERROR: wd_start failed: %d\n", ret); diff --git a/arch/arm/src/stm32f7/stm32_ethernet.c b/arch/arm/src/stm32f7/stm32_ethernet.c index b11c769643a..c36fb607f99 100644 --- a/arch/arm/src/stm32f7/stm32_ethernet.c +++ b/arch/arm/src/stm32f7/stm32_ethernet.c @@ -727,10 +727,10 @@ static int stm32_interrupt(int irq, void *context, FAR void *arg); /* Watchdog timer expirations */ static void stm32_txtimeout_work(void *arg); -static void stm32_txtimeout_expiry(int argc, uint32_t arg, ...); +static void stm32_txtimeout_expiry(int argc, wdparm_t arg, ...); static void stm32_poll_work(void *arg); -static void stm32_poll_expiry(int argc, uint32_t arg, ...); +static void stm32_poll_expiry(int argc, wdparm_t arg, ...); /* NuttX callback functions */ @@ -1258,7 +1258,8 @@ static int stm32_transmit(struct stm32_ethmac_s *priv) /* Setup the TX timeout watchdog (perhaps restarting the timer) */ - wd_start(priv->txtimeout, STM32_TXTIMEOUT, stm32_txtimeout_expiry, 1, (uint32_t)priv); + wd_start(priv->txtimeout, STM32_TXTIMEOUT, + stm32_txtimeout_expiry, 1, (wdparm_t)priv); return OK; } @@ -2307,7 +2308,7 @@ static void stm32_txtimeout_work(void *arg) * ****************************************************************************/ -static void stm32_txtimeout_expiry(int argc, uint32_t arg, ...) +static void stm32_txtimeout_expiry(int argc, wdparm_t arg, ...) { struct stm32_ethmac_s *priv = (struct stm32_ethmac_s *)arg; @@ -2397,7 +2398,8 @@ static void stm32_poll_work(void *arg) /* Setup the watchdog poll timer again */ - wd_start(priv->txpoll, STM32_WDDELAY, stm32_poll_expiry, 1, priv); + wd_start(priv->txpoll, STM32_WDDELAY, + stm32_poll_expiry, 1, (wdparm_t)priv); net_unlock(); } @@ -2419,7 +2421,7 @@ static void stm32_poll_work(void *arg) * ****************************************************************************/ -static void stm32_poll_expiry(int argc, uint32_t arg, ...) +static void stm32_poll_expiry(int argc, wdparm_t arg, ...) { struct stm32_ethmac_s *priv = (struct stm32_ethmac_s *)arg; @@ -2431,7 +2433,8 @@ static void stm32_poll_expiry(int argc, uint32_t arg, ...) } else { - wd_start(priv->txpoll, STM32_WDDELAY, stm32_poll_expiry, 1, priv); + wd_start(priv->txpoll, STM32_WDDELAY, + stm32_poll_expiry, 1, (wdparm_t)priv); } } @@ -2479,7 +2482,8 @@ static int stm32_ifup(struct net_driver_s *dev) /* Set and activate a timer process */ - wd_start(priv->txpoll, STM32_WDDELAY, stm32_poll_expiry, 1, (uint32_t)priv); + wd_start(priv->txpoll, STM32_WDDELAY, + stm32_poll_expiry, 1, (wdparm_t)priv); /* Enable the Ethernet interrupt */ diff --git a/arch/arm/src/stm32f7/stm32_qspi.c b/arch/arm/src/stm32f7/stm32_qspi.c index 8750176415a..858f46cd227 100644 --- a/arch/arm/src/stm32f7/stm32_qspi.c +++ b/arch/arm/src/stm32f7/stm32_qspi.c @@ -1349,7 +1349,7 @@ static int qspi0_interrupt(int irq, void *context, FAR void *arg) * ****************************************************************************/ -static void qspi_dma_timeout(int argc, uint32_t arg, ...) +static void qspi_dma_timeout(int argc, wdparm_t arg, ...) { struct stm32f7_qspidev_s *priv = (struct stm32f7_qspidev_s *)arg; DEBUGASSERT(priv != NULL); @@ -1525,7 +1525,7 @@ static int qspi_memory_dma(struct stm32f7_qspidev_s *priv, /* Start (or re-start) the watchdog timeout */ ret = wd_start(priv->dmadog, DMA_TIMEOUT_TICKS, - qspi_dma_timeout, 1, (uint32_t)priv); + qspi_dma_timeout, 1, (wdparm_t)priv); if (ret < 0) { spierr("ERROR: wd_start failed: %d\n", ret); diff --git a/arch/arm/src/stm32f7/stm32_sai.c b/arch/arm/src/stm32f7/stm32_sai.c index acfeb215174..055bbde137a 100644 --- a/arch/arm/src/stm32f7/stm32_sai.c +++ b/arch/arm/src/stm32f7/stm32_sai.c @@ -843,7 +843,7 @@ static void sai_mckdivider(struct stm32f7_sai_s *priv) * ****************************************************************************/ -static void sai_timeout(int argc, uint32_t arg, ...) +static void sai_timeout(int argc, wdparm_t arg, ...) { struct stm32f7_sai_s *priv = (struct stm32f7_sai_s *)arg; DEBUGASSERT(priv != NULL); @@ -988,8 +988,8 @@ static int sai_dma_setup(struct stm32f7_sai_s *priv) if (bfcontainer->timeout > 0) { - ret = wd_start(priv->dog, bfcontainer->timeout, sai_timeout, - 1, (uint32_t)priv); + ret = wd_start(priv->dog, bfcontainer->timeout, + sai_timeout, 1, (wdparm_t)priv); /* Check if we have successfully started the watchdog timer. Note * that we do nothing in the case of failure to start the timer. We diff --git a/arch/arm/src/stm32f7/stm32_sdmmc.c b/arch/arm/src/stm32f7/stm32_sdmmc.c index 169f33c9f90..2dc16974dc6 100644 --- a/arch/arm/src/stm32f7/stm32_sdmmc.c +++ b/arch/arm/src/stm32f7/stm32_sdmmc.c @@ -509,7 +509,7 @@ static void stm32_dataconfig(struct stm32_dev_s *priv, uint32_t timeout, static void stm32_datadisable(struct stm32_dev_s *priv); static void stm32_sendfifo(struct stm32_dev_s *priv); static void stm32_recvfifo(struct stm32_dev_s *priv); -static void stm32_eventtimeout(int argc, uint32_t arg, ...); +static void stm32_eventtimeout(int argc, wdparm_t arg, ...); static void stm32_endwait(struct stm32_dev_s *priv, sdio_eventset_t wkupevent); static void stm32_endtransfer(struct stm32_dev_s *priv, @@ -1452,7 +1452,7 @@ static void stm32_recvfifo(struct stm32_dev_s *priv) * ****************************************************************************/ -static void stm32_eventtimeout(int argc, uint32_t arg, ...) +static void stm32_eventtimeout(int argc, wdparm_t arg, ...) { struct stm32_dev_s *priv = (struct stm32_dev_s *)arg; @@ -2827,8 +2827,8 @@ static sdio_eventset_t stm32_eventwait(FAR struct sdio_dev_s *dev, /* Start the watchdog timer */ delay = MSEC2TICK(timeout); - ret = wd_start(priv->waitwdog, delay, stm32_eventtimeout, - 1, (uint32_t)priv); + ret = wd_start(priv->waitwdog, delay, + stm32_eventtimeout, 1, (wdparm_t)priv); if (ret < 0) { mcerr("ERROR: wd_start failed: %d\n", ret); diff --git a/arch/arm/src/stm32h7/stm32_ethernet.c b/arch/arm/src/stm32h7/stm32_ethernet.c index 529822fb7d2..b19a49affd7 100644 --- a/arch/arm/src/stm32h7/stm32_ethernet.c +++ b/arch/arm/src/stm32h7/stm32_ethernet.c @@ -717,10 +717,10 @@ static int stm32_interrupt(int irq, void *context, FAR void *arg); /* Watchdog timer expirations */ static void stm32_txtimeout_work(void *arg); -static void stm32_txtimeout_expiry(int argc, uint32_t arg, ...); +static void stm32_txtimeout_expiry(int argc, wdparm_t arg, ...); static void stm32_poll_work(void *arg); -static void stm32_poll_expiry(int argc, uint32_t arg, ...); +static void stm32_poll_expiry(int argc, wdparm_t arg, ...); /* NuttX callback functions */ @@ -1277,8 +1277,8 @@ static int stm32_transmit(struct stm32_ethmac_s *priv) /* Setup the TX timeout watchdog (perhaps restarting the timer) */ - wd_start(priv->txtimeout, STM32_TXTIMEOUT, stm32_txtimeout_expiry, - 1, (uint32_t)priv); + wd_start(priv->txtimeout, STM32_TXTIMEOUT, + stm32_txtimeout_expiry, 1, (wdparm_t)priv); /* Update the tx descriptor tail pointer register to start the DMA */ @@ -2410,7 +2410,7 @@ static void stm32_txtimeout_work(void *arg) * ****************************************************************************/ -static void stm32_txtimeout_expiry(int argc, uint32_t arg, ...) +static void stm32_txtimeout_expiry(int argc, wdparm_t arg, ...) { struct stm32_ethmac_s *priv = (struct stm32_ethmac_s *)arg; @@ -2501,7 +2501,8 @@ static void stm32_poll_work(void *arg) /* Setup the watchdog poll timer again */ - wd_start(priv->txpoll, STM32_WDDELAY, stm32_poll_expiry, 1, priv); + wd_start(priv->txpoll, STM32_WDDELAY, + stm32_poll_expiry, 1, (wdparm_t)priv); net_unlock(); } @@ -2523,7 +2524,7 @@ static void stm32_poll_work(void *arg) * ****************************************************************************/ -static void stm32_poll_expiry(int argc, uint32_t arg, ...) +static void stm32_poll_expiry(int argc, wdparm_t arg, ...) { struct stm32_ethmac_s *priv = (struct stm32_ethmac_s *)arg; @@ -2535,7 +2536,8 @@ static void stm32_poll_expiry(int argc, uint32_t arg, ...) } else { - wd_start(priv->txpoll, STM32_WDDELAY, stm32_poll_expiry, 1, priv); + wd_start(priv->txpoll, STM32_WDDELAY, + stm32_poll_expiry, 1, (wdparm_t)priv); } } @@ -2583,8 +2585,8 @@ static int stm32_ifup(struct net_driver_s *dev) /* Set and activate a timer process */ - wd_start(priv->txpoll, STM32_WDDELAY, stm32_poll_expiry, 1, - (uint32_t)priv); + wd_start(priv->txpoll, STM32_WDDELAY, + stm32_poll_expiry, 1, (wdparm_t)priv); /* Enable the Ethernet interrupt */ diff --git a/arch/arm/src/stm32h7/stm32_qspi.c b/arch/arm/src/stm32h7/stm32_qspi.c index b90db2fb056..aa705b8d0fd 100644 --- a/arch/arm/src/stm32h7/stm32_qspi.c +++ b/arch/arm/src/stm32h7/stm32_qspi.c @@ -1393,7 +1393,7 @@ static int qspi0_interrupt(int irq, void *context, FAR void *arg) * ****************************************************************************/ -static void qspi_dma_timeout(int argc, uint32_t arg, ...) +static void qspi_dma_timeout(int argc, wdparm_t arg, ...) { struct stm32h7_qspidev_s *priv = (struct stm32h7_qspidev_s *)arg; DEBUGASSERT(priv != NULL); @@ -1569,7 +1569,7 @@ static int qspi_memory_dma(struct stm32h7_qspidev_s *priv, /* Start (or re-start) the watchdog timeout */ ret = wd_start(priv->dmadog, DMA_TIMEOUT_TICKS, - qspi_dma_timeout, 1, (uint32_t)priv); + qspi_dma_timeout, 1, (wdparm_t)priv); if (ret < 0) { spierr("ERROR: wd_start failed: %d\n", ret); diff --git a/arch/arm/src/stm32h7/stm32_sdmmc.c b/arch/arm/src/stm32h7/stm32_sdmmc.c index 48b9576a2d9..d8c618e316a 100644 --- a/arch/arm/src/stm32h7/stm32_sdmmc.c +++ b/arch/arm/src/stm32h7/stm32_sdmmc.c @@ -452,7 +452,7 @@ static void stm32_recvfifo(struct stm32_dev_s *priv); !defined(CONFIG_ARCH_HAVE_SDIO_DELAYED_INVLDT) static void stm32_recvdma(struct stm32_dev_s *priv); #endif -static void stm32_eventtimeout(int argc, uint32_t arg, ...); +static void stm32_eventtimeout(int argc, wdparm_t arg, ...); static void stm32_endwait(struct stm32_dev_s *priv, sdio_eventset_t wkupevent); static void stm32_endtransfer(struct stm32_dev_s *priv, @@ -1429,7 +1429,7 @@ static void stm32_recvdma(struct stm32_dev_s *priv) * ****************************************************************************/ -static void stm32_eventtimeout(int argc, uint32_t arg, ...) +static void stm32_eventtimeout(int argc, wdparm_t arg, ...) { struct stm32_dev_s *priv = (struct stm32_dev_s *)arg; @@ -2891,8 +2891,8 @@ static sdio_eventset_t stm32_eventwait(FAR struct sdio_dev_s *dev, /* Start the watchdog timer */ delay = MSEC2TICK(timeout); - ret = wd_start(priv->waitwdog, delay, stm32_eventtimeout, - 1, (uint32_t)priv); + ret = wd_start(priv->waitwdog, delay, + stm32_eventtimeout, 1, (wdparm_t)priv); if (ret < OK) { mcerr("ERROR: wd_start failed: %d\n", ret); diff --git a/arch/arm/src/stm32l4/stm32l4_qspi.c b/arch/arm/src/stm32l4/stm32l4_qspi.c index 92b88f58123..3ed4c53a0d9 100644 --- a/arch/arm/src/stm32l4/stm32l4_qspi.c +++ b/arch/arm/src/stm32l4/stm32l4_qspi.c @@ -1304,7 +1304,7 @@ static int qspi0_interrupt(int irq, void *context, FAR void *arg) * ****************************************************************************/ -static void qspi_dma_timeout(int argc, uint32_t arg, ...) +static void qspi_dma_timeout(int argc, wdparm_t arg, ...) { struct stm32l4_qspidev_s *priv = (struct stm32l4_qspidev_s *)arg; DEBUGASSERT(priv != NULL); @@ -1478,7 +1478,7 @@ static int qspi_memory_dma(struct stm32l4_qspidev_s *priv, /* Start (or re-start) the watchdog timeout */ ret = wd_start(priv->dmadog, DMA_TIMEOUT_TICKS, - qspi_dma_timeout, 1, (uint32_t)priv); + qspi_dma_timeout, 1, (wdparm_t)priv); if (ret < 0) { spierr("ERROR: wd_start failed: %d\n", ret); diff --git a/arch/arm/src/stm32l4/stm32l4_sai.c b/arch/arm/src/stm32l4/stm32l4_sai.c index 83911a412aa..44bf3bafeb4 100644 --- a/arch/arm/src/stm32l4/stm32l4_sai.c +++ b/arch/arm/src/stm32l4/stm32l4_sai.c @@ -512,7 +512,7 @@ static void sai_mckdivider(struct stm32l4_sai_s *priv) * ****************************************************************************/ -static void sai_timeout(int argc, uint32_t arg, ...) +static void sai_timeout(int argc, wdparm_t arg, ...) { struct stm32l4_sai_s *priv = (struct stm32l4_sai_s *)arg; DEBUGASSERT(priv != NULL); @@ -657,8 +657,8 @@ static int sai_dma_setup(struct stm32l4_sai_s *priv) if (bfcontainer->timeout > 0) { - ret = wd_start(priv->dog, bfcontainer->timeout, sai_timeout, - 1, (uint32_t)priv); + ret = wd_start(priv->dog, bfcontainer->timeout, + sai_timeout, 1, (wdparm_t)priv); /* Check if we have successfully started the watchdog timer. Note * that we do nothing in the case of failure to start the timer. We diff --git a/arch/arm/src/stm32l4/stm32l4_sdmmc.c b/arch/arm/src/stm32l4/stm32l4_sdmmc.c index ffd30db2bf3..bfb011bf93e 100644 --- a/arch/arm/src/stm32l4/stm32l4_sdmmc.c +++ b/arch/arm/src/stm32l4/stm32l4_sdmmc.c @@ -446,7 +446,7 @@ static void stm32_dataconfig(struct stm32_dev_s *priv, uint32_t timeout, static void stm32_datadisable(struct stm32_dev_s *priv); static void stm32_sendfifo(struct stm32_dev_s *priv); static void stm32_recvfifo(struct stm32_dev_s *priv); -static void stm32_eventtimeout(int argc, uint32_t arg, ...); +static void stm32_eventtimeout(int argc, wdparm_t arg, ...); static void stm32_endwait(struct stm32_dev_s *priv, sdio_eventset_t wkupevent); static void stm32_endtransfer(struct stm32_dev_s *priv, @@ -1332,7 +1332,7 @@ static void stm32_recvfifo(struct stm32_dev_s *priv) * ****************************************************************************/ -static void stm32_eventtimeout(int argc, uint32_t arg, ...) +static void stm32_eventtimeout(int argc, wdparm_t arg, ...) { struct stm32_dev_s *priv = (struct stm32_dev_s *)arg; @@ -2631,8 +2631,8 @@ static sdio_eventset_t stm32_eventwait(FAR struct sdio_dev_s *dev, /* Start the watchdog timer */ delay = MSEC2TICK(timeout); - ret = wd_start(priv->waitwdog, delay, stm32_eventtimeout, - 1, (uint32_t)priv); + ret = wd_start(priv->waitwdog, delay, + stm32_eventtimeout, 1, (wdparm_t)priv); if (ret < 0) { mcerr("ERROR: wd_start failed: %d\n", ret); diff --git a/arch/arm/src/tiva/lm/lm3s_ethernet.c b/arch/arm/src/tiva/lm/lm3s_ethernet.c index 99805e3c062..35ef6af3899 100644 --- a/arch/arm/src/tiva/lm/lm3s_ethernet.c +++ b/arch/arm/src/tiva/lm/lm3s_ethernet.c @@ -260,10 +260,10 @@ static int tiva_interrupt(int irq, void *context, FAR void *arg); /* Watchdog timer expirations */ static void tiva_txtimeout_work(void *arg); -static void tiva_txtimeout_expiry(int argc, uint32_t arg, ...); +static void tiva_txtimeout_expiry(int argc, wdparm_t arg, ...); static void tiva_poll_work(void *arg); -static void tiva_poll_expiry(int argc, uint32_t arg, ...); +static void tiva_poll_expiry(int argc, wdparm_t arg, ...); /* NuttX callback functions */ @@ -584,7 +584,7 @@ static int tiva_transmit(struct tiva_driver_s *priv) /* Setup the TX timeout watchdog (perhaps restarting the timer) */ wd_start(priv->ld_txtimeout, TIVA_TXTIMEOUT, - tiva_txtimeout_expiry, 1, (uint32_t)priv); + tiva_txtimeout_expiry, 1, (wdparm_t)priv); ret = OK; } @@ -1226,8 +1226,8 @@ static void tiva_poll_work(void *arg) /* Setup the watchdog poll timer again */ - wd_start(priv->ld_txpoll, TIVA_WDDELAY, tiva_poll_expiry, - 1, priv); + wd_start(priv->ld_txpoll, TIVA_WDDELAY, + tiva_poll_expiry, 1, (wdparm_t)priv); } net_unlock(); @@ -1413,8 +1413,8 @@ static int tiva_ifup(struct net_driver_s *dev) /* Set and activate a timer process */ - wd_start(priv->ld_txpoll, TIVA_WDDELAY, tiva_poll_expiry, - 1, (uint32_t)priv); + wd_start(priv->ld_txpoll, TIVA_WDDELAY, + tiva_poll_expiry, 1, (wdparm_t)priv); priv->ld_bifup = true; leave_critical_section(flags); diff --git a/arch/arm/src/tiva/tm4c/tm4c_ethernet.c b/arch/arm/src/tiva/tm4c/tm4c_ethernet.c index e96d341fe59..eb43cd81553 100644 --- a/arch/arm/src/tiva/tm4c/tm4c_ethernet.c +++ b/arch/arm/src/tiva/tm4c/tm4c_ethernet.c @@ -699,10 +699,10 @@ static int tiva_interrupt(int irq, FAR void *context, FAR void *arg); /* Watchdog timer expirations */ static void tiva_txtimeout_work(FAR void *arg); -static void tiva_txtimeout_expiry(int argc, uint32_t arg, ...); +static void tiva_txtimeout_expiry(int argc, wdparm_t arg, ...); static void tiva_poll_work(FAR void *arg); -static void tiva_poll_expiry(int argc, uint32_t arg, ...); +static void tiva_poll_expiry(int argc, wdparm_t arg, ...); /* NuttX callback functions */ @@ -1196,7 +1196,8 @@ static int tiva_transmit(FAR struct tiva_ethmac_s *priv) /* Setup the TX timeout watchdog (perhaps restarting the timer) */ - wd_start(priv->txtimeout, TIVA_TXTIMEOUT, tiva_txtimeout_expiry, 1, (uint32_t)priv); + wd_start(priv->txtimeout, TIVA_TXTIMEOUT, + tiva_txtimeout_expiry, 1, (wdparm_t)priv); return OK; } @@ -2197,7 +2198,7 @@ static void tiva_txtimeout_work(FAR void *arg) * ****************************************************************************/ -static void tiva_txtimeout_expiry(int argc, uint32_t arg, ...) +static void tiva_txtimeout_expiry(int argc, wdparm_t arg, ...) { FAR struct tiva_ethmac_s *priv = (FAR struct tiva_ethmac_s *)arg; @@ -2285,8 +2286,8 @@ static void tiva_poll_work(FAR void *arg) /* Setup the watchdog poll timer again */ - wd_start(priv->txpoll, TIVA_WDDELAY, tiva_poll_expiry, - 1, (uint32_t)priv); + wd_start(priv->txpoll, TIVA_WDDELAY, + tiva_poll_expiry, 1, (wdparm_t)priv); net_unlock(); } @@ -2308,7 +2309,7 @@ static void tiva_poll_work(FAR void *arg) * ****************************************************************************/ -static void tiva_poll_expiry(int argc, uint32_t arg, ...) +static void tiva_poll_expiry(int argc, wdparm_t arg, ...) { FAR struct tiva_ethmac_s *priv = (FAR struct tiva_ethmac_s *)arg; @@ -2361,8 +2362,8 @@ static int tiva_ifup(struct net_driver_s *dev) /* Set and activate a timer process */ - wd_start(priv->txpoll, TIVA_WDDELAY, tiva_poll_expiry, - 1, (uint32_t)priv); + wd_start(priv->txpoll, TIVA_WDDELAY, + tiva_poll_expiry, 1, (wdparm_t)priv); /* Enable the Ethernet interrupt */ diff --git a/arch/arm/src/xmc4/xmc4_spi.c b/arch/arm/src/xmc4/xmc4_spi.c index 8722b801dac..c168694cd54 100644 --- a/arch/arm/src/xmc4/xmc4_spi.c +++ b/arch/arm/src/xmc4/xmc4_spi.c @@ -912,7 +912,7 @@ static void spi_dma_sampledone(struct xmc4_spics_s *spics) ****************************************************************************/ #ifdef CONFIG_XMC4_SPI_DMA -static void spi_dmatimeout(int argc, uint32_t arg, ...) +static void spi_dmatimeout(int argc, wdparm_t arg, ...) { struct xmc4_spics_s *spics = (struct xmc4_spics_s *)arg; @@ -1662,7 +1662,7 @@ static void spi_exchange(struct spi_dev_s *dev, const void *txbuffer, /* Start (or re-start) the watchdog timeout */ ret = wd_start(spics->dmadog, DMA_TIMEOUT_TICKS, - spi_dmatimeout, 1, (uint32_t)spics); + spi_dmatimeout, 1, (wdparm_t)spics); if (ret != OK) { spierr("ERROR: wd_start failed: %d\n", ret); diff --git a/arch/hc/src/m9s12/m9s12_ethernet.c b/arch/hc/src/m9s12/m9s12_ethernet.c index f06b29971d7..713fa771b06 100644 --- a/arch/hc/src/m9s12/m9s12_ethernet.c +++ b/arch/hc/src/m9s12/m9s12_ethernet.c @@ -131,8 +131,8 @@ static int emac_interrupt(int irq, FAR void *context, FAR void *arg); /* Watchdog timer expirations */ -static void emac_polltimer(int argc, uint32_t arg, ...); -static void emac_txtimeout(int argc, uint32_t arg, ...); +static void emac_polltimer(int argc, wdparm_t arg, ...); +static void emac_txtimeout(int argc, wdparm_t arg, ...); /* NuttX callback functions */ @@ -183,7 +183,8 @@ static int emac_transmit(FAR struct emac_driver_s *priv) /* Setup the TX timeout watchdog (perhaps restarting the timer) */ - wd_start(priv->d_txtimeout, HCS12_TXTIMEOUT, emac_txtimeout, 1, (uint32_t)priv); + wd_start(priv->d_txtimeout, HCS12_TXTIMEOUT, + emac_txtimeout, 1, (wdparm_t)priv); return OK; } @@ -486,7 +487,7 @@ static int emac_interrupt(int irq, FAR void *context, FAR void *arg) * ****************************************************************************/ -static void emac_txtimeout(int argc, uint32_t arg, ...) +static void emac_txtimeout(int argc, wdparm_t arg, ...) { FAR struct emac_driver_s *priv = (FAR struct emac_driver_s *)arg; @@ -517,7 +518,7 @@ static void emac_txtimeout(int argc, uint32_t arg, ...) * ****************************************************************************/ -static void emac_polltimer(int argc, uint32_t arg, ...) +static void emac_polltimer(int argc, wdparm_t arg, ...) { FAR struct emac_driver_s *priv = (FAR struct emac_driver_s *)arg; @@ -534,7 +535,7 @@ static void emac_polltimer(int argc, uint32_t arg, ...) /* Setup the watchdog poll timer again */ - wd_start(priv->d_txpoll, HCS12_WDDELAY, emac_polltimer, 1, arg); + wd_start(priv->d_txpoll, HCS12_WDDELAY, emac_polltimer, 1, (wdparm_t)arg); } /**************************************************************************** @@ -566,7 +567,7 @@ static int emac_ifup(struct net_driver_s *dev) /* Set and activate a timer process */ - wd_start(priv->d_txpoll, HCS12_WDDELAY, emac_polltimer, 1, (uint32_t)priv); + wd_start(priv->d_txpoll, HCS12_WDDELAY, emac_polltimer, 1, (wdparm_t)priv); /* Enable the Ethernet interrupt */ diff --git a/arch/mips/src/pic32mx/pic32mx_ethernet.c b/arch/mips/src/pic32mx/pic32mx_ethernet.c index f9395665cc3..5f5bab18539 100644 --- a/arch/mips/src/pic32mx/pic32mx_ethernet.c +++ b/arch/mips/src/pic32mx/pic32mx_ethernet.c @@ -416,10 +416,10 @@ static int pic32mx_interrupt(int irq, void *context, FAR void *arg); /* Watchdog timer expirations */ static void pic32mx_txtimeout_work(void *arg); -static void pic32mx_txtimeout_expiry(int argc, uint32_t arg, ...); +static void pic32mx_txtimeout_expiry(int argc, wdparm_t arg, ...); static void pic32mx_poll_work(void *arg); -static void pic32mx_poll_expiry(int argc, uint32_t arg, ...); +static void pic32mx_poll_expiry(int argc, wdparm_t arg, ...); /* NuttX callback functions */ @@ -1111,7 +1111,7 @@ static int pic32mx_transmit(struct pic32mx_driver_s *priv) /* Setup the TX timeout watchdog (perhaps restarting the timer) */ wd_start(priv->pd_txtimeout, PIC32MX_TXTIMEOUT, - pic32mx_txtimeout_expiry, 1, (uint32_t)priv); + pic32mx_txtimeout_expiry, 1, (wdparm_t)priv); return OK; } @@ -2063,8 +2063,8 @@ static void pic32mx_poll_work(void *arg) /* Setup the watchdog poll timer again */ - wd_start(priv->pd_txpoll, PIC32MX_WDDELAY, pic32mx_poll_expiry, - 1, priv); + wd_start(priv->pd_txpoll, PIC32MX_WDDELAY, + pic32mx_poll_expiry, 1, (wdparm_t)priv); net_unlock(); } @@ -2392,8 +2392,8 @@ static int pic32mx_ifup(struct net_driver_s *dev) /* Set and activate a timer process */ - wd_start(priv->pd_txpoll, PIC32MX_WDDELAY, pic32mx_poll_expiry, 1, - (uint32_t)priv); + wd_start(priv->pd_txpoll, PIC32MX_WDDELAY, + pic32mx_poll_expiry, 1, (wdparm_t)priv); /* Finally, enable the Ethernet interrupt at the interrupt controller */ diff --git a/arch/mips/src/pic32mx/pic32mx_usbdev.c b/arch/mips/src/pic32mx/pic32mx_usbdev.c index 47da535500e..64a52652d04 100644 --- a/arch/mips/src/pic32mx/pic32mx_usbdev.c +++ b/arch/mips/src/pic32mx/pic32mx_usbdev.c @@ -465,7 +465,7 @@ static void pic32mx_epwrite(struct pic32mx_ep_s *privep, const uint8_t *src, uint32_t nbytes); static void pic32mx_wrcomplete(struct pic32mx_usbdev_s *priv, struct pic32mx_ep_s *privep); -static void pic32mx_rqrestart(int argc, uint32_t arg1, ...); +static void pic32mx_rqrestart(int argc, wdparm_t arg1, ...); static void pic32mx_delayedrestart(struct pic32mx_usbdev_s *priv, uint8_t epno); static void pic32mx_rqstop(struct pic32mx_ep_s *privep); @@ -971,7 +971,7 @@ static void pic32mx_wrcomplete(struct pic32mx_usbdev_s *priv, * Name: pic32mx_rqrestart ****************************************************************************/ -static void pic32mx_rqrestart(int argc, uint32_t arg1, ...) +static void pic32mx_rqrestart(int argc, wdparm_t arg1, ...) { struct pic32mx_usbdev_s *priv; struct pic32mx_ep_s *privep; @@ -1042,8 +1042,8 @@ static void pic32mx_delayedrestart(struct pic32mx_usbdev_s *priv, /* And start (or re-start) the watchdog timer */ - wd_start(priv->wdog, RESTART_DELAY, pic32mx_rqrestart, 1, - (uint32_t)priv); + wd_start(priv->wdog, RESTART_DELAY, + pic32mx_rqrestart, 1, (wdparm_t)priv); } /**************************************************************************** diff --git a/arch/mips/src/pic32mz/pic32mz_ethernet.c b/arch/mips/src/pic32mz/pic32mz_ethernet.c index fe83dfb3f77..11aa6608d89 100644 --- a/arch/mips/src/pic32mz/pic32mz_ethernet.c +++ b/arch/mips/src/pic32mz/pic32mz_ethernet.c @@ -478,10 +478,10 @@ static int pic32mz_interrupt(int irq, void *context, FAR void *arg); /* Watchdog timer expirations */ static void pic32mz_txtimeout_work(void *arg); -static void pic32mz_txtimeout_expiry(int argc, uint32_t arg, ...); +static void pic32mz_txtimeout_expiry(int argc, wdparm_t arg, ...); static void pic32mz_poll_work(void *arg); -static void pic32mz_poll_expiry(int argc, uint32_t arg, ...); +static void pic32mz_poll_expiry(int argc, wdparm_t arg, ...); /* NuttX callback functions */ @@ -1218,7 +1218,7 @@ static int pic32mz_transmit(struct pic32mz_driver_s *priv) /* Setup the TX timeout watchdog (perhaps restarting the timer) */ wd_start(priv->pd_txtimeout, PIC32MZ_TXTIMEOUT, - pic32mz_txtimeout_expiry, 1, (uint32_t)priv); + pic32mz_txtimeout_expiry, 1, (wdparm_t)priv); return OK; } @@ -2202,8 +2202,8 @@ static void pic32mz_poll_work(void *arg) /* Setup the watchdog poll timer again */ - wd_start(priv->pd_txpoll, PIC32MZ_WDDELAY, pic32mz_poll_expiry, - 1, priv); + wd_start(priv->pd_txpoll, PIC32MZ_WDDELAY, + pic32mz_poll_expiry, 1, (wdparm_t)priv); net_unlock(); } @@ -2545,8 +2545,8 @@ static int pic32mz_ifup(struct net_driver_s *dev) /* Set and activate a timer process */ - wd_start(priv->pd_txpoll, PIC32MZ_WDDELAY, pic32mz_poll_expiry, 1, - (uint32_t)priv); + wd_start(priv->pd_txpoll, PIC32MZ_WDDELAY, + pic32mz_poll_expiry, 1, (wdparm_t)priv); /* Finally, enable the Ethernet interrupt at the interrupt controller */ diff --git a/arch/mips/src/pic32mz/pic32mz_spi.c b/arch/mips/src/pic32mz/pic32mz_spi.c index 37828fa4ebe..ca525911e37 100644 --- a/arch/mips/src/pic32mz/pic32mz_spi.c +++ b/arch/mips/src/pic32mz/pic32mz_spi.c @@ -218,7 +218,7 @@ static void spi_dma_sampledone(FAR struct pic32mz_dev_s *priv); # endif static void spi_dmarxcallback(DMA_HANDLE handle, uint8_t status, void *arg); static void spi_dmatxcallback(DMA_HANDLE handle, uint8_t status, void *arg); -static void spi_dmatimeout(int argc, uint32_t arg, ...); +static void spi_dmatimeout(int argc, wdparm_t arg, ...); #endif /* SPI methods */ @@ -995,7 +995,7 @@ static void spi_dmatxcallback(DMA_HANDLE handle, uint8_t status, void *arg) ****************************************************************************/ #ifdef CONFIG_PIC32MZ_SPI_DMA -static void spi_dmatimeout(int argc, uint32_t arg, ...) +static void spi_dmatimeout(int argc, wdparm_t arg, ...) { struct pic32mz_dev_s *priv = (struct pic32mz_dev_s *)arg; DEBUGASSERT(priv != NULL); @@ -1775,7 +1775,7 @@ static void spi_exchange(FAR struct spi_dev_s *dev, FAR const void *txbuffer, /* Start (or re-start) the watchdog timeout */ ret = wd_start(priv->dmadog, DMA_TIMEOUT_TICKS, - spi_dmatimeout, 1, (uint32_t)priv); + spi_dmatimeout, 1, (wdparm_t)priv); if (ret < 0) { spierr("ERROR: wd_start failed: %d\n", ret); diff --git a/arch/misoc/src/common/misoc_net.c b/arch/misoc/src/common/misoc_net.c index 4a9c961cf08..2bdfb34c9d2 100644 --- a/arch/misoc/src/common/misoc_net.c +++ b/arch/misoc/src/common/misoc_net.c @@ -773,8 +773,8 @@ static void misoc_net_poll_work(FAR void *arg) /* Setup the watchdog poll timer again */ - wd_start(priv->misoc_net_txpoll, MISOC_NET_WDDELAY, misoc_net_poll_expiry, 1, - (wdparm_t)priv); + wd_start(priv->misoc_net_txpoll, MISOC_NET_WDDELAY, + misoc_net_poll_expiry, 1, (wdparm_t)priv); net_unlock(); } diff --git a/arch/renesas/src/rx65n/rx65n_eth.c b/arch/renesas/src/rx65n/rx65n_eth.c index ee86e78627c..54f1aa21a72 100644 --- a/arch/renesas/src/rx65n/rx65n_eth.c +++ b/arch/renesas/src/rx65n/rx65n_eth.c @@ -2073,7 +2073,7 @@ static void rx65n_txtimeout_work(FAR void *arg) * ****************************************************************************/ -void rx65n_txtimeout_expiry(int argc, uint32_t arg, ...) +void rx65n_txtimeout_expiry(int argc, wdparm_t arg, ...) { FAR struct rx65n_ethmac_s *priv = (FAR struct rx65n_ethmac_s *)arg; nerr("ERROR: Timeout!\n"); @@ -2185,7 +2185,7 @@ static void rx65n_poll_work(FAR void *arg) * ****************************************************************************/ -void rx65n_poll_expiry(int argc, uint32_t arg, ...) +void rx65n_poll_expiry(int argc, wdparm_t arg, ...) { FAR struct rx65n_ethmac_s *priv = (FAR struct rx65n_ethmac_s *)arg; rx65n_cmtw0_stop(rx65n_cmtw0_txpoll); diff --git a/arch/renesas/src/rx65n/rx65n_eth.h b/arch/renesas/src/rx65n/rx65n_eth.h index ea840b765f6..3ec09745c39 100644 --- a/arch/renesas/src/rx65n/rx65n_eth.h +++ b/arch/renesas/src/rx65n/rx65n_eth.h @@ -87,7 +87,7 @@ int rx65n_ethinitialize(int intf); * ****************************************************************************/ -void rx65n_poll_expiry(int argc, uint32_t arg, ...); +void rx65n_poll_expiry(int argc, wdparm_t arg, ...); /**************************************************************************** * Function: rx65n_txtimeout_expiry @@ -104,7 +104,7 @@ void rx65n_poll_expiry(int argc, uint32_t arg, ...); * ****************************************************************************/ -void rx65n_txtimeout_expiry(int argc, uint32_t arg, ...); +void rx65n_txtimeout_expiry(int argc, wdparm_t arg, ...); #endif #undef EXTERN diff --git a/arch/sim/src/sim/up_ioexpander.c b/arch/sim/src/sim/up_ioexpander.c index 578216d83b5..a5f08d2b835 100644 --- a/arch/sim/src/sim/up_ioexpander.c +++ b/arch/sim/src/sim/up_ioexpander.c @@ -774,8 +774,8 @@ static void sim_interrupt_work(void *arg) /* Re-start the poll timer */ - ret = wd_start(priv->wdog, SIM_POLLDELAY, sim_interrupt, - 1, (wdparm_t)priv); + ret = wd_start(priv->wdog, SIM_POLLDELAY, + sim_interrupt, 1, (wdparm_t)priv); if (ret < 0) { gpioerr("ERROR: Failed to start poll timer\n"); @@ -863,8 +863,8 @@ FAR struct ioexpander_dev_s *sim_ioexpander_initialize(void) priv->wdog = wd_create(); DEBUGASSERT(priv->wdog != NULL); - ret = wd_start(priv->wdog, SIM_POLLDELAY, sim_interrupt, - 1, (wdparm_t)priv); + ret = wd_start(priv->wdog, SIM_POLLDELAY, + sim_interrupt, 1, (wdparm_t)priv); if (ret < 0) { gpioerr("ERROR: Failed to start poll timer\n"); diff --git a/arch/z80/src/ez80/ez80_emac.c b/arch/z80/src/ez80/ez80_emac.c index 99049d3cf82..1057b718830 100644 --- a/arch/z80/src/ez80/ez80_emac.c +++ b/arch/z80/src/ez80/ez80_emac.c @@ -413,10 +413,10 @@ static int ez80emac_sysinterrupt(int irq, FAR void *context, /* Watchdog timer expirations */ static void ez80emac_txtimeout_work(FAR void *arg); -static void ez80emac_txtimeout_expiry(int argc, uint32_t arg, ...); +static void ez80emac_txtimeout_expiry(int argc, wdparm_t arg, ...); static void ez80emac_poll_work(FAR void *arg); -static void ez80emac_poll_expiry(int argc, uint32_t arg, ...); +static void ez80emac_poll_expiry(int argc, wdparm_t arg, ...); /* NuttX callback functions */ @@ -1131,7 +1131,7 @@ static int ez80emac_transmit(struct ez80emac_driver_s *priv) /* Setup the TX timeout watchdog (perhaps restarting the timer) */ wd_start(priv->txtimeout, EMAC_TXTIMEOUT, - ez80emac_txtimeout_expiry, 1, (uint32_t)priv); + ez80emac_txtimeout_expiry, 1, (wdparm_t)priv); return OK; } @@ -1991,7 +1991,8 @@ static void ez80emac_poll_work(FAR void *arg) /* Setup the watchdog poll timer again */ - wd_start(priv->txpoll, EMAC_WDDELAY, ez80emac_poll_expiry, 1, priv); + wd_start(priv->txpoll, EMAC_WDDELAY, + ez80emac_poll_expiry, 1, (wdparm_t)priv); net_unlock(); } @@ -2033,8 +2034,8 @@ static void ez80emac_poll_expiry(int argc, wdparm_t arg, ...) * cycle. */ - wd_start(priv->txpoll, EMAC_WDDELAY, ez80emac_poll_expiry, - 1, arg); + wd_start(priv->txpoll, EMAC_WDDELAY, + ez80emac_poll_expiry, 1, (wdparm_t)arg); } } @@ -2125,8 +2126,8 @@ static int ez80emac_ifup(FAR struct net_driver_s *dev) /* Set and activate a timer process */ - wd_start(priv->txpoll, EMAC_WDDELAY, ez80emac_poll_expiry, - 1, (uint32_t)priv); + wd_start(priv->txpoll, EMAC_WDDELAY, + ez80emac_poll_expiry, 1, (wdparm_t)priv); /* Enable the Ethernet interrupts */ diff --git a/boards/arm/samv7/samv71-xult/src/sam_ili9488.c b/boards/arm/samv7/samv71-xult/src/sam_ili9488.c index 020b59b5c44..d08c864fba3 100644 --- a/boards/arm/samv7/samv71-xult/src/sam_ili9488.c +++ b/boards/arm/samv7/samv71-xult/src/sam_ili9488.c @@ -382,7 +382,7 @@ static void sam_lcd_dump(struct sam_dev_s *priv); #endif static void sam_lcd_endwait(struct sam_dev_s *priv, int result); -static void sam_lcd_dmatimeout(int argc, uint32_t arg, ...); +static void sam_lcd_dmatimeout(int argc, wdparm_t arg, ...); static int sam_lcd_dmawait(FAR struct sam_dev_s *priv, uint32_t timeout); static void sam_lcd_dmacallback(DMA_HANDLE handle, void *arg, int result); static int sam_lcd_txtransfer(FAR struct sam_dev_s *priv, @@ -941,7 +941,7 @@ static void sam_lcd_endwait(struct sam_dev_s *priv, int result) * ****************************************************************************/ -static void sam_lcd_dmatimeout(int argc, uint32_t arg, ...) +static void sam_lcd_dmatimeout(int argc, wdparm_t arg, ...) { struct sam_dev_s *priv = (struct sam_dev_s *)arg; @@ -983,8 +983,8 @@ static int sam_lcd_dmawait(FAR struct sam_dev_s *priv, uint32_t timeout) /* Started ... setup the timeout */ - ret = wd_start(priv->dmadog, timeout, sam_lcd_dmatimeout, - 1, (uint32_t)priv); + ret = wd_start(priv->dmadog, timeout, + sam_lcd_dmatimeout, 1, (wdparm_t)priv); if (ret < 0) { lcderr("ERROR: wd_start failed: %d\n", errno); diff --git a/drivers/input/ads7843e.c b/drivers/input/ads7843e.c index 0a9b20334dc..baeefccf43f 100644 --- a/drivers/input/ads7843e.c +++ b/drivers/input/ads7843e.c @@ -501,7 +501,7 @@ static int ads7843e_schedule(FAR struct ads7843e_dev_s *priv) * Name: ads7843e_wdog ****************************************************************************/ -static void ads7843e_wdog(int argc, uint32_t arg1, ...) +static void ads7843e_wdog(int argc, wdparm_t arg1, ...) { FAR struct ads7843e_dev_s *priv = (FAR struct ads7843e_dev_s *)((uintptr_t)arg1); @@ -602,8 +602,8 @@ static void ads7843e_worker(FAR void *arg) * later. */ - wd_start(priv->wdog, ADS7843E_WDOG_DELAY, ads7843e_wdog, 1, - (uint32_t)priv); + wd_start(priv->wdog, ADS7843E_WDOG_DELAY, + ads7843e_wdog, 1, (wdparm_t)priv); goto ignored; } else @@ -637,8 +637,8 @@ static void ads7843e_worker(FAR void *arg) /* Continue to sample the position while the pen is down */ - wd_start(priv->wdog, ADS7843E_WDOG_DELAY, ads7843e_wdog, 1, - (uint32_t)priv); + wd_start(priv->wdog, ADS7843E_WDOG_DELAY, + ads7843e_wdog, 1, (wdparm_t)priv); /* Check the thresholds. Bail if there is no significant difference */ diff --git a/drivers/input/ft5x06.c b/drivers/input/ft5x06.c index 4bf192edced..69fa257e36b 100644 --- a/drivers/input/ft5x06.c +++ b/drivers/input/ft5x06.c @@ -363,7 +363,7 @@ static void ft5x06_data_worker(FAR void *arg) #ifdef CONFIG_FT5X06_POLLMODE /* Exit, re-starting the poll. */ - wd_start(priv->polltimer, priv->delay, ft5x06_poll_timeout, 1, priv); + wd_start(priv->polltimer, priv->delay, ft5x06_poll_timeout, 1, (wdparm_t)priv); #else /* Exit, re-enabling FT5x06 interrupts */ diff --git a/drivers/input/max11802.c b/drivers/input/max11802.c index 911ee634ad9..5fd352a773d 100644 --- a/drivers/input/max11802.c +++ b/drivers/input/max11802.c @@ -460,7 +460,7 @@ static int max11802_schedule(FAR struct max11802_dev_s *priv) * Name: max11802_wdog ****************************************************************************/ -static void max11802_wdog(int argc, uint32_t arg1, ...) +static void max11802_wdog(int argc, wdparm_t arg1, ...) { FAR struct max11802_dev_s *priv = (FAR struct max11802_dev_s *)((uintptr_t)arg1); @@ -580,8 +580,8 @@ static void max11802_worker(FAR void *arg) iinfo("Previous pen up event still in buffer\n"); max11802_notify(priv); - wd_start(priv->wdog, MAX11802_WDOG_DELAY, max11802_wdog, 1, - (uint32_t)priv); + wd_start(priv->wdog, MAX11802_WDOG_DELAY, + max11802_wdog, 1, (wdparm_t)priv); goto ignored; } else @@ -620,8 +620,8 @@ static void max11802_worker(FAR void *arg) /* Continue to sample the position while the pen is down */ - wd_start(priv->wdog, MAX11802_WDOG_DELAY, max11802_wdog, 1, - (uint32_t)priv); + wd_start(priv->wdog, MAX11802_WDOG_DELAY, + max11802_wdog, 1, (wdparm_t)priv); /* Check if data is valid */ diff --git a/drivers/input/stmpe811_tsc.c b/drivers/input/stmpe811_tsc.c index ecc15bf11de..2c0db7b2b1e 100644 --- a/drivers/input/stmpe811_tsc.c +++ b/drivers/input/stmpe811_tsc.c @@ -5,7 +5,7 @@ * Author: Gregory Nutt * * References: - * "STMPE811 S-Touch® advanced resistive touchscreen controller with 8-bit + * "STMPE811 S-Touch� advanced resistive touchscreen controller with 8-bit * GPIO expander," Doc ID 14489 Rev 6, CD00186725, STMicroelectronics" * * Redistribution and use in source and binary forms, with or without @@ -734,9 +734,9 @@ static void stmpe811_timeoutworker(FAR void *arg) * ****************************************************************************/ -static void stmpe811_timeout(int argc, uint32_t arg1, ...) +static void stmpe811_timeout(int argc, wdparm_t arg1, ...) { - FAR struct stmpe811_dev_s *priv = (FAR struct stmpe811_dev_s *)((uintptr_t)arg1); + FAR struct stmpe811_dev_s *priv = (FAR struct stmpe811_dev_s *)arg1; int ret; /* Are we still stuck in the pen down state? */ @@ -1093,8 +1093,8 @@ ignored: if (priv->sample.contact == CONTACT_DOWN || priv->sample.contact == CONTACT_MOVE) { - wd_start(priv->wdog, STMPE811_PENUP_TICKS, stmpe811_timeout, - 1, (uint32_t)((uintptr_t)priv)); + wd_start(priv->wdog, STMPE811_PENUP_TICKS, + stmpe811_timeout, 1, (wdparm_t)priv); } /* Reset and clear all data in the FIFO */ diff --git a/drivers/ioexpander/pcf8574.c b/drivers/ioexpander/pcf8574.c index 886fef976db..c0193f5ac91 100644 --- a/drivers/ioexpander/pcf8574.c +++ b/drivers/ioexpander/pcf8574.c @@ -988,8 +988,7 @@ static void pcf8574_irqworker(void *arg) sched_lock(); ret = wd_start(priv->wdog, PCF8574_POLLDELAY, - pcf8574_poll_expiry, - 1, (wdparm_t)priv); + pcf8574_poll_expiry, 1, (wdparm_t)priv); if (ret < 0) { gpioerr("ERROR: Failed to start poll timer\n"); @@ -1163,8 +1162,7 @@ FAR struct ioexpander_dev_s *pcf8574_initialize(FAR struct i2c_master_s *i2c, DEBUGASSERT(priv->wdog != NULL); ret = wd_start(priv->wdog, PCF8574_POLLDELAY, - pcf8574_poll_expiry, - 1, (wdparm_t)priv); + pcf8574_poll_expiry, 1, (wdparm_t)priv); if (ret < 0) { gpioerr("ERROR: Failed to start poll timer\n"); diff --git a/drivers/ioexpander/tca64xx.c b/drivers/ioexpander/tca64xx.c index 215244a9878..46040bf5503 100644 --- a/drivers/ioexpander/tca64xx.c +++ b/drivers/ioexpander/tca64xx.c @@ -1261,8 +1261,8 @@ errout_with_restart: /* Re-start the poll timer */ sched_lock(); - ret = wd_start(priv->wdog, TCA64XX_POLLDELAY, tca64_poll_expiry, - 1, (wdparm_t)priv); + ret = wd_start(priv->wdog, TCA64XX_POLLDELAY, + tca64_poll_expiry, 1, (wdparm_t)priv); if (ret < 0) { gpioerr("ERROR: Failed to start poll timer\n"); @@ -1434,8 +1434,8 @@ FAR struct ioexpander_dev_s *tca64_initialize(FAR struct i2c_master_s *i2c, priv->wdog = wd_create(); DEBUGASSERT(priv->wdog != NULL); - ret = wd_start(priv->wdog, TCA64XX_POLLDELAY, tca64_poll_expiry, - 1, (wdparm_t)priv); + ret = wd_start(priv->wdog, TCA64XX_POLLDELAY, + tca64_poll_expiry, 1, (wdparm_t)priv); if (ret < 0) { gpioerr("ERROR: Failed to start poll timer\n"); diff --git a/drivers/net/dm90x0.c b/drivers/net/dm90x0.c index 58efbb7f162..46c32cc3631 100644 --- a/drivers/net/dm90x0.c +++ b/drivers/net/dm90x0.c @@ -396,10 +396,10 @@ static int dm9x_interrupt(int irq, FAR void *context, FAR void *arg); /* Watchdog timer expirations */ static void dm9x_txtimeout_work(FAR void *arg); -static void dm9x_txtimeout_expiry(int argc, uint32_t arg, ...); +static void dm9x_txtimeout_expiry(int argc, wdparm_t arg, ...); static void dm9x_poll_work(FAR void *arg); -static void dm9x_poll_expiry(int argc, uint32_t arg, ...); +static void dm9x_poll_expiry(int argc, wdparm_t arg, ...); /* NuttX callback functions */ @@ -1421,8 +1421,8 @@ static void dm9x_poll_work(FAR void *arg) /* Setup the watchdog poll timer again */ - wd_start(priv->dm_txpoll, DM9X_WDDELAY, dm9x_poll_expiry, 1, - (wdparm_t)priv); + wd_start(priv->dm_txpoll, DM9X_WDDELAY, + dm9x_poll_expiry, 1, (wdparm_t)priv); net_unlock(); } @@ -1556,8 +1556,8 @@ static int dm9x_ifup(FAR struct net_driver_s *dev) /* Set and activate a timer process */ - wd_start(priv->dm_txpoll, DM9X_WDDELAY, dm9x_poll_expiry, 1, - (wdparm_t)priv); + wd_start(priv->dm_txpoll, DM9X_WDDELAY, + dm9x_poll_expiry, 1, (wdparm_t)priv); /* Enable the DM9X interrupt */ diff --git a/drivers/net/enc28j60.c b/drivers/net/enc28j60.c index 8644fc708d8..b5d9bb1b91d 100644 --- a/drivers/net/enc28j60.c +++ b/drivers/net/enc28j60.c @@ -335,9 +335,9 @@ static int enc_interrupt(int irq, FAR void *context, FAR void *arg); /* Watchdog timer expirations */ static void enc_toworker(FAR void *arg); -static void enc_txtimeout(int argc, uint32_t arg, ...); +static void enc_txtimeout(int argc, wdparm_t arg, ...); static void enc_pollworker(FAR void *arg); -static void enc_polltimer(int argc, uint32_t arg, ...); +static void enc_polltimer(int argc, wdparm_t arg, ...); /* NuttX callback functions */ @@ -1158,8 +1158,8 @@ static int enc_transmit(FAR struct enc_driver_s *priv) * the timer is started? */ - wd_start(priv->txtimeout, ENC_TXTIMEOUT, enc_txtimeout, 1, - (wdparm_t)priv); + wd_start(priv->txtimeout, ENC_TXTIMEOUT, + enc_txtimeout, 1, (wdparm_t)priv); return OK; } @@ -1942,7 +1942,7 @@ static void enc_toworker(FAR void *arg) * ****************************************************************************/ -static void enc_txtimeout(int argc, uint32_t arg, ...) +static void enc_txtimeout(int argc, wdparm_t arg, ...) { FAR struct enc_driver_s *priv = (FAR struct enc_driver_s *)arg; int ret; @@ -2016,8 +2016,8 @@ static void enc_pollworker(FAR void *arg) /* Setup the watchdog poll timer again */ - wd_start(priv->txpoll, ENC_WDDELAY, enc_polltimer, 1, - (wdparm_t)arg); + wd_start(priv->txpoll, ENC_WDDELAY, + enc_polltimer, 1, (wdparm_t)arg); } /**************************************************************************** @@ -2037,7 +2037,7 @@ static void enc_pollworker(FAR void *arg) * ****************************************************************************/ -static void enc_polltimer(int argc, uint32_t arg, ...) +static void enc_polltimer(int argc, wdparm_t arg, ...) { FAR struct enc_driver_s *priv = (FAR struct enc_driver_s *)arg; int ret; @@ -2116,8 +2116,8 @@ static int enc_ifup(struct net_driver_s *dev) /* Set and activate a timer process */ - wd_start(priv->txpoll, ENC_WDDELAY, enc_polltimer, 1, - (wdparm_t)priv); + wd_start(priv->txpoll, ENC_WDDELAY, + enc_polltimer, 1, (wdparm_t)priv); /* Mark the interface up and enable the Ethernet interrupt at the * controller diff --git a/drivers/net/encx24j600.c b/drivers/net/encx24j600.c index c64ca01b3c5..74d8a230808 100644 --- a/drivers/net/encx24j600.c +++ b/drivers/net/encx24j600.c @@ -353,9 +353,9 @@ static int enc_interrupt(int irq, FAR void *context, FAR void *arg); /* Watchdog timer expirations */ static void enc_toworker(FAR void *arg); -static void enc_txtimeout(int argc, uint32_t arg, ...); +static void enc_txtimeout(int argc, wdparm_t arg, ...); static void enc_pollworker(FAR void *arg); -static void enc_polltimer(int argc, uint32_t arg, ...); +static void enc_polltimer(int argc, wdparm_t arg, ...); /* NuttX callback functions */ @@ -1064,8 +1064,8 @@ static int enc_transmit(FAR struct enc_driver_s *priv) * the timer is started? */ - wd_start(priv->txtimeout, ENC_TXTIMEOUT, enc_txtimeout, 1, - (wdparm_t)priv); + wd_start(priv->txtimeout, ENC_TXTIMEOUT, + enc_txtimeout, 1, (wdparm_t)priv); /* free the descriptor */ @@ -2096,7 +2096,7 @@ static void enc_toworker(FAR void *arg) * ****************************************************************************/ -static void enc_txtimeout(int argc, uint32_t arg, ...) +static void enc_txtimeout(int argc, wdparm_t arg, ...) { FAR struct enc_driver_s *priv = (FAR struct enc_driver_s *)arg; int ret; @@ -2190,7 +2190,7 @@ static void enc_pollworker(FAR void *arg) * ****************************************************************************/ -static void enc_polltimer(int argc, uint32_t arg, ...) +static void enc_polltimer(int argc, wdparm_t arg, ...) { FAR struct enc_driver_s *priv = (FAR struct enc_driver_s *)arg; int ret; @@ -2272,8 +2272,8 @@ static int enc_ifup(struct net_driver_s *dev) /* Set and activate a timer process */ - wd_start(priv->txpoll, ENC_WDDELAY, enc_polltimer, 1, - (wdparm_t)priv); + wd_start(priv->txpoll, ENC_WDDELAY, + enc_polltimer, 1, (wdparm_t)priv); /* Mark the interface up and enable the Ethernet interrupt at the * controller diff --git a/drivers/net/ftmac100.c b/drivers/net/ftmac100.c index c1cbb4e4cfb..5d76bce891a 100644 --- a/drivers/net/ftmac100.c +++ b/drivers/net/ftmac100.c @@ -222,10 +222,10 @@ static int ftmac100_interrupt(int irq, FAR void *context, FAR void *arg); /* Watchdog timer expirations */ static void ftmac100_txtimeout_work(FAR void *arg); -static void ftmac100_txtimeout_expiry(int argc, uint32_t arg, ...); +static void ftmac100_txtimeout_expiry(int argc, wdparm_t arg, ...); static void ftmac100_poll_work(FAR void *arg); -static void ftmac100_poll_expiry(int argc, uint32_t arg, ...); +static void ftmac100_poll_expiry(int argc, wdparm_t arg, ...); /* NuttX callback functions */ @@ -1090,7 +1090,7 @@ static void ftmac100_txtimeout_work(FAR void *arg) * ****************************************************************************/ -static void ftmac100_txtimeout_expiry(int argc, uint32_t arg, ...) +static void ftmac100_txtimeout_expiry(int argc, wdparm_t arg, ...) { FAR struct ftmac100_driver_s *priv = (FAR struct ftmac100_driver_s *)arg; @@ -1144,8 +1144,8 @@ static void ftmac100_poll_work(FAR void *arg) /* Setup the watchdog poll timer again */ - wd_start(priv->ft_txpoll, FTMAC100_WDDELAY, ftmac100_poll_expiry, 1, - (wdparm_t)priv); + wd_start(priv->ft_txpoll, FTMAC100_WDDELAY, + ftmac100_poll_expiry, 1, (wdparm_t)priv); net_unlock(); } @@ -1167,7 +1167,7 @@ static void ftmac100_poll_work(FAR void *arg) * ****************************************************************************/ -static void ftmac100_poll_expiry(int argc, uint32_t arg, ...) +static void ftmac100_poll_expiry(int argc, wdparm_t arg, ...) { FAR struct ftmac100_driver_s *priv = (FAR struct ftmac100_driver_s *)arg; @@ -1230,8 +1230,8 @@ static int ftmac100_ifup(struct net_driver_s *dev) /* Set and activate a timer process */ - wd_start(priv->ft_txpoll, FTMAC100_WDDELAY, ftmac100_poll_expiry, 1, - (wdparm_t)priv); + wd_start(priv->ft_txpoll, FTMAC100_WDDELAY, + ftmac100_poll_expiry, 1, (wdparm_t)priv); /* Enable the Ethernet interrupt */ diff --git a/drivers/net/lan91c111.c b/drivers/net/lan91c111.c index 81748aa43bf..719c1b6d49a 100644 --- a/drivers/net/lan91c111.c +++ b/drivers/net/lan91c111.c @@ -1032,8 +1032,8 @@ static void lan91c111_poll_work(FAR void *arg) /* Setup the watchdog poll timer again */ - wd_start(priv->txpoll, LAN91C111_WDDELAY, lan91c111_poll_expiry, 1, - (wdparm_t)dev); + wd_start(priv->txpoll, LAN91C111_WDDELAY, + lan91c111_poll_expiry, 1, (wdparm_t)dev); net_unlock(); } @@ -1133,8 +1133,8 @@ static int lan91c111_ifup(FAR struct net_driver_s *dev) /* Set and activate a timer process */ - wd_start(priv->txpoll, LAN91C111_WDDELAY, lan91c111_poll_expiry, 1, - (wdparm_t)dev); + wd_start(priv->txpoll, LAN91C111_WDDELAY, + lan91c111_poll_expiry, 1, (wdparm_t)dev); net_unlock(); /* Enable the Ethernet interrupt */ diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c index bf419e639c2..3fcce3b0367 100644 --- a/drivers/net/loopback.c +++ b/drivers/net/loopback.c @@ -249,7 +249,7 @@ static void lo_poll_work(FAR void *arg) /* Setup the watchdog poll timer again */ - wd_start(priv->lo_polldog, LO_WDDELAY, lo_poll_expiry, 1, priv); + wd_start(priv->lo_polldog, LO_WDDELAY, lo_poll_expiry, 1, (wdparm_t)priv); net_unlock(); } @@ -316,8 +316,8 @@ static int lo_ifup(FAR struct net_driver_s *dev) /* Set and activate a timer process */ - wd_start(priv->lo_polldog, LO_WDDELAY, lo_poll_expiry, - 1, (wdparm_t)priv); + wd_start(priv->lo_polldog, LO_WDDELAY, + lo_poll_expiry, 1, (wdparm_t)priv); priv->lo_bifup = true; return OK; diff --git a/drivers/net/rpmsgdrv.c b/drivers/net/rpmsgdrv.c index 5efec3cd4a3..9e93a03e7ac 100644 --- a/drivers/net/rpmsgdrv.c +++ b/drivers/net/rpmsgdrv.c @@ -843,8 +843,8 @@ static void net_rpmsg_drv_poll_work(FAR void *arg) /* Setup the watchdog poll timer again */ - wd_start(priv->txpoll, NET_RPMSG_DRV_WDDELAY, net_rpmsg_drv_poll_expiry, 1, - (wdparm_t)dev); + wd_start(priv->txpoll, NET_RPMSG_DRV_WDDELAY, + net_rpmsg_drv_poll_expiry, 1, (wdparm_t)dev); net_unlock(); } @@ -968,8 +968,8 @@ static int net_rpmsg_drv_ifup(FAR struct net_driver_s *dev) /* Set and activate a timer process */ - wd_start(priv->txpoll, NET_RPMSG_DRV_WDDELAY, net_rpmsg_drv_poll_expiry, 1, - (wdparm_t)dev); + wd_start(priv->txpoll, NET_RPMSG_DRV_WDDELAY, + net_rpmsg_drv_poll_expiry, 1, (wdparm_t)dev); net_unlock(); diff --git a/drivers/net/skeleton.c b/drivers/net/skeleton.c index 28a24acbc7d..9de0c739a85 100644 --- a/drivers/net/skeleton.c +++ b/drivers/net/skeleton.c @@ -744,8 +744,8 @@ static void skel_poll_work(FAR void *arg) /* Setup the watchdog poll timer again */ - wd_start(priv->sk_txpoll, skeleton_WDDELAY, skel_poll_expiry, 1, - (wdparm_t)priv); + wd_start(priv->sk_txpoll, skeleton_WDDELAY, + skel_poll_expiry, 1, (wdparm_t)priv); net_unlock(); } @@ -823,8 +823,8 @@ static int skel_ifup(FAR struct net_driver_s *dev) /* Set and activate a timer process */ - wd_start(priv->sk_txpoll, skeleton_WDDELAY, skel_poll_expiry, 1, - (wdparm_t)priv); + wd_start(priv->sk_txpoll, skeleton_WDDELAY, + skel_poll_expiry, 1, (wdparm_t)priv); /* Enable the Ethernet interrupt */ diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 71411c1bcf9..da0d659da05 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -811,7 +811,7 @@ static void tun_poll_work(FAR void *arg) /* Setup the watchdog poll timer again */ - wd_start(priv->txpoll, TUN_WDDELAY, tun_poll_expiry, 1, priv); + wd_start(priv->txpoll, TUN_WDDELAY, tun_poll_expiry, 1, (wdparm_t)priv); net_unlock(); tun_unlock(priv); @@ -879,8 +879,8 @@ static int tun_ifup(FAR struct net_driver_s *dev) /* Set and activate a timer process */ - wd_start(priv->txpoll, TUN_WDDELAY, tun_poll_expiry, - 1, (wdparm_t)priv); + wd_start(priv->txpoll, TUN_WDDELAY, + tun_poll_expiry, 1, (wdparm_t)priv); priv->bifup = true; return OK; diff --git a/drivers/power/activity_governor.c b/drivers/power/activity_governor.c index ef5cf8b037a..4faab88a39c 100644 --- a/drivers/power/activity_governor.c +++ b/drivers/power/activity_governor.c @@ -548,14 +548,13 @@ static void governor_statechanged(int domain, enum pm_state_e newstate) } } -static void governor_timer_cb(int argc, wdparm_t arg1, ...) +static void governor_timer_cb(int argc, ...) { /* Do nothing here, cause we only need TIMER ISR to wake up PM, * for deceasing PM state. */ UNUSED(argc); - UNUSED(arg1); } /**************************************************************************** @@ -608,7 +607,7 @@ static void governor_timer(int domain) if (!WDOG_ISACTIVE(pdomstate->wdog) || abs(delay - left) > PM_TIMER_GAP) { - wd_start(pdomstate->wdog, delay, governor_timer_cb, 0); + wd_start(pdomstate->wdog, delay, (wdentry_t)governor_timer_cb, 0); } } else diff --git a/drivers/sensors/ak09912.c b/drivers/sensors/ak09912.c index 67fe396db5e..bb6ee3b7d00 100644 --- a/drivers/sensors/ak09912.c +++ b/drivers/sensors/ak09912.c @@ -398,9 +398,9 @@ static int ak09912_set_noise_suppr_flt(FAR struct ak09912_dev_s *priv, * ****************************************************************************/ -static void ak09912_wd_timeout(int argc, uint32_t arg, ...) +static void ak09912_wd_timeout(int argc, wdparm_t arg, ...) { - struct ak09912_dev_s *priv = (struct ak09912_dev_s *) arg; + struct ak09912_dev_s *priv = (struct ak09912_dev_s *)arg; irqstate_t flags = enter_critical_section(); nxsem_post(&priv->wait); leave_critical_section(flags); @@ -421,8 +421,8 @@ static int ak09912_read_mag_uncomp_data(FAR struct ak09912_dev_s *priv, uint8_t state = 0; uint8_t buffer[8]; /* TMPS and ST2 is read, but the value is omitted. */ - wd_start(priv->wd, AK09912_POLLING_TIMEOUT, ak09912_wd_timeout, - 1, (uint32_t)priv); + wd_start(priv->wd, AK09912_POLLING_TIMEOUT, + ak09912_wd_timeout, 1, (wdparm_t)priv); state = ak09912_getreg8(priv, AK09912_ST1); while (! (state & 0x1)) { diff --git a/drivers/timers/watchdog.c b/drivers/timers/watchdog.c index 840f90b51bd..0cab155ad7e 100644 --- a/drivers/timers/watchdog.c +++ b/drivers/timers/watchdog.c @@ -152,7 +152,7 @@ static void watchdog_automonitor_timer(int argc, wdparm_t arg1, ...) { lower->ops->keepalive(lower); wd_start(upper->wdog, WATCHDOG_AUTOMONITOR_TIMEOUT_TICK / 2, - watchdog_automonitor_timer, 1, upper); + watchdog_automonitor_timer, 1, (wdparm_t)upper); } } #elif defined(CONFIG_WATCHDOG_AUTOMONITOR_BY_WORKER) @@ -196,7 +196,7 @@ static void watchdog_automonitor_start(FAR struct watchdog_upperhalf_s #elif defined(CONFIG_WATCHDOG_AUTOMONITOR_BY_TIMER) upper->wdog = wd_create(); wd_start(upper->wdog, WATCHDOG_AUTOMONITOR_TIMEOUT_TICK / 2, - watchdog_automonitor_timer, 1, upper); + watchdog_automonitor_timer, 1, (wdparm_t)upper); #elif defined(CONFIG_WATCHDOG_AUTOMONITOR_BY_WORKER) work_queue(LPWORK, &upper->work, watchdog_automonitor_worker, upper, WATCHDOG_AUTOMONITOR_TIMEOUT_TICK / 2); diff --git a/drivers/usbdev/cdcacm.c b/drivers/usbdev/cdcacm.c index fd9e4266878..6e6e0209c33 100644 --- a/drivers/usbdev/cdcacm.c +++ b/drivers/usbdev/cdcacm.c @@ -746,8 +746,8 @@ static int cdcacm_release_rxpending(FAR struct cdcacm_dev_s *priv) if (!sq_empty(&priv->rxpending)) { - wd_start(priv->rxfailsafe, CDCACM_RXDELAY, cdcacm_rxtimeout, - 1, priv); + wd_start(priv->rxfailsafe, CDCACM_RXDELAY, + cdcacm_rxtimeout, 1, (wdparm_t)priv); } leave_critical_section(flags); diff --git a/drivers/usbdev/cdcecm.c b/drivers/usbdev/cdcecm.c index 25ea9bd7b83..2dc0827a02f 100644 --- a/drivers/usbdev/cdcecm.c +++ b/drivers/usbdev/cdcecm.c @@ -703,8 +703,8 @@ static void cdcecm_poll_work(FAR void *arg) /* Setup the watchdog poll timer again */ - wd_start(self->txpoll, CDCECM_WDDELAY, cdcecm_poll_expiry, 1, - (wdparm_t)self); + wd_start(self->txpoll, CDCECM_WDDELAY, + cdcecm_poll_expiry, 1, (wdparm_t)self); net_unlock(); } @@ -784,8 +784,8 @@ static int cdcecm_ifup(FAR struct net_driver_s *dev) /* Set and activate a timer process */ - wd_start(priv->txpoll, CDCECM_WDDELAY, cdcecm_poll_expiry, 1, - (wdparm_t)priv); + wd_start(priv->txpoll, CDCECM_WDDELAY, + cdcecm_poll_expiry, 1, (wdparm_t)priv); priv->bifup = true; return OK; diff --git a/drivers/usbdev/rndis.c b/drivers/usbdev/rndis.c index 665ce37306b..e2d8bb2865f 100644 --- a/drivers/usbdev/rndis.c +++ b/drivers/usbdev/rndis.c @@ -224,7 +224,7 @@ static int rndis_ifdown(FAR struct net_driver_s *dev); static int rndis_txavail(FAR struct net_driver_s *dev); static int rndis_transmit(FAR struct rndis_dev_s *priv); static int rndis_txpoll(FAR struct net_driver_s *dev); -static void rndis_polltimer(int argc, uint32_t arg, ...); +static void rndis_polltimer(int argc, wdparm_t arg, ...); /* usbclass callbacks */ @@ -1104,7 +1104,7 @@ static void rndis_pollworker(FAR void *arg) * ****************************************************************************/ -static void rndis_polltimer(int argc, uint32_t arg, ...) +static void rndis_polltimer(int argc, wdparm_t arg, ...) { FAR struct rndis_dev_s *priv = (FAR struct rndis_dev_s *)arg; int ret; @@ -1119,8 +1119,8 @@ static void rndis_polltimer(int argc, uint32_t arg, ...) /* Setup the watchdog poll timer again */ - wd_start(priv->txpoll, RNDIS_WDDELAY, rndis_polltimer, 1, - (wdparm_t)arg); + wd_start(priv->txpoll, RNDIS_WDDELAY, + rndis_polltimer, 1, (wdparm_t)arg); } /**************************************************************************** @@ -1135,8 +1135,8 @@ static int rndis_ifup(FAR struct net_driver_s *dev) { FAR struct rndis_dev_s *priv = (FAR struct rndis_dev_s *)dev->d_private; - wd_start(priv->txpoll, RNDIS_WDDELAY, rndis_polltimer, - 1, (wdparm_t)priv); + wd_start(priv->txpoll, RNDIS_WDDELAY, + rndis_polltimer, 1, (wdparm_t)priv); return OK; } diff --git a/drivers/usbhost/usbhost_cdcmbim.c b/drivers/usbhost/usbhost_cdcmbim.c index 25859803da5..6f6f77346e8 100644 --- a/drivers/usbhost/usbhost_cdcmbim.c +++ b/drivers/usbhost/usbhost_cdcmbim.c @@ -2321,8 +2321,8 @@ static void cdcmbim_txpoll_work(void *arg) /* setup the watchdog poll timer again */ - (void)wd_start(priv->txpoll, (1 * CLK_TCK), - cdcmbim_txpoll_expiry, 1, priv); + wd_start(priv->txpoll, (1 * CLK_TCK), + cdcmbim_txpoll_expiry, 1, (wdparm_t)priv); net_unlock(); } @@ -2428,8 +2428,8 @@ static int cdcmbim_ifup(struct net_driver_s *dev) /* Start network TX poll */ - (void)wd_start(priv->txpoll, (1 * CLK_TCK), cdcmbim_txpoll_expiry, 1, - (wdparm_t)priv); + wd_start(priv->txpoll, (1 * CLK_TCK), + cdcmbim_txpoll_expiry, 1, (wdparm_t)priv); priv->bifup = true; return OK; } diff --git a/drivers/wireless/ieee80211/bcm43xxx/bcmf_netdev.c b/drivers/wireless/ieee80211/bcm43xxx/bcmf_netdev.c index ed586d59cc9..54f1a3564ff 100644 --- a/drivers/wireless/ieee80211/bcm43xxx/bcmf_netdev.c +++ b/drivers/wireless/ieee80211/bcm43xxx/bcmf_netdev.c @@ -622,8 +622,8 @@ static void bcmf_poll_work(FAR void *arg) /* Setup the watchdog poll timer again */ - wd_start(priv->bc_txpoll, BCMF_WDDELAY, bcmf_poll_expiry, 1, - (wdparm_t)priv); + wd_start(priv->bc_txpoll, BCMF_WDDELAY, + bcmf_poll_expiry, 1, (wdparm_t)priv); exit_unlock: net_unlock(); } @@ -698,8 +698,8 @@ static int bcmf_ifup(FAR struct net_driver_s *dev) /* Set and activate a timer process */ - wd_start(priv->bc_txpoll, BCMF_WDDELAY, bcmf_poll_expiry, 1, - (wdparm_t)priv); + wd_start(priv->bc_txpoll, BCMF_WDDELAY, + bcmf_poll_expiry, 1, (wdparm_t)priv); /* Enable the hardware interrupt */ diff --git a/drivers/wireless/ieee802154/xbee/xbee.c b/drivers/wireless/ieee802154/xbee/xbee.c index 327addd913e..7c3035f295e 100644 --- a/drivers/wireless/ieee802154/xbee/xbee.c +++ b/drivers/wireless/ieee802154/xbee/xbee.c @@ -86,10 +86,10 @@ static void xbee_process_rxframe(FAR struct xbee_priv_s *priv, static void xbee_notify(FAR struct xbee_priv_s *priv, FAR struct ieee802154_primitive_s *primitive); static void xbee_notify_worker(FAR void *arg); -static void xbee_atquery_timeout(int argc, uint32_t arg, ...); +static void xbee_atquery_timeout(int argc, wdparm_t arg, ...); #ifdef CONFIG_XBEE_LOCKUP_WORKAROUND -static void xbee_lockupcheck_timeout(int argc, uint32_t arg, ...); +static void xbee_lockupcheck_timeout(int argc, wdparm_t arg, ...); static void xbee_lockupcheck_worker(FAR void *arg); static void xbee_backup_worker(FAR void *arg); static void xbee_lockupcheck_reschedule(FAR struct xbee_priv_s *priv); @@ -1108,7 +1108,7 @@ static void xbee_notify_worker(FAR void *arg) * ****************************************************************************/ -static void xbee_atquery_timeout(int argc, uint32_t arg, ...) +static void xbee_atquery_timeout(int argc, wdparm_t arg, ...) { FAR struct xbee_priv_s *priv = (FAR struct xbee_priv_s *)arg; @@ -1141,7 +1141,7 @@ static void xbee_atquery_timeout(int argc, uint32_t arg, ...) * ****************************************************************************/ -static void xbee_lockupcheck_timeout(int argc, uint32_t arg, ...) +static void xbee_lockupcheck_timeout(int argc, wdparm_t arg, ...) { FAR struct xbee_priv_s *priv = (FAR struct xbee_priv_s *)arg; @@ -1211,8 +1211,8 @@ static void xbee_lockupcheck_reschedule(FAR struct xbee_priv_s *priv) * it back in a working state */ - wd_start(priv->lockup_wd, XBEE_LOCKUP_QUERYTIME, xbee_lockupcheck_timeout, - 1, (wdparm_t)priv); + wd_start(priv->lockup_wd, XBEE_LOCKUP_QUERYTIME, + xbee_lockupcheck_timeout, 1, (wdparm_t)priv); } #endif diff --git a/drivers/wireless/ieee802154/xbee/xbee_mac.c b/drivers/wireless/ieee802154/xbee/xbee_mac.c index 30fa859e8c3..085c0055c9f 100644 --- a/drivers/wireless/ieee802154/xbee/xbee_mac.c +++ b/drivers/wireless/ieee802154/xbee/xbee_mac.c @@ -70,7 +70,7 @@ * Private Function Prototypes ****************************************************************************/ -static void xbee_assoctimer(int argc, uint32_t arg, ...); +static void xbee_assoctimer(int argc, wdparm_t arg, ...); static void xbee_assocworker(FAR void *arg); /**************************************************************************** @@ -105,7 +105,7 @@ static void xbee_assocworker(FAR void *arg); * ****************************************************************************/ -static void xbee_assoctimer(int argc, uint32_t arg, ...) +static void xbee_assoctimer(int argc, wdparm_t arg, ...) { FAR struct xbee_priv_s *priv = (FAR struct xbee_priv_s *)arg; int ret; @@ -154,8 +154,8 @@ static void xbee_assocworker(FAR void *arg) { xbee_send_atquery(priv, "AI"); - wd_start(priv->assocwd, XBEE_ASSOC_POLLDELAY, xbee_assoctimer, - 1, (wdparm_t)arg); + wd_start(priv->assocwd, XBEE_ASSOC_POLLDELAY, + xbee_assoctimer, 1, (wdparm_t)arg); } } @@ -180,7 +180,7 @@ static void xbee_assocworker(FAR void *arg) * ****************************************************************************/ -static void xbee_reqdata_timeout(int argc, uint32_t arg, ...) +static void xbee_reqdata_timeout(int argc, wdparm_t arg, ...) { FAR struct xbee_priv_s *priv = (FAR struct xbee_priv_s *)arg; @@ -380,8 +380,8 @@ int xbee_req_data(XBEEHANDLE xbee, { /* Setup a timeout in case the XBee never responds with a tx status */ - wd_start(priv->reqdata_wd, XBEE_RESPONSE_TIMEOUT, xbee_reqdata_timeout, - 1, (wdparm_t)priv); + wd_start(priv->reqdata_wd, XBEE_RESPONSE_TIMEOUT, + xbee_reqdata_timeout, 1, (wdparm_t)priv); /* Send the frame */ @@ -698,8 +698,8 @@ int xbee_req_associate(XBEEHANDLE xbee, FAR struct ieee802154_assoc_req_s *req) * an update. */ - return wd_start(priv->assocwd, XBEE_ASSOC_POLLDELAY, xbee_assoctimer, - 1, (wdparm_t)priv); + return wd_start(priv->assocwd, XBEE_ASSOC_POLLDELAY, + xbee_assoctimer, 1, (wdparm_t)priv); } /**************************************************************************** diff --git a/drivers/wireless/ieee802154/xbee/xbee_netdev.c b/drivers/wireless/ieee802154/xbee/xbee_netdev.c index 266bd755800..4729378906e 100644 --- a/drivers/wireless/ieee802154/xbee/xbee_netdev.c +++ b/drivers/wireless/ieee802154/xbee/xbee_netdev.c @@ -629,8 +629,8 @@ static void xbeenet_txpoll_work(FAR void *arg) /* Setup the watchdog poll timer again */ - wd_start(priv->xd_txpoll, TXPOLL_WDDELAY, xbeenet_txpoll_expiry, 1, - (wdparm_t)priv); + wd_start(priv->xd_txpoll, TXPOLL_WDDELAY, + xbeenet_txpoll_expiry, 1, (wdparm_t)priv); net_unlock(); } @@ -780,8 +780,8 @@ static int xbeenet_ifup(FAR struct net_driver_s *dev) #endif /* Set and activate a timer process */ - wd_start(priv->xd_txpoll, TXPOLL_WDDELAY, xbeenet_txpoll_expiry, - 1, (wdparm_t)priv); + wd_start(priv->xd_txpoll, TXPOLL_WDDELAY, + xbeenet_txpoll_expiry, 1, (wdparm_t)priv); /* The interface is now up */ diff --git a/drivers/wireless/spirit/drivers/spirit_netdev.c b/drivers/wireless/spirit/drivers/spirit_netdev.c index e6cd6d22f29..fddb3caca89 100644 --- a/drivers/wireless/spirit/drivers/spirit_netdev.c +++ b/drivers/wireless/spirit/drivers/spirit_netdev.c @@ -1804,8 +1804,8 @@ static void spirit_txpoll_work(FAR void *arg) /* Setup the watchdog poll timer again */ - wd_start(priv->txpoll, SPIRIT_WDDELAY, spirit_txpoll_expiry, 1, - (wdparm_t)priv); + wd_start(priv->txpoll, SPIRIT_WDDELAY, + spirit_txpoll_expiry, 1, (wdparm_t)priv); } else { @@ -1943,8 +1943,8 @@ static int spirit_ifup(FAR struct net_driver_s *dev) /* Set and activate a timer process */ - wd_start(priv->txpoll, SPIRIT_WDDELAY, spirit_txpoll_expiry, 1, - (wdparm_t)priv); + wd_start(priv->txpoll, SPIRIT_WDDELAY, + spirit_txpoll_expiry, 1, (wdparm_t)priv); /* Enables the interrupts from the SPIRIT1 */ diff --git a/fs/mount/fs_automount.c b/fs/mount/fs_automount.c index 16c99e3007c..44ae4269c6d 100644 --- a/fs/mount/fs_automount.c +++ b/fs/mount/fs_automount.c @@ -84,7 +84,7 @@ struct automounter_state_s static int automount_findinode(FAR const char *path); static void automount_mount(FAR struct automounter_state_s *priv); static int automount_unmount(FAR struct automounter_state_s *priv); -static void automount_timeout(int argc, uint32_t arg1, ...); +static void automount_timeout(int argc, wdparm_t arg1, ...); static void automount_worker(FAR void *arg); static int automount_interrupt(FAR const struct automount_lower_s *lower, FAR void *arg, bool inserted); @@ -293,8 +293,8 @@ static int automount_unmount(FAR struct automounter_state_s *priv) /* Start a timer to retry the umount2 after a delay */ - ret = wd_start(priv->wdog, lower->udelay, automount_timeout, 1, - (uint32_t)((uintptr_t)priv)); + ret = wd_start(priv->wdog, lower->udelay, + automount_timeout, 1, (wdparm_t)priv); if (ret < 0) { ferr("ERROR: wd_start failed: %d\n", ret); @@ -349,10 +349,10 @@ static int automount_unmount(FAR struct automounter_state_s *priv) * ****************************************************************************/ -static void automount_timeout(int argc, uint32_t arg1, ...) +static void automount_timeout(int argc, wdparm_t arg1, ...) { FAR struct automounter_state_s *priv = - (FAR struct automounter_state_s *)((uintptr_t)arg1); + (FAR struct automounter_state_s *)arg1; int ret; finfo("Timeout!\n"); diff --git a/net/mld/mld_timer.c b/net/mld/mld_timer.c index 5b97c3ca0d1..1818e8a798b 100644 --- a/net/mld/mld_timer.c +++ b/net/mld/mld_timer.c @@ -196,7 +196,7 @@ static void mld_gendog_work(FAR void *arg) * ****************************************************************************/ -static void mld_gendog_timout(int argc, uint32_t arg, ...) +static void mld_gendog_timout(int argc, wdparm_t arg, ...) { FAR struct work_s *work; int ret; @@ -285,7 +285,7 @@ static void mld_v1dog_work(FAR void *arg) * ****************************************************************************/ -static void mld_v1dog_timout(int argc, uint32_t arg, ...) +static void mld_v1dog_timout(int argc, wdparm_t arg, ...) { FAR struct work_s *work; int ret; @@ -400,7 +400,7 @@ static void mld_polldog_work(FAR void *arg) * ****************************************************************************/ -static void mld_polldog_timout(int argc, uint32_t arg, ...) +static void mld_polldog_timout(int argc, wdparm_t arg, ...) { FAR struct mld_group_s *group; int ret; @@ -443,8 +443,8 @@ void mld_start_gentimer(FAR struct net_driver_s *dev, clock_t ticks) mldinfo("ticks: %lu\n", (unsigned long)ticks); - ret = wd_start(dev->d_mld.gendog, ticks, mld_gendog_timout, 1, - dev->d_ifindex); + ret = wd_start(dev->d_mld.gendog, ticks, + mld_gendog_timout, 1, (wdparm_t)dev->d_ifindex); DEBUGASSERT(ret == OK); UNUSED(ret); @@ -468,8 +468,8 @@ void mld_start_v1timer(FAR struct net_driver_s *dev, clock_t ticks) mldinfo("ticks: %lu\n", (unsigned long)ticks); - ret = wd_start(dev->d_mld.v1dog, ticks, mld_v1dog_timout, 1, - dev->d_ifindex); + ret = wd_start(dev->d_mld.v1dog, ticks, + mld_v1dog_timout, 1, (wdparm_t)dev->d_ifindex); DEBUGASSERT(ret == OK); UNUSED(ret); @@ -491,7 +491,7 @@ void mld_start_polltimer(FAR struct mld_group_s *group, clock_t ticks) mldinfo("ticks: %lu\n", (unsigned long)ticks); - ret = wd_start(group->polldog, ticks, mld_polldog_timout, 1, (uint32_t)group); + ret = wd_start(group->polldog, ticks, mld_polldog_timout, 1, (wdparm_t)group); DEBUGASSERT(ret == OK); UNUSED(ret); diff --git a/sched/mqueue/mq_timedreceive.c b/sched/mqueue/mq_timedreceive.c index 3c9bf99d8bd..98a92d7e9fb 100644 --- a/sched/mqueue/mq_timedreceive.c +++ b/sched/mqueue/mq_timedreceive.c @@ -224,7 +224,7 @@ ssize_t nxmq_timedreceive(mqd_t mqdes, FAR char *msg, size_t msglen, /* Start the watchdog */ - wd_start(rtcb->waitdog, ticks, nxmq_rcvtimeout, 1, getpid()); + wd_start(rtcb->waitdog, ticks, nxmq_rcvtimeout, 1, (wdparm_t)getpid()); } /* Get the message from the message queue */ diff --git a/sched/mqueue/mq_timedsend.c b/sched/mqueue/mq_timedsend.c index b9fa37c9520..ad3c17aa4f3 100644 --- a/sched/mqueue/mq_timedsend.c +++ b/sched/mqueue/mq_timedsend.c @@ -256,7 +256,7 @@ int nxmq_timedsend(mqd_t mqdes, FAR const char *msg, size_t msglen, /* Start the watchdog and begin the wait for MQ not full */ - wd_start(rtcb->waitdog, ticks, nxmq_sndtimeout, 1, getpid()); + wd_start(rtcb->waitdog, ticks, nxmq_sndtimeout, 1, (wdparm_t)getpid()); /* And wait for the message queue to be non-empty */ diff --git a/sched/pthread/pthread_condclockwait.c b/sched/pthread/pthread_condclockwait.c index c14a1092b46..c741c031cd4 100644 --- a/sched/pthread/pthread_condclockwait.c +++ b/sched/pthread/pthread_condclockwait.c @@ -26,7 +26,6 @@ #include #include -#include #include #include #include @@ -68,17 +67,10 @@ * ****************************************************************************/ -static void pthread_condtimedout(int argc, wdparm_t arg1, ...) +static void pthread_condtimedout(int argc, wdparm_t arg1, wdparm_t arg2, ...) { pid_t pid = (pid_t)arg1; - int signo; - va_list ap; - - /* Retrieve the variadic argument */ - - va_start(ap, arg1); - signo = (int)va_arg(ap, wdparm_t); - va_end(ap); + int signo = (int)arg2; #ifdef HAVE_GROUP_MEMBERS { @@ -287,9 +279,8 @@ int pthread_cond_clockwait(FAR pthread_cond_t *cond, /* Start the watchdog */ wd_start(rtcb->waitdog, ticks, - pthread_condtimedout, - 2, (wdparm_t)mypid, - (wdparm_t)SIGCONDTIMEDOUT); + (wdentry_t)pthread_condtimedout, 2, + (wdparm_t)mypid, (wdparm_t)SIGCONDTIMEDOUT); /* Take the condition semaphore. Do not restore * interrupts until we return from the wait. This is diff --git a/sched/sched/sched_sporadic.c b/sched/sched/sched_sporadic.c index 52c6312e408..c313478b2ad 100644 --- a/sched/sched/sched_sporadic.c +++ b/sched/sched/sched_sporadic.c @@ -290,7 +290,7 @@ static int sporadic_budget_start(FAR struct replenishment_s *mrepl) /* And start the timer for the budget interval */ DEBUGVERIFY(wd_start(&mrepl->timer, sporadic->budget, - sporadic_budget_expire, 1, (wdentry_t)mrepl)); + sporadic_budget_expire, 1, (wdparm_t)mrepl)); /* Then reprioritize to the higher priority */ @@ -348,8 +348,8 @@ static int sporadic_interval_start(FAR struct replenishment_s *mrepl) * be canceled if the thread exits. */ - DEBUGVERIFY(wd_start(&mrepl->timer, remainder, sporadic_interval_expire, - 1, (wdentry_t)mrepl)); + DEBUGVERIFY(wd_start(&mrepl->timer, remainder, + sporadic_interval_expire, 1, (wdparm_t)mrepl)); /* Drop the priority of thread, possible causing a context switch. */ @@ -390,8 +390,8 @@ static int sporadic_replenish_start(FAR struct replenishment_s *repl) /* And start the timer for the budget interval */ - DEBUGVERIFY(wd_start(&repl->timer, repl->budget, sporadic_replenish_expire, - 1, (wdentry_t)repl)); + DEBUGVERIFY(wd_start(&repl->timer, repl->budget, + sporadic_replenish_expire, 1, (wdparm_t)repl)); /* Then reprioritize to the higher priority */ @@ -426,8 +426,8 @@ static int sporadic_replenish_delay(FAR struct replenishment_s *repl, /* And start the timer for the delay prior to replenishing. */ - DEBUGVERIFY(wd_start(&repl->timer, period, sporadic_delay_expire, - 1, (wdentry_t)repl)); + DEBUGVERIFY(wd_start(&repl->timer, period, + sporadic_delay_expire, 1, (wdparm_t)repl)); return OK; } diff --git a/sched/semaphore/sem_clockwait.c b/sched/semaphore/sem_clockwait.c index 58d2bcaaf31..83f46042e61 100644 --- a/sched/semaphore/sem_clockwait.c +++ b/sched/semaphore/sem_clockwait.c @@ -177,7 +177,7 @@ int nxsem_clockwait(FAR sem_t *sem, clockid_t clockid, /* Start the watchdog */ - wd_start(rtcb->waitdog, ticks, nxsem_timeout, 1, getpid()); + wd_start(rtcb->waitdog, ticks, nxsem_timeout, 1, (wdparm_t)getpid()); /* Now perform the blocking wait. If nxsem_wait() fails, the * negated errno value will be returned below. diff --git a/sched/semaphore/sem_tickwait.c b/sched/semaphore/sem_tickwait.c index 6ac38282b69..1e604f2e1f5 100644 --- a/sched/semaphore/sem_tickwait.c +++ b/sched/semaphore/sem_tickwait.c @@ -132,7 +132,7 @@ int nxsem_tickwait(FAR sem_t *sem, clock_t start, uint32_t delay) /* Start the watchdog with interrupts still disabled */ - wd_start(rtcb->waitdog, delay, nxsem_timeout, 1, getpid()); + wd_start(rtcb->waitdog, delay, nxsem_timeout, 1, (wdparm_t)getpid()); /* Now perform the blocking wait */ diff --git a/sched/timer/timer_settime.c b/sched/timer/timer_settime.c index b492383ce4c..21c4733859c 100644 --- a/sched/timer/timer_settime.c +++ b/sched/timer/timer_settime.c @@ -99,7 +99,7 @@ static inline void timer_restart(FAR struct posix_timer_s *timer, { timer->pt_last = timer->pt_delay; wd_start(timer->pt_wdog, timer->pt_delay, - timer_timeout, 1, itimer); + timer_timeout, 1, (wdparm_t)itimer); } } @@ -323,8 +323,8 @@ int timer_settime(timer_t timerid, int flags, */ timer->pt_last = delay; - ret = wd_start(timer->pt_wdog, delay, timer_timeout, - 1, (wdparm_t)timer); + ret = wd_start(timer->pt_wdog, delay, + timer_timeout, 1, (wdparm_t)timer); if (ret < 0) { set_errno(-ret); diff --git a/sched/wdog/wd_start.c b/sched/wdog/wd_start.c index c724778780e..2592d901764 100644 --- a/sched/wdog/wd_start.c +++ b/sched/wdog/wd_start.c @@ -168,7 +168,7 @@ static inline void wd_expiration(void) * ****************************************************************************/ -int wd_start(WDOG_ID wdog, int32_t delay, wdentry_t wdentry, int argc, ...) +int wd_start(WDOG_ID wdog, int32_t delay, wdentry_t wdentry, int argc, ...) { va_list ap; FAR struct wdog_s *curr; diff --git a/wireless/bluetooth/bt_netdev.c b/wireless/bluetooth/bt_netdev.c index 6c420e1ea22..456207dce63 100644 --- a/wireless/bluetooth/bt_netdev.c +++ b/wireless/bluetooth/bt_netdev.c @@ -549,8 +549,8 @@ static void btnet_txpoll_work(FAR void *arg) /* Setup the watchdog poll timer again */ - wd_start(priv->bd_txpoll, TXPOLL_WDDELAY, btnet_txpoll_expiry, 1, - (wdparm_t)priv); + wd_start(priv->bd_txpoll, TXPOLL_WDDELAY, + btnet_txpoll_expiry, 1, (wdparm_t)priv); net_unlock(); } @@ -629,8 +629,8 @@ static int btnet_ifup(FAR struct net_driver_s *netdev) /* Set and activate a timer process */ - wd_start(priv->bd_txpoll, TXPOLL_WDDELAY, btnet_txpoll_expiry, - 1, (wdparm_t)priv); + wd_start(priv->bd_txpoll, TXPOLL_WDDELAY, + btnet_txpoll_expiry, 1, (wdparm_t)priv); /* The interface is now up */ diff --git a/wireless/ieee802154/mac802154_loopback.c b/wireless/ieee802154/mac802154_loopback.c index 707bbffbe18..9a58fe72064 100644 --- a/wireless/ieee802154/mac802154_loopback.c +++ b/wireless/ieee802154/mac802154_loopback.c @@ -491,7 +491,7 @@ static void lo_poll_work(FAR void *arg) /* Setup the watchdog poll timer again */ - wd_start(priv->lo_polldog, LO_WDDELAY, lo_poll_expiry, 1, priv); + wd_start(priv->lo_polldog, LO_WDDELAY, lo_poll_expiry, 1, (wdparm_t)priv); net_unlock(); } @@ -594,8 +594,8 @@ static int lo_ifup(FAR struct net_driver_s *dev) /* Set and activate a timer process */ - wd_start(priv->lo_polldog, LO_WDDELAY, lo_poll_expiry, - 1, (wdparm_t)priv); + wd_start(priv->lo_polldog, LO_WDDELAY, + lo_poll_expiry, 1, (wdparm_t)priv); priv->lo_bifup = true; return OK; diff --git a/wireless/ieee802154/mac802154_netdev.c b/wireless/ieee802154/mac802154_netdev.c index c3e979a55f8..d130038d270 100644 --- a/wireless/ieee802154/mac802154_netdev.c +++ b/wireless/ieee802154/mac802154_netdev.c @@ -590,8 +590,8 @@ static void macnet_txpoll_work(FAR void *arg) /* Setup the watchdog poll timer again */ - wd_start(priv->md_txpoll, TXPOLL_WDDELAY, macnet_txpoll_expiry, 1, - (wdparm_t)priv); + wd_start(priv->md_txpoll, TXPOLL_WDDELAY, + macnet_txpoll_expiry, 1, (wdparm_t)priv); net_unlock(); } @@ -778,8 +778,8 @@ static int macnet_ifup(FAR struct net_driver_s *dev) /* Set and activate a timer process */ - wd_start(priv->md_txpoll, TXPOLL_WDDELAY, macnet_txpoll_expiry, - 1, (wdparm_t)priv); + wd_start(priv->md_txpoll, TXPOLL_WDDELAY, + macnet_txpoll_expiry, 1, (wdparm_t)priv); ret = OK; } diff --git a/wireless/pktradio/pktradio_loopback.c b/wireless/pktradio/pktradio_loopback.c index 8681dffc0b9..10cf1559d37 100644 --- a/wireless/pktradio/pktradio_loopback.c +++ b/wireless/pktradio/pktradio_loopback.c @@ -449,7 +449,7 @@ static void lo_poll_work(FAR void *arg) /* Setup the watchdog poll timer again */ - wd_start(priv->lo_polldog, LO_WDDELAY, lo_poll_expiry, 1, priv); + wd_start(priv->lo_polldog, LO_WDDELAY, lo_poll_expiry, 1, (wdparm_t)priv); net_unlock(); } @@ -533,8 +533,8 @@ static int lo_ifup(FAR struct net_driver_s *dev) /* Set and activate a timer process */ - wd_start(priv->lo_polldog, LO_WDDELAY, lo_poll_expiry, - 1, (wdparm_t)priv); + wd_start(priv->lo_polldog, LO_WDDELAY, + lo_poll_expiry, 1, (wdparm_t)priv); priv->lo_bifup = true; return OK;