You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by gn...@apache.org on 2020/04/07 12:23:27 UTC
[incubator-nuttx] 03/05: Remove type casting to wdentry_t (boards/)
This is an automated email from the ASF dual-hosted git repository.
gnutt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 2ca9681b00d509b0f95884504f8504297863b859
Author: Nakamura, Yuuichi <Yu...@sony.com>
AuthorDate: Mon Apr 6 23:01:51 2020 +0900
Remove type casting to wdentry_t (boards/)
---
boards/arm/samv7/samv71-xult/src/sam_ili9488.c | 6 +++---
boards/sim/sim/sim/src/sim_gpio.c | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/boards/arm/samv7/samv71-xult/src/sam_ili9488.c b/boards/arm/samv7/samv71-xult/src/sam_ili9488.c
index be0009e..7480fec 100644
--- a/boards/arm/samv7/samv71-xult/src/sam_ili9488.c
+++ b/boards/arm/samv7/samv71-xult/src/sam_ili9488.c
@@ -382,7 +382,7 @@ static void sam_lcd_dump(struct sam_dev_s *priv);
#endif
static void sam_lcd_endwait(struct sam_dev_s *priv, int result);
-static void sam_lcd_dmatimeout(int argc, uint32_t arg);
+static void sam_lcd_dmatimeout(int argc, uint32_t arg, ...);
static int sam_lcd_dmawait(FAR struct sam_dev_s *priv, uint32_t timeout);
static void sam_lcd_dmacallback(DMA_HANDLE handle, void *arg, int result);
static int sam_lcd_txtransfer(FAR struct sam_dev_s *priv,
@@ -939,7 +939,7 @@ static void sam_lcd_endwait(struct sam_dev_s *priv, int result)
*
****************************************************************************/
-static void sam_lcd_dmatimeout(int argc, uint32_t arg)
+static void sam_lcd_dmatimeout(int argc, uint32_t arg, ...)
{
struct sam_dev_s *priv = (struct sam_dev_s *)arg;
@@ -981,7 +981,7 @@ static int sam_lcd_dmawait(FAR struct sam_dev_s *priv, uint32_t timeout)
/* Started ... setup the timeout */
- ret = wd_start(priv->dmadog, timeout, (wdentry_t)sam_lcd_dmatimeout,
+ ret = wd_start(priv->dmadog, timeout, sam_lcd_dmatimeout,
1, (uint32_t)priv);
if (ret < 0)
{
diff --git a/boards/sim/sim/sim/src/sim_gpio.c b/boards/sim/sim/sim/src/sim_gpio.c
index b6ba6d8..8ebe213 100644
--- a/boards/sim/sim/sim/src/sim_gpio.c
+++ b/boards/sim/sim/sim/src/sim_gpio.c
@@ -202,7 +202,7 @@ static int gpint_enable(FAR struct gpio_dev_s *dev, bool enable)
{
gpioinfo("Start 1 second timer\n");
wd_start(simgpint->wdog, SEC2TICK(1),
- (wdentry_t)sim_interrupt, 1, (wdparm_t)dev);
+ sim_interrupt, 1, (wdparm_t)dev);
}
}
else