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

sched/wdog: Remove MAX_WDOGPARMS and related stuff

Browse Source 
since the variable arguments are error prone and seldom used.

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao
2020-08-10 02:29:35 +08:00
committed by patacongo
parent 7252275e15
commit acca9fcc3b
128 changed files with 728 additions and 977 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Documentation/NuttxPortingGuide.html
+5 -16
View File
@@ -2838,7 +2838,7 @@ int up_timer_start(FAR const struct timespec *ts);
<pre>
#include &lt;nuttx/wdog.h&gt;
int wd_start(FAR struct wdog_s *wdog, int delay,
wdentry_t wdentry, int argc, ....);
wdentry_t wdentry, wdparm_t arg);
</pre>
<p>
@@ -2860,11 +2860,10 @@ wd_start() on a given watchdog ID has any effect.
<li><code>wdog</code>. Watchdog ID
<li><code>delay</code>. Delay count in clock ticks
<li><code>wdentry</code>. Function to call on timeout
<li><code>argc</code>. The number of uint32_t parameters to pass to wdentry.
<li><code>...</code>. uint32_t size parameters to pass to wdentry
<li><code>arg</code>. The parameter to pass to wdentry.
<p>
<b>NOTE</b>: All parameters must be of type <code>wdparm_t</code>.
<b>NOTE</b>: The parameter must be of type <code>wdparm_t</code>.
</p>
</ul>
@@ -2955,24 +2954,14 @@ 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, wdparm_t arg1, ...);
typedef void (*wdentry_t)(wdparm_t arg);
</pre>
<p>
Where <code>argc</code> is the number of <code>wdparm_t</code> type arguments that follow.
</p>
<p>
The arguments are passed as scalar <code>wdparm_t</code> values. For systems where the <code>sizeof(pointer) &lt; sizeof(uint32_t)</code>, the following union defines the alignment of the pointer within the <code>uint32_t</code>. For example, the SDCC MCS51 general pointer is 24-bits, but <code>uint32_t</code> is 32-bits (of course).
The argument is passed as scalar <code>wdparm_t</code> values. For systems where the <code>sizeof(pointer) &lt; sizeof(uint32_t)</code>, the following union defines the alignment of the pointer within the <code>uint32_t</code>. For example, the SDCC MCS51 general pointer is 24-bits, but <code>uint32_t</code> is 32-bits (of course).
</p>
We always have <code>sizeof(pointer) <= sizeof(uintptr_t)</code> by definition.
</p>
<ul><pre>
union wdparm_u
{
FAR void *pvarg; /* The size one generic point */
uint32_t dwarg; /* Big enough for a 32-bit value in any case */
uintptr_t uiarg; /* sizeof(uintptr_t) >= sizeof(pointer) */
};
#if UINTPTR_MAX >= UINT32_MAX
typedef uintptr_t wdparm_t;
#else
arch/arm/src/c5471/c5471_ethernet.c
+11 -13
View File
@@ -416,10 +416,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, wdparm_t arg, ...);
static void c5471_txtimeout_expiry(wdparm_t arg);
static void c5471_poll_work(FAR void *arg);
static void c5471_poll_expiry(int argc, wdparm_t arg, ...);
static void c5471_poll_expiry(wdparm_t arg);
/* NuttX callback functions */
@@ -1012,7 +1012,7 @@ static int c5471_transmit(struct c5471_driver_s *priv)
/* Setup the TX timeout watchdog (perhaps restarting the timer) */
wd_start(&priv->c_txtimeout, C5471_TXTIMEOUT,
c5471_txtimeout_expiry, 1, (wdparm_t)priv);
c5471_txtimeout_expiry, (wdparm_t)priv);
return OK;
}
@@ -1762,8 +1762,7 @@ static void c5471_txtimeout_work(FAR void *arg)
* The last TX never completed. Reset the hardware and start again.
*
* Input Parameters:
* argc - The number of available arguments
* arg - The first argument
* arg - The argument
*
* Returned Value:
* None
@@ -1773,7 +1772,7 @@ static void c5471_txtimeout_work(FAR void *arg)
*
****************************************************************************/
static void c5471_txtimeout_expiry(int argc, wdparm_t arg, ...)
static void c5471_txtimeout_expiry(wdparm_t arg)
{
struct c5471_driver_s *priv = (struct c5471_driver_s *)arg;
@@ -1828,8 +1827,8 @@ static void c5471_poll_work(FAR void *arg)
/* Setup the watchdog poll timer again */
wd_start(&priv->c_txpoll, C5471_WDDELAY, c5471_poll_expiry, 1,
(wdparm_t)priv);
wd_start(&priv->c_txpoll, C5471_WDDELAY,
c5471_poll_expiry, (wdparm_t)priv);
net_unlock();
}
@@ -1840,8 +1839,7 @@ static void c5471_poll_work(FAR void *arg)
* Periodic timer handler. Called from the timer interrupt handler.
*
* Input Parameters:
* argc - The number of available arguments
* arg - The first argument
* arg - The argument
*
* Returned Value:
* None
@@ -1851,7 +1849,7 @@ static void c5471_poll_work(FAR void *arg)
*
****************************************************************************/
static void c5471_poll_expiry(int argc, wdparm_t arg, ...)
static void c5471_poll_expiry(wdparm_t arg)
{
struct c5471_driver_s *priv = (struct c5471_driver_s *)arg;
@@ -1915,8 +1913,8 @@ static int c5471_ifup(struct net_driver_s *dev)
/* Set and activate a timer process */
wd_start(&priv->c_txpoll, C5471_WDDELAY, c5471_poll_expiry,
1, (wdparm_t)priv);
wd_start(&priv->c_txpoll, C5471_WDDELAY,
c5471_poll_expiry, (wdparm_t)priv);
/* Enable the Ethernet interrupt */
arch/arm/src/cxd56xx/cxd56_i2c.c
+5 -5
View File
@@ -162,13 +162,13 @@ 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, wdparm_t arg, ...);
static void cxd56_i2c_timeout(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,
FAR struct i2c_msg_s *msgs, int count);
#ifdef CONFIG_I2C_RESET
static int cxd56_i2c_reset(FAR struct i2c_master_s * dev);
static int cxd56_i2c_reset(FAR struct i2c_master_s *dev);
#endif
#if defined(CONFIG_CXD56_I2C0_SCUSEQ) || defined(CONFIG_CXD56_I2C1_SCUSEQ)
static int cxd56_i2c_transfer_scu(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, wdparm_t arg, ...)
static void cxd56_i2c_timeout(wdparm_t arg)
{
struct cxd56_i2cdev_s *priv = (struct cxd56_i2cdev_s *)arg;
irqstate_t flags = enter_critical_section();
@@ -551,7 +551,7 @@ 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, (wdparm_t)priv);
cxd56_i2c_timeout, (wdparm_t)priv);
/* Set stop flag for indicate the last data */
@@ -597,7 +597,7 @@ static int cxd56_i2c_send(struct cxd56_i2cdev_s *priv, int last)
flags = enter_critical_section();
wd_start(&priv->timeout, I2C_TIMEOUT,
cxd56_i2c_timeout, 1, (wdparm_t)priv);
cxd56_i2c_timeout, (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, wdparm_t arg, ...)
static void icc_rxtimeout(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, (wdparm_t)priv);
wd_start(&priv->rxtimeout, timo, icc_rxtimeout, (wdparm_t)priv);
icc_semtake(&priv->rxwait);
arch/arm/src/cxd56xx/cxd56_rtc.c
+3 -3
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, ...)
static void cxd56_rtc_initialize(wdparm_t arg)
{
struct timespec ts;
#ifdef CONFIG_CXD56_RTC_LATEINIT
@@ -274,7 +274,7 @@ static void cxd56_rtc_initialize(int argc, ...)
rtcinfo("retry count: %d\n", s_retry);
if (OK == wd_start(&s_wdog, MSEC2TICK(RTC_CLOCK_CHECK_INTERVAL),
(wdentry_t)cxd56_rtc_initialize, 0))
cxd56_rtc_initialize, 0))
{
/* Again, this function is called recursively */
@@ -355,7 +355,7 @@ static void cxd56_rtc_initialize(int argc, ...)
int up_rtc_initialize(void)
{
cxd56_rtc_initialize(1, (wdparm_t)NULL);
cxd56_rtc_initialize(1, NULL);
return OK;
}
arch/arm/src/cxd56xx/cxd56_sdhci.c
+5 -6
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, wdparm_t arg, ...);
static void cxd56_eventtimeout(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,
@@ -960,8 +960,7 @@ static void cxd56_receive(struct cxd56_sdiodev_s *priv)
* any other waited-for event occurring.
*
* Input Parameters:
* argc - The number of arguments (should be 1)
* arg - The argument (state structure reference cast to uint32_t)
* arg - The argument
*
* Returned Value:
* None
@@ -971,11 +970,11 @@ static void cxd56_receive(struct cxd56_sdiodev_s *priv)
*
****************************************************************************/
static void cxd56_eventtimeout(int argc, wdparm_t arg, ...)
static void cxd56_eventtimeout(wdparm_t arg)
{
struct cxd56_sdiodev_s *priv = (struct cxd56_sdiodev_s *)arg;
DEBUGASSERT(argc == 1 && priv != NULL);
DEBUGASSERT(priv != NULL);
DEBUGASSERT((priv->waitevents & SDIOWAIT_TIMEOUT) != 0);
/* Is a data transfer complete event expected? */
@@ -2590,7 +2589,7 @@ static sdio_eventset_t cxd56_sdio_eventwait(FAR struct sdio_dev_s *dev,
delay = MSEC2TICK(timeout);
ret = wd_start(&priv->waitwdog, delay,
cxd56_eventtimeout, 1, (wdparm_t)priv);
cxd56_eventtimeout, (wdparm_t)priv);
if (ret != OK)
{
mcerr("ERROR: wd_start failed: %d\n", ret);
arch/arm/src/efm32/efm32_spi.c
+5 -5
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, wdparm_t arg1, ...);
static void spi_dma_timeout(wdparm_t arg);
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,9 +407,9 @@ static void spi_wait_status(const struct efm32_spiconfig_s *config,
****************************************************************************/
#ifdef CONFIG_EFM32_SPI_DMA
static void spi_dma_timeout(int argc, wdparm_t arg1, ...)
static void spi_dma_timeout(wdparm_t arg)
{
struct efm32_spidev_s *priv = (struct efm32_spidev_s *)((uintptr_t)arg1);
struct efm32_spidev_s *priv = (struct efm32_spidev_s *)arg;
/* Mark DMA timeout error and wakeup form RX and TX waiters */
@@ -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, (wdparm_t)priv);
ret = wd_start(&priv->wdog, ticks,
spi_dma_timeout, (wdparm_t)priv);
if (ret < 0)
{
spierr("ERROR: Failed to start timeout: %d\n", ret);
arch/arm/src/imxrt/imxrt_enet.c
+9 -11
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, wdparm_t arg, ...);
static void imxrt_txtimeout_expiry(wdparm_t arg);
static void imxrt_poll_work(FAR void *arg);
static void imxrt_polltimer_expiry(int argc, wdparm_t arg, ...);
static void imxrt_polltimer_expiry(wdparm_t arg);
/* NuttX callback functions */
@@ -566,7 +566,7 @@ 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);
imxrt_txtimeout_expiry, (wdparm_t)priv);
/* Start the TX transfer (if it was not already waiting for buffers) */
@@ -1171,8 +1171,7 @@ static void imxrt_txtimeout_work(FAR void *arg)
* The last TX never completed. Reset the hardware and start again.
*
* Input Parameters:
* argc - The number of available arguments
* arg - The first argument
* arg - The argument
*
* Returned Value:
* None
@@ -1182,7 +1181,7 @@ static void imxrt_txtimeout_work(FAR void *arg)
*
****************************************************************************/
static void imxrt_txtimeout_expiry(int argc, wdparm_t arg, ...)
static void imxrt_txtimeout_expiry(wdparm_t arg)
{
FAR struct imxrt_driver_s *priv = (FAR struct imxrt_driver_s *)arg;
@@ -1240,7 +1239,7 @@ 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);
imxrt_polltimer_expiry, (wdparm_t)priv);
net_unlock();
}
@@ -1251,8 +1250,7 @@ static void imxrt_poll_work(FAR void *arg)
* Periodic timer handler. Called from the timer interrupt handler.
*
* Input Parameters:
* argc - The number of available arguments
* arg - The first argument
* arg - The argument
*
* Returned Value:
* None
@@ -1262,7 +1260,7 @@ static void imxrt_poll_work(FAR void *arg)
*
****************************************************************************/
static void imxrt_polltimer_expiry(int argc, wdparm_t arg, ...)
static void imxrt_polltimer_expiry(wdparm_t arg)
{
FAR struct imxrt_driver_s *priv = (FAR struct imxrt_driver_s *)arg;
@@ -1372,7 +1370,7 @@ 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);
imxrt_polltimer_expiry, (wdparm_t)priv);
/* Clear all pending ENET interrupt */
arch/arm/src/imxrt/imxrt_usdhc.c
+5 -6
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, wdparm_t arg, ...);
static void imxrt_eventtimeout(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,
@@ -1006,8 +1006,7 @@ static void imxrt_receive(struct imxrt_dev_s *priv)
* any other waited-for event occurring.
*
* Input Parameters:
* argc - The number of arguments (should be 1)
* arg - The argument (state structure reference cast to uint32_t)
* arg - The argument
*
* Returned Value:
* None
@@ -1017,11 +1016,11 @@ static void imxrt_receive(struct imxrt_dev_s *priv)
*
****************************************************************************/
static void imxrt_eventtimeout(int argc, wdparm_t arg, ...)
static void imxrt_eventtimeout(wdparm_t arg)
{
struct imxrt_dev_s *priv = (struct imxrt_dev_s *)arg;
DEBUGASSERT(argc == 1 && priv != NULL);
DEBUGASSERT(priv != NULL);
DEBUGASSERT((priv->waitevents & SDIOWAIT_TIMEOUT) != 0);
/* Is a data transfer complete event expected? */
@@ -2709,7 +2708,7 @@ static sdio_eventset_t imxrt_eventwait(FAR struct sdio_dev_s *dev,
delay = MSEC2TICK(timeout);
ret = wd_start(&priv->waitwdog, delay,
imxrt_eventtimeout, 1, (wdparm_t)priv);
imxrt_eventtimeout, (wdparm_t)priv);
if (ret < 0)
{
arch/arm/src/kinetis/hardware/kinetis_usbhs.h
+13 -13
View File
@@ -770,8 +770,8 @@
/* USB PHY General Control Register */
#define USBPHY_CTRLn_SFTRST (1 << 31) /* Bit 31: Soft-reset the USBPHY_PWD, USBPHY_TX, USBPHY_RX, and USBPHY_CTRL */
#define USBPHY_CTRLn_CLKGATE (1 << 30) /* Bit 30: Gate UTMI Clocks */
#define USBPHY_CTRLN_SFTRST (1 << 31) /* Bit 31: Soft-reset the USBPHY_PWD, USBPHY_TX, USBPHY_RX, and USBPHY_CTRL */
#define USBPHY_CTRLN_CLKGATE (1 << 30) /* Bit 30: Gate UTMI Clocks */
#define USBPHY_CTRLn_UTMI_SUSPENDM (1 << 29) /* Bit 29: Indicats powered-down state */
#define USBPHY_CTRLn_HOST_FORCE_LS_SE0 (1 << 28) /* Bit 28: Forces next FS packet tohave a EOP with low-speed timing */
#define USBPHY_CTRLn_OTG_ID_VALUE (1 << 27) /* Bit 27: Indicates the results of USB_ID pin */
@@ -782,8 +782,8 @@
#define USBPHY_CTRLn_ENAUTOCLR_CLKGATE (1 << 19) /* Bit 19: Auto-clear the CLKGATE bit if wakeup event while suspended */
#define USBPHY_CTRLn_AUTORESUME_EN (1 << 18) /* Bit 18: Auto resume, HW will send Resume to respond to the device remote wakeup */
/* Bit 16-17: Reserved */
#define USBPHY_CTRLn_ENUTMILEVEL3 (1 << 15) /* Bit 15: Enables UTMI+ Level 3 operation for the USB HS PHY */
#define USBPHY_CTRLn_ENUTMILEVEL2 (1 << 14) /* Bit 14: Enables UTMI+ Level 2 operation for the USB HS PHY */
#define USBPHY_CTRLN_ENUTMILEVEL3 (1 << 15) /* Bit 15: Enables UTMI+ Level 3 operation for the USB HS PHY */
#define USBPHY_CTRLN_ENUTMILEVEL2 (1 << 14) /* Bit 14: Enables UTMI+ Level 2 operation for the USB HS PHY */
/* Bit 13: Reserved */
#define USBPHY_CTRLn_DEVPLUGIN_IRQ (1 << 12) /* Bit 12: Indicates device is connected */
/* Bits 5-11: Reserved */
@@ -855,21 +855,21 @@
/* USB PHY PLL Control/Status Register */
#define USBPHY_PLL_SICn_PLL_LOCK (1 << 31) /* Bit 31: USB PLL lock status indicator */
#define USBPHY_PLL_SICN_PLL_LOCK (1 << 31) /* Bit 31: USB PLL lock status indicator */
/* Bits 17-30: Reserved */
#define USBPHY_PLL_SICn_PLL_BYPASS (1 << 16) /* Bit 16: Bypass the USB PLL */
#define USBPHY_PLL_SICN_PLL_BYPASS (1 << 16) /* Bit 16: Bypass the USB PLL */
/* Bits 14-15: Reserved */
#define USBPHY_PLL_SICn_PLL_ENABLE (1 << 13) /* Bit 13: Enable the clock output from the USB PLL */
#define USBPHY_PLL_SICn_PLL_POWER (1 << 12) /* Bit 12: Power up the USB PLL */
#define USBPHY_PLL_SICN_PLL_POWER (1 << 12) /* Bit 12: Power up the USB PLL */
#define USBPHY_PLL_SICn_PLL_HOLD_RING_OFF (1 << 11) /* Bit 11: Analog debug bit */
/* Bits 7-10: Reserved */
#define USBPHY_PLL_SICn_PLL_EN_USB_CLKS (1 << 6) /* Bit 6: Enable the USB clock output from the USB PHY PLL */
#define USBPHY_PLL_SICN_PLL_EN_USB_CLKS (1 << 6) /* Bit 6: Enable the USB clock output from the USB PHY PLL */
/* Bits 2-5: Reserved */
#define USBPHY_PLL_SICn_PLL_DIV_SEL_SHIFT (0) /* Bits 0-4: Controls the USB PLL feedback loop divider */
#define USBPHY_PLL_SICn_PLL_DIV_SEL_MASK (0x1f << USBPHY_PLL_SICn_PLL_DIV_SEL_SHIFT)
# define USBPHY_PLL_SICn_PLL_DIV_SEL_24MHZ (0 << USBPHY_PLL_SICn_PLL_DIV_SEL_SHIFT) /* 24Mhz XTAL */
# define USBPHY_PLL_SICn_PLL_DIV_SEL_16MHZ (1 << USBPHY_PLL_SICn_PLL_DIV_SEL_SHIFT) /* 16Mhz XTAL */
# define USBPHY_PLL_SICn_PLL_DIV_SEL_12MHZ (2 << USBPHY_PLL_SICn_PLL_DIV_SEL_SHIFT) /* 12Mhz XTAL */
#define USBPHY_PLL_SICN_PLL_DIV_SEL_MASK (0x1f << USBPHY_PLL_SICn_PLL_DIV_SEL_SHIFT)
# define USBPHY_PLL_SICN_PLL_DIV_SEL_24MHZ (0 << USBPHY_PLL_SICn_PLL_DIV_SEL_SHIFT) /* 24Mhz XTAL */
# define USBPHY_PLL_SICN_PLL_DIV_SEL_16MHZ (1 << USBPHY_PLL_SICn_PLL_DIV_SEL_SHIFT) /* 16Mhz XTAL */
# define USBPHY_PLL_SICN_PLL_DIV_SEL_12MHZ (2 << USBPHY_PLL_SICn_PLL_DIV_SEL_SHIFT) /* 12Mhz XTAL */
/* USB PHY VBUS Detect Control Register */
@@ -968,6 +968,6 @@
#define USBPHY_TRIM_OVERRIDE_ENn_TRIM_TX_CAL45DP_OVERRIDE (1 << 3) /* Bit 3: Override enable for TX_CAL45DP */
#define USBPHY_TRIM_OVERRIDE_ENn_TRIM_TX_D_CAL_OVERRIDE (1 << 2) /* Bit 2: Override enable for TX_D_CAL */
#define USBPHY_TRIM_OVERRIDE_ENn_TRIM_ENV_TAIL_ADJ_VD_OVERRIDE (1 << 1) /* Bit 1: Override enable for ENV_TAIL_ADJ */
#define USBPHY_TRIM_OVERRIDE_ENn_TRIM_DIV_SEL_OVERRIDE (1 << 0) /* Bit 0: Override enable for PLL_DIV_SEL */
#define USBPHY_TRIM_OVERRIDE_ENN_TRIM_DIV_SEL_OVERRIDE (1 << 0) /* Bit 0: Override enable for PLL_DIV_SEL */
#endif /* __ARCH_ARM_SRC_KINETIS_HARDWARE_KINETIS_USBHS_H */
arch/arm/src/kinetis/kinetis_enet.c
+9 -11
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, wdparm_t arg, ...);
static void kinetis_txtimeout_expiry(wdparm_t arg);
static void kinetis_poll_work(FAR void *arg);
static void kinetis_polltimer_expiry(int argc, wdparm_t arg, ...);
static void kinetis_polltimer_expiry(wdparm_t arg);
/* NuttX callback functions */
@@ -521,7 +521,7 @@ 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);
kinetis_txtimeout_expiry, (wdparm_t)priv);
return OK;
}
@@ -1031,8 +1031,7 @@ static void kinetis_txtimeout_work(FAR void *arg)
* The last TX never completed. Reset the hardware and start again.
*
* Input Parameters:
* argc - The number of available arguments
* arg - The first argument
* arg - The argument
*
* Returned Value:
* None
@@ -1042,7 +1041,7 @@ static void kinetis_txtimeout_work(FAR void *arg)
*
****************************************************************************/
static void kinetis_txtimeout_expiry(int argc, wdparm_t arg, ...)
static void kinetis_txtimeout_expiry(wdparm_t arg)
{
FAR struct kinetis_driver_s *priv = (FAR struct kinetis_driver_s *)arg;
@@ -1101,7 +1100,7 @@ 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);
kinetis_polltimer_expiry, (wdparm_t)priv);
net_unlock();
}
@@ -1112,8 +1111,7 @@ static void kinetis_poll_work(FAR void *arg)
* Periodic timer handler. Called from the timer interrupt handler.
*
* Input Parameters:
* argc - The number of available arguments
* arg - The first argument
* arg - The argument
*
* Returned Value:
* None
@@ -1123,7 +1121,7 @@ static void kinetis_poll_work(FAR void *arg)
*
****************************************************************************/
static void kinetis_polltimer_expiry(int argc, wdparm_t arg, ...)
static void kinetis_polltimer_expiry(wdparm_t arg)
{
FAR struct kinetis_driver_s *priv = (FAR struct kinetis_driver_s *)arg;
@@ -1244,7 +1242,7 @@ 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);
kinetis_polltimer_expiry, (wdparm_t)priv);
putreg32(0, KINETIS_ENET_EIMR);
arch/arm/src/kinetis/kinetis_flexcan.c
+5 -7
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, wdparm_t arg, ...);
static void kinetis_txtimeout_expiry(wdparm_t arg);
#endif
/* NuttX callback functions */
@@ -752,7 +752,7 @@ 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);
kinetis_txtimeout_expiry, (wdparm_t)priv);
}
#endif
@@ -1131,8 +1131,7 @@ static void kinetis_txtimeout_work(FAR void *arg)
* The last TX never completed. Reset the hardware and start again.
*
* Input Parameters:
* argc - The number of available arguments
* arg - The first argument
* arg - The argument
*
* Returned Value:
* None
@@ -1142,12 +1141,11 @@ static void kinetis_txtimeout_work(FAR void *arg)
*
****************************************************************************/
static void kinetis_txtimeout_expiry(int argc, wdparm_t arg, ...)
static void kinetis_txtimeout_expiry(wdparm_t arg)
{
FAR struct kinetis_driver_s *priv = (FAR struct kinetis_driver_s *)arg;
/* Schedule to perform the TX timeout processing on the worker thread
*/
/* Schedule to perform the TX timeout processing on the worker thread */
work_queue(CANWORK, &priv->irqwork, kinetis_txtimeout_work, priv, 0);
}
arch/arm/src/kinetis/kinetis_i2c.c
+3 -3
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, wdparm_t arg, ...);
static void kinetis_i2c_timeout(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, wdparm_t arg, ...)
static void kinetis_i2c_timeout(wdparm_t arg)
{
struct kinetis_i2cdev_s *priv = (struct kinetis_i2cdev_s *)arg;
@@ -1223,7 +1223,7 @@ static int kinetis_i2c_transfer(struct i2c_master_s *dev,
/* Wait for transfer complete */
wd_start(&priv->timeout, I2C_TIMEOUT,
kinetis_i2c_timeout, 1, (wdparm_t)priv);
kinetis_i2c_timeout, (wdparm_t)priv);
kinetis_i2c_wait(priv);
wd_cancel(&priv->timeout);
arch/arm/src/kinetis/kinetis_sdhc.c
+5 -6
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, wdparm_t arg, ...);
static void kinetis_eventtimeout(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,
@@ -923,8 +923,7 @@ static void kinetis_receive(struct kinetis_dev_s *priv)
* any other waited-for event occurring.
*
* Input Parameters:
* argc - The number of arguments (should be 1)
* arg - The argument (state structure reference cast to uint32_t)
* arg - The argument
*
* Returned Value:
* None
@@ -934,11 +933,11 @@ static void kinetis_receive(struct kinetis_dev_s *priv)
*
****************************************************************************/
static void kinetis_eventtimeout(int argc, wdparm_t arg, ...)
static void kinetis_eventtimeout(wdparm_t arg)
{
struct kinetis_dev_s *priv = (struct kinetis_dev_s *)arg;
DEBUGASSERT(argc == 1 && priv != NULL);
DEBUGASSERT(priv != NULL);
DEBUGASSERT((priv->waitevents & SDIOWAIT_TIMEOUT) != 0);
/* Is a data transfer complete event expected? */
@@ -2507,7 +2506,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, (wdparm_t)priv);
kinetis_eventtimeout, (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, wdparm_t arg1, ...);
static void khci_rqrestart(wdparm_t arg);
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, wdparm_t arg1, ...)
static void khci_rqrestart(wdparm_t arg)
{
struct khci_usbdev_s *priv;
struct khci_ep_s *privep;
@@ -1061,7 +1061,7 @@ static void khci_rqrestart(int argc, wdparm_t arg1, ...)
/* Recover the pointer to the driver structure */
priv = (struct khci_usbdev_s *)((uintptr_t)arg1);
priv = (struct khci_usbdev_s *)arg;
DEBUGASSERT(priv != NULL);
/* Sample and clear the set of endpoints that have recovered from a stall */
@@ -1119,7 +1119,7 @@ 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, (wdparm_t)priv);
khci_rqrestart, (wdparm_t)priv);
}
/******************************************************************************************
arch/arm/src/lpc17xx_40xx/lpc17_40_ethernet.c
+9 -11
View File
@@ -382,10 +382,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, wdparm_t arg, ...);
static void lpc17_40_txtimeout_expiry(wdparm_t arg);
static void lpc17_40_poll_work(FAR void *arg);
static void lpc17_40_poll_expiry(int argc, wdparm_t arg, ...);
static void lpc17_40_poll_expiry(wdparm_t arg);
/* NuttX callback functions */
@@ -702,7 +702,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, (wdparm_t)priv);
lpc17_40_txtimeout_expiry, (wdparm_t)priv);
return OK;
}
@@ -1419,8 +1419,7 @@ static void lpc17_40_txtimeout_work(FAR void *arg)
* The last TX never completed. Reset the hardware and start again.
*
* Input Parameters:
* argc - The number of available arguments
* arg - The first argument
* arg - The argument
*
* Returned Value:
* None
@@ -1430,7 +1429,7 @@ static void lpc17_40_txtimeout_work(FAR void *arg)
*
****************************************************************************/
static void lpc17_40_txtimeout_expiry(int argc, wdparm_t arg, ...)
static void lpc17_40_txtimeout_expiry(wdparm_t arg)
{
struct lpc17_40_driver_s *priv = (struct lpc17_40_driver_s *)arg;
@@ -1510,7 +1509,7 @@ 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, (wdparm_t)priv);
lpc17_40_poll_expiry, (wdparm_t)priv);
net_unlock();
}
@@ -1521,8 +1520,7 @@ static void lpc17_40_poll_work(FAR void *arg)
* Periodic timer handler. Called from the timer interrupt handler.
*
* Input Parameters:
* argc - The number of available arguments
* arg - The first argument
* arg - The argument
*
* Returned Value:
* None
@@ -1532,7 +1530,7 @@ static void lpc17_40_poll_work(FAR void *arg)
*
****************************************************************************/
static void lpc17_40_poll_expiry(int argc, wdparm_t arg, ...)
static void lpc17_40_poll_expiry(wdparm_t arg)
{
FAR struct lpc17_40_driver_s *priv = (FAR struct lpc17_40_driver_s *)arg;
@@ -1765,7 +1763,7 @@ 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, (wdparm_t)priv);
lpc17_40_poll_expiry, (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
+3 -3
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, wdparm_t arg, ...);
static void lpc17_40_i2c_timeout(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);
@@ -239,7 +239,7 @@ 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, (wdparm_t)priv);
lpc17_40_i2c_timeout, (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, wdparm_t arg, ...)
static void lpc17_40_i2c_timeout(wdparm_t arg)
{
struct lpc17_40_i2cdev_s *priv = (struct lpc17_40_i2cdev_s *)arg;
arch/arm/src/lpc17xx_40xx/lpc17_40_sdcard.c
+4 -5
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, wdparm_t arg, ...);
static void lpc17_40_eventtimeout(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,
@@ -1077,8 +1077,7 @@ static void lpc17_40_recvfifo(struct lpc17_40_dev_s *priv)
* any other waited-for event occurring.
*
* Input Parameters:
* argc - The number of arguments (should be 1)
* arg - The argument (state structure reference cast to uint32_t)
* arg - The argument
*
* Returned Value:
* None
@@ -1088,7 +1087,7 @@ static void lpc17_40_recvfifo(struct lpc17_40_dev_s *priv)
*
****************************************************************************/
static void lpc17_40_eventtimeout(int argc, wdparm_t arg, ...)
static void lpc17_40_eventtimeout(wdparm_t arg)
{
struct lpc17_40_dev_s *priv = (struct lpc17_40_dev_s *)arg;
@@ -2345,7 +2344,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, (wdparm_t)priv);
lpc17_40_eventtimeout, (wdparm_t)priv);
if (ret < 0)
{
mcerr("ERROR: wd_start failed: %d\n", ret);
arch/arm/src/lpc2378/lpc23xx_i2c.c
+3 -3
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, wdparm_t arg, ...);
static void lpc2378_i2c_timeout(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);
@@ -221,7 +221,7 @@ static int lpc2378_i2c_start(struct lpc2378_i2cdev_s *priv)
putreg32(I2C_CONSET_STA, priv->base + I2C_CONSET_OFFSET);
wd_start(&priv->timeout, I2C_TIMEOUT,
lpc2378_i2c_timeout, 1, (wdparm_t)priv);
lpc2378_i2c_timeout, (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, wdparm_t arg, ...)
static void lpc2378_i2c_timeout(wdparm_t arg)
{
struct lpc2378_i2cdev_s *priv = (struct lpc2378_i2cdev_s *)arg;
arch/arm/src/lpc31xx/lpc31_i2c.c
+3 -3
View File
@@ -116,7 +116,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, wdparm_t arg, ...);
static void i2c_timeout(wdparm_t arg);
static void i2c_hwreset(struct lpc31_i2cdev_s *priv);
static void i2c_setfrequency(struct lpc31_i2cdev_s *priv,
uint32_t frequency);
@@ -424,7 +424,7 @@ out:
*
****************************************************************************/
static void i2c_timeout(int argc, wdparm_t arg, ...)
static void i2c_timeout(wdparm_t arg)
{
struct lpc31_i2cdev_s *priv = (struct lpc31_i2cdev_s *) arg;
@@ -515,7 +515,7 @@ static int i2c_transfer(FAR struct i2c_master_s *dev,
/* Start a watchdog to timeout the transfer if the bus is locked up... */
wd_start(&priv->timeout, I2C_TIMEOUT, i2c_timeout, 1, (wdparm_t)priv);
wd_start(&priv->timeout, I2C_TIMEOUT, i2c_timeout, (wdparm_t)priv);
/* Wait for the transfer to complete */
arch/arm/src/lpc43xx/lpc43_ethernet.c
+9 -11
View File
@@ -613,10 +613,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, wdparm_t arg, ...);
static void lpc43_txtimeout_expiry(wdparm_t arg);
static void lpc43_poll_work(FAR void *arg);
static void lpc43_poll_expiry(int argc, wdparm_t arg, ...);
static void lpc43_poll_expiry(wdparm_t arg);
/* NuttX callback functions */
@@ -1118,7 +1118,7 @@ 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, (wdparm_t)priv);
lpc43_txtimeout_expiry, (wdparm_t)priv);
return OK;
}
@@ -2109,8 +2109,7 @@ static void lpc43_txtimeout_work(FAR void *arg)
* The last TX never completed. Reset the hardware and start again.
*
* Input Parameters:
* argc - The number of available arguments
* arg - The first argument
* arg - The argument
*
* Returned Value:
* None
@@ -2120,7 +2119,7 @@ static void lpc43_txtimeout_work(FAR void *arg)
*
****************************************************************************/
static void lpc43_txtimeout_expiry(int argc, wdparm_t arg, ...)
static void lpc43_txtimeout_expiry(wdparm_t arg)
{
FAR struct lpc43_ethmac_s *priv = (FAR struct lpc43_ethmac_s *)arg;
@@ -2210,7 +2209,7 @@ static void lpc43_poll_work(FAR void *arg)
/* Setup the watchdog poll timer again */
wd_start(&priv->txpoll, LPC43_WDDELAY,
lpc43_poll_expiry, 1, (wdparm_t)priv);
lpc43_poll_expiry, (wdparm_t)priv);
net_unlock();
}
@@ -2221,8 +2220,7 @@ static void lpc43_poll_work(FAR void *arg)
* Periodic timer handler. Called from the timer interrupt handler.
*
* Input Parameters:
* argc - The number of available arguments
* arg - The first argument
* arg - The argument
*
* Returned Value:
* None
@@ -2232,7 +2230,7 @@ static void lpc43_poll_work(FAR void *arg)
*
****************************************************************************/
static void lpc43_poll_expiry(int argc, wdparm_t arg, ...)
static void lpc43_poll_expiry(wdparm_t arg)
{
FAR struct lpc43_ethmac_s *priv = (FAR struct lpc43_ethmac_s *)arg;
@@ -2287,7 +2285,7 @@ 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, (wdparm_t)priv);
lpc43_poll_expiry, (wdparm_t)priv);
/* Enable the Ethernet interrupt */
arch/arm/src/lpc43xx/lpc43_i2c.c
+3 -3
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, wdparm_t arg, ...);
static void lpc43_i2c_timeout(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,
@@ -203,7 +203,7 @@ static int lpc43_i2c_start(struct lpc43_i2cdev_s *priv)
putreg32(I2C_CONSET_STA, priv->base + LPC43_I2C_CONSET_OFFSET);
wd_start(&priv->timeout, I2C_TIMEOUT,
lpc43_i2c_timeout, 1, (wdparm_t)priv);
lpc43_i2c_timeout, (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, wdparm_t arg, ...)
static void lpc43_i2c_timeout(wdparm_t arg)
{
struct lpc43_i2cdev_s *priv = (struct lpc43_i2cdev_s *)arg;
arch/arm/src/lpc43xx/lpc43_sdmmc.c
+4 -5
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, wdparm_t arg, ...);
static void lpc43_eventtimeout(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,
@@ -827,8 +827,7 @@ static void lpc43_config_dmaints(struct lpc43_dev_s *priv, uint32_t xfrmask,
* any other waited-for event occurring.
*
* Input Parameters:
* argc - The number of arguments (should be 1)
* arg - The argument (state structure reference cast to uint32_t)
* arg - The argument
*
* Returned Value:
* None
@@ -838,7 +837,7 @@ static void lpc43_config_dmaints(struct lpc43_dev_s *priv, uint32_t xfrmask,
*
****************************************************************************/
static void lpc43_eventtimeout(int argc, wdparm_t arg, ...)
static void lpc43_eventtimeout(wdparm_t arg)
{
struct lpc43_dev_s *priv = (struct lpc43_dev_s *)arg;
@@ -2314,7 +2313,7 @@ static sdio_eventset_t lpc43_eventwait(FAR struct sdio_dev_s *dev,
delay = MSEC2TICK(timeout);
ret = wd_start(&priv->waitwdog, delay,
lpc43_eventtimeout, 1, (wdparm_t)priv);
lpc43_eventtimeout, (wdparm_t)priv);
if (ret < 0)
{
mcerr("ERROR: wd_start failed: %d\n", ret);
arch/arm/src/lpc54xx/lpc54_ethernet.c
+9 -11
View File
@@ -408,10 +408,10 @@ static void lpc54_eth_dotimer(struct lpc54_ethdriver_s *priv);
static void lpc54_eth_dopoll(struct lpc54_ethdriver_s *priv);
static void lpc54_eth_txtimeout_work(void *arg);
static void lpc54_eth_txtimeout_expiry(int argc, wdparm_t arg, ...);
static void lpc54_eth_txtimeout_expiry(wdparm_t arg);
static void lpc54_eth_poll_work(void *arg);
static void lpc54_eth_poll_expiry(int argc, wdparm_t arg, ...);
static void lpc54_eth_poll_expiry(wdparm_t arg);
/* NuttX callback functions */
@@ -687,7 +687,7 @@ static int lpc54_eth_transmit(struct lpc54_ethdriver_s *priv,
/* Setup the TX timeout watchdog (perhaps restarting the timer) */
wd_start(&priv->eth_txtimeout, LPC54_TXTIMEOUT,
lpc54_eth_txtimeout_expiry, 1, (wdparm_t)priv);
lpc54_eth_txtimeout_expiry, (wdparm_t)priv);
return OK;
}
@@ -1660,8 +1660,7 @@ static void lpc54_eth_txtimeout_work(void *arg)
* The last TX never completed. Reset the hardware and start again.
*
* Input Parameters:
* argc - The number of available arguments
* arg - The first argument
* arg - The argument
*
* Returned Value:
* None
@@ -1672,7 +1671,7 @@ static void lpc54_eth_txtimeout_work(void *arg)
*
****************************************************************************/
static void lpc54_eth_txtimeout_expiry(int argc, wdparm_t arg, ...)
static void lpc54_eth_txtimeout_expiry(wdparm_t arg)
{
struct lpc54_ethdriver_s *priv = (struct lpc54_ethdriver_s *)arg;
@@ -1859,7 +1858,7 @@ 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);
lpc54_eth_poll_expiry, (wdparm_t)priv);
net_unlock();
}
@@ -1870,8 +1869,7 @@ static void lpc54_eth_poll_work(void *arg)
* Periodic timer handler. Called from the timer interrupt handler.
*
* Input Parameters:
* argc - The number of available arguments
* arg - The first argument
* arg - The argument
*
* Returned Value:
* None
@@ -1882,7 +1880,7 @@ static void lpc54_eth_poll_work(void *arg)
*
****************************************************************************/
static void lpc54_eth_poll_expiry(int argc, wdparm_t arg, ...)
static void lpc54_eth_poll_expiry(wdparm_t arg)
{
struct lpc54_ethdriver_s *priv = (struct lpc54_ethdriver_s *)arg;
@@ -2170,7 +2168,7 @@ 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);
lpc54_eth_poll_expiry, (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, wdparm_t arg, ...);
static void lpc54_i2c_timeout(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, wdparm_t arg, ...)
static void lpc54_i2c_timeout(wdparm_t arg)
{
struct lpc54_i2cdev_s *priv = (struct lpc54_i2cdev_s *)arg;
@@ -768,7 +768,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, (wdparm_t)priv);
lpc54_i2c_timeout, (wdparm_t)priv);
/* Initiate the transfer */
arch/arm/src/lpc54xx/lpc54_sdmmc.c
+4 -5
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, wdparm_t arg, ...);
static void lpc54_eventtimeout(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,
@@ -827,8 +827,7 @@ static void lpc54_config_dmaints(struct lpc54_dev_s *priv, uint32_t xfrmask,
* any other waited-for event occurring.
*
* Input Parameters:
* argc - The number of arguments (should be 1)
* arg - The argument (state structure reference cast to uint32_t)
* arg - The argument
*
* Returned Value:
* None
@@ -838,7 +837,7 @@ static void lpc54_config_dmaints(struct lpc54_dev_s *priv, uint32_t xfrmask,
*
****************************************************************************/
static void lpc54_eventtimeout(int argc, wdparm_t arg, ...)
static void lpc54_eventtimeout(wdparm_t arg)
{
struct lpc54_dev_s *priv = (struct lpc54_dev_s *)arg;
@@ -2314,7 +2313,7 @@ static sdio_eventset_t lpc54_eventwait(FAR struct sdio_dev_s *dev,
delay = MSEC2TICK(timeout);
ret = wd_start(&priv->waitwdog, delay,
lpc54_eventtimeout, 1, (wdparm_t)priv);
lpc54_eventtimeout, (wdparm_t)priv);
if (ret < 0)
{
mcerr("ERROR: wd_start failed: %d\n", ret);
arch/arm/src/s32k1xx/s32k1xx_enet.c
+9 -11
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, wdparm_t arg, ...);
static void s32k1xx_txtimeout_expiry(wdparm_t arg);
static void s32k1xx_poll_work(FAR void *arg);
static void s32k1xx_polltimer_expiry(int argc, wdparm_t arg, ...);
static void s32k1xx_polltimer_expiry(wdparm_t arg);
/* NuttX callback functions */
@@ -573,7 +573,7 @@ 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);
s32k1xx_txtimeout_expiry, (wdparm_t)priv);
/* Start the TX transfer (if it was not already waiting for buffers) */
@@ -1181,8 +1181,7 @@ static void s32k1xx_txtimeout_work(FAR void *arg)
* The last TX never completed. Reset the hardware and start again.
*
* Input Parameters:
* argc - The number of available arguments
* arg - The first argument
* arg - The argument
*
* Returned Value:
* None
@@ -1192,7 +1191,7 @@ static void s32k1xx_txtimeout_work(FAR void *arg)
*
****************************************************************************/
static void s32k1xx_txtimeout_expiry(int argc, wdparm_t arg, ...)
static void s32k1xx_txtimeout_expiry(wdparm_t arg)
{
FAR struct s32k1xx_driver_s *priv = (FAR struct s32k1xx_driver_s *)arg;
@@ -1251,7 +1250,7 @@ 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);
s32k1xx_polltimer_expiry, (wdparm_t)priv);
net_unlock();
}
@@ -1262,8 +1261,7 @@ static void s32k1xx_poll_work(FAR void *arg)
* Periodic timer handler. Called from the timer interrupt handler.
*
* Input Parameters:
* argc - The number of available arguments
* arg - The first argument
* arg - The argument
*
* Returned Value:
* None
@@ -1273,7 +1271,7 @@ static void s32k1xx_poll_work(FAR void *arg)
*
****************************************************************************/
static void s32k1xx_polltimer_expiry(int argc, wdparm_t arg, ...)
static void s32k1xx_polltimer_expiry(wdparm_t arg)
{
FAR struct s32k1xx_driver_s *priv = (FAR struct s32k1xx_driver_s *)arg;
@@ -1383,7 +1381,7 @@ 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);
s32k1xx_polltimer_expiry, (wdparm_t)priv);
/* Clear all pending ENET interrupt */
arch/arm/src/s32k1xx/s32k1xx_flexcan.c
+4 -5
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, wdparm_t arg, ...);
static void s32k1xx_txtimeout_expiry(wdparm_t arg);
#endif
/* NuttX callback functions */
@@ -753,7 +753,7 @@ 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);
s32k1xx_txtimeout_expiry, (wdparm_t)priv);
}
#endif
@@ -1132,8 +1132,7 @@ static void s32k1xx_txtimeout_work(FAR void *arg)
* The last TX never completed. Reset the hardware and start again.
*
* Input Parameters:
* argc - The number of available arguments
* arg - The first argument
* arg - The argument
*
* Returned Value:
* None
@@ -1143,7 +1142,7 @@ static void s32k1xx_txtimeout_work(FAR void *arg)
*
****************************************************************************/
static void s32k1xx_txtimeout_expiry(int argc, wdparm_t arg, ...)
static void s32k1xx_txtimeout_expiry(wdparm_t arg)
{
FAR struct s32k1xx_driver_s *priv = (FAR struct s32k1xx_driver_s *)arg;
arch/arm/src/sam34/sam_emac.c
+9 -11
View File
@@ -393,10 +393,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, wdparm_t arg, ...);
static void sam_txtimeout_expiry(wdparm_t arg);
static void sam_poll_work(FAR void *arg);
static void sam_poll_expiry(int argc, wdparm_t arg, ...);
static void sam_poll_expiry(wdparm_t arg);
/* NuttX callback functions */
@@ -815,7 +815,7 @@ 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, (wdparm_t)priv);
sam_txtimeout_expiry, (wdparm_t)priv);
/* Set d_len to zero meaning that the d_buf[] packet buffer is again
* available.
@@ -1729,8 +1729,7 @@ static void sam_txtimeout_work(FAR void *arg)
* The last TX never completed. Reset the hardware and start again.
*
* Input Parameters:
* argc - The number of available arguments
* arg - The first argument
* arg - The argument
*
* Returned Value:
* None
@@ -1740,7 +1739,7 @@ static void sam_txtimeout_work(FAR void *arg)
*
****************************************************************************/
static void sam_txtimeout_expiry(int argc, wdparm_t arg, ...)
static void sam_txtimeout_expiry(wdparm_t arg)
{
FAR struct sam_emac_s *priv = (FAR struct sam_emac_s *)arg;
@@ -1792,7 +1791,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, (wdparm_t)priv);
wd_start(&priv->txpoll, SAM_WDDELAY, sam_poll_expiry, (wdparm_t)priv);
net_unlock();
}
@@ -1803,8 +1802,7 @@ static void sam_poll_work(FAR void *arg)
* Periodic timer handler. Called from the timer interrupt handler.
*
* Input Parameters:
* argc - The number of available arguments
* arg - The first argument
* arg - The argument
*
* Returned Value:
* None
@@ -1814,7 +1812,7 @@ static void sam_poll_work(FAR void *arg)
*
****************************************************************************/
static void sam_poll_expiry(int argc, wdparm_t arg, ...)
static void sam_poll_expiry(wdparm_t arg)
{
FAR struct sam_emac_s *priv = (FAR struct sam_emac_s *)arg;
@@ -1891,7 +1889,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, (wdparm_t)priv);
wd_start(&priv->txpoll, SAM_WDDELAY, sam_poll_expiry, (wdparm_t)priv);
/* Enable the EMAC interrupt */
arch/arm/src/sam34/sam_hsmci.c
+5 -6
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, wdparm_t arg, ...);
static void sam_eventtimeout(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);
@@ -1077,8 +1077,7 @@ static void sam_dmacallback(DMA_HANDLE handle, void *arg, int result)
* any other waited-for event occurring.
*
* Input Parameters:
* argc - The number of arguments (should be 1)
* arg - The argument (state structure reference cast to uint32_t)
* arg - The argument
*
* Returned Value:
* None
@@ -1088,11 +1087,11 @@ static void sam_dmacallback(DMA_HANDLE handle, void *arg, int result)
*
****************************************************************************/
static void sam_eventtimeout(int argc, wdparm_t arg, ...)
static void sam_eventtimeout(wdparm_t arg)
{
struct sam_dev_s *priv = (struct sam_dev_s *)arg;
DEBUGASSERT(argc == 1 && priv != NULL);
DEBUGASSERT(priv != NULL);
DEBUGASSERT((priv->waitevents & SDIOWAIT_TIMEOUT) != 0);
/* Is a data transfer complete event expected? */
@@ -2329,7 +2328,7 @@ static sdio_eventset_t sam_eventwait(FAR struct sdio_dev_s *dev,
delay = MSEC2TICK(timeout);
ret = wd_start(&priv->waitwdog, delay,
sam_eventtimeout, 1, (wdparm_t)priv);
sam_eventtimeout, (wdparm_t)priv);
if (ret < 0)
{
mcerr("ERROR: wd_start failed: %d\n", ret);
arch/arm/src/sam34/sam_spi.c
+3 -4
View File
@@ -724,8 +724,7 @@ static void spi_dma_sampledone(struct sam_spics_s *spics)
* DMA.
*
* Input Parameters:
* argc - The number of arguments (should be 1)
* arg - The argument (state structure reference cast to uint32_t)
* arg - The argument
*
* Returned Value:
* None
@@ -736,7 +735,7 @@ static void spi_dma_sampledone(struct sam_spics_s *spics)
****************************************************************************/
#ifdef CONFIG_SAM34_SPI_DMA
static void spi_dmatimeout(int argc, wdparm_t arg, ...)
static void spi_dmatimeout(wdparm_t arg)
{
struct sam_spics_s *spics = (struct sam_spics_s *)arg;
DEBUGASSERT(spics != NULL);
@@ -1590,7 +1589,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, (wdparm_t)spics);
spi_dmatimeout, (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, wdparm_t arg, ...);
static void twi_timeout(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, (wdparm_t)priv);
wd_start(&priv->timeout, TWI_TIMEOUT, twi_timeout, (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, wdparm_t arg, ...)
static void twi_timeout(wdparm_t arg)
{
struct twi_dev_s *priv = (struct twi_dev_s *)arg;
arch/arm/src/sama5/sam_emaca.c
+9 -11
View File
@@ -397,10 +397,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, wdparm_t arg, ...);
static void sam_txtimeout_expiry(wdparm_t arg);
static void sam_poll_work(FAR void *arg);
static void sam_poll_expiry(int argc, wdparm_t arg, ...);
static void sam_poll_expiry(wdparm_t arg);
/* NuttX callback functions */
@@ -823,7 +823,7 @@ 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, (wdparm_t)priv);
sam_txtimeout_expiry, (wdparm_t)priv);
/* Set d_len to zero meaning that the d_buf[] packet buffer is again
* available.
@@ -1763,8 +1763,7 @@ static void sam_txtimeout_work(FAR void *arg)
* The last TX never completed. Reset the hardware and start again.
*
* Input Parameters:
* argc - The number of available arguments
* arg - The first argument
* arg - The argument
*
* Returned Value:
* None
@@ -1774,7 +1773,7 @@ static void sam_txtimeout_work(FAR void *arg)
*
****************************************************************************/
static void sam_txtimeout_expiry(int argc, wdparm_t arg, ...)
static void sam_txtimeout_expiry(wdparm_t arg)
{
FAR struct sam_emac_s *priv = (FAR struct sam_emac_s *)arg;
@@ -1826,7 +1825,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, (wdparm_t)priv);
wd_start(&priv->txpoll, SAM_WDDELAY, sam_poll_expiry, (wdparm_t)priv);
net_unlock();
}
@@ -1837,8 +1836,7 @@ static void sam_poll_work(FAR void *arg)
* Periodic timer handler. Called from the timer interrupt handler.
*
* Input Parameters:
* argc - The number of available arguments
* arg - The first argument
* arg - The argument
*
* Returned Value:
* None
@@ -1848,7 +1846,7 @@ static void sam_poll_work(FAR void *arg)
*
****************************************************************************/
static void sam_poll_expiry(int argc, wdparm_t arg, ...)
static void sam_poll_expiry(wdparm_t arg)
{
FAR struct sam_emac_s *priv = (FAR struct sam_emac_s *)arg;
@@ -1925,7 +1923,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, (wdparm_t)priv);
wd_start(&priv->txpoll, SAM_WDDELAY, sam_poll_expiry, (wdparm_t)priv);
/* Enable the EMAC interrupt */
arch/arm/src/sama5/sam_emacb.c
+9 -11
View File
@@ -491,10 +491,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, wdparm_t arg, ...);
static void sam_txtimeout_expiry(wdparm_t arg);
static void sam_poll_work(FAR void *arg);
static void sam_poll_expiry(int argc, wdparm_t arg, ...);
static void sam_poll_expiry(wdparm_t arg);
/* NuttX callback functions */
@@ -1164,7 +1164,7 @@ 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, (wdparm_t)priv);
sam_txtimeout_expiry, (wdparm_t)priv);
/* Set d_len to zero meaning that the d_buf[] packet buffer is again
* available.
@@ -2128,8 +2128,7 @@ static void sam_txtimeout_work(FAR void *arg)
* The last TX never completed. Reset the hardware and start again.
*
* Input Parameters:
* argc - The number of available arguments
* arg - The first argument
* arg - The argument
*
* Returned Value:
* None
@@ -2139,7 +2138,7 @@ static void sam_txtimeout_work(FAR void *arg)
*
****************************************************************************/
static void sam_txtimeout_expiry(int argc, wdparm_t arg, ...)
static void sam_txtimeout_expiry(wdparm_t arg)
{
FAR struct sam_emac_s *priv = (FAR struct sam_emac_s *)arg;
@@ -2191,7 +2190,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, (wdparm_t)priv);
wd_start(&priv->txpoll, SAM_WDDELAY, sam_poll_expiry, (wdparm_t)priv);
net_unlock();
}
@@ -2202,8 +2201,7 @@ static void sam_poll_work(FAR void *arg)
* Periodic timer handler. Called from the timer interrupt handler.
*
* Input Parameters:
* argc - The number of available arguments
* arg - The first argument
* arg - The argument
*
* Returned Value:
* None
@@ -2213,7 +2211,7 @@ static void sam_poll_work(FAR void *arg)
*
****************************************************************************/
static void sam_poll_expiry(int argc, wdparm_t arg, ...)
static void sam_poll_expiry(wdparm_t arg)
{
FAR struct sam_emac_s *priv = (FAR struct sam_emac_s *)arg;
@@ -2298,7 +2296,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, (wdparm_t)priv);
wd_start(&priv->txpoll, SAM_WDDELAY, sam_poll_expiry, (wdparm_t)priv);
/* Enable the EMAC interrupt */
arch/arm/src/sama5/sam_gmac.c
+9 -11
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, wdparm_t arg, ...);
static void sam_txtimeout_expiry(wdparm_t arg);
static void sam_poll_work(FAR void *arg);
static void sam_poll_expiry(int argc, wdparm_t arg, ...);
static void sam_poll_expiry(wdparm_t arg);
/* NuttX callback functions */
@@ -765,7 +765,7 @@ 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, (wdparm_t)priv);
sam_txtimeout_expiry, (wdparm_t)priv);
/* Set d_len to zero meaning that the d_buf[] packet buffer is again
* available.
@@ -1747,8 +1747,7 @@ static void sam_txtimeout_work(FAR void *arg)
* The last TX never completed. Reset the hardware and start again.
*
* Input Parameters:
* argc - The number of available arguments
* arg - The first argument
* arg - The argument
*
* Returned Value:
* None
@@ -1758,7 +1757,7 @@ static void sam_txtimeout_work(FAR void *arg)
*
****************************************************************************/
static void sam_txtimeout_expiry(int argc, wdparm_t arg, ...)
static void sam_txtimeout_expiry(wdparm_t arg)
{
FAR struct sam_gmac_s *priv = (FAR struct sam_gmac_s *)arg;
@@ -1810,7 +1809,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, (wdparm_t)priv);
wd_start(&priv->txpoll, SAM_WDDELAY, sam_poll_expiry, (wdparm_t)priv);
net_unlock();
}
@@ -1821,8 +1820,7 @@ static void sam_poll_work(FAR void *arg)
* Periodic timer handler. Called from the timer interrupt handler.
*
* Input Parameters:
* argc - The number of available arguments
* arg - The first argument
* arg - The argument
*
* Returned Value:
* None
@@ -1832,7 +1830,7 @@ static void sam_poll_work(FAR void *arg)
*
****************************************************************************/
static void sam_poll_expiry(int argc, wdparm_t arg, ...)
static void sam_poll_expiry(wdparm_t arg)
{
FAR struct sam_gmac_s *priv = (FAR struct sam_gmac_s *)arg;
@@ -1912,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, (wdparm_t)priv);
wd_start(&priv->txpoll, SAM_WDDELAY, sam_poll_expiry, (wdparm_t)priv);
/* Enable the GMAC interrupt */
arch/arm/src/sama5/sam_hsmci.c
+5 -6
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, wdparm_t arg, ...);
static void sam_eventtimeout(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);
@@ -1299,8 +1299,7 @@ static inline uintptr_t hsmci_physregaddr(struct sam_dev_s *priv,
* any other waited-for event occurring.
*
* Input Parameters:
* argc - The number of arguments (should be 1)
* arg - The argument (state structure reference cast to uint32_t)
* arg - The argument
*
* Returned Value:
* None
@@ -1310,11 +1309,11 @@ static inline uintptr_t hsmci_physregaddr(struct sam_dev_s *priv,
*
****************************************************************************/
static void sam_eventtimeout(int argc, wdparm_t arg, ...)
static void sam_eventtimeout(wdparm_t arg)
{
struct sam_dev_s *priv = (struct sam_dev_s *)arg;
DEBUGASSERT(argc == 1 && priv != NULL);
DEBUGASSERT(priv != NULL);
sam_xfrsample((struct sam_dev_s *)arg, SAMPLENDX_TIMEOUT);
/* Make sure that any hung DMA is stopped. dmabusy == false is the cue
@@ -2756,7 +2755,7 @@ static sdio_eventset_t sam_eventwait(FAR struct sdio_dev_s *dev,
delay = MSEC2TICK(timeout);
ret = wd_start(&priv->waitwdog, delay,
sam_eventtimeout, 1, (wdparm_t)priv);
sam_eventtimeout, (wdparm_t)priv);
if (ret < 0)
{
lcderr("ERROR: wd_start failed: %d\n", ret);
arch/arm/src/sama5/sam_sdmmc.c
+5 -6
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, wdparm_t arg, ...);
static void sam_eventtimeout(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,
@@ -1160,8 +1160,7 @@ static void sam_receive(struct sam_dev_s *priv)
* any other waited-for event occurring.
*
* Input Parameters:
* argc - The number of arguments (should be 1)
* arg - The argument (state structure reference cast to uint32_t)
* arg - The argument
*
* Returned Value:
* None
@@ -1171,11 +1170,11 @@ static void sam_receive(struct sam_dev_s *priv)
*
****************************************************************************/
static void sam_eventtimeout(int argc, wdparm_t arg, ...)
static void sam_eventtimeout(wdparm_t arg)
{
struct sam_dev_s *priv = (struct sam_dev_s *)arg;
DEBUGASSERT(argc == 1 && priv != NULL);
DEBUGASSERT(priv != NULL);
DEBUGASSERT((priv->waitevents & SDIOWAIT_TIMEOUT) != 0);
/* Is a data transfer complete event expected? */
@@ -2913,7 +2912,7 @@ static sdio_eventset_t sam_eventwait(FAR struct sdio_dev_s *dev,
delay = MSEC2TICK(timeout);
ret = wd_start(&priv->waitwdog, delay,
sam_eventtimeout, 1, (wdparm_t)priv);
sam_eventtimeout, (wdparm_t)priv);
if (ret < 0)
{
arch/arm/src/sama5/sam_spi.c
+3 -4
View File
@@ -712,8 +712,7 @@ static void spi_dma_sampledone(struct sam_spics_s *spics)
* DMA.
*
* Input Parameters:
* argc - The number of arguments (should be 1)
* arg - The argument (state structure reference cast to uint32_t)
* arg - The argument
*
* Returned Value:
* None
@@ -724,7 +723,7 @@ static void spi_dma_sampledone(struct sam_spics_s *spics)
****************************************************************************/
#ifdef CONFIG_SAMA5_SPI_DMA
static void spi_dmatimeout(int argc, wdparm_t arg, ...)
static void spi_dmatimeout(wdparm_t arg)
{
struct sam_spics_s *spics = (struct sam_spics_s *)arg;
DEBUGASSERT(spics != NULL);
@@ -1518,7 +1517,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, (wdparm_t)spics);
spi_dmatimeout, (wdparm_t)spics);
if (ret < 0)
{
spierr("ERROR: wd_start failed: %d\n", ret);
arch/arm/src/sama5/sam_ssc.c
+8 -10
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, wdparm_t arg, ...);
static void ssc_rxdma_timeout(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, wdparm_t arg, ...);
static void ssc_txdma_timeout(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);
@@ -1183,8 +1183,7 @@ static void ssc_txdma_sampledone(struct sam_ssc_s *priv, int result)
* The RX watchdog timeout without completion of the RX DMA.
*
* Input Parameters:
* argc - The number of arguments (should be 1)
* arg - The argument (state structure reference cast to uint32_t)
* arg - The argument
*
* Returned Value:
* None
@@ -1195,7 +1194,7 @@ static void ssc_txdma_sampledone(struct sam_ssc_s *priv, int result)
****************************************************************************/
#ifdef SSC_HAVE_RX
static void ssc_rxdma_timeout(int argc, wdparm_t arg, ...)
static void ssc_rxdma_timeout(wdparm_t arg)
{
struct sam_ssc_s *priv = (struct sam_ssc_s *)arg;
DEBUGASSERT(priv != NULL);
@@ -1345,7 +1344,7 @@ static int ssc_rxdma_setup(struct sam_ssc_s *priv)
if (!notimeout)
{
ret = wd_start(&priv->rx.dog, timeout,
ssc_rxdma_timeout, 1, (wdparm_t)priv);
ssc_rxdma_timeout, (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
@@ -1599,8 +1598,7 @@ static void ssc_rxdma_callback(DMA_HANDLE handle, void *arg, int result)
* The RX watchdog timeout without completion of the RX DMA.
*
* Input Parameters:
* argc - The number of arguments (should be 1)
* arg - The argument (state structure reference cast to uint32_t)
* arg - The argument
*
* Returned Value:
* None
@@ -1611,7 +1609,7 @@ static void ssc_rxdma_callback(DMA_HANDLE handle, void *arg, int result)
****************************************************************************/
#ifdef SSC_HAVE_TX
static void ssc_txdma_timeout(int argc, wdparm_t arg, ...)
static void ssc_txdma_timeout(wdparm_t arg)
{
struct sam_ssc_s *priv = (struct sam_ssc_s *)arg;
DEBUGASSERT(priv != NULL);
@@ -1762,7 +1760,7 @@ static int ssc_txdma_setup(struct sam_ssc_s *priv)
if (!notimeout)
{
ret = wd_start(&priv->tx.dog, timeout,
ssc_txdma_timeout, 1, (wdparm_t)priv);
ssc_txdma_timeout, (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
+5 -5
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, wdparm_t arg1, ...);
static void sam_tsd_expiry(wdparm_t arg);
/* Character driver methods */
@@ -587,7 +587,7 @@ static void sam_tsd_bottomhalf(void *arg)
*/
wd_start(&priv->wdog, TSD_WDOG_DELAY,
sam_tsd_expiry, 1, (wdparm_t)priv);
sam_tsd_expiry, (wdparm_t)priv);
ier = 0;
goto ignored;
}
@@ -666,7 +666,7 @@ 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, (wdparm_t)priv);
sam_tsd_expiry, (wdparm_t)priv);
/* Check the thresholds. Bail if (1) this is not the first
* measurement and (2) there is no significant difference from
@@ -806,9 +806,9 @@ static int sam_tsd_schedule(struct sam_tsd_s *priv)
*
****************************************************************************/
static void sam_tsd_expiry(int argc, wdparm_t arg1, ...)
static void sam_tsd_expiry(wdparm_t arg)
{
struct sam_tsd_s *priv = (struct sam_tsd_s *)((uintptr_t)arg1);
struct sam_tsd_s *priv = (struct sam_tsd_s *)arg;
/* Schedule touchscreen work */
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, wdparm_t arg, ...);
static void twi_timeout(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, (wdparm_t)priv);
wd_start(&priv->timeout, timeout, twi_timeout, (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, wdparm_t arg, ...)
static void twi_timeout(wdparm_t arg)
{
struct twi_dev_s *priv = (struct twi_dev_s *)arg;
arch/arm/src/samd5e5/sam_gmac.c
+9 -11
View File
@@ -320,10 +320,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, wdparm_t arg, ...);
static void sam_txtimeout_expiry(wdparm_t arg);
static void sam_poll_work(FAR void *arg);
static void sam_poll_expiry(int argc, wdparm_t arg, ...);
static void sam_poll_expiry(wdparm_t arg);
/* NuttX callback functions */
@@ -754,7 +754,7 @@ 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, (wdparm_t)priv);
sam_txtimeout_expiry, (wdparm_t)priv);
/* Set d_len to zero meaning that the d_buf[] packet buffer is again
* available.
@@ -1715,8 +1715,7 @@ static void sam_txtimeout_work(FAR void *arg)
* The last TX never completed. Reset the hardware and start again.
*
* Input Parameters:
* argc - The number of available arguments
* arg - The first argument
* arg - The argument
*
* Returned Value:
* None
@@ -1726,7 +1725,7 @@ static void sam_txtimeout_work(FAR void *arg)
*
****************************************************************************/
static void sam_txtimeout_expiry(int argc, wdparm_t arg, ...)
static void sam_txtimeout_expiry(wdparm_t arg)
{
FAR struct sam_gmac_s *priv = (FAR struct sam_gmac_s *)arg;
@@ -1778,7 +1777,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, (wdparm_t)priv);
wd_start(&priv->txpoll, SAM_WDDELAY, sam_poll_expiry, (wdparm_t)priv);
net_unlock();
}
@@ -1789,8 +1788,7 @@ static void sam_poll_work(FAR void *arg)
* Periodic timer handler. Called from the timer interrupt handler.
*
* Input Parameters:
* argc - The number of available arguments
* arg - The first argument
* arg - The argument
*
* Returned Value:
* None
@@ -1800,7 +1798,7 @@ static void sam_poll_work(FAR void *arg)
*
****************************************************************************/
static void sam_poll_expiry(int argc, wdparm_t arg, ...)
static void sam_poll_expiry(wdparm_t arg)
{
FAR struct sam_gmac_s *priv = (FAR struct sam_gmac_s *)arg;
@@ -1880,7 +1878,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, (wdparm_t)priv);
wd_start(&priv->txpoll, SAM_WDDELAY, sam_poll_expiry, (wdparm_t)priv);
/* Enable the GMAC interrupt */
arch/arm/src/samv7/sam_emac.c
+9 -11
View File
@@ -604,10 +604,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, wdparm_t arg, ...);
static void sam_txtimeout_expiry(wdparm_t arg);
static void sam_poll_work(FAR void *arg);
static void sam_poll_expiry(int argc, wdparm_t arg, ...);
static void sam_poll_expiry(wdparm_t arg);
/* NuttX callback functions */
@@ -1469,7 +1469,7 @@ 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, (wdparm_t)priv);
sam_txtimeout_expiry, (wdparm_t)priv);
/* Set d_len to zero meaning that the d_buf[] packet buffer is again
* available.
@@ -2590,8 +2590,7 @@ static void sam_txtimeout_work(FAR void *arg)
* The last TX never completed. Reset the hardware and start again.
*
* Input Parameters:
* argc - The number of available arguments
* arg - The first argument
* arg - The argument
*
* Returned Value:
* None
@@ -2601,7 +2600,7 @@ static void sam_txtimeout_work(FAR void *arg)
*
****************************************************************************/
static void sam_txtimeout_expiry(int argc, wdparm_t arg, ...)
static void sam_txtimeout_expiry(wdparm_t arg)
{
FAR struct sam_emac_s *priv = (FAR struct sam_emac_s *)arg;
@@ -2653,7 +2652,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, (wdparm_t)priv);
wd_start(&priv->txpoll, SAM_WDDELAY, sam_poll_expiry, (wdparm_t)priv);
net_unlock();
}
@@ -2664,8 +2663,7 @@ static void sam_poll_work(FAR void *arg)
* Periodic timer handler. Called from the timer interrupt handler.
*
* Input Parameters:
* argc - The number of available arguments
* arg - The first argument
* arg - The argument
*
* Returned Value:
* None
@@ -2675,7 +2673,7 @@ static void sam_poll_work(FAR void *arg)
*
****************************************************************************/
static void sam_poll_expiry(int argc, wdparm_t arg, ...)
static void sam_poll_expiry(wdparm_t arg)
{
FAR struct sam_emac_s *priv = (FAR struct sam_emac_s *)arg;
@@ -2771,7 +2769,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, (wdparm_t)priv);
wd_start(&priv->txpoll, SAM_WDDELAY, sam_poll_expiry, (wdparm_t)priv);
/* Enable the EMAC interrupt */
arch/arm/src/samv7/sam_hsmci.c
+6 -7
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, wdparm_t arg, ...);
static void sam_eventtimeout(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);
@@ -1235,8 +1235,7 @@ static inline uintptr_t hsmci_regaddr(struct sam_dev_s *priv,
* any other waited-for event occurring.
*
* Input Parameters:
* argc - The number of arguments (should be 1)
* arg - The argument (state structure reference cast to uint32_t)
* arg - The argument
*
* Returned Value:
* None
@@ -1246,12 +1245,12 @@ static inline uintptr_t hsmci_regaddr(struct sam_dev_s *priv,
*
****************************************************************************/
static void sam_eventtimeout(int argc, wdparm_t arg, ...)
static void sam_eventtimeout(wdparm_t arg)
{
struct sam_dev_s *priv = (struct sam_dev_s *)arg;
DEBUGASSERT(argc == 1 && priv != NULL);
sam_xfrsample((struct sam_dev_s *)arg, SAMPLENDX_TIMEOUT);
DEBUGASSERT(priv != NULL);
sam_xfrsample(priv, SAMPLENDX_TIMEOUT);
/* Make sure that any hung DMA is stopped. dmabusy == false is the cue
* so the DMA callback is ignored.
@@ -2804,7 +2803,7 @@ static sdio_eventset_t sam_eventwait(FAR struct sdio_dev_s *dev,
delay = MSEC2TICK(timeout);
ret = wd_start(&priv->waitwdog, delay,
sam_eventtimeout, 1, (wdparm_t)priv);
sam_eventtimeout, (wdparm_t)priv);
if (ret < 0)
{
mcerr("ERROR: wd_start failed: %d\n", ret);
arch/arm/src/samv7/sam_qspi.c
+3 -4
View File
@@ -578,8 +578,7 @@ static void qspi_dma_sampledone(struct sam_qspidev_s *priv)
* DMA.
*
* Input Parameters:
* argc - The number of arguments (should be 1)
* arg - The argument (state structure reference cast to uint32_t)
* arg - The argument
*
* Returned Value:
* None
@@ -590,7 +589,7 @@ static void qspi_dma_sampledone(struct sam_qspidev_s *priv)
****************************************************************************/
#ifdef CONFIG_SAMV7_QSPI_DMA
static void qspi_dma_timeout(int argc, wdparm_t arg, ...)
static void qspi_dma_timeout(wdparm_t arg)
{
struct sam_qspidev_s *priv = (struct sam_qspidev_s *)arg;
DEBUGASSERT(priv != NULL);
@@ -891,7 +890,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, (wdparm_t)priv);
qspi_dma_timeout, (wdparm_t)priv);
if (ret < 0)
{
spierr("ERROR: wd_start failed: %d\n", ret);
arch/arm/src/samv7/sam_spi.c
+3 -4
View File
@@ -753,8 +753,7 @@ static void spi_dma_sampledone(struct sam_spics_s *spics)
* DMA.
*
* Input Parameters:
* argc - The number of arguments (should be 1)
* arg - The argument (state structure reference cast to uint32_t)
* arg - The argument
*
* Returned Value:
* None
@@ -765,7 +764,7 @@ static void spi_dma_sampledone(struct sam_spics_s *spics)
****************************************************************************/
#ifdef CONFIG_SAMV7_SPI_DMA
static void spi_dmatimeout(int argc, wdparm_t arg, ...)
static void spi_dmatimeout(wdparm_t arg)
{
struct sam_spics_s *spics = (struct sam_spics_s *)arg;
DEBUGASSERT(spics != NULL);
@@ -1865,7 +1864,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, (wdparm_t)spics);
spi_dmatimeout, (wdparm_t)spics);
if (ret < 0)
{
spierr("ERROR: wd_start failed: %d\n", ret);
arch/arm/src/samv7/sam_ssc.c
+8 -10
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, wdparm_t arg, ...);
static void ssc_rxdma_timeout(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, wdparm_t arg, ...);
static void ssc_txdma_timeout(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);
@@ -1158,8 +1158,7 @@ static void ssc_txdma_sampledone(struct sam_ssc_s *priv, int result)
* The RX watchdog timeout without completion of the RX DMA.
*
* Input Parameters:
* argc - The number of arguments (should be 1)
* arg - The argument (state structure reference cast to uint32_t)
* arg - The argument
*
* Returned Value:
* None
@@ -1170,7 +1169,7 @@ static void ssc_txdma_sampledone(struct sam_ssc_s *priv, int result)
****************************************************************************/
#ifdef SSC_HAVE_RX
static void ssc_rxdma_timeout(int argc, wdparm_t arg, ...)
static void ssc_rxdma_timeout(wdparm_t arg)
{
struct sam_ssc_s *priv = (struct sam_ssc_s *)arg;
DEBUGASSERT(priv != NULL);
@@ -1322,7 +1321,7 @@ static int ssc_rxdma_setup(struct sam_ssc_s *priv)
if (!notimeout)
{
ret = wd_start(&priv->rx.dog, timeout,
ssc_rxdma_timeout, 1, (wdparm_t)priv);
ssc_rxdma_timeout, (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
@@ -1576,8 +1575,7 @@ static void ssc_rxdma_callback(DMA_HANDLE handle, void *arg, int result)
* The RX watchdog timeout without completion of the RX DMA.
*
* Input Parameters:
* argc - The number of arguments (should be 1)
* arg - The argument (state structure reference cast to uint32_t)
* arg - The argument
*
* Returned Value:
* None
@@ -1588,7 +1586,7 @@ static void ssc_rxdma_callback(DMA_HANDLE handle, void *arg, int result)
****************************************************************************/
#ifdef SSC_HAVE_TX
static void ssc_txdma_timeout(int argc, wdparm_t arg, ...)
static void ssc_txdma_timeout(wdparm_t arg)
{
struct sam_ssc_s *priv = (struct sam_ssc_s *)arg;
DEBUGASSERT(priv != NULL);
@@ -1743,7 +1741,7 @@ static int ssc_txdma_setup(struct sam_ssc_s *priv)
if (!notimeout)
{
ret = wd_start(&priv->tx.dog, timeout,
ssc_txdma_timeout, 1, (wdparm_t)priv);
ssc_txdma_timeout, (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
+3 -3
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, wdparm_t arg, ...);
static void twi_timeout(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);
@@ -485,7 +485,7 @@ static int twi_wait(struct twi_dev_s *priv, unsigned int size)
*/
wd_start(&priv->timeout, (timeout * size),
twi_timeout, 1, (wdparm_t)priv);
twi_timeout, (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, wdparm_t arg, ...)
static void twi_timeout(wdparm_t arg)
{
struct twi_dev_s *priv = (struct twi_dev_s *)arg;
arch/arm/src/stm32/stm32_eth.c
+9 -11
View File
@@ -719,10 +719,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, wdparm_t arg, ...);
static void stm32_txtimeout_expiry(wdparm_t arg);
static void stm32_poll_work(FAR void *arg);
static void stm32_poll_expiry(int argc, wdparm_t arg, ...);
static void stm32_poll_expiry(wdparm_t arg);
/* NuttX callback functions */
@@ -1229,7 +1229,7 @@ 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, (wdparm_t)priv);
stm32_txtimeout_expiry, (wdparm_t)priv);
return OK;
}
@@ -2217,8 +2217,7 @@ static void stm32_txtimeout_work(FAR void *arg)
* The last TX never completed. Reset the hardware and start again.
*
* Input Parameters:
* argc - The number of available arguments
* arg - The first argument
* arg - The argument
*
* Returned Value:
* None
@@ -2228,7 +2227,7 @@ static void stm32_txtimeout_work(FAR void *arg)
*
****************************************************************************/
static void stm32_txtimeout_expiry(int argc, wdparm_t arg, ...)
static void stm32_txtimeout_expiry(wdparm_t arg)
{
FAR struct stm32_ethmac_s *priv = (FAR struct stm32_ethmac_s *)arg;
@@ -2318,7 +2317,7 @@ static void stm32_poll_work(FAR void *arg)
/* Setup the watchdog poll timer again */
wd_start(&priv->txpoll, STM32_WDDELAY,
stm32_poll_expiry, 1, (wdparm_t)priv);
stm32_poll_expiry, (wdparm_t)priv);
net_unlock();
}
@@ -2329,8 +2328,7 @@ static void stm32_poll_work(FAR void *arg)
* Periodic timer handler. Called from the timer interrupt handler.
*
* Input Parameters:
* argc - The number of available arguments
* arg - The first argument
* arg - The argument
*
* Returned Value:
* None
@@ -2340,7 +2338,7 @@ static void stm32_poll_work(FAR void *arg)
*
****************************************************************************/
static void stm32_poll_expiry(int argc, wdparm_t arg, ...)
static void stm32_poll_expiry(wdparm_t arg)
{
FAR struct stm32_ethmac_s *priv = (FAR struct stm32_ethmac_s *)arg;
@@ -2396,7 +2394,7 @@ 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, (wdparm_t)priv);
stm32_poll_expiry, (wdparm_t)priv);
/* Enable the Ethernet interrupt */
arch/arm/src/stm32/stm32_i2s.c
+8 -10
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, wdparm_t arg, ...);
static void i2s_rxdma_timeout(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, wdparm_t arg, ...);
static void i2s_txdma_timeout(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);
@@ -945,8 +945,7 @@ static void i2s_txdma_sampledone(struct stm32_i2s_s *priv, int result)
* The RX watchdog timeout without completion of the RX DMA.
*
* Input Parameters:
* argc - The number of arguments (should be 1)
* arg - The argument (state structure reference cast to uint32_t)
* arg - The argument
*
* Returned Value:
* None
@@ -957,7 +956,7 @@ static void i2s_txdma_sampledone(struct stm32_i2s_s *priv, int result)
****************************************************************************/
#ifdef I2S_HAVE_RX
static void i2s_rxdma_timeout(int argc, wdparm_t arg, ...)
static void i2s_rxdma_timeout(wdparm_t arg)
{
struct stm32_i2s_s *priv = (struct stm32_i2s_s *)arg;
DEBUGASSERT(priv != NULL);
@@ -1096,7 +1095,7 @@ static int i2s_rxdma_setup(struct stm32_i2s_s *priv)
if (!notimeout)
{
ret = wd_start(&priv->rx.dog, timeout,
i2s_rxdma_timeout, 1, (wdparm_t)priv);
i2s_rxdma_timeout, (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
@@ -1345,8 +1344,7 @@ static void i2s_rxdma_callback(DMA_HANDLE handle, uint8_t result, void *arg)
* The RX watchdog timeout without completion of the RX DMA.
*
* Input Parameters:
* argc - The number of arguments (should be 1)
* arg - The argument (state structure reference cast to uint32_t)
* arg - The argument
*
* Returned Value:
* None
@@ -1357,7 +1355,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, wdparm_t arg, ...)
static void i2s_txdma_timeout(wdparm_t arg)
{
struct stm32_i2s_s *priv = (struct stm32_i2s_s *)arg;
DEBUGASSERT(priv != NULL);
@@ -1496,7 +1494,7 @@ static int i2s_txdma_setup(struct stm32_i2s_s *priv)
if (!notimeout)
{
ret = wd_start(&priv->tx.dog, timeout,
i2s_txdma_timeout, 1, (wdparm_t)priv);
i2s_txdma_timeout, (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

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