Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-20 12:33:27 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

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
Download Patch File Download Diff File Expand all files Collapse all files
Documentation/NuttxPortingGuide.html
+1 -1
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.
arch/arm/src/c5471/c5471_ethernet.c
+2 -2
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 */
arch/arm/src/cxd56xx/cxd56_i2c.c
+6 -5
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));
arch/arm/src/cxd56xx/cxd56_icc.c
+2 -2
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);
arch/arm/src/cxd56xx/cxd56_rtc.c
+2 -2
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 */
arch/arm/src/cxd56xx/cxd56_sdhci.c
+4 -4
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);
arch/arm/src/efm32/efm32_spi.c
+4 -4
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);
arch/arm/src/imxrt/imxrt_enet.c
+10 -10
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 */
arch/arm/src/imxrt/imxrt_usdhc.c
+4 -4
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)
{
arch/arm/src/kinetis/kinetis_enet.c
+10 -10
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);
arch/arm/src/kinetis/kinetis_flexcan.c
+4 -4
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;
arch/arm/src/kinetis/kinetis_i2c.c
+4 -4
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);
arch/arm/src/kinetis/kinetis_sdhc.c
+3 -4
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);
arch/arm/src/kinetis/kinetis_usbdev.c
+4 -4
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);
}
/******************************************************************************************
arch/arm/src/lpc17xx_40xx/lpc17_40_ethernet.c
+9 -9
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
arch/arm/src/lpc17xx_40xx/lpc17_40_i2c.c
+4 -4
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;
arch/arm/src/lpc17xx_40xx/lpc17_40_sdcard.c
+3 -4
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);
arch/arm/src/lpc2378/lpc23xx_i2c.c
+4 -4
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;
arch/arm/src/lpc31xx/lpc31_i2c.c
+3 -3
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 */
arch/arm/src/lpc43xx/lpc43_ethernet.c
+10 -8
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 */
arch/arm/src/lpc43xx/lpc43_i2c.c
+4 -4
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;
arch/arm/src/lpc43xx/lpc43_sdmmc.c
+4 -4
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);
arch/arm/src/lpc54xx/lpc54_ethernet.c
+4 -4
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 */
arch/arm/src/lpc54xx/lpc54_i2c_master.c
+3 -3
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 */
arch/arm/src/lpc54xx/lpc54_sdmmc.c
+4 -4
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);
arch/arm/src/s32k1xx/s32k1xx_enet.c
+10 -10
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 */
arch/arm/src/s32k1xx/s32k1xx_flexcan.c
+4 -4
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;
arch/arm/src/sam34/sam_emac.c
+8 -8
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 */
arch/arm/src/sam34/sam_hsmci.c
+4 -4
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);
arch/arm/src/sam34/sam_spi.c
+2 -2
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);
arch/arm/src/sam34/sam_twi.c
+3 -3
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;
arch/arm/src/sama5/sam_emaca.c
+8 -8
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 */
arch/arm/src/sama5/sam_emacb.c
+8 -8
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 */
arch/arm/src/sama5/sam_gmac.c
+8 -8
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 */
arch/arm/src/sama5/sam_hsmci.c
+4 -4
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);
arch/arm/src/sama5/sam_sdmmc.c
+4 -4
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)
{
arch/arm/src/sama5/sam_spi.c
+2 -2
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);
arch/arm/src/sama5/sam_ssc.c
+8 -8
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
arch/arm/src/sama5/sam_tsd.c
+6 -6
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);
arch/arm/src/sama5/sam_twi.c
+3 -3
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;
arch/arm/src/samd5e5/sam_gmac.c
+8 -8
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 */
arch/arm/src/samv7/sam_emac.c
+8 -8
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 */
arch/arm/src/samv7/sam_hsmci.c
+4 -4
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);
arch/arm/src/samv7/sam_qspi.c
+2 -2
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);
arch/arm/src/samv7/sam_spi.c
+2 -2
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);
arch/arm/src/samv7/sam_ssc.c
+8 -8
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
arch/arm/src/samv7/sam_twihs.c
+4 -4
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;
arch/arm/src/stm32/stm32_eth.c
+10 -7
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 */
arch/arm/src/stm32/stm32_i2s.c
+8 -8
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
arch/arm/src/stm32/stm32_sdio.c
+4 -4
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);

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