nuttx/nuttx-update
1
2
Fork 1
Code Issues 1 Pull requests 1 Projects Releases Packages Wiki Activity Actions

sched/wdog: Replace all callback argument from uint32_t to wdparm_t

Browse source 
and alwasy cast the argument of wd_start to wdparm_t

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao 2020-08-06 17:08:40 +08:00 committed by Alan Carvalho de Assis
parent 3b76666a1e
commit 4c706771c3
115 changed files with 540 additions and 539 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Documentation/NuttxPortingGuide.html
View file

@ -3042,7 +3042,7 @@ VxWorks provides the following comparable interface:
When a watchdog expires, the callback function with this type is called:
</p>
<pre>
typedef void (*wdentry_t)(int argc, ...);
typedef void (*wdentry_t)(int argc, wdparm_t arg1, ...);
</pre>
<p>
Where <code>argc</code> is the number of <code>wdparm_t</code> type arguments that follow.

4
arch/arm/src/c5471/c5471_ethernet.c
View file

@ -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 */

11
arch/arm/src/cxd56xx/cxd56_i2c.c
View file

@ -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));

4
arch/arm/src/cxd56xx/cxd56_icc.c
View file

@ -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);

4
arch/arm/src/cxd56xx/cxd56_rtc.c
View file

@ -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 */

8
arch/arm/src/cxd56xx/cxd56_sdhci.c
View file

@ -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);

8
arch/arm/src/efm32/efm32_spi.c
View file

@ -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);

20
arch/arm/src/imxrt/imxrt_enet.c
View file

@ -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 */

8
arch/arm/src/imxrt/imxrt_usdhc.c
View file

@ -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)
{

20
arch/arm/src/kinetis/kinetis_enet.c
View file

@ -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);

8
arch/arm/src/kinetis/kinetis_flexcan.c
View file

@ -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;

8
arch/arm/src/kinetis/kinetis_i2c.c
View file

@ -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);

7
arch/arm/src/kinetis/kinetis_sdhc.c
View file

@ -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);

8
arch/arm/src/kinetis/kinetis_usbdev.c
View file

@ -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);
}
/******************************************************************************************

18
arch/arm/src/lpc17xx_40xx/lpc17_40_ethernet.c
View file

@ -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

8
arch/arm/src/lpc17xx_40xx/lpc17_40_i2c.c
View file

@ -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;

7
arch/arm/src/lpc17xx_40xx/lpc17_40_sdcard.c
View file

@ -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);

8
arch/arm/src/lpc2378/lpc23xx_i2c.c
View file

@ -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;

6
arch/arm/src/lpc31xx/lpc31_i2c.c
View file

@ -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 */

18
arch/arm/src/lpc43xx/lpc43_ethernet.c
View file

@ -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 */

8
arch/arm/src/lpc43xx/lpc43_i2c.c
View file

@ -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;

8
arch/arm/src/lpc43xx/lpc43_sdmmc.c
View file

@ -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);

8
arch/arm/src/lpc54xx/lpc54_ethernet.c
View file

@ -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 */

6
arch/arm/src/lpc54xx/lpc54_i2c_master.c
View file

@ -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 */

8
arch/arm/src/lpc54xx/lpc54_sdmmc.c
View file

@ -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);

20
arch/arm/src/s32k1xx/s32k1xx_enet.c
View file

@ -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 */

8
arch/arm/src/s32k1xx/s32k1xx_flexcan.c
View file

@ -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;

16
arch/arm/src/sam34/sam_emac.c
View file

@ -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 */

8
arch/arm/src/sam34/sam_hsmci.c
View file

@ -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);

4
arch/arm/src/sam34/sam_spi.c
View file

@ -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);

6
arch/arm/src/sam34/sam_twi.c
View file

@ -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;

16
arch/arm/src/sama5/sam_emaca.c
View file

@ -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 */

16
arch/arm/src/sama5/sam_emacb.c
View file

@ -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 */

16
arch/arm/src/sama5/sam_gmac.c
View file

@ -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 */

8
arch/arm/src/sama5/sam_hsmci.c
View file

@ -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);

8
arch/arm/src/sama5/sam_sdmmc.c
View file

@ -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)
{

4
arch/arm/src/sama5/sam_spi.c
View file

@ -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);

16
arch/arm/src/sama5/sam_ssc.c
View file

@ -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

12
arch/arm/src/sama5/sam_tsd.c
View file

@ -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);

6
arch/arm/src/sama5/sam_twi.c
View file

@ -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;

16
arch/arm/src/samd5e5/sam_gmac.c
View file

@ -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 */

16
arch/arm/src/samv7/sam_emac.c
View file

@ -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 */

8
arch/arm/src/samv7/sam_hsmci.c
View file

@ -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);

4
arch/arm/src/samv7/sam_qspi.c
View file

@ -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);

4
arch/arm/src/samv7/sam_spi.c
View file

@ -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);

16
arch/arm/src/samv7/sam_ssc.c
View file

@ -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

8
arch/arm/src/samv7/sam_twihs.c
View file

@ -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;

17
arch/arm/src/stm32/stm32_eth.c
View file

@ -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 */

16
arch/arm/src/stm32/stm32_i2s.c
View file

@ -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

8
arch/arm/src/stm32/stm32_sdio.c
View file

@ -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);

20
arch/arm/src/stm32f7/stm32_ethernet.c
View file

@ -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 */

4
arch/arm/src/stm32f7/stm32_qspi.c
View file

@ -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);

6
arch/arm/src/stm32f7/stm32_sai.c
View file

@ -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

8
arch/arm/src/stm32f7/stm32_sdmmc.c
View file

@ -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);

22
arch/arm/src/stm32h7/stm32_ethernet.c
View file

@ -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 */

4
arch/arm/src/stm32h7/stm32_qspi.c
View file

@ -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);

8
arch/arm/src/stm32h7/stm32_sdmmc.c
View file

@ -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);

4
arch/arm/src/stm32l4/stm32l4_qspi.c
View file

@ -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);

6
arch/arm/src/stm32l4/stm32l4_sai.c
View file

@ -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

8
arch/arm/src/stm32l4/stm32l4_sdmmc.c
View file

@ -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);

14
arch/arm/src/tiva/lm/lm3s_ethernet.c
View file

@ -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);

19
arch/arm/src/tiva/tm4c/tm4c_ethernet.c
View file

@ -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 */

4
arch/arm/src/xmc4/xmc4_spi.c
View file

@ -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);

15
arch/hc/src/m9s12/m9s12_ethernet.c
View file

@ -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 */

14
arch/mips/src/pic32mx/pic32mx_ethernet.c
View file

@ -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 */

8
arch/mips/src/pic32mx/pic32mx_usbdev.c
View file

@ -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);
}
/****************************************************************************

14
arch/mips/src/pic32mz/pic32mz_ethernet.c
View file

@ -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 */

6
arch/mips/src/pic32mz/pic32mz_spi.c
View file

@ -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);

4
arch/misoc/src/common/misoc_net.c
View file

@ -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();
}

4
arch/renesas/src/rx65n/rx65n_eth.c
View file

@ -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);

4
arch/renesas/src/rx65n/rx65n_eth.h
View file

@ -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

8
arch/sim/src/sim/up_ioexpander.c
View file

@ -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");

17
arch/z80/src/ez80/ez80_emac.c
View file

@ -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 */

8
boards/arm/samv7/samv71-xult/src/sam_ili9488.c
View file

@ -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);

10
drivers/input/ads7843e.c
View file

@ -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 */

2
drivers/input/ft5x06.c
View file

@ -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 */

10
drivers/input/max11802.c
View file

@ -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 */

10
drivers/input/stmpe811_tsc.c
View file

@ -5,7 +5,7 @@
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* References:
* "STMPE811 S-Touch® advanced resistive touchscreen controller with 8-bit
* "STMPE811 S-Touch<EFBFBD> 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 */

6
drivers/ioexpander/pcf8574.c
View file

@ -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");

8
drivers/ioexpander/tca64xx.c
View file

@ -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");

12
drivers/net/dm90x0.c
View file

@ -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 */

20
drivers/net/enc28j60.c
View file

@ -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

16
drivers/net/encx24j600.c
View file

@ -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

16
drivers/net/ftmac100.c
View file

@ -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 */

8
drivers/net/lan91c111.c
View file

@ -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 */

6
drivers/net/loopback.c
View file

@ -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;

8
drivers/net/rpmsgdrv.c
View file

@ -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();

8
drivers/net/skeleton.c
View file

@ -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 */

6
drivers/net/tun.c
View file

@ -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;

5
drivers/power/activity_governor.c
View file

@ -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

8
drivers/sensors/ak09912.c
View file

@ -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))
{

4
drivers/timers/watchdog.c
View file

@ -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);

4
drivers/usbdev/cdcacm.c
View file

@ -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);

8
drivers/usbdev/cdcecm.c
View file

@ -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;

12
drivers/usbdev/rndis.c
View file

@ -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;
}

8
drivers/usbhost/usbhost_cdcmbim.c
View file

@ -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;
}

8
drivers/wireless/ieee80211/bcm43xxx/bcmf_netdev.c
View file

@ -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 */

12
drivers/wireless/ieee802154/xbee/xbee.c
View file

@ -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

18
drivers/wireless/ieee802154/xbee/xbee_mac.c
View file

@ -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);
}
/****************************************************************************

8
drivers/wireless/ieee802154/xbee/xbee_netdev.c
View file

@ -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 */

Some files were not shown because too many files have changed in this diff Show more