diff --git a/Documentation/NuttxPortingGuide.html b/Documentation/NuttxPortingGuide.html index eaabd9e9b31..d4cb2ed1654 100644 --- a/Documentation/NuttxPortingGuide.html +++ b/Documentation/NuttxPortingGuide.html @@ -2824,108 +2824,21 @@ int up_timer_start(FAR const struct timespec *ts); or kill() to communicate with NuttX tasks.

-

4.4.5.1 wd_create/wd_static

+

4.4.5.1 wd_start

Function Prototype: 

     #include <nuttx/wdog.h>
-    WDOG_ID wd_create(void);
-    void wd_static(FAR struct wdog_s *wdog);
-
- -

-Description: The wd_create() function will create a timer by allocating the appropriate resources for the watchdog. The wd_create() function returns a pointer to a fully initialized, dynamically allocated struct wdog_s instance (which is typedef'ed as WDOG_ID); -

-

-wd_static() performs the equivalent initialization of a statically allocated struct wdog_s instance. No allocation is performed in this case. The initializer definition, WDOG_INITIALIZER is also available for initialization of static instances of struct wdog_s. NOTE: wd_static() is also implemented as a macro definition. -

-

-Input Parameters: None. -

-Returned Value: -

- -

-Assumptions/Limitations: -

- POSIX Compatibility: This is a NON-POSIX interface. -VxWorks provides the following comparable interface: -

-    WDOG_ID wdCreate (void);
-
- -

-Differences from the VxWorks interface include: -

- -

4.4.5.2 wd_delete

- -

-Function Prototype: -

-    #include <nuttx/wdog.h>
-    int wd_delete(WDOG_ID wdog);
-
- -

-Description: The wd_delete function will deallocate a watchdog timer previously allocated via wd_create(). The watchdog timer will be removed from the timer queue if has been started. -

-

-This function need not be called for statically allocated timers (but it is not harmful to do so). -

-Input Parameters: - - -

-Returned Value: -

- -

-Assumptions/Limitations: It is the responsibility of the -caller to assure that the watchdog is inactive before deleting -it. -

-POSIX Compatibility: This is a NON-POSIX interface. -VxWorks provides the following comparable interface: -

-    STATUS wdDelete (WDOG_ID wdog);
-
- -

-Differences from the VxWorks interface include: -

- -

4.4.5.3 wd_start

- -

-Function Prototype: -

-    #include <nuttx/wdog.h>
-    int wd_start(WDOG_ID wdog, int delay, wdentry_t wdentry,
-                 int argc, ....);
+    int wd_start(FAR struct wdog_s *wdog, int delay,
+                 wdentry_t wdentry, int argc, ....);

@@ -2980,12 +2893,12 @@ to wdentry; VxWorks supports only a single parameter. The maximum number of parameters is determined by -

4.4.5.4 wd_cancel

+

4.4.5.2 wd_cancel

Function Prototype: 

     #include <nuttx/wdog.h>
-    int wd_cancel(WDOG_ID wdog);
+    int wd_cancel(FAR struct wdog_s *wdog);

@@ -3013,13 +2926,13 @@ VxWorks provides the following comparable interface: STATUS wdCancel (WDOG_ID wdog); -

4.4.5.5 wd_gettime

+

4.4.5.3 wd_gettime

Function Prototype: 

     #include <nuttx/wdog.h>
-    int wd_gettime(WDOG_ID wdog);
+    int wd_gettime(FAR struct wdog_s *wdog);

Description: @@ -3037,7 +2950,7 @@ VxWorks provides the following comparable interface: means either that wdog is not valid or that the wdog has already expired.

-

4.4.5.6 Watchdog Timer Callback

+

4.4.5.4 Watchdog Timer Callback

When a watchdog expires, the callback function with this type is called:

diff --git a/Documentation/NuttxUserGuide.html b/Documentation/NuttxUserGuide.html index ae5a2094d10..f264cecea36 100644 --- a/Documentation/NuttxUserGuide.html +++ b/Documentation/NuttxUserGuide.html @@ -10139,7 +10139,6 @@ OS resources. These hidden structures include:
  • struct tcb_s
  • mqd_t
  • sem_t -
  • WDOG_ID
  • pthread_key_t

    diff --git a/arch/arm/src/c5471/c5471_ethernet.c b/arch/arm/src/c5471/c5471_ethernet.c index 5330f240690..25371fb3ab2 100644 --- a/arch/arm/src/c5471/c5471_ethernet.c +++ b/arch/arm/src/c5471/c5471_ethernet.c @@ -318,8 +318,8 @@ static uint8_t g_pktbuf[MAX_NETDEV_PKTSIZE + CONFIG_NET_GUARDSIZE]; struct c5471_driver_s { bool c_bifup; /* true:ifup false:ifdown */ - WDOG_ID c_txpoll; /* TX poll timer */ - WDOG_ID c_txtimeout; /* TX timeout timer */ + struct wdog_s c_txpoll; /* TX poll timer */ + struct wdog_s c_txtimeout; /* TX timeout timer */ struct work_s c_irqwork; /* For deferring interrupt work to the work queue */ struct work_s c_pollwork; /* For deferring poll work to the work queue */ @@ -1011,7 +1011,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, + wd_start(&priv->c_txtimeout, C5471_TXTIMEOUT, c5471_txtimeout_expiry, 1, (wdparm_t)priv); return OK; } @@ -1575,7 +1575,7 @@ static void c5471_txdone(struct c5471_driver_s *priv) { /* If no further xmits are pending, then cancel the TX timeout */ - wd_cancel(priv->c_txtimeout); + wd_cancel(&priv->c_txtimeout); /* Then poll the network for new XMIT data */ @@ -1705,7 +1705,7 @@ static int c5471_interrupt(int irq, FAR void *context, FAR void *arg) * expiration and the deferred interrupt processing. */ - wd_cancel(priv->c_txtimeout); + wd_cancel(&priv->c_txtimeout); } /* Schedule to perform the interrupt processing on the worker thread. */ @@ -1828,7 +1828,7 @@ 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, + wd_start(&priv->c_txpoll, C5471_WDDELAY, c5471_poll_expiry, 1, (wdparm_t)priv); net_unlock(); } @@ -1915,7 +1915,7 @@ 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, + wd_start(&priv->c_txpoll, C5471_WDDELAY, c5471_poll_expiry, 1, (wdparm_t)priv); /* Enable the Ethernet interrupt */ @@ -1968,8 +1968,8 @@ static int c5471_ifdown(struct net_driver_s *dev) /* Cancel the TX poll timer and TX timeout timers */ - wd_cancel(priv->c_txpoll); - wd_cancel(priv->c_txtimeout); + wd_cancel(&priv->c_txpoll); + wd_cancel(&priv->c_txtimeout); /* Reset the device */ @@ -2498,12 +2498,7 @@ void arm_netinitialize(void) g_c5471[0].c_dev.d_addmac = c5471_addmac; /* Add multicast MAC address */ g_c5471[0].c_dev.d_rmmac = c5471_rmmac; /* Remove multicast MAC address */ #endif - g_c5471[0].c_dev.d_private = (void *)g_c5471; /* Used to recover private state from dev */ - - /* Create a watchdog for timing polling for and timing of transmissions */ - - g_c5471[0].c_txpoll = wd_create(); /* Create periodic poll timer */ - g_c5471[0].c_txtimeout = wd_create(); /* Create TX timeout timer */ + g_c5471[0].c_dev.d_private = g_c5471; /* Used to recover private state from dev */ /* Register the device with the OS so that socket IOCTLs can be performed */ diff --git a/arch/arm/src/cxd56xx/cxd56_i2c.c b/arch/arm/src/cxd56xx/cxd56_i2c.c index 47a8b90b3c1..72e8e89c566 100644 --- a/arch/arm/src/cxd56xx/cxd56_i2c.c +++ b/arch/arm/src/cxd56xx/cxd56_i2c.c @@ -98,7 +98,7 @@ struct cxd56_i2cdev_s sem_t mutex; /* Only one thread can access at a time */ sem_t wait; /* Place to wait for transfer completion */ - WDOG_ID timeout; /* watchdog to timeout when bus hung */ + struct wdog_s timeout; /* watchdog to timeout when bus hung */ uint32_t frequency; /* Current I2C frequency */ ssize_t reg_buff_offset; ssize_t rw_size; @@ -493,7 +493,7 @@ static int cxd56_i2c_interrupt(int irq, FAR void *context, FAR void *arg) * Therefore, call nxsem_post() only when wd_cancel() succeeds. */ - ret = wd_cancel(priv->timeout); + ret = wd_cancel(&priv->timeout); if (ret == OK) { i2c_givesem(&priv->wait); @@ -550,7 +550,7 @@ static int cxd56_i2c_receive(struct cxd56_i2cdev_s *priv, int last) } flags = enter_critical_section(); - wd_start(priv->timeout, I2C_TIMEOUT, + wd_start(&priv->timeout, I2C_TIMEOUT, cxd56_i2c_timeout, 1, (wdparm_t)priv); /* Set stop flag for indicate the last data */ @@ -596,7 +596,7 @@ static int cxd56_i2c_send(struct cxd56_i2cdev_s *priv, int last) while (!(i2c_reg_read(priv, CXD56_IC_STATUS) & STATUS_TFNF)); flags = enter_critical_section(); - wd_start(priv->timeout, I2C_TIMEOUT, + wd_start(&priv->timeout, I2C_TIMEOUT, cxd56_i2c_timeout, 1, (wdparm_t)priv); i2c_reg_write(priv, CXD56_IC_DATA_CMD, (uint32_t)msg->buffer[i] | (last ? CMD_STOP : 0)); @@ -1056,8 +1056,6 @@ struct i2c_master_s *cxd56_i2cbus_initialize(int port) nxsem_init(&priv->wait, 0, 0); nxsem_set_protocol(&priv->wait, SEM_PRIO_NONE); - priv->timeout = wd_create(); - /* Attach Interrupt Handler */ irq_attach(priv->irqid, cxd56_i2c_interrupt, priv); @@ -1119,8 +1117,7 @@ int cxd56_i2cbus_uninitialize(FAR struct i2c_master_s *dev) up_disable_irq(priv->irqid); irq_detach(priv->irqid); - wd_delete(priv->timeout); - priv->timeout = NULL; + wd_cancel(&priv->timeout); nxsem_destroy(&priv->mutex); nxsem_destroy(&priv->wait); diff --git a/arch/arm/src/cxd56xx/cxd56_icc.c b/arch/arm/src/cxd56xx/cxd56_icc.c index 5ff9b3fc7cc..4ef444968a9 100644 --- a/arch/arm/src/cxd56xx/cxd56_icc.c +++ b/arch/arm/src/cxd56xx/cxd56_icc.c @@ -122,7 +122,7 @@ struct iccdev_s FAR void *userdata; sem_t rxwait; - WDOG_ID rxtimeout; + struct wdog_s rxtimeout; int flags; @@ -338,11 +338,11 @@ 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, 1, (wdparm_t)priv); icc_semtake(&priv->rxwait); - wd_cancel(priv->rxtimeout); + wd_cancel(&priv->rxtimeout); } flags = enter_critical_section(); @@ -379,8 +379,6 @@ static FAR struct iccdev_s *icc_devnew(void) memset(priv, 0, sizeof(struct iccdev_s)); - priv->rxtimeout = wd_create(); - nxsem_init(&priv->rxwait, 0, 0); nxsem_set_protocol(&priv->rxwait, SEM_PRIO_NONE); @@ -401,7 +399,7 @@ static FAR struct iccdev_s *icc_devnew(void) static void icc_devfree(FAR struct iccdev_s *priv) { - wd_delete(priv->rxtimeout); + wd_cancel(&priv->rxtimeout); kmm_free(priv); } diff --git a/arch/arm/src/cxd56xx/cxd56_rtc.c b/arch/arm/src/cxd56xx/cxd56_rtc.c index 4b416a3d6a6..f638814fda2 100644 --- a/arch/arm/src/cxd56xx/cxd56_rtc.c +++ b/arch/arm/src/cxd56xx/cxd56_rtc.c @@ -254,13 +254,8 @@ static void cxd56_rtc_initialize(int argc, ...) { struct timespec ts; #ifdef CONFIG_CXD56_RTC_LATEINIT - static WDOG_ID s_wdog = NULL; - static int s_retry = 0; - - if (s_wdog == NULL) - { - s_wdog = wd_create(); - } + static struct wdog_s s_wdog; + static int s_retry = 0; /* Check whether RTC clock source selects the external RTC and the * synchronization from the external RTC is completed. @@ -278,7 +273,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), + if (OK == wd_start(&s_wdog, MSEC2TICK(RTC_CLOCK_CHECK_INTERVAL), (wdentry_t)cxd56_rtc_initialize, 0)) { /* Again, this function is called recursively */ @@ -292,10 +287,7 @@ static void cxd56_rtc_initialize(int argc, ...) /* RTC clock is stable, or give up using the external RTC */ - if (s_wdog != NULL) - { - wd_delete(s_wdog); - } + wd_cancel(&s_wdog); #endif #ifdef CONFIG_RTC_ALARM diff --git a/arch/arm/src/cxd56xx/cxd56_sdhci.c b/arch/arm/src/cxd56xx/cxd56_sdhci.c index 538db00808f..e36ae37deb1 100644 --- a/arch/arm/src/cxd56xx/cxd56_sdhci.c +++ b/arch/arm/src/cxd56xx/cxd56_sdhci.c @@ -252,7 +252,7 @@ struct cxd56_sdiodev_s sdio_eventset_t waitevents; /* Set of events to be waited for */ uint32_t waitints; /* Interrupt enables for event waiting */ volatile sdio_eventset_t wkupevent; /* The event that caused the wakeup */ - WDOG_ID waitwdog; /* Watchdog that handles event timeouts */ + struct wdog_s waitwdog; /* Watchdog that handles event timeouts */ /* Callback support */ @@ -1016,7 +1016,7 @@ static void cxd56_endwait(struct cxd56_sdiodev_s *priv, { /* Cancel the watchdog timeout */ - wd_cancel(priv->waitwdog); + wd_cancel(&priv->waitwdog); /* Disable event-related interrupts */ @@ -1364,11 +1364,6 @@ static void cxd56_sdio_sdhci_reset(FAR struct sdio_dev_s *dev) nxsem_set_protocol(&priv->waitsem, SEM_PRIO_NONE); - /* Create a watchdog timer */ - - priv->waitwdog = wd_create(); - DEBUGASSERT(priv->waitwdog); - /* The next phase of the hardware reset would be to set the SYSCTRL INITA * bit to send 80 clock ticks for card to power up and then reset the card * with CMD0. This is done elsewhere. @@ -1383,7 +1378,7 @@ static void cxd56_sdio_sdhci_reset(FAR struct sdio_dev_s *dev) priv->xfrflags = 0; /* Used to synchronize SDIO and DMA completion events */ #endif - wd_cancel(priv->waitwdog); /* Cancel any timeouts */ + wd_cancel(&priv->waitwdog); /* Cancel any timeouts */ /* Interrupt mode data transfer support */ @@ -2085,7 +2080,7 @@ static int cxd56_sdio_cancel(FAR struct sdio_dev_s *dev) /* Cancel any watchdog timeout */ - wd_cancel(priv->waitwdog); + wd_cancel(&priv->waitwdog); /* If this was a DMA transfer, make sure that DMA is stopped */ @@ -2594,7 +2589,7 @@ static sdio_eventset_t cxd56_sdio_eventwait(FAR struct sdio_dev_s *dev, /* Start the watchdog timer */ delay = MSEC2TICK(timeout); - ret = wd_start(priv->waitwdog, delay, + ret = wd_start(&priv->waitwdog, delay, cxd56_eventtimeout, 1, (wdparm_t)priv); if (ret != OK) { @@ -2623,7 +2618,7 @@ static sdio_eventset_t cxd56_sdio_eventwait(FAR struct sdio_dev_s *dev, * return an SDIO error. */ - wd_cancel(priv->waitwdog); + wd_cancel(&priv->waitwdog); return SDIOWAIT_ERROR; } diff --git a/arch/arm/src/efm32/efm32_spi.c b/arch/arm/src/efm32/efm32_spi.c index a1c278417c2..036c13fdf4c 100644 --- a/arch/arm/src/efm32/efm32_spi.c +++ b/arch/arm/src/efm32/efm32_spi.c @@ -126,7 +126,7 @@ struct efm32_spidev_s const struct efm32_spiconfig_s *config; /* Constant SPI hardware configuration */ #ifdef CONFIG_EFM32_SPI_DMA - WDOG_ID wdog; /* Timer to catch hung DMA */ + struct wdog_s wdog; /* Timer to catch hung DMA */ volatile uint8_t rxresult; /* Result of the RX DMA */ volatile uint8_t txresult; /* Result of the TX DMA */ DMA_HANDLE rxdmach; /* RX DMA channel handle */ @@ -452,7 +452,7 @@ static void spi_dmarxwait(struct efm32_spidev_s *priv) DEBUGASSERT(priv->rxresult != EINPROGRESS); if (priv->txresult != EINPROGRESS) { - wd_cancel(priv->wdog); + wd_cancel(&priv->wdog); } leave_critical_section(flags); @@ -482,7 +482,7 @@ static void spi_dmatxwait(struct efm32_spidev_s *priv) DEBUGASSERT(priv->txresult != EINPROGRESS); if (priv->rxresult != EINPROGRESS) { - wd_cancel(priv->wdog); + wd_cancel(&priv->wdog); } leave_critical_section(flags); @@ -1465,7 +1465,7 @@ 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, + ret = wd_start(&priv->wdog, (int)ticks, spi_dma_timeout, 1, (wdparm_t)priv); if (ret < 0) { @@ -1620,15 +1620,6 @@ static int spi_portinitialize(struct efm32_spidev_s *priv) goto errout_with_rxdmach; } - /* Allocate a timer to catch hung DMA transfers */ - - priv->wdog = wd_create(); - if (!priv->wdog) - { - spierr("ERROR: Failed to create a timer for SPI port: %d\n", port); - goto errout_with_txdmach; - } - /* Initialized semaphores used to wait for DMA completion */ nxsem_init(&priv->rxdmasem, 0, 0); diff --git a/arch/arm/src/imxrt/imxrt_enet.c b/arch/arm/src/imxrt/imxrt_enet.c index dc1bd397dbc..f2032c53df2 100644 --- a/arch/arm/src/imxrt/imxrt_enet.c +++ b/arch/arm/src/imxrt/imxrt_enet.c @@ -265,8 +265,8 @@ struct imxrt_driver_s uint8_t txhead; /* The next TX descriptor to use */ uint8_t rxtail; /* The next RX descriptor to use */ uint8_t phyaddr; /* Selected PHY address */ - WDOG_ID txpoll; /* TX poll timer */ - WDOG_ID txtimeout; /* TX timeout timer */ + struct wdog_s txpoll; /* TX poll timer */ + struct wdog_s txtimeout; /* TX timeout timer */ struct work_s irqwork; /* For deferring interrupt work to the work queue */ struct work_s pollwork; /* For deferring poll work to the work queue */ struct enet_desc_s *txdesc; /* A pointer to the list of TX descriptor */ @@ -565,7 +565,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, + wd_start(&priv->txtimeout, IMXRT_TXTIMEOUT, imxrt_txtimeout_expiry, 1, (wdparm_t)priv); /* Start the TX transfer (if it was not already waiting for buffers) */ @@ -913,7 +913,7 @@ static void imxrt_txdone(FAR struct imxrt_driver_s *priv) * canceled. */ - wd_cancel(priv->txtimeout); + wd_cancel(&priv->txtimeout); /* Verify that the oldest descriptor descriptor completed */ @@ -955,7 +955,7 @@ static void imxrt_txdone(FAR struct imxrt_driver_s *priv) { /* No.. Cancel the TX timeout and disable further Tx interrupts. */ - wd_cancel(priv->txtimeout); + wd_cancel(&priv->txtimeout); regval = getreg32(IMXRT_ENET_EIMR); regval &= ~TX_INTERRUPTS; @@ -1239,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, + wd_start(&priv->txpoll, IMXRT_WDDELAY, imxrt_polltimer_expiry, 1, (wdparm_t)priv); net_unlock(); } @@ -1371,7 +1371,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, + wd_start(&priv->txpoll, IMXRT_WDDELAY, imxrt_polltimer_expiry, 1, (wdparm_t)priv); /* Clear all pending ENET interrupt */ @@ -1456,8 +1456,8 @@ static int imxrt_ifdown(struct net_driver_s *dev) /* Cancel the TX poll timer and TX timeout timers */ - wd_cancel(priv->txpoll); - wd_cancel(priv->txtimeout); + wd_cancel(&priv->txpoll); + wd_cancel(&priv->txtimeout); /* Put the EMAC in its reset, non-operational state. This should be * a known configuration that will guarantee the imxrt_ifup() always @@ -2535,12 +2535,7 @@ int imxrt_netinitialize(int intf) #ifdef CONFIG_NETDEV_IOCTL priv->dev.d_ioctl = imxrt_ioctl; /* Support PHY ioctl() calls */ #endif - priv->dev.d_private = (void *)g_enet; /* Used to recover private state from dev */ - - /* Create a watchdog for timing polling for and timing of transmissions */ - - priv->txpoll = wd_create(); /* Create periodic poll timer */ - priv->txtimeout = wd_create(); /* Create TX timeout timer */ + priv->dev.d_private = g_enet; /* Used to recover private state from dev */ #ifdef CONFIG_NET_ETHERNET /* Determine a semi-unique MAC address from MCU UID diff --git a/arch/arm/src/imxrt/imxrt_usdhc.c b/arch/arm/src/imxrt/imxrt_usdhc.c index b6a154ea39f..ab7f527ed18 100644 --- a/arch/arm/src/imxrt/imxrt_usdhc.c +++ b/arch/arm/src/imxrt/imxrt_usdhc.c @@ -171,7 +171,7 @@ struct imxrt_dev_s sdio_eventset_t waitevents; /* Set of events to be waited for */ uint32_t waitints; /* Interrupt enables for event waiting */ volatile sdio_eventset_t wkupevent; /* The event that caused the wakeup */ - WDOG_ID waitwdog; /* Watchdog that handles event timeouts */ + struct wdog_s waitwdog; /* Watchdog that handles event timeouts */ /* Callback support */ @@ -1062,7 +1062,7 @@ static void imxrt_endwait(struct imxrt_dev_s *priv, { /* Cancel the watchdog timeout */ - wd_cancel(priv->waitwdog); + wd_cancel(&priv->waitwdog); /* Disable event-related interrupts */ @@ -1398,7 +1398,7 @@ static void imxrt_reset(FAR struct sdio_dev_s *dev) priv->xfrflags = 0; /* Used to synchronize SDIO and DMA completion */ #endif - wd_cancel(priv->waitwdog); /* Cancel any timeouts */ + wd_cancel(&priv->waitwdog); /* Cancel any timeouts */ /* Interrupt mode data transfer support */ @@ -2279,7 +2279,7 @@ static int imxrt_cancel(FAR struct sdio_dev_s *dev) /* Cancel any watchdog timeout */ - wd_cancel(priv->waitwdog); + wd_cancel(&priv->waitwdog); /* If this was a DMA transfer, make sure that DMA is stopped */ @@ -2708,7 +2708,7 @@ static sdio_eventset_t imxrt_eventwait(FAR struct sdio_dev_s *dev, /* Start the watchdog timer */ delay = MSEC2TICK(timeout); - ret = wd_start(priv->waitwdog, delay, + ret = wd_start(&priv->waitwdog, delay, imxrt_eventtimeout, 1, (wdparm_t)priv); if (ret < 0) @@ -2738,7 +2738,7 @@ static sdio_eventset_t imxrt_eventwait(FAR struct sdio_dev_s *dev, * return an SDIO error. */ - wd_cancel(priv->waitwdog); + wd_cancel(&priv->waitwdog); return SDIOWAIT_ERROR; } @@ -3119,11 +3119,6 @@ FAR struct sdio_dev_s *imxrt_usdhc_initialize(int slotno) nxsem_set_protocol(&priv->waitsem, SEM_PRIO_NONE); - /* Create a watchdog timer */ - - priv->waitwdog = wd_create(); - DEBUGASSERT(priv->waitwdog); - switch (priv->addr) { case IMXRT_USDHC1_BASE: diff --git a/arch/arm/src/kinetis/kinetis_enet.c b/arch/arm/src/kinetis/kinetis_enet.c index 5a32ac87aa3..d3bb6df4e51 100644 --- a/arch/arm/src/kinetis/kinetis_enet.c +++ b/arch/arm/src/kinetis/kinetis_enet.c @@ -237,8 +237,8 @@ struct kinetis_driver_s uint8_t txhead; /* The next TX descriptor to use */ uint8_t rxtail; /* The next RX descriptor to use */ uint8_t phyaddr; /* Selected PHY address */ - WDOG_ID txpoll; /* TX poll timer */ - WDOG_ID txtimeout; /* TX timeout timer */ + struct wdog_s txpoll; /* TX poll timer */ + struct wdog_s txtimeout; /* TX timeout timer */ uint32_t ints; /* Enabled interrupts */ struct work_s irqwork; /* For deferring interrupt work to the work queue */ struct work_s pollwork; /* For deferring poll work to the work queue */ @@ -520,7 +520,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, + wd_start(&priv->txtimeout, KINETIS_TXTIMEOUT, kinetis_txtimeout_expiry, 1, (wdparm_t)priv); return OK; } @@ -821,7 +821,7 @@ static void kinetis_txdone(FAR struct kinetis_driver_s *priv) { /* No.. Cancel the TX timeout and disable further Tx interrupts. */ - wd_cancel(priv->txtimeout); + wd_cancel(&priv->txtimeout); priv->ints &= ~TX_INTERRUPTS; modifyreg32(KINETIS_ENET_EIMR, TX_INTERRUPTS, priv->ints); } @@ -975,7 +975,7 @@ static int kinetis_interrupt(int irq, FAR void *context, FAR void *arg) * expiration and the deferred interrupt processing. */ - wd_cancel(priv->txtimeout); + wd_cancel(&priv->txtimeout); } /* Schedule to perform the interrupt processing on the worker thread. */ @@ -1100,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, + wd_start(&priv->txpoll, KINETIS_WDDELAY, kinetis_polltimer_expiry, 1, (wdparm_t)priv); net_unlock(); } @@ -1243,7 +1243,7 @@ static int kinetis_ifup(struct net_driver_s *dev) /* Set and activate a timer process */ - wd_start(priv->txpoll, KINETIS_WDDELAY, + wd_start(&priv->txpoll, KINETIS_WDDELAY, kinetis_polltimer_expiry, 1, (wdparm_t)priv); putreg32(0, KINETIS_ENET_EIMR); @@ -1309,8 +1309,8 @@ static int kinetis_ifdown(struct net_driver_s *dev) /* Cancel the TX poll timer and TX timeout timers */ - wd_cancel(priv->txpoll); - wd_cancel(priv->txtimeout); + wd_cancel(&priv->txpoll); + wd_cancel(&priv->txtimeout); /* Put the EMAC in its reset, non-operational state. This should be * a known configuration that will guarantee the kinetis_ifup() always @@ -2231,12 +2231,7 @@ int kinetis_netinitialize(int intf) #ifdef CONFIG_NETDEV_IOCTL priv->dev.d_ioctl = kinetis_ioctl; /* Support PHY ioctl() calls */ #endif - priv->dev.d_private = (void *)g_enet; /* Used to recover private state from dev */ - - /* Create a watchdog for timing polling for and timing of transmissions */ - - priv->txpoll = wd_create(); /* Create periodic poll timer */ - priv->txtimeout = wd_create(); /* Create TX timeout timer */ + priv->dev.d_private = g_enet; /* Used to recover private state from dev */ #ifdef CONFIG_NET_ETHERNET /* Determine a semi-unique MAC address from MCU UID diff --git a/arch/arm/src/kinetis/kinetis_flexcan.c b/arch/arm/src/kinetis/kinetis_flexcan.c index 16c30636347..737c37a6dd4 100644 --- a/arch/arm/src/kinetis/kinetis_flexcan.c +++ b/arch/arm/src/kinetis/kinetis_flexcan.c @@ -294,7 +294,7 @@ struct kinetis_driver_s uint32_t base; /* FLEXCAN base address */ bool bifup; /* true:ifup false:ifdown */ #ifdef TX_TIMEOUT_WQ - WDOG_ID txtimeout[TXMBCOUNT]; /* TX timeout timer */ + struct wdog_s txtimeout[TXMBCOUNT]; /* TX timeout timer */ #endif struct work_s irqwork; /* For deferring interrupt work to the wq */ struct work_s pollwork; /* For deferring poll work to the work wq */ @@ -751,7 +751,7 @@ static int kinetis_transmit(FAR struct kinetis_driver_s *priv) if (timeout > 0) { - wd_start(priv->txtimeout[mbi], timeout + 1, + wd_start(&priv->txtimeout[mbi], timeout + 1, kinetis_txtimeout_expiry, 1, (wdparm_t)priv); } #endif @@ -1003,7 +1003,7 @@ static void kinetis_txdone(FAR void *arg) * corresponding watchdog can be canceled. */ - wd_cancel(priv->txtimeout[mbi]); + wd_cancel(&priv->txtimeout[mbi]); #endif } @@ -1867,15 +1867,7 @@ int kinetis_caninitialize(int intf) #ifdef CONFIG_NETDEV_IOCTL priv->dev.d_ioctl = kinetis_ioctl; /* Support CAN ioctl() calls */ #endif - priv->dev.d_private = (void *)priv; /* Used to recover private state from dev */ - -#ifdef TX_TIMEOUT_WQ - for (i = 0; i < TXMBCOUNT; i++) - { - priv->txtimeout[i] = wd_create(); /* Create TX timeout timer */ - } - -#endif + priv->dev.d_private = priv; /* Used to recover private state from dev */ priv->rx = (struct mb_s *)(priv->base + KINETIS_CAN_MB_OFFSET); priv->tx = (struct mb_s *)(priv->base + KINETIS_CAN_MB_OFFSET + (sizeof(struct mb_s) * RXMBCOUNT)); diff --git a/arch/arm/src/kinetis/kinetis_i2c.c b/arch/arm/src/kinetis/kinetis_i2c.c index 6b89b14f774..a195875b256 100644 --- a/arch/arm/src/kinetis/kinetis_i2c.c +++ b/arch/arm/src/kinetis/kinetis_i2c.c @@ -130,7 +130,7 @@ struct kinetis_i2cdev_s bool restart; /* Should next transfer restart or not */ sem_t mutex; /* Only one thread can access at a time */ sem_t wait; /* Place to wait for state machine completion */ - WDOG_ID timeout; /* watchdog to timeout when bus hung */ + struct wdog_s timeout; /* watchdog to timeout when bus hung */ struct i2c_msg_s *msgs; /* Remaining transfers - first one is in * progress */ }; @@ -1222,11 +1222,11 @@ static int kinetis_i2c_transfer(struct i2c_master_s *dev, /* Wait for transfer complete */ - wd_start(priv->timeout, I2C_TIMEOUT, + wd_start(&priv->timeout, I2C_TIMEOUT, kinetis_i2c_timeout, 1, (wdparm_t)priv); kinetis_i2c_wait(priv); - wd_cancel(priv->timeout); + wd_cancel(&priv->timeout); msg_n++; } @@ -1437,14 +1437,6 @@ struct i2c_master_s *kinetis_i2cbus_initialize(int port) flags = enter_critical_section(); if ((volatile int)priv->refs++ == 0) { - priv->timeout = wd_create(); - DEBUGASSERT(priv->timeout != 0); - if (priv->timeout == NULL) - { - priv->refs--; - goto errout; - } - kinetis_i2c_sem_init(priv); kinetis_i2c_init(priv); } @@ -1452,10 +1444,6 @@ struct i2c_master_s *kinetis_i2cbus_initialize(int port) leave_critical_section(flags); return &priv->dev; - -errout: - leave_critical_section(flags); - return NULL; } /**************************************************************************** @@ -1494,7 +1482,7 @@ int kinetis_i2cbus_uninitialize(struct i2c_master_s *dev) kinetis_i2c_deinit(priv); kinetis_i2c_sem_destroy(priv); - wd_delete(priv->timeout); + wd_cancel(&priv->timeout); return OK; } diff --git a/arch/arm/src/kinetis/kinetis_sdhc.c b/arch/arm/src/kinetis/kinetis_sdhc.c index 823ce47f2e3..a594c8d1920 100644 --- a/arch/arm/src/kinetis/kinetis_sdhc.c +++ b/arch/arm/src/kinetis/kinetis_sdhc.c @@ -166,7 +166,7 @@ struct kinetis_dev_s sdio_eventset_t waitevents; /* Set of events to be waited for */ uint32_t waitints; /* Interrupt enables for event waiting */ volatile sdio_eventset_t wkupevent; /* The event that caused the wakeup */ - WDOG_ID waitwdog; /* Watchdog that handles event timeouts */ + struct wdog_s waitwdog; /* Watchdog that handles event timeouts */ /* Callback support */ @@ -979,7 +979,7 @@ static void kinetis_endwait(struct kinetis_dev_s *priv, { /* Cancel the watchdog timeout */ - wd_cancel(priv->waitwdog); + wd_cancel(&priv->waitwdog); /* Disable event-related interrupts */ @@ -1295,7 +1295,7 @@ static void kinetis_reset(FAR struct sdio_dev_s *dev) priv->xfrflags = 0; /* Used to synchronize SDIO and DMA completion events */ #endif - wd_cancel(priv->waitwdog); /* Cancel any timeouts */ + wd_cancel(&priv->waitwdog); /* Cancel any timeouts */ /* Interrupt mode data transfer support */ @@ -2071,7 +2071,7 @@ static int kinetis_cancel(FAR struct sdio_dev_s *dev) /* Cancel any watchdog timeout */ - wd_cancel(priv->waitwdog); + wd_cancel(&priv->waitwdog); /* If this was a DMA transfer, make sure that DMA is stopped */ @@ -2506,7 +2506,7 @@ static sdio_eventset_t kinetis_eventwait(FAR struct sdio_dev_s *dev, /* Start the watchdog timer */ delay = MSEC2TICK(timeout); - ret = wd_start(priv->waitwdog, delay, + ret = wd_start(&priv->waitwdog, delay, kinetis_eventtimeout, 1, (wdparm_t)priv); if (ret < 0) { @@ -2535,7 +2535,7 @@ static sdio_eventset_t kinetis_eventwait(FAR struct sdio_dev_s *dev, * return an SDIO error. */ - wd_cancel(priv->waitwdog); + wd_cancel(&priv->waitwdog); return SDIOWAIT_ERROR; } @@ -2878,11 +2878,6 @@ FAR struct sdio_dev_s *sdhc_initialize(int slotno) nxsem_set_protocol(&priv->waitsem, SEM_PRIO_NONE); - /* Create a watchdog timer */ - - priv->waitwdog = wd_create(); - DEBUGASSERT(priv->waitwdog); - /* In addition to the system clock, the SDHC module needs a clock for the * base for the external card clock. There are four possible sources for * this clock, selected by the SIM's SOPT2 register: diff --git a/arch/arm/src/kinetis/kinetis_usbdev.c b/arch/arm/src/kinetis/kinetis_usbdev.c index b163c6b938e..757922c8ccb 100644 --- a/arch/arm/src/kinetis/kinetis_usbdev.c +++ b/arch/arm/src/kinetis/kinetis_usbdev.c @@ -496,7 +496,7 @@ struct khci_usbdev_s uint8_t rxbusy:1; /* EP0 OUT data transfer in progress */ uint16_t epavail; /* Bitset of available endpoints */ uint16_t epstalled; /* Bitset of stalled endpoints */ - WDOG_ID wdog; /* Supports the restart delay */ + struct wdog_s wdog; /* Supports the restart delay */ uint8_t out0data[2][CONFIG_USBDEV_EP0_MAXSIZE]; uint8_t ep0data[CONFIG_USBDEV_SETUP_MAXDATASIZE]; @@ -1118,7 +1118,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, + wd_start(&priv->wdog, RESTART_DELAY, khci_rqrestart, 1, (wdparm_t)priv); } @@ -4356,12 +4356,6 @@ static void khci_swinitialize(struct khci_usbdev_s *priv) priv->epavail = KHCI_ENDP_ALLSET & ~KHCI_ENDP_BIT(EP0); priv->rwakeup = 1; - /* Initialize the watchdog timer that is used to perform a delayed - * queue restart after recovering from a stall. - */ - - priv->wdog = wd_create(); - /* Initialize the endpoint list */ for (epno = 0; epno < KHCI_NENDPOINTS; epno++) @@ -4533,7 +4527,7 @@ void arm_usbuninitialize(void) kinetis_usbpullup(&priv->usbdev, false); - wd_delete(priv->wdog); + wd_cancel(&priv->wdog); /* Put the hardware in an inactive state */ diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_ethernet.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_ethernet.c index df8573b35a6..283e024a5c9 100644 --- a/arch/arm/src/lpc17xx_40xx/lpc17_40_ethernet.c +++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_ethernet.c @@ -309,8 +309,8 @@ struct lpc17_40_driver_s uint8_t lp_phyaddr; /* PHY device address */ #endif uint32_t lp_inten; /* Shadow copy of INTEN register */ - WDOG_ID lp_txpoll; /* TX poll timer */ - WDOG_ID lp_txtimeout; /* TX timeout timer */ + struct wdog_s lp_txpoll; /* TX poll timer */ + struct wdog_s lp_txtimeout; /* TX timeout timer */ struct work_s lp_txwork; /* TX work continuation */ struct work_s lp_rxwork; /* RX work continuation */ @@ -701,7 +701,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, + wd_start(&priv->lp_txtimeout, LPC17_40_TXTIMEOUT, lpc17_40_txtimeout_expiry, 1, (wdparm_t)priv); return OK; } @@ -1331,7 +1331,7 @@ static int lpc17_40_interrupt(int irq, void *context, FAR void *arg) * Cancel the pending Tx timeout */ - wd_cancel(priv->lp_txtimeout); + wd_cancel(&priv->lp_txtimeout); /* Disable further Tx interrupts. Tx interrupts may be * re-enabled again depending upon the actions of @@ -1509,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, + wd_start(&priv->lp_txpoll, LPC17_40_WDDELAY, lpc17_40_poll_expiry, 1, (wdparm_t)priv); net_unlock(); } @@ -1764,7 +1764,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, + wd_start(&priv->lp_txpoll, LPC17_40_WDDELAY, lpc17_40_poll_expiry, 1, (wdparm_t)priv); /* Finally, make the interface up and enable the Ethernet interrupt at @@ -1809,8 +1809,8 @@ static int lpc17_40_ifdown(struct net_driver_s *dev) /* Cancel the TX poll timer and TX timeout timers */ - wd_cancel(priv->lp_txpoll); - wd_cancel(priv->lp_txtimeout); + wd_cancel(&priv->lp_txpoll); + wd_cancel(&priv->lp_txtimeout); /* Reset the device and mark it as down. */ @@ -3307,19 +3307,14 @@ static inline int lpc17_40_ethinitialize(int intf) #ifdef CONFIG_NETDEV_IOCTL priv->lp_dev.d_ioctl = lpc17_40_eth_ioctl; /* Handle network IOCTL commands */ #endif - priv->lp_dev.d_private = (void *)priv; /* Used to recover private state from dev */ + priv->lp_dev.d_private = priv; /* Used to recover private state from dev */ #if CONFIG_LPC17_40_NINTERFACES > 1 # error "A mechanism to associate base address an IRQ with an interface is needed" - priv->lp_base = ??; /* Ethernet controller base address */ - priv->lp_irq = ??; /* Ethernet controller IRQ number */ + priv->lp_base = ??; /* Ethernet controller base address */ + priv->lp_irq = ??; /* Ethernet controller IRQ number */ #endif - /* Create a watchdog for timing polling for and timing of transmissions */ - - priv->lp_txpoll = wd_create(); /* Create periodic poll timer */ - priv->lp_txtimeout = wd_create(); /* Create TX timeout timer */ - /* Reset the Ethernet controller and leave in the ifdown statue. The * Ethernet controller will be properly re-initialized each time * lpc17_40_ifup() is called. diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_i2c.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_i2c.c index 8f38211379a..bc0ca1e7a7c 100644 --- a/arch/arm/src/lpc17xx_40xx/lpc17_40_i2c.c +++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_i2c.c @@ -112,7 +112,7 @@ struct lpc17_40_i2cdev_s sem_t mutex; /* Only one thread can access at a time */ sem_t wait; /* Place to wait for state machine completion */ volatile uint8_t state; /* State of state machine */ - WDOG_ID timeout; /* Watchdog to timeout when bus hung */ + struct wdog_s timeout; /* Watchdog to timeout when bus hung */ uint32_t frequency; /* Current I2C frequency */ struct i2c_msg_s *msgs; /* remaining transfers - first one is in progress */ @@ -238,7 +238,7 @@ static int lpc17_40_i2c_start(struct lpc17_40_i2cdev_s *priv) priv->state = 0x00; - wd_start(priv->timeout, timeout, + wd_start(&priv->timeout, timeout, lpc17_40_i2c_timeout, 1, (wdparm_t)priv); nxsem_wait(&priv->wait); @@ -261,7 +261,7 @@ static void lpc17_40_i2c_stop(struct lpc17_40_i2cdev_s *priv) priv->base + LPC17_40_I2C_CONSET_OFFSET); } - wd_cancel(priv->timeout); + wd_cancel(&priv->timeout); nxsem_post(&priv->wait); } @@ -630,11 +630,6 @@ struct i2c_master_s *lpc17_40_i2cbus_initialize(int port) nxsem_set_protocol(&priv->wait, SEM_PRIO_NONE); - /* Allocate a watchdog timer */ - - priv->timeout = wd_create(); - DEBUGASSERT(priv->timeout != 0); - /* Attach Interrupt Handler */ irq_attach(priv->irqid, lpc17_40_i2c_interrupt, priv); @@ -670,10 +665,9 @@ int lpc17_40_i2cbus_uninitialize(FAR struct i2c_master_s * dev) nxsem_destroy(&priv->mutex); nxsem_destroy(&priv->wait); - /* Free the watchdog timer */ + /* Cancel the watchdog timer */ - wd_delete(priv->timeout); - priv->timeout = NULL; + wd_cancel(&priv->timeout); /* Disable interrupts */ diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_sdcard.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_sdcard.c index 0668e2dacb6..52d982e3261 100644 --- a/arch/arm/src/lpc17xx_40xx/lpc17_40_sdcard.c +++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_sdcard.c @@ -250,7 +250,7 @@ struct lpc17_40_dev_s sdio_eventset_t waitevents; /* Set of events to be waited for */ uint32_t waitmask; /* Interrupt enables for event waiting */ volatile sdio_eventset_t wkupevent; /* The event that caused the wakeup */ - WDOG_ID waitwdog; /* Watchdog that handles event timeouts */ + struct wdog_s waitwdog; /* Watchdog that handles event timeouts */ /* Callback support */ @@ -1131,7 +1131,7 @@ static void lpc17_40_endwait(struct lpc17_40_dev_s *priv, { /* Cancel the watchdog timeout */ - wd_cancel(priv->waitwdog); + wd_cancel(&priv->waitwdog); /* Disable event-related interrupts */ @@ -1495,7 +1495,7 @@ static void lpc17_40_reset(FAR struct sdio_dev_s *dev) priv->xfrflags = 0; /* Used to synchronize SD card and DMA completion events */ #endif - wd_cancel(priv->waitwdog); /* Cancel any timeouts */ + wd_cancel(&priv->waitwdog); /* Cancel any timeouts */ /* Interrupt mode data transfer support */ @@ -1914,7 +1914,7 @@ static int lpc17_40_cancel(FAR struct sdio_dev_s *dev) /* Cancel any watchdog timeout */ - wd_cancel(priv->waitwdog); + wd_cancel(&priv->waitwdog); /* If this was a DMA transfer, make sure that DMA is stopped */ @@ -2344,7 +2344,7 @@ static sdio_eventset_t lpc17_40_eventwait(FAR struct sdio_dev_s *dev, /* Start the watchdog timer */ delay = MSEC2TICK(timeout); - ret = wd_start(priv->waitwdog, delay, + ret = wd_start(&priv->waitwdog, delay, lpc17_40_eventtimeout, 1, (wdparm_t)priv); if (ret < 0) { @@ -2373,7 +2373,7 @@ static sdio_eventset_t lpc17_40_eventwait(FAR struct sdio_dev_s *dev, * return an SDIO error. */ - wd_cancel(priv->waitwdog); + wd_cancel(&priv->waitwdog); leave_critical_section(flags); return SDIOWAIT_ERROR; } @@ -2793,11 +2793,6 @@ FAR struct sdio_dev_s *sdio_initialize(int slotno) nxsem_set_protocol(&priv->waitsem, SEM_PRIO_NONE); - /* Create a watchdog timer */ - - priv->waitwdog = wd_create(); - DEBUGASSERT(priv->waitwdog); - #ifdef CONFIG_LPC17_40_SDCARD_DMA /* Configure the SDCARD DMA request */ diff --git a/arch/arm/src/lpc2378/lpc23xx_i2c.c b/arch/arm/src/lpc2378/lpc23xx_i2c.c index 05bdf561ecf..8d374bd9ff5 100644 --- a/arch/arm/src/lpc2378/lpc23xx_i2c.c +++ b/arch/arm/src/lpc2378/lpc23xx_i2c.c @@ -118,7 +118,7 @@ struct lpc2378_i2cdev_s sem_t mutex; /* Only one thread can access at a time */ sem_t wait; /* Place to wait for state machine completion */ volatile uint8_t state; /* State of state machine */ - WDOG_ID timeout; /* Watchdog to timeout when bus hung */ + struct wdog_s timeout; /* Watchdog to timeout when bus hung */ uint32_t frequency; /* Current I2C frequency */ struct i2c_msg_s *msgs; /* remaining transfers - first one is in progress */ @@ -220,11 +220,11 @@ static int lpc2378_i2c_start(struct lpc2378_i2cdev_s *priv) priv->base + I2C_CONCLR_OFFSET); putreg32(I2C_CONSET_STA, priv->base + I2C_CONSET_OFFSET); - wd_start(priv->timeout, I2C_TIMEOUT, + wd_start(&priv->timeout, I2C_TIMEOUT, lpc2378_i2c_timeout, 1, (wdparm_t)priv); nxsem_wait(&priv->wait); - wd_cancel(priv->timeout); + wd_cancel(&priv->timeout); return priv->nmsg; } @@ -590,11 +590,6 @@ struct i2c_master_s *lpc2378_i2cbus_initialize(int port) nxsem_set_protocol(&priv->wait, SEM_PRIO_NONE); - /* Allocate a watchdog timer */ - - priv->timeout = wd_create(); - DEBUGASSERT(priv->timeout != 0); - /* Attach Interrupt Handler */ irq_attach(priv->irqid, lpc2378_i2c_interrupt, priv); @@ -630,10 +625,9 @@ int lpc2378_i2cbus_uninitialize(FAR struct i2c_master_s * dev) nxsem_destroy(&priv->mutex); nxsem_destroy(&priv->wait); - /* Free the watchdog timer */ + /* Cancel the watchdog timer */ - wd_delete(priv->timeout); - priv->timeout = NULL; + wd_cancel(&priv->timeout); /* Disable interrupts */ diff --git a/arch/arm/src/lpc31xx/lpc31_i2c.c b/arch/arm/src/lpc31xx/lpc31_i2c.c index c26751baea2..4c1293bc6e4 100644 --- a/arch/arm/src/lpc31xx/lpc31_i2c.c +++ b/arch/arm/src/lpc31xx/lpc31_i2c.c @@ -91,7 +91,7 @@ struct lpc31_i2cdev_s sem_t mutex; /* Only one thread can access at a time */ sem_t wait; /* Place to wait for state machine completion */ volatile uint8_t state; /* State of state machine */ - WDOG_ID timeout; /* Watchdog to timeout when bus hung */ + struct wdog_s timeout; /* Watchdog to timeout when bus hung */ uint32_t frequency; /* Current I2C frequency */ struct i2c_msg_s *msgs; /* remaining transfers - first one is in progress */ @@ -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, 1, (wdparm_t)priv); /* Wait for the transfer to complete */ @@ -524,7 +524,7 @@ static int i2c_transfer(FAR struct i2c_master_s *dev, nxsem_wait(&priv->wait); } - wd_cancel(priv->timeout); + wd_cancel(&priv->timeout); ret = count - priv->nmsg; leave_critical_section(flags); @@ -597,11 +597,6 @@ struct i2c_master_s *lpc31_i2cbus_initialize(int port) i2c_hwreset(priv); - /* Allocate a watchdog timer */ - - priv->timeout = wd_create(); - DEBUGASSERT(priv->timeout != 0); - /* Attach Interrupt Handler */ irq_attach(priv->irqid, i2c_interrupt, priv); diff --git a/arch/arm/src/lpc43xx/lpc43_ethernet.c b/arch/arm/src/lpc43xx/lpc43_ethernet.c index a3faa624394..cf2b14232d3 100644 --- a/arch/arm/src/lpc43xx/lpc43_ethernet.c +++ b/arch/arm/src/lpc43xx/lpc43_ethernet.c @@ -526,8 +526,8 @@ struct lpc43_ethmac_s uint8_t ifup : 1; /* true:ifup false:ifdown */ uint8_t mbps100 : 1; /* 100MBps operation (vs 10 MBps) */ uint8_t fduplex : 1; /* Full (vs. half) duplex */ - WDOG_ID txpoll; /* TX poll timer */ - WDOG_ID txtimeout; /* TX timeout timer */ + struct wdog_s txpoll; /* TX poll timer */ + struct wdog_s txtimeout; /* TX timeout timer */ struct work_s irqwork; /* For deferring work to the work queue */ struct work_s pollwork; /* For deferring work to the work queue */ @@ -1117,7 +1117,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, + wd_start(&priv->txtimeout, LPC43_TXTIMEOUT, lpc43_txtimeout_expiry, 1, (wdparm_t)priv); return OK; } @@ -1897,7 +1897,7 @@ static void lpc43_txdone(FAR struct lpc43_ethmac_s *priv) { /* Cancel the TX timeout */ - wd_cancel(priv->txtimeout); + wd_cancel(&priv->txtimeout); /* And disable further TX interrupts. */ @@ -2055,7 +2055,7 @@ static int lpc43_interrupt(int irq, FAR void *context, FAR void *arg) * expiration and the deferred interrupt processing. */ - wd_cancel(priv->txtimeout); + wd_cancel(&priv->txtimeout); } /* Schedule to perform the interrupt processing on the worker thread. */ @@ -2209,7 +2209,7 @@ static void lpc43_poll_work(FAR void *arg) /* Setup the watchdog poll timer again */ - wd_start(priv->txpoll, LPC43_WDDELAY, + wd_start(&priv->txpoll, LPC43_WDDELAY, lpc43_poll_expiry, 1, (wdparm_t)priv); net_unlock(); } @@ -2286,7 +2286,7 @@ static int lpc43_ifup(struct net_driver_s *dev) /* Set and activate a timer process */ - wd_start(priv->txpoll, LPC43_WDDELAY, + wd_start(&priv->txpoll, LPC43_WDDELAY, lpc43_poll_expiry, 1, (wdparm_t)priv); /* Enable the Ethernet interrupt */ @@ -2329,8 +2329,8 @@ static int lpc43_ifdown(struct net_driver_s *dev) /* Cancel the TX poll timer and TX timeout timers */ - wd_cancel(priv->txpoll); - wd_cancel(priv->txtimeout); + wd_cancel(&priv->txpoll); + wd_cancel(&priv->txtimeout); /* Put the EMAC in its reset, non-operational state. This should be * a known configuration that will guarantee the lpc43_ifup() always @@ -3883,12 +3883,7 @@ static inline int lpc43_ethinitialize(void) #ifdef CONFIG_NETDEV_IOCTL priv->dev.d_ioctl = lpc43_ioctl; /* Support PHY ioctl() calls */ #endif - priv->dev.d_private = (void *)&g_lpc43ethmac; /* Used to recover private state from dev */ - - /* Create a watchdog for timing polling for and timing of transmission */ - - priv->txpoll = wd_create(); /* Create periodic poll timer */ - priv->txtimeout = wd_create(); /* Create TX timeout timer */ + priv->dev.d_private = &g_lpc43ethmac; /* Used to recover private state from dev */ /* Configure GPIO pins to support Ethernet */ diff --git a/arch/arm/src/lpc43xx/lpc43_i2c.c b/arch/arm/src/lpc43xx/lpc43_i2c.c index bcac1504e39..9f62eb2e566 100644 --- a/arch/arm/src/lpc43xx/lpc43_i2c.c +++ b/arch/arm/src/lpc43xx/lpc43_i2c.c @@ -107,7 +107,7 @@ struct lpc43_i2cdev_s sem_t mutex; /* Only one thread can access at a time */ sem_t wait; /* Place to wait for state machine completion */ volatile uint8_t state; /* State of state machine */ - WDOG_ID timeout; /* watchdog to timeout when bus hung */ + struct wdog_s timeout; /* watchdog to timeout when bus hung */ uint32_t frequency; /* Current I2C frequency */ struct i2c_msg_s *msgs; /* remaining transfers - first one is in progress */ @@ -202,11 +202,11 @@ static int lpc43_i2c_start(struct lpc43_i2cdev_s *priv) priv->base + LPC43_I2C_CONCLR_OFFSET); putreg32(I2C_CONSET_STA, priv->base + LPC43_I2C_CONSET_OFFSET); - wd_start(priv->timeout, I2C_TIMEOUT, + wd_start(&priv->timeout, I2C_TIMEOUT, lpc43_i2c_timeout, 1, (wdparm_t)priv); nxsem_wait(&priv->wait); - wd_cancel(priv->timeout); + wd_cancel(&priv->timeout); return priv->nmsg; } @@ -538,11 +538,6 @@ struct i2c_master_s *lpc43_i2cbus_initialize(int port) nxsem_set_protocol(&priv->wait, SEM_PRIO_NONE); - /* Allocate a watchdog timer */ - - priv->timeout = wd_create(); - DEBUGASSERT(priv->timeout != 0); - /* Attach Interrupt Handler */ irq_attach(priv->irqid, lpc43_i2c_interrupt, priv); diff --git a/arch/arm/src/lpc43xx/lpc43_sdmmc.c b/arch/arm/src/lpc43xx/lpc43_sdmmc.c index 87c96a739be..dc2cb8c2014 100644 --- a/arch/arm/src/lpc43xx/lpc43_sdmmc.c +++ b/arch/arm/src/lpc43xx/lpc43_sdmmc.c @@ -230,7 +230,7 @@ struct lpc43_dev_s sdio_eventset_t waitevents; /* Set of events to be waited for */ uint32_t waitmask; /* Interrupt enables for event waiting */ volatile sdio_eventset_t wkupevent; /* The event that caused the wakeup */ - WDOG_ID waitwdog; /* Watchdog that handles event timeouts */ + struct wdog_s waitwdog; /* Watchdog that handles event timeouts */ /* Callback support */ @@ -885,7 +885,7 @@ static void lpc43_endwait(struct lpc43_dev_s *priv, /* Cancel the watchdog timeout */ - wd_cancel(priv->waitwdog); + wd_cancel(&priv->waitwdog); /* Disable event-related interrupts */ @@ -1297,7 +1297,7 @@ static void lpc43_reset(FAR struct sdio_dev_s *dev) priv->waitmask = 0; /* Interrupt enables for event waiting */ priv->wkupevent = 0; /* The event that caused the wakeup */ - wd_cancel(priv->waitwdog); /* Cancel any timeouts */ + wd_cancel(&priv->waitwdog); /* Cancel any timeouts */ /* Interrupt mode data transfer support */ @@ -1878,7 +1878,7 @@ static int lpc43_cancel(FAR struct sdio_dev_s *dev) /* Cancel any watchdog timeout */ - wd_cancel(priv->waitwdog); + wd_cancel(&priv->waitwdog); /* Mark no transfer in progress */ @@ -2313,7 +2313,7 @@ static sdio_eventset_t lpc43_eventwait(FAR struct sdio_dev_s *dev, /* Start the watchdog timer */ delay = MSEC2TICK(timeout); - ret = wd_start(priv->waitwdog, delay, + ret = wd_start(&priv->waitwdog, delay, lpc43_eventtimeout, 1, (wdparm_t)priv); if (ret < 0) { @@ -2341,7 +2341,7 @@ static sdio_eventset_t lpc43_eventwait(FAR struct sdio_dev_s *dev, * return an SDIO error. */ - wd_cancel(priv->waitwdog); + wd_cancel(&priv->waitwdog); leave_critical_section(flags); return SDIOWAIT_ERROR; } @@ -2883,11 +2883,6 @@ FAR struct sdio_dev_s *lpc43_sdmmc_initialize(int slotno) nxsem_set_protocol(&priv->waitsem, SEM_PRIO_NONE); - /* Create a watchdog timer */ - - priv->waitwdog = wd_create(); - DEBUGASSERT(priv->waitwdog != NULL); - /* Configure GPIOs for 4-bit, wide-bus operation */ lpc43_pin_config(GPIO_SD_D0); diff --git a/arch/arm/src/lpc54xx/lpc54_ethernet.c b/arch/arm/src/lpc54xx/lpc54_ethernet.c index a3d8eb67a17..6f704746236 100644 --- a/arch/arm/src/lpc54xx/lpc54_ethernet.c +++ b/arch/arm/src/lpc54xx/lpc54_ethernet.c @@ -296,8 +296,8 @@ struct lpc54_ethdriver_s uint8_t eth_fullduplex : 1; /* 1:Full duplex 0:Half duplex mode */ uint8_t eth_100mbps : 1; /* 1:100mbps 0:10mbps */ uint8_t eth_rxdiscard : 1; /* 1:Discarding Rx data */ - WDOG_ID eth_txpoll; /* TX poll timer */ - WDOG_ID eth_txtimeout; /* TX timeout timer */ + struct wdog_s eth_txpoll; /* TX poll timer */ + struct wdog_s eth_txtimeout; /* TX timeout timer */ struct work_s eth_irqwork; /* For deferring interrupt work to the work queue */ struct work_s eth_pollwork; /* For deferring poll work to the work queue */ struct work_s eth_timeoutwork; /* For deferring timeout work to the work queue */ @@ -686,7 +686,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, + wd_start(&priv->eth_txtimeout, LPC54_TXTIMEOUT, lpc54_eth_txtimeout_expiry, 1, (wdparm_t)priv); return OK; } @@ -1322,7 +1322,7 @@ static void lpc54_eth_txdone(struct lpc54_ethdriver_s *priv, if (txring->tr_inuse == 0) #endif { - wd_cancel(priv->eth_txtimeout); + wd_cancel(&priv->eth_txtimeout); work_cancel(ETHWORK, &priv->eth_timeoutwork); } @@ -1858,7 +1858,7 @@ static void lpc54_eth_poll_work(void *arg) /* Setup the watchdog poll timer again */ - wd_start(priv->eth_txpoll, LPC54_WDDELAY, + wd_start(&priv->eth_txpoll, LPC54_WDDELAY, lpc54_eth_poll_expiry, 1, (wdparm_t)priv); net_unlock(); } @@ -2169,7 +2169,7 @@ static int lpc54_eth_ifup(struct net_driver_s *dev) /* Set and activate a timer process */ - wd_start(priv->eth_txpoll, LPC54_WDDELAY, + wd_start(&priv->eth_txpoll, LPC54_WDDELAY, lpc54_eth_poll_expiry, 1, (wdparm_t)priv); /* Enable the Ethernet interrupt */ @@ -2211,8 +2211,8 @@ static int lpc54_eth_ifdown(struct net_driver_s *dev) /* Cancel the TX poll timer and TX timeout timers */ - wd_cancel(priv->eth_txpoll); - wd_cancel(priv->eth_txtimeout); + wd_cancel(&priv->eth_txpoll); + wd_cancel(&priv->eth_txtimeout); /* Put the EMAC in its post-reset, non-operational state. This should be * a known configuration that will guarantee the lpc54_eth_ifup() always @@ -3085,14 +3085,7 @@ int arm_netinitialize(int intf) #ifdef CONFIG_NETDEV_IOCTL priv->eth_dev.d_ioctl = lpc54_eth_ioctl; /* Handle network IOCTL commands */ #endif - priv->eth_dev.d_private = (void *)&g_ethdriver; /* Used to recover private state from dev */ - - /* Create a watchdog for timing polling for and timing of transmissions */ - - priv->eth_txpoll = wd_create(); /* Create periodic poll timer */ - priv->eth_txtimeout = wd_create(); /* Create TX timeout timer */ - - DEBUGASSERT(priv->eth_txpoll != NULL && priv->eth_txtimeout != NULL); + priv->eth_dev.d_private = &g_ethdriver; /* Used to recover private state from dev */ /* Configure GPIO pins to support Ethernet */ diff --git a/arch/arm/src/lpc54xx/lpc54_i2c_master.c b/arch/arm/src/lpc54xx/lpc54_i2c_master.c index 6903bad0b50..7a98c168f31 100644 --- a/arch/arm/src/lpc54xx/lpc54_i2c_master.c +++ b/arch/arm/src/lpc54xx/lpc54_i2c_master.c @@ -128,7 +128,7 @@ struct lpc54_i2cdev_s struct i2c_master_s dev; /* Generic I2C device */ uintptr_t base; /* Base address of Flexcomm registers */ - WDOG_ID timeout; /* Watchdog to timeout when bus hung */ + struct wdog_s timeout; /* Watchdog to timeout when bus hung */ uint32_t frequency; /* Current I2C frequency */ uint32_t fclock; /* Flexcomm function clock frequency */ @@ -476,7 +476,7 @@ static bool lpc54_i2c_nextmsg(struct lpc54_i2cdev_s *priv) * Cancel any timeout */ - wd_cancel(priv->timeout); + wd_cancel(&priv->timeout); /* Disable further I2C interrupts and return to the IDLE state */ @@ -767,7 +767,7 @@ static int lpc54_i2c_transfer(FAR struct i2c_master_s *dev, /* Set up the transfer timeout */ - wd_start(priv->timeout, priv->nmsgs * I2C_WDOG_TIMEOUT, + wd_start(&priv->timeout, priv->nmsgs * I2C_WDOG_TIMEOUT, lpc54_i2c_timeout, 1, (wdparm_t)priv); /* Initiate the transfer */ @@ -1218,11 +1218,6 @@ struct i2c_master_s *lpc54_i2cbus_initialize(int port) nxsem_set_protocol(&priv->waitsem, SEM_PRIO_NONE); #endif - /* Allocate a watchdog timer */ - - priv->timeout = wd_create(); - DEBUGASSERT(priv->timeout != 0); - #ifndef CONFIG_I2C_POLLED /* Attach Interrupt Handler */ diff --git a/arch/arm/src/lpc54xx/lpc54_sdmmc.c b/arch/arm/src/lpc54xx/lpc54_sdmmc.c index c7acedcfa1c..b94c124b474 100644 --- a/arch/arm/src/lpc54xx/lpc54_sdmmc.c +++ b/arch/arm/src/lpc54xx/lpc54_sdmmc.c @@ -234,7 +234,7 @@ struct lpc54_dev_s sdio_eventset_t waitevents; /* Set of events to be waited for */ uint32_t waitmask; /* Interrupt enables for event waiting */ volatile sdio_eventset_t wkupevent; /* The event that caused the wakeup */ - WDOG_ID waitwdog; /* Watchdog that handles event timeouts */ + struct wdog_s waitwdog; /* Watchdog that handles event timeouts */ /* Callback support */ @@ -885,7 +885,7 @@ static void lpc54_endwait(struct lpc54_dev_s *priv, /* Cancel the watchdog timeout */ - wd_cancel(priv->waitwdog); + wd_cancel(&priv->waitwdog); /* Disable event-related interrupts */ @@ -1297,7 +1297,7 @@ static void lpc54_reset(FAR struct sdio_dev_s *dev) priv->waitmask = 0; /* Interrupt enables for event waiting */ priv->wkupevent = 0; /* The event that caused the wakeup */ - wd_cancel(priv->waitwdog); /* Cancel any timeouts */ + wd_cancel(&priv->waitwdog); /* Cancel any timeouts */ /* Interrupt mode data transfer support */ @@ -1878,7 +1878,7 @@ static int lpc54_cancel(FAR struct sdio_dev_s *dev) /* Cancel any watchdog timeout */ - wd_cancel(priv->waitwdog); + wd_cancel(&priv->waitwdog); /* Mark no transfer in progress */ @@ -2313,7 +2313,7 @@ static sdio_eventset_t lpc54_eventwait(FAR struct sdio_dev_s *dev, /* Start the watchdog timer */ delay = MSEC2TICK(timeout); - ret = wd_start(priv->waitwdog, delay, + ret = wd_start(&priv->waitwdog, delay, lpc54_eventtimeout, 1, (wdparm_t)priv); if (ret < 0) { @@ -2341,7 +2341,7 @@ static sdio_eventset_t lpc54_eventwait(FAR struct sdio_dev_s *dev, * return an SDIO error. */ - wd_cancel(priv->waitwdog); + wd_cancel(&priv->waitwdog); leave_critical_section(flags); return SDIOWAIT_ERROR; } @@ -2890,11 +2890,6 @@ FAR struct sdio_dev_s *lpc54_sdmmc_initialize(int slotno) nxsem_set_protocol(&priv->waitsem, SEM_PRIO_NONE); - /* Create a watchdog timer */ - - priv->waitwdog = wd_create(); - DEBUGASSERT(priv->waitwdog != NULL); - /* Configure GPIOs for 4-bit, wide-bus operation */ lpc54_gpio_config(GPIO_SD_D0); diff --git a/arch/arm/src/s32k1xx/s32k1xx_enet.c b/arch/arm/src/s32k1xx/s32k1xx_enet.c index 9906817474f..1302fec4626 100644 --- a/arch/arm/src/s32k1xx/s32k1xx_enet.c +++ b/arch/arm/src/s32k1xx/s32k1xx_enet.c @@ -271,8 +271,8 @@ struct s32k1xx_driver_s uint8_t txhead; /* The next TX descriptor to use */ uint8_t rxtail; /* The next RX descriptor to use */ uint8_t phyaddr; /* Selected PHY address */ - WDOG_ID txpoll; /* TX poll timer */ - WDOG_ID txtimeout; /* TX timeout timer */ + struct wdog_s txpoll; /* TX poll timer */ + struct wdog_s txtimeout; /* TX timeout timer */ struct work_s irqwork; /* For deferring interrupt work to the work queue */ struct work_s pollwork; /* For deferring poll work to the work queue */ struct enet_desc_s *txdesc; /* A pointer to the list of TX descriptor */ @@ -572,7 +572,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, + wd_start(&priv->txtimeout, S32K1XX_TXTIMEOUT, s32k1xx_txtimeout_expiry, 1, (wdparm_t)priv); /* Start the TX transfer (if it was not already waiting for buffers) */ @@ -921,7 +921,7 @@ static void s32k1xx_txdone(FAR struct s32k1xx_driver_s *priv) * canceled. */ - wd_cancel(priv->txtimeout); + wd_cancel(&priv->txtimeout); /* Verify that the oldest descriptor descriptor completed */ @@ -963,7 +963,7 @@ static void s32k1xx_txdone(FAR struct s32k1xx_driver_s *priv) { /* No.. Cancel the TX timeout and disable further Tx interrupts. */ - wd_cancel(priv->txtimeout); + wd_cancel(&priv->txtimeout); regval = getreg32(S32K1XX_ENET_EIMR); regval &= ~TX_INTERRUPTS; @@ -1250,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, + wd_start(&priv->txpoll, S32K1XX_WDDELAY, s32k1xx_polltimer_expiry, 1, (wdparm_t)priv); net_unlock(); } @@ -1382,7 +1382,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, + wd_start(&priv->txpoll, S32K1XX_WDDELAY, s32k1xx_polltimer_expiry, 1, (wdparm_t)priv); /* Clear all pending ENET interrupt */ @@ -1470,8 +1470,8 @@ static int s32k1xx_ifdown(struct net_driver_s *dev) /* Cancel the TX poll timer and TX timeout timers */ - wd_cancel(priv->txpoll); - wd_cancel(priv->txtimeout); + wd_cancel(&priv->txpoll); + wd_cancel(&priv->txtimeout); /* Put the EMAC in its reset, non-operational state. This should be * a known configuration that will guarantee the s32k1xx_ifup() always @@ -2605,12 +2605,7 @@ int s32k1xx_netinitialize(int intf) #ifdef CONFIG_NETDEV_IOCTL priv->dev.d_ioctl = s32k1xx_ioctl; /* Support PHY ioctl() calls */ #endif - priv->dev.d_private = (void *)g_enet; /* Used to recover private state from dev */ - - /* Create a watchdog for timing polling for and timing of transmissions */ - - priv->txpoll = wd_create(); /* Create periodic poll timer */ - priv->txtimeout = wd_create(); /* Create TX timeout timer */ + priv->dev.d_private = g_enet; /* Used to recover private state from dev */ #ifdef CONFIG_NET_ETHERNET /* Determine a semi-unique MAC address from MCU UID diff --git a/arch/arm/src/s32k1xx/s32k1xx_flexcan.c b/arch/arm/src/s32k1xx/s32k1xx_flexcan.c index b7ab4a52475..cdf407afb76 100644 --- a/arch/arm/src/s32k1xx/s32k1xx_flexcan.c +++ b/arch/arm/src/s32k1xx/s32k1xx_flexcan.c @@ -295,7 +295,7 @@ struct s32k1xx_driver_s uint32_t base; /* FLEXCAN base address */ bool bifup; /* true:ifup false:ifdown */ #ifdef TX_TIMEOUT_WQ - WDOG_ID txtimeout[TXMBCOUNT]; /* TX timeout timer */ + struct wdog_s txtimeout[TXMBCOUNT]; /* TX timeout timer */ #endif struct work_s irqwork; /* For deferring interrupt work to the wq */ struct work_s pollwork; /* For deferring poll work to the work wq */ @@ -752,7 +752,7 @@ static int s32k1xx_transmit(FAR struct s32k1xx_driver_s *priv) if (timeout >= 0) { - wd_start(priv->txtimeout[mbi], timeout + 1, + wd_start(&priv->txtimeout[mbi], timeout + 1, s32k1xx_txtimeout_expiry, 1, (wdparm_t)priv); } #endif @@ -1004,7 +1004,7 @@ static void s32k1xx_txdone(FAR void *arg) * corresponding watchdog can be canceled. */ - wd_cancel(priv->txtimeout[mbi]); + wd_cancel(&priv->txtimeout[mbi]); #endif } @@ -1861,15 +1861,7 @@ int s32k1xx_caninitialize(int intf) #ifdef CONFIG_NETDEV_IOCTL priv->dev.d_ioctl = s32k1xx_ioctl; /* Support CAN ioctl() calls */ #endif - priv->dev.d_private = (void *)priv; /* Used to recover private state from dev */ - -#ifdef TX_TIMEOUT_WQ - for (i = 0; i < TXMBCOUNT; i++) - { - priv->txtimeout[i] = wd_create(); /* Create TX timeout timer */ - } - -#endif + priv->dev.d_private = priv; /* Used to recover private state from dev */ priv->rx = (struct mb_s *)(priv->base + S32K1XX_CAN_MB_OFFSET); priv->tx = (struct mb_s *)(priv->base + S32K1XX_CAN_MB_OFFSET + (sizeof(struct mb_s) * RXMBCOUNT)); diff --git a/arch/arm/src/sam34/sam_emac.c b/arch/arm/src/sam34/sam_emac.c index 606d900229f..49633c9558c 100644 --- a/arch/arm/src/sam34/sam_emac.c +++ b/arch/arm/src/sam34/sam_emac.c @@ -271,8 +271,8 @@ struct sam_emac_s { uint8_t ifup : 1; /* true:ifup false:ifdown */ - WDOG_ID txpoll; /* TX poll timer */ - WDOG_ID txtimeout; /* TX timeout timer */ + struct wdog_s txpoll; /* TX poll timer */ + struct wdog_s txtimeout; /* TX timeout timer */ struct work_s irqwork; /* For deferring interrupt work to the work queue */ struct work_s pollwork; /* For deferring poll work to the work queue */ @@ -814,7 +814,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, + wd_start(&priv->txtimeout, SAM_TXTIMEOUT, sam_txtimeout_expiry, 1, (wdparm_t)priv); /* Set d_len to zero meaning that the d_buf[] packet buffer is again @@ -1675,7 +1675,7 @@ static int sam_emac_interrupt(int irq, void *context, FAR void *arg) * expiration and the deferred interrupt processing. */ - wd_cancel(priv->txtimeout); + wd_cancel(&priv->txtimeout); } /* Schedule to perform the interrupt processing on the worker thread. */ @@ -1792,7 +1792,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, 1, (wdparm_t)priv); net_unlock(); } @@ -1891,7 +1891,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, 1, (wdparm_t)priv); /* Enable the EMAC interrupt */ @@ -1930,8 +1930,8 @@ static int sam_ifdown(struct net_driver_s *dev) /* Cancel the TX poll timer and TX timeout timers */ - wd_cancel(priv->txpoll); - wd_cancel(priv->txtimeout); + wd_cancel(&priv->txpoll); + wd_cancel(&priv->txtimeout); /* Put the EMAC in its reset, non-operational state. This should be * a known configuration that will guarantee the sam_ifup() always @@ -3682,23 +3682,7 @@ void arm_netinitialize(void) #ifdef CONFIG_NETDEV_IOCTL priv->dev.d_ioctl = sam_ioctl; /* Support PHY ioctl() calls */ #endif - priv->dev.d_private = (void *)&g_emac; /* Used to recover private state from dev */ - - /* Create a watchdog for timing polling for and timing of transmissions */ - - priv->txpoll = wd_create(); - if (!priv->txpoll) - { - nerr("ERROR: Failed to create periodic poll timer\n"); - return; - } - - priv->txtimeout = wd_create(); /* Create TX timeout timer */ - if (!priv->txtimeout) - { - nerr("ERROR: Failed to create periodic poll timer\n"); - goto errout_with_txpoll; - } + priv->dev.d_private = &g_emac; /* Used to recover private state from dev */ /* Configure PIO pins to support EMAC MII */ @@ -3710,7 +3694,7 @@ void arm_netinitialize(void) if (ret < 0) { nerr("ERROR: sam_buffer_initialize failed: %d\n", ret); - goto errout_with_txtimeout; + return; } /* Attach the IRQ to the driver. It will not be enabled at the AIC until @@ -3751,10 +3735,6 @@ void arm_netinitialize(void) errout_with_buffers: sam_buffer_free(priv); -errout_with_txtimeout: - wd_delete(priv->txtimeout); -errout_with_txpoll: - wd_delete(priv->txpoll); } #endif /* CONFIG_NET && CONFIG_SAM34_EMAC */ diff --git a/arch/arm/src/sam34/sam_hsmci.c b/arch/arm/src/sam34/sam_hsmci.c index 2b6495848b2..973940783c8 100644 --- a/arch/arm/src/sam34/sam_hsmci.c +++ b/arch/arm/src/sam34/sam_hsmci.c @@ -312,7 +312,7 @@ struct sam_dev_s uint32_t cmdrmask; /* Interrupt enables for this * particular cmd/response */ volatile sdio_eventset_t wkupevent; /* The event that caused the wakeup */ - WDOG_ID waitwdog; /* Watchdog that handles event timeouts */ + struct wdog_s waitwdog; /* Watchdog that handles event timeouts */ #ifdef CONFIG_SAM34_DMAC0 bool dmabusy; /* TRUE: DMA is in progress */ #endif @@ -1128,7 +1128,7 @@ static void sam_endwait(struct sam_dev_s *priv, sdio_eventset_t wkupevent) { /* Cancel the watchdog timeout */ - wd_cancel(priv->waitwdog); + wd_cancel(&priv->waitwdog); /* Disable event-related interrupts and save wakeup event */ @@ -1463,7 +1463,7 @@ static void sam_reset(FAR struct sdio_dev_s *dev) priv->dmabusy = false; /* No DMA in progress */ #endif - wd_cancel(priv->waitwdog); /* Cancel any timeouts */ + wd_cancel(&priv->waitwdog); /* Cancel any timeouts */ /* Interrupt mode data transfer support */ @@ -1890,7 +1890,7 @@ static int sam_cancel(FAR struct sdio_dev_s *dev) /* Cancel any watchdog timeout */ - wd_cancel(priv->waitwdog); + wd_cancel(&priv->waitwdog); /* Make sure that the DMA is stopped (it will be stopped automatically * on normal transfers, but not necessarily when the transfer terminates @@ -2328,7 +2328,7 @@ static sdio_eventset_t sam_eventwait(FAR struct sdio_dev_s *dev, /* Start the watchdog timer */ delay = MSEC2TICK(timeout); - ret = wd_start(priv->waitwdog, delay, + ret = wd_start(&priv->waitwdog, delay, sam_eventtimeout, 1, (wdparm_t)priv); if (ret < 0) { @@ -2356,7 +2356,7 @@ static sdio_eventset_t sam_eventwait(FAR struct sdio_dev_s *dev, * disable all event, and return an SDIO error. */ - wd_cancel(priv->waitwdog); + wd_cancel(&priv->waitwdog); sam_disablexfrints(priv); sam_disablewaitints(priv, SDIOWAIT_ERROR); return SDIOWAIT_ERROR; @@ -2721,11 +2721,6 @@ FAR struct sdio_dev_s *sdio_initialize(int slotno) nxsem_set_protocol(&priv->waitsem, SEM_PRIO_NONE); - /* Create a watchdog timer */ - - priv->waitwdog = wd_create(); - DEBUGASSERT(priv->waitwdog); - #ifdef CONFIG_SAM34_DMAC0 /* Allocate a DMA channel. A FIFO size of 8 is sufficient. */ diff --git a/arch/arm/src/sam34/sam_spi.c b/arch/arm/src/sam34/sam_spi.c index 985a5e1ab79..030b0f4c47f 100644 --- a/arch/arm/src/sam34/sam_spi.c +++ b/arch/arm/src/sam34/sam_spi.c @@ -179,7 +179,7 @@ struct sam_spics_s #ifdef CONFIG_SAM34_SPI_DMA bool candma; /* DMA is supported */ sem_t dmawait; /* Used to wait for DMA completion */ - WDOG_ID dmadog; /* Watchdog that handles DMA timeouts */ + struct wdog_s dmadog; /* Watchdog that handles DMA timeouts */ int result; /* DMA result */ DMA_HANDLE rxdma; /* SPI RX DMA handle */ DMA_HANDLE txdma; /* SPI TX DMA handle */ @@ -781,7 +781,7 @@ static void spi_rxcallback(DMA_HANDLE handle, void *arg, int result) /* Cancel the watchdog timeout */ - wd_cancel(spics->dmadog); + wd_cancel(&spics->dmadog); /* Sample DMA registers at the time of the callback */ @@ -1589,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, + ret = wd_start(&spics->dmadog, DMA_TIMEOUT_TICKS, spi_dmatimeout, 1, (wdparm_t)spics); if (ret < 0) { @@ -1602,7 +1602,7 @@ static void spi_exchange(struct spi_dev_s *dev, const void *txbuffer, /* Cancel the watchdog timeout */ - wd_cancel(spics->dmadog); + wd_cancel(&spics->dmadog); /* Check if we were awakened by an error of some kind. */ @@ -1890,11 +1890,6 @@ struct spi_dev_s *sam_spibus_initialize(int port) nxsem_init(&spics->dmawait, 0, 0); nxsem_set_protocol(&spics->dmawait, SEM_PRIO_NONE); - - /* Create a watchdog time to catch DMA timeouts */ - - spics->dmadog = wd_create(); - DEBUGASSERT(spics->dmadog); #endif spi_dumpregs(spi, "After initialization"); diff --git a/arch/arm/src/sam34/sam_twi.c b/arch/arm/src/sam34/sam_twi.c index 31d5de09d2a..c8ec965193f 100644 --- a/arch/arm/src/sam34/sam_twi.c +++ b/arch/arm/src/sam34/sam_twi.c @@ -121,7 +121,7 @@ struct twi_dev_s sem_t exclsem; /* Only one thread can access at a time */ sem_t waitsem; /* Wait for TWI transfer completion */ - WDOG_ID timeout; /* Watchdog to recover from bus hangs */ + struct wdog_s timeout; /* Watchdog to recover from bus hangs */ volatile int result; /* The result of the transfer */ volatile int xfrd; /* Number of bytes transfers */ @@ -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, 1, (wdparm_t)priv); /* Wait for either the TWI transfer or the timeout to complete */ @@ -388,7 +388,7 @@ static int twi_wait(struct twi_dev_s *priv) if (ret < 0) { - wd_cancel(priv->timeout); + wd_cancel(&priv->timeout); return ret; } } @@ -413,7 +413,7 @@ static void twi_wakeup(struct twi_dev_s *priv, int result) { /* Cancel any pending timeout */ - wd_cancel(priv->timeout); + wd_cancel(&priv->timeout); /* Disable any further TWI interrupts */ @@ -983,11 +983,6 @@ struct i2c_master_s *sam_i2cbus_initialize(int bus) nxsem_set_protocol(&priv->waitsem, SEM_PRIO_NONE); - /* Allocate a watchdog timer */ - - priv->timeout = wd_create(); - DEBUGASSERT(priv->timeout != 0); - /* Configure and enable the TWI hardware */ priv->pid = pid; @@ -1027,10 +1022,9 @@ int sam_i2cbus_uninitialize(FAR struct i2c_master_s * dev) nxsem_destroy(&priv->exclsem); nxsem_destroy(&priv->waitsem); - /* Free the watchdog timer */ + /* Cancel the watchdog timer */ - wd_delete(priv->timeout); - priv->timeout = NULL; + wd_cancel(&priv->timeout); /* Detach Interrupt Handler */ diff --git a/arch/arm/src/sama5/sam_emaca.c b/arch/arm/src/sama5/sam_emaca.c index bead0e15232..adaa7f6bc5c 100644 --- a/arch/arm/src/sama5/sam_emaca.c +++ b/arch/arm/src/sama5/sam_emaca.c @@ -275,8 +275,8 @@ struct sam_emac_s { uint8_t ifup : 1; /* true:ifup false:ifdown */ - WDOG_ID txpoll; /* TX poll timer */ - WDOG_ID txtimeout; /* TX timeout timer */ + struct wdog_s txpoll; /* TX poll timer */ + struct wdog_s txtimeout; /* TX timeout timer */ struct work_s irqwork; /* For deferring interrupt work to the work queue */ struct work_s pollwork; /* For deferring poll work to the work queue */ @@ -822,7 +822,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, + wd_start(&priv->txtimeout, SAM_TXTIMEOUT, sam_txtimeout_expiry, 1, (wdparm_t)priv); /* Set d_len to zero meaning that the d_buf[] packet buffer is again @@ -1711,7 +1711,7 @@ static int sam_emac_interrupt(int irq, void *context, FAR void *arg) * expiration and the deferred interrupt processing. */ - wd_cancel(priv->txtimeout); + wd_cancel(&priv->txtimeout); } /* Schedule to perform the interrupt processing on the worker thread. */ @@ -1826,7 +1826,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, 1, (wdparm_t)priv); net_unlock(); } @@ -1925,7 +1925,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, 1, (wdparm_t)priv); /* Enable the EMAC interrupt */ @@ -1964,8 +1964,8 @@ static int sam_ifdown(struct net_driver_s *dev) /* Cancel the TX poll timer and TX timeout timers */ - wd_cancel(priv->txpoll); - wd_cancel(priv->txtimeout); + wd_cancel(&priv->txpoll); + wd_cancel(&priv->txtimeout); /* Put the EMAC in its reset, non-operational state. This should be * a known configuration that will guarantee the sam_ifup() always @@ -3719,25 +3719,7 @@ int sam_emac_initialize(void) #ifdef CONFIG_NETDEV_IOCTL priv->dev.d_ioctl = sam_ioctl; /* Support PHY ioctl() calls */ #endif - priv->dev.d_private = (void *)&g_emac; /* Used to recover private state from dev */ - - /* Create a watchdog for timing polling for and timing of transmissions */ - - priv->txpoll = wd_create(); - if (!priv->txpoll) - { - nerr("ERROR: Failed to create periodic poll timer\n"); - ret = -EAGAIN; - goto errout; - } - - priv->txtimeout = wd_create(); /* Create TX timeout timer */ - if (!priv->txtimeout) - { - nerr("ERROR: Failed to create periodic poll timer\n"); - ret = -EAGAIN; - goto errout_with_txpoll; - } + priv->dev.d_private = &g_emac; /* Used to recover private state from dev */ /* Configure PIO pins to support EMAC */ @@ -3749,7 +3731,7 @@ int sam_emac_initialize(void) if (ret < 0) { nerr("ERROR: sam_buffer_initialize failed: %d\n", ret); - goto errout_with_txtimeout; + return ret; } /* Attach the IRQ to the driver. It will not be enabled at the AIC until @@ -3790,11 +3772,6 @@ int sam_emac_initialize(void) errout_with_buffers: sam_buffer_free(priv); -errout_with_txtimeout: - wd_delete(priv->txtimeout); -errout_with_txpoll: - wd_delete(priv->txpoll); -errout: return ret; } diff --git a/arch/arm/src/sama5/sam_emacb.c b/arch/arm/src/sama5/sam_emacb.c index 3ce8ae6e0ed..9406cca746b 100644 --- a/arch/arm/src/sama5/sam_emacb.c +++ b/arch/arm/src/sama5/sam_emacb.c @@ -413,8 +413,8 @@ struct sam_emacattr_s struct sam_emac_s { uint8_t ifup : 1; /* true:ifup false:ifdown */ - WDOG_ID txpoll; /* TX poll timer */ - WDOG_ID txtimeout; /* TX timeout timer */ + struct wdog_s txpoll; /* TX poll timer */ + struct wdog_s txtimeout; /* TX timeout timer */ struct work_s irqwork; /* For deferring interrupt work to the work queue */ struct work_s pollwork; /* For deferring poll work to the work queue */ @@ -1163,7 +1163,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, + wd_start(&priv->txtimeout, SAM_TXTIMEOUT, sam_txtimeout_expiry, 1, (wdparm_t)priv); /* Set d_len to zero meaning that the d_buf[] packet buffer is again @@ -2076,7 +2076,7 @@ static int sam_emac_interrupt(int irq, void *context, FAR void *arg) * expiration and the deferred interrupt processing. */ - wd_cancel(priv->txtimeout); + wd_cancel(&priv->txtimeout); } /* Schedule to perform the interrupt processing on the worker thread. */ @@ -2191,7 +2191,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, 1, (wdparm_t)priv); net_unlock(); } @@ -2298,7 +2298,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, 1, (wdparm_t)priv); /* Enable the EMAC interrupt */ @@ -2337,8 +2337,8 @@ static int sam_ifdown(struct net_driver_s *dev) /* Cancel the TX poll timer and TX timeout timers */ - wd_cancel(priv->txpoll); - wd_cancel(priv->txtimeout); + wd_cancel(&priv->txpoll); + wd_cancel(&priv->txtimeout); /* Put the EMAC in its reset, non-operational state. This should be * a known configuration that will guarantee the sam_ifup() always @@ -4416,24 +4416,6 @@ int sam_emac_initialize(int intf) priv->dev.d_private = priv; /* Used to recover private state from dev */ - /* Create a watchdog for timing polling for and timing of transmissions */ - - priv->txpoll = wd_create(); - if (!priv->txpoll) - { - nerr("ERROR: Failed to create periodic poll timer\n"); - ret = -EAGAIN; - goto errout; - } - - priv->txtimeout = wd_create(); /* Create TX timeout timer */ - if (!priv->txtimeout) - { - nerr("ERROR: Failed to create periodic poll timer\n"); - ret = -EAGAIN; - goto errout_with_txpoll; - } - /* Configure PIO pins to support EMAC */ sam_ethgpioconfig(priv); @@ -4444,7 +4426,7 @@ int sam_emac_initialize(int intf) if (ret < 0) { nerr("ERROR: sam_buffer_initialize failed: %d\n", ret); - goto errout_with_txtimeout; + return ret; } /* Attach the IRQ to the driver. It will not be enabled at the AIC until @@ -4485,11 +4467,6 @@ int sam_emac_initialize(int intf) errout_with_buffers: sam_buffer_free(priv); -errout_with_txtimeout: - wd_delete(priv->txtimeout); -errout_with_txpoll: - wd_delete(priv->txpoll); -errout: return ret; } diff --git a/arch/arm/src/sama5/sam_gmac.c b/arch/arm/src/sama5/sam_gmac.c index 5a332a86d42..e12828d388e 100644 --- a/arch/arm/src/sama5/sam_gmac.c +++ b/arch/arm/src/sama5/sam_gmac.c @@ -201,8 +201,8 @@ struct sam_gmac_s { uint8_t ifup : 1; /* true:ifup false:ifdown */ - WDOG_ID txpoll; /* TX poll timer */ - WDOG_ID txtimeout; /* TX timeout timer */ + struct wdog_s txpoll; /* TX poll timer */ + struct wdog_s txtimeout; /* TX timeout timer */ struct work_s irqwork; /* For deferring interrupt work to the work queue */ struct work_s pollwork; /* For deferring poll work to the work queue */ @@ -764,7 +764,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, + wd_start(&priv->txtimeout, SAM_TXTIMEOUT, sam_txtimeout_expiry, 1, (wdparm_t)priv); /* Set d_len to zero meaning that the d_buf[] packet buffer is again @@ -1695,7 +1695,7 @@ static int sam_gmac_interrupt(int irq, void *context, FAR void *arg) * expiration and the deferred interrupt processing. */ - wd_cancel(priv->txtimeout); + wd_cancel(&priv->txtimeout); } /* Schedule to perform the interrupt processing on the worker thread. */ @@ -1810,7 +1810,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, 1, (wdparm_t)priv); net_unlock(); } @@ -1912,7 +1912,7 @@ static int sam_ifup(struct net_driver_s *dev) /* Set and activate a timer process */ - wd_start(priv->txpoll, SAM_WDDELAY, sam_poll_expiry, 1, (wdparm_t)priv); + wd_start(&priv->txpoll, SAM_WDDELAY, sam_poll_expiry, 1, (wdparm_t)priv); /* Enable the GMAC interrupt */ @@ -1951,8 +1951,8 @@ static int sam_ifdown(struct net_driver_s *dev) /* Cancel the TX poll timer and TX timeout timers */ - wd_cancel(priv->txpoll); - wd_cancel(priv->txtimeout); + wd_cancel(&priv->txpoll); + wd_cancel(&priv->txtimeout); /* Put the GMAC in its reset, non-operational state. This should be * a known configuration that will guarantee the sam_ifup() always @@ -3825,25 +3825,7 @@ int sam_gmac_initialize(void) #ifdef CONFIG_NETDEV_IOCTL priv->dev.d_ioctl = sam_ioctl; /* Support PHY ioctl() calls */ #endif - priv->dev.d_private = (void *)&g_gmac; /* Used to recover private state from dev */ - - /* Create a watchdog for timing polling for and timing of transmissions */ - - priv->txpoll = wd_create(); - if (!priv->txpoll) - { - nerr("ERROR: Failed to create periodic poll timer\n"); - ret = -EAGAIN; - goto errout; - } - - priv->txtimeout = wd_create(); /* Create TX timeout timer */ - if (!priv->txtimeout) - { - nerr("ERROR: Failed to create periodic poll timer\n"); - ret = -EAGAIN; - goto errout_with_txpoll; - } + priv->dev.d_private = &g_gmac; /* Used to recover private state from dev */ /* Configure PIO pins to support GMAC */ @@ -3855,7 +3837,7 @@ int sam_gmac_initialize(void) if (ret < 0) { nerr("ERROR: sam_buffer_initialize failed: %d\n", ret); - goto errout_with_txtimeout; + return ret; } /* Attach the IRQ to the driver. It will not be enabled at the AIC until @@ -3896,11 +3878,6 @@ int sam_gmac_initialize(void) errout_with_buffers: sam_buffer_free(priv); -errout_with_txtimeout: - wd_delete(priv->txtimeout); -errout_with_txpoll: - wd_delete(priv->txpoll); -errout: return ret; } diff --git a/arch/arm/src/sama5/sam_hsmci.c b/arch/arm/src/sama5/sam_hsmci.c index 10b471a2238..e2f59be6c72 100644 --- a/arch/arm/src/sama5/sam_hsmci.c +++ b/arch/arm/src/sama5/sam_hsmci.c @@ -398,7 +398,7 @@ struct sam_dev_s uint32_t cmdrmask; /* Interrupt enables for this * particular cmd/response */ volatile sdio_eventset_t wkupevent; /* The event that caused the wakeup */ - WDOG_ID waitwdog; /* Watchdog that handles event timeouts */ + struct wdog_s waitwdog; /* Watchdog that handles event timeouts */ uint8_t hsmci; /* HSMCI (0, 1, or 2) */ volatile bool dmabusy; /* TRUE: DMA transfer is in progress */ volatile bool xfrbusy; /* TRUE: Transfer is in progress */ @@ -1366,7 +1366,7 @@ static void sam_endwait(struct sam_dev_s *priv, sdio_eventset_t wkupevent) { /* Cancel the watchdog timeout */ - wd_cancel(priv->waitwdog); + wd_cancel(&priv->waitwdog); /* Disable event-related interrupts and save wakeup event */ @@ -1724,19 +1724,19 @@ static void sam_reset(FAR struct sdio_dev_s *dev) /* Reset data */ - priv->waitevents = 0; /* Set of events to be waited for */ - priv->waitmask = 0; /* Interrupt enables for event waiting */ - priv->wkupevent = 0; /* The event that caused the wakeup */ - priv->dmabusy = false; /* No DMA in progress */ - wd_cancel(priv->waitwdog); /* Cancel any timeouts */ + priv->waitevents = 0; /* Set of events to be waited for */ + priv->waitmask = 0; /* Interrupt enables for event waiting */ + priv->wkupevent = 0; /* The event that caused the wakeup */ + priv->dmabusy = false; /* No DMA in progress */ + wd_cancel(&priv->waitwdog); /* Cancel any timeouts */ /* Interrupt mode data transfer support */ - priv->xfrmask = 0; /* Interrupt enables for data transfer */ + priv->xfrmask = 0; /* Interrupt enables for data transfer */ /* DMA data transfer support */ - priv->widebus = false; /* Required for DMA support */ + priv->widebus = false; /* Required for DMA support */ leave_critical_section(flags); } @@ -2314,7 +2314,7 @@ static int sam_cancel(FAR struct sdio_dev_s *dev) /* Cancel any watchdog timeout */ - wd_cancel(priv->waitwdog); + wd_cancel(&priv->waitwdog); /* Make sure that the DMA is stopped (it will be stopped automatically * on normal transfers, but not necessarily when the transfer terminates @@ -2755,7 +2755,7 @@ static sdio_eventset_t sam_eventwait(FAR struct sdio_dev_s *dev, } delay = MSEC2TICK(timeout); - ret = wd_start(priv->waitwdog, delay, + ret = wd_start(&priv->waitwdog, delay, sam_eventtimeout, 1, (wdparm_t)priv); if (ret < 0) { @@ -2783,7 +2783,7 @@ static sdio_eventset_t sam_eventwait(FAR struct sdio_dev_s *dev, * disable all event, and return an SDIO error. */ - wd_cancel(priv->waitwdog); + wd_cancel(&priv->waitwdog); sam_disablexfrints(priv); sam_disablewaitints(priv, SDIOWAIT_ERROR); return SDIOWAIT_ERROR; @@ -3346,11 +3346,6 @@ FAR struct sdio_dev_s *sdio_initialize(int slotno) nxsem_set_protocol(&priv->waitsem, SEM_PRIO_NONE); - /* Create a watchdog timer */ - - priv->waitwdog = wd_create(); - DEBUGASSERT(priv->waitwdog); - /* Initialize the callbacks */ memcpy(&priv->dev, &g_callbacks, sizeof(struct sdio_dev_s)); diff --git a/arch/arm/src/sama5/sam_sdmmc.c b/arch/arm/src/sama5/sam_sdmmc.c index 19e69decb1a..d0fd4b39f75 100644 --- a/arch/arm/src/sama5/sam_sdmmc.c +++ b/arch/arm/src/sama5/sam_sdmmc.c @@ -163,7 +163,7 @@ struct sam_dev_s sdio_eventset_t waitevents; /* Set of events to be waited for */ uint32_t waitints; /* Interrupt enables for event waiting */ volatile sdio_eventset_t wkupevent; /* The event that caused the wakeup */ - WDOG_ID waitwdog; /* Watchdog that handles event timeouts */ + struct wdog_s waitwdog; /* Watchdog that handles event timeouts */ /* Callback support */ @@ -1216,7 +1216,7 @@ static void sam_endwait(struct sam_dev_s *priv, sdio_eventset_t wkupevent) { /* Cancel the watchdog timeout */ - wd_cancel(priv->waitwdog); + wd_cancel(&priv->waitwdog); /* Disable event-related interrupts */ @@ -1573,7 +1573,7 @@ static void sam_reset(FAR struct sdio_dev_s *dev) priv->xfrflags = 0; /* Used to synchronize SDIO and DMA completion */ #endif - wd_cancel(priv->waitwdog); /* Cancel any timeouts */ + wd_cancel(&priv->waitwdog); /* Cancel any timeouts */ /* Interrupt mode data transfer support */ @@ -2479,7 +2479,7 @@ static int sam_cancel(FAR struct sdio_dev_s *dev) /* Cancel any watchdog timeout */ - wd_cancel(priv->waitwdog); + wd_cancel(&priv->waitwdog); /* If this was a DMA transfer, make sure that DMA is stopped */ @@ -2912,7 +2912,7 @@ static sdio_eventset_t sam_eventwait(FAR struct sdio_dev_s *dev, /* Start the watchdog timer */ delay = MSEC2TICK(timeout); - ret = wd_start(priv->waitwdog, delay, + ret = wd_start(&priv->waitwdog, delay, sam_eventtimeout, 1, (wdparm_t)priv); if (ret < 0) @@ -3618,11 +3618,6 @@ FAR struct sdio_dev_s *sam_sdmmc_sdio_initialize(int slotno) nxsem_set_protocol(&priv->waitsem, SEM_PRIO_NONE); - /* Create a watchdog timer */ - - priv->waitwdog = wd_create(); - DEBUGASSERT(priv->waitwdog); - switch (priv->addr) { case SAM_SDMMC0_VBASE: diff --git a/arch/arm/src/sama5/sam_spi.c b/arch/arm/src/sama5/sam_spi.c index 4dac81b580a..06449db18bc 100644 --- a/arch/arm/src/sama5/sam_spi.c +++ b/arch/arm/src/sama5/sam_spi.c @@ -170,7 +170,7 @@ struct sam_spics_s #ifdef CONFIG_SAMA5_SPI_DMA bool candma; /* DMA is supported */ sem_t dmawait; /* Used to wait for DMA completion */ - WDOG_ID dmadog; /* Watchdog that handles DMA timeouts */ + struct wdog_s dmadog; /* Watchdog that handles DMA timeouts */ int result; /* DMA result */ DMA_HANDLE rxdma; /* SPI RX DMA handle */ DMA_HANDLE txdma; /* SPI TX DMA handle */ @@ -769,7 +769,7 @@ static void spi_rxcallback(DMA_HANDLE handle, void *arg, int result) /* Cancel the watchdog timeout */ - wd_cancel(spics->dmadog); + wd_cancel(&spics->dmadog); /* Sample DMA registers at the time of the callback */ @@ -1517,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, + ret = wd_start(&spics->dmadog, DMA_TIMEOUT_TICKS, spi_dmatimeout, 1, (wdparm_t)spics); if (ret < 0) { @@ -1530,7 +1530,7 @@ static void spi_exchange(struct spi_dev_s *dev, const void *txbuffer, /* Cancel the watchdog timeout */ - wd_cancel(spics->dmadog); + wd_cancel(&spics->dmadog); /* Check if we were awakened by an error of some kind. */ @@ -1819,11 +1819,6 @@ struct spi_dev_s *sam_spibus_initialize(int port) nxsem_init(&spics->dmawait, 0, 0); nxsem_set_protocol(&spics->dmawait, SEM_PRIO_NONE); - - /* Create a watchdog time to catch DMA timeouts */ - - spics->dmadog = wd_create(); - DEBUGASSERT(spics->dmadog); #endif spi_dumpregs(spi, "After initialization"); diff --git a/arch/arm/src/sama5/sam_ssc.c b/arch/arm/src/sama5/sam_ssc.c index 184b0a9d7dc..8d3f846cb61 100644 --- a/arch/arm/src/sama5/sam_ssc.c +++ b/arch/arm/src/sama5/sam_ssc.c @@ -425,7 +425,7 @@ struct sam_buffer_s struct sam_transport_s { DMA_HANDLE dma; /* SSC DMA handle */ - WDOG_ID dog; /* Watchdog that handles DMA timeouts */ + struct wdog_s dog; /* Watchdog that handles DMA timeouts */ sq_queue_t pend; /* A queue of pending transfers */ sq_queue_t act; /* A queue of active transfers */ sq_queue_t done; /* A queue of completed transfers */ @@ -1344,7 +1344,7 @@ static int ssc_rxdma_setup(struct sam_ssc_s *priv) if (!notimeout) { - ret = wd_start(priv->rx.dog, timeout, + ret = wd_start(&priv->rx.dog, timeout, ssc_rxdma_timeout, 1, (wdparm_t)priv); /* Check if we have successfully started the watchdog timer. Note @@ -1575,7 +1575,7 @@ static void ssc_rxdma_callback(DMA_HANDLE handle, void *arg, int result) /* Cancel the watchdog timeout */ - wd_cancel(priv->rx.dog); + wd_cancel(&priv->rx.dog); /* Sample DMA registers at the time of the DMA completion */ @@ -1761,7 +1761,7 @@ static int ssc_txdma_setup(struct sam_ssc_s *priv) if (!notimeout) { - ret = wd_start(priv->tx.dog, timeout, + ret = wd_start(&priv->tx.dog, timeout, ssc_txdma_timeout, 1, (wdparm_t)priv); /* Check if we have successfully started the watchdog timer. Note @@ -1979,7 +1979,7 @@ static void ssc_txdma_callback(DMA_HANDLE handle, void *arg, int result) /* Cancel the watchdog timeout */ - wd_cancel(priv->tx.dog); + wd_cancel(&priv->tx.dog); /* Sample DMA registers at the time of the DMA completion */ @@ -3007,15 +3007,6 @@ static int ssc_dma_allocate(struct sam_ssc_s *priv) i2serr("ERROR: Failed to allocate the RX DMA channel\n"); goto errout; } - - /* Create a watchdog time to catch RX DMA timeouts */ - - priv->rx.dog = wd_create(); - if (!priv->rx.dog) - { - i2serr("ERROR: Failed to create the RX DMA watchdog\n"); - goto errout; - } } #endif @@ -3030,15 +3021,6 @@ static int ssc_dma_allocate(struct sam_ssc_s *priv) i2serr("ERROR: Failed to allocate the TX DMA channel\n"); goto errout; } - - /* Create a watchdog time to catch TX DMA timeouts */ - - priv->tx.dog = wd_create(); - if (!priv->tx.dog) - { - i2serr("ERROR: Failed to create the TX DMA watchdog\n"); - goto errout; - } } #endif @@ -3070,11 +3052,7 @@ errout: static void ssc_dma_free(struct sam_ssc_s *priv) { #ifdef SSC_HAVE_TX - if (priv->tx.dog) - { - wd_delete(priv->tx.dog); - } - + wd_cancel(&priv->tx.dog); if (priv->tx.dma) { sam_dmafree(priv->tx.dma); @@ -3082,11 +3060,7 @@ static void ssc_dma_free(struct sam_ssc_s *priv) #endif #ifdef SSC_HAVE_RX - if (priv->rx.dog) - { - wd_delete(priv->rx.dog); - } - + wd_cancel(&priv->rx.dog); if (priv->rx.dma) { sam_dmafree(priv->rx.dma); diff --git a/arch/arm/src/sama5/sam_tsd.c b/arch/arm/src/sama5/sam_tsd.c index abcd1641881..96ae61a25af 100644 --- a/arch/arm/src/sama5/sam_tsd.c +++ b/arch/arm/src/sama5/sam_tsd.c @@ -179,7 +179,7 @@ struct sam_tsd_s struct sam_adc_s *adc; /* ADC device handle */ struct work_s work; /* Supports the interrupt handling "bottom half" */ struct sam_sample_s sample; /* Last sampled touch point data */ - WDOG_ID wdog; /* Poll the position while the pen is down */ + struct wdog_s wdog; /* Poll the position while the pen is down */ /* The following is a list if poll structures of threads waiting for * driver events. The 'struct pollfd' reference for each open is also @@ -586,7 +586,7 @@ static void sam_tsd_bottomhalf(void *arg) * this case; we rely on the timer expiry to get us going again. */ - wd_start(priv->wdog, TSD_WDOG_DELAY, + wd_start(&priv->wdog, TSD_WDOG_DELAY, sam_tsd_expiry, 1, (wdparm_t)priv); ier = 0; goto ignored; @@ -665,7 +665,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, + wd_start(&priv->wdog, TSD_WDOG_DELAY, sam_tsd_expiry, 1, (wdparm_t)priv); /* Check the thresholds. Bail if (1) this is not the first @@ -774,7 +774,7 @@ static int sam_tsd_schedule(struct sam_tsd_s *priv) * while the pen remains down. */ - wd_cancel(priv->wdog); + wd_cancel(&priv->wdog); /* Disable further touchscreen interrupts. Touchscreen interrupts will be * re-enabled after the worker thread executes. @@ -1590,7 +1590,7 @@ static void sam_tsd_uninitialize(struct sam_tsd_s *priv) * while the pen remains down. */ - wd_cancel(priv->wdog); + wd_cancel(&priv->wdog); /* Disable further touchscreen interrupts. Touchscreen interrupts will be * re-enabled after the worker thread executes. @@ -1655,7 +1655,6 @@ int sam_tsd_register(struct sam_adc_s *adc, int minor) memset(priv, 0, sizeof(struct sam_tsd_s)); priv->adc = adc; /* Save the ADC device handle */ - priv->wdog = wd_create(); /* Create a watchdog timer */ priv->threshx = INVALID_THRESHOLD; /* Initialize thresholding logic */ priv->threshy = INVALID_THRESHOLD; /* Initialize thresholding logic */ diff --git a/arch/arm/src/sama5/sam_twi.c b/arch/arm/src/sama5/sam_twi.c index a9fa0a9cee4..77ba1abb303 100644 --- a/arch/arm/src/sama5/sam_twi.c +++ b/arch/arm/src/sama5/sam_twi.c @@ -161,7 +161,7 @@ struct twi_dev_s sem_t exclsem; /* Only one thread can access at a time */ sem_t waitsem; /* Wait for TWI transfer completion */ - WDOG_ID timeout; /* Watchdog to recover from bus hangs */ + struct wdog_s timeout; /* Watchdog to recover from bus hangs */ volatile int result; /* The result of the transfer */ volatile int xfrd; /* Number of bytes transfers */ @@ -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, 1, (wdparm_t)priv); /* Wait for either the TWI transfer or the timeout to complete */ @@ -493,7 +493,7 @@ static int twi_wait(struct twi_dev_s *priv, unsigned int size) if (ret < 0) { - wd_cancel(priv->timeout); + wd_cancel(&priv->timeout); return ret; } } @@ -518,7 +518,7 @@ static void twi_wakeup(struct twi_dev_s *priv, int result) { /* Cancel any pending timeout */ - wd_cancel(priv->timeout); + wd_cancel(&priv->timeout); /* Disable any further TWI interrupts */ @@ -1257,22 +1257,13 @@ struct i2c_master_s *sam_i2cbus_initialize(int bus) flags = enter_critical_section(); - /* Allocate a watchdog timer */ - - priv->timeout = wd_create(); - if (priv->timeout == NULL) - { - ierr("ERROR: Failed to allocate a timer\n"); - goto errout_with_irq; - } - /* Attach Interrupt Handler */ ret = irq_attach(priv->attr->irq, twi_interrupt, priv); if (ret < 0) { ierr("ERROR: Failed to attach irq %d\n", priv->attr->irq); - goto errout_with_wdog; + goto errout_with_lock; } /* Initialize the TWI driver structure */ @@ -1296,11 +1287,7 @@ struct i2c_master_s *sam_i2cbus_initialize(int bus) leave_critical_section(flags); return &priv->dev; -errout_with_wdog: - wd_delete(priv->timeout); - priv->timeout = NULL; - -errout_with_irq: +errout_with_lock: leave_critical_section(flags); return NULL; } @@ -1328,10 +1315,9 @@ int sam_i2cbus_uninitialize(FAR struct i2c_master_s *dev) nxsem_destroy(&priv->exclsem); nxsem_destroy(&priv->waitsem); - /* Free the watchdog timer */ + /* Cancel the watchdog timer */ - wd_delete(priv->timeout); - priv->timeout = NULL; + wd_cancel(&priv->timeout); /* Detach Interrupt Handler */ diff --git a/arch/arm/src/samd5e5/sam_gmac.c b/arch/arm/src/samd5e5/sam_gmac.c index 57040ce5d6c..3cb63385a6d 100644 --- a/arch/arm/src/samd5e5/sam_gmac.c +++ b/arch/arm/src/samd5e5/sam_gmac.c @@ -199,8 +199,8 @@ struct sam_gmac_s { uint8_t ifup : 1; /* true:ifup false:ifdown */ - WDOG_ID txpoll; /* TX poll timer */ - WDOG_ID txtimeout; /* TX timeout timer */ + struct wdog_s txpoll; /* TX poll timer */ + struct wdog_s txtimeout; /* TX timeout timer */ struct work_s irqwork; /* For deferring interrupt work to the work queue */ struct work_s pollwork; /* For deferring poll work to the work queue */ @@ -753,7 +753,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, + wd_start(&priv->txtimeout, SAM_TXTIMEOUT, sam_txtimeout_expiry, 1, (wdparm_t)priv); /* Set d_len to zero meaning that the d_buf[] packet buffer is again @@ -1663,7 +1663,7 @@ static int sam_gmac_interrupt(int irq, void *context, FAR void *arg) * expiration and the deferred interrupt processing. */ - wd_cancel(priv->txtimeout); + wd_cancel(&priv->txtimeout); } /* Schedule to perform the interrupt processing on the worker thread. */ @@ -1778,7 +1778,7 @@ static void sam_poll_work(FAR void *arg) /* Setup the watchdog poll timer again */ - wd_start(priv->txpoll, SAM_WDDELAY, sam_poll_expiry, 1, (wdparm_t)priv); + wd_start(&priv->txpoll, SAM_WDDELAY, sam_poll_expiry, 1, (wdparm_t)priv); net_unlock(); } @@ -1880,7 +1880,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, 1, (wdparm_t)priv); /* Enable the GMAC interrupt */ @@ -1919,8 +1919,8 @@ static int sam_ifdown(struct net_driver_s *dev) /* Cancel the TX poll timer and TX timeout timers */ - wd_cancel(priv->txpoll); - wd_cancel(priv->txtimeout); + wd_cancel(&priv->txpoll); + wd_cancel(&priv->txtimeout); /* Put the GMAC in its reset, non-operational state. This should be * a known configuration that will guarantee the sam_ifup() always @@ -3764,25 +3764,7 @@ int sam_gmac_initialize(void) #ifdef CONFIG_NETDEV_IOCTL priv->dev.d_ioctl = sam_ioctl; /* Support PHY ioctl() calls */ #endif - priv->dev.d_private = (void *)&g_gmac; /* Used to recover private state from dev */ - - /* Create a watchdog for timing polling for and timing of transmissions */ - - priv->txpoll = wd_create(); - if (!priv->txpoll) - { - nerr("ERROR: Failed to create periodic poll timer\n"); - ret = -EAGAIN; - goto errout; - } - - priv->txtimeout = wd_create(); /* Create TX timeout timer */ - if (!priv->txtimeout) - { - nerr("ERROR: Failed to create periodic poll timer\n"); - ret = -EAGAIN; - goto errout_with_txpoll; - } + priv->dev.d_private = &g_gmac; /* Used to recover private state from dev */ /* Configure PIO pins to support GMAC */ @@ -3794,7 +3776,7 @@ int sam_gmac_initialize(void) if (ret < 0) { nerr("ERROR: sam_buffer_initialize failed: %d\n", ret); - goto errout_with_txtimeout; + return ret; } /* Attach the IRQ to the driver. It will not be enabled at the AIC until @@ -3836,11 +3818,6 @@ int sam_gmac_initialize(void) errout_with_buffers: sam_buffer_free(priv); -errout_with_txtimeout: - wd_delete(priv->txtimeout); -errout_with_txpoll: - wd_delete(priv->txpoll); -errout: return ret; } diff --git a/arch/arm/src/samv7/sam_emac.c b/arch/arm/src/samv7/sam_emac.c index 3365fae1acb..ef5f8258c7f 100644 --- a/arch/arm/src/samv7/sam_emac.c +++ b/arch/arm/src/samv7/sam_emac.c @@ -529,8 +529,8 @@ struct sam_queue_s struct sam_emac_s { uint8_t ifup : 1; /* true:ifup false:ifdown */ - WDOG_ID txpoll; /* TX poll timer */ - WDOG_ID txtimeout; /* TX timeout timer */ + struct wdog_s txpoll; /* TX poll timer */ + struct wdog_s txtimeout; /* TX timeout timer */ struct work_s irqwork; /* For deferring work to the work queue */ struct work_s pollwork; /* For deferring work to the work queue */ @@ -1468,7 +1468,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, + wd_start(&priv->txtimeout, SAM_TXTIMEOUT, sam_txtimeout_expiry, 1, (wdparm_t)priv); /* Set d_len to zero meaning that the d_buf[] packet buffer is again @@ -2536,7 +2536,7 @@ static int sam_emac_interrupt(int irq, void *context, FAR void *arg) * expiration and the deferred interrupt processing. */ - wd_cancel(priv->txtimeout); + wd_cancel(&priv->txtimeout); } /* Schedule to perform the interrupt processing on the worker thread. */ @@ -2653,7 +2653,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, 1, (wdparm_t)priv); net_unlock(); } @@ -2771,7 +2771,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, 1, (wdparm_t)priv); /* Enable the EMAC interrupt */ @@ -2810,8 +2810,8 @@ static int sam_ifdown(struct net_driver_s *dev) /* Cancel the TX poll timer and TX timeout timers */ - wd_cancel(priv->txpoll); - wd_cancel(priv->txtimeout); + wd_cancel(&priv->txpoll); + wd_cancel(&priv->txtimeout); /* Put the EMAC in its reset, non-operational state. This should be * a known configuration that will guarantee the sam_ifup() always @@ -5049,24 +5049,6 @@ int sam_emac_initialize(int intf) priv->dev.d_private = priv; /* Used to recover private state from dev */ - /* Create a watchdog for timing polling for and timing of transmissions */ - - priv->txpoll = wd_create(); - if (!priv->txpoll) - { - nerr("ERROR: Failed to create periodic poll timer\n"); - ret = -EAGAIN; - goto errout; - } - - priv->txtimeout = wd_create(); /* Create TX timeout timer */ - if (!priv->txtimeout) - { - nerr("ERROR: Failed to create periodic poll timer\n"); - ret = -EAGAIN; - goto errout_with_txpoll; - } - /* Configure PIO pins to support EMAC */ sam_ethgpioconfig(priv); @@ -5077,7 +5059,7 @@ int sam_emac_initialize(int intf) if (ret < 0) { nerr("ERROR: sam_buffer_allocate failed: %d\n", ret); - goto errout_with_txtimeout; + return ret; } /* Attach the IRQ to the driver. It will not be enabled at the AIC until @@ -5118,11 +5100,6 @@ int sam_emac_initialize(int intf) errout_with_buffers: sam_buffer_free(priv); -errout_with_txtimeout: - wd_delete(priv->txtimeout); -errout_with_txpoll: - wd_delete(priv->txpoll); -errout: return ret; } diff --git a/arch/arm/src/samv7/sam_hsmci.c b/arch/arm/src/samv7/sam_hsmci.c index eb27aa8a14c..30f94b00ebb 100644 --- a/arch/arm/src/samv7/sam_hsmci.c +++ b/arch/arm/src/samv7/sam_hsmci.c @@ -333,7 +333,7 @@ struct sam_dev_s uint32_t cmdrmask; /* Interrupt enables for this * particular cmd/response */ volatile sdio_eventset_t wkupevent; /* The event that caused the wakeup */ - WDOG_ID waitwdog; /* Watchdog that handles event timeouts */ + struct wdog_s waitwdog; /* Watchdog that handles event timeouts */ uint8_t hsmci; /* HSMCI (0, 1, or 2) */ volatile bool dmabusy; /* TRUE: DMA transfer is in progress */ volatile bool xfrbusy; /* TRUE: Transfer is in progress */ @@ -1302,7 +1302,7 @@ static void sam_endwait(struct sam_dev_s *priv, sdio_eventset_t wkupevent) { /* Cancel the watchdog timeout */ - wd_cancel(priv->waitwdog); + wd_cancel(&priv->waitwdog); /* Disable event-related interrupts and save wakeup event */ @@ -1709,19 +1709,19 @@ static void sam_reset(FAR struct sdio_dev_s *dev) /* Reset data */ - priv->waitevents = 0; /* Set of events to be waited for */ - priv->waitmask = 0; /* Interrupt enables for event waiting */ - priv->wkupevent = 0; /* The event that caused the wakeup */ - priv->dmabusy = false; /* No DMA in progress */ - wd_cancel(priv->waitwdog); /* Cancel any timeouts */ + priv->waitevents = 0; /* Set of events to be waited for */ + priv->waitmask = 0; /* Interrupt enables for event waiting */ + priv->wkupevent = 0; /* The event that caused the wakeup */ + priv->dmabusy = false; /* No DMA in progress */ + wd_cancel(&priv->waitwdog); /* Cancel any timeouts */ /* Interrupt mode data transfer support */ - priv->xfrmask = 0; /* Interrupt enables for data transfer */ + priv->xfrmask = 0; /* Interrupt enables for data transfer */ /* DMA data transfer support */ - priv->widebus = false; /* Required for DMA support */ + priv->widebus = false; /* Required for DMA support */ leave_critical_section(flags); } @@ -2357,7 +2357,7 @@ static int sam_cancel(FAR struct sdio_dev_s *dev) /* Cancel any watchdog timeout */ - wd_cancel(priv->waitwdog); + wd_cancel(&priv->waitwdog); /* Make sure that the DMA is stopped (it will be stopped automatically * on normal transfers, but not necessarily when the transfer terminates @@ -2803,7 +2803,7 @@ static sdio_eventset_t sam_eventwait(FAR struct sdio_dev_s *dev, } delay = MSEC2TICK(timeout); - ret = wd_start(priv->waitwdog, delay, + ret = wd_start(&priv->waitwdog, delay, sam_eventtimeout, 1, (wdparm_t)priv); if (ret < 0) { @@ -2831,7 +2831,7 @@ static sdio_eventset_t sam_eventwait(FAR struct sdio_dev_s *dev, * disable all event, and return an SDIO error. */ - wd_cancel(priv->waitwdog); + wd_cancel(&priv->waitwdog); sam_disablexfrints(priv); sam_disablewaitints(priv, SDIOWAIT_ERROR); return SDIOWAIT_ERROR; @@ -3380,11 +3380,6 @@ FAR struct sdio_dev_s *sdio_initialize(int slotno) nxsem_set_protocol(&priv->waitsem, SEM_PRIO_NONE); - /* Create a watchdog timer */ - - priv->waitwdog = wd_create(); - DEBUGASSERT(priv->waitwdog); - /* Initialize the callbacks */ memcpy(&priv->dev, &g_callbacks, sizeof(struct sdio_dev_s)); diff --git a/arch/arm/src/samv7/sam_qspi.c b/arch/arm/src/samv7/sam_qspi.c index 044b2d07fab..fb51eb0259d 100644 --- a/arch/arm/src/samv7/sam_qspi.c +++ b/arch/arm/src/samv7/sam_qspi.c @@ -192,7 +192,7 @@ struct sam_qspidev_s uint8_t rxintf; /* RX hardware interface number */ uint8_t txintf; /* TX hardware interface number */ sem_t dmawait; /* Used to wait for DMA completion */ - WDOG_ID dmadog; /* Watchdog that handles DMA timeouts */ + struct wdog_s dmadog; /* Watchdog that handles DMA timeouts */ int result; /* DMA result */ DMA_HANDLE dmach; /* QSPI DMA handle */ #endif @@ -635,7 +635,7 @@ static void qspi_dma_callback(DMA_HANDLE handle, void *arg, int result) /* Cancel the watchdog timeout */ - wd_cancel(priv->dmadog); + wd_cancel(&priv->dmadog); /* Sample DMA registers at the time of the callback */ @@ -890,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, + ret = wd_start(&priv->dmadog, DMA_TIMEOUT_TICKS, qspi_dma_timeout, 1, (wdparm_t)priv); if (ret < 0) { @@ -903,7 +903,7 @@ static int qspi_memory_dma(struct sam_qspidev_s *priv, /* Cancel the watchdog timeout */ - wd_cancel(priv->dmadog); + wd_cancel(&priv->dmadog); /* Check if we were awakened by an error of some kind. */ @@ -1798,15 +1798,6 @@ struct qspi_dev_s *sam_qspi_initialize(int intf) nxsem_init(&priv->dmawait, 0, 0); nxsem_set_protocol(&priv->dmawait, SEM_PRIO_NONE); - - /* Create a watchdog time to catch DMA timeouts */ - - priv->dmadog = wd_create(); - if (priv->dmadog == NULL) - { - spierr("ERROR: Failed to create wdog\n"); - goto errout_with_dmahandles; - } #endif #ifdef QSPI_USE_INTERRUPTS @@ -1816,7 +1807,7 @@ struct qspi_dev_s *sam_qspi_initialize(int intf) if (ret < 0) { spierr("ERROR: Failed to attach irq %d\n", priv->irq); - goto errout_with_dmadog; + goto errout_with_dmawait; } #endif @@ -1845,14 +1836,10 @@ errout_with_irq: #ifdef QSPI_USE_INTERRUPTS irq_detach(priv->irq); -errout_with_dmadog: +errout_with_dmawait: #endif #ifdef CONFIG_SAMV7_QSPI_DMA - wd_delete(priv->dmadog); - -errout_with_dmahandles: nxsem_destroy(&priv->dmawait); - if (priv->dmach) { sam_dmafree(priv->dmach); diff --git a/arch/arm/src/samv7/sam_spi.c b/arch/arm/src/samv7/sam_spi.c index a1b463214c6..d40daee090d 100644 --- a/arch/arm/src/samv7/sam_spi.c +++ b/arch/arm/src/samv7/sam_spi.c @@ -168,7 +168,7 @@ struct sam_spics_s #ifdef CONFIG_SAMV7_SPI_DMA bool candma; /* DMA is supported */ sem_t dmawait; /* Used to wait for DMA completion */ - WDOG_ID dmadog; /* Watchdog that handles DMA timeouts */ + struct wdog_s dmadog; /* Watchdog that handles DMA timeouts */ int result; /* DMA result */ DMA_HANDLE rxdma; /* SPI RX DMA handle */ DMA_HANDLE txdma; /* SPI TX DMA handle */ @@ -810,7 +810,7 @@ static void spi_rxcallback(DMA_HANDLE handle, void *arg, int result) /* Cancel the watchdog timeout */ - wd_cancel(spics->dmadog); + wd_cancel(&spics->dmadog); /* Sample DMA registers at the time of the callback */ @@ -1864,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, + ret = wd_start(&spics->dmadog, DMA_TIMEOUT_TICKS, spi_dmatimeout, 1, (wdparm_t)spics); if (ret < 0) { @@ -1877,7 +1877,7 @@ static void spi_exchange(struct spi_dev_s *dev, const void *txbuffer, /* Cancel the watchdog timeout */ - wd_cancel(spics->dmadog); + wd_cancel(&spics->dmadog); /* Check if we were awakened by an error of some kind. */ @@ -2175,11 +2175,6 @@ FAR struct spi_dev_s *sam_spibus_initialize(int port) nxsem_init(&spics->dmawait, 0, 0); nxsem_set_protocol(&spics->dmawait, SEM_PRIO_NONE); - - /* Create a watchdog time to catch DMA timeouts */ - - spics->dmadog = wd_create(); - DEBUGASSERT(spics->dmadog); #endif spi_dumpregs(spi, "After initialization"); diff --git a/arch/arm/src/samv7/sam_ssc.c b/arch/arm/src/samv7/sam_ssc.c index 55ce8d1d0e4..681cde44347 100644 --- a/arch/arm/src/samv7/sam_ssc.c +++ b/arch/arm/src/samv7/sam_ssc.c @@ -400,7 +400,7 @@ struct sam_buffer_s struct sam_transport_s { DMA_HANDLE dma; /* SSC DMA handle */ - WDOG_ID dog; /* Watchdog that handles DMA timeouts */ + struct wdog_s dog; /* Watchdog that handles DMA timeouts */ sq_queue_t pend; /* A queue of pending transfers */ sq_queue_t act; /* A queue of active transfers */ sq_queue_t done; /* A queue of completed transfers */ @@ -1321,7 +1321,7 @@ static int ssc_rxdma_setup(struct sam_ssc_s *priv) if (!notimeout) { - ret = wd_start(priv->rx.dog, timeout, + ret = wd_start(&priv->rx.dog, timeout, ssc_rxdma_timeout, 1, (wdparm_t)priv); /* Check if we have successfully started the watchdog timer. Note @@ -1552,7 +1552,7 @@ static void ssc_rxdma_callback(DMA_HANDLE handle, void *arg, int result) /* Cancel the watchdog timeout */ - wd_cancel(priv->rx.dog); + wd_cancel(&priv->rx.dog); /* Sample DMA registers at the time of the DMA completion */ @@ -1742,7 +1742,7 @@ static int ssc_txdma_setup(struct sam_ssc_s *priv) if (!notimeout) { - ret = wd_start(priv->tx.dog, timeout, + ret = wd_start(&priv->tx.dog, timeout, ssc_txdma_timeout, 1, (wdparm_t)priv); /* Check if we have successfully started the watchdog timer. Note @@ -1960,7 +1960,7 @@ static void ssc_txdma_callback(DMA_HANDLE handle, void *arg, int result) /* Cancel the watchdog timeout */ - wd_cancel(priv->tx.dog); + wd_cancel(&priv->tx.dog); /* Sample DMA registers at the time of the DMA completion */ @@ -2990,15 +2990,6 @@ static int ssc_dma_allocate(struct sam_ssc_s *priv) i2serr("ERROR: Failed to allocate the RX DMA channel\n"); goto errout; } - - /* Create a watchdog time to catch RX DMA timeouts */ - - priv->rx.dog = wd_create(); - if (!priv->rx.dog) - { - i2serr("ERROR: Failed to create the RX DMA watchdog\n"); - goto errout; - } } #endif @@ -3013,15 +3004,6 @@ static int ssc_dma_allocate(struct sam_ssc_s *priv) i2serr("ERROR: Failed to allocate the TX DMA channel\n"); goto errout; } - - /* Create a watchdog time to catch TX DMA timeouts */ - - priv->tx.dog = wd_create(); - if (!priv->tx.dog) - { - i2serr("ERROR: Failed to create the TX DMA watchdog\n"); - goto errout; - } } #endif @@ -3053,11 +3035,7 @@ errout: static void ssc_dma_free(struct sam_ssc_s *priv) { #ifdef SSC_HAVE_TX - if (priv->tx.dog) - { - wd_delete(priv->tx.dog); - } - + wd_cancel(&priv->tx.dog); if (priv->tx.dma) { sam_dmafree(priv->tx.dma); @@ -3065,11 +3043,7 @@ static void ssc_dma_free(struct sam_ssc_s *priv) #endif #ifdef SSC_HAVE_RX - if (priv->rx.dog) - { - wd_delete(priv->rx.dog); - } - + wd_cancel(&priv->rx.dog); if (priv->rx.dma) { sam_dmafree(priv->rx.dma); diff --git a/arch/arm/src/samv7/sam_twihs.c b/arch/arm/src/samv7/sam_twihs.c index cab7ac57016..e58b4db897c 100644 --- a/arch/arm/src/samv7/sam_twihs.c +++ b/arch/arm/src/samv7/sam_twihs.c @@ -160,7 +160,7 @@ struct twi_dev_s sem_t exclsem; /* Only one thread can access at a time */ sem_t waitsem; /* Wait for TWIHS transfer completion */ - WDOG_ID timeout; /* Watchdog to recover from bus hangs */ + struct wdog_s timeout; /* Watchdog to recover from bus hangs */ volatile int result; /* The result of the transfer */ volatile int xfrd; /* Number of bytes transfers */ @@ -484,7 +484,7 @@ static int twi_wait(struct twi_dev_s *priv, unsigned int size) * a TWIHS transfer stalls. */ - wd_start(priv->timeout, (timeout * size), + wd_start(&priv->timeout, (timeout * size), twi_timeout, 1, (wdparm_t)priv); /* Wait for either the TWIHS transfer or the timeout to complete */ @@ -498,7 +498,7 @@ static int twi_wait(struct twi_dev_s *priv, unsigned int size) if (ret < 0) { - wd_cancel(priv->timeout); + wd_cancel(&priv->timeout); return ret; } } @@ -543,7 +543,7 @@ static void twi_wakeup(struct twi_dev_s *priv, int result) { /* Cancel any pending timeout */ - wd_cancel(priv->timeout); + wd_cancel(&priv->timeout); /* Disable any further TWIHS interrupts */ @@ -1425,22 +1425,13 @@ struct i2c_master_s *sam_i2cbus_initialize(int bus) priv->attr = attr; - /* Allocate a watchdog timer */ - - priv->timeout = wd_create(); - if (priv->timeout == NULL) - { - ierr("ERROR: Failed to allocate a timer\n"); - goto errout_with_irq; - } - /* Attach Interrupt Handler */ ret = irq_attach(priv->attr->irq, twi_interrupt, priv); if (ret < 0) { ierr("ERROR: Failed to attach irq %d\n", priv->attr->irq); - goto errout_with_wdog; + goto errout_with_lock; } /* Initialize the TWIHS driver structure */ @@ -1466,11 +1457,7 @@ struct i2c_master_s *sam_i2cbus_initialize(int bus) leave_critical_section(flags); return &priv->dev; -errout_with_wdog: - wd_delete(priv->timeout); - priv->timeout = NULL; - -errout_with_irq: +errout_with_lock: priv->refs--; leave_critical_section(flags); return NULL; @@ -1513,10 +1500,9 @@ int sam_i2cbus_uninitialize(FAR struct i2c_master_s *dev) nxsem_destroy(&priv->exclsem); nxsem_destroy(&priv->waitsem); - /* Free the watchdog timer */ + /* Cancel the watchdog timer */ - wd_delete(priv->timeout); - priv->timeout = NULL; + wd_cancel(&priv->timeout); /* Detach Interrupt Handler */ diff --git a/arch/arm/src/stm32/stm32_eth.c b/arch/arm/src/stm32/stm32_eth.c index fbf66e8dea1..f64219183f0 100644 --- a/arch/arm/src/stm32/stm32_eth.c +++ b/arch/arm/src/stm32/stm32_eth.c @@ -632,8 +632,8 @@ struct stm32_ethmac_s uint8_t ifup : 1; /* true:ifup false:ifdown */ uint8_t mbps100 : 1; /* 100MBps operation (vs 10 MBps) */ uint8_t fduplex : 1; /* Full (vs. half) duplex */ - WDOG_ID txpoll; /* TX poll timer */ - WDOG_ID txtimeout; /* TX timeout timer */ + struct wdog_s txpoll; /* TX poll timer */ + struct wdog_s txtimeout; /* TX timeout timer */ struct work_s irqwork; /* For deferring interrupt work to the work queue */ struct work_s pollwork; /* For deferring poll work to the work queue */ @@ -1228,7 +1228,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, + wd_start(&priv->txtimeout, STM32_TXTIMEOUT, stm32_txtimeout_expiry, 1, (wdparm_t)priv); return OK; } @@ -2003,7 +2003,7 @@ static void stm32_txdone(FAR struct stm32_ethmac_s *priv) { /* Cancel the TX timeout */ - wd_cancel(priv->txtimeout); + wd_cancel(&priv->txtimeout); /* And disable further TX interrupts. */ @@ -2165,7 +2165,7 @@ static int stm32_interrupt(int irq, FAR void *context, FAR void *arg) * expiration and the deferred interrupt processing. */ - wd_cancel(priv->txtimeout); + wd_cancel(&priv->txtimeout); } /* Schedule to perform the interrupt processing on the worker thread. */ @@ -2317,7 +2317,7 @@ static void stm32_poll_work(FAR void *arg) /* Setup the watchdog poll timer again */ - wd_start(priv->txpoll, STM32_WDDELAY, + wd_start(&priv->txpoll, STM32_WDDELAY, stm32_poll_expiry, 1, (wdparm_t)priv); net_unlock(); } @@ -2395,7 +2395,7 @@ static int stm32_ifup(struct net_driver_s *dev) /* Set and activate a timer process */ - wd_start(priv->txpoll, STM32_WDDELAY, + wd_start(&priv->txpoll, STM32_WDDELAY, stm32_poll_expiry, 1, (wdparm_t)priv); /* Enable the Ethernet interrupt */ @@ -2440,8 +2440,8 @@ static int stm32_ifdown(struct net_driver_s *dev) /* Cancel the TX poll timer and TX timeout timers */ - wd_cancel(priv->txpoll); - wd_cancel(priv->txtimeout); + wd_cancel(&priv->txpoll); + wd_cancel(&priv->txtimeout); /* Put the EMAC in its reset, non-operational state. This should be * a known configuration that will guarantee the stm32_ifup() always @@ -4108,12 +4108,7 @@ int stm32_ethinitialize(int intf) #ifdef CONFIG_NETDEV_IOCTL priv->dev.d_ioctl = stm32_ioctl; /* Support PHY ioctl() calls */ #endif - priv->dev.d_private = (void *)g_stm32ethmac; /* Used to recover private state from dev */ - - /* Create a watchdog for timing polling for and timing of transmissions */ - - priv->txpoll = wd_create(); /* Create periodic poll timer */ - priv->txtimeout = wd_create(); /* Create TX timeout timer */ + priv->dev.d_private = g_stm32ethmac; /* Used to recover private state from dev */ /* Configure GPIO pins to support Ethernet */ diff --git a/arch/arm/src/stm32/stm32_i2s.c b/arch/arm/src/stm32/stm32_i2s.c index c52649a50e3..6096cf4c62a 100644 --- a/arch/arm/src/stm32/stm32_i2s.c +++ b/arch/arm/src/stm32/stm32_i2s.c @@ -275,7 +275,7 @@ struct stm32_buffer_s struct stm32_transport_s { DMA_HANDLE dma; /* I2S DMA handle */ - WDOG_ID dog; /* Watchdog that handles DMA timeouts */ + struct wdog_s dog; /* Watchdog that handles DMA timeouts */ sq_queue_t pend; /* A queue of pending transfers */ sq_queue_t act; /* A queue of active transfers */ sq_queue_t done; /* A queue of completed transfers */ @@ -1095,7 +1095,7 @@ static int i2s_rxdma_setup(struct stm32_i2s_s *priv) if (!notimeout) { - ret = wd_start(priv->rx.dog, timeout, + ret = wd_start(&priv->rx.dog, timeout, i2s_rxdma_timeout, 1, (wdparm_t)priv); /* Check if we have successfully started the watchdog timer. Note @@ -1320,7 +1320,7 @@ static void i2s_rxdma_callback(DMA_HANDLE handle, uint8_t result, void *arg) /* Cancel the watchdog timeout */ - wd_cancel(priv->rx.dog); + wd_cancel(&priv->rx.dog); /* Sample DMA registers at the time of the DMA completion */ @@ -1495,7 +1495,7 @@ static int i2s_txdma_setup(struct stm32_i2s_s *priv) if (!notimeout) { - ret = wd_start(priv->tx.dog, timeout, + ret = wd_start(&priv->tx.dog, timeout, i2s_txdma_timeout, 1, (wdparm_t)priv); /* Check if we have successfully started the watchdog timer. Note @@ -1707,7 +1707,7 @@ static void i2s_txdma_callback(DMA_HANDLE handle, uint8_t result, void *arg) /* Cancel the watchdog timeout */ - wd_cancel(priv->tx.dog); + wd_cancel(&priv->tx.dog); /* Sample DMA registers at the time of the DMA completion */ @@ -2380,15 +2380,6 @@ static int i2s_dma_allocate(struct stm32_i2s_s *priv) i2serr("ERROR: Failed to allocate the RX DMA channel\n"); goto errout; } - - /* Create a watchdog time to catch RX DMA timeouts */ - - priv->rx.dog = wd_create(); - if (!priv->rx.dog) - { - i2serr("ERROR: Failed to create the RX DMA watchdog\n"); - goto errout; - } } #endif @@ -2403,15 +2394,6 @@ static int i2s_dma_allocate(struct stm32_i2s_s *priv) i2serr("ERROR: Failed to allocate the TX DMA channel\n"); goto errout; } - - /* Create a watchdog time to catch TX DMA timeouts */ - - priv->tx.dog = wd_create(); - if (!priv->tx.dog) - { - i2serr("ERROR: Failed to create the TX DMA watchdog\n"); - goto errout; - } } #endif @@ -2443,11 +2425,7 @@ errout: static void i2s_dma_free(struct stm32_i2s_s *priv) { #ifdef I2S_HAVE_TX - if (priv->tx.dog) - { - wd_delete(priv->tx.dog); - } - + wd_cancel(&priv->tx.dog); if (priv->tx.dma) { stm32_dmafree(priv->tx.dma); @@ -2455,11 +2433,7 @@ static void i2s_dma_free(struct stm32_i2s_s *priv) #endif #ifdef I2S_HAVE_RX - if (priv->rx.dog) - { - wd_delete(priv->rx.dog); - } - + wd_cancel(&priv->rx.dog); if (priv->rx.dma) { stm32_dmafree(priv->rx.dma); diff --git a/arch/arm/src/stm32/stm32_sdio.c b/arch/arm/src/stm32/stm32_sdio.c index 37e94fafd6d..5549e0179a5 100644 --- a/arch/arm/src/stm32/stm32_sdio.c +++ b/arch/arm/src/stm32/stm32_sdio.c @@ -307,7 +307,7 @@ struct stm32_dev_s sdio_eventset_t waitevents; /* Set of events to be waited for */ uint32_t waitmask; /* Interrupt enables for event waiting */ volatile sdio_eventset_t wkupevent; /* The event that caused the wakeup */ - WDOG_ID waitwdog; /* Watchdog that handles event timeouts */ + struct wdog_s waitwdog; /* Watchdog that handles event timeouts */ /* Callback support */ @@ -1244,7 +1244,7 @@ static void stm32_endwait(struct stm32_dev_s *priv, { /* Cancel the watchdog timeout */ - wd_cancel(priv->waitwdog); + wd_cancel(&priv->waitwdog); /* Disable event-related interrupts */ @@ -1635,7 +1635,7 @@ static void stm32_reset(FAR struct sdio_dev_s *dev) priv->xfrflags = 0; /* Used to synchronize SDIO and DMA completion events */ #endif - wd_cancel(priv->waitwdog); /* Cancel any timeouts */ + wd_cancel(&priv->waitwdog); /* Cancel any timeouts */ /* Interrupt mode data transfer support */ @@ -2100,7 +2100,7 @@ static int stm32_cancel(FAR struct sdio_dev_s *dev) /* Cancel any watchdog timeout */ - wd_cancel(priv->waitwdog); + wd_cancel(&priv->waitwdog); /* If this was a DMA transfer, make sure that DMA is stopped */ @@ -2545,7 +2545,7 @@ static sdio_eventset_t stm32_eventwait(FAR struct sdio_dev_s *dev, /* Start the watchdog timer */ delay = MSEC2TICK(timeout); - ret = wd_start(priv->waitwdog, delay, + ret = wd_start(&priv->waitwdog, delay, stm32_eventtimeout, 1, (wdparm_t)priv); if (ret < 0) { @@ -2588,7 +2588,7 @@ static sdio_eventset_t stm32_eventwait(FAR struct sdio_dev_s *dev, * return an SDIO error. */ - wd_cancel(priv->waitwdog); + wd_cancel(&priv->waitwdog); wkupevent = SDIOWAIT_ERROR; goto errout_with_waitints; } @@ -3042,11 +3042,6 @@ FAR struct sdio_dev_s *sdio_initialize(int slotno) nxsem_set_protocol(&priv->waitsem, SEM_PRIO_NONE); - /* Create a watchdog timer */ - - priv->waitwdog = wd_create(); - DEBUGASSERT(priv->waitwdog); - /* Allocate a DMA channel */ #ifdef CONFIG_STM32_SDIO_DMA diff --git a/arch/arm/src/stm32f7/stm32_ethernet.c b/arch/arm/src/stm32f7/stm32_ethernet.c index 616201063b0..de424bf8dbb 100644 --- a/arch/arm/src/stm32f7/stm32_ethernet.c +++ b/arch/arm/src/stm32f7/stm32_ethernet.c @@ -632,8 +632,8 @@ struct stm32_ethmac_s uint8_t mbps100 : 1; /* 100MBps operation (vs 10 MBps) */ uint8_t fduplex : 1; /* Full (vs. half) duplex */ uint8_t intf; /* Ethernet interface number */ - WDOG_ID txpoll; /* TX poll timer */ - WDOG_ID txtimeout; /* TX timeout timer */ + struct wdog_s txpoll; /* TX poll timer */ + struct wdog_s txtimeout; /* TX timeout timer */ struct work_s irqwork; /* For deferring interrupt work to the work queue */ struct work_s pollwork; /* For deferring poll work to the work queue */ @@ -1268,7 +1268,7 @@ static int stm32_transmit(struct stm32_ethmac_s *priv) /* Setup the TX timeout watchdog (perhaps restarting the timer) */ - wd_start(priv->txtimeout, STM32_TXTIMEOUT, + wd_start(&priv->txtimeout, STM32_TXTIMEOUT, stm32_txtimeout_expiry, 1, (wdparm_t)priv); return OK; } @@ -2097,7 +2097,7 @@ static void stm32_txdone(struct stm32_ethmac_s *priv) { /* Cancel the TX timeout */ - wd_cancel(priv->txtimeout); + wd_cancel(&priv->txtimeout); /* And disable further TX interrupts. */ @@ -2258,7 +2258,7 @@ static int stm32_interrupt(int irq, void *context, FAR void *arg) * expiration and the deferred interrupt processing. */ - wd_cancel(priv->txtimeout); + wd_cancel(&priv->txtimeout); } DEBUGASSERT(work_available(&priv->irqwork)); @@ -2412,7 +2412,7 @@ static void stm32_poll_work(void *arg) /* Setup the watchdog poll timer again */ - wd_start(priv->txpoll, STM32_WDDELAY, + wd_start(&priv->txpoll, STM32_WDDELAY, stm32_poll_expiry, 1, (wdparm_t)priv); net_unlock(); } @@ -2447,7 +2447,7 @@ static void stm32_poll_expiry(int argc, wdparm_t arg, ...) } else { - wd_start(priv->txpoll, STM32_WDDELAY, + wd_start(&priv->txpoll, STM32_WDDELAY, stm32_poll_expiry, 1, (wdparm_t)priv); } } @@ -2496,7 +2496,7 @@ static int stm32_ifup(struct net_driver_s *dev) /* Set and activate a timer process */ - wd_start(priv->txpoll, STM32_WDDELAY, + wd_start(&priv->txpoll, STM32_WDDELAY, stm32_poll_expiry, 1, (wdparm_t)priv); /* Enable the Ethernet interrupt */ @@ -2538,8 +2538,8 @@ static int stm32_ifdown(struct net_driver_s *dev) /* Cancel the TX poll timer and TX timeout timers */ - wd_cancel(priv->txpoll); - wd_cancel(priv->txtimeout); + wd_cancel(&priv->txpoll); + wd_cancel(&priv->txtimeout); /* Put the EMAC in its reset, non-operational state. This should be * a known configuration that will guarantee the stm32_ifup() always @@ -4183,11 +4183,6 @@ int stm32_ethinitialize(int intf) priv->dev.d_private = g_stm32ethmac; /* Used to recover private state from dev */ priv->intf = intf; /* Remember the interface number */ - /* Create a watchdog for timing polling for and timing of transmissions */ - - priv->txpoll = wd_create(); /* Create periodic poll timer */ - priv->txtimeout = wd_create(); /* Create TX timeout timer */ - stm32_get_uniqueid(uid); crc = crc64(uid, 12); diff --git a/arch/arm/src/stm32f7/stm32_qspi.c b/arch/arm/src/stm32f7/stm32_qspi.c index 858f46cd227..a4a1324e302 100644 --- a/arch/arm/src/stm32f7/stm32_qspi.c +++ b/arch/arm/src/stm32f7/stm32_qspi.c @@ -200,7 +200,7 @@ struct stm32f7_qspidev_s sem_t dmawait; /* Used to wait for DMA completion */ int result; /* DMA result */ DMA_HANDLE dmach; /* QSPI DMA handle */ - WDOG_ID dmadog; /* Watchdog that handles DMA timeouts */ + struct wdog_s dmadog; /* Watchdog that handles DMA timeouts */ #endif /* Debug stuff */ @@ -1392,7 +1392,7 @@ static void qspi_dma_callback(DMA_HANDLE handle, uint8_t isr, void *arg) /* Cancel the watchdog timeout */ - wd_cancel(priv->dmadog); + wd_cancel(&priv->dmadog); /* Sample DMA registers at the time of the callback */ @@ -1524,7 +1524,7 @@ static int qspi_memory_dma(struct stm32f7_qspidev_s *priv, { /* Start (or re-start) the watchdog timeout */ - ret = wd_start(priv->dmadog, DMA_TIMEOUT_TICKS, + ret = wd_start(&priv->dmadog, DMA_TIMEOUT_TICKS, qspi_dma_timeout, 1, (wdparm_t)priv); if (ret < 0) { @@ -1543,7 +1543,7 @@ static int qspi_memory_dma(struct stm32f7_qspidev_s *priv, /* Cancel the watchdog timeout */ - wd_cancel(priv->dmadog); + wd_cancel(&priv->dmadog); /* Check if we were awakened by an error of some kind */ @@ -2601,15 +2601,6 @@ struct qspi_dev_s *stm32f7_qspi_initialize(int intf) nxsem_init(&priv->dmawait, 0, 0); nxsem_set_protocol(&priv->dmawait, SEM_PRIO_NONE); - - /* Create a watchdog time to catch DMA timeouts */ - - priv->dmadog = wd_create(); - if (priv->dmadog == NULL) - { - spierr("ERROR: Failed to create wdog\n"); - goto errout_with_dmahandles; - } #endif #ifdef CONFIG_STM32F7_QSPI_INTERRUPTS @@ -2619,7 +2610,7 @@ struct qspi_dev_s *stm32f7_qspi_initialize(int intf) if (ret < 0) { spierr("ERROR: Failed to attach irq %d\n", priv->irq); - goto errout_with_dmadog; + goto errout_with_dmawait; } /* Initialize the semaphore that blocks until the operation completes. @@ -2657,14 +2648,10 @@ errout_with_irq: #ifdef CONFIG_STM32F7_QSPI_INTERRUPTS irq_detach(priv->irq); -errout_with_dmadog: +errout_with_dmawait: #endif #ifdef CONFIG_STM32F7_QSPI_DMA - wd_delete(priv->dmadog); - -errout_with_dmahandles: nxsem_destroy(&priv->dmawait); - if (priv->dmach) { stm32_dmafree(priv->dmach); diff --git a/arch/arm/src/stm32f7/stm32_sai.c b/arch/arm/src/stm32f7/stm32_sai.c index 055bbde137a..582948f8aae 100644 --- a/arch/arm/src/stm32f7/stm32_sai.c +++ b/arch/arm/src/stm32f7/stm32_sai.c @@ -217,7 +217,7 @@ struct stm32f7_sai_s uint32_t samplerate; /* Data sample rate */ uint8_t rxenab:1; /* True: RX transfers enabled */ uint8_t txenab:1; /* True: TX transfers enabled */ - WDOG_ID dog; /* Watchdog that handles timeouts */ + struct wdog_s dog; /* Watchdog that handles timeouts */ sq_queue_t pend; /* A queue of pending transfers */ sq_queue_t act; /* A queue of active transfers */ sq_queue_t done; /* A queue of completed transfers */ @@ -988,7 +988,7 @@ static int sai_dma_setup(struct stm32f7_sai_s *priv) if (bfcontainer->timeout > 0) { - ret = wd_start(priv->dog, bfcontainer->timeout, + ret = wd_start(&priv->dog, bfcontainer->timeout, sai_timeout, 1, (wdparm_t)priv); /* Check if we have successfully started the watchdog timer. Note @@ -1170,7 +1170,7 @@ static void sai_dma_callback(DMA_HANDLE handle, uint8_t isr, void *arg) /* Cancel the watchdog timeout */ - wd_cancel(priv->dog); + wd_cancel(&priv->dog); /* Then schedule completion of the transfer to occur on the worker thread */ @@ -1624,11 +1624,6 @@ static void sai_portinitialize(struct stm32f7_sai_s *priv) nxsem_init(&priv->exclsem, 0, 1); - /* Create a watchdog timer to catch transfer timeouts */ - - priv->dog = wd_create(); - DEBUGASSERT(priv->dog); - /* Initialize buffering */ sai_buf_initialize(priv); diff --git a/arch/arm/src/stm32f7/stm32_sdmmc.c b/arch/arm/src/stm32f7/stm32_sdmmc.c index 2dc16974dc6..dfab71d3b7d 100644 --- a/arch/arm/src/stm32f7/stm32_sdmmc.c +++ b/arch/arm/src/stm32f7/stm32_sdmmc.c @@ -397,7 +397,7 @@ struct stm32_dev_s sdio_eventset_t waitevents; /* Set of events to be waited for */ uint32_t waitmask; /* Interrupt enables for event waiting */ volatile sdio_eventset_t wkupevent; /* The event that caused the wakeup */ - WDOG_ID waitwdog; /* Watchdog that handles event timeouts */ + struct wdog_s waitwdog; /* Watchdog that handles event timeouts */ /* Callback support */ @@ -1495,7 +1495,7 @@ static void stm32_endwait(struct stm32_dev_s *priv, { /* Cancel the watchdog timeout */ - wd_cancel(priv->waitwdog); + wd_cancel(&priv->waitwdog); /* Disable event-related interrupts */ @@ -1918,7 +1918,7 @@ static void stm32_reset(FAR struct sdio_dev_s *dev) * completion events */ #endif - wd_cancel(priv->waitwdog); /* Cancel any timeouts */ + wd_cancel(&priv->waitwdog); /* Cancel any timeouts */ /* Interrupt mode data transfer support */ @@ -2375,7 +2375,7 @@ static int stm32_cancel(FAR struct sdio_dev_s *dev) /* Cancel any watchdog timeout */ - wd_cancel(priv->waitwdog); + wd_cancel(&priv->waitwdog); /* If this was a DMA transfer, make sure that DMA is stopped */ @@ -2827,7 +2827,7 @@ static sdio_eventset_t stm32_eventwait(FAR struct sdio_dev_s *dev, /* Start the watchdog timer */ delay = MSEC2TICK(timeout); - ret = wd_start(priv->waitwdog, delay, + ret = wd_start(&priv->waitwdog, delay, stm32_eventtimeout, 1, (wdparm_t)priv); if (ret < 0) { @@ -2870,7 +2870,7 @@ static sdio_eventset_t stm32_eventwait(FAR struct sdio_dev_s *dev, * return an SDIO error. */ - wd_cancel(priv->waitwdog); + wd_cancel(&priv->waitwdog); wkupevent = SDIOWAIT_ERROR; goto errout_with_waitints; } @@ -3475,11 +3475,6 @@ FAR struct sdio_dev_s *sdio_initialize(int slotno) nxsem_set_protocol(&priv->waitsem, SEM_PRIO_NONE); - /* Create a watchdog timer */ - - priv->waitwdog = wd_create(); - DEBUGASSERT(priv->waitwdog); - #ifdef CONFIG_STM32F7_SDMMC_DMA /* Allocate a DMA channel */ diff --git a/arch/arm/src/stm32h7/stm32_ethernet.c b/arch/arm/src/stm32h7/stm32_ethernet.c index 228b19f3d79..1e9d283882c 100644 --- a/arch/arm/src/stm32h7/stm32_ethernet.c +++ b/arch/arm/src/stm32h7/stm32_ethernet.c @@ -610,8 +610,8 @@ struct stm32_ethmac_s uint8_t mbps100 : 1; /* 100MBps operation (vs 10 MBps) */ uint8_t fduplex : 1; /* Full (vs. half) duplex */ uint8_t intf; /* Ethernet interface number */ - WDOG_ID txpoll; /* TX poll timer */ - WDOG_ID txtimeout; /* TX timeout timer */ + struct wdog_s txpoll; /* TX poll timer */ + struct wdog_s txtimeout; /* TX timeout timer */ struct work_s irqwork; /* For deferring interrupt work to the work queue */ struct work_s pollwork; /* For deferring poll work to the work queue */ @@ -1277,7 +1277,7 @@ static int stm32_transmit(struct stm32_ethmac_s *priv) /* Setup the TX timeout watchdog (perhaps restarting the timer) */ - wd_start(priv->txtimeout, STM32_TXTIMEOUT, + wd_start(&priv->txtimeout, STM32_TXTIMEOUT, stm32_txtimeout_expiry, 1, (wdparm_t)priv); /* Update the tx descriptor tail pointer register to start the DMA */ @@ -2184,7 +2184,7 @@ static void stm32_txdone(struct stm32_ethmac_s *priv) { /* Cancel the TX timeout */ - wd_cancel(priv->txtimeout); + wd_cancel(&priv->txtimeout); /* And disable further TX interrupts. */ @@ -2345,7 +2345,7 @@ static int stm32_interrupt(int irq, void *context, FAR void *arg) * expiration and the deferred interrupt processing. */ - wd_cancel(priv->txtimeout); + wd_cancel(&priv->txtimeout); } DEBUGASSERT(work_available(&priv->irqwork)); @@ -2502,7 +2502,7 @@ static void stm32_poll_work(void *arg) /* Setup the watchdog poll timer again */ - wd_start(priv->txpoll, STM32_WDDELAY, + wd_start(&priv->txpoll, STM32_WDDELAY, stm32_poll_expiry, 1, (wdparm_t)priv); net_unlock(); } @@ -2537,7 +2537,7 @@ static void stm32_poll_expiry(int argc, wdparm_t arg, ...) } else { - wd_start(priv->txpoll, STM32_WDDELAY, + wd_start(&priv->txpoll, STM32_WDDELAY, stm32_poll_expiry, 1, (wdparm_t)priv); } } @@ -2586,7 +2586,7 @@ static int stm32_ifup(struct net_driver_s *dev) /* Set and activate a timer process */ - wd_start(priv->txpoll, STM32_WDDELAY, + wd_start(&priv->txpoll, STM32_WDDELAY, stm32_poll_expiry, 1, (wdparm_t)priv); /* Enable the Ethernet interrupt */ @@ -2628,8 +2628,8 @@ static int stm32_ifdown(struct net_driver_s *dev) /* Cancel the TX poll timer and TX timeout timers */ - wd_cancel(priv->txpoll); - wd_cancel(priv->txtimeout); + wd_cancel(&priv->txpoll); + wd_cancel(&priv->txtimeout); /* Put the EMAC in its reset, non-operational state. This should be * a known configuration that will guarantee the stm32_ifup() always @@ -4385,15 +4385,9 @@ static inline int stm32_ethinitialize(int intf) #ifdef CONFIG_NETDEV_PHY_IOCTL priv->dev.d_ioctl = stm32_ioctl; /* Support PHY ioctl() calls */ #endif - priv->dev.d_private = - (void *)g_stm32ethmac; /* Used to recover private state */ + priv->dev.d_private = g_stm32ethmac; /* Used to recover private state */ priv->intf = intf; /* Remember the interface number */ - /* Create a watchdog for timing polling for and timing of transmissions */ - - priv->txpoll = wd_create(); /* Create periodic poll timer */ - priv->txtimeout = wd_create(); /* Create TX timeout timer */ - stm32_get_uniqueid(uid); crc = crc64(uid, 12); diff --git a/arch/arm/src/stm32h7/stm32_qspi.c b/arch/arm/src/stm32h7/stm32_qspi.c index aa705b8d0fd..50c282f54a8 100644 --- a/arch/arm/src/stm32h7/stm32_qspi.c +++ b/arch/arm/src/stm32h7/stm32_qspi.c @@ -224,7 +224,7 @@ struct stm32h7_qspidev_s sem_t dmawait; /* Used to wait for DMA completion */ int result; /* DMA result */ DMA_HANDLE dmach; /* QSPI DMA handle */ - WDOG_ID dmadog; /* Watchdog that handles DMA timeouts */ + struct wdog_s dmadog; /* Watchdog that handles DMA timeouts */ #endif /* Debug stuff */ @@ -1436,7 +1436,7 @@ static void qspi_dma_callback(DMA_HANDLE handle, uint8_t isr, void *arg) /* Cancel the watchdog timeout */ - wd_cancel(priv->dmadog); + wd_cancel(&priv->dmadog); /* Sample DMA registers at the time of the callback */ @@ -1568,7 +1568,7 @@ static int qspi_memory_dma(struct stm32h7_qspidev_s *priv, { /* Start (or re-start) the watchdog timeout */ - ret = wd_start(priv->dmadog, DMA_TIMEOUT_TICKS, + ret = wd_start(&priv->dmadog, DMA_TIMEOUT_TICKS, qspi_dma_timeout, 1, (wdparm_t)priv); if (ret < 0) { @@ -1587,7 +1587,7 @@ static int qspi_memory_dma(struct stm32h7_qspidev_s *priv, /* Cancel the watchdog timeout */ - wd_cancel(priv->dmadog); + wd_cancel(&priv->dmadog); /* Check if we were awakened by an error of some kind */ @@ -2668,15 +2668,6 @@ struct qspi_dev_s *stm32h7_qspi_initialize(int intf) nxsem_init(&priv->dmawait, 0, 0); nxsem_set_protocol(&priv->dmawait, SEM_PRIO_NONE); - - /* Create a watchdog time to catch DMA timeouts */ - - priv->dmadog = wd_create(); - if (priv->dmadog == NULL) - { - spierr("ERROR: Failed to create wdog\n"); - goto errout_with_dmahandles; - } #endif #ifdef CONFIG_STM32H7_QSPI_INTERRUPTS @@ -2686,7 +2677,7 @@ struct qspi_dev_s *stm32h7_qspi_initialize(int intf) if (ret < 0) { spierr("ERROR: Failed to attach irq %d\n", priv->irq); - goto errout_with_dmadog; + goto errout_with_dmawait; } /* Initialize the semaphore that blocks until the operation completes. @@ -2724,14 +2715,10 @@ errout_with_irq: #ifdef CONFIG_STM32H7_QSPI_INTERRUPTS irq_detach(priv->irq); -errout_with_dmadog: +errout_with_dmawait: #endif #ifdef CONFIG_STM32H7_QSPI_DMA - wd_delete(priv->dmadog); - -errout_with_dmahandles: nxsem_destroy(&priv->dmawait); - if (priv->dmach) { stm32_dmafree(priv->dmach); diff --git a/arch/arm/src/stm32h7/stm32_sdmmc.c b/arch/arm/src/stm32h7/stm32_sdmmc.c index d8c618e316a..2005b42273d 100644 --- a/arch/arm/src/stm32h7/stm32_sdmmc.c +++ b/arch/arm/src/stm32h7/stm32_sdmmc.c @@ -336,7 +336,7 @@ struct stm32_dev_s sdio_eventset_t waitevents; /* Set of events to be waited for */ uint32_t waitmask; /* Interrupt enables for event waiting */ volatile sdio_eventset_t wkupevent; /* The event that caused the wakeup */ - WDOG_ID waitwdog; /* Watchdog that handles event timeouts */ + struct wdog_s waitwdog; /* Watchdog that handles event timeouts */ /* Callback support */ @@ -1476,7 +1476,7 @@ static void stm32_endwait(struct stm32_dev_s *priv, { /* Cancel the watchdog timeout */ - wd_cancel(priv->waitwdog); + wd_cancel(&priv->waitwdog); /* Disable event-related interrupts */ @@ -1952,7 +1952,7 @@ static void stm32_reset(FAR struct sdio_dev_s *dev) priv->waitmask = 0; /* Interrupt enables for event waiting */ priv->wkupevent = 0; /* The event that caused the wakeup */ - wd_cancel(priv->waitwdog); /* Cancel any timeouts */ + wd_cancel(&priv->waitwdog); /* Cancel any timeouts */ /* Interrupt mode data transfer support */ @@ -2453,7 +2453,7 @@ static int stm32_cancel(FAR struct sdio_dev_s *dev) /* Cancel any watchdog timeout */ - wd_cancel(priv->waitwdog); + wd_cancel(&priv->waitwdog); /* Mark no transfer in progress */ @@ -2891,7 +2891,7 @@ static sdio_eventset_t stm32_eventwait(FAR struct sdio_dev_s *dev, /* Start the watchdog timer */ delay = MSEC2TICK(timeout); - ret = wd_start(priv->waitwdog, delay, + ret = wd_start(&priv->waitwdog, delay, stm32_eventtimeout, 1, (wdparm_t)priv); if (ret < OK) { @@ -2934,7 +2934,7 @@ static sdio_eventset_t stm32_eventwait(FAR struct sdio_dev_s *dev, * return an SDIO error. */ - wd_cancel(priv->waitwdog); + wd_cancel(&priv->waitwdog); wkupevent = SDIOWAIT_ERROR; goto errout_with_waitints; } @@ -3535,11 +3535,6 @@ FAR struct sdio_dev_s *sdio_initialize(int slotno) nxsem_set_protocol(&priv->waitsem, SEM_PRIO_NONE); - /* Create a watchdog timer */ - - priv->waitwdog = wd_create(); - DEBUGASSERT(priv->waitwdog); - /* Reset the card and assure that it is in the initial, unconfigured * state. */ diff --git a/arch/arm/src/stm32l4/stm32l4_qspi.c b/arch/arm/src/stm32l4/stm32l4_qspi.c index 3ed4c53a0d9..6d0ee27e946 100644 --- a/arch/arm/src/stm32l4/stm32l4_qspi.c +++ b/arch/arm/src/stm32l4/stm32l4_qspi.c @@ -197,7 +197,7 @@ struct stm32l4_qspidev_s sem_t dmawait; /* Used to wait for DMA completion */ int result; /* DMA result */ DMA_HANDLE dmach; /* QSPI DMA handle */ - WDOG_ID dmadog; /* Watchdog that handles DMA timeouts */ + struct wdog_s dmadog; /* Watchdog that handles DMA timeouts */ #endif /* Debug stuff */ @@ -1347,7 +1347,7 @@ static void qspi_dma_callback(DMA_HANDLE handle, uint8_t isr, void *arg) /* Cancel the watchdog timeout */ - wd_cancel(priv->dmadog); + wd_cancel(&priv->dmadog); /* Sample DMA registers at the time of the callback */ @@ -1477,7 +1477,7 @@ static int qspi_memory_dma(struct stm32l4_qspidev_s *priv, { /* Start (or re-start) the watchdog timeout */ - ret = wd_start(priv->dmadog, DMA_TIMEOUT_TICKS, + ret = wd_start(&priv->dmadog, DMA_TIMEOUT_TICKS, qspi_dma_timeout, 1, (wdparm_t)priv); if (ret < 0) { @@ -1490,7 +1490,7 @@ static int qspi_memory_dma(struct stm32l4_qspidev_s *priv, /* Cancel the watchdog timeout */ - wd_cancel(priv->dmadog); + wd_cancel(&priv->dmadog); /* Check if we were awakened by an error of some kind */ @@ -2541,15 +2541,6 @@ struct qspi_dev_s *stm32l4_qspi_initialize(int intf) nxsem_init(&priv->dmawait, 0, 0); nxsem_set_protocol(&priv->dmawait, SEM_PRIO_NONE); - - /* Create a watchdog time to catch DMA timeouts */ - - priv->dmadog = wd_create(); - if (priv->dmadog == NULL) - { - spierr("ERROR: Failed to create wdog\n"); - goto errout_with_dmahandles; - } #endif #ifdef STM32L4_QSPI_INTERRUPTS @@ -2559,7 +2550,7 @@ struct qspi_dev_s *stm32l4_qspi_initialize(int intf) if (ret < 0) { spierr("ERROR: Failed to attach irq %d\n", priv->irq); - goto errout_with_dmadog; + goto errout_with_dmawait; } /* Initialize the semaphore that blocks until the operation completes. @@ -2597,14 +2588,10 @@ errout_with_irq: #ifdef STM32L4_QSPI_INTERRUPTS irq_detach(priv->irq); -errout_with_dmadog: +errout_with_dmawait: #endif #ifdef CONFIG_STM32L4_QSPI_DMA - wd_delete(priv->dmadog); - -errout_with_dmahandles: nxsem_destroy(&priv->dmawait); - if (priv->dmach) { stm32l4_dmafree(priv->dmach); diff --git a/arch/arm/src/stm32l4/stm32l4_sai.c b/arch/arm/src/stm32l4/stm32l4_sai.c index 44bf3bafeb4..559465f63a5 100644 --- a/arch/arm/src/stm32l4/stm32l4_sai.c +++ b/arch/arm/src/stm32l4/stm32l4_sai.c @@ -156,7 +156,7 @@ struct stm32l4_sai_s uint32_t samplerate; /* Data sample rate */ uint8_t rxenab:1; /* True: RX transfers enabled */ uint8_t txenab:1; /* True: TX transfers enabled */ - WDOG_ID dog; /* Watchdog that handles timeouts */ + struct wdog_s dog; /* Watchdog that handles timeouts */ sq_queue_t pend; /* A queue of pending transfers */ sq_queue_t act; /* A queue of active transfers */ sq_queue_t done; /* A queue of completed transfers */ @@ -657,7 +657,7 @@ static int sai_dma_setup(struct stm32l4_sai_s *priv) if (bfcontainer->timeout > 0) { - ret = wd_start(priv->dog, bfcontainer->timeout, + ret = wd_start(&priv->dog, bfcontainer->timeout, sai_timeout, 1, (wdparm_t)priv); /* Check if we have successfully started the watchdog timer. Note @@ -839,7 +839,7 @@ static void sai_dma_callback(DMA_HANDLE handle, uint8_t isr, void *arg) /* Cancel the watchdog timeout */ - wd_cancel(priv->dog); + wd_cancel(&priv->dog); /* Then schedule completion of the transfer to occur on the worker thread */ @@ -1296,11 +1296,6 @@ static void sai_portinitialize(struct stm32l4_sai_s *priv) nxsem_init(&priv->exclsem, 0, 1); - /* Create a watchdog timer to catch transfer timeouts */ - - priv->dog = wd_create(); - DEBUGASSERT(priv->dog); - /* Initialize buffering */ sai_buf_initialize(priv); diff --git a/arch/arm/src/stm32l4/stm32l4_sdmmc.c b/arch/arm/src/stm32l4/stm32l4_sdmmc.c index bfb011bf93e..8de5052f558 100644 --- a/arch/arm/src/stm32l4/stm32l4_sdmmc.c +++ b/arch/arm/src/stm32l4/stm32l4_sdmmc.c @@ -347,7 +347,7 @@ struct stm32_dev_s sdio_eventset_t waitevents; /* Set of events to be waited for */ uint32_t waitmask; /* Interrupt enables for event waiting */ volatile sdio_eventset_t wkupevent; /* The event that caused the wakeup */ - WDOG_ID waitwdog; /* Watchdog that handles event timeouts */ + struct wdog_s waitwdog; /* Watchdog that handles event timeouts */ /* Callback support */ @@ -1375,7 +1375,7 @@ static void stm32_endwait(struct stm32_dev_s *priv, { /* Cancel the watchdog timeout */ - wd_cancel(priv->waitwdog); + wd_cancel(&priv->waitwdog); /* Disable event-related interrupts */ @@ -1743,7 +1743,7 @@ static void stm32_reset(FAR struct sdio_dev_s *dev) * completion events */ #endif - wd_cancel(priv->waitwdog); /* Cancel any timeouts */ + wd_cancel(&priv->waitwdog); /* Cancel any timeouts */ /* Interrupt mode data transfer support */ @@ -2168,7 +2168,7 @@ static int stm32_cancel(FAR struct sdio_dev_s *dev) /* Cancel any watchdog timeout */ - wd_cancel(priv->waitwdog); + wd_cancel(&priv->waitwdog); /* If this was a DMA transfer, make sure that DMA is stopped */ @@ -2631,7 +2631,7 @@ static sdio_eventset_t stm32_eventwait(FAR struct sdio_dev_s *dev, /* Start the watchdog timer */ delay = MSEC2TICK(timeout); - ret = wd_start(priv->waitwdog, delay, + ret = wd_start(&priv->waitwdog, delay, stm32_eventtimeout, 1, (wdparm_t)priv); if (ret < 0) { @@ -2674,7 +2674,7 @@ static sdio_eventset_t stm32_eventwait(FAR struct sdio_dev_s *dev, * return an SDIO error. */ - wd_cancel(priv->waitwdog); + wd_cancel(&priv->waitwdog); wkupevent = SDIOWAIT_ERROR; goto errout_with_waitints; } @@ -3178,11 +3178,6 @@ FAR struct sdio_dev_s *sdio_initialize(int slotno) nxsem_set_protocol(&priv->waitsem, SEM_PRIO_NONE); - /* Create a watchdog timer */ - - priv->waitwdog = wd_create(); - DEBUGASSERT(priv->waitwdog); - #ifdef CONFIG_STM32L4_SDMMC_DMA /* Allocate a DMA channel */ diff --git a/arch/arm/src/tiva/lm/lm3s_ethernet.c b/arch/arm/src/tiva/lm/lm3s_ethernet.c index 2f2d5be0244..eea6e31337f 100644 --- a/arch/arm/src/tiva/lm/lm3s_ethernet.c +++ b/arch/arm/src/tiva/lm/lm3s_ethernet.c @@ -205,8 +205,8 @@ struct tiva_driver_s #endif bool ld_bifup; /* true:ifup false:ifdown */ - WDOG_ID ld_txpoll; /* TX poll timer */ - WDOG_ID ld_txtimeout; /* TX timeout timer */ + struct wdog_s ld_txpoll; /* TX poll timer */ + struct wdog_s ld_txtimeout; /* TX timeout timer */ struct work_s ld_irqwork; /* For deferring interrupt work to the work queue */ struct work_s ld_pollwork; /* For deferring poll work to the work queue */ @@ -597,7 +597,7 @@ static int tiva_transmit(struct tiva_driver_s *priv) /* Setup the TX timeout watchdog (perhaps restarting the timer) */ - wd_start(priv->ld_txtimeout, TIVA_TXTIMEOUT, + wd_start(&priv->ld_txtimeout, TIVA_TXTIMEOUT, tiva_txtimeout_expiry, 1, (wdparm_t)priv); ret = OK; } @@ -952,7 +952,7 @@ static void tiva_txdone(struct tiva_driver_s *priv) { /* Cancel the TX timeout */ - wd_cancel(priv->ld_txtimeout); + wd_cancel(&priv->ld_txtimeout); /* Verify that the Tx FIFO is not in use. The NEWTX bit initiates an * Ethernet transmission once the packet has been placed in the TX FIFO. @@ -1116,7 +1116,7 @@ static int tiva_interrupt(int irq, void *context, FAR void *arg) * expiration and the deferred interrupt processing. */ - wd_cancel(priv->ld_txtimeout); + wd_cancel(&priv->ld_txtimeout); } /* Schedule to perform the interrupt processing on the worker thread. */ @@ -1243,7 +1243,7 @@ static void tiva_poll_work(void *arg) /* Setup the watchdog poll timer again */ - wd_start(priv->ld_txpoll, TIVA_WDDELAY, + wd_start(&priv->ld_txpoll, TIVA_WDDELAY, tiva_poll_expiry, 1, (wdparm_t)priv); } @@ -1430,7 +1430,7 @@ static int tiva_ifup(struct net_driver_s *dev) /* Set and activate a timer process */ - wd_start(priv->ld_txpoll, TIVA_WDDELAY, + wd_start(&priv->ld_txpoll, TIVA_WDDELAY, tiva_poll_expiry, 1, (wdparm_t)priv); priv->ld_bifup = true; @@ -1468,8 +1468,8 @@ static int tiva_ifdown(struct net_driver_s *dev) /* Cancel the TX poll timer and TX timeout timers */ flags = enter_critical_section(); - wd_cancel(priv->ld_txpoll); - wd_cancel(priv->ld_txtimeout); + wd_cancel(&priv->ld_txpoll); + wd_cancel(&priv->ld_txtimeout); /* Disable the Ethernet interrupt */ @@ -1715,17 +1715,13 @@ static inline int tiva_ethinitialize(int intf) priv->ld_dev.d_addmac = tiva_addmac; /* Add multicast MAC address */ priv->ld_dev.d_rmmac = tiva_rmmac; /* Remove multicast MAC address */ #endif - priv->ld_dev.d_private = (void *)priv; /* Used to recover private state from dev */ - - /* Create a watchdog for timing polling for and timing of transmissions */ + priv->ld_dev.d_private = priv; /* Used to recover private state from dev */ #if TIVA_NETHCONTROLLERS > 1 # error "A mechanism to associate base address an IRQ with an interface is needed" - priv->ld_base = ??; /* Ethernet controller base address */ - priv->ld_irq = ??; /* Ethernet controller IRQ number */ + priv->ld_base = ??; /* Ethernet controller base address */ + priv->ld_irq = ??; /* Ethernet controller IRQ number */ #endif - priv->ld_txpoll = wd_create(); /* Create periodic poll timer */ - priv->ld_txtimeout = wd_create(); /* Create TX timeout timer */ #ifdef CONFIG_TIVA_BOARDMAC /* If the board can provide us with a MAC address, get the address diff --git a/arch/arm/src/tiva/tm4c/tm4c_ethernet.c b/arch/arm/src/tiva/tm4c/tm4c_ethernet.c index a4d2b10a25b..36bfe8dbda6 100644 --- a/arch/arm/src/tiva/tm4c/tm4c_ethernet.c +++ b/arch/arm/src/tiva/tm4c/tm4c_ethernet.c @@ -628,8 +628,8 @@ struct tiva_ethmac_s uint8_t ifup : 1; /* true:ifup false:ifdown */ uint8_t mbps100 : 1; /* 100MBps operation (vs 10 MBps) */ uint8_t fduplex : 1; /* Full (vs. half) duplex */ - WDOG_ID txpoll; /* TX poll timer */ - WDOG_ID txtimeout; /* TX timeout timer */ + struct wdog_s txpoll; /* TX poll timer */ + struct wdog_s txtimeout; /* TX timeout timer */ struct work_s irqwork; /* For deferring interrupt work to the work queue */ struct work_s pollwork; /* For deferring poll work to the work queue */ @@ -1218,7 +1218,7 @@ static int tiva_transmit(FAR struct tiva_ethmac_s *priv) /* Setup the TX timeout watchdog (perhaps restarting the timer) */ - wd_start(priv->txtimeout, TIVA_TXTIMEOUT, + wd_start(&priv->txtimeout, TIVA_TXTIMEOUT, tiva_txtimeout_expiry, 1, (wdparm_t)priv); return OK; } @@ -1983,7 +1983,7 @@ static void tiva_txdone(FAR struct tiva_ethmac_s *priv) { /* Cancel the TX timeout */ - wd_cancel(priv->txtimeout); + wd_cancel(&priv->txtimeout); /* And disable further TX interrupts. */ @@ -2145,7 +2145,7 @@ static int tiva_interrupt(int irq, FAR void *context, FAR void *arg) * expiration and the deferred interrupt processing. */ - wd_cancel(priv->txtimeout); + wd_cancel(&priv->txtimeout); } /* Schedule to perform the interrupt processing on the worker thread. */ @@ -2313,7 +2313,7 @@ static void tiva_poll_work(FAR void *arg) /* Setup the watchdog poll timer again */ - wd_start(priv->txpoll, TIVA_WDDELAY, + wd_start(&priv->txpoll, TIVA_WDDELAY, tiva_poll_expiry, 1, (wdparm_t)priv); net_unlock(); } @@ -2390,7 +2390,7 @@ static int tiva_ifup(struct net_driver_s *dev) /* Set and activate a timer process */ - wd_start(priv->txpoll, TIVA_WDDELAY, + wd_start(&priv->txpoll, TIVA_WDDELAY, tiva_poll_expiry, 1, (wdparm_t)priv); /* Enable the Ethernet interrupt */ @@ -2433,8 +2433,8 @@ static int tiva_ifdown(struct net_driver_s *dev) /* Cancel the TX poll timer and TX timeout timers */ - wd_cancel(priv->txpoll); - wd_cancel(priv->txtimeout); + wd_cancel(&priv->txpoll); + wd_cancel(&priv->txtimeout); /* Put the EMAC in its reset, non-operational state. This should be * a known configuration that will guarantee the tiva_ifup() always @@ -4092,12 +4092,7 @@ int tiva_ethinitialize(int intf) #ifdef CONFIG_NETDEV_IOCTL priv->dev.d_ioctl = tiva_ioctl; /* Support PHY ioctl() calls */ #endif - priv->dev.d_private = (void *)g_tiva_ethmac; /* Used to recover private state from dev */ - - /* Create a watchdog for timing polling for and timing of transmissions */ - - priv->txpoll = wd_create(); /* Create periodic poll timer */ - priv->txtimeout = wd_create(); /* Create TX timeout timer */ + priv->dev.d_private = g_tiva_ethmac; /* Used to recover private state from dev */ #ifdef CONFIG_TIVA_BOARDMAC /* If the board can provide us with a MAC address, get the address diff --git a/arch/arm/src/xmc4/xmc4_spi.c b/arch/arm/src/xmc4/xmc4_spi.c index c168694cd54..64f2f646dbd 100644 --- a/arch/arm/src/xmc4/xmc4_spi.c +++ b/arch/arm/src/xmc4/xmc4_spi.c @@ -185,7 +185,7 @@ struct xmc4_spics_s #ifdef CONFIG_XMC4_SPI_DMA bool candma; /* DMA is supported */ sem_t dmawait; /* Used to wait for DMA completion */ - WDOG_ID dmadog; /* Watchdog that handles DMA timeouts */ + struct wdog_s dmadog; /* Watchdog that handles DMA timeouts */ int result; /* DMA result */ DMA_HANDLE rxdma; /* SPI RX DMA handle */ DMA_HANDLE txdma; /* SPI TX DMA handle */ @@ -959,7 +959,7 @@ static void spi_rxcallback(DMA_HANDLE handle, void *arg, int result) /* Cancel the watchdog timeout */ - wd_cancel(spics->dmadog); + wd_cancel(&spics->dmadog); /* Sample DMA registers at the time of the callback */ @@ -1661,7 +1661,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, + ret = wd_start(&spics->dmadog, DMA_TIMEOUT_TICKS, spi_dmatimeout, 1, (wdparm_t)spics); if (ret != OK) { @@ -1674,7 +1674,7 @@ static void spi_exchange(struct spi_dev_s *dev, const void *txbuffer, /* Cancel the watchdog timeout */ - wd_cancel(spics->dmadog); + wd_cancel(&spics->dmadog); /* Check if we were awakened by an error of some kind. */ @@ -2092,11 +2092,6 @@ struct spi_dev_s *xmc4_spibus_initialize(int channel) nxsem_init(&spics->dmawait, 0, 0); nxsem_set_protocol(&spics->dmawait, SEM_PRIO_NONE); - - /* Create a watchdog time to catch DMA timeouts */ - - spics->dmadog = wd_create(); - DEBUGASSERT(spics->dmadog); #endif spi_dumpregs(spi, "After initialization"); diff --git a/arch/hc/src/m9s12/m9s12_ethernet.c b/arch/hc/src/m9s12/m9s12_ethernet.c index 97ab2016214..1fe9aa26719 100644 --- a/arch/hc/src/m9s12/m9s12_ethernet.c +++ b/arch/hc/src/m9s12/m9s12_ethernet.c @@ -96,8 +96,8 @@ struct emac_driver_s { bool d_bifup; /* true:ifup false:ifdown */ - WDOG_ID d_txpoll; /* TX poll timer */ - WDOG_ID d_txtimeout; /* TX timeout timer */ + struct wdog_s d_txpoll; /* TX poll timer */ + struct wdog_s d_txtimeout; /* TX timeout timer */ /* This holds the information visible to the NuttX network */ @@ -185,7 +185,7 @@ static int emac_transmit(FAR struct emac_driver_s *priv) /* Setup the TX timeout watchdog (perhaps restarting the timer) */ - wd_start(priv->d_txtimeout, HCS12_TXTIMEOUT, + wd_start(&priv->d_txtimeout, HCS12_TXTIMEOUT, emac_txtimeout, 1, (wdparm_t)priv); return OK; } @@ -427,7 +427,7 @@ static void emac_txdone(FAR struct emac_driver_s *priv) * disable further Tx interrupts. */ - wd_cancel(priv->d_txtimeout); + wd_cancel(&priv->d_txtimeout); /* Then poll the network for new XMIT data */ @@ -540,7 +540,7 @@ static void emac_polltimer(int argc, wdparm_t arg, ...) /* Setup the watchdog poll timer again */ - wd_start(priv->d_txpoll, HCS12_WDDELAY, emac_polltimer, 1, (wdparm_t)arg); + wd_start(&priv->d_txpoll, HCS12_WDDELAY, emac_polltimer, 1, (wdparm_t)arg); } /**************************************************************************** @@ -573,7 +573,8 @@ static int emac_ifup(struct net_driver_s *dev) /* Set and activate a timer process */ - wd_start(priv->d_txpoll, HCS12_WDDELAY, emac_polltimer, 1, (wdparm_t)priv); + wd_start(&priv->d_txpoll, HCS12_WDDELAY, + emac_polltimer, 1, (wdparm_t)priv); /* Enable the Ethernet interrupt */ @@ -611,8 +612,8 @@ static int emac_ifdown(struct net_driver_s *dev) /* Cancel the TX poll timer and TX timeout timers */ - wd_cancel(priv->d_txpoll); - wd_cancel(priv->d_txtimeout); + wd_cancel(&priv->d_txpoll); + wd_cancel(&priv->d_txtimeout); /* Put the EMAC is its reset, non-operational state. This should be * a known configuration that will guarantee the emac_ifup() always @@ -786,11 +787,6 @@ int emac_initialize(int intf) #endif priv->d_dev.d_private = priv; /* Used to recover private state from dev */ - /* Create a watchdog for timing polling for and timing of transmissions */ - - priv->d_txpoll = wd_create(); /* Create periodic poll timer */ - priv->d_txtimeout = wd_create(); /* Create TX timeout timer */ - /* Put the interface in the down state. This usually amounts to resetting * the device and/or calling emac_ifdown(). */ diff --git a/arch/mips/src/pic32mx/pic32mx_ethernet.c b/arch/mips/src/pic32mx/pic32mx_ethernet.c index fc3338096d3..52304b11cd0 100644 --- a/arch/mips/src/pic32mx/pic32mx_ethernet.c +++ b/arch/mips/src/pic32mx/pic32mx_ethernet.c @@ -330,8 +330,8 @@ struct pic32mx_driver_s #endif uint8_t pd_txnext; /* Index to the next Tx descriptor */ uint32_t pd_inten; /* Shadow copy of INTEN register */ - WDOG_ID pd_txpoll; /* TX poll timer */ - WDOG_ID pd_txtimeout; /* TX timeout timer */ + struct wdog_s pd_txpoll; /* TX poll timer */ + struct wdog_s pd_txtimeout; /* TX timeout timer */ struct work_s pd_irqwork; /* For deferring interrupt work to the work queue */ struct work_s pd_pollwork; /* For deferring poll work to the work queue */ @@ -1112,7 +1112,7 @@ static int pic32mx_transmit(struct pic32mx_driver_s *priv) /* Setup the TX timeout watchdog (perhaps restarting the timer) */ - wd_start(priv->pd_txtimeout, PIC32MX_TXTIMEOUT, + wd_start(&priv->pd_txtimeout, PIC32MX_TXTIMEOUT, pic32mx_txtimeout_expiry, 1, (wdparm_t)priv); return OK; @@ -1628,7 +1628,7 @@ static void pic32mx_txdone(struct pic32mx_driver_s *priv) /* Cancel the pending Tx timeout */ - wd_cancel(priv->pd_txtimeout); + wd_cancel(&priv->pd_txtimeout); /* Disable further Tx interrupts. Tx interrupts may be re-enabled again * depending upon the result of the poll. @@ -1939,7 +1939,7 @@ static int pic32mx_interrupt(int irq, void *context, FAR void *arg) * expiration and the deferred interrupt processing. */ - wd_cancel(priv->pd_txtimeout); + wd_cancel(&priv->pd_txtimeout); } /* Schedule to perform the interrupt processing on the worker thread. */ @@ -2069,7 +2069,7 @@ static void pic32mx_poll_work(void *arg) /* Setup the watchdog poll timer again */ - wd_start(priv->pd_txpoll, PIC32MX_WDDELAY, + wd_start(&priv->pd_txpoll, PIC32MX_WDDELAY, pic32mx_poll_expiry, 1, (wdparm_t)priv); net_unlock(); } @@ -2401,7 +2401,7 @@ static int pic32mx_ifup(struct net_driver_s *dev) /* Set and activate a timer process */ - wd_start(priv->pd_txpoll, PIC32MX_WDDELAY, + wd_start(&priv->pd_txpoll, PIC32MX_WDDELAY, pic32mx_poll_expiry, 1, (wdparm_t)priv); /* Finally, enable the Ethernet interrupt at the interrupt controller */ @@ -2448,8 +2448,8 @@ static int pic32mx_ifdown(struct net_driver_s *dev) /* Cancel the TX poll timer and TX timeout timers */ - wd_cancel(priv->pd_txpoll); - wd_cancel(priv->pd_txtimeout); + wd_cancel(&priv->pd_txpoll); + wd_cancel(&priv->pd_txtimeout); /* Reset the device and mark it as down. */ @@ -3414,20 +3414,15 @@ static inline int pic32mx_ethinitialize(int intf) priv->pd_dev.d_addmac = pic32mx_addmac; /* Add multicast MAC address */ priv->pd_dev.d_rmmac = pic32mx_rmmac; /* Remove multicast MAC address */ #endif - priv->pd_dev.d_private = (void *)priv; /* Used to recover private state from dev */ + priv->pd_dev.d_private = priv; /* Used to recover private state from dev */ #if CONFIG_PIC32MX_NINTERFACES > 1 # error "A mechanism to associate base address an IRQ with an interface is needed" - priv->pd_base = ??; /* Ethernet controller base address */ - priv->pd_irq = ??; /* Ethernet controller IRQ vector number */ - priv->pd_irqsrc = ??; /* Ethernet controller IRQ source number */ + priv->pd_base = ??; /* Ethernet controller base address */ + priv->pd_irq = ??; /* Ethernet controller IRQ vector number */ + priv->pd_irqsrc = ??; /* Ethernet controller IRQ source number */ #endif - /* Create a watchdog for timing polling for and timing of transmissions */ - - priv->pd_txpoll = wd_create(); /* Create periodic poll timer */ - priv->pd_txtimeout = wd_create(); /* Create TX timeout timer */ - /* Reset the Ethernet controller and leave in the ifdown state. The * Ethernet controller will be properly re-initialized each time * pic32mx_ifup() is called. diff --git a/arch/mips/src/pic32mx/pic32mx_usbdev.c b/arch/mips/src/pic32mx/pic32mx_usbdev.c index 64a52652d04..630e91e6c92 100644 --- a/arch/mips/src/pic32mx/pic32mx_usbdev.c +++ b/arch/mips/src/pic32mx/pic32mx_usbdev.c @@ -422,7 +422,7 @@ struct pic32mx_usbdev_s uint8_t rxbusy:1; /* EP0 OUT data transfer in progress */ uint16_t epavail; /* Bitset of available endpoints */ uint16_t epstalled; /* Bitset of stalled endpoints */ - WDOG_ID wdog; /* Supports the restart delay */ + struct wdog_s wdog; /* Supports the restart delay */ /* The endpoint list */ @@ -1042,7 +1042,7 @@ static void pic32mx_delayedrestart(struct pic32mx_usbdev_s *priv, /* And start (or re-start) the watchdog timer */ - wd_start(priv->wdog, RESTART_DELAY, + wd_start(&priv->wdog, RESTART_DELAY, pic32mx_rqrestart, 1, (wdparm_t)priv); } @@ -4366,7 +4366,6 @@ void up_usbinitialize(void) */ priv->epstalled = 0; - priv->wdog = wd_create(); /* Attach USB controller interrupt handler. The hardware will not be * initialized and interrupts will not be enabled until the class device diff --git a/arch/mips/src/pic32mz/pic32mz_ethernet.c b/arch/mips/src/pic32mz/pic32mz_ethernet.c index 11aa6608d89..98e5feae18d 100644 --- a/arch/mips/src/pic32mz/pic32mz_ethernet.c +++ b/arch/mips/src/pic32mz/pic32mz_ethernet.c @@ -386,8 +386,8 @@ struct pic32mz_driver_s #endif uint8_t pd_txnext; /* Index to the next Tx descriptor */ uint32_t pd_inten; /* Shadow copy of INTEN register */ - WDOG_ID pd_txpoll; /* TX poll timer */ - WDOG_ID pd_txtimeout; /* TX timeout timer */ + struct wdog_s pd_txpoll; /* TX poll timer */ + struct wdog_s pd_txtimeout; /* TX timeout timer */ struct work_s pd_irqwork; /* For deferring interrupt work to the work queue */ struct work_s pd_pollwork; /* For deferring poll work to the work queue */ @@ -1217,7 +1217,7 @@ static int pic32mz_transmit(struct pic32mz_driver_s *priv) /* Setup the TX timeout watchdog (perhaps restarting the timer) */ - wd_start(priv->pd_txtimeout, PIC32MZ_TXTIMEOUT, + wd_start(&priv->pd_txtimeout, PIC32MZ_TXTIMEOUT, pic32mz_txtimeout_expiry, 1, (wdparm_t)priv); return OK; @@ -1746,7 +1746,7 @@ static void pic32mz_txdone(struct pic32mz_driver_s *priv) /* Cancel the pending Tx timeout */ - wd_cancel(priv->pd_txtimeout); + wd_cancel(&priv->pd_txtimeout); /* Disable further Tx interrupts. Tx interrupts may be re-enabled again * depending upon the result of the poll. @@ -2073,7 +2073,7 @@ static int pic32mz_interrupt(int irq, void *context, FAR void *arg) * expiration and the deferred interrupt processing. */ - wd_cancel(priv->pd_txtimeout); + wd_cancel(&priv->pd_txtimeout); } /* Schedule to perform the interrupt processing on the worker thread. */ @@ -2202,7 +2202,7 @@ static void pic32mz_poll_work(void *arg) /* Setup the watchdog poll timer again */ - wd_start(priv->pd_txpoll, PIC32MZ_WDDELAY, + wd_start(&priv->pd_txpoll, PIC32MZ_WDDELAY, pic32mz_poll_expiry, 1, (wdparm_t)priv); net_unlock(); } @@ -2545,7 +2545,7 @@ static int pic32mz_ifup(struct net_driver_s *dev) /* Set and activate a timer process */ - wd_start(priv->pd_txpoll, PIC32MZ_WDDELAY, + wd_start(&priv->pd_txpoll, PIC32MZ_WDDELAY, pic32mz_poll_expiry, 1, (wdparm_t)priv); /* Finally, enable the Ethernet interrupt at the interrupt controller */ @@ -2593,8 +2593,8 @@ static int pic32mz_ifdown(struct net_driver_s *dev) /* Cancel the TX poll timer and TX timeout timers */ - wd_cancel(priv->pd_txpoll); - wd_cancel(priv->pd_txtimeout); + wd_cancel(&priv->pd_txpoll); + wd_cancel(&priv->pd_txtimeout); /* Reset the device and mark it as down. */ @@ -3577,20 +3577,15 @@ static inline int pic32mz_ethinitialize(int intf) priv->pd_dev.d_addmac = pic32mz_addmac; /* Add multicast MAC address */ priv->pd_dev.d_rmmac = pic32mz_rmmac; /* Remove multicast MAC address */ #endif - priv->pd_dev.d_private = (void *)priv; /* Used to recover private state from dev */ + priv->pd_dev.d_private = priv; /* Used to recover private state from dev */ #if CONFIG_PIC32MZ_NINTERFACES > 1 # error "A mechanism to associate base address an IRQ with an interface is needed" - priv->pd_base = ; /* Ethernet controller base address */ - priv->pd_irq = ; /* Ethernet controller IRQ vector number */ - priv->pd_irqsrc = ; /* Ethernet controller IRQ source number */ + priv->pd_base = ; /* Ethernet controller base address */ + priv->pd_irq = ; /* Ethernet controller IRQ vector number */ + priv->pd_irqsrc = ; /* Ethernet controller IRQ source number */ #endif - /* Create a watchdog for timing polling for and timing of transmissions */ - - priv->pd_txpoll = wd_create(); /* Create periodic poll timer */ - priv->pd_txtimeout = wd_create(); /* Create TX timeout timer */ - /* Configure Ethernet peripheral pin selections */ /* Controlled by DEVCFG FMIIEN and FETHIO settings */ diff --git a/arch/mips/src/pic32mz/pic32mz_spi.c b/arch/mips/src/pic32mz/pic32mz_spi.c index ca525911e37..5b1688b632e 100644 --- a/arch/mips/src/pic32mz/pic32mz_spi.c +++ b/arch/mips/src/pic32mz/pic32mz_spi.c @@ -154,7 +154,7 @@ struct pic32mz_dev_s DMA_HANDLE txdma; /* SPI TX DMA handle */ int result; /* DMA result */ sem_t dmawait; /* Used to wait for DMA completion */ - WDOG_ID dmadog; /* Watchdog that handles DMA timeouts */ + struct wdog_s dmadog; /* Watchdog that handles DMA timeouts */ #endif #ifdef CONFIG_PIC32MZ_SPI_REGDEBUG @@ -889,7 +889,7 @@ static void spi_dmarxcallback(DMA_HANDLE handle, uint8_t status, void *arg) /* Cancel the watchdog timeout */ - wd_cancel(priv->dmadog); + wd_cancel(&priv->dmadog); /* Sample DMA registers at the time of the callback */ @@ -944,7 +944,7 @@ static void spi_dmatxcallback(DMA_HANDLE handle, uint8_t status, void *arg) /* Cancel the watchdog timeout */ - wd_cancel(priv->dmadog); + wd_cancel(&priv->dmadog); /* Sample DMA registers at the time of the callback */ @@ -1774,7 +1774,7 @@ static void spi_exchange(FAR struct spi_dev_s *dev, FAR const void *txbuffer, { /* Start (or re-start) the watchdog timeout */ - ret = wd_start(priv->dmadog, DMA_TIMEOUT_TICKS, + ret = wd_start(&priv->dmadog, DMA_TIMEOUT_TICKS, spi_dmatimeout, 1, (wdparm_t)priv); if (ret < 0) { @@ -1787,7 +1787,7 @@ static void spi_exchange(FAR struct spi_dev_s *dev, FAR const void *txbuffer, /* Cancel the watchdog timeout */ - wd_cancel(priv->dmadog); + wd_cancel(&priv->dmadog); /* Check if we were awakened by an error of some kind. EINTR is not a * failure. It simply means that the wait was awakened by a signal. @@ -2039,11 +2039,6 @@ FAR struct spi_dev_s *pic32mz_spibus_initialize(int port) nxsem_init(&priv->dmawait, 0, 0); nxsem_set_protocol(&priv->dmawait, SEM_PRIO_NONE); - - /* Create a watchdog timer to catch DMA timeouts */ - - priv->dmadog = wd_create(); - DEBUGASSERT(priv->dmadog); #endif #ifdef CONFIG_PIC32MZ_SPI_INTERRUPTS diff --git a/arch/misoc/src/common/misoc_net.c b/arch/misoc/src/common/misoc_net.c index 63c946c1e34..97f4d159fdd 100644 --- a/arch/misoc/src/common/misoc_net.c +++ b/arch/misoc/src/common/misoc_net.c @@ -117,8 +117,8 @@ struct misoc_net_driver_s { bool misoc_net_bifup; /* true:ifup false:ifdown */ - WDOG_ID misoc_net_txpoll; /* TX poll timer */ - WDOG_ID misoc_net_txtimeout; /* TX timeout timer */ + struct wdog_s misoc_net_txpoll; /* TX poll timer */ + struct wdog_s misoc_net_txtimeout; /* TX timeout timer */ struct work_s misoc_net_irqwork; /* For deferring interrupt work to the work queue */ struct work_s misoc_net_pollwork; /* For deferring poll work to the work queue */ uint8_t *rx0_buf; /* 2 RX and 2 TX buffer */ @@ -273,7 +273,7 @@ static int misoc_net_transmit(FAR struct misoc_net_driver_s *priv) /* Setup the TX timeout watchdog (perhaps restarting the timer) */ - wd_start(priv->misoc_net_txtimeout, MISOC_NET_TXTIMEOUT, + wd_start(&priv->misoc_net_txtimeout, MISOC_NET_TXTIMEOUT, misoc_net_txtimeout_expiry, 1, (wdparm_t)priv); return OK; } @@ -557,7 +557,7 @@ static void misoc_net_txdone(FAR struct misoc_net_driver_s *priv) * disable further Tx interrupts. */ - wd_cancel(priv->misoc_net_txtimeout); + wd_cancel(&priv->misoc_net_txtimeout); /* And disable further TX interrupts. */ @@ -661,7 +661,7 @@ static int misoc_net_interrupt(int irq, FAR void *context, FAR void *arg) * expiration and the deferred interrupt processing. */ - wd_cancel(priv->misoc_net_txtimeout); + wd_cancel(&priv->misoc_net_txtimeout); } /* Schedule to perform the interrupt processing on the worker thread. */ @@ -781,7 +781,7 @@ static void misoc_net_poll_work(FAR void *arg) /* Setup the watchdog poll timer again */ - wd_start(priv->misoc_net_txpoll, MISOC_NET_WDDELAY, + wd_start(&priv->misoc_net_txpoll, MISOC_NET_WDDELAY, misoc_net_poll_expiry, 1, (wdparm_t)priv); net_unlock(); @@ -866,7 +866,7 @@ static int misoc_net_ifup(FAR struct net_driver_s *dev) /* Set and activate a timer process */ - wd_start(priv->misoc_net_txpoll, MISOC_NET_WDDELAY, + wd_start(&priv->misoc_net_txpoll, MISOC_NET_WDDELAY, misoc_net_poll_expiry, 1, (wdparm_t)priv); priv->misoc_net_bifup = true; @@ -911,8 +911,8 @@ static int misoc_net_ifdown(FAR struct net_driver_s *dev) /* Cancel the TX poll timer and TX timeout timers */ - wd_cancel(priv->misoc_net_txpoll); - wd_cancel(priv->misoc_net_txtimeout); + wd_cancel(&priv->misoc_net_txpoll); + wd_cancel(&priv->misoc_net_txtimeout); /* Put the EMAC in its reset, non-operational state. This should be * a known configuration that will guarantee the misoc_net_ifup() always @@ -1205,12 +1205,7 @@ int misoc_net_initialize(int intf) priv->misoc_net_dev.d_addmac = misoc_net_addmac; /* Add multicast MAC address */ priv->misoc_net_dev.d_rmmac = misoc_net_rmmac; /* Remove multicast MAC address */ #endif - priv->misoc_net_dev.d_private = (FAR void *)g_misoc_net; /* Used to recover private state from dev */ - - /* Create a watchdog for timing polling for and timing of transmissions */ - - priv->misoc_net_txpoll = wd_create(); /* Create periodic poll timer */ - priv->misoc_net_txtimeout = wd_create(); /* Create TX timeout timer */ + priv->misoc_net_dev.d_private = g_misoc_net; /* Used to recover private state from dev */ /* Put the interface in the down state. This usually amounts to resetting * the device and/or calling misoc_net_ifdown(). diff --git a/arch/renesas/src/rx65n/rx65n_eth.c b/arch/renesas/src/rx65n/rx65n_eth.c index 411428794aa..559b9ce2813 100644 --- a/arch/renesas/src/rx65n/rx65n_eth.c +++ b/arch/renesas/src/rx65n/rx65n_eth.c @@ -4194,7 +4194,7 @@ int rx65n_ethinitialize(int intf) /* Used to recover private state from dev */ - priv->dev.d_private = (void *)g_rx65nethmac; + priv->dev.d_private = g_rx65nethmac; /* Multi cast flag */ diff --git a/arch/sim/src/sim/up_ioexpander.c b/arch/sim/src/sim/up_ioexpander.c index a5f08d2b835..286c2d1aa9a 100644 --- a/arch/sim/src/sim/up_ioexpander.c +++ b/arch/sim/src/sim/up_ioexpander.c @@ -108,7 +108,7 @@ struct sim_dev_s ioe_pinset_t level[2]; /* Bit encoded: 01=high/rising, * 10 low/falling, 11 both */ - WDOG_ID wdog; /* Timer used to poll for interrupt + struct wdog_s wdog; /* Timer used to poll for interrupt * simulation */ struct work_s work; /* Supports the interrupt handling * "bottom half" */ @@ -774,7 +774,7 @@ static void sim_interrupt_work(void *arg) /* Re-start the poll timer */ - ret = wd_start(priv->wdog, SIM_POLLDELAY, + ret = wd_start(&priv->wdog, SIM_POLLDELAY, sim_interrupt, 1, (wdparm_t)priv); if (ret < 0) { @@ -858,12 +858,7 @@ FAR struct ioexpander_dev_s *sim_ioexpander_initialize(void) priv->level[0] = PINSET_ALL; /* All rising edge */ priv->level[1] = PINSET_ALL; /* All falling edge */ - /* Set up a timer to poll for simulated interrupts */ - - priv->wdog = wd_create(); - DEBUGASSERT(priv->wdog != NULL); - - ret = wd_start(priv->wdog, SIM_POLLDELAY, + ret = wd_start(&priv->wdog, SIM_POLLDELAY, sim_interrupt, 1, (wdparm_t)priv); if (ret < 0) { diff --git a/arch/xtensa/src/esp32/esp32_emac.c b/arch/xtensa/src/esp32/esp32_emac.c index 4928ea8ecae..271825a5d7a 100644 --- a/arch/xtensa/src/esp32/esp32_emac.c +++ b/arch/xtensa/src/esp32/esp32_emac.c @@ -200,8 +200,8 @@ struct esp32_emac_s uint8_t mbps100 : 1; /* 100MBps operation (vs 10 MBps) */ uint8_t fduplex : 1; /* Full (vs. half) duplex */ - WDOG_ID txpoll; /* TX poll timer */ - WDOG_ID txtimeout; /* TX timeout timer */ + struct wdog_s txpoll; /* TX poll timer */ + struct wdog_s txtimeout; /* TX timeout timer */ struct work_s txwork; /* For deferring TX work to the work queue */ struct work_s rxwork; /* For deferring RX work to the work queue */ @@ -825,8 +825,8 @@ static int emac_transmit(struct esp32_emac_s *priv) /* Setup the TX timeout watchdog (perhaps restarting the timer) */ - ret = wd_start(priv->txtimeout, EMAC_TX_TO, emac_txtimeout_expiry, - 1, (uint32_t)priv); + ret = wd_start(&priv->txtimeout, EMAC_TX_TO, + emac_txtimeout_expiry, 1, (wdparm_t)priv); if (ret) { nerr("ERROR: Failed to start TX timeout timer"); @@ -1503,7 +1503,7 @@ static void emac_tx_interrupt_work(FAR void *arg) net_lock(); - wd_cancel(priv->txtimeout); + wd_cancel(&priv->txtimeout); emac_dopoll(priv); @@ -1798,8 +1798,8 @@ static void emac_poll_work(FAR void *arg) } } - ret = wd_start(priv->txpoll, EMAC_WDDELAY , emac_poll_expiry, - 1, (uint32_t)priv); + ret = wd_start(&priv->txpoll, EMAC_WDDELAY, + emac_poll_expiry, 1, (wdparm_t)priv); if (ret) { nerr("ERROR: Failed to start TX poll timer"); @@ -1901,7 +1901,8 @@ static int emac_ifup(struct net_driver_s *dev) /* Set and activate a timer process */ - wd_start(priv->txpoll, EMAC_WDDELAY , emac_poll_expiry, 1, (uint32_t)priv); + wd_start(&priv->txpoll, EMAC_WDDELAY, + emac_poll_expiry, 1, (wdparm_t)priv); /* Enable the Ethernet interrupt */ @@ -1948,8 +1949,8 @@ static int emac_ifdown(struct net_driver_s *dev) /* Cancel the TX poll timer and TX timeout timers */ - wd_cancel(priv->txpoll); - wd_cancel(priv->txtimeout); + wd_cancel(&priv->txpoll); + wd_cancel(&priv->txtimeout); /* Reset ethernet MAC and disable clock */ @@ -2209,26 +2210,6 @@ int esp32_emac_init(void) goto errout_with_attachirq; } - /* Create a watchdog for timing polling for and timing of transmissions */ - - priv->txpoll = wd_create(); /* Create periodic poll timer */ - if (!priv->txpoll) - { - nerr("ERROR: Failed create TX poll watch dog\n"); - - ret = -ENOMEM; - goto errout_with_attachirq; - } - - priv->txtimeout = wd_create(); /* Create TX timeout timer */ - if (!priv->txtimeout) - { - nerr("ERROR: Failed create TX timeout watch dog\n"); - - ret = -ENOMEM; - goto errout_with_createtxtimeout; - } - /* Initialize the driver structure */ priv->dev.d_ifup = emac_ifup; /* I/F up (new IP address) callback */ @@ -2255,19 +2236,11 @@ int esp32_emac_init(void) { nerr("ERROR: Failed to register net device\n"); - goto errout_with_registernetdev; + goto errout_with_attachirq; } return 0; -errout_with_registernetdev: - wd_delete(priv->txtimeout); - priv->txtimeout = NULL; - -errout_with_createtxtimeout: - wd_delete(priv->txpoll); - priv->txpoll = NULL; - errout_with_attachirq: esp32_detach_peripheral(0, ESP32_PERIPH_EMAC, priv->cpuint); esp32_free_cpuint(priv->cpuint); diff --git a/arch/z80/src/ez80/ez80_emac.c b/arch/z80/src/ez80/ez80_emac.c index 34e2e08d362..9c2f248b41d 100644 --- a/arch/z80/src/ez80/ez80_emac.c +++ b/arch/z80/src/ez80/ez80_emac.c @@ -338,8 +338,8 @@ struct ez80emac_driver_s bool bfullduplex; /* true:full duplex */ bool b100mbs; /* true:100Mbp */ - WDOG_ID txpoll; /* TX poll timer */ - WDOG_ID txtimeout; /* TX timeout timer */ + struct wdog_s txpoll; /* TX poll timer */ + struct wdog_s txtimeout; /* TX timeout timer */ struct work_s txwork; /* For deferring Tx-related work to the work queue */ struct work_s rxwork; /* For deferring Rx-related work to the work queue */ @@ -1134,7 +1134,7 @@ static int ez80emac_transmit(struct ez80emac_driver_s *priv) /* Setup the TX timeout watchdog (perhaps restarting the timer) */ - wd_start(priv->txtimeout, EMAC_TXTIMEOUT, + wd_start(&priv->txtimeout, EMAC_TXTIMEOUT, ez80emac_txtimeout_expiry, 1, (wdparm_t)priv); return OK; } @@ -1617,7 +1617,7 @@ static void ez80emac_txinterrupt_work(FAR void *arg) /* Cancel any pending the TX timeout */ - wd_cancel(priv->txtimeout); + wd_cancel(&priv->txtimeout); } net_unlock(); @@ -1666,7 +1666,7 @@ static int ez80emac_txinterrupt(int irq, FAR void *context, FAR void *arg) * expiration and the deferred interrupt processing. */ - wd_cancel(priv->txtimeout); + wd_cancel(&priv->txtimeout); } /* Schedule to perform the Tx interrupt processing on the worker thread. */ @@ -1995,7 +1995,7 @@ static void ez80emac_poll_work(FAR void *arg) /* Setup the watchdog poll timer again */ - wd_start(priv->txpoll, EMAC_WDDELAY, + wd_start(&priv->txpoll, EMAC_WDDELAY, ez80emac_poll_expiry, 1, (wdparm_t)priv); net_unlock(); } @@ -2038,7 +2038,7 @@ static void ez80emac_poll_expiry(int argc, wdparm_t arg, ...) * cycle. */ - wd_start(priv->txpoll, EMAC_WDDELAY, + wd_start(&priv->txpoll, EMAC_WDDELAY, ez80emac_poll_expiry, 1, (wdparm_t)arg); } } @@ -2130,7 +2130,7 @@ static int ez80emac_ifup(FAR struct net_driver_s *dev) /* Set and activate a timer process */ - wd_start(priv->txpoll, EMAC_WDDELAY, + wd_start(&priv->txpoll, EMAC_WDDELAY, ez80emac_poll_expiry, 1, (wdparm_t)priv); /* Enable the Ethernet interrupts */ @@ -2177,8 +2177,8 @@ static int ez80emac_ifdown(struct net_driver_s *dev) /* Cancel the TX poll timer and TX timeout timers */ - wd_cancel(priv->txpoll); - wd_cancel(priv->txtimeout); + wd_cancel(&priv->txpoll); + wd_cancel(&priv->txtimeout); /* Disable Rx */ @@ -2620,12 +2620,7 @@ int up_netinitialize(void) priv->dev.d_addmac = ez80emac_addmac; /* Add multicast MAC address */ priv->dev.d_rmmac = ez80emac_rmmac; /* Remove multicast MAC address */ #endif - priv->dev.d_private = (FAR void *)&g_emac; /* Used to recover private state from dev */ - - /* Create a watchdog for timing polling for and timing of transmissions */ - - priv->txpoll = wd_create(); /* Create periodic poll timer */ - priv->txtimeout = wd_create(); /* Create TX timeout timer */ + priv->dev.d_private = &g_emac; /* Used to recover private state from dev */ /* Read the MAC address from the hardware into * priv->dev.d_mac.ether.ether_addr_octet diff --git a/boards/arm/a1x/pcduino-a10/configs/nsh/defconfig b/boards/arm/a1x/pcduino-a10/configs/nsh/defconfig index 8aa71e7cc13..aa3772fbfc9 100644 --- a/boards/arm/a1x/pcduino-a10/configs/nsh/defconfig +++ b/boards/arm/a1x/pcduino-a10/configs/nsh/defconfig @@ -37,7 +37,6 @@ CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=905969664 CONFIG_RAM_START=0x4a000000 CONFIG_RAM_VSTART=0x4a000000 @@ -52,4 +51,3 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_NSH=y CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=2 diff --git a/boards/arm/am335x/beaglebone-black/configs/lcd/defconfig b/boards/arm/am335x/beaglebone-black/configs/lcd/defconfig index 21abb221240..08c142d8808 100644 --- a/boards/arm/am335x/beaglebone-black/configs/lcd/defconfig +++ b/boards/arm/am335x/beaglebone-black/configs/lcd/defconfig @@ -39,7 +39,6 @@ CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=369098752 CONFIG_RAM_START=0x8a000000 CONFIG_RAM_VSTART=0x8a000000 @@ -54,4 +53,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_VIDEO=y -CONFIG_WDOG_INTRESERVE=2 diff --git a/boards/arm/am335x/beaglebone-black/configs/nsh/defconfig b/boards/arm/am335x/beaglebone-black/configs/nsh/defconfig index fdfb99ae592..4f683d1656b 100644 --- a/boards/arm/am335x/beaglebone-black/configs/nsh/defconfig +++ b/boards/arm/am335x/beaglebone-black/configs/nsh/defconfig @@ -37,7 +37,6 @@ CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=369098752 CONFIG_RAM_START=0x8a000000 CONFIG_RAM_VSTART=0x8a000000 @@ -51,4 +50,3 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_NSH=y CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=2 diff --git a/boards/arm/c5471/c5471evm/configs/httpd/defconfig b/boards/arm/c5471/c5471evm/configs/httpd/defconfig index ecf9ce2ac6f..91683c250fe 100644 --- a/boards/arm/c5471/c5471evm/configs/httpd/defconfig +++ b/boards/arm/c5471/c5471evm/configs/httpd/defconfig @@ -31,7 +31,6 @@ CONFIG_NET_TCPBACKLOG=y CONFIG_NET_TCP_CONNS=16 CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 -CONFIG_PREALLOC_WDOGS=8 CONFIG_PTHREAD_STACK_DEFAULT=4096 CONFIG_RAM_SIZE=285212672 CONFIG_RAM_START=0 @@ -45,4 +44,3 @@ CONFIG_TASK_NAME_SIZE=0 CONFIG_USERMAIN_STACKSIZE=4096 CONFIG_USER_ENTRYPOINT="webserver_main" CONFIG_WATCHDOG=y -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/c5471/c5471evm/configs/nettest/defconfig b/boards/arm/c5471/c5471evm/configs/nettest/defconfig index 3ec8434dc3b..0199eca9a12 100644 --- a/boards/arm/c5471/c5471evm/configs/nettest/defconfig +++ b/boards/arm/c5471/c5471evm/configs/nettest/defconfig @@ -30,7 +30,6 @@ CONFIG_NET_SOCKOPTS=y CONFIG_NET_TCP=y CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 -CONFIG_PREALLOC_WDOGS=8 CONFIG_PTHREAD_STACK_DEFAULT=4096 CONFIG_RAM_SIZE=285212672 CONFIG_RAM_START=0 @@ -44,4 +43,3 @@ CONFIG_TASK_NAME_SIZE=0 CONFIG_USERMAIN_STACKSIZE=4096 CONFIG_USER_ENTRYPOINT="nettest_main" CONFIG_WATCHDOG=y -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/c5471/c5471evm/configs/nsh/defconfig b/boards/arm/c5471/c5471evm/configs/nsh/defconfig index 3450060990e..cde6f3241b6 100644 --- a/boards/arm/c5471/c5471evm/configs/nsh/defconfig +++ b/boards/arm/c5471/c5471evm/configs/nsh/defconfig @@ -41,7 +41,6 @@ CONFIG_NET_UDP_CHECKSUMS=y CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NSH_READLINE=y -CONFIG_PREALLOC_WDOGS=8 CONFIG_PTHREAD_STACK_DEFAULT=4096 CONFIG_RAM_SIZE=285212672 CONFIG_RAM_START=0 @@ -56,4 +55,3 @@ CONFIG_TASK_NAME_SIZE=0 CONFIG_USERMAIN_STACKSIZE=4096 CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WATCHDOG=y -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/cxd56xx/spresense/configs/audio/defconfig b/boards/arm/cxd56xx/spresense/configs/audio/defconfig index 63211895a2d..29acf6240c7 100644 --- a/boards/arm/cxd56xx/spresense/configs/audio/defconfig +++ b/boards/arm/cxd56xx/spresense/configs/audio/defconfig @@ -59,7 +59,6 @@ CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=1572864 CONFIG_RAM_START=0x0d000000 CONFIG_READLINE_CMD_HISTORY=y diff --git a/boards/arm/cxd56xx/spresense/configs/audio_sdk/defconfig b/boards/arm/cxd56xx/spresense/configs/audio_sdk/defconfig index 0de6fc4b789..f7e518d60f9 100644 --- a/boards/arm/cxd56xx/spresense/configs/audio_sdk/defconfig +++ b/boards/arm/cxd56xx/spresense/configs/audio_sdk/defconfig @@ -57,7 +57,6 @@ CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=1572864 CONFIG_RAM_START=0x0d000000 CONFIG_READLINE_CMD_HISTORY=y diff --git a/boards/arm/cxd56xx/spresense/configs/camera/defconfig b/boards/arm/cxd56xx/spresense/configs/camera/defconfig index 2d4db6a7139..7549dd94518 100644 --- a/boards/arm/cxd56xx/spresense/configs/camera/defconfig +++ b/boards/arm/cxd56xx/spresense/configs/camera/defconfig @@ -58,7 +58,6 @@ CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=1572864 CONFIG_RAM_START=0x0d000000 CONFIG_READLINE_CMD_HISTORY=y diff --git a/boards/arm/cxd56xx/spresense/configs/elf/defconfig b/boards/arm/cxd56xx/spresense/configs/elf/defconfig index c79693f2def..1ff08113f9f 100644 --- a/boards/arm/cxd56xx/spresense/configs/elf/defconfig +++ b/boards/arm/cxd56xx/spresense/configs/elf/defconfig @@ -37,7 +37,6 @@ CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_PATH_INITIAL="/mnt/romfs" CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=1572864 CONFIG_RAM_START=0x0d000000 CONFIG_RR_INTERVAL=200 diff --git a/boards/arm/cxd56xx/spresense/configs/example_camera/defconfig b/boards/arm/cxd56xx/spresense/configs/example_camera/defconfig index c90e73fe9ba..58c948146f0 100644 --- a/boards/arm/cxd56xx/spresense/configs/example_camera/defconfig +++ b/boards/arm/cxd56xx/spresense/configs/example_camera/defconfig @@ -58,7 +58,6 @@ CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=1572864 CONFIG_RAM_START=0x0d000000 CONFIG_READLINE_CMD_HISTORY=y diff --git a/boards/arm/cxd56xx/spresense/configs/example_lcd/defconfig b/boards/arm/cxd56xx/spresense/configs/example_lcd/defconfig index 108281f067c..05a402a16a4 100644 --- a/boards/arm/cxd56xx/spresense/configs/example_lcd/defconfig +++ b/boards/arm/cxd56xx/spresense/configs/example_lcd/defconfig @@ -77,7 +77,6 @@ CONFIG_NX=y CONFIG_NXFONT_SERIF22X29=y CONFIG_NX_BLOCKING=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=1572864 CONFIG_RAM_START=0x0d000000 CONFIG_READLINE_CMD_HISTORY=y diff --git a/boards/arm/cxd56xx/spresense/configs/lcd/defconfig b/boards/arm/cxd56xx/spresense/configs/lcd/defconfig index 9fbd026018d..0c576d4db9b 100644 --- a/boards/arm/cxd56xx/spresense/configs/lcd/defconfig +++ b/boards/arm/cxd56xx/spresense/configs/lcd/defconfig @@ -65,7 +65,6 @@ CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=1572864 CONFIG_RAM_START=0x0d000000 CONFIG_READLINE_CMD_HISTORY=y diff --git a/boards/arm/cxd56xx/spresense/configs/lte/defconfig b/boards/arm/cxd56xx/spresense/configs/lte/defconfig index af1e8abfebd..b36adfb1675 100644 --- a/boards/arm/cxd56xx/spresense/configs/lte/defconfig +++ b/boards/arm/cxd56xx/spresense/configs/lte/defconfig @@ -57,7 +57,6 @@ CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=1572864 CONFIG_RAM_START=0x0d000000 CONFIG_READLINE_CMD_HISTORY=y diff --git a/boards/arm/cxd56xx/spresense/configs/module/defconfig b/boards/arm/cxd56xx/spresense/configs/module/defconfig index e916e01299c..b51d0071aa8 100644 --- a/boards/arm/cxd56xx/spresense/configs/module/defconfig +++ b/boards/arm/cxd56xx/spresense/configs/module/defconfig @@ -39,7 +39,6 @@ CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_PATH_INITIAL="/mnt/romfs" CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=1572864 CONFIG_RAM_START=0x0d000000 CONFIG_RR_INTERVAL=200 diff --git a/boards/arm/cxd56xx/spresense/configs/mpy/defconfig b/boards/arm/cxd56xx/spresense/configs/mpy/defconfig index a4dc5e15916..b5ab6327627 100644 --- a/boards/arm/cxd56xx/spresense/configs/mpy/defconfig +++ b/boards/arm/cxd56xx/spresense/configs/mpy/defconfig @@ -67,7 +67,6 @@ CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=1572864 CONFIG_RAM_START=0x0d000000 CONFIG_READLINE_CMD_HISTORY=y diff --git a/boards/arm/cxd56xx/spresense/configs/nsh/defconfig b/boards/arm/cxd56xx/spresense/configs/nsh/defconfig index 41344a6ab12..a2bf2c04c72 100644 --- a/boards/arm/cxd56xx/spresense/configs/nsh/defconfig +++ b/boards/arm/cxd56xx/spresense/configs/nsh/defconfig @@ -37,7 +37,6 @@ CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=1572864 CONFIG_RAM_START=0x0d000000 CONFIG_READLINE_CMD_HISTORY=y diff --git a/boards/arm/cxd56xx/spresense/configs/posix_spawn/defconfig b/boards/arm/cxd56xx/spresense/configs/posix_spawn/defconfig index f7ddcdfe02f..649b411da9c 100644 --- a/boards/arm/cxd56xx/spresense/configs/posix_spawn/defconfig +++ b/boards/arm/cxd56xx/spresense/configs/posix_spawn/defconfig @@ -42,7 +42,6 @@ CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_PATH_INITIAL="/mnt/romfs" CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=1572864 CONFIG_RAM_START=0x0d000000 CONFIG_RR_INTERVAL=200 diff --git a/boards/arm/cxd56xx/spresense/configs/rndis/defconfig b/boards/arm/cxd56xx/spresense/configs/rndis/defconfig index 93fd3c2283b..87367ee8d26 100644 --- a/boards/arm/cxd56xx/spresense/configs/rndis/defconfig +++ b/boards/arm/cxd56xx/spresense/configs/rndis/defconfig @@ -105,7 +105,6 @@ CONFIG_NXPLAYER_HTTP_STREAMING_SUPPORT=y CONFIG_NXPLAYER_MAINTHREAD_STACKSIZE=3072 CONFIG_PATH_INITIAL="/mnt/sd0/bin" CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=1572864 CONFIG_RAM_START=0x0d000000 CONFIG_READLINE_CMD_HISTORY=y diff --git a/boards/arm/cxd56xx/spresense/configs/smp/defconfig b/boards/arm/cxd56xx/spresense/configs/smp/defconfig index 7e35288e282..5c64e24e766 100644 --- a/boards/arm/cxd56xx/spresense/configs/smp/defconfig +++ b/boards/arm/cxd56xx/spresense/configs/smp/defconfig @@ -38,7 +38,6 @@ CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=1572864 CONFIG_RAM_START=0x0d000000 CONFIG_READLINE_CMD_HISTORY=y diff --git a/boards/arm/cxd56xx/spresense/configs/usbmsc/defconfig b/boards/arm/cxd56xx/spresense/configs/usbmsc/defconfig index 093f2cfe986..ddb8303cc70 100644 --- a/boards/arm/cxd56xx/spresense/configs/usbmsc/defconfig +++ b/boards/arm/cxd56xx/spresense/configs/usbmsc/defconfig @@ -62,7 +62,6 @@ CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=1572864 CONFIG_RAM_START=0x0d000000 CONFIG_READLINE_CMD_HISTORY=y diff --git a/boards/arm/cxd56xx/spresense/configs/usbnsh/defconfig b/boards/arm/cxd56xx/spresense/configs/usbnsh/defconfig index 1b2fdd00f1b..2a914255e22 100644 --- a/boards/arm/cxd56xx/spresense/configs/usbnsh/defconfig +++ b/boards/arm/cxd56xx/spresense/configs/usbnsh/defconfig @@ -55,7 +55,6 @@ CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=1572864 CONFIG_RAM_START=0x0d000000 CONFIG_READLINE_CMD_HISTORY=y diff --git a/boards/arm/cxd56xx/spresense/configs/wifi/defconfig b/boards/arm/cxd56xx/spresense/configs/wifi/defconfig index 17bd3d4cbb7..dc1f819230d 100644 --- a/boards/arm/cxd56xx/spresense/configs/wifi/defconfig +++ b/boards/arm/cxd56xx/spresense/configs/wifi/defconfig @@ -108,7 +108,6 @@ CONFIG_NXPLAYER_HTTP_STREAMING_SUPPORT=y CONFIG_NXPLAYER_MAINTHREAD_STACKSIZE=3072 CONFIG_PATH_INITIAL="/mnt/sd0/bin" CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=1572864 CONFIG_RAM_START=0x0d000000 CONFIG_READLINE_CMD_HISTORY=y diff --git a/boards/arm/dm320/ntosd-dm320/configs/nettest/defconfig b/boards/arm/dm320/ntosd-dm320/configs/nettest/defconfig index bf254165fe8..519bf68d0fd 100644 --- a/boards/arm/dm320/ntosd-dm320/configs/nettest/defconfig +++ b/boards/arm/dm320/ntosd-dm320/configs/nettest/defconfig @@ -31,7 +31,6 @@ CONFIG_NET_SOCKOPTS=y CONFIG_NET_TCP=y CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 -CONFIG_PREALLOC_WDOGS=8 CONFIG_PTHREAD_STACK_DEFAULT=4096 CONFIG_RAM_SIZE=33554432 CONFIG_RAM_START=0x01100000 @@ -47,4 +46,3 @@ CONFIG_TASK_NAME_SIZE=0 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USERMAIN_STACKSIZE=4096 CONFIG_USER_ENTRYPOINT="nettest_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/dm320/ntosd-dm320/configs/poll/defconfig b/boards/arm/dm320/ntosd-dm320/configs/poll/defconfig index b742af1096a..27ed1526051 100644 --- a/boards/arm/dm320/ntosd-dm320/configs/poll/defconfig +++ b/boards/arm/dm320/ntosd-dm320/configs/poll/defconfig @@ -33,7 +33,6 @@ CONFIG_NET_TCPBACKLOG=y CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_PIPES=y -CONFIG_PREALLOC_WDOGS=8 CONFIG_PTHREAD_STACK_DEFAULT=4096 CONFIG_RAM_SIZE=33554432 CONFIG_RAM_START=0x01100000 @@ -49,4 +48,3 @@ CONFIG_TASK_NAME_SIZE=0 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USERMAIN_STACKSIZE=4096 CONFIG_USER_ENTRYPOINT="poll_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/dm320/ntosd-dm320/configs/udp/defconfig b/boards/arm/dm320/ntosd-dm320/configs/udp/defconfig index 576a8694e87..f8dc6bd22fc 100644 --- a/boards/arm/dm320/ntosd-dm320/configs/udp/defconfig +++ b/boards/arm/dm320/ntosd-dm320/configs/udp/defconfig @@ -33,7 +33,6 @@ CONFIG_NET_UDP=y CONFIG_NET_UDP_CHECKSUMS=y CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 -CONFIG_PREALLOC_WDOGS=8 CONFIG_PTHREAD_STACK_DEFAULT=4096 CONFIG_RAM_SIZE=33554432 CONFIG_RAM_START=0x01100000 @@ -49,4 +48,3 @@ CONFIG_TASK_NAME_SIZE=0 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USERMAIN_STACKSIZE=4096 CONFIG_USER_ENTRYPOINT="udpclient_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/dm320/ntosd-dm320/configs/webserver/defconfig b/boards/arm/dm320/ntosd-dm320/configs/webserver/defconfig index 369e9c604c2..ca973dbf77c 100644 --- a/boards/arm/dm320/ntosd-dm320/configs/webserver/defconfig +++ b/boards/arm/dm320/ntosd-dm320/configs/webserver/defconfig @@ -32,7 +32,6 @@ CONFIG_NET_SOCKOPTS=y CONFIG_NET_TCP=y CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 -CONFIG_PREALLOC_WDOGS=8 CONFIG_PTHREAD_STACK_DEFAULT=4096 CONFIG_RAM_SIZE=33554432 CONFIG_RAM_START=0x01100000 @@ -48,4 +47,3 @@ CONFIG_TASK_NAME_SIZE=0 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USERMAIN_STACKSIZE=4096 CONFIG_USER_ENTRYPOINT="webserver_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/efm32/efm32-g8xx-stk/configs/nsh/defconfig b/boards/arm/efm32/efm32-g8xx-stk/configs/nsh/defconfig index 4dd72727dc2..0a3c0ea860f 100644 --- a/boards/arm/efm32/efm32-g8xx-stk/configs/nsh/defconfig +++ b/boards/arm/efm32/efm32-g8xx-stk/configs/nsh/defconfig @@ -27,7 +27,6 @@ CONFIG_NFILE_STREAMS=8 CONFIG_NSH_FILEIOSIZE=256 CONFIG_NSH_LINELEN=78 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=32768 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -39,4 +38,3 @@ CONFIG_START_YEAR=2010 CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/efm32/efm32gg-stk3700/configs/nsh/defconfig b/boards/arm/efm32/efm32gg-stk3700/configs/nsh/defconfig index 708b4af8b60..f3ccddd26ca 100644 --- a/boards/arm/efm32/efm32gg-stk3700/configs/nsh/defconfig +++ b/boards/arm/efm32/efm32gg-stk3700/configs/nsh/defconfig @@ -28,7 +28,6 @@ CONFIG_NFILE_STREAMS=8 CONFIG_NSH_FILEIOSIZE=256 CONFIG_NSH_LINELEN=78 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=131072 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -40,4 +39,3 @@ CONFIG_START_YEAR=2010 CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/efm32/olimex-efm32g880f128-stk/configs/nsh/defconfig b/boards/arm/efm32/olimex-efm32g880f128-stk/configs/nsh/defconfig index 4b49b741acd..d92183bc76d 100644 --- a/boards/arm/efm32/olimex-efm32g880f128-stk/configs/nsh/defconfig +++ b/boards/arm/efm32/olimex-efm32g880f128-stk/configs/nsh/defconfig @@ -27,7 +27,6 @@ CONFIG_NFILE_STREAMS=8 CONFIG_NSH_FILEIOSIZE=256 CONFIG_NSH_LINELEN=78 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=32768 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -39,4 +38,3 @@ CONFIG_START_YEAR=2010 CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/eoss3/quickfeather/configs/nsh/defconfig b/boards/arm/eoss3/quickfeather/configs/nsh/defconfig index a0873206677..82e169e8fb7 100644 --- a/boards/arm/eoss3/quickfeather/configs/nsh/defconfig +++ b/boards/arm/eoss3/quickfeather/configs/nsh/defconfig @@ -30,7 +30,6 @@ CONFIG_NSH_MOTD=y CONFIG_NSH_MOTD_STRING="Hello from Apache NuttX on QuickFeather" CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=262144 CONFIG_RAM_START=0x20040000 CONFIG_RAW_BINARY=y @@ -45,4 +44,3 @@ CONFIG_TESTING_OSTEST_STACKSIZE=4096 CONFIG_UART_SERIAL_CONSOLE=y CONFIG_USERMAIN_STACKSIZE=4096 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=2 diff --git a/boards/arm/imxrt/imxrt1020-evk/configs/netnsh/defconfig b/boards/arm/imxrt/imxrt1020-evk/configs/netnsh/defconfig index faa72436b04..68b1a391aea 100644 --- a/boards/arm/imxrt/imxrt1020-evk/configs/netnsh/defconfig +++ b/boards/arm/imxrt/imxrt1020-evk/configs/netnsh/defconfig @@ -50,7 +50,6 @@ CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_DISABLE_IFUPDOWN=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=262144 CONFIG_RAM_START=0x20200000 CONFIG_RAW_BINARY=y diff --git a/boards/arm/imxrt/imxrt1020-evk/configs/nsh/defconfig b/boards/arm/imxrt/imxrt1020-evk/configs/nsh/defconfig index 16d58d0b669..0572311a160 100644 --- a/boards/arm/imxrt/imxrt1020-evk/configs/nsh/defconfig +++ b/boards/arm/imxrt/imxrt1020-evk/configs/nsh/defconfig @@ -38,7 +38,6 @@ CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_DISABLE_IFUPDOWN=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=262144 CONFIG_RAM_START=0x20200000 CONFIG_RAW_BINARY=y diff --git a/boards/arm/imxrt/imxrt1020-evk/configs/usdhc/defconfig b/boards/arm/imxrt/imxrt1020-evk/configs/usdhc/defconfig index 9ca5155fdb9..e139511a847 100644 --- a/boards/arm/imxrt/imxrt1020-evk/configs/usdhc/defconfig +++ b/boards/arm/imxrt/imxrt1020-evk/configs/usdhc/defconfig @@ -56,7 +56,6 @@ CONFIG_NSH_CMDOPT_DD_STATS=y CONFIG_NSH_DISABLE_IFUPDOWN=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=262144 CONFIG_RAM_START=0x20200000 CONFIG_RAW_BINARY=y diff --git a/boards/arm/imxrt/imxrt1050-evk/configs/knsh/defconfig b/boards/arm/imxrt/imxrt1050-evk/configs/knsh/defconfig index b27db33b284..d894abde65a 100644 --- a/boards/arm/imxrt/imxrt1050-evk/configs/knsh/defconfig +++ b/boards/arm/imxrt/imxrt1050-evk/configs/knsh/defconfig @@ -36,7 +36,6 @@ CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_NUTTX_USERSPACE=0x60200000 CONFIG_PASS1_BUILDIR="boards/arm/imxrt/imxrt1050-evk/kernel" -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=524288 CONFIG_RAM_START=0x20200000 CONFIG_SCHED_WAITPID=y diff --git a/boards/arm/imxrt/imxrt1050-evk/configs/libcxxtest/defconfig b/boards/arm/imxrt/imxrt1050-evk/configs/libcxxtest/defconfig index 3972f2192a6..e4a380f5adf 100644 --- a/boards/arm/imxrt/imxrt1050-evk/configs/libcxxtest/defconfig +++ b/boards/arm/imxrt/imxrt1050-evk/configs/libcxxtest/defconfig @@ -33,7 +33,6 @@ CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=536870912 CONFIG_RAM_START=0x20200000 CONFIG_SCHED_CPULOAD=y diff --git a/boards/arm/imxrt/imxrt1050-evk/configs/netnsh/defconfig b/boards/arm/imxrt/imxrt1050-evk/configs/netnsh/defconfig index 1fdcea9f5fb..c6eab025732 100644 --- a/boards/arm/imxrt/imxrt1050-evk/configs/netnsh/defconfig +++ b/boards/arm/imxrt/imxrt1050-evk/configs/netnsh/defconfig @@ -54,7 +54,6 @@ CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=524288 CONFIG_RAM_START=0x20200000 CONFIG_SCHED_LPWORK=y diff --git a/boards/arm/imxrt/imxrt1050-evk/configs/nsh/defconfig b/boards/arm/imxrt/imxrt1050-evk/configs/nsh/defconfig index defd6c514ea..e6dedcaf626 100644 --- a/boards/arm/imxrt/imxrt1050-evk/configs/nsh/defconfig +++ b/boards/arm/imxrt/imxrt1050-evk/configs/nsh/defconfig @@ -32,7 +32,6 @@ CONFIG_NSH_DISABLE_IFUPDOWN=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=524288 CONFIG_RAM_START=0x20200000 CONFIG_START_DAY=14 diff --git a/boards/arm/imxrt/imxrt1060-evk/configs/knsh/defconfig b/boards/arm/imxrt/imxrt1060-evk/configs/knsh/defconfig index 57646aa543b..13c5996f091 100644 --- a/boards/arm/imxrt/imxrt1060-evk/configs/knsh/defconfig +++ b/boards/arm/imxrt/imxrt1060-evk/configs/knsh/defconfig @@ -36,7 +36,6 @@ CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_NUTTX_USERSPACE=0x60200000 CONFIG_PASS1_BUILDIR="boards/arm/imxrt/imxrt1060-evk/kernel" -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=1048576 CONFIG_RAM_START=0x20200000 CONFIG_SCHED_WAITPID=y diff --git a/boards/arm/imxrt/imxrt1060-evk/configs/libcxxtest/defconfig b/boards/arm/imxrt/imxrt1060-evk/configs/libcxxtest/defconfig index 0b7d7f3aedb..17476e974e0 100644 --- a/boards/arm/imxrt/imxrt1060-evk/configs/libcxxtest/defconfig +++ b/boards/arm/imxrt/imxrt1060-evk/configs/libcxxtest/defconfig @@ -33,7 +33,6 @@ CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=1048576 CONFIG_RAM_START=0x20200000 CONFIG_SCHED_CPULOAD=y diff --git a/boards/arm/imxrt/imxrt1060-evk/configs/lvgl/defconfig b/boards/arm/imxrt/imxrt1060-evk/configs/lvgl/defconfig index acaa96f2bdd..0c492846fbf 100644 --- a/boards/arm/imxrt/imxrt1060-evk/configs/lvgl/defconfig +++ b/boards/arm/imxrt/imxrt1060-evk/configs/lvgl/defconfig @@ -54,7 +54,6 @@ CONFIG_NSH_DISABLE_IFUPDOWN=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=1048576 CONFIG_RAM_START=0x20200000 CONFIG_SCHED_HPWORK=y diff --git a/boards/arm/imxrt/imxrt1060-evk/configs/netnsh/defconfig b/boards/arm/imxrt/imxrt1060-evk/configs/netnsh/defconfig index 6c43fb691da..ab8fc7b8753 100644 --- a/boards/arm/imxrt/imxrt1060-evk/configs/netnsh/defconfig +++ b/boards/arm/imxrt/imxrt1060-evk/configs/netnsh/defconfig @@ -55,7 +55,6 @@ CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=1048576 CONFIG_RAM_START=0x20200000 CONFIG_READLINE_CMD_HISTORY=y diff --git a/boards/arm/imxrt/imxrt1060-evk/configs/nsh/defconfig b/boards/arm/imxrt/imxrt1060-evk/configs/nsh/defconfig index ccfe0d0df8c..44000f240b9 100644 --- a/boards/arm/imxrt/imxrt1060-evk/configs/nsh/defconfig +++ b/boards/arm/imxrt/imxrt1060-evk/configs/nsh/defconfig @@ -32,7 +32,6 @@ CONFIG_NSH_DISABLE_IFUPDOWN=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=1048576 CONFIG_RAM_START=0x20200000 CONFIG_START_DAY=14 diff --git a/boards/arm/imxrt/imxrt1060-evk/configs/nshocram/defconfig b/boards/arm/imxrt/imxrt1060-evk/configs/nshocram/defconfig index f42c2c3d0d6..a4ba49ea7ae 100644 --- a/boards/arm/imxrt/imxrt1060-evk/configs/nshocram/defconfig +++ b/boards/arm/imxrt/imxrt1060-evk/configs/nshocram/defconfig @@ -37,7 +37,6 @@ CONFIG_NSH_DISABLE_IFUPDOWN=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=786432 CONFIG_RAM_START=0x20200000 CONFIG_START_DAY=14 diff --git a/boards/arm/kinetis/freedom-k28f/configs/nsh/defconfig b/boards/arm/kinetis/freedom-k28f/configs/nsh/defconfig index 23f990db3ac..97c5ec3f8f9 100644 --- a/boards/arm/kinetis/freedom-k28f/configs/nsh/defconfig +++ b/boards/arm/kinetis/freedom-k28f/configs/nsh/defconfig @@ -35,7 +35,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=524288 CONFIG_RAM_START=0x34000000 CONFIG_RAW_BINARY=y diff --git a/boards/arm/kinetis/freedom-k28f/configs/nshsdusb/defconfig b/boards/arm/kinetis/freedom-k28f/configs/nshsdusb/defconfig index f2dca91ca21..3ecac1c3614 100644 --- a/boards/arm/kinetis/freedom-k28f/configs/nshsdusb/defconfig +++ b/boards/arm/kinetis/freedom-k28f/configs/nshsdusb/defconfig @@ -67,7 +67,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_PRIORITY_INHERITANCE=y CONFIG_PTHREAD_STACK_DEFAULT=2048 CONFIG_RAM_SIZE=524288 diff --git a/boards/arm/kinetis/freedom-k28f/src/k28_usbhshost.c b/boards/arm/kinetis/freedom-k28f/src/k28_usbhshost.c index f6ee46e2211..f72cff75f7f 100644 --- a/boards/arm/kinetis/freedom-k28f/src/k28_usbhshost.c +++ b/boards/arm/kinetis/freedom-k28f/src/k28_usbhshost.c @@ -115,7 +115,7 @@ static struct usbhost_connection_s *g_ehciconn; # ifdef HAVE_USB_AUTOMOUNTER /* Unmount retry timer */ -static WDOG_ID g_umount_tmr[CONFIG_FRDMK28F_USB_AUTOMOUNT_NUM_BLKDEV]; +static struct wdog_s g_umount_tmr[CONFIG_FRDMK28F_USB_AUTOMOUNT_NUM_BLKDEV]; # endif /***************************************************************************** diff --git a/boards/arm/kinetis/freedom-k64f/configs/netnsh/defconfig b/boards/arm/kinetis/freedom-k64f/configs/netnsh/defconfig index 3a01c3bd871..b0c0afbc6d4 100644 --- a/boards/arm/kinetis/freedom-k64f/configs/netnsh/defconfig +++ b/boards/arm/kinetis/freedom-k64f/configs/netnsh/defconfig @@ -55,7 +55,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=131072 CONFIG_RAM_START=0x1fff0000 CONFIG_RR_INTERVAL=200 @@ -70,4 +69,3 @@ CONFIG_SYSTEM_PING=y CONFIG_TASK_NAME_SIZE=0 CONFIG_UART3_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/kinetis/freedom-k64f/configs/nsh/defconfig b/boards/arm/kinetis/freedom-k64f/configs/nsh/defconfig index 52d52f5203d..8602cbcdfdb 100644 --- a/boards/arm/kinetis/freedom-k64f/configs/nsh/defconfig +++ b/boards/arm/kinetis/freedom-k64f/configs/nsh/defconfig @@ -49,7 +49,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_PWM=y CONFIG_RAM_SIZE=131072 CONFIG_RAM_START=0x1fff0000 @@ -64,4 +63,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/kinetis/freedom-k66f/configs/netnsh/defconfig b/boards/arm/kinetis/freedom-k66f/configs/netnsh/defconfig index 43a008faf24..b400d8282ad 100644 --- a/boards/arm/kinetis/freedom-k66f/configs/netnsh/defconfig +++ b/boards/arm/kinetis/freedom-k66f/configs/netnsh/defconfig @@ -63,7 +63,6 @@ CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_CHILDSTATUS=2 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_PRIORITY_INHERITANCE=y CONFIG_RAM_SIZE=262144 CONFIG_RAM_START=0x1fff0000 @@ -86,4 +85,3 @@ CONFIG_UART1_BAUD=57600 CONFIG_UART1_SERIAL_CONSOLE=y CONFIG_USEC_PER_TICK=1000 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/kinetis/freedom-k66f/configs/nsh/defconfig b/boards/arm/kinetis/freedom-k66f/configs/nsh/defconfig index a1a04a5e11c..a2c28e8bd0b 100644 --- a/boards/arm/kinetis/freedom-k66f/configs/nsh/defconfig +++ b/boards/arm/kinetis/freedom-k66f/configs/nsh/defconfig @@ -77,7 +77,6 @@ CONFIG_NSH_READLINE=y CONFIG_NSH_STRERROR=y CONFIG_PREALLOC_CHILDSTATUS=2 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_PRIORITY_INHERITANCE=y CONFIG_PWM=y CONFIG_RAM_SIZE=262144 @@ -105,4 +104,3 @@ CONFIG_UART1_BAUD=57600 CONFIG_UART1_SERIAL_CONSOLE=y CONFIG_USEC_PER_TICK=1000 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/kinetis/kwikstik-k40/configs/ostest/defconfig b/boards/arm/kinetis/kwikstik-k40/configs/ostest/defconfig index de9fe43ec0c..417dad6aecd 100644 --- a/boards/arm/kinetis/kwikstik-k40/configs/ostest/defconfig +++ b/boards/arm/kinetis/kwikstik-k40/configs/ostest/defconfig @@ -25,7 +25,6 @@ CONFIG_MAX_TASKS=16 CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x1fff8000 CONFIG_RR_INTERVAL=200 @@ -39,4 +38,3 @@ CONFIG_TESTING_OSTEST_NBARRIER_THREADS=3 CONFIG_TESTING_OSTEST_STACKSIZE=2048 CONFIG_UART5_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="ostest_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/kinetis/teensy-3.x/configs/nsh/defconfig b/boards/arm/kinetis/teensy-3.x/configs/nsh/defconfig index b65e88583cd..3fe742ea5ac 100644 --- a/boards/arm/kinetis/teensy-3.x/configs/nsh/defconfig +++ b/boards/arm/kinetis/teensy-3.x/configs/nsh/defconfig @@ -37,7 +37,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x1fff8000 CONFIG_RAW_BINARY=y diff --git a/boards/arm/kinetis/teensy-3.x/configs/usbnsh/defconfig b/boards/arm/kinetis/teensy-3.x/configs/usbnsh/defconfig index d9c495a2b93..6d2f5948959 100644 --- a/boards/arm/kinetis/teensy-3.x/configs/usbnsh/defconfig +++ b/boards/arm/kinetis/teensy-3.x/configs/usbnsh/defconfig @@ -37,7 +37,6 @@ CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_NSH_USBCONSOLE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x1fff8000 CONFIG_RAW_BINARY=y diff --git a/boards/arm/kinetis/twr-k60n512/configs/nsh/defconfig b/boards/arm/kinetis/twr-k60n512/configs/nsh/defconfig index ec3cd1bb0d8..05056f8dc81 100644 --- a/boards/arm/kinetis/twr-k60n512/configs/nsh/defconfig +++ b/boards/arm/kinetis/twr-k60n512/configs/nsh/defconfig @@ -28,7 +28,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=131072 CONFIG_RAM_START=0x1fff0000 CONFIG_RR_INTERVAL=200 @@ -41,4 +40,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_UART3_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/kinetis/twr-k64f120m/configs/netnsh/defconfig b/boards/arm/kinetis/twr-k64f120m/configs/netnsh/defconfig index 08cd894f6bc..899c9a3c4b0 100644 --- a/boards/arm/kinetis/twr-k64f120m/configs/netnsh/defconfig +++ b/boards/arm/kinetis/twr-k64f120m/configs/netnsh/defconfig @@ -49,7 +49,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=262144 CONFIG_RAM_START=0x1fff0000 CONFIG_RR_INTERVAL=200 @@ -63,4 +62,3 @@ CONFIG_TASK_NAME_SIZE=10 CONFIG_TWR_K64F120M_SDHC_AUTOMOUNT=y CONFIG_UART1_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/kinetis/twr-k64f120m/configs/nsh/defconfig b/boards/arm/kinetis/twr-k64f120m/configs/nsh/defconfig index f078575d0f1..281a32b5596 100644 --- a/boards/arm/kinetis/twr-k64f120m/configs/nsh/defconfig +++ b/boards/arm/kinetis/twr-k64f120m/configs/nsh/defconfig @@ -35,7 +35,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=262144 CONFIG_RAM_START=0x1fff0000 CONFIG_RR_INTERVAL=200 @@ -48,4 +47,3 @@ CONFIG_TASK_NAME_SIZE=10 CONFIG_TWR_K64F120M_SDHC_AUTOMOUNT=y CONFIG_UART1_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/kl/freedom-kl25z/configs/nsh/defconfig b/boards/arm/kl/freedom-kl25z/configs/nsh/defconfig index 3e942299f4d..5f3effd6d0a 100644 --- a/boards/arm/kl/freedom-kl25z/configs/nsh/defconfig +++ b/boards/arm/kl/freedom-kl25z/configs/nsh/defconfig @@ -46,7 +46,6 @@ CONFIG_NSH_FILEIOSIZE=64 CONFIG_NSH_LINELEN=80 CONFIG_NUNGET_CHARS=0 CONFIG_PREALLOC_TIMERS=0 -CONFIG_PREALLOC_WDOGS=4 CONFIG_PTHREAD_STACK_DEFAULT=1536 CONFIG_PWM=y CONFIG_RAM_SIZE=16384 @@ -66,4 +65,3 @@ CONFIG_TLS_NELEM=0 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USERMAIN_STACKSIZE=1536 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/kl/freedom-kl26z/configs/nsh/defconfig b/boards/arm/kl/freedom-kl26z/configs/nsh/defconfig index 76f73890f1b..7d196e64216 100644 --- a/boards/arm/kl/freedom-kl26z/configs/nsh/defconfig +++ b/boards/arm/kl/freedom-kl26z/configs/nsh/defconfig @@ -46,7 +46,6 @@ CONFIG_NSH_FILEIOSIZE=64 CONFIG_NSH_LINELEN=80 CONFIG_NUNGET_CHARS=0 CONFIG_PREALLOC_TIMERS=0 -CONFIG_PREALLOC_WDOGS=4 CONFIG_PTHREAD_STACK_DEFAULT=1536 CONFIG_PWM=y CONFIG_RAM_SIZE=16384 @@ -66,4 +65,3 @@ CONFIG_TLS_NELEM=0 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USERMAIN_STACKSIZE=1536 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/kl/teensy-lc/configs/nsh/defconfig b/boards/arm/kl/teensy-lc/configs/nsh/defconfig index 408dcac0c85..1a57886e9d4 100644 --- a/boards/arm/kl/teensy-lc/configs/nsh/defconfig +++ b/boards/arm/kl/teensy-lc/configs/nsh/defconfig @@ -60,7 +60,6 @@ CONFIG_NSH_FILEIOSIZE=64 CONFIG_NSH_LINELEN=80 CONFIG_NUNGET_CHARS=0 CONFIG_PREALLOC_TIMERS=0 -CONFIG_PREALLOC_WDOGS=4 CONFIG_PTHREAD_STACK_DEFAULT=1536 CONFIG_PWM=y CONFIG_RAM_SIZE=8192 @@ -78,4 +77,3 @@ CONFIG_TLS_NELEM=0 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USERMAIN_STACKSIZE=1536 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/audio/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/audio/defconfig index 11a433dc1b8..a03927acfb3 100644 --- a/boards/arm/lc823450/lc823450-xgevk/configs/audio/defconfig +++ b/boards/arm/lc823450/lc823450-xgevk/configs/audio/defconfig @@ -99,7 +99,6 @@ CONFIG_NX_BLOCKING=y CONFIG_PIPES=y CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=2048 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_PTHREAD_MUTEX_TYPES=y CONFIG_PTHREAD_STACK_DEFAULT=3072 CONFIG_RAM_SIZE=1044480 diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/bt/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/bt/defconfig index 61d84dd0035..4ad86a0f165 100644 --- a/boards/arm/lc823450/lc823450-xgevk/configs/bt/defconfig +++ b/boards/arm/lc823450/lc823450-xgevk/configs/bt/defconfig @@ -133,7 +133,6 @@ CONFIG_NX_BLOCKING=y CONFIG_PIPES=y CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=2048 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_PTHREAD_MUTEX_TYPES=y CONFIG_PTHREAD_STACK_DEFAULT=3072 CONFIG_RAM_SIZE=1044480 diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/elf/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/elf/defconfig index b613b4a8451..128a5802c43 100644 --- a/boards/arm/lc823450/lc823450-xgevk/configs/elf/defconfig +++ b/boards/arm/lc823450/lc823450-xgevk/configs/elf/defconfig @@ -43,7 +43,6 @@ CONFIG_PATH_INITIAL="/mnt/romfs" CONFIG_PIPES=y CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=2048 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_PTHREAD_MUTEX_TYPES=y CONFIG_PTHREAD_STACK_DEFAULT=3072 CONFIG_RAM_SIZE=1044480 diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/ipl2/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/ipl2/defconfig index 5bd380fbfd9..b48c9f03a37 100644 --- a/boards/arm/lc823450/lc823450-xgevk/configs/ipl2/defconfig +++ b/boards/arm/lc823450/lc823450-xgevk/configs/ipl2/defconfig @@ -43,7 +43,6 @@ CONFIG_NFILE_STREAMS=8 CONFIG_PIPES=y CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=2048 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_PTHREAD_MUTEX_TYPES=y CONFIG_PTHREAD_STACK_DEFAULT=3072 CONFIG_RAM_SIZE=1044480 diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/knsh/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/knsh/defconfig index 0f589bba3dd..bfeb8c8325d 100644 --- a/boards/arm/lc823450/lc823450-xgevk/configs/knsh/defconfig +++ b/boards/arm/lc823450/lc823450-xgevk/configs/knsh/defconfig @@ -87,7 +87,6 @@ CONFIG_PASS1_BUILDIR="boards/arm/lc823450/lc823450-xgevk/kernel" CONFIG_PIPES=y CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=2048 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_PTHREAD_MUTEX_TYPES=y CONFIG_PTHREAD_STACK_DEFAULT=3072 CONFIG_RAM_SIZE=1044480 diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/kostest/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/kostest/defconfig index 03332f4456f..94eb08568ed 100644 --- a/boards/arm/lc823450/lc823450-xgevk/configs/kostest/defconfig +++ b/boards/arm/lc823450/lc823450-xgevk/configs/kostest/defconfig @@ -29,7 +29,6 @@ CONFIG_NFILE_STREAMS=8 CONFIG_NUTTX_USERSPACE=0x05020000 CONFIG_PASS1_BUILDIR="boards/arm/lc823450/lc823450-xgevk/kernel" CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=1044480 CONFIG_RAM_START=0x02001000 CONFIG_RAW_BINARY=y @@ -52,4 +51,3 @@ CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART0_TXBUFSIZE=2048 CONFIG_USERMAIN_STACKSIZE=3072 CONFIG_USER_ENTRYPOINT="ostest_main" -CONFIG_WDOG_INTRESERVE=2 diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/krndis/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/krndis/defconfig index a172cadaa69..dc6c523ed4d 100644 --- a/boards/arm/lc823450/lc823450-xgevk/configs/krndis/defconfig +++ b/boards/arm/lc823450/lc823450-xgevk/configs/krndis/defconfig @@ -140,7 +140,6 @@ CONFIG_PATH_INITIAL="/mnt/sd0/bin" CONFIG_PIPES=y CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=2048 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_PTHREAD_MUTEX_TYPES=y CONFIG_PTHREAD_STACK_DEFAULT=3072 CONFIG_RAM_SIZE=1044480 diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/nsh/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/nsh/defconfig index e2ed6baa486..92e108e1341 100644 --- a/boards/arm/lc823450/lc823450-xgevk/configs/nsh/defconfig +++ b/boards/arm/lc823450/lc823450-xgevk/configs/nsh/defconfig @@ -92,7 +92,6 @@ CONFIG_NX_BLOCKING=y CONFIG_PIPES=y CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=2048 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_PTHREAD_MUTEX_TYPES=y CONFIG_PTHREAD_STACK_DEFAULT=3072 CONFIG_RAM_SIZE=1044480 diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/posix_spawn/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/posix_spawn/defconfig index ad5d66afbbd..4825e612f17 100644 --- a/boards/arm/lc823450/lc823450-xgevk/configs/posix_spawn/defconfig +++ b/boards/arm/lc823450/lc823450-xgevk/configs/posix_spawn/defconfig @@ -42,7 +42,6 @@ CONFIG_PATH_INITIAL="/mnt/romfs" CONFIG_PIPES=y CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=2048 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_PTHREAD_MUTEX_TYPES=y CONFIG_PTHREAD_STACK_DEFAULT=3072 CONFIG_RAM_SIZE=1044480 diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/rndis/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/rndis/defconfig index f72e6d19467..1ff313451b2 100644 --- a/boards/arm/lc823450/lc823450-xgevk/configs/rndis/defconfig +++ b/boards/arm/lc823450/lc823450-xgevk/configs/rndis/defconfig @@ -140,7 +140,6 @@ CONFIG_PATH_INITIAL="/mnt/sd0/bin" CONFIG_PIPES=y CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=2048 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_PTHREAD_MUTEX_TYPES=y CONFIG_PTHREAD_STACK_DEFAULT=3072 CONFIG_RAM_SIZE=1044480 diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/usb/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/usb/defconfig index 7857636e3d2..c1a8e78aea4 100644 --- a/boards/arm/lc823450/lc823450-xgevk/configs/usb/defconfig +++ b/boards/arm/lc823450/lc823450-xgevk/configs/usb/defconfig @@ -95,7 +95,6 @@ CONFIG_NX_BLOCKING=y CONFIG_PIPES=y CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=2048 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_PTHREAD_MUTEX_TYPES=y CONFIG_PTHREAD_STACK_DEFAULT=3072 CONFIG_RAM_SIZE=1044480 diff --git a/boards/arm/lpc17xx_40xx/lincoln60/configs/netnsh/defconfig b/boards/arm/lpc17xx_40xx/lincoln60/configs/netnsh/defconfig index 11e334235ca..365932373df 100644 --- a/boards/arm/lpc17xx_40xx/lincoln60/configs/netnsh/defconfig +++ b/boards/arm/lpc17xx_40xx/lincoln60/configs/netnsh/defconfig @@ -54,7 +54,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=32768 CONFIG_RAM_START=0x10000000 CONFIG_RAW_BINARY=y @@ -69,4 +68,3 @@ CONFIG_SYSTEM_PING=y CONFIG_TASK_NAME_SIZE=0 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/lpc17xx_40xx/lincoln60/configs/nsh/defconfig b/boards/arm/lpc17xx_40xx/lincoln60/configs/nsh/defconfig index 0ef56b86490..8e210c1faf7 100644 --- a/boards/arm/lpc17xx_40xx/lincoln60/configs/nsh/defconfig +++ b/boards/arm/lpc17xx_40xx/lincoln60/configs/nsh/defconfig @@ -27,7 +27,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=32768 CONFIG_RAM_START=0x10000000 CONFIG_RAW_BINARY=y @@ -40,4 +39,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/lpc17xx_40xx/lincoln60/configs/thttpd-binfs/defconfig b/boards/arm/lpc17xx_40xx/lincoln60/configs/thttpd-binfs/defconfig index 4f02536b6e6..5698e099b3d 100644 --- a/boards/arm/lpc17xx_40xx/lincoln60/configs/thttpd-binfs/defconfig +++ b/boards/arm/lpc17xx_40xx/lincoln60/configs/thttpd-binfs/defconfig @@ -54,7 +54,6 @@ CONFIG_NFILE_STREAMS=8 CONFIG_NSOCKET_DESCRIPTORS=12 CONFIG_NUNGET_CHARS=0 CONFIG_PIPES=y -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=32768 CONFIG_RAM_START=0x10000000 CONFIG_RR_INTERVAL=200 @@ -77,4 +76,3 @@ CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART0_TXBUFSIZE=64 CONFIG_USERMAIN_STACKSIZE=6144 CONFIG_USER_ENTRYPOINT="thttp_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/lpc17xx_40xx/lpc4088-devkit/configs/knsh/defconfig b/boards/arm/lpc17xx_40xx/lpc4088-devkit/configs/knsh/defconfig index 776aaef4e37..ff84bf5397d 100644 --- a/boards/arm/lpc17xx_40xx/lpc4088-devkit/configs/knsh/defconfig +++ b/boards/arm/lpc17xx_40xx/lpc4088-devkit/configs/knsh/defconfig @@ -47,7 +47,6 @@ CONFIG_NUTTX_USERSPACE=0x00040000 CONFIG_PASS1_BUILDIR="boards/arm/lpc17xx_40xx/lpc4088-devkit/kernel" CONFIG_PIPES=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x10000000 CONFIG_RR_INTERVAL=200 @@ -65,4 +64,3 @@ CONFIG_SYS_RESERVED=8 CONFIG_TASK_NAME_SIZE=0 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/lpc17xx_40xx/lpc4088-devkit/configs/nsh/defconfig b/boards/arm/lpc17xx_40xx/lpc4088-devkit/configs/nsh/defconfig index b0cf95cea48..d3e1fe42600 100644 --- a/boards/arm/lpc17xx_40xx/lpc4088-devkit/configs/nsh/defconfig +++ b/boards/arm/lpc17xx_40xx/lpc4088-devkit/configs/nsh/defconfig @@ -67,7 +67,6 @@ CONFIG_NSH_READLINE=y CONFIG_NXFLAT=y CONFIG_PIPES=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x10000000 CONFIG_RR_INTERVAL=200 @@ -89,4 +88,3 @@ CONFIG_TASK_NAME_SIZE=0 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USERMAIN_STACKSIZE=4096 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/lpc17xx_40xx/lpc4088-quickstart/configs/knsh/defconfig b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/configs/knsh/defconfig index 7862493bd5e..4595349f520 100644 --- a/boards/arm/lpc17xx_40xx/lpc4088-quickstart/configs/knsh/defconfig +++ b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/configs/knsh/defconfig @@ -44,7 +44,6 @@ CONFIG_NUTTX_USERSPACE=0x00040000 CONFIG_PASS1_BUILDIR="boards/arm/lpc17xx_40xx/lpc4088-quickstart/kernel" CONFIG_PIPES=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x10000000 CONFIG_RR_INTERVAL=200 @@ -61,4 +60,3 @@ CONFIG_SYS_RESERVED=8 CONFIG_TASK_NAME_SIZE=0 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/lpc17xx_40xx/lpc4088-quickstart/configs/nsh/defconfig b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/configs/nsh/defconfig index 36f203a077d..8d6c0d82938 100644 --- a/boards/arm/lpc17xx_40xx/lpc4088-quickstart/configs/nsh/defconfig +++ b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/configs/nsh/defconfig @@ -37,7 +37,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_READLINE=y CONFIG_PIPES=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x10000000 CONFIG_RR_INTERVAL=200 @@ -52,4 +51,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/dhcpd/defconfig b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/dhcpd/defconfig index 98992958e91..8a5850b68bc 100644 --- a/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/dhcpd/defconfig +++ b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/dhcpd/defconfig @@ -39,7 +39,6 @@ CONFIG_NET_UDP_CHECKSUMS=y CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NUNGET_CHARS=0 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=32768 CONFIG_RAM_START=0x10000000 CONFIG_RR_INTERVAL=200 @@ -52,4 +51,3 @@ CONFIG_STDIO_DISABLE_BUFFERING=y CONFIG_TASK_NAME_SIZE=0 CONFIG_UART3_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="dhcpd_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/nsh/defconfig b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/nsh/defconfig index c1808be5f0e..74ab8e4a562 100644 --- a/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/nsh/defconfig +++ b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/nsh/defconfig @@ -57,7 +57,6 @@ CONFIG_NSH_LINELEN=64 CONFIG_NSH_MMCSDSPIPORTNO=1 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=32768 CONFIG_RAM_START=0x10000000 CONFIG_RR_INTERVAL=200 @@ -72,4 +71,3 @@ CONFIG_SYSTEM_PING=y CONFIG_TASK_NAME_SIZE=0 CONFIG_UART3_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/nx/defconfig b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/nx/defconfig index 66258339d54..04f053c36a6 100644 --- a/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/nx/defconfig +++ b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/nx/defconfig @@ -51,7 +51,6 @@ CONFIG_NX_BLOCKING=y CONFIG_NX_KBD=y CONFIG_NX_XYINPUT_MOUSE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=32768 CONFIG_RAM_START=0x10000000 CONFIG_RR_INTERVAL=200 @@ -66,4 +65,3 @@ CONFIG_TASK_NAME_SIZE=0 CONFIG_UART3_SERIAL_CONSOLE=y CONFIG_UG9664HSWAG01_POWER=y CONFIG_USER_ENTRYPOINT="nx_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/thttpd/defconfig b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/thttpd/defconfig index ee600b00e87..8319382daa0 100644 --- a/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/thttpd/defconfig +++ b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/thttpd/defconfig @@ -43,7 +43,6 @@ CONFIG_NSOCKET_DESCRIPTORS=16 CONFIG_NUNGET_CHARS=0 CONFIG_NXFLAT=y CONFIG_PIPES=y -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=32768 CONFIG_RAM_START=0x10000000 CONFIG_RR_INTERVAL=200 @@ -60,4 +59,3 @@ CONFIG_THTTPD_IOBUFFERSIZE=1024 CONFIG_UART3_SERIAL_CONSOLE=y CONFIG_USERMAIN_STACKSIZE=8192 CONFIG_USER_ENTRYPOINT="thttp_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/usbmsc/defconfig b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/usbmsc/defconfig index a8c195e5ef8..9a8555f4c63 100644 --- a/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/usbmsc/defconfig +++ b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/usbmsc/defconfig @@ -30,7 +30,6 @@ CONFIG_MM_REGIONS=2 CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=32768 CONFIG_RAM_START=0x10000000 CONFIG_RR_INTERVAL=200 @@ -52,4 +51,3 @@ CONFIG_USBMSC_PRODUCTSTR="USBdev Storage" CONFIG_USBMSC_REMOVABLE=y CONFIG_USBMSC_VERSIONNO=0x0399 CONFIG_USER_ENTRYPOINT="msconn_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/lpc17xx_40xx/lx_cpu/configs/nsh/defconfig b/boards/arm/lpc17xx_40xx/lx_cpu/configs/nsh/defconfig index fcd7a3e7a0a..6d14e455b18 100644 --- a/boards/arm/lpc17xx_40xx/lx_cpu/configs/nsh/defconfig +++ b/boards/arm/lpc17xx_40xx/lx_cpu/configs/nsh/defconfig @@ -132,7 +132,6 @@ CONFIG_NSH_READLINE=y CONFIG_NSH_ROMFSETC=y CONFIG_NXFLAT=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_PRIORITY_INHERITANCE=y CONFIG_PSEUDOTERM=y CONFIG_PTABLE_PARTITION=y @@ -172,4 +171,3 @@ CONFIG_USBDEV_COMPOSITE=y CONFIG_USBHOST_COMPOSITE=y CONFIG_USERMAIN_STACKSIZE=4096 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/lpc17xx_40xx/mbed/configs/nsh/defconfig b/boards/arm/lpc17xx_40xx/mbed/configs/nsh/defconfig index bd3fad2dbc9..f1eebd98233 100644 --- a/boards/arm/lpc17xx_40xx/mbed/configs/nsh/defconfig +++ b/boards/arm/lpc17xx_40xx/mbed/configs/nsh/defconfig @@ -37,7 +37,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=32768 CONFIG_RAM_START=0x10000000 CONFIG_RAW_BINARY=y @@ -51,4 +50,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/lpc17xx_40xx/mcb1700/configs/nsh/defconfig b/boards/arm/lpc17xx_40xx/mcb1700/configs/nsh/defconfig index 095bd5c86cb..1a2eebcb427 100644 --- a/boards/arm/lpc17xx_40xx/mcb1700/configs/nsh/defconfig +++ b/boards/arm/lpc17xx_40xx/mcb1700/configs/nsh/defconfig @@ -37,7 +37,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=32768 CONFIG_RAM_START=0x10000000 CONFIG_RAW_BINARY=y @@ -51,4 +50,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/ftpc/defconfig b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/ftpc/defconfig index ac0bfe44e71..1e287e54ff1 100644 --- a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/ftpc/defconfig +++ b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/ftpc/defconfig @@ -62,7 +62,6 @@ CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_NSOCKET_DESCRIPTORS=16 CONFIG_NXFLAT=y -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=32768 CONFIG_RAM_START=0x10000000 CONFIG_RR_INTERVAL=200 @@ -80,4 +79,3 @@ CONFIG_TASK_NAME_SIZE=0 CONFIG_UART0_BAUD=57600 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/hidkbd/defconfig b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/hidkbd/defconfig index cff3acf61c6..423cbcb3f66 100644 --- a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/hidkbd/defconfig +++ b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/hidkbd/defconfig @@ -39,7 +39,6 @@ CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_NXFLAT=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=32768 CONFIG_RAM_START=0x10000000 CONFIG_RR_INTERVAL=200 @@ -58,4 +57,3 @@ CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USBHOST_HIDKBD=y CONFIG_USBHOST_ISOC_DISABLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/hidmouse/defconfig b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/hidmouse/defconfig index cb0df9f9fb0..3f256ed324f 100644 --- a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/hidmouse/defconfig +++ b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/hidmouse/defconfig @@ -56,7 +56,6 @@ CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_NXFLAT=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=32768 CONFIG_RAM_START=0x10000000 CONFIG_RR_INTERVAL=200 @@ -76,4 +75,3 @@ CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USBHOST_HIDMOUSE=y CONFIG_USBHOST_ISOC_DISABLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/nettest/defconfig b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/nettest/defconfig index 14fc6ea0a8b..c10b47c6285 100644 --- a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/nettest/defconfig +++ b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/nettest/defconfig @@ -41,7 +41,6 @@ CONFIG_NET_TCP=y CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NUNGET_CHARS=0 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=32768 CONFIG_RAM_START=0x10000000 CONFIG_RR_INTERVAL=200 @@ -55,4 +54,3 @@ CONFIG_TASK_NAME_SIZE=0 CONFIG_UART0_BAUD=57600 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nettest_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/nsh/defconfig b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/nsh/defconfig index add437018d7..dad1ba32dbc 100644 --- a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/nsh/defconfig +++ b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/nsh/defconfig @@ -66,7 +66,6 @@ CONFIG_NSH_MMCSDSPIPORTNO=1 CONFIG_NSH_READLINE=y CONFIG_NXFLAT=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=32768 CONFIG_RAM_START=0x10000000 CONFIG_RR_INTERVAL=200 @@ -84,4 +83,3 @@ CONFIG_TASK_NAME_SIZE=0 CONFIG_UART0_BAUD=57600 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/slip-httpd/defconfig b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/slip-httpd/defconfig index 0a72b259ed8..ed71c89cb3b 100644 --- a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/slip-httpd/defconfig +++ b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/slip-httpd/defconfig @@ -42,7 +42,6 @@ CONFIG_NSOCKET_DESCRIPTORS=16 CONFIG_NUNGET_CHARS=0 CONFIG_NXFLAT=y CONFIG_PIPES=y -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=32768 CONFIG_RAM_START=0x10000000 CONFIG_RR_INTERVAL=200 @@ -60,4 +59,3 @@ CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART1_BAUD=57600 CONFIG_USERMAIN_STACKSIZE=8192 CONFIG_USER_ENTRYPOINT="thttp_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/thttpd-binfs/defconfig b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/thttpd-binfs/defconfig index bfe8469a93d..2c1163dae10 100644 --- a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/thttpd-binfs/defconfig +++ b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/thttpd-binfs/defconfig @@ -46,7 +46,6 @@ CONFIG_NFILE_STREAMS=8 CONFIG_NSOCKET_DESCRIPTORS=16 CONFIG_NUNGET_CHARS=0 CONFIG_PIPES=y -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=32768 CONFIG_RAM_START=0x10000000 CONFIG_RR_INTERVAL=200 @@ -62,4 +61,3 @@ CONFIG_UART0_BAUD=57600 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USERMAIN_STACKSIZE=8192 CONFIG_USER_ENTRYPOINT="thttp_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/thttpd-nxflat/defconfig b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/thttpd-nxflat/defconfig index d19c9d225aa..d0210c47d78 100644 --- a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/thttpd-nxflat/defconfig +++ b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/thttpd-nxflat/defconfig @@ -44,7 +44,6 @@ CONFIG_NSOCKET_DESCRIPTORS=16 CONFIG_NUNGET_CHARS=0 CONFIG_NXFLAT=y CONFIG_PIPES=y -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=32768 CONFIG_RAM_START=0x10000000 CONFIG_RR_INTERVAL=200 @@ -62,4 +61,3 @@ CONFIG_UART0_BAUD=57600 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USERMAIN_STACKSIZE=8192 CONFIG_USER_ENTRYPOINT="thttp_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/usbmsc/defconfig b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/usbmsc/defconfig index 0ba5dc0ec36..31082f78ba7 100644 --- a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/usbmsc/defconfig +++ b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/usbmsc/defconfig @@ -31,7 +31,6 @@ CONFIG_MM_REGIONS=2 CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=32768 CONFIG_RAM_START=0x10000000 CONFIG_RR_INTERVAL=200 @@ -54,4 +53,3 @@ CONFIG_USBMSC_PRODUCTSTR="USBdev Storage" CONFIG_USBMSC_REMOVABLE=y CONFIG_USBMSC_VERSIONNO=0x0399 CONFIG_USER_ENTRYPOINT="msconn_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/usbserial/defconfig b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/usbserial/defconfig index 69f7e36168e..4a1276f0cb0 100644 --- a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/usbserial/defconfig +++ b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/usbserial/defconfig @@ -33,7 +33,6 @@ CONFIG_PL2303_RXBUFSIZE=512 CONFIG_PL2303_TXBUFSIZE=512 CONFIG_PL2303_VENDORSTR="Nuttx" CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=32768 CONFIG_RAM_START=0x10000000 CONFIG_RR_INTERVAL=200 @@ -45,4 +44,3 @@ CONFIG_TASK_NAME_SIZE=0 CONFIG_UART0_BAUD=57600 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="usbserial_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/zmodem/defconfig b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/zmodem/defconfig index dfda096d8c8..ee03047f812 100644 --- a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/zmodem/defconfig +++ b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/zmodem/defconfig @@ -63,7 +63,6 @@ CONFIG_NSH_MMCSDSPIPORTNO=1 CONFIG_NSH_READLINE=y CONFIG_NXFLAT=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=32768 CONFIG_RAM_START=0x10000000 CONFIG_RR_INTERVAL=200 @@ -90,4 +89,3 @@ CONFIG_UART0_RXBUFSIZE=1024 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART1_BAUD=2400 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/lpc17xx_40xx/open1788/configs/fb/defconfig b/boards/arm/lpc17xx_40xx/open1788/configs/fb/defconfig index 0187b9104c9..f3c883ab918 100644 --- a/boards/arm/lpc17xx_40xx/open1788/configs/fb/defconfig +++ b/boards/arm/lpc17xx_40xx/open1788/configs/fb/defconfig @@ -37,7 +37,6 @@ CONFIG_NX=y CONFIG_NXFONT_SANS23X27=y CONFIG_NXFONT_SANS28X37B=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x10000000 CONFIG_RR_INTERVAL=200 @@ -52,4 +51,3 @@ CONFIG_TASK_NAME_SIZE=0 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="fb_main" CONFIG_VIDEO_FB=y -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/lpc17xx_40xx/open1788/configs/knsh/defconfig b/boards/arm/lpc17xx_40xx/open1788/configs/knsh/defconfig index 877ac783603..eb3e461eb1d 100644 --- a/boards/arm/lpc17xx_40xx/open1788/configs/knsh/defconfig +++ b/boards/arm/lpc17xx_40xx/open1788/configs/knsh/defconfig @@ -47,7 +47,6 @@ CONFIG_NUTTX_USERSPACE=0x00040000 CONFIG_PASS1_BUILDIR="boards/arm/lpc17xx_40xx/open1788/kernel" CONFIG_PIPES=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x10000000 CONFIG_RR_INTERVAL=200 @@ -65,4 +64,3 @@ CONFIG_SYS_RESERVED=8 CONFIG_TASK_NAME_SIZE=0 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/lpc17xx_40xx/open1788/configs/knxterm/defconfig b/boards/arm/lpc17xx_40xx/open1788/configs/knxterm/defconfig index a152edbf7fe..c8d6fe397a4 100644 --- a/boards/arm/lpc17xx_40xx/open1788/configs/knxterm/defconfig +++ b/boards/arm/lpc17xx_40xx/open1788/configs/knxterm/defconfig @@ -59,7 +59,6 @@ CONFIG_NX_BLOCKING=y CONFIG_PASS1_BUILDIR="boards/arm/lpc17xx_40xx/open1788/kernel" CONFIG_PIPES=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x10000000 CONFIG_RR_INTERVAL=200 @@ -75,4 +74,3 @@ CONFIG_SYS_RESERVED=8 CONFIG_TASK_NAME_SIZE=0 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nxterm_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/lpc17xx_40xx/open1788/configs/nsh/defconfig b/boards/arm/lpc17xx_40xx/open1788/configs/nsh/defconfig index 4fc7c3b7a9d..bd64976652c 100644 --- a/boards/arm/lpc17xx_40xx/open1788/configs/nsh/defconfig +++ b/boards/arm/lpc17xx_40xx/open1788/configs/nsh/defconfig @@ -41,7 +41,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_READLINE=y CONFIG_PIPES=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x10000000 CONFIG_RR_INTERVAL=200 @@ -56,4 +55,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/lpc17xx_40xx/open1788/configs/nxlines/defconfig b/boards/arm/lpc17xx_40xx/open1788/configs/nxlines/defconfig index 562f69fb7fa..c3c1ee58755 100644 --- a/boards/arm/lpc17xx_40xx/open1788/configs/nxlines/defconfig +++ b/boards/arm/lpc17xx_40xx/open1788/configs/nxlines/defconfig @@ -44,7 +44,6 @@ CONFIG_NX_ANTIALIASING=y CONFIG_NX_BLOCKING=y CONFIG_PIPES=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x10000000 CONFIG_RR_INTERVAL=200 @@ -59,4 +58,3 @@ CONFIG_SYSTEM_READLINE=y CONFIG_TASK_NAME_SIZE=0 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nxlines_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/lpc17xx_40xx/open1788/configs/pdcurses/defconfig b/boards/arm/lpc17xx_40xx/open1788/configs/pdcurses/defconfig index b50d0b964c5..7278942e8db 100644 --- a/boards/arm/lpc17xx_40xx/open1788/configs/pdcurses/defconfig +++ b/boards/arm/lpc17xx_40xx/open1788/configs/pdcurses/defconfig @@ -60,7 +60,6 @@ CONFIG_PDCURSES_DJOYSTICK=y CONFIG_PDCURSES_FONT_6X9=y CONFIG_PIPES=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x10000000 CONFIG_RR_INTERVAL=200 @@ -75,4 +74,3 @@ CONFIG_TASK_NAME_SIZE=0 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_VIDEO_FB=y -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/lpc17xx_40xx/open1788/configs/pwfb/defconfig b/boards/arm/lpc17xx_40xx/open1788/configs/pwfb/defconfig index 5e4daa7db2f..188487522f7 100644 --- a/boards/arm/lpc17xx_40xx/open1788/configs/pwfb/defconfig +++ b/boards/arm/lpc17xx_40xx/open1788/configs/pwfb/defconfig @@ -53,7 +53,6 @@ CONFIG_NXTK_BORDERCOLOR2=0x6b4d CONFIG_NXTK_BORDERCOLOR3=0xdedb CONFIG_NX_BLOCKING=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x10000000 CONFIG_RR_INTERVAL=200 @@ -67,4 +66,3 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_TASK_NAME_SIZE=0 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="pwfb_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/lpc17xx_40xx/u-blox-c027/configs/nsh/defconfig b/boards/arm/lpc17xx_40xx/u-blox-c027/configs/nsh/defconfig index db923bb0fa7..16d0d749151 100644 --- a/boards/arm/lpc17xx_40xx/u-blox-c027/configs/nsh/defconfig +++ b/boards/arm/lpc17xx_40xx/u-blox-c027/configs/nsh/defconfig @@ -90,7 +90,6 @@ CONFIG_NSH_STRERROR=y CONFIG_NSH_TELNET_LOGIN=y CONFIG_NSH_WGET_USERAGENT="NuttX/7.xx.x (; http://www.nuttx.org/)" CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=32768 CONFIG_RAM_START=0x10000000 CONFIG_RAW_BINARY=y @@ -110,4 +109,3 @@ CONFIG_UART1_IFLOWCONTROL=y CONFIG_UART1_OFLOWCONTROL=y CONFIG_UART2_BAUD=9600 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/lpc17xx_40xx/zkit-arm-1769/configs/hello/defconfig b/boards/arm/lpc17xx_40xx/zkit-arm-1769/configs/hello/defconfig index d40f6ca8fe7..4f357749985 100644 --- a/boards/arm/lpc17xx_40xx/zkit-arm-1769/configs/hello/defconfig +++ b/boards/arm/lpc17xx_40xx/zkit-arm-1769/configs/hello/defconfig @@ -41,7 +41,6 @@ CONFIG_NFILE_STREAMS=8 CONFIG_NSOCKET_DESCRIPTORS=16 CONFIG_NUNGET_CHARS=0 CONFIG_NXFLAT=y -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=32768 CONFIG_RAM_START=0x10000000 CONFIG_RR_INTERVAL=200 @@ -54,4 +53,3 @@ CONFIG_TASK_NAME_SIZE=0 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USERMAIN_STACKSIZE=8192 CONFIG_USER_ENTRYPOINT="hello_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/lpc17xx_40xx/zkit-arm-1769/configs/nsh/defconfig b/boards/arm/lpc17xx_40xx/zkit-arm-1769/configs/nsh/defconfig index 6a42e5f9dbe..da02c73ab13 100644 --- a/boards/arm/lpc17xx_40xx/zkit-arm-1769/configs/nsh/defconfig +++ b/boards/arm/lpc17xx_40xx/zkit-arm-1769/configs/nsh/defconfig @@ -63,7 +63,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=32768 CONFIG_RAM_START=0x10000000 CONFIG_RR_INTERVAL=200 @@ -79,4 +78,3 @@ CONFIG_SYSTEM_PING=y CONFIG_TASK_NAME_SIZE=0 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/lpc17xx_40xx/zkit-arm-1769/configs/nxhello/defconfig b/boards/arm/lpc17xx_40xx/zkit-arm-1769/configs/nxhello/defconfig index 209a25def13..50024d65ab6 100644 --- a/boards/arm/lpc17xx_40xx/zkit-arm-1769/configs/nxhello/defconfig +++ b/boards/arm/lpc17xx_40xx/zkit-arm-1769/configs/nxhello/defconfig @@ -80,7 +80,6 @@ CONFIG_NX_BLOCKING=y CONFIG_NX_KBD=y CONFIG_NX_XYINPUT_MOUSE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=32768 CONFIG_RAM_START=0x10000000 CONFIG_RR_INTERVAL=200 @@ -96,4 +95,3 @@ CONFIG_SYSTEM_PING=y CONFIG_TASK_NAME_SIZE=0 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nxhello_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/lpc17xx_40xx/zkit-arm-1769/configs/thttpd/defconfig b/boards/arm/lpc17xx_40xx/zkit-arm-1769/configs/thttpd/defconfig index f5b4916e7dd..c63ef96e39a 100644 --- a/boards/arm/lpc17xx_40xx/zkit-arm-1769/configs/thttpd/defconfig +++ b/boards/arm/lpc17xx_40xx/zkit-arm-1769/configs/thttpd/defconfig @@ -47,7 +47,6 @@ CONFIG_NSOCKET_DESCRIPTORS=16 CONFIG_NUNGET_CHARS=0 CONFIG_NXFLAT=y CONFIG_PIPES=y -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=32768 CONFIG_RAM_START=0x10000000 CONFIG_RR_INTERVAL=200 @@ -65,4 +64,3 @@ CONFIG_THTTPD_IPADDR=0xac100064 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USERMAIN_STACKSIZE=8192 CONFIG_USER_ENTRYPOINT="thttp_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/lpc214x/mcu123-lpc214x/configs/composite/defconfig b/boards/arm/lpc214x/mcu123-lpc214x/configs/composite/defconfig index 94130124cd2..01f6fa2abfe 100644 --- a/boards/arm/lpc214x/mcu123-lpc214x/configs/composite/defconfig +++ b/boards/arm/lpc214x/mcu123-lpc214x/configs/composite/defconfig @@ -37,7 +37,6 @@ CONFIG_MMCSD_MULTIBLOCK_DISABLE=y CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=32768 CONFIG_RAM_START=0x40000000 CONFIG_SDCLONE_DISABLE=y @@ -61,4 +60,3 @@ CONFIG_USBMSC_NWRREQS=2 CONFIG_USBMSC_REMOVABLE=y CONFIG_USBMSC_VERSIONNO=0x0399 CONFIG_USER_ENTRYPOINT="conn_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/lpc214x/mcu123-lpc214x/configs/nsh/defconfig b/boards/arm/lpc214x/mcu123-lpc214x/configs/nsh/defconfig index bd6a83782f0..d0d6c2d3d59 100644 --- a/boards/arm/lpc214x/mcu123-lpc214x/configs/nsh/defconfig +++ b/boards/arm/lpc214x/mcu123-lpc214x/configs/nsh/defconfig @@ -31,7 +31,6 @@ CONFIG_NSH_LINELEN=64 CONFIG_NSH_MMCSDSPIPORTNO=1 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=32768 CONFIG_RAM_START=0x40000000 CONFIG_RAW_BINARY=y @@ -45,4 +44,3 @@ CONFIG_UART0_BAUD=38400 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART1_BAUD=38400 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/lpc214x/mcu123-lpc214x/configs/usbmsc/defconfig b/boards/arm/lpc214x/mcu123-lpc214x/configs/usbmsc/defconfig index 0529eb5e453..1bb33d7910a 100644 --- a/boards/arm/lpc214x/mcu123-lpc214x/configs/usbmsc/defconfig +++ b/boards/arm/lpc214x/mcu123-lpc214x/configs/usbmsc/defconfig @@ -24,7 +24,6 @@ CONFIG_MMCSD=y CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=32768 CONFIG_RAM_START=0x40000000 CONFIG_RAW_BINARY=y @@ -49,4 +48,3 @@ CONFIG_USBMSC_PRODUCTSTR="USBdev Storage" CONFIG_USBMSC_REMOVABLE=y CONFIG_USBMSC_VERSIONNO=0x0399 CONFIG_USER_ENTRYPOINT="msconn_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/lpc214x/mcu123-lpc214x/configs/usbserial/defconfig b/boards/arm/lpc214x/mcu123-lpc214x/configs/usbserial/defconfig index 93747ca9698..c36b0f18bd4 100644 --- a/boards/arm/lpc214x/mcu123-lpc214x/configs/usbserial/defconfig +++ b/boards/arm/lpc214x/mcu123-lpc214x/configs/usbserial/defconfig @@ -29,7 +29,6 @@ CONFIG_PL2303_RXBUFSIZE=512 CONFIG_PL2303_TXBUFSIZE=512 CONFIG_PL2303_VENDORSTR="Nuttx" CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=32768 CONFIG_RAM_START=0x40000000 CONFIG_RAW_BINARY=y @@ -42,4 +41,3 @@ CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART1_BAUD=38400 CONFIG_USBDEV=y CONFIG_USER_ENTRYPOINT="usbserial_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/lpc214x/zp214xpa/configs/nsh/defconfig b/boards/arm/lpc214x/zp214xpa/configs/nsh/defconfig index c2ddf4528c3..ee2773d1823 100644 --- a/boards/arm/lpc214x/zp214xpa/configs/nsh/defconfig +++ b/boards/arm/lpc214x/zp214xpa/configs/nsh/defconfig @@ -23,7 +23,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=32768 CONFIG_RAM_START=0x40000000 CONFIG_RAW_BINARY=y @@ -36,4 +35,3 @@ CONFIG_UART0_BAUD=38400 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART1_BAUD=38400 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/lpc214x/zp214xpa/configs/nxlines/defconfig b/boards/arm/lpc214x/zp214xpa/configs/nxlines/defconfig index 69997d07041..495525a61a0 100644 --- a/boards/arm/lpc214x/zp214xpa/configs/nxlines/defconfig +++ b/boards/arm/lpc214x/zp214xpa/configs/nxlines/defconfig @@ -42,7 +42,6 @@ CONFIG_NXTK_BORDERWIDTH=2 CONFIG_NX_BLOCKING=y CONFIG_NX_WRITEONLY=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=32768 CONFIG_RAM_START=0x40000000 CONFIG_RAW_BINARY=y @@ -56,4 +55,3 @@ CONFIG_UART0_BAUD=38400 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART1_BAUD=38400 CONFIG_USER_ENTRYPOINT="nxlines_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/lpc2378/olimex-lpc2378/configs/nsh/defconfig b/boards/arm/lpc2378/olimex-lpc2378/configs/nsh/defconfig index 957c5f778ae..b56a8a12e1e 100644 --- a/boards/arm/lpc2378/olimex-lpc2378/configs/nsh/defconfig +++ b/boards/arm/lpc2378/olimex-lpc2378/configs/nsh/defconfig @@ -24,7 +24,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=32768 CONFIG_RAM_START=0x40000000 CONFIG_RAW_BINARY=y @@ -40,4 +39,3 @@ CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART0_TXBUFSIZE=128 CONFIG_UART2_BAUD=576000 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/lpc31xx/ea3131/configs/nsh/defconfig b/boards/arm/lpc31xx/ea3131/configs/nsh/defconfig index 9828e78fe40..eb2e0043867 100644 --- a/boards/arm/lpc31xx/ea3131/configs/nsh/defconfig +++ b/boards/arm/lpc31xx/ea3131/configs/nsh/defconfig @@ -31,7 +31,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=196608 CONFIG_RAM_START=0x11028000 CONFIG_RAM_VSTART=0x11028000 @@ -45,4 +44,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_UART_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/lpc31xx/ea3131/configs/pgnsh/defconfig b/boards/arm/lpc31xx/ea3131/configs/pgnsh/defconfig index e5e0aa76b7d..eb68bcb3d52 100644 --- a/boards/arm/lpc31xx/ea3131/configs/pgnsh/defconfig +++ b/boards/arm/lpc31xx/ea3131/configs/pgnsh/defconfig @@ -43,7 +43,6 @@ CONFIG_PAGING_STACKSIZE=2048 CONFIG_PASS1_BUILDIR="boards/arm/lpc31xx/ea3131/locked" CONFIG_PASS1_OBJECT="locked.r" CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=196608 CONFIG_RAM_START=0x11028000 CONFIG_RAM_VSTART=0x11028000 @@ -57,4 +56,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_UART_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/lpc31xx/ea3131/configs/usbserial/defconfig b/boards/arm/lpc31xx/ea3131/configs/usbserial/defconfig index 4ebdbc0bddb..9ebb5cb77f9 100644 --- a/boards/arm/lpc31xx/ea3131/configs/usbserial/defconfig +++ b/boards/arm/lpc31xx/ea3131/configs/usbserial/defconfig @@ -34,7 +34,6 @@ CONFIG_PL2303_RXBUFSIZE=512 CONFIG_PL2303_TXBUFSIZE=512 CONFIG_PL2303_VENDORSTR="Nuttx" CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=196608 CONFIG_RAM_START=0x11028000 CONFIG_RAM_VSTART=0x11028000 @@ -53,4 +52,3 @@ CONFIG_USBDEV=y CONFIG_USBDEV_DUALSPEED=y CONFIG_USBDEV_TRACE=y CONFIG_USER_ENTRYPOINT="usbserial_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/lpc31xx/ea3152/configs/ostest/defconfig b/boards/arm/lpc31xx/ea3152/configs/ostest/defconfig index fc3936a3ca9..0cb1e919059 100644 --- a/boards/arm/lpc31xx/ea3152/configs/ostest/defconfig +++ b/boards/arm/lpc31xx/ea3152/configs/ostest/defconfig @@ -26,7 +26,6 @@ CONFIG_MAX_TASKS=16 CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=196608 CONFIG_RAM_START=0x11028000 CONFIG_RAM_VSTART=0x11028000 @@ -42,4 +41,3 @@ CONFIG_TESTING_OSTEST_NBARRIER_THREADS=3 CONFIG_TESTING_OSTEST_STACKSIZE=2048 CONFIG_UART_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="ostest_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/lpc31xx/olimex-lpc-h3131/configs/nsh/defconfig b/boards/arm/lpc31xx/olimex-lpc-h3131/configs/nsh/defconfig index 4408a3e9952..dab7b6f959d 100644 --- a/boards/arm/lpc31xx/olimex-lpc-h3131/configs/nsh/defconfig +++ b/boards/arm/lpc31xx/olimex-lpc-h3131/configs/nsh/defconfig @@ -34,7 +34,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_PTHREAD_STACK_DEFAULT=1536 CONFIG_RAM_SIZE=196608 CONFIG_RAM_START=0x11028000 @@ -52,4 +51,3 @@ CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536 CONFIG_UART_SERIAL_CONSOLE=y CONFIG_USERMAIN_STACKSIZE=1536 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/lpc43xx/bambino-200e/configs/knsh/defconfig b/boards/arm/lpc43xx/bambino-200e/configs/knsh/defconfig index c668445025c..284f8d0bd15 100644 --- a/boards/arm/lpc43xx/bambino-200e/configs/knsh/defconfig +++ b/boards/arm/lpc43xx/bambino-200e/configs/knsh/defconfig @@ -40,7 +40,6 @@ CONFIG_NSH_READLINE=y CONFIG_NUTTX_USERSPACE=0x14040000 CONFIG_PASS1_BUILDIR="boards/arm/lpc43xx/bambino-200e/kernel" CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=131072 CONFIG_RAM_START=0x10000000 CONFIG_RAW_BINARY=y @@ -58,4 +57,3 @@ CONFIG_TIMER=y CONFIG_UART1_SERIAL_CONSOLE=y CONFIG_USBDEV=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/lpc43xx/bambino-200e/configs/max31855/defconfig b/boards/arm/lpc43xx/bambino-200e/configs/max31855/defconfig index 387e3ebfa0a..291e136b8b8 100644 --- a/boards/arm/lpc43xx/bambino-200e/configs/max31855/defconfig +++ b/boards/arm/lpc43xx/bambino-200e/configs/max31855/defconfig @@ -42,7 +42,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=131072 CONFIG_RAM_START=0x10000000 CONFIG_RAW_BINARY=y @@ -63,4 +62,3 @@ CONFIG_TIMER=y CONFIG_UART1_SERIAL_CONSOLE=y CONFIG_USBDEV=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/lpc43xx/bambino-200e/configs/netnsh/defconfig b/boards/arm/lpc43xx/bambino-200e/configs/netnsh/defconfig index fd944275ebb..55d2dda24b6 100644 --- a/boards/arm/lpc43xx/bambino-200e/configs/netnsh/defconfig +++ b/boards/arm/lpc43xx/bambino-200e/configs/netnsh/defconfig @@ -71,7 +71,6 @@ CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_NSOCKET_DESCRIPTORS=10 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=131072 CONFIG_RAM_START=0x10000000 CONFIG_RAW_BINARY=y @@ -87,4 +86,3 @@ CONFIG_SYSTEM_PING=y CONFIG_TASK_NAME_SIZE=0 CONFIG_UART1_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/lpc43xx/bambino-200e/configs/nsh/defconfig b/boards/arm/lpc43xx/bambino-200e/configs/nsh/defconfig index a810c2d6028..3ba42f37ebd 100644 --- a/boards/arm/lpc43xx/bambino-200e/configs/nsh/defconfig +++ b/boards/arm/lpc43xx/bambino-200e/configs/nsh/defconfig @@ -38,7 +38,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=131072 CONFIG_RAM_START=0x10000000 CONFIG_RAW_BINARY=y @@ -57,4 +56,3 @@ CONFIG_TIMER=y CONFIG_UART1_SERIAL_CONSOLE=y CONFIG_USBDEV=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/lpc43xx/bambino-200e/configs/usbnsh/defconfig b/boards/arm/lpc43xx/bambino-200e/configs/usbnsh/defconfig index 680035afa86..9644f1af782 100644 --- a/boards/arm/lpc43xx/bambino-200e/configs/usbnsh/defconfig +++ b/boards/arm/lpc43xx/bambino-200e/configs/usbnsh/defconfig @@ -36,7 +36,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=131072 CONFIG_RAM_START=0x10000000 CONFIG_RAW_BINARY=y @@ -52,4 +51,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USBDEV=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/lpc43xx/lpc4330-xplorer/configs/nsh/defconfig b/boards/arm/lpc43xx/lpc4330-xplorer/configs/nsh/defconfig index 357ed42718d..d3f28ba41bf 100644 --- a/boards/arm/lpc43xx/lpc4330-xplorer/configs/nsh/defconfig +++ b/boards/arm/lpc43xx/lpc4330-xplorer/configs/nsh/defconfig @@ -31,7 +31,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=73728 CONFIG_RAM_START=0x10080000 CONFIG_RAW_BINARY=y @@ -46,4 +45,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART0_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/lpc43xx/lpc4337-ws/configs/nsh/defconfig b/boards/arm/lpc43xx/lpc4337-ws/configs/nsh/defconfig index 6e9e2e4d568..f869d201afb 100644 --- a/boards/arm/lpc43xx/lpc4337-ws/configs/nsh/defconfig +++ b/boards/arm/lpc43xx/lpc4337-ws/configs/nsh/defconfig @@ -52,7 +52,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=32768 CONFIG_RAM_START=0x10000000 CONFIG_RAW_BINARY=y @@ -77,4 +76,3 @@ CONFIG_USBDEV_DUALSPEED=y CONFIG_USBDEV_MAXPOWER=500 CONFIG_USEC_PER_TICK=1000 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/lpc43xx/lpc4357-evb/configs/nsh/defconfig b/boards/arm/lpc43xx/lpc4357-evb/configs/nsh/defconfig index d956f45fa78..6459bdce32d 100644 --- a/boards/arm/lpc43xx/lpc4357-evb/configs/nsh/defconfig +++ b/boards/arm/lpc43xx/lpc4357-evb/configs/nsh/defconfig @@ -31,7 +31,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=32768 CONFIG_RAM_START=0x10000000 CONFIG_RAW_BINARY=y @@ -46,4 +45,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART0_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/lpc43xx/lpc4370-link2/configs/nsh/defconfig b/boards/arm/lpc43xx/lpc4370-link2/configs/nsh/defconfig index 33b9c120131..b57ba828fff 100644 --- a/boards/arm/lpc43xx/lpc4370-link2/configs/nsh/defconfig +++ b/boards/arm/lpc43xx/lpc4370-link2/configs/nsh/defconfig @@ -49,7 +49,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=131072 CONFIG_RAM_START=0x10000000 CONFIG_RAW_BINARY=y @@ -74,4 +73,3 @@ CONFIG_USBDEV_DUALSPEED=y CONFIG_USBDEV_MAXPOWER=500 CONFIG_USEC_PER_TICK=1000 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/fb/defconfig b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/fb/defconfig index ef0b3bd2b0a..0e278817c18 100644 --- a/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/fb/defconfig +++ b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/fb/defconfig @@ -66,7 +66,6 @@ CONFIG_NXFONTS_DISABLE_4BPP=y CONFIG_NXFONTS_DISABLE_8BPP=y CONFIG_PDCURSES_FONT_6X9=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=163840 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -84,4 +83,3 @@ CONFIG_TASK_NAME_SIZE=0 CONFIG_USART0_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_VIDEO_FB=y -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/lvgl/defconfig b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/lvgl/defconfig index 3a31e43e657..e3847abe1c2 100644 --- a/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/lvgl/defconfig +++ b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/lvgl/defconfig @@ -53,7 +53,6 @@ CONFIG_MM_REGIONS=2 CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=163840 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -65,4 +64,3 @@ CONFIG_TASK_NAME_SIZE=32 CONFIG_USART0_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="lvgldemo_main" CONFIG_VIDEO_FB=y -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/netnsh/defconfig b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/netnsh/defconfig index ad90458a184..47bad2f0ca8 100644 --- a/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/netnsh/defconfig +++ b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/netnsh/defconfig @@ -56,7 +56,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=163840 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -73,4 +72,3 @@ CONFIG_SYSTEM_PING=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART0_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/nsh/defconfig b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/nsh/defconfig index 5ab6a209bcc..53896cb5810 100644 --- a/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/nsh/defconfig +++ b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/nsh/defconfig @@ -45,7 +45,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=163840 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -64,4 +63,3 @@ CONFIG_SYSTEM_RAMTEST=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART0_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/nxwm/defconfig b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/nxwm/defconfig index c58e4ea907b..43ddfdff33b 100644 --- a/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/nxwm/defconfig +++ b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/nxwm/defconfig @@ -88,7 +88,6 @@ CONFIG_NX_BLOCKING=y CONFIG_NX_KBD=y CONFIG_NX_XYINPUT_TOUCHSCREEN=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=163840 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -103,4 +102,3 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART0_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nxwm_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/pwfb/defconfig b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/pwfb/defconfig index 5f1d3472119..53292f3703b 100644 --- a/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/pwfb/defconfig +++ b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/pwfb/defconfig @@ -59,7 +59,6 @@ CONFIG_NXTK_BORDERCOLOR2=0x6b4d CONFIG_NXTK_BORDERCOLOR3=0xdedb CONFIG_NX_BLOCKING=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=163840 CONFIG_RAM_START=0x20000000 CONFIG_RR_INTERVAL=200 @@ -75,4 +74,3 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART0_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="pwfb_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/pwlines/defconfig b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/pwlines/defconfig index 0f7ef5759b0..90f1e318ddd 100644 --- a/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/pwlines/defconfig +++ b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/pwlines/defconfig @@ -52,7 +52,6 @@ CONFIG_NX_ANTIALIASING=y CONFIG_NX_BLOCKING=y CONFIG_PREALLOC_MQ_MSGS=64 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=163840 CONFIG_RAM_START=0x20000000 CONFIG_RR_INTERVAL=200 @@ -68,4 +67,3 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART0_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="pwlines_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/twm4nx1/defconfig b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/twm4nx1/defconfig index 1bee2413113..8d947174487 100644 --- a/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/twm4nx1/defconfig +++ b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/twm4nx1/defconfig @@ -84,7 +84,6 @@ CONFIG_NX_SWCURSOR=y CONFIG_NX_XYINPUT_TOUCHSCREEN=y CONFIG_PREALLOC_MQ_MSGS=64 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=163840 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -104,4 +103,3 @@ CONFIG_TWM4NX_KEYBOARD_DEVPATH="/dev/console" CONFIG_TWM4NX_TOUCHSCREEN=y CONFIG_USART0_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="twm4nx_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/twm4nx2/defconfig b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/twm4nx2/defconfig index 0756f5e59b3..2139c6ffb63 100644 --- a/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/twm4nx2/defconfig +++ b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/twm4nx2/defconfig @@ -85,7 +85,6 @@ CONFIG_NX_SWCURSOR=y CONFIG_NX_XYINPUT_TOUCHSCREEN=y CONFIG_PREALLOC_MQ_MSGS=64 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=163840 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -106,4 +105,3 @@ CONFIG_TWM4NX_KEYBOARD_DEVPATH="/dev/console" CONFIG_TWM4NX_TOUCHSCREEN=y CONFIG_USART0_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="twm4nx_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/moxart/moxa/configs/nsh/defconfig b/boards/arm/moxart/moxa/configs/nsh/defconfig index 0acc1b7664b..be14046a5b8 100644 --- a/boards/arm/moxart/moxa/configs/nsh/defconfig +++ b/boards/arm/moxart/moxa/configs/nsh/defconfig @@ -81,7 +81,6 @@ CONFIG_NSH_LOGIN_PASSWORD="nuttx" CONFIG_NSH_TELNET=y CONFIG_NSH_TELNET_LOGIN=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=2097152 CONFIG_RAW_BINARY=y CONFIG_RR_INTERVAL=200 @@ -98,4 +97,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_PING=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/nrf52/nrf52-feather/configs/nsh/defconfig b/boards/arm/nrf52/nrf52-feather/configs/nsh/defconfig index 90eb567e531..db99c2bc6e7 100644 --- a/boards/arm/nrf52/nrf52-feather/configs/nsh/defconfig +++ b/boards/arm/nrf52/nrf52-feather/configs/nsh/defconfig @@ -30,7 +30,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=65535 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -44,4 +43,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/nrf52/nrf52-feather/configs/userleds/defconfig b/boards/arm/nrf52/nrf52-feather/configs/userleds/defconfig index 7de1912c69c..d7867dd1372 100644 --- a/boards/arm/nrf52/nrf52-feather/configs/userleds/defconfig +++ b/boards/arm/nrf52/nrf52-feather/configs/userleds/defconfig @@ -34,7 +34,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=65535 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -50,4 +49,3 @@ CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USERLED=y CONFIG_USERLED_LOWER=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/nrf52/nrf52832-dk/configs/nsh/defconfig b/boards/arm/nrf52/nrf52832-dk/configs/nsh/defconfig index 5d3c142179a..cb7c76d5b91 100644 --- a/boards/arm/nrf52/nrf52832-dk/configs/nsh/defconfig +++ b/boards/arm/nrf52/nrf52832-dk/configs/nsh/defconfig @@ -30,7 +30,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=65535 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -44,4 +43,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/nrf52/nrf52832-dk/configs/wdog/defconfig b/boards/arm/nrf52/nrf52832-dk/configs/wdog/defconfig index 04609371628..2f8d8aa0889 100644 --- a/boards/arm/nrf52/nrf52832-dk/configs/wdog/defconfig +++ b/boards/arm/nrf52/nrf52832-dk/configs/wdog/defconfig @@ -34,7 +34,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=65535 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -48,4 +47,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/nrf52/nrf52840-dk/configs/highpri/defconfig b/boards/arm/nrf52/nrf52840-dk/configs/highpri/defconfig index 6fb3a7d4c8d..53f38a53d93 100644 --- a/boards/arm/nrf52/nrf52840-dk/configs/highpri/defconfig +++ b/boards/arm/nrf52/nrf52840-dk/configs/highpri/defconfig @@ -30,7 +30,6 @@ CONFIG_NRF52840DK_HIGHPRI=y CONFIG_NRF52_TIMER0=y CONFIG_NRF52_UART0=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=65535 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -43,4 +42,3 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_TASK_NAME_SIZE=0 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="highpri_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/nrf52/nrf52840-dk/configs/nsh/defconfig b/boards/arm/nrf52/nrf52840-dk/configs/nsh/defconfig index af15ce8954a..40a63096873 100644 --- a/boards/arm/nrf52/nrf52840-dk/configs/nsh/defconfig +++ b/boards/arm/nrf52/nrf52840-dk/configs/nsh/defconfig @@ -30,7 +30,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=65535 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -44,4 +43,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/nrf52/nrf52840-dk/configs/timer/defconfig b/boards/arm/nrf52/nrf52840-dk/configs/timer/defconfig index f7a500d2be4..0731a378ac3 100644 --- a/boards/arm/nrf52/nrf52840-dk/configs/timer/defconfig +++ b/boards/arm/nrf52/nrf52840-dk/configs/timer/defconfig @@ -35,7 +35,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=65535 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -50,4 +49,3 @@ CONFIG_TASK_NAME_SIZE=0 CONFIG_TIMER=y CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/nrf52/nrf52840-dongle/configs/nsh/defconfig b/boards/arm/nrf52/nrf52840-dongle/configs/nsh/defconfig index 6939aaba6d0..4e4eea0f016 100644 --- a/boards/arm/nrf52/nrf52840-dongle/configs/nsh/defconfig +++ b/boards/arm/nrf52/nrf52840-dongle/configs/nsh/defconfig @@ -30,7 +30,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=65535 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -44,4 +43,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/nuc1xx/nutiny-nuc120/configs/nsh/defconfig b/boards/arm/nuc1xx/nutiny-nuc120/configs/nsh/defconfig index 794539713fe..0cf3da350b6 100644 --- a/boards/arm/nuc1xx/nutiny-nuc120/configs/nsh/defconfig +++ b/boards/arm/nuc1xx/nutiny-nuc120/configs/nsh/defconfig @@ -43,7 +43,6 @@ CONFIG_NSH_LINELEN=80 CONFIG_NUC_UART1=y CONFIG_NUNGET_CHARS=0 CONFIG_PREALLOC_TIMERS=0 -CONFIG_PREALLOC_WDOGS=4 CONFIG_PTHREAD_STACK_DEFAULT=1536 CONFIG_RAM_SIZE=16384 CONFIG_RAM_START=0x20000000 @@ -65,4 +64,3 @@ CONFIG_UART1_SERIAL_CONSOLE=y CONFIG_UART1_TXBUFSIZE=64 CONFIG_USERMAIN_STACKSIZE=1536 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/s32k1xx/rddrone-uavcan144/configs/nsh/defconfig b/boards/arm/s32k1xx/rddrone-uavcan144/configs/nsh/defconfig index 598b4873476..ebd364a56c9 100644 --- a/boards/arm/s32k1xx/rddrone-uavcan144/configs/nsh/defconfig +++ b/boards/arm/s32k1xx/rddrone-uavcan144/configs/nsh/defconfig @@ -43,7 +43,6 @@ CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=61440 CONFIG_RAM_START=0x1fff8000 CONFIG_RAW_BINARY=y diff --git a/boards/arm/s32k1xx/rddrone-uavcan144/configs/nshdebug/defconfig b/boards/arm/s32k1xx/rddrone-uavcan144/configs/nshdebug/defconfig index a5075eeb205..9b6a7bd940a 100644 --- a/boards/arm/s32k1xx/rddrone-uavcan144/configs/nshdebug/defconfig +++ b/boards/arm/s32k1xx/rddrone-uavcan144/configs/nshdebug/defconfig @@ -45,7 +45,6 @@ CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=61440 CONFIG_RAM_START=0x1fff8000 CONFIG_RAW_BINARY=y diff --git a/boards/arm/s32k1xx/rddrone-uavcan146/configs/nsh/defconfig b/boards/arm/s32k1xx/rddrone-uavcan146/configs/nsh/defconfig index 771300e7bff..2f193615585 100644 --- a/boards/arm/s32k1xx/rddrone-uavcan146/configs/nsh/defconfig +++ b/boards/arm/s32k1xx/rddrone-uavcan146/configs/nsh/defconfig @@ -50,7 +50,6 @@ CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=126976 CONFIG_RAM_START=0x1fff0000 CONFIG_RAW_BINARY=y diff --git a/boards/arm/s32k1xx/rddrone-uavcan146/configs/nshdebug/defconfig b/boards/arm/s32k1xx/rddrone-uavcan146/configs/nshdebug/defconfig index 7838ce3073d..707b4a981f7 100644 --- a/boards/arm/s32k1xx/rddrone-uavcan146/configs/nshdebug/defconfig +++ b/boards/arm/s32k1xx/rddrone-uavcan146/configs/nshdebug/defconfig @@ -45,7 +45,6 @@ CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=126976 CONFIG_RAM_START=0x1fff0000 CONFIG_RAW_BINARY=y diff --git a/boards/arm/s32k1xx/s32k118evb/configs/nsh/defconfig b/boards/arm/s32k1xx/s32k118evb/configs/nsh/defconfig index 95af656807f..b5e3f9eefc4 100644 --- a/boards/arm/s32k1xx/s32k118evb/configs/nsh/defconfig +++ b/boards/arm/s32k1xx/s32k118evb/configs/nsh/defconfig @@ -44,7 +44,6 @@ CONFIG_NSH_FILEIOSIZE=64 CONFIG_NSH_LINELEN=80 CONFIG_NUNGET_CHARS=0 CONFIG_PREALLOC_TIMERS=0 -CONFIG_PREALLOC_WDOGS=4 CONFIG_PTHREAD_STACK_DEFAULT=1536 CONFIG_RAM_SIZE=23552 CONFIG_RAM_START=0x1ffffc00 @@ -63,4 +62,3 @@ CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536 CONFIG_TLS_NELEM=0 CONFIG_USERMAIN_STACKSIZE=1536 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/s32k1xx/s32k144evb/configs/nsh/defconfig b/boards/arm/s32k1xx/s32k144evb/configs/nsh/defconfig index 2b4674532ea..b59cc1b2c8e 100644 --- a/boards/arm/s32k1xx/s32k144evb/configs/nsh/defconfig +++ b/boards/arm/s32k1xx/s32k144evb/configs/nsh/defconfig @@ -35,7 +35,6 @@ CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=61440 CONFIG_RAM_START=0x1fff8000 CONFIG_RR_INTERVAL=200 diff --git a/boards/arm/s32k1xx/s32k146evb/configs/nsh/defconfig b/boards/arm/s32k1xx/s32k146evb/configs/nsh/defconfig index 647accf0098..f1664629a4f 100644 --- a/boards/arm/s32k1xx/s32k146evb/configs/nsh/defconfig +++ b/boards/arm/s32k1xx/s32k146evb/configs/nsh/defconfig @@ -35,7 +35,6 @@ CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=126976 CONFIG_RAM_START=0x1fff0000 CONFIG_RR_INTERVAL=200 diff --git a/boards/arm/s32k1xx/s32k148evb/configs/nsh/defconfig b/boards/arm/s32k1xx/s32k148evb/configs/nsh/defconfig index 5e012f516e7..decefc18507 100644 --- a/boards/arm/s32k1xx/s32k148evb/configs/nsh/defconfig +++ b/boards/arm/s32k1xx/s32k148evb/configs/nsh/defconfig @@ -35,7 +35,6 @@ CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=258048 CONFIG_RAM_START=0x1ffe0000 CONFIG_RR_INTERVAL=200 diff --git a/boards/arm/sam34/arduino-due/configs/nsh/defconfig b/boards/arm/sam34/arduino-due/configs/nsh/defconfig index 59f3a4e39dd..093f9458986 100644 --- a/boards/arm/sam34/arduino-due/configs/nsh/defconfig +++ b/boards/arm/sam34/arduino-due/configs/nsh/defconfig @@ -31,7 +31,6 @@ CONFIG_NSH_DISABLE_IFUPDOWN=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -45,4 +44,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=32 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/sam34/flipnclick-sam3x/configs/nsh/defconfig b/boards/arm/sam34/flipnclick-sam3x/configs/nsh/defconfig index f9bc42583c5..c508eb7ea13 100644 --- a/boards/arm/sam34/flipnclick-sam3x/configs/nsh/defconfig +++ b/boards/arm/sam34/flipnclick-sam3x/configs/nsh/defconfig @@ -31,7 +31,6 @@ CONFIG_NSH_DISABLE_IFUPDOWN=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -45,4 +44,3 @@ CONFIG_START_YEAR=2013 CONFIG_SYSTEM_NSH=y CONFIG_USART0_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/sam34/flipnclick-sam3x/configs/nxlines/defconfig b/boards/arm/sam34/flipnclick-sam3x/configs/nxlines/defconfig index 963210028a3..6965ed2432e 100644 --- a/boards/arm/sam34/flipnclick-sam3x/configs/nxlines/defconfig +++ b/boards/arm/sam34/flipnclick-sam3x/configs/nxlines/defconfig @@ -47,7 +47,6 @@ CONFIG_NXTK_BORDERWIDTH=2 CONFIG_NX_BLOCKING=y CONFIG_PREALLOC_MQ_MSGS=8 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -61,4 +60,3 @@ CONFIG_START_MONTH=2 CONFIG_SYSTEM_NSH=y CONFIG_USART0_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/sam34/sam3u-ek/configs/knsh/defconfig b/boards/arm/sam34/sam3u-ek/configs/knsh/defconfig index a9d49824cad..ba0062398ba 100644 --- a/boards/arm/sam34/sam3u-ek/configs/knsh/defconfig +++ b/boards/arm/sam34/sam3u-ek/configs/knsh/defconfig @@ -38,7 +38,6 @@ CONFIG_NSH_READLINE=y CONFIG_NUTTX_USERSPACE=0x00090000 CONFIG_PASS1_BUILDIR="boards/arm/sam34/sam3u-ek/kernel" CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=32768 CONFIG_RAM_START=0x20000000 CONFIG_RR_INTERVAL=200 @@ -55,4 +54,3 @@ CONFIG_SYS_RESERVED=8 CONFIG_TASK_NAME_SIZE=0 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/sam34/sam3u-ek/configs/nsh/defconfig b/boards/arm/sam34/sam3u-ek/configs/nsh/defconfig index 36d97e4a136..59e0488637c 100644 --- a/boards/arm/sam34/sam3u-ek/configs/nsh/defconfig +++ b/boards/arm/sam34/sam3u-ek/configs/nsh/defconfig @@ -32,7 +32,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=32768 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -46,4 +45,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/sam34/sam3u-ek/configs/nx/defconfig b/boards/arm/sam34/sam3u-ek/configs/nx/defconfig index 337533bbece..bef195b6543 100644 --- a/boards/arm/sam34/sam3u-ek/configs/nx/defconfig +++ b/boards/arm/sam34/sam3u-ek/configs/nx/defconfig @@ -49,7 +49,6 @@ CONFIG_NX_BLOCKING=y CONFIG_NX_KBD=y CONFIG_NX_XYINPUT_MOUSE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=32768 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -61,4 +60,3 @@ CONFIG_START_YEAR=2010 CONFIG_TASK_NAME_SIZE=0 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nx_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/sam34/sam3u-ek/configs/nxwm/defconfig b/boards/arm/sam34/sam3u-ek/configs/nxwm/defconfig index afae4183e02..11b7badbfd3 100644 --- a/boards/arm/sam34/sam3u-ek/configs/nxwm/defconfig +++ b/boards/arm/sam34/sam3u-ek/configs/nxwm/defconfig @@ -76,7 +76,6 @@ CONFIG_NX_KBD=y CONFIG_NX_WRITEONLY=y CONFIG_NX_XYINPUT_TOUCHSCREEN=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_PTHREAD_STACK_DEFAULT=1024 CONFIG_RAM_SIZE=32768 CONFIG_RAM_START=0x20000000 @@ -97,4 +96,3 @@ CONFIG_TASK_NAME_SIZE=0 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USERMAIN_STACKSIZE=1024 CONFIG_USER_ENTRYPOINT="nxwm_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/sam34/sam4cmp-db/configs/nsh/defconfig b/boards/arm/sam34/sam4cmp-db/configs/nsh/defconfig index 86ab08ee17c..936487567d4 100644 --- a/boards/arm/sam34/sam4cmp-db/configs/nsh/defconfig +++ b/boards/arm/sam34/sam4cmp-db/configs/nsh/defconfig @@ -26,7 +26,6 @@ CONFIG_NSH_DISABLE_IFUPDOWN=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=131072 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -43,4 +42,3 @@ CONFIG_TESTING_OSTEST=y CONFIG_TESTING_SMP=y CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/sam34/sam4l-xplained/configs/nsh/defconfig b/boards/arm/sam34/sam4l-xplained/configs/nsh/defconfig index c7b534beacd..7ab36476b71 100644 --- a/boards/arm/sam34/sam4l-xplained/configs/nsh/defconfig +++ b/boards/arm/sam34/sam4l-xplained/configs/nsh/defconfig @@ -32,7 +32,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_PTHREAD_STACK_DEFAULT=1536 CONFIG_RAM_SIZE=32768 CONFIG_RAM_START=0x20000000 @@ -50,4 +49,3 @@ CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536 CONFIG_USART0_SERIAL_CONSOLE=y CONFIG_USERMAIN_STACKSIZE=1536 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/sam34/sam4s-xplained/configs/nsh/defconfig b/boards/arm/sam34/sam4s-xplained/configs/nsh/defconfig index b13d4152420..f3fc673ceb4 100644 --- a/boards/arm/sam34/sam4s-xplained/configs/nsh/defconfig +++ b/boards/arm/sam34/sam4s-xplained/configs/nsh/defconfig @@ -32,7 +32,6 @@ CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=131072 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -47,4 +46,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_UART1_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/sama5/sama5d2-xult/configs/sdmmcnsh/defconfig b/boards/arm/sama5/sama5d2-xult/configs/sdmmcnsh/defconfig index d7c57fdb99e..d4bb3bcf5c6 100644 --- a/boards/arm/sama5/sama5d2-xult/configs/sdmmcnsh/defconfig +++ b/boards/arm/sama5/sama5d2-xult/configs/sdmmcnsh/defconfig @@ -81,7 +81,6 @@ CONFIG_NSH_PROMPT_STRING="nsh> " CONFIG_NSH_QUOTE=y CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=268435456 CONFIG_RAM_START=0x20000000 CONFIG_RAM_VSTART=0x20000000 @@ -142,4 +141,3 @@ CONFIG_USBDEV_TRACE_NRECORDS=512 CONFIG_USBHOST_HIDKBD=y CONFIG_USBHOST_MSC=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=2 diff --git a/boards/arm/sama5/sama5d3-xplained/configs/ethernet-over-usb-2-high-speed/defconfig b/boards/arm/sama5/sama5d3-xplained/configs/ethernet-over-usb-2-high-speed/defconfig index f44726418e4..c50d496db6f 100644 --- a/boards/arm/sama5/sama5d3-xplained/configs/ethernet-over-usb-2-high-speed/defconfig +++ b/boards/arm/sama5/sama5d3-xplained/configs/ethernet-over-usb-2-high-speed/defconfig @@ -73,7 +73,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_PROMPT_STRING="nsh> " CONFIG_NSH_ROMFSETC=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=268435456 CONFIG_RAM_START=0x20000000 CONFIG_RAM_VSTART=0x20000000 @@ -125,4 +124,3 @@ CONFIG_USBDEV_DUALSPEED=y CONFIG_USBDEV_TRACE=y CONFIG_USBDEV_TRACE_NRECORDS=512 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=2 diff --git a/boards/arm/sama5/sama5d3-xplained/configs/nsh/defconfig b/boards/arm/sama5/sama5d3-xplained/configs/nsh/defconfig index 58e755a651f..53951163bef 100644 --- a/boards/arm/sama5/sama5d3-xplained/configs/nsh/defconfig +++ b/boards/arm/sama5/sama5d3-xplained/configs/nsh/defconfig @@ -38,7 +38,6 @@ CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=268435456 CONFIG_RAM_START=0x20000000 CONFIG_RAM_VSTART=0x20000000 @@ -57,4 +56,3 @@ CONFIG_START_YEAR=2014 CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_NSH=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=2 diff --git a/boards/arm/sama5/sama5d3x-ek/configs/demo/defconfig b/boards/arm/sama5/sama5d3x-ek/configs/demo/defconfig index 49528bfb479..dabc397e198 100644 --- a/boards/arm/sama5/sama5d3x-ek/configs/demo/defconfig +++ b/boards/arm/sama5/sama5d3x-ek/configs/demo/defconfig @@ -46,7 +46,6 @@ CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x00304000 CONFIG_RAM_VSTART=0x00304000 @@ -98,4 +97,3 @@ CONFIG_USBMSC_EPBULKIN=2 CONFIG_USBMSC_EPBULKOUT=1 CONFIG_USBMSC_VENDORSTR="Nuttx" CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=2 diff --git a/boards/arm/sama5/sama5d3x-ek/configs/hello/defconfig b/boards/arm/sama5/sama5d3x-ek/configs/hello/defconfig index f1d4e533757..451a213f11b 100644 --- a/boards/arm/sama5/sama5d3x-ek/configs/hello/defconfig +++ b/boards/arm/sama5/sama5d3x-ek/configs/hello/defconfig @@ -26,7 +26,6 @@ CONFIG_MAX_TASKS=16 CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x00300000 CONFIG_RAM_VSTART=0x00300000 @@ -42,4 +41,3 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="hello_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/sama5/sama5d3x-ek/configs/norboot/defconfig b/boards/arm/sama5/sama5d3x-ek/configs/norboot/defconfig index 34c68db90b7..f1a875ab5ad 100644 --- a/boards/arm/sama5/sama5d3x-ek/configs/norboot/defconfig +++ b/boards/arm/sama5/sama5d3x-ek/configs/norboot/defconfig @@ -26,7 +26,6 @@ CONFIG_MAX_TASKS=16 CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x00300000 CONFIG_RAM_VSTART=0x00300000 @@ -46,4 +45,3 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nor_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/sama5/sama5d3x-ek/configs/nsh/defconfig b/boards/arm/sama5/sama5d3x-ek/configs/nsh/defconfig index dbe1c8e77c2..05f467ba0dc 100644 --- a/boards/arm/sama5/sama5d3x-ek/configs/nsh/defconfig +++ b/boards/arm/sama5/sama5d3x-ek/configs/nsh/defconfig @@ -39,7 +39,6 @@ CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x00304000 CONFIG_RAM_VSTART=0x00304000 @@ -59,4 +58,3 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_NSH=y CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=2 diff --git a/boards/arm/sama5/sama5d3x-ek/configs/nx/defconfig b/boards/arm/sama5/sama5d3x-ek/configs/nx/defconfig index 740794af973..f80ec4729bd 100644 --- a/boards/arm/sama5/sama5d3x-ek/configs/nx/defconfig +++ b/boards/arm/sama5/sama5d3x-ek/configs/nx/defconfig @@ -41,7 +41,6 @@ CONFIG_NX_BLOCKING=y CONFIG_NX_KBD=y CONFIG_NX_XYINPUT_MOUSE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x00304000 CONFIG_RAM_VSTART=0x00304000 @@ -73,4 +72,3 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_READLINE=y CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nx_main" -CONFIG_WDOG_INTRESERVE=2 diff --git a/boards/arm/sama5/sama5d3x-ek/configs/nxplayer/defconfig b/boards/arm/sama5/sama5d3x-ek/configs/nxplayer/defconfig index 0e1f99250cb..ec4ecfbf8d2 100644 --- a/boards/arm/sama5/sama5d3x-ek/configs/nxplayer/defconfig +++ b/boards/arm/sama5/sama5d3x-ek/configs/nxplayer/defconfig @@ -53,7 +53,6 @@ CONFIG_NSH_READLINE=y CONFIG_NXPLAYER_INCLUDE_SYSTEM_RESET=y CONFIG_NXPLAYER_RECURSIVE_MEDIA_SEARCH=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x00304000 CONFIG_RAM_VSTART=0x00304000 @@ -96,6 +95,5 @@ CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_NXPLAYER=y CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=2 CONFIG_WM8904_NUM_BUFFERS=8 CONFIG_WM8904_WORKER_STACKSIZE=1536 diff --git a/boards/arm/sama5/sama5d3x-ek/configs/ov2640/defconfig b/boards/arm/sama5/sama5d3x-ek/configs/ov2640/defconfig index 2615aa1c8e3..bdbcd3c48db 100644 --- a/boards/arm/sama5/sama5d3x-ek/configs/ov2640/defconfig +++ b/boards/arm/sama5/sama5d3x-ek/configs/ov2640/defconfig @@ -30,7 +30,6 @@ CONFIG_MM_REGIONS=2 CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x00304000 CONFIG_RAM_VSTART=0x00304000 @@ -64,4 +63,3 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="ov2640_main" CONFIG_VIDEO_OV2640=y -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/sama5/sama5d4-ek/configs/at25boot/defconfig b/boards/arm/sama5/sama5d4-ek/configs/at25boot/defconfig index 2fbf7809f19..1b4eaaa0611 100644 --- a/boards/arm/sama5/sama5d4-ek/configs/at25boot/defconfig +++ b/boards/arm/sama5/sama5d4-ek/configs/at25boot/defconfig @@ -33,7 +33,6 @@ CONFIG_MTD_AT25=y CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x00200000 CONFIG_RAM_VSTART=0x00200000 @@ -59,4 +58,3 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_READLINE=y CONFIG_USART3_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="at25_main" -CONFIG_WDOG_INTRESERVE=2 diff --git a/boards/arm/sama5/sama5d4-ek/configs/dramboot/defconfig b/boards/arm/sama5/sama5d4-ek/configs/dramboot/defconfig index fe102f262c0..c44788590e2 100644 --- a/boards/arm/sama5/sama5d4-ek/configs/dramboot/defconfig +++ b/boards/arm/sama5/sama5d4-ek/configs/dramboot/defconfig @@ -31,7 +31,6 @@ CONFIG_MAX_TASKS=16 CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x00200000 CONFIG_RAM_VSTART=0x00200000 @@ -54,4 +53,3 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_READLINE=y CONFIG_USART3_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="dram_main" -CONFIG_WDOG_INTRESERVE=2 diff --git a/boards/arm/sama5/sama5d4-ek/configs/ramtest/defconfig b/boards/arm/sama5/sama5d4-ek/configs/ramtest/defconfig index d650e312495..aa1e847cb57 100644 --- a/boards/arm/sama5/sama5d4-ek/configs/ramtest/defconfig +++ b/boards/arm/sama5/sama5d4-ek/configs/ramtest/defconfig @@ -72,7 +72,6 @@ CONFIG_NSH_LINELEN=64 CONFIG_NSH_NESTDEPTH=1 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x00200000 CONFIG_RAM_VSTART=0x00200000 @@ -95,4 +94,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_RAMTEST=y CONFIG_USART3_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=2 diff --git a/boards/arm/samd2l2/arduino-m0/configs/nsh/defconfig b/boards/arm/samd2l2/arduino-m0/configs/nsh/defconfig index 2970e79bca3..c99d2fb0e9a 100644 --- a/boards/arm/samd2l2/arduino-m0/configs/nsh/defconfig +++ b/boards/arm/samd2l2/arduino-m0/configs/nsh/defconfig @@ -41,7 +41,6 @@ CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NSH_BUILTIN_APPS=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_PTHREAD_STACK_DEFAULT=1536 CONFIG_RAM_SIZE=32768 CONFIG_RAM_START=0x20000000 @@ -65,4 +64,3 @@ CONFIG_USART4_TXBUFSIZE=64 CONFIG_USART5_SERIAL_CONSOLE=y CONFIG_USERMAIN_STACKSIZE=1536 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/samd2l2/arduino-m0/configs/usbnsh/defconfig b/boards/arm/samd2l2/arduino-m0/configs/usbnsh/defconfig index eea625d3e83..7d4bc20da6f 100644 --- a/boards/arm/samd2l2/arduino-m0/configs/usbnsh/defconfig +++ b/boards/arm/samd2l2/arduino-m0/configs/usbnsh/defconfig @@ -44,7 +44,6 @@ CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NSH_BUILTIN_APPS=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_PTHREAD_STACK_DEFAULT=1536 CONFIG_RAM_SIZE=32768 CONFIG_RAM_START=0x20000000 @@ -63,4 +62,3 @@ CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536 CONFIG_USBDEV=y CONFIG_USERMAIN_STACKSIZE=1536 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/samd2l2/samd20-xplained/configs/nsh/defconfig b/boards/arm/samd2l2/samd20-xplained/configs/nsh/defconfig index 581af4f6232..d7d9d1e08da 100644 --- a/boards/arm/samd2l2/samd20-xplained/configs/nsh/defconfig +++ b/boards/arm/samd2l2/samd20-xplained/configs/nsh/defconfig @@ -43,7 +43,6 @@ CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NSH_BUILTIN_APPS=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_PTHREAD_STACK_DEFAULT=1536 CONFIG_RAM_SIZE=32768 CONFIG_RAM_START=0x20000000 @@ -66,4 +65,3 @@ CONFIG_USART4_SERIAL_CONSOLE=y CONFIG_USART4_TXBUFSIZE=64 CONFIG_USERMAIN_STACKSIZE=1536 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/samd2l2/samd21-xplained/configs/nsh/defconfig b/boards/arm/samd2l2/samd21-xplained/configs/nsh/defconfig index b3783f3a472..1c322b70c6d 100644 --- a/boards/arm/samd2l2/samd21-xplained/configs/nsh/defconfig +++ b/boards/arm/samd2l2/samd21-xplained/configs/nsh/defconfig @@ -44,7 +44,6 @@ CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NSH_BUILTIN_APPS=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_PTHREAD_STACK_DEFAULT=1536 CONFIG_RAM_SIZE=32768 CONFIG_RAM_START=0x20000000 @@ -66,4 +65,3 @@ CONFIG_USART4_SERIAL_CONSOLE=y CONFIG_USART4_TXBUFSIZE=64 CONFIG_USERMAIN_STACKSIZE=1536 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/samd2l2/saml21-xplained/configs/nsh/defconfig b/boards/arm/samd2l2/saml21-xplained/configs/nsh/defconfig index 181451f3e36..83178ebc11e 100644 --- a/boards/arm/samd2l2/saml21-xplained/configs/nsh/defconfig +++ b/boards/arm/samd2l2/saml21-xplained/configs/nsh/defconfig @@ -44,7 +44,6 @@ CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NSH_BUILTIN_APPS=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_PTHREAD_STACK_DEFAULT=1536 CONFIG_RAM_SIZE=32768 CONFIG_RAM_START=0x20000000 @@ -69,4 +68,3 @@ CONFIG_USART4_SERIAL_CONSOLE=y CONFIG_USART4_TXBUFSIZE=64 CONFIG_USERMAIN_STACKSIZE=1536 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/samd5e5/metro-m4/configs/nsh/defconfig b/boards/arm/samd5e5/metro-m4/configs/nsh/defconfig index 052afd116aa..d4126fc84bc 100644 --- a/boards/arm/samd5e5/metro-m4/configs/nsh/defconfig +++ b/boards/arm/samd5e5/metro-m4/configs/nsh/defconfig @@ -27,7 +27,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_PTHREAD_STACK_DEFAULT=1536 CONFIG_RAM_SIZE=196608 CONFIG_RAM_START=0x20000000 @@ -48,4 +47,3 @@ CONFIG_USART3_SERIAL_CONSOLE=y CONFIG_USART3_TXBUFSIZE=64 CONFIG_USERMAIN_STACKSIZE=1536 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/samd5e5/same54-xplained-pro/configs/nsh/defconfig b/boards/arm/samd5e5/same54-xplained-pro/configs/nsh/defconfig index fa967a59e41..15648d3a212 100644 --- a/boards/arm/samd5e5/same54-xplained-pro/configs/nsh/defconfig +++ b/boards/arm/samd5e5/same54-xplained-pro/configs/nsh/defconfig @@ -27,7 +27,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_PTHREAD_STACK_DEFAULT=1536 CONFIG_RAM_SIZE=196608 CONFIG_RAM_START=0x20000000 @@ -49,4 +48,3 @@ CONFIG_USART3_RXBUFSIZE=64 CONFIG_USART3_TXBUFSIZE=64 CONFIG_USERMAIN_STACKSIZE=1536 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/samv7/same70-xplained/configs/twm4nx/defconfig b/boards/arm/samv7/same70-xplained/configs/twm4nx/defconfig index 94f88e2ac67..011a269708b 100644 --- a/boards/arm/samv7/same70-xplained/configs/twm4nx/defconfig +++ b/boards/arm/samv7/same70-xplained/configs/twm4nx/defconfig @@ -86,7 +86,6 @@ CONFIG_NX_SWCURSOR=y CONFIG_NX_XYINPUT_TOUCHSCREEN=y CONFIG_PREALLOC_MQ_MSGS=64 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=393216 CONFIG_RAM_START=0x20400000 CONFIG_RAW_BINARY=y diff --git a/boards/arm/samv7/samv71-xult/src/sam_ili9488.c b/boards/arm/samv7/samv71-xult/src/sam_ili9488.c index d08c864fba3..10e8dd51df2 100644 --- a/boards/arm/samv7/samv71-xult/src/sam_ili9488.c +++ b/boards/arm/samv7/samv71-xult/src/sam_ili9488.c @@ -329,7 +329,7 @@ struct sam_dev_s /* Allocated DMA channel */ DMA_HANDLE dmach; - WDOG_ID dmadog; /* For DMA timeout detection */ + struct wdog_s dmadog; /* For DMA timeout detection */ volatile int result; /* Result of the DMA transfer */ sem_t waitsem; /* Used to way for DMA completion */ volatile bool dmabusy; /* True: DMA is in progress */ @@ -914,7 +914,7 @@ static void sam_lcd_endwait(struct sam_dev_s *priv, int result) { /* Save the result and cancel the watchdog timeout */ - wd_cancel(priv->dmadog); + wd_cancel(&priv->dmadog); priv->result = result; /* Wake up the waiting thread */ @@ -983,7 +983,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, + ret = wd_start(&priv->dmadog, timeout, sam_lcd_dmatimeout, 1, (wdparm_t)priv); if (ret < 0) { @@ -1582,16 +1582,6 @@ int board_lcd_initialize(void) goto errout_with_waitsem; } - /* Allocate a watchdog timer to catch DMA timeouts */ - - priv->dmadog = wd_create(); - if (!priv->dmadog) - { - lcderr("ERROR: Failed to allocate a timer\n"); - ret = -EAGAIN; - goto errout_with_dmach; - } - /* Identify and configure the LCD */ up_mdelay(50); @@ -1599,7 +1589,7 @@ int board_lcd_initialize(void) if (ret < 0) { lcderr("ERROR: sam_lcd_initialize failed: %d\n", ret); - goto errout_with_dmadog; + goto errout_with_dmach; } /* Clear the display (setting it to the color 0=black) */ @@ -1617,10 +1607,6 @@ int board_lcd_initialize(void) return OK; -errout_with_dmadog: - wd_delete(priv->dmadog); - priv->dmadog = NULL; - errout_with_dmach: sam_dmafree(priv->dmach); priv->dmach = NULL; @@ -1667,9 +1653,7 @@ void board_lcd_uninitialize(void) /* Free other resources */ - wd_delete(priv->dmadog); - priv->dmadog = NULL; - + wd_cancel(&priv->dmadog); nxsem_destroy(&priv->waitsem); /* Put the LCD in the lowest possible power state */ diff --git a/boards/arm/stm32/clicker2-stm32/configs/knsh/defconfig b/boards/arm/stm32/clicker2-stm32/configs/knsh/defconfig index f14ea50d941..2bbed29f54f 100644 --- a/boards/arm/stm32/clicker2-stm32/configs/knsh/defconfig +++ b/boards/arm/stm32/clicker2-stm32/configs/knsh/defconfig @@ -38,7 +38,6 @@ CONFIG_NSH_READLINE=y CONFIG_NUTTX_USERSPACE=0x08020000 CONFIG_PASS1_BUILDIR="boards/arm/stm32/clicker2-stm32/kernel" CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=131072 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -59,4 +58,3 @@ CONFIG_SYS_RESERVED=8 CONFIG_TASK_NAME_SIZE=32 CONFIG_USART3_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-6lowpan/defconfig b/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-6lowpan/defconfig index 7c016970ebd..58baf412cd6 100644 --- a/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-6lowpan/defconfig +++ b/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-6lowpan/defconfig @@ -90,7 +90,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAMLOG=y CONFIG_RAMLOG_BUFSIZE=8192 CONFIG_RAMLOG_SYSLOG=y diff --git a/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-mac/defconfig b/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-mac/defconfig index cb3b6f5d001..1adc95daede 100644 --- a/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-mac/defconfig +++ b/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-mac/defconfig @@ -41,7 +41,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAMLOG=y CONFIG_RAMLOG_SYSLOG=y CONFIG_RAM_SIZE=131072 @@ -63,6 +62,5 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=32 CONFIG_USART3_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 CONFIG_WIRELESS=y CONFIG_WIRELESS_IEEE802154=y diff --git a/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-starhub/defconfig b/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-starhub/defconfig index 655f2882a45..75bc297791b 100644 --- a/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-starhub/defconfig +++ b/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-starhub/defconfig @@ -75,7 +75,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAMLOG=y CONFIG_RAMLOG_BUFSIZE=8192 CONFIG_RAMLOG_SYSLOG=y diff --git a/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-starpoint/defconfig b/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-starpoint/defconfig index 9fa170e9224..ea8b850b4ab 100644 --- a/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-starpoint/defconfig +++ b/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-starpoint/defconfig @@ -92,7 +92,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAMLOG=y CONFIG_RAMLOG_BUFSIZE=8192 CONFIG_RAMLOG_SYSLOG=y diff --git a/boards/arm/stm32/clicker2-stm32/configs/nsh/defconfig b/boards/arm/stm32/clicker2-stm32/configs/nsh/defconfig index 10a9343a023..21233a7719c 100644 --- a/boards/arm/stm32/clicker2-stm32/configs/nsh/defconfig +++ b/boards/arm/stm32/clicker2-stm32/configs/nsh/defconfig @@ -33,7 +33,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=131072 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -53,4 +52,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=32 CONFIG_USART3_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32/clicker2-stm32/configs/usbnsh/defconfig b/boards/arm/stm32/clicker2-stm32/configs/usbnsh/defconfig index fadf7f54094..c80670ff4af 100644 --- a/boards/arm/stm32/clicker2-stm32/configs/usbnsh/defconfig +++ b/boards/arm/stm32/clicker2-stm32/configs/usbnsh/defconfig @@ -43,7 +43,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=131072 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y diff --git a/boards/arm/stm32/clicker2-stm32/configs/xbee-6lowpan/defconfig b/boards/arm/stm32/clicker2-stm32/configs/xbee-6lowpan/defconfig index 8e92de16cff..f0e6aa71b3c 100644 --- a/boards/arm/stm32/clicker2-stm32/configs/xbee-6lowpan/defconfig +++ b/boards/arm/stm32/clicker2-stm32/configs/xbee-6lowpan/defconfig @@ -86,7 +86,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAMLOG=y CONFIG_RAMLOG_BUFSIZE=8192 CONFIG_RAMLOG_SYSLOG=y diff --git a/boards/arm/stm32/cloudctrl/configs/nsh/defconfig b/boards/arm/stm32/cloudctrl/configs/nsh/defconfig index 7715b577419..afe6657deeb 100644 --- a/boards/arm/stm32/cloudctrl/configs/nsh/defconfig +++ b/boards/arm/stm32/cloudctrl/configs/nsh/defconfig @@ -53,7 +53,6 @@ CONFIG_NSH_MMCSDSPIPORTNO=1 CONFIG_NSH_READLINE=y CONFIG_NSOCKET_DESCRIPTORS=10 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x20000000 CONFIG_RR_INTERVAL=200 @@ -85,4 +84,3 @@ CONFIG_USART2_RXBUFSIZE=128 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USART2_TXBUFSIZE=128 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32/fire-stm32v2/configs/nsh/defconfig b/boards/arm/stm32/fire-stm32v2/configs/nsh/defconfig index f720abd5a06..89b04e8bb1e 100644 --- a/boards/arm/stm32/fire-stm32v2/configs/nsh/defconfig +++ b/boards/arm/stm32/fire-stm32v2/configs/nsh/defconfig @@ -58,7 +58,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_NSOCKET_DESCRIPTORS=16 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x20000000 CONFIG_RR_INTERVAL=200 @@ -94,4 +93,3 @@ CONFIG_USBMSC_PRODUCTSTR="USBdev Storage" CONFIG_USBMSC_REMOVABLE=y CONFIG_USBMSC_VERSIONNO=0x0399 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=2 diff --git a/boards/arm/stm32/hymini-stm32v/configs/nsh/defconfig b/boards/arm/stm32/hymini-stm32v/configs/nsh/defconfig index 0750f72cf9f..c45899e4e0b 100644 --- a/boards/arm/stm32/hymini-stm32v/configs/nsh/defconfig +++ b/boards/arm/stm32/hymini-stm32v/configs/nsh/defconfig @@ -28,7 +28,6 @@ CONFIG_NFILE_STREAMS=8 CONFIG_NSH_ARCHINIT=y CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=49152 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -51,4 +50,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32/hymini-stm32v/configs/nsh2/defconfig b/boards/arm/stm32/hymini-stm32v/configs/nsh2/defconfig index c6dfb0323c6..f6aec1fedfc 100644 --- a/boards/arm/stm32/hymini-stm32v/configs/nsh2/defconfig +++ b/boards/arm/stm32/hymini-stm32v/configs/nsh2/defconfig @@ -55,7 +55,6 @@ CONFIG_NXFONT_SANS23X27=y CONFIG_NXFONT_SANS28X37B=y CONFIG_NX_BLOCKING=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=49152 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -93,4 +92,3 @@ CONFIG_USBMSC_PRODUCTSTR="USBdev Storage" CONFIG_USBMSC_REMOVABLE=y CONFIG_USBMSC_VERSIONNO=0x0399 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32/hymini-stm32v/configs/usbmsc/defconfig b/boards/arm/stm32/hymini-stm32v/configs/usbmsc/defconfig index c545e2f3e84..6eb24c4b3c9 100644 --- a/boards/arm/stm32/hymini-stm32v/configs/usbmsc/defconfig +++ b/boards/arm/stm32/hymini-stm32v/configs/usbmsc/defconfig @@ -22,7 +22,6 @@ CONFIG_MMCSD_SDIO=y CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=49152 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -54,4 +53,3 @@ CONFIG_USBMSC_PRODUCTSTR="USBdev Storage" CONFIG_USBMSC_REMOVABLE=y CONFIG_USBMSC_VERSIONNO=0x0399 CONFIG_USER_ENTRYPOINT="msconn_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32/hymini-stm32v/configs/usbnsh/defconfig b/boards/arm/stm32/hymini-stm32v/configs/usbnsh/defconfig index 9f1a50b6bc8..acb255bdfa6 100644 --- a/boards/arm/stm32/hymini-stm32v/configs/usbnsh/defconfig +++ b/boards/arm/stm32/hymini-stm32v/configs/usbnsh/defconfig @@ -28,7 +28,6 @@ CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=49152 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -51,4 +50,3 @@ CONFIG_SYSLOG_DEVPATH="/dev/ttyS0" CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32/hymini-stm32v/configs/usbserial/defconfig b/boards/arm/stm32/hymini-stm32v/configs/usbserial/defconfig index 77b1e31cf32..32605ac92e6 100644 --- a/boards/arm/stm32/hymini-stm32v/configs/usbserial/defconfig +++ b/boards/arm/stm32/hymini-stm32v/configs/usbserial/defconfig @@ -25,7 +25,6 @@ CONFIG_PL2303_RXBUFSIZE=512 CONFIG_PL2303_TXBUFSIZE=512 CONFIG_PL2303_VENDORSTR="Nuttx" CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=49152 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -40,4 +39,3 @@ CONFIG_STM32_USB=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="usbserial_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32/maple/configs/nsh/defconfig b/boards/arm/stm32/maple/configs/nsh/defconfig index 3ac3d268242..edad4e6d67c 100644 --- a/boards/arm/stm32/maple/configs/nsh/defconfig +++ b/boards/arm/stm32/maple/configs/nsh/defconfig @@ -39,7 +39,6 @@ CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=1024 CONFIG_NSH_LINELEN=80 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=6 CONFIG_PTHREAD_STACK_DEFAULT=1024 CONFIG_RAM_SIZE=20480 CONFIG_RAM_START=0x20000000 @@ -59,4 +58,3 @@ CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USBDEV_TRACE=y CONFIG_USBDEV_TRACE_NRECORDS=32 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32/maple/configs/nx/defconfig b/boards/arm/stm32/maple/configs/nx/defconfig index abff5cf9c65..02ae079d2e2 100644 --- a/boards/arm/stm32/maple/configs/nx/defconfig +++ b/boards/arm/stm32/maple/configs/nx/defconfig @@ -57,7 +57,6 @@ CONFIG_NX=y CONFIG_NXFONT_MONO5X8=y CONFIG_NX_BLOCKING=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=6 CONFIG_PTHREAD_STACK_DEFAULT=1024 CONFIG_RAM_SIZE=20480 CONFIG_RAM_START=0x20000000 @@ -83,4 +82,3 @@ CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USBDEV_TRACE=y CONFIG_USBDEV_TRACE_NRECORDS=32 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32/maple/configs/usbnsh/defconfig b/boards/arm/stm32/maple/configs/usbnsh/defconfig index 94a2f2b68cc..ebb93a739f7 100644 --- a/boards/arm/stm32/maple/configs/usbnsh/defconfig +++ b/boards/arm/stm32/maple/configs/usbnsh/defconfig @@ -46,7 +46,6 @@ CONFIG_NSH_FILEIOSIZE=1024 CONFIG_NSH_LINELEN=80 CONFIG_NSH_USBCONSOLE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=6 CONFIG_PTHREAD_STACK_DEFAULT=1024 CONFIG_RAM_SIZE=20480 CONFIG_RAM_START=0x20000000 @@ -66,4 +65,3 @@ CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USBDEV_TRACE=y CONFIG_USBDEV_TRACE_NRECORDS=32 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32/mikroe-stm32f4/configs/fulldemo/defconfig b/boards/arm/stm32/mikroe-stm32f4/configs/fulldemo/defconfig index 9b7053f44e4..99654f79c5c 100644 --- a/boards/arm/stm32/mikroe-stm32f4/configs/fulldemo/defconfig +++ b/boards/arm/stm32/mikroe-stm32f4/configs/fulldemo/defconfig @@ -110,7 +110,6 @@ CONFIG_NX_KBD=y CONFIG_NX_XYINPUT_TOUCHSCREEN=y CONFIG_PLATFORM_CONFIGDATA=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAMMTD=y CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 @@ -145,4 +144,3 @@ CONFIG_SYSTEM_NXPLAYER=y CONFIG_TASK_NAME_SIZE=11 CONFIG_USBDEV=y CONFIG_USER_ENTRYPOINT="nxwm_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32/mikroe-stm32f4/configs/kostest/defconfig b/boards/arm/stm32/mikroe-stm32f4/configs/kostest/defconfig index 27f4bbc034e..81201587fd6 100644 --- a/boards/arm/stm32/mikroe-stm32f4/configs/kostest/defconfig +++ b/boards/arm/stm32/mikroe-stm32f4/configs/kostest/defconfig @@ -57,7 +57,6 @@ CONFIG_NSH_STRERROR=y CONFIG_NUTTX_USERSPACE=0x08020000 CONFIG_PASS1_BUILDIR="boards/arm/stm32/mikroe-stm32f4/kernel" CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAMMTD=y CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 @@ -90,4 +89,3 @@ CONFIG_TASK_NAME_SIZE=11 CONFIG_TESTING_OSTEST=y CONFIG_USBDEV=y CONFIG_USER_ENTRYPOINT="ostest_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32/mikroe-stm32f4/configs/nsh/defconfig b/boards/arm/stm32/mikroe-stm32f4/configs/nsh/defconfig index 578b9ad743f..1d0f5e8afe0 100644 --- a/boards/arm/stm32/mikroe-stm32f4/configs/nsh/defconfig +++ b/boards/arm/stm32/mikroe-stm32f4/configs/nsh/defconfig @@ -51,7 +51,6 @@ CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_NSH_STRERROR=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAMMTD=y CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 @@ -74,4 +73,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32/mikroe-stm32f4/configs/nx/defconfig b/boards/arm/stm32/mikroe-stm32f4/configs/nx/defconfig index 966d8e63071..4c9e258961d 100644 --- a/boards/arm/stm32/mikroe-stm32f4/configs/nx/defconfig +++ b/boards/arm/stm32/mikroe-stm32f4/configs/nx/defconfig @@ -54,7 +54,6 @@ CONFIG_NXTK_BORDERCOLOR3=0xc618 CONFIG_NXTK_BORDERWIDTH=3 CONFIG_NX_BLOCKING=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -70,4 +69,3 @@ CONFIG_SYSLOG_CHAR=y CONFIG_SYSLOG_DEVPATH="/dev/ttyS0" CONFIG_TASK_NAME_SIZE=0 CONFIG_USER_ENTRYPOINT="nx_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32/mikroe-stm32f4/configs/nxlines/defconfig b/boards/arm/stm32/mikroe-stm32f4/configs/nxlines/defconfig index 7f73257bc56..a7e310aff53 100644 --- a/boards/arm/stm32/mikroe-stm32f4/configs/nxlines/defconfig +++ b/boards/arm/stm32/mikroe-stm32f4/configs/nxlines/defconfig @@ -58,7 +58,6 @@ CONFIG_NXTK_BORDERCOLOR3=0xc618 CONFIG_NXTK_BORDERWIDTH=3 CONFIG_NX_BLOCKING=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -74,4 +73,3 @@ CONFIG_SYSLOG_CHAR=y CONFIG_SYSLOG_DEVPATH="/dev/ttyS0" CONFIG_TASK_NAME_SIZE=0 CONFIG_USER_ENTRYPOINT="nxlines_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32/mikroe-stm32f4/configs/nxtext/defconfig b/boards/arm/stm32/mikroe-stm32f4/configs/nxtext/defconfig index 0f0873495f1..15ae72707ae 100644 --- a/boards/arm/stm32/mikroe-stm32f4/configs/nxtext/defconfig +++ b/boards/arm/stm32/mikroe-stm32f4/configs/nxtext/defconfig @@ -52,7 +52,6 @@ CONFIG_NXTK_BORDERCOLOR3=0xc618 CONFIG_NXTK_BORDERWIDTH=3 CONFIG_NX_BLOCKING=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -68,4 +67,3 @@ CONFIG_SYSLOG_CHAR=y CONFIG_SYSLOG_DEVPATH="/dev/ttyS0" CONFIG_TASK_NAME_SIZE=0 CONFIG_USER_ENTRYPOINT="nxtext_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32/mikroe-stm32f4/configs/usbnsh/defconfig b/boards/arm/stm32/mikroe-stm32f4/configs/usbnsh/defconfig index 486df5faf71..2b7fdd82264 100644 --- a/boards/arm/stm32/mikroe-stm32f4/configs/usbnsh/defconfig +++ b/boards/arm/stm32/mikroe-stm32f4/configs/usbnsh/defconfig @@ -56,7 +56,6 @@ CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_NSH_STRERROR=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -79,4 +78,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USBDEV=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32/nucleo-f103rb/configs/adc/defconfig b/boards/arm/stm32/nucleo-f103rb/configs/adc/defconfig index e73cbf5e9ac..09c9db74201 100644 --- a/boards/arm/stm32/nucleo-f103rb/configs/adc/defconfig +++ b/boards/arm/stm32/nucleo-f103rb/configs/adc/defconfig @@ -31,7 +31,6 @@ CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=1024 CONFIG_NSH_LINELEN=80 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=20480 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -59,4 +58,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32/nucleo-f103rb/configs/nsh/defconfig b/boards/arm/stm32/nucleo-f103rb/configs/nsh/defconfig index 22bc7a73f2c..e746daac1f5 100644 --- a/boards/arm/stm32/nucleo-f103rb/configs/nsh/defconfig +++ b/boards/arm/stm32/nucleo-f103rb/configs/nsh/defconfig @@ -26,7 +26,6 @@ CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=1024 CONFIG_NSH_LINELEN=80 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=20480 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -47,4 +46,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32/nucleo-f103rb/configs/pwm/defconfig b/boards/arm/stm32/nucleo-f103rb/configs/pwm/defconfig index 0253e73a5e9..1c60ad35858 100644 --- a/boards/arm/stm32/nucleo-f103rb/configs/pwm/defconfig +++ b/boards/arm/stm32/nucleo-f103rb/configs/pwm/defconfig @@ -27,7 +27,6 @@ CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=1024 CONFIG_NSH_LINELEN=80 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_PWM=y CONFIG_RAM_SIZE=20480 CONFIG_RAM_START=0x20000000 @@ -53,4 +52,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32/nucleo-f207zg/configs/adc/defconfig b/boards/arm/stm32/nucleo-f207zg/configs/adc/defconfig index 706f35b0478..aae309ad8e7 100644 --- a/boards/arm/stm32/nucleo-f207zg/configs/adc/defconfig +++ b/boards/arm/stm32/nucleo-f207zg/configs/adc/defconfig @@ -30,7 +30,6 @@ CONFIG_NFILE_STREAMS=8 CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -51,4 +50,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART3_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32/nucleo-f207zg/configs/nsh/defconfig b/boards/arm/stm32/nucleo-f207zg/configs/nsh/defconfig index 911626a6a41..cc0130158f9 100644 --- a/boards/arm/stm32/nucleo-f207zg/configs/nsh/defconfig +++ b/boards/arm/stm32/nucleo-f207zg/configs/nsh/defconfig @@ -25,7 +25,6 @@ CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NSH_BUILTIN_APPS=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -40,4 +39,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART3_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32/nucleo-f207zg/configs/pwm/defconfig b/boards/arm/stm32/nucleo-f207zg/configs/pwm/defconfig index 8ac24d3bb0c..d0f86140532 100644 --- a/boards/arm/stm32/nucleo-f207zg/configs/pwm/defconfig +++ b/boards/arm/stm32/nucleo-f207zg/configs/pwm/defconfig @@ -26,7 +26,6 @@ CONFIG_NFILE_STREAMS=8 CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_PWM=y CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 @@ -45,4 +44,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART3_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32/nucleo-f302r8/configs/highpri/defconfig b/boards/arm/stm32/nucleo-f302r8/configs/highpri/defconfig index 7a973856d7b..c35203605f3 100644 --- a/boards/arm/stm32/nucleo-f302r8/configs/highpri/defconfig +++ b/boards/arm/stm32/nucleo-f302r8/configs/highpri/defconfig @@ -34,7 +34,6 @@ CONFIG_NFILE_STREAMS=8 CONFIG_NUCLEOF302R8_HIGHPRI=y CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=512 CONFIG_PREALLOC_TIMERS=2 -CONFIG_PREALLOC_WDOGS=1 CONFIG_PTHREAD_STACK_DEFAULT=1024 CONFIG_PTHREAD_STACK_MIN=1024 CONFIG_PWM=y @@ -66,4 +65,3 @@ CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=512 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USERMAIN_STACKSIZE=1024 CONFIG_USER_ENTRYPOINT="highpri_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32/nucleo-f302r8/configs/nsh/defconfig b/boards/arm/stm32/nucleo-f302r8/configs/nsh/defconfig index 786ef362e24..d8d2aed7f6e 100644 --- a/boards/arm/stm32/nucleo-f302r8/configs/nsh/defconfig +++ b/boards/arm/stm32/nucleo-f302r8/configs/nsh/defconfig @@ -75,7 +75,6 @@ CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=512 CONFIG_PREALLOC_TIMERS=2 -CONFIG_PREALLOC_WDOGS=1 CONFIG_PTHREAD_STACK_DEFAULT=1024 CONFIG_PTHREAD_STACK_MIN=1024 CONFIG_RAM_SIZE=16386 @@ -96,4 +95,3 @@ CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=512 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USERMAIN_STACKSIZE=1024 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32/nucleo-f303re/configs/adc/defconfig b/boards/arm/stm32/nucleo-f303re/configs/adc/defconfig index fed1ec314d3..662f2fadac9 100644 --- a/boards/arm/stm32/nucleo-f303re/configs/adc/defconfig +++ b/boards/arm/stm32/nucleo-f303re/configs/adc/defconfig @@ -29,7 +29,6 @@ CONFIG_NFILE_STREAMS=8 CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -51,4 +50,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32/nucleo-f303re/configs/can/defconfig b/boards/arm/stm32/nucleo-f303re/configs/can/defconfig index 334e10b2342..603f6441f70 100644 --- a/boards/arm/stm32/nucleo-f303re/configs/can/defconfig +++ b/boards/arm/stm32/nucleo-f303re/configs/can/defconfig @@ -26,7 +26,6 @@ CONFIG_MM_REGIONS=2 CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -39,4 +38,3 @@ CONFIG_STM32_CAN1=y CONFIG_STM32_JTAG_SW_ENABLE=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USER_ENTRYPOINT="can_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32/nucleo-f303re/configs/hello/defconfig b/boards/arm/stm32/nucleo-f303re/configs/hello/defconfig index dd8bfc30e4e..a6955c8fa6b 100644 --- a/boards/arm/stm32/nucleo-f303re/configs/hello/defconfig +++ b/boards/arm/stm32/nucleo-f303re/configs/hello/defconfig @@ -24,7 +24,6 @@ CONFIG_MM_REGIONS=2 CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -38,4 +37,3 @@ CONFIG_STM32_USART2=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="hello_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32/nucleo-f303re/configs/nsh/defconfig b/boards/arm/stm32/nucleo-f303re/configs/nsh/defconfig index afcd421aa0c..00f2120ca3b 100644 --- a/boards/arm/stm32/nucleo-f303re/configs/nsh/defconfig +++ b/boards/arm/stm32/nucleo-f303re/configs/nsh/defconfig @@ -23,7 +23,6 @@ CONFIG_MM_REGIONS=2 CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -38,4 +37,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32/nucleo-f303re/configs/nxlines/defconfig b/boards/arm/stm32/nucleo-f303re/configs/nxlines/defconfig index 5252d46c660..d33b8ee0d5f 100644 --- a/boards/arm/stm32/nucleo-f303re/configs/nxlines/defconfig +++ b/boards/arm/stm32/nucleo-f303re/configs/nxlines/defconfig @@ -35,7 +35,6 @@ CONFIG_NXFONT_MONO5X8=y CONFIG_NXSTART_EXTERNINIT=y CONFIG_NX_BLOCKING=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAMLOG=y CONFIG_RAMLOG_SYSLOG=y CONFIG_RAM_SIZE=65536 @@ -50,4 +49,3 @@ CONFIG_STM32_JTAG_SW_ENABLE=y CONFIG_STM32_SPI1=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USER_ENTRYPOINT="nxlines_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32/nucleo-f303re/configs/pwm/defconfig b/boards/arm/stm32/nucleo-f303re/configs/pwm/defconfig index 64ace735841..565ac4197db 100644 --- a/boards/arm/stm32/nucleo-f303re/configs/pwm/defconfig +++ b/boards/arm/stm32/nucleo-f303re/configs/pwm/defconfig @@ -26,7 +26,6 @@ CONFIG_NFILE_STREAMS=8 CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_PWM=y CONFIG_PWM_MULTICHAN=y CONFIG_PWM_NCHANNELS=2 @@ -51,4 +50,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32/nucleo-f303re/configs/serialrx/defconfig b/boards/arm/stm32/nucleo-f303re/configs/serialrx/defconfig index 2ccf269c877..48eaf2fe0bc 100644 --- a/boards/arm/stm32/nucleo-f303re/configs/serialrx/defconfig +++ b/boards/arm/stm32/nucleo-f303re/configs/serialrx/defconfig @@ -28,7 +28,6 @@ CONFIG_MM_REGIONS=2 CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -42,4 +41,3 @@ CONFIG_STM32_UART4=y CONFIG_TASK_NAME_SIZE=0 CONFIG_UART4_BAUD=9600 CONFIG_USER_ENTRYPOINT="serialrx_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32/nucleo-f303ze/configs/adc/defconfig b/boards/arm/stm32/nucleo-f303ze/configs/adc/defconfig index fc14dbb05b6..29ce0315d0c 100644 --- a/boards/arm/stm32/nucleo-f303ze/configs/adc/defconfig +++ b/boards/arm/stm32/nucleo-f303ze/configs/adc/defconfig @@ -32,7 +32,6 @@ CONFIG_NFILE_STREAMS=8 CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -56,4 +55,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART3_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32/nucleo-f303ze/configs/nsh/defconfig b/boards/arm/stm32/nucleo-f303ze/configs/nsh/defconfig index 9e945f0e1d0..5b9dd70e64b 100644 --- a/boards/arm/stm32/nucleo-f303ze/configs/nsh/defconfig +++ b/boards/arm/stm32/nucleo-f303ze/configs/nsh/defconfig @@ -26,7 +26,6 @@ CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NSH_BUILTIN_APPS=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -41,4 +40,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART3_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32/nucleo-f303ze/configs/nxlines_oled/defconfig b/boards/arm/stm32/nucleo-f303ze/configs/nxlines_oled/defconfig index e337ddb0d34..ff7e9843565 100644 --- a/boards/arm/stm32/nucleo-f303ze/configs/nxlines_oled/defconfig +++ b/boards/arm/stm32/nucleo-f303ze/configs/nxlines_oled/defconfig @@ -39,7 +39,6 @@ CONFIG_NX=y CONFIG_NXFONT_MONO5X8=y CONFIG_NX_BLOCKING=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -55,4 +54,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART3_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32/nucleo-f334r8/configs/adc/defconfig b/boards/arm/stm32/nucleo-f334r8/configs/adc/defconfig index e4c5c75f96e..72ac0849588 100644 --- a/boards/arm/stm32/nucleo-f334r8/configs/adc/defconfig +++ b/boards/arm/stm32/nucleo-f334r8/configs/adc/defconfig @@ -78,7 +78,6 @@ CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=512 CONFIG_PREALLOC_TIMERS=2 -CONFIG_PREALLOC_WDOGS=1 CONFIG_PTHREAD_STACK_DEFAULT=1024 CONFIG_PTHREAD_STACK_MIN=1024 CONFIG_RAM_SIZE=12288 @@ -106,4 +105,3 @@ CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=512 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USERMAIN_STACKSIZE=1024 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32/nucleo-f334r8/configs/highpri/defconfig b/boards/arm/stm32/nucleo-f334r8/configs/highpri/defconfig index 2510fdf570d..97f8f55e1a7 100644 --- a/boards/arm/stm32/nucleo-f334r8/configs/highpri/defconfig +++ b/boards/arm/stm32/nucleo-f334r8/configs/highpri/defconfig @@ -34,7 +34,6 @@ CONFIG_NFILE_STREAMS=8 CONFIG_NUCLEOF334R8_HIGHPRI=y CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=512 CONFIG_PREALLOC_TIMERS=2 -CONFIG_PREALLOC_WDOGS=1 CONFIG_PTHREAD_STACK_DEFAULT=1024 CONFIG_PTHREAD_STACK_MIN=1024 CONFIG_RAM_SIZE=12288 @@ -70,4 +69,3 @@ CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=512 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USERMAIN_STACKSIZE=1024 CONFIG_USER_ENTRYPOINT="highpri_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32/nucleo-f334r8/configs/nsh/defconfig b/boards/arm/stm32/nucleo-f334r8/configs/nsh/defconfig index e5453367b22..2db4c7bbd89 100644 --- a/boards/arm/stm32/nucleo-f334r8/configs/nsh/defconfig +++ b/boards/arm/stm32/nucleo-f334r8/configs/nsh/defconfig @@ -75,7 +75,6 @@ CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=512 CONFIG_PREALLOC_TIMERS=2 -CONFIG_PREALLOC_WDOGS=1 CONFIG_PTHREAD_STACK_DEFAULT=1024 CONFIG_PTHREAD_STACK_MIN=1024 CONFIG_RAM_SIZE=12288 @@ -97,4 +96,3 @@ CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=512 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USERMAIN_STACKSIZE=1024 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32/nucleo-f334r8/configs/spwm1/defconfig b/boards/arm/stm32/nucleo-f334r8/configs/spwm1/defconfig index 2d3c24bf18b..260e8cd9baa 100644 --- a/boards/arm/stm32/nucleo-f334r8/configs/spwm1/defconfig +++ b/boards/arm/stm32/nucleo-f334r8/configs/spwm1/defconfig @@ -36,7 +36,6 @@ CONFIG_NUCLEOF334R8_SPWM_PHASE_NUM=3 CONFIG_NUCLEOF334R8_SPWM_USE_HRTIM1=y CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=512 CONFIG_PREALLOC_TIMERS=2 -CONFIG_PREALLOC_WDOGS=1 CONFIG_PTHREAD_STACK_DEFAULT=1024 CONFIG_PTHREAD_STACK_MIN=1024 CONFIG_RAM_SIZE=12288 @@ -81,4 +80,3 @@ CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=512 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USERMAIN_STACKSIZE=1024 CONFIG_USER_ENTRYPOINT="spwm_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32/nucleo-f334r8/configs/spwm2/defconfig b/boards/arm/stm32/nucleo-f334r8/configs/spwm2/defconfig index 5f1f283beb9..f209b34d9fc 100644 --- a/boards/arm/stm32/nucleo-f334r8/configs/spwm2/defconfig +++ b/boards/arm/stm32/nucleo-f334r8/configs/spwm2/defconfig @@ -37,7 +37,6 @@ CONFIG_NUCLEOF334R8_SPWM=y CONFIG_NUCLEOF334R8_SPWM_PHASE_NUM=4 CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=512 CONFIG_PREALLOC_TIMERS=2 -CONFIG_PREALLOC_WDOGS=1 CONFIG_PTHREAD_STACK_DEFAULT=1024 CONFIG_PTHREAD_STACK_MIN=1024 CONFIG_RAM_SIZE=12288 @@ -72,4 +71,3 @@ CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=512 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USERMAIN_STACKSIZE=1024 CONFIG_USER_ENTRYPOINT="spwm_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32/nucleo-f410rb/configs/nsh/defconfig b/boards/arm/stm32/nucleo-f410rb/configs/nsh/defconfig index 0a3a7a83999..eb5802abb65 100644 --- a/boards/arm/stm32/nucleo-f410rb/configs/nsh/defconfig +++ b/boards/arm/stm32/nucleo-f410rb/configs/nsh/defconfig @@ -36,7 +36,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=32768 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -62,4 +61,3 @@ CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USERLED=y CONFIG_USERLED_LOWER=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32/nucleo-f412zg/configs/nsh/defconfig b/boards/arm/stm32/nucleo-f412zg/configs/nsh/defconfig index c1b4ff863bd..e2ab90f2809 100644 --- a/boards/arm/stm32/nucleo-f412zg/configs/nsh/defconfig +++ b/boards/arm/stm32/nucleo-f412zg/configs/nsh/defconfig @@ -42,7 +42,6 @@ CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_CHILDSTATUS=2 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=262144 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y diff --git a/boards/arm/stm32/nucleo-f429zi/configs/netnsh/defconfig b/boards/arm/stm32/nucleo-f429zi/configs/netnsh/defconfig index 8596bf41b72..1fac139b2ad 100644 --- a/boards/arm/stm32/nucleo-f429zi/configs/netnsh/defconfig +++ b/boards/arm/stm32/nucleo-f429zi/configs/netnsh/defconfig @@ -52,7 +52,6 @@ CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_NUCLEO_F429ZI_CONSOLE_VIRTUAL=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -82,4 +81,3 @@ CONFIG_SYSTEM_PING=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART3_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32/nucleo-f429zi/configs/nsh/defconfig b/boards/arm/stm32/nucleo-f429zi/configs/nsh/defconfig index e4e399c6027..931b82799dc 100644 --- a/boards/arm/stm32/nucleo-f429zi/configs/nsh/defconfig +++ b/boards/arm/stm32/nucleo-f429zi/configs/nsh/defconfig @@ -34,7 +34,6 @@ CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_NUCLEO_F429ZI_CONSOLE_VIRTUAL=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -54,4 +53,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART3_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32/nucleo-f446re/configs/nsh/defconfig b/boards/arm/stm32/nucleo-f446re/configs/nsh/defconfig index 39aaa348d80..9ee455d3a1f 100644 --- a/boards/arm/stm32/nucleo-f446re/configs/nsh/defconfig +++ b/boards/arm/stm32/nucleo-f446re/configs/nsh/defconfig @@ -34,7 +34,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=131072 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -55,4 +54,3 @@ CONFIG_TASK_NAME_SIZE=0 CONFIG_TESTING_OSTEST=y CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32/nucleo-f4x1re/configs/f401-nsh/defconfig b/boards/arm/stm32/nucleo-f4x1re/configs/f401-nsh/defconfig index 3e18c968d2f..96187d44fc0 100644 --- a/boards/arm/stm32/nucleo-f4x1re/configs/f401-nsh/defconfig +++ b/boards/arm/stm32/nucleo-f4x1re/configs/f401-nsh/defconfig @@ -33,7 +33,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=98304 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -52,4 +51,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32/nucleo-f4x1re/configs/f411-mcp2515-extid/defconfig b/boards/arm/stm32/nucleo-f4x1re/configs/f411-mcp2515-extid/defconfig index 9d78ce8d3b3..7839511ae3f 100644 --- a/boards/arm/stm32/nucleo-f4x1re/configs/f411-mcp2515-extid/defconfig +++ b/boards/arm/stm32/nucleo-f4x1re/configs/f411-mcp2515-extid/defconfig @@ -43,7 +43,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=131072 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -63,4 +62,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32/nucleo-f4x1re/configs/f411-nsh/defconfig b/boards/arm/stm32/nucleo-f4x1re/configs/f411-nsh/defconfig index 34d19444032..d00239e21c8 100644 --- a/boards/arm/stm32/nucleo-f4x1re/configs/f411-nsh/defconfig +++ b/boards/arm/stm32/nucleo-f4x1re/configs/f411-nsh/defconfig @@ -33,7 +33,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=131072 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -53,4 +52,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32/nucleo-l152re/configs/nsh/defconfig b/boards/arm/stm32/nucleo-l152re/configs/nsh/defconfig index c6465db5cf4..50c419d1ae6 100644 --- a/boards/arm/stm32/nucleo-l152re/configs/nsh/defconfig +++ b/boards/arm/stm32/nucleo-l152re/configs/nsh/defconfig @@ -34,7 +34,6 @@ CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_NUNGET_CHARS=0 CONFIG_PREALLOC_TIMERS=0 -CONFIG_PREALLOC_WDOGS=4 CONFIG_PTHREAD_MUTEX_UNSAFE=y CONFIG_PTHREAD_STACK_DEFAULT=1536 CONFIG_RAM_SIZE=81920 @@ -58,4 +57,3 @@ CONFIG_TLS_NELEM=0 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USERMAIN_STACKSIZE=1536 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32/olimex-stm32-e407/configs/bmp180/defconfig b/boards/arm/stm32/olimex-stm32-e407/configs/bmp180/defconfig index b71ea761aa7..e0bc745fb3b 100644 --- a/boards/arm/stm32/olimex-stm32-e407/configs/bmp180/defconfig +++ b/boards/arm/stm32/olimex-stm32-e407/configs/bmp180/defconfig @@ -38,7 +38,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y diff --git a/boards/arm/stm32/olimex-stm32-e407/configs/dac/defconfig b/boards/arm/stm32/olimex-stm32-e407/configs/dac/defconfig index 3453de65133..2df935de81d 100644 --- a/boards/arm/stm32/olimex-stm32-e407/configs/dac/defconfig +++ b/boards/arm/stm32/olimex-stm32-e407/configs/dac/defconfig @@ -41,7 +41,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y diff --git a/boards/arm/stm32/olimex-stm32-e407/configs/discover/defconfig b/boards/arm/stm32/olimex-stm32-e407/configs/discover/defconfig index 516596c7435..22c4cfb6829 100644 --- a/boards/arm/stm32/olimex-stm32-e407/configs/discover/defconfig +++ b/boards/arm/stm32/olimex-stm32-e407/configs/discover/defconfig @@ -46,7 +46,6 @@ CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NSOCKET_DESCRIPTORS=10 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y diff --git a/boards/arm/stm32/olimex-stm32-e407/configs/ina219/defconfig b/boards/arm/stm32/olimex-stm32-e407/configs/ina219/defconfig index 29895f77aff..5fe99656957 100644 --- a/boards/arm/stm32/olimex-stm32-e407/configs/ina219/defconfig +++ b/boards/arm/stm32/olimex-stm32-e407/configs/ina219/defconfig @@ -40,7 +40,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -61,4 +60,3 @@ CONFIG_SYSLOG_DEVPATH="/dev/ttyS0" CONFIG_SYSTEM_NSH=y CONFIG_USBDEV=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32/olimex-stm32-e407/configs/mrf24j40-6lowpan/defconfig b/boards/arm/stm32/olimex-stm32-e407/configs/mrf24j40-6lowpan/defconfig index c4d77a60724..d9dc77570c2 100644 --- a/boards/arm/stm32/olimex-stm32-e407/configs/mrf24j40-6lowpan/defconfig +++ b/boards/arm/stm32/olimex-stm32-e407/configs/mrf24j40-6lowpan/defconfig @@ -88,7 +88,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y diff --git a/boards/arm/stm32/olimex-stm32-e407/configs/mrf24j40-mac/defconfig b/boards/arm/stm32/olimex-stm32-e407/configs/mrf24j40-mac/defconfig index bf08176ee90..d45e35ae885 100644 --- a/boards/arm/stm32/olimex-stm32-e407/configs/mrf24j40-mac/defconfig +++ b/boards/arm/stm32/olimex-stm32-e407/configs/mrf24j40-mac/defconfig @@ -47,7 +47,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y diff --git a/boards/arm/stm32/olimex-stm32-e407/configs/netnsh/defconfig b/boards/arm/stm32/olimex-stm32-e407/configs/netnsh/defconfig index 2cc74b20ea5..e2cefab453a 100644 --- a/boards/arm/stm32/olimex-stm32-e407/configs/netnsh/defconfig +++ b/boards/arm/stm32/olimex-stm32-e407/configs/netnsh/defconfig @@ -50,7 +50,6 @@ CONFIG_NFILE_STREAMS=8 CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSOCKET_DESCRIPTORS=10 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y diff --git a/boards/arm/stm32/olimex-stm32-e407/configs/nsh/defconfig b/boards/arm/stm32/olimex-stm32-e407/configs/nsh/defconfig index ac8fb854f39..44e7c70eb8c 100644 --- a/boards/arm/stm32/olimex-stm32-e407/configs/nsh/defconfig +++ b/boards/arm/stm32/olimex-stm32-e407/configs/nsh/defconfig @@ -34,7 +34,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y diff --git a/boards/arm/stm32/olimex-stm32-e407/configs/telnetd/defconfig b/boards/arm/stm32/olimex-stm32-e407/configs/telnetd/defconfig index 4a9a8ba6939..5cba1ea87e7 100644 --- a/boards/arm/stm32/olimex-stm32-e407/configs/telnetd/defconfig +++ b/boards/arm/stm32/olimex-stm32-e407/configs/telnetd/defconfig @@ -52,7 +52,6 @@ CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NSOCKET_DESCRIPTORS=10 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y diff --git a/boards/arm/stm32/olimex-stm32-e407/configs/timer/defconfig b/boards/arm/stm32/olimex-stm32-e407/configs/timer/defconfig index 76c0c1d27be..13c44dba79a 100644 --- a/boards/arm/stm32/olimex-stm32-e407/configs/timer/defconfig +++ b/boards/arm/stm32/olimex-stm32-e407/configs/timer/defconfig @@ -37,7 +37,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y diff --git a/boards/arm/stm32/olimex-stm32-e407/configs/usbnsh/defconfig b/boards/arm/stm32/olimex-stm32-e407/configs/usbnsh/defconfig index 93ffe901ccf..c7207d68cf0 100644 --- a/boards/arm/stm32/olimex-stm32-e407/configs/usbnsh/defconfig +++ b/boards/arm/stm32/olimex-stm32-e407/configs/usbnsh/defconfig @@ -39,7 +39,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -58,4 +57,3 @@ CONFIG_SYSLOG_DEVPATH="/dev/ttyS0" CONFIG_SYSTEM_NSH=y CONFIG_USBDEV=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32/olimex-stm32-e407/configs/webserver/defconfig b/boards/arm/stm32/olimex-stm32-e407/configs/webserver/defconfig index fb07eb420df..faa6306a08a 100644 --- a/boards/arm/stm32/olimex-stm32-e407/configs/webserver/defconfig +++ b/boards/arm/stm32/olimex-stm32-e407/configs/webserver/defconfig @@ -48,7 +48,6 @@ CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NSOCKET_DESCRIPTORS=10 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y diff --git a/boards/arm/stm32/olimex-stm32-h405/configs/usbnsh/defconfig b/boards/arm/stm32/olimex-stm32-h405/configs/usbnsh/defconfig index e392f2262f9..aea239a9346 100644 --- a/boards/arm/stm32/olimex-stm32-h405/configs/usbnsh/defconfig +++ b/boards/arm/stm32/olimex-stm32-h405/configs/usbnsh/defconfig @@ -47,7 +47,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -71,4 +70,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USBDEV=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32/olimex-stm32-h407/configs/nsh/defconfig b/boards/arm/stm32/olimex-stm32-h407/configs/nsh/defconfig index c4461b34351..15379a34d70 100644 --- a/boards/arm/stm32/olimex-stm32-h407/configs/nsh/defconfig +++ b/boards/arm/stm32/olimex-stm32-h407/configs/nsh/defconfig @@ -35,7 +35,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y diff --git a/boards/arm/stm32/olimex-stm32-h407/configs/nsh_uext/defconfig b/boards/arm/stm32/olimex-stm32-h407/configs/nsh_uext/defconfig index 935d337f6e3..88a60c92bbf 100644 --- a/boards/arm/stm32/olimex-stm32-h407/configs/nsh_uext/defconfig +++ b/boards/arm/stm32/olimex-stm32-h407/configs/nsh_uext/defconfig @@ -33,7 +33,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y diff --git a/boards/arm/stm32/olimex-stm32-p107/configs/nsh/defconfig b/boards/arm/stm32/olimex-stm32-p107/configs/nsh/defconfig index 9957ea8dbb0..dac5da1b462 100644 --- a/boards/arm/stm32/olimex-stm32-p107/configs/nsh/defconfig +++ b/boards/arm/stm32/olimex-stm32-p107/configs/nsh/defconfig @@ -46,7 +46,6 @@ CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_READLINE=y CONFIG_NSOCKET_DESCRIPTORS=10 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x20000000 CONFIG_RR_INTERVAL=200 @@ -72,4 +71,3 @@ CONFIG_SYSTEM_PING=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32/olimex-stm32-p207/configs/nsh/defconfig b/boards/arm/stm32/olimex-stm32-p207/configs/nsh/defconfig index 1b719f5c018..24524b6b56c 100644 --- a/boards/arm/stm32/olimex-stm32-p207/configs/nsh/defconfig +++ b/boards/arm/stm32/olimex-stm32-p207/configs/nsh/defconfig @@ -52,7 +52,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -87,4 +86,3 @@ CONFIG_TASK_NAME_SIZE=0 CONFIG_USART3_SERIAL_CONSOLE=y CONFIG_USBHOST=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32/olimex-stm32-p407/configs/audio/defconfig b/boards/arm/stm32/olimex-stm32-p407/configs/audio/defconfig index 0bca27e351d..320241c27c5 100644 --- a/boards/arm/stm32/olimex-stm32-p407/configs/audio/defconfig +++ b/boards/arm/stm32/olimex-stm32-p407/configs/audio/defconfig @@ -43,7 +43,6 @@ CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_NXPLAYER_DEFAULT_MEDIADIR="/mnt/music" CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=131072 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -72,4 +71,3 @@ CONFIG_TASK_NAME_SIZE=32 CONFIG_USART3_SERIAL_CONSOLE=y CONFIG_USBHOST_MSC=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32/olimex-stm32-p407/configs/dhtxx/defconfig b/boards/arm/stm32/olimex-stm32-p407/configs/dhtxx/defconfig index e607cc83eda..0d9434e1c6a 100644 --- a/boards/arm/stm32/olimex-stm32-p407/configs/dhtxx/defconfig +++ b/boards/arm/stm32/olimex-stm32-p407/configs/dhtxx/defconfig @@ -41,7 +41,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=131072 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -65,4 +64,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=32 CONFIG_USBDEV=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32/olimex-stm32-p407/configs/hidkbd/defconfig b/boards/arm/stm32/olimex-stm32-p407/configs/hidkbd/defconfig index 878935a3446..e8ef807fab0 100644 --- a/boards/arm/stm32/olimex-stm32-p407/configs/hidkbd/defconfig +++ b/boards/arm/stm32/olimex-stm32-p407/configs/hidkbd/defconfig @@ -38,7 +38,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=131072 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -60,4 +59,3 @@ CONFIG_TASK_NAME_SIZE=32 CONFIG_USART3_SERIAL_CONSOLE=y CONFIG_USBHOST_HIDKBD=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32/olimex-stm32-p407/configs/kelf/defconfig b/boards/arm/stm32/olimex-stm32-p407/configs/kelf/defconfig index 197931bb252..501b9b142ce 100644 --- a/boards/arm/stm32/olimex-stm32-p407/configs/kelf/defconfig +++ b/boards/arm/stm32/olimex-stm32-p407/configs/kelf/defconfig @@ -40,7 +40,6 @@ CONFIG_NUTTX_USERSPACE=0x08020000 CONFIG_PASS1_BUILDIR="boards/arm/stm32/olimex-stm32-p407/kernel" CONFIG_PATH_INITIAL="/mnt/vfat" CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 CONFIG_RR_INTERVAL=200 @@ -63,4 +62,3 @@ CONFIG_USBHOST_ISOC_DISABLE=y CONFIG_USBHOST_MSC=y CONFIG_USERMAIN_STACKSIZE=4096 CONFIG_USER_ENTRYPOINT="elf_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32/olimex-stm32-p407/configs/kmodule/defconfig b/boards/arm/stm32/olimex-stm32-p407/configs/kmodule/defconfig index e539c297a6c..715a670145f 100644 --- a/boards/arm/stm32/olimex-stm32-p407/configs/kmodule/defconfig +++ b/boards/arm/stm32/olimex-stm32-p407/configs/kmodule/defconfig @@ -38,7 +38,6 @@ CONFIG_NFILE_STREAMS=8 CONFIG_NUTTX_USERSPACE=0x08020000 CONFIG_PASS1_BUILDIR="boards/arm/stm32/olimex-stm32-p407/kernel" CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 CONFIG_RR_INTERVAL=200 @@ -59,4 +58,3 @@ CONFIG_USART3_SERIAL_CONSOLE=y CONFIG_USBHOST_ISOC_DISABLE=y CONFIG_USBHOST_MSC=y CONFIG_USER_ENTRYPOINT="module_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32/olimex-stm32-p407/configs/knsh/defconfig b/boards/arm/stm32/olimex-stm32-p407/configs/knsh/defconfig index d21d6001eec..315a27376b4 100644 --- a/boards/arm/stm32/olimex-stm32-p407/configs/knsh/defconfig +++ b/boards/arm/stm32/olimex-stm32-p407/configs/knsh/defconfig @@ -39,7 +39,6 @@ CONFIG_NSH_READLINE=y CONFIG_NUTTX_USERSPACE=0x08020000 CONFIG_PASS1_BUILDIR="boards/arm/stm32/olimex-stm32-p407/kernel" CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=131072 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -59,4 +58,3 @@ CONFIG_SYS_RESERVED=8 CONFIG_TASK_NAME_SIZE=32 CONFIG_USART3_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32/olimex-stm32-p407/configs/nsh/defconfig b/boards/arm/stm32/olimex-stm32-p407/configs/nsh/defconfig index 73ac56d9d8a..fa3f346f784 100644 --- a/boards/arm/stm32/olimex-stm32-p407/configs/nsh/defconfig +++ b/boards/arm/stm32/olimex-stm32-p407/configs/nsh/defconfig @@ -36,7 +36,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=131072 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -58,4 +57,3 @@ CONFIG_TASK_NAME_SIZE=32 CONFIG_USART3_SERIAL_CONSOLE=y CONFIG_USBHOST_MSC=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32/olimex-stm32-p407/configs/zmodem/defconfig b/boards/arm/stm32/olimex-stm32-p407/configs/zmodem/defconfig index 31df76f6521..ad4f468b20f 100644 --- a/boards/arm/stm32/olimex-stm32-p407/configs/zmodem/defconfig +++ b/boards/arm/stm32/olimex-stm32-p407/configs/zmodem/defconfig @@ -38,7 +38,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y diff --git a/boards/arm/stm32/olimexino-stm32/configs/can/defconfig b/boards/arm/stm32/olimexino-stm32/configs/can/defconfig index b0e100a2d9d..6ea99f147ac 100644 --- a/boards/arm/stm32/olimexino-stm32/configs/can/defconfig +++ b/boards/arm/stm32/olimexino-stm32/configs/can/defconfig @@ -71,7 +71,6 @@ CONFIG_NSH_LINELEN=40 CONFIG_NSH_NESTDEPTH=0 CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=768 CONFIG_PREALLOC_TIMERS=2 -CONFIG_PREALLOC_WDOGS=4 CONFIG_PRIORITY_INHERITANCE=y CONFIG_PTHREAD_STACK_DEFAULT=464 CONFIG_RAM_SIZE=20480 @@ -114,4 +113,3 @@ CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USART1_TXBUFSIZE=32 CONFIG_USERMAIN_STACKSIZE=880 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=2 diff --git a/boards/arm/stm32/olimexino-stm32/configs/composite/defconfig b/boards/arm/stm32/olimexino-stm32/configs/composite/defconfig index 13390e89cfe..8f3e4696ba6 100644 --- a/boards/arm/stm32/olimexino-stm32/configs/composite/defconfig +++ b/boards/arm/stm32/olimexino-stm32/configs/composite/defconfig @@ -84,7 +84,6 @@ CONFIG_NSH_FILEIOSIZE=128 CONFIG_NSH_LINELEN=40 CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=768 CONFIG_PREALLOC_TIMERS=2 -CONFIG_PREALLOC_WDOGS=4 CONFIG_PRIORITY_INHERITANCE=y CONFIG_PTHREAD_STACK_DEFAULT=464 CONFIG_RAM_SIZE=20480 @@ -144,4 +143,3 @@ CONFIG_USBMSC_SCSI_STACKSIZE=340 CONFIG_USERMAIN_STACKSIZE=880 CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WATCHDOG=y -CONFIG_WDOG_INTRESERVE=2 diff --git a/boards/arm/stm32/olimexino-stm32/configs/nsh/defconfig b/boards/arm/stm32/olimexino-stm32/configs/nsh/defconfig index ba9ee17ee1a..eab6c6688de 100644 --- a/boards/arm/stm32/olimexino-stm32/configs/nsh/defconfig +++ b/boards/arm/stm32/olimexino-stm32/configs/nsh/defconfig @@ -72,7 +72,6 @@ CONFIG_NSH_FILEIOSIZE=128 CONFIG_NSH_LINELEN=40 CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=768 CONFIG_PREALLOC_TIMERS=2 -CONFIG_PREALLOC_WDOGS=4 CONFIG_PRIORITY_INHERITANCE=y CONFIG_PTHREAD_STACK_DEFAULT=464 CONFIG_RAM_SIZE=20480 @@ -123,4 +122,3 @@ CONFIG_USART2_TXBUFSIZE=32 CONFIG_USERMAIN_STACKSIZE=880 CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WATCHDOG=y -CONFIG_WDOG_INTRESERVE=2 diff --git a/boards/arm/stm32/olimexino-stm32/configs/smallnsh/defconfig b/boards/arm/stm32/olimexino-stm32/configs/smallnsh/defconfig index 5c6eb67f534..ff12c7bb6d1 100644 --- a/boards/arm/stm32/olimexino-stm32/configs/smallnsh/defconfig +++ b/boards/arm/stm32/olimexino-stm32/configs/smallnsh/defconfig @@ -63,7 +63,6 @@ CONFIG_NSH_LINELEN=40 CONFIG_NSH_NESTDEPTH=0 CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=768 CONFIG_PREALLOC_TIMERS=2 -CONFIG_PREALLOC_WDOGS=4 CONFIG_PRIORITY_INHERITANCE=y CONFIG_PTHREAD_STACK_DEFAULT=464 CONFIG_RAM_SIZE=20480 @@ -98,4 +97,3 @@ CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USART1_TXBUFSIZE=32 CONFIG_USERMAIN_STACKSIZE=880 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=2 diff --git a/boards/arm/stm32/olimexino-stm32/configs/tiny/defconfig b/boards/arm/stm32/olimexino-stm32/configs/tiny/defconfig index 416eba9a105..86b6b606b29 100644 --- a/boards/arm/stm32/olimexino-stm32/configs/tiny/defconfig +++ b/boards/arm/stm32/olimexino-stm32/configs/tiny/defconfig @@ -44,7 +44,6 @@ CONFIG_NFILE_DESCRIPTORS=5 CONFIG_NFILE_STREAMS=5 CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=768 CONFIG_PREALLOC_TIMERS=2 -CONFIG_PREALLOC_WDOGS=4 CONFIG_PRIORITY_INHERITANCE=y CONFIG_PTHREAD_STACK_DEFAULT=464 CONFIG_RAM_SIZE=20480 @@ -82,4 +81,3 @@ CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USART1_TXBUFSIZE=32 CONFIG_USERMAIN_STACKSIZE=880 CONFIG_USER_ENTRYPOINT="can_main" -CONFIG_WDOG_INTRESERVE=2 diff --git a/boards/arm/stm32/omnibusf4/configs/nsh/defconfig b/boards/arm/stm32/omnibusf4/configs/nsh/defconfig index d8aad205c88..6871a30e581 100644 --- a/boards/arm/stm32/omnibusf4/configs/nsh/defconfig +++ b/boards/arm/stm32/omnibusf4/configs/nsh/defconfig @@ -72,7 +72,6 @@ CONFIG_NSH_PROMPT_STRING="omnibusf4> " CONFIG_NSH_READLINE=y CONFIG_PIPES=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_PWM=y CONFIG_PWM_MULTICHAN=y CONFIG_PWM_NCHANNELS=4 diff --git a/boards/arm/stm32/photon/configs/nsh/defconfig b/boards/arm/stm32/photon/configs/nsh/defconfig index 930f3681a73..7008348b621 100644 --- a/boards/arm/stm32/photon/configs/nsh/defconfig +++ b/boards/arm/stm32/photon/configs/nsh/defconfig @@ -35,7 +35,6 @@ CONFIG_PHOTON_DFU_BOOTLOADER=y CONFIG_PHOTON_IWDG=y CONFIG_PHOTON_WDG_THREAD=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y diff --git a/boards/arm/stm32/photon/configs/rgbled/defconfig b/boards/arm/stm32/photon/configs/rgbled/defconfig index c1920ae1505..8bac70ec990 100644 --- a/boards/arm/stm32/photon/configs/rgbled/defconfig +++ b/boards/arm/stm32/photon/configs/rgbled/defconfig @@ -40,7 +40,6 @@ CONFIG_PHOTON_DFU_BOOTLOADER=y CONFIG_PHOTON_IWDG=y CONFIG_PHOTON_WDG_THREAD=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_PWM=y CONFIG_PWM_MULTICHAN=y CONFIG_PWM_NCHANNELS=4 diff --git a/boards/arm/stm32/photon/configs/usbnsh/defconfig b/boards/arm/stm32/photon/configs/usbnsh/defconfig index 1c896a9addf..dea24bb3b42 100644 --- a/boards/arm/stm32/photon/configs/usbnsh/defconfig +++ b/boards/arm/stm32/photon/configs/usbnsh/defconfig @@ -38,7 +38,6 @@ CONFIG_PHOTON_DFU_BOOTLOADER=y CONFIG_PHOTON_IWDG=y CONFIG_PHOTON_WDG_THREAD=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y diff --git a/boards/arm/stm32/photon/configs/wlan/defconfig b/boards/arm/stm32/photon/configs/wlan/defconfig index 5455e00334b..604c73d0f82 100644 --- a/boards/arm/stm32/photon/configs/wlan/defconfig +++ b/boards/arm/stm32/photon/configs/wlan/defconfig @@ -69,7 +69,6 @@ CONFIG_PHOTON_IWDG=y CONFIG_PHOTON_WDG_THREAD=y CONFIG_PHOTON_WLAN=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 CONFIG_RR_INTERVAL=200 diff --git a/boards/arm/stm32/shenzhou/configs/nsh/defconfig b/boards/arm/stm32/shenzhou/configs/nsh/defconfig index b81e15541de..eb36a2c880c 100644 --- a/boards/arm/stm32/shenzhou/configs/nsh/defconfig +++ b/boards/arm/stm32/shenzhou/configs/nsh/defconfig @@ -52,7 +52,6 @@ CONFIG_NSH_MMCSDSPIPORTNO=1 CONFIG_NSH_READLINE=y CONFIG_NSOCKET_DESCRIPTORS=10 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x20000000 CONFIG_RR_INTERVAL=200 @@ -83,4 +82,3 @@ CONFIG_USART2_RXBUFSIZE=128 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USART2_TXBUFSIZE=128 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32/shenzhou/configs/nxwm/defconfig b/boards/arm/stm32/shenzhou/configs/nxwm/defconfig index 8a27d2e6ce0..0b7de0473db 100644 --- a/boards/arm/stm32/shenzhou/configs/nxwm/defconfig +++ b/boards/arm/stm32/shenzhou/configs/nxwm/defconfig @@ -97,7 +97,6 @@ CONFIG_NX_BLOCKING=y CONFIG_NX_KBD=y CONFIG_NX_XYINPUT_TOUCHSCREEN=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_PTHREAD_STACK_DEFAULT=1024 CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x20000000 @@ -132,4 +131,3 @@ CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USART2_TXBUFSIZE=128 CONFIG_USERMAIN_STACKSIZE=1024 CONFIG_USER_ENTRYPOINT="nxwm_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32/shenzhou/configs/thttpd/defconfig b/boards/arm/stm32/shenzhou/configs/thttpd/defconfig index 9cd014c23b0..8412128184d 100644 --- a/boards/arm/stm32/shenzhou/configs/thttpd/defconfig +++ b/boards/arm/stm32/shenzhou/configs/thttpd/defconfig @@ -60,7 +60,6 @@ CONFIG_NSOCKET_DESCRIPTORS=16 CONFIG_NXFLAT=y CONFIG_PIPES=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x20000000 CONFIG_RR_INTERVAL=200 @@ -95,4 +94,3 @@ CONFIG_USART2_RXBUFSIZE=128 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USART2_TXBUFSIZE=128 CONFIG_USER_ENTRYPOINT="thttp_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32/stm3210e-eval/configs/composite/defconfig b/boards/arm/stm32/stm3210e-eval/configs/composite/defconfig index b80b0572815..972df3d9075 100644 --- a/boards/arm/stm32/stm3210e-eval/configs/composite/defconfig +++ b/boards/arm/stm32/stm3210e-eval/configs/composite/defconfig @@ -35,7 +35,6 @@ CONFIG_MTD=y CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x20000000 CONFIG_RR_INTERVAL=200 @@ -68,4 +67,3 @@ CONFIG_USBMSC_NWRREQS=2 CONFIG_USBMSC_REMOVABLE=y CONFIG_USBMSC_VERSIONNO=0x0399 CONFIG_USER_ENTRYPOINT="conn_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32/stm3210e-eval/configs/nsh/defconfig b/boards/arm/stm32/stm3210e-eval/configs/nsh/defconfig index e39c7d77ade..ca1c705dfae 100644 --- a/boards/arm/stm32/stm3210e-eval/configs/nsh/defconfig +++ b/boards/arm/stm32/stm3210e-eval/configs/nsh/defconfig @@ -33,7 +33,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x20000000 CONFIG_RR_INTERVAL=200 @@ -56,4 +55,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32/stm3210e-eval/configs/nsh2/defconfig b/boards/arm/stm32/stm3210e-eval/configs/nsh2/defconfig index c54c5b70adf..1b6624ecba6 100644 --- a/boards/arm/stm32/stm3210e-eval/configs/nsh2/defconfig +++ b/boards/arm/stm32/stm3210e-eval/configs/nsh2/defconfig @@ -74,7 +74,6 @@ CONFIG_NX_BLOCKING=y CONFIG_NX_KBD=y CONFIG_NX_XYINPUT_MOUSE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x20000000 CONFIG_RR_INTERVAL=200 @@ -112,4 +111,3 @@ CONFIG_USBMSC_PRODUCTSTR="USBdev Storage" CONFIG_USBMSC_REMOVABLE=y CONFIG_USBMSC_VERSIONNO=0x0399 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32/stm3210e-eval/configs/nx/defconfig b/boards/arm/stm32/stm3210e-eval/configs/nx/defconfig index 08d2fba15e1..f876c16d7de 100644 --- a/boards/arm/stm32/stm3210e-eval/configs/nx/defconfig +++ b/boards/arm/stm32/stm3210e-eval/configs/nx/defconfig @@ -50,7 +50,6 @@ CONFIG_NX_BLOCKING=y CONFIG_NX_KBD=y CONFIG_NX_XYINPUT_MOUSE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x20000000 CONFIG_RR_INTERVAL=200 @@ -75,4 +74,3 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nx_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32/stm3210e-eval/configs/nxterm/defconfig b/boards/arm/stm32/stm3210e-eval/configs/nxterm/defconfig index 27e9c2260c2..95896734bae 100644 --- a/boards/arm/stm32/stm3210e-eval/configs/nxterm/defconfig +++ b/boards/arm/stm32/stm3210e-eval/configs/nxterm/defconfig @@ -50,7 +50,6 @@ CONFIG_NX_KBD=y CONFIG_NX_XYINPUT_MOUSE=y CONFIG_PREALLOC_MQ_MSGS=8 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x20000000 CONFIG_RR_INTERVAL=200 @@ -72,4 +71,3 @@ CONFIG_STM32_USART2=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nxterm_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32/stm3210e-eval/configs/pm/defconfig b/boards/arm/stm32/stm3210e-eval/configs/pm/defconfig index bac5a512b9c..66bf83a9537 100644 --- a/boards/arm/stm32/stm3210e-eval/configs/pm/defconfig +++ b/boards/arm/stm32/stm3210e-eval/configs/pm/defconfig @@ -69,7 +69,6 @@ CONFIG_NX_XYINPUT_TOUCHSCREEN=y CONFIG_PM=y CONFIG_PM_BUTTONS=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x20000000 CONFIG_RR_INTERVAL=200 @@ -98,4 +97,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32/stm3210e-eval/configs/usbmsc/defconfig b/boards/arm/stm32/stm3210e-eval/configs/usbmsc/defconfig index 3750df0a924..bb560b58d63 100644 --- a/boards/arm/stm32/stm3210e-eval/configs/usbmsc/defconfig +++ b/boards/arm/stm32/stm3210e-eval/configs/usbmsc/defconfig @@ -24,7 +24,6 @@ CONFIG_MMCSD_SDIO=y CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x20000000 CONFIG_RR_INTERVAL=200 @@ -56,4 +55,3 @@ CONFIG_USBMSC_PRODUCTSTR="USBdev Storage" CONFIG_USBMSC_REMOVABLE=y CONFIG_USBMSC_VERSIONNO=0x0399 CONFIG_USER_ENTRYPOINT="msconn_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32/stm3210e-eval/configs/usbserial/defconfig b/boards/arm/stm32/stm3210e-eval/configs/usbserial/defconfig index a66a5f7b97d..c300811633d 100644 --- a/boards/arm/stm32/stm3210e-eval/configs/usbserial/defconfig +++ b/boards/arm/stm32/stm3210e-eval/configs/usbserial/defconfig @@ -28,7 +28,6 @@ CONFIG_PL2303_RXBUFSIZE=512 CONFIG_PL2303_TXBUFSIZE=512 CONFIG_PL2303_VENDORSTR="Nuttx" CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x20000000 CONFIG_RR_INTERVAL=200 @@ -45,4 +44,3 @@ CONFIG_STM32_USB=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="usbserial_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32/stm3220g-eval/configs/dhcpd/defconfig b/boards/arm/stm32/stm3220g-eval/configs/dhcpd/defconfig index c0261aeebed..cc7dda09395 100644 --- a/boards/arm/stm32/stm3220g-eval/configs/dhcpd/defconfig +++ b/boards/arm/stm32/stm3220g-eval/configs/dhcpd/defconfig @@ -39,7 +39,6 @@ CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NSOCKET_DESCRIPTORS=10 CONFIG_NUNGET_CHARS=0 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=196608 CONFIG_RAM_START=0x20000000 CONFIG_RR_INTERVAL=200 @@ -65,4 +64,3 @@ CONFIG_USART3_RXBUFSIZE=128 CONFIG_USART3_SERIAL_CONSOLE=y CONFIG_USART3_TXBUFSIZE=128 CONFIG_USER_ENTRYPOINT="dhcpd_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32/stm3220g-eval/configs/nettest/defconfig b/boards/arm/stm32/stm3220g-eval/configs/nettest/defconfig index 665ee4f7830..cd48d7736d6 100644 --- a/boards/arm/stm32/stm3220g-eval/configs/nettest/defconfig +++ b/boards/arm/stm32/stm3220g-eval/configs/nettest/defconfig @@ -38,7 +38,6 @@ CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NSOCKET_DESCRIPTORS=10 CONFIG_NUNGET_CHARS=0 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=196608 CONFIG_RAM_START=0x20000000 CONFIG_RR_INTERVAL=200 @@ -64,4 +63,3 @@ CONFIG_USART3_RXBUFSIZE=128 CONFIG_USART3_SERIAL_CONSOLE=y CONFIG_USART3_TXBUFSIZE=128 CONFIG_USER_ENTRYPOINT="nettest_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32/stm3220g-eval/configs/nsh/defconfig b/boards/arm/stm32/stm3220g-eval/configs/nsh/defconfig index 6946d12242a..eae59c42ddb 100644 --- a/boards/arm/stm32/stm3220g-eval/configs/nsh/defconfig +++ b/boards/arm/stm32/stm3220g-eval/configs/nsh/defconfig @@ -51,7 +51,6 @@ CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_READLINE=y CONFIG_NSOCKET_DESCRIPTORS=10 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=196608 CONFIG_RAM_START=0x20000000 CONFIG_RR_INTERVAL=200 @@ -80,4 +79,3 @@ CONFIG_USART3_RXBUFSIZE=128 CONFIG_USART3_SERIAL_CONSOLE=y CONFIG_USART3_TXBUFSIZE=128 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32/stm3220g-eval/configs/nsh2/defconfig b/boards/arm/stm32/stm3220g-eval/configs/nsh2/defconfig index b4ec93f5cdb..946a2bcca2c 100644 --- a/boards/arm/stm32/stm3220g-eval/configs/nsh2/defconfig +++ b/boards/arm/stm32/stm3220g-eval/configs/nsh2/defconfig @@ -64,7 +64,6 @@ CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_NSOCKET_DESCRIPTORS=10 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAMLOG=y CONFIG_RAMLOG_SYSLOG=y CONFIG_RAM_SIZE=196608 @@ -95,4 +94,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_PING=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=2 diff --git a/boards/arm/stm32/stm3220g-eval/configs/nxwm/defconfig b/boards/arm/stm32/stm3220g-eval/configs/nxwm/defconfig index 1d8839a9755..12c7866771e 100644 --- a/boards/arm/stm32/stm3220g-eval/configs/nxwm/defconfig +++ b/boards/arm/stm32/stm3220g-eval/configs/nxwm/defconfig @@ -95,7 +95,6 @@ CONFIG_NX_BLOCKING=y CONFIG_NX_KBD=y CONFIG_NX_XYINPUT_TOUCHSCREEN=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=196608 CONFIG_RAM_START=0x20000000 CONFIG_RR_INTERVAL=200 @@ -131,4 +130,3 @@ CONFIG_USART3_RXBUFSIZE=128 CONFIG_USART3_SERIAL_CONSOLE=y CONFIG_USART3_TXBUFSIZE=128 CONFIG_USER_ENTRYPOINT="nxwm_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32/stm3220g-eval/configs/telnetd/defconfig b/boards/arm/stm32/stm3220g-eval/configs/telnetd/defconfig index 48d384d6259..b94e9fb8914 100644 --- a/boards/arm/stm32/stm3220g-eval/configs/telnetd/defconfig +++ b/boards/arm/stm32/stm3220g-eval/configs/telnetd/defconfig @@ -41,7 +41,6 @@ CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NSOCKET_DESCRIPTORS=10 CONFIG_NUNGET_CHARS=0 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=196608 CONFIG_RAM_START=0x20000000 CONFIG_RR_INTERVAL=200 @@ -66,4 +65,3 @@ CONFIG_USART3_RXBUFSIZE=128 CONFIG_USART3_SERIAL_CONSOLE=y CONFIG_USART3_TXBUFSIZE=128 CONFIG_USER_ENTRYPOINT="telnetd_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32/stm3240g-eval/configs/dhcpd/defconfig b/boards/arm/stm32/stm3240g-eval/configs/dhcpd/defconfig index 723333c4d1d..8c8543a0c91 100644 --- a/boards/arm/stm32/stm3240g-eval/configs/dhcpd/defconfig +++ b/boards/arm/stm32/stm3240g-eval/configs/dhcpd/defconfig @@ -40,7 +40,6 @@ CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NSOCKET_DESCRIPTORS=10 CONFIG_NUNGET_CHARS=0 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=196608 CONFIG_RAM_START=0x20000000 CONFIG_RR_INTERVAL=200 @@ -66,4 +65,3 @@ CONFIG_USART3_RXBUFSIZE=128 CONFIG_USART3_SERIAL_CONSOLE=y CONFIG_USART3_TXBUFSIZE=128 CONFIG_USER_ENTRYPOINT="dhcpd_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32/stm3240g-eval/configs/discover/defconfig b/boards/arm/stm32/stm3240g-eval/configs/discover/defconfig index 3cce2b95904..c2c9451ec6e 100644 --- a/boards/arm/stm32/stm3240g-eval/configs/discover/defconfig +++ b/boards/arm/stm32/stm3240g-eval/configs/discover/defconfig @@ -48,7 +48,6 @@ CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NSOCKET_DESCRIPTORS=10 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=196608 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -76,4 +75,3 @@ CONFIG_USART3_RXBUFSIZE=128 CONFIG_USART3_SERIAL_CONSOLE=y CONFIG_USART3_TXBUFSIZE=128 CONFIG_USER_ENTRYPOINT="discover_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32/stm3240g-eval/configs/fb/defconfig b/boards/arm/stm32/stm3240g-eval/configs/fb/defconfig index 89226134828..5ef04c53a4c 100644 --- a/boards/arm/stm32/stm3240g-eval/configs/fb/defconfig +++ b/boards/arm/stm32/stm3240g-eval/configs/fb/defconfig @@ -53,7 +53,6 @@ CONFIG_NXFONTS_DISABLE_8BPP=y CONFIG_PDCURSES_FONT_6X9=y CONFIG_PREALLOC_MQ_MSGS=8 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=196608 CONFIG_RAM_START=0x20000000 CONFIG_RR_INTERVAL=200 @@ -77,4 +76,3 @@ CONFIG_USART3_SERIAL_CONSOLE=y CONFIG_USART3_TXBUFSIZE=128 CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_VIDEO_FB=y -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32/stm3240g-eval/configs/knxwm/defconfig b/boards/arm/stm32/stm3240g-eval/configs/knxwm/defconfig index 5b8359fc956..7e8ff311493 100644 --- a/boards/arm/stm32/stm3240g-eval/configs/knxwm/defconfig +++ b/boards/arm/stm32/stm3240g-eval/configs/knxwm/defconfig @@ -72,7 +72,6 @@ CONFIG_NX_KBD=y CONFIG_NX_XYINPUT_TOUCHSCREEN=y CONFIG_PASS1_BUILDIR="boards/arm/stm32/stm3240g-eval/kernel" CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=196608 CONFIG_RAM_START=0x20000000 CONFIG_RR_INTERVAL=200 @@ -102,4 +101,3 @@ CONFIG_USART3_RXBUFSIZE=128 CONFIG_USART3_SERIAL_CONSOLE=y CONFIG_USART3_TXBUFSIZE=128 CONFIG_USER_ENTRYPOINT="nxwm_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32/stm3240g-eval/configs/nettest/defconfig b/boards/arm/stm32/stm3240g-eval/configs/nettest/defconfig index 020f79aeaa3..64277bce89d 100644 --- a/boards/arm/stm32/stm3240g-eval/configs/nettest/defconfig +++ b/boards/arm/stm32/stm3240g-eval/configs/nettest/defconfig @@ -40,7 +40,6 @@ CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NSOCKET_DESCRIPTORS=10 CONFIG_NUNGET_CHARS=0 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=196608 CONFIG_RAM_START=0x20000000 CONFIG_RR_INTERVAL=200 @@ -66,4 +65,3 @@ CONFIG_USART3_RXBUFSIZE=128 CONFIG_USART3_SERIAL_CONSOLE=y CONFIG_USART3_TXBUFSIZE=128 CONFIG_USER_ENTRYPOINT="nettest_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32/stm3240g-eval/configs/nsh/defconfig b/boards/arm/stm32/stm3240g-eval/configs/nsh/defconfig index 106c4499177..bc5762a9311 100644 --- a/boards/arm/stm32/stm3240g-eval/configs/nsh/defconfig +++ b/boards/arm/stm32/stm3240g-eval/configs/nsh/defconfig @@ -57,7 +57,6 @@ CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_NSOCKET_DESCRIPTORS=10 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=196608 CONFIG_RAM_START=0x20000000 CONFIG_RR_INTERVAL=200 @@ -87,4 +86,3 @@ CONFIG_USART3_RXBUFSIZE=128 CONFIG_USART3_SERIAL_CONSOLE=y CONFIG_USART3_TXBUFSIZE=128 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32/stm3240g-eval/configs/nsh2/defconfig b/boards/arm/stm32/stm3240g-eval/configs/nsh2/defconfig index fecae4d4fd2..1dad245cb36 100644 --- a/boards/arm/stm32/stm3240g-eval/configs/nsh2/defconfig +++ b/boards/arm/stm32/stm3240g-eval/configs/nsh2/defconfig @@ -65,7 +65,6 @@ CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_NSOCKET_DESCRIPTORS=10 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAMLOG=y CONFIG_RAMLOG_SYSLOG=y CONFIG_RAM_SIZE=196608 @@ -97,4 +96,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_PING=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=2 diff --git a/boards/arm/stm32/stm3240g-eval/configs/nxterm/defconfig b/boards/arm/stm32/stm3240g-eval/configs/nxterm/defconfig index ce2edae4702..d8e5e6b6581 100644 --- a/boards/arm/stm32/stm3240g-eval/configs/nxterm/defconfig +++ b/boards/arm/stm32/stm3240g-eval/configs/nxterm/defconfig @@ -80,7 +80,6 @@ CONFIG_NX_KBD=y CONFIG_NX_XYINPUT_MOUSE=y CONFIG_PREALLOC_MQ_MSGS=8 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=196608 CONFIG_RAM_START=0x20000000 CONFIG_RR_INTERVAL=200 @@ -110,4 +109,3 @@ CONFIG_USART3_RXBUFSIZE=128 CONFIG_USART3_SERIAL_CONSOLE=y CONFIG_USART3_TXBUFSIZE=128 CONFIG_USER_ENTRYPOINT="nxterm_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32/stm3240g-eval/configs/nxwm/defconfig b/boards/arm/stm32/stm3240g-eval/configs/nxwm/defconfig index a2cc3da6d46..5cb10ca3e7e 100644 --- a/boards/arm/stm32/stm3240g-eval/configs/nxwm/defconfig +++ b/boards/arm/stm32/stm3240g-eval/configs/nxwm/defconfig @@ -92,7 +92,6 @@ CONFIG_NX_BLOCKING=y CONFIG_NX_KBD=y CONFIG_NX_XYINPUT_TOUCHSCREEN=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=196608 CONFIG_RAM_START=0x20000000 CONFIG_RR_INTERVAL=200 @@ -128,4 +127,3 @@ CONFIG_USART3_RXBUFSIZE=128 CONFIG_USART3_SERIAL_CONSOLE=y CONFIG_USART3_TXBUFSIZE=128 CONFIG_USER_ENTRYPOINT="nxwm_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32/stm3240g-eval/configs/telnetd/defconfig b/boards/arm/stm32/stm3240g-eval/configs/telnetd/defconfig index 750abe9cffb..4d30892f493 100644 --- a/boards/arm/stm32/stm3240g-eval/configs/telnetd/defconfig +++ b/boards/arm/stm32/stm3240g-eval/configs/telnetd/defconfig @@ -42,7 +42,6 @@ CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NSOCKET_DESCRIPTORS=10 CONFIG_NUNGET_CHARS=0 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=196608 CONFIG_RAM_START=0x20000000 CONFIG_RR_INTERVAL=200 @@ -67,4 +66,3 @@ CONFIG_USART3_RXBUFSIZE=128 CONFIG_USART3_SERIAL_CONSOLE=y CONFIG_USART3_TXBUFSIZE=128 CONFIG_USER_ENTRYPOINT="telnetd_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32/stm3240g-eval/configs/webserver/defconfig b/boards/arm/stm32/stm3240g-eval/configs/webserver/defconfig index f34755d46bc..c2b4ee3856e 100644 --- a/boards/arm/stm32/stm3240g-eval/configs/webserver/defconfig +++ b/boards/arm/stm32/stm3240g-eval/configs/webserver/defconfig @@ -53,7 +53,6 @@ CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_NSOCKET_DESCRIPTORS=10 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=196608 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -82,4 +81,3 @@ CONFIG_USART3_RXBUFSIZE=128 CONFIG_USART3_SERIAL_CONSOLE=y CONFIG_USART3_TXBUFSIZE=128 CONFIG_USER_ENTRYPOINT="webserver_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32/stm3240g-eval/configs/xmlrpc/defconfig b/boards/arm/stm32/stm3240g-eval/configs/xmlrpc/defconfig index e6b388bc903..d49cba1237a 100644 --- a/boards/arm/stm32/stm3240g-eval/configs/xmlrpc/defconfig +++ b/boards/arm/stm32/stm3240g-eval/configs/xmlrpc/defconfig @@ -47,7 +47,6 @@ CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NSOCKET_DESCRIPTORS=10 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=196608 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -76,4 +75,3 @@ CONFIG_USART3_SERIAL_CONSOLE=y CONFIG_USART3_TXBUFSIZE=128 CONFIG_USERMAIN_STACKSIZE=4096 CONFIG_USER_ENTRYPOINT="xmlrpc_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32/stm32_tiny/configs/nsh/defconfig b/boards/arm/stm32/stm32_tiny/configs/nsh/defconfig index 25e0b25219b..c9f19be22ab 100644 --- a/boards/arm/stm32/stm32_tiny/configs/nsh/defconfig +++ b/boards/arm/stm32/stm32_tiny/configs/nsh/defconfig @@ -38,7 +38,6 @@ CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=1024 CONFIG_NSH_LINELEN=80 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=20480 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -60,5 +59,4 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 CONFIG_WL_NRF24L01=y diff --git a/boards/arm/stm32/stm32_tiny/configs/usbnsh/defconfig b/boards/arm/stm32/stm32_tiny/configs/usbnsh/defconfig index 19c19c8d839..ae04cf6f29c 100644 --- a/boards/arm/stm32/stm32_tiny/configs/usbnsh/defconfig +++ b/boards/arm/stm32/stm32_tiny/configs/usbnsh/defconfig @@ -41,7 +41,6 @@ CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=1024 CONFIG_NSH_LINELEN=80 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=6 CONFIG_RAM_SIZE=20480 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -61,4 +60,3 @@ CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USBDEV_TRACE=y CONFIG_USBDEV_TRACE_NRECORDS=32 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32/stm32butterfly2/configs/nsh/defconfig b/boards/arm/stm32/stm32butterfly2/configs/nsh/defconfig index 55c1289a535..711fd2222c5 100644 --- a/boards/arm/stm32/stm32butterfly2/configs/nsh/defconfig +++ b/boards/arm/stm32/stm32butterfly2/configs/nsh/defconfig @@ -49,7 +49,6 @@ CONFIG_NSH_MOTD_STRING="stm32butterfly2 welcoms you" CONFIG_NSH_READLINE=y CONFIG_NSH_STRERROR=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -77,4 +76,3 @@ CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USBHOST_HIDKBD=y CONFIG_USBHOST_MSC=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32/stm32butterfly2/configs/nshnet/defconfig b/boards/arm/stm32/stm32butterfly2/configs/nshnet/defconfig index 73adfd2e5fa..730b7983286 100644 --- a/boards/arm/stm32/stm32butterfly2/configs/nshnet/defconfig +++ b/boards/arm/stm32/stm32butterfly2/configs/nshnet/defconfig @@ -63,7 +63,6 @@ CONFIG_NSH_READLINE=y CONFIG_NSH_STRERROR=y CONFIG_PL2303=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -98,4 +97,3 @@ CONFIG_USBDEV=y CONFIG_USBDEV_BUSPOWERED=y CONFIG_USBDEV_MAXPOWER=500 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32/stm32butterfly2/configs/nshusbdev/defconfig b/boards/arm/stm32/stm32butterfly2/configs/nshusbdev/defconfig index 4aa7dacc1ea..03acbc77554 100644 --- a/boards/arm/stm32/stm32butterfly2/configs/nshusbdev/defconfig +++ b/boards/arm/stm32/stm32butterfly2/configs/nshusbdev/defconfig @@ -48,7 +48,6 @@ CONFIG_NSH_READLINE=y CONFIG_NSH_STRERROR=y CONFIG_PL2303=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -76,4 +75,3 @@ CONFIG_USBDEV=y CONFIG_USBDEV_BUSPOWERED=y CONFIG_USBDEV_MAXPOWER=500 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32/stm32butterfly2/configs/nshusbhost/defconfig b/boards/arm/stm32/stm32butterfly2/configs/nshusbhost/defconfig index 55c1289a535..711fd2222c5 100644 --- a/boards/arm/stm32/stm32butterfly2/configs/nshusbhost/defconfig +++ b/boards/arm/stm32/stm32butterfly2/configs/nshusbhost/defconfig @@ -49,7 +49,6 @@ CONFIG_NSH_MOTD_STRING="stm32butterfly2 welcoms you" CONFIG_NSH_READLINE=y CONFIG_NSH_STRERROR=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -77,4 +76,3 @@ CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USBHOST_HIDKBD=y CONFIG_USBHOST_MSC=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32/stm32f103-minimum/configs/apds9960/defconfig b/boards/arm/stm32/stm32f103-minimum/configs/apds9960/defconfig index a9b9c8acc6f..dec5c7e0e01 100644 --- a/boards/arm/stm32/stm32f103-minimum/configs/apds9960/defconfig +++ b/boards/arm/stm32/stm32f103-minimum/configs/apds9960/defconfig @@ -38,7 +38,6 @@ CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=1024 CONFIG_NSH_LINELEN=80 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_PTHREAD_STACK_MIN=512 CONFIG_RAM_SIZE=20480 CONFIG_RAM_START=0x20000000 @@ -64,4 +63,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32/stm32f103-minimum/configs/audio_tone/defconfig b/boards/arm/stm32/stm32f103-minimum/configs/audio_tone/defconfig index a661154869a..eb84abc54e9 100644 --- a/boards/arm/stm32/stm32f103-minimum/configs/audio_tone/defconfig +++ b/boards/arm/stm32/stm32f103-minimum/configs/audio_tone/defconfig @@ -38,7 +38,6 @@ CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=1024 CONFIG_NSH_LINELEN=80 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_PWM=y CONFIG_RAM_SIZE=20480 CONFIG_RAM_START=0x20000000 @@ -66,4 +65,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32/stm32f103-minimum/configs/buttons/defconfig b/boards/arm/stm32/stm32f103-minimum/configs/buttons/defconfig index bddaaa50380..ab1d2e9cb9c 100644 --- a/boards/arm/stm32/stm32f103-minimum/configs/buttons/defconfig +++ b/boards/arm/stm32/stm32f103-minimum/configs/buttons/defconfig @@ -43,7 +43,6 @@ CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=1024 CONFIG_NSH_LINELEN=80 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=20480 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -64,4 +63,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32/stm32f103-minimum/configs/hello/defconfig b/boards/arm/stm32/stm32f103-minimum/configs/hello/defconfig index 667f612703b..d2493ab99be 100644 --- a/boards/arm/stm32/stm32f103-minimum/configs/hello/defconfig +++ b/boards/arm/stm32/stm32f103-minimum/configs/hello/defconfig @@ -44,7 +44,6 @@ CONFIG_NSH_FILEIOSIZE=64 CONFIG_NSH_LINELEN=80 CONFIG_NUNGET_CHARS=0 CONFIG_PREALLOC_TIMERS=0 -CONFIG_PREALLOC_WDOGS=4 CONFIG_PTHREAD_STACK_DEFAULT=1536 CONFIG_RAM_SIZE=20480 CONFIG_RAM_START=0x20000000 @@ -66,4 +65,3 @@ CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536 CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USERMAIN_STACKSIZE=1536 CONFIG_USER_ENTRYPOINT="hello_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32/stm32f103-minimum/configs/jlx12864g/defconfig b/boards/arm/stm32/stm32f103-minimum/configs/jlx12864g/defconfig index ec4b7bdf9b8..c0ceadbe55f 100644 --- a/boards/arm/stm32/stm32f103-minimum/configs/jlx12864g/defconfig +++ b/boards/arm/stm32/stm32f103-minimum/configs/jlx12864g/defconfig @@ -48,7 +48,6 @@ CONFIG_NXTK_BORDERWIDTH=1 CONFIG_NX_BLOCKING=y CONFIG_NX_WRITEONLY=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=20480 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -71,4 +70,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32/stm32f103-minimum/configs/lcd1602/defconfig b/boards/arm/stm32/stm32f103-minimum/configs/lcd1602/defconfig index 4aec01b4a32..bb4c0513c89 100644 --- a/boards/arm/stm32/stm32f103-minimum/configs/lcd1602/defconfig +++ b/boards/arm/stm32/stm32f103-minimum/configs/lcd1602/defconfig @@ -42,7 +42,6 @@ CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=1024 CONFIG_NSH_LINELEN=80 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=20480 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -66,4 +65,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32/stm32f103-minimum/configs/mcp2515/defconfig b/boards/arm/stm32/stm32f103-minimum/configs/mcp2515/defconfig index 3f441b8ab45..23a3c45fd1f 100644 --- a/boards/arm/stm32/stm32f103-minimum/configs/mcp2515/defconfig +++ b/boards/arm/stm32/stm32f103-minimum/configs/mcp2515/defconfig @@ -43,7 +43,6 @@ CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=1024 CONFIG_NSH_LINELEN=80 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=20480 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -64,4 +63,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32/stm32f103-minimum/configs/nrf24/defconfig b/boards/arm/stm32/stm32f103-minimum/configs/nrf24/defconfig index 06af68b9275..6a3ee0c626f 100644 --- a/boards/arm/stm32/stm32f103-minimum/configs/nrf24/defconfig +++ b/boards/arm/stm32/stm32f103-minimum/configs/nrf24/defconfig @@ -37,7 +37,6 @@ CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=1024 CONFIG_NSH_LINELEN=80 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=20480 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -59,5 +58,4 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 CONFIG_WL_NRF24L01=y diff --git a/boards/arm/stm32/stm32f103-minimum/configs/nsh/defconfig b/boards/arm/stm32/stm32f103-minimum/configs/nsh/defconfig index 0a53512d212..023a305403c 100644 --- a/boards/arm/stm32/stm32f103-minimum/configs/nsh/defconfig +++ b/boards/arm/stm32/stm32f103-minimum/configs/nsh/defconfig @@ -34,7 +34,6 @@ CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=1024 CONFIG_NSH_LINELEN=80 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=20480 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -55,4 +54,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32/stm32f103-minimum/configs/pwm/defconfig b/boards/arm/stm32/stm32f103-minimum/configs/pwm/defconfig index eab20c84792..b4de3c58d9c 100644 --- a/boards/arm/stm32/stm32f103-minimum/configs/pwm/defconfig +++ b/boards/arm/stm32/stm32f103-minimum/configs/pwm/defconfig @@ -36,7 +36,6 @@ CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=1024 CONFIG_NSH_LINELEN=80 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_PWM=y CONFIG_RAM_SIZE=20480 CONFIG_RAM_START=0x20000000 @@ -62,4 +61,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32/stm32f103-minimum/configs/rfid-rc522/defconfig b/boards/arm/stm32/stm32f103-minimum/configs/rfid-rc522/defconfig index 3f6fb7a7cb7..b8fc7dbc2aa 100644 --- a/boards/arm/stm32/stm32f103-minimum/configs/rfid-rc522/defconfig +++ b/boards/arm/stm32/stm32f103-minimum/configs/rfid-rc522/defconfig @@ -38,7 +38,6 @@ CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=1024 CONFIG_NSH_LINELEN=80 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=20480 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -60,4 +59,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32/stm32f103-minimum/configs/rgbled/defconfig b/boards/arm/stm32/stm32f103-minimum/configs/rgbled/defconfig index 7c54ac6bef4..94fb3cadf9b 100644 --- a/boards/arm/stm32/stm32f103-minimum/configs/rgbled/defconfig +++ b/boards/arm/stm32/stm32f103-minimum/configs/rgbled/defconfig @@ -36,7 +36,6 @@ CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=1024 CONFIG_NSH_LINELEN=80 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_PWM=y CONFIG_RAM_SIZE=20480 CONFIG_RAM_START=0x20000000 @@ -74,4 +73,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32/stm32f103-minimum/configs/usbnsh/defconfig b/boards/arm/stm32/stm32f103-minimum/configs/usbnsh/defconfig index 50a4fc85702..49bcaceab80 100644 --- a/boards/arm/stm32/stm32f103-minimum/configs/usbnsh/defconfig +++ b/boards/arm/stm32/stm32f103-minimum/configs/usbnsh/defconfig @@ -41,7 +41,6 @@ CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=1024 CONFIG_NSH_LINELEN=80 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=6 CONFIG_RAM_SIZE=20480 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -60,4 +59,3 @@ CONFIG_TASK_NAME_SIZE=0 CONFIG_USBDEV_TRACE=y CONFIG_USBDEV_TRACE_NRECORDS=32 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32/stm32f103-minimum/configs/userled/defconfig b/boards/arm/stm32/stm32f103-minimum/configs/userled/defconfig index 0a8cbb59ffc..75f15c0942a 100644 --- a/boards/arm/stm32/stm32f103-minimum/configs/userled/defconfig +++ b/boards/arm/stm32/stm32f103-minimum/configs/userled/defconfig @@ -38,7 +38,6 @@ CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=1024 CONFIG_NSH_LINELEN=80 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=20480 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -61,4 +60,3 @@ CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USERLED=y CONFIG_USERLED_LOWER=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32/stm32f103-minimum/configs/veml6070/defconfig b/boards/arm/stm32/stm32f103-minimum/configs/veml6070/defconfig index 1e6ba0589bc..183aa2db9f6 100644 --- a/boards/arm/stm32/stm32f103-minimum/configs/veml6070/defconfig +++ b/boards/arm/stm32/stm32f103-minimum/configs/veml6070/defconfig @@ -36,7 +36,6 @@ CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=1024 CONFIG_NSH_LINELEN=80 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=20480 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -60,4 +59,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32/stm32f334-disco/configs/buckboost/defconfig b/boards/arm/stm32/stm32f334-disco/configs/buckboost/defconfig index d0d23f8f896..f546a0284ee 100644 --- a/boards/arm/stm32/stm32f334-disco/configs/buckboost/defconfig +++ b/boards/arm/stm32/stm32f334-disco/configs/buckboost/defconfig @@ -93,7 +93,6 @@ CONFIG_NSH_READLINE=y CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=512 CONFIG_POWER=y CONFIG_PREALLOC_TIMERS=2 -CONFIG_PREALLOC_WDOGS=1 CONFIG_PTHREAD_STACK_DEFAULT=1024 CONFIG_PTHREAD_STACK_MIN=1024 CONFIG_RAM_SIZE=12288 @@ -140,4 +139,3 @@ CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=512 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USERMAIN_STACKSIZE=1024 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32/stm32f334-disco/configs/nsh/defconfig b/boards/arm/stm32/stm32f334-disco/configs/nsh/defconfig index 3e81c2daa86..8ad8cd09dc8 100644 --- a/boards/arm/stm32/stm32f334-disco/configs/nsh/defconfig +++ b/boards/arm/stm32/stm32f334-disco/configs/nsh/defconfig @@ -77,7 +77,6 @@ CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=512 CONFIG_PREALLOC_TIMERS=2 -CONFIG_PREALLOC_WDOGS=1 CONFIG_PTHREAD_STACK_DEFAULT=1024 CONFIG_PTHREAD_STACK_MIN=1024 CONFIG_RAM_SIZE=12288 @@ -99,4 +98,3 @@ CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=512 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USERMAIN_STACKSIZE=1024 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32/stm32f334-disco/configs/powerled/defconfig b/boards/arm/stm32/stm32f334-disco/configs/powerled/defconfig index dcd266b89d2..d6a8733ebf7 100644 --- a/boards/arm/stm32/stm32f334-disco/configs/powerled/defconfig +++ b/boards/arm/stm32/stm32f334-disco/configs/powerled/defconfig @@ -84,7 +84,6 @@ CONFIG_NSH_MAXARGUMENTS=16 CONFIG_NSH_READLINE=y CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=512 CONFIG_PREALLOC_TIMERS=2 -CONFIG_PREALLOC_WDOGS=1 CONFIG_PTHREAD_STACK_DEFAULT=1024 CONFIG_PTHREAD_STACK_MIN=1024 CONFIG_RAM_SIZE=12288 @@ -126,4 +125,3 @@ CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=512 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USERMAIN_STACKSIZE=1024 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32/stm32f3discovery/configs/nsh/defconfig b/boards/arm/stm32/stm32f3discovery/configs/nsh/defconfig index e9ee751ef88..eb6b5d20e93 100644 --- a/boards/arm/stm32/stm32f3discovery/configs/nsh/defconfig +++ b/boards/arm/stm32/stm32f3discovery/configs/nsh/defconfig @@ -34,7 +34,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=40960 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -55,4 +54,3 @@ CONFIG_USART2_RXBUFSIZE=128 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USART2_TXBUFSIZE=128 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32/stm32f3discovery/configs/usbnsh/defconfig b/boards/arm/stm32/stm32f3discovery/configs/usbnsh/defconfig index 0de43efbb3a..c30d8cfa13d 100644 --- a/boards/arm/stm32/stm32f3discovery/configs/usbnsh/defconfig +++ b/boards/arm/stm32/stm32f3discovery/configs/usbnsh/defconfig @@ -39,7 +39,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=40960 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -58,4 +57,3 @@ CONFIG_SYSLOG_DEVPATH="/dev/ttyS0" CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32/stm32f411-minimum/configs/nsh/defconfig b/boards/arm/stm32/stm32f411-minimum/configs/nsh/defconfig index 59a779e6fbc..63a3294dbf6 100644 --- a/boards/arm/stm32/stm32f411-minimum/configs/nsh/defconfig +++ b/boards/arm/stm32/stm32f411-minimum/configs/nsh/defconfig @@ -33,7 +33,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=131072 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -50,4 +49,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32/stm32f411e-disco/configs/nsh/defconfig b/boards/arm/stm32/stm32f411e-disco/configs/nsh/defconfig index 5b478d5c9cd..f74d589d81f 100644 --- a/boards/arm/stm32/stm32f411e-disco/configs/nsh/defconfig +++ b/boards/arm/stm32/stm32f411e-disco/configs/nsh/defconfig @@ -34,7 +34,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=131072 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -51,4 +50,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32/stm32f429i-disco/configs/adc/defconfig b/boards/arm/stm32/stm32f429i-disco/configs/adc/defconfig index ec8ebf587fb..9a552b2bcd9 100644 --- a/boards/arm/stm32/stm32f429i-disco/configs/adc/defconfig +++ b/boards/arm/stm32/stm32f429i-disco/configs/adc/defconfig @@ -39,7 +39,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -66,4 +65,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32/stm32f429i-disco/configs/extflash/defconfig b/boards/arm/stm32/stm32f429i-disco/configs/extflash/defconfig index 060a37ea365..7368d8c19b8 100644 --- a/boards/arm/stm32/stm32f429i-disco/configs/extflash/defconfig +++ b/boards/arm/stm32/stm32f429i-disco/configs/extflash/defconfig @@ -41,7 +41,6 @@ CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PLATFORM_CONFIGDATA=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -69,4 +68,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32/stm32f429i-disco/configs/fb/defconfig b/boards/arm/stm32/stm32f429i-disco/configs/fb/defconfig index 5f6c0f40373..aeda81d552f 100644 --- a/boards/arm/stm32/stm32f429i-disco/configs/fb/defconfig +++ b/boards/arm/stm32/stm32f429i-disco/configs/fb/defconfig @@ -44,7 +44,6 @@ CONFIG_NSH_LINELEN=128 CONFIG_NSH_MAXARGUMENTS=17 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -83,4 +82,3 @@ CONFIG_TASK_NAME_SIZE=0 CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_VIDEO_FB=y -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32/stm32f429i-disco/configs/highpri/defconfig b/boards/arm/stm32/stm32f429i-disco/configs/highpri/defconfig index 39ce4b9369d..c06b20c8907 100644 --- a/boards/arm/stm32/stm32f429i-disco/configs/highpri/defconfig +++ b/boards/arm/stm32/stm32f429i-disco/configs/highpri/defconfig @@ -30,7 +30,6 @@ CONFIG_MM_REGIONS=2 CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_PWM=y CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 @@ -63,4 +62,3 @@ CONFIG_SYSTEM_READLINE=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="highpri_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32/stm32f429i-disco/configs/lcd/defconfig b/boards/arm/stm32/stm32f429i-disco/configs/lcd/defconfig index 8d4fcf32a14..bc5e80116b0 100644 --- a/boards/arm/stm32/stm32f429i-disco/configs/lcd/defconfig +++ b/boards/arm/stm32/stm32f429i-disco/configs/lcd/defconfig @@ -46,7 +46,6 @@ CONFIG_NX=y CONFIG_NXFONT_MONO5X8=y CONFIG_NX_BLOCKING=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -69,4 +68,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32/stm32f429i-disco/configs/lvgl/defconfig b/boards/arm/stm32/stm32f429i-disco/configs/lvgl/defconfig index 3342e1b929a..b2cf9e46118 100644 --- a/boards/arm/stm32/stm32f429i-disco/configs/lvgl/defconfig +++ b/boards/arm/stm32/stm32f429i-disco/configs/lvgl/defconfig @@ -47,7 +47,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -81,4 +80,3 @@ CONFIG_TASK_NAME_SIZE=0 CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_VIDEO_FB=y -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32/stm32f429i-disco/configs/nsh/defconfig b/boards/arm/stm32/stm32f429i-disco/configs/nsh/defconfig index cb284596397..9862d5843e9 100644 --- a/boards/arm/stm32/stm32f429i-disco/configs/nsh/defconfig +++ b/boards/arm/stm32/stm32f429i-disco/configs/nsh/defconfig @@ -33,7 +33,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -54,4 +53,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32/stm32f429i-disco/configs/nxhello/defconfig b/boards/arm/stm32/stm32f429i-disco/configs/nxhello/defconfig index f235af83f2a..047eb0cbf14 100644 --- a/boards/arm/stm32/stm32f429i-disco/configs/nxhello/defconfig +++ b/boards/arm/stm32/stm32f429i-disco/configs/nxhello/defconfig @@ -48,7 +48,6 @@ CONFIG_NX_BLOCKING=y CONFIG_NX_WRITEONLY=y CONFIG_NX_XYINPUT_TOUCHSCREEN=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=214688 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -80,4 +79,3 @@ CONFIG_TASK_NAME_SIZE=0 CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_VIDEO_FB=y -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32/stm32f429i-disco/configs/nxwm/defconfig b/boards/arm/stm32/stm32f429i-disco/configs/nxwm/defconfig index afc935cba7b..0844b5a7120 100644 --- a/boards/arm/stm32/stm32f429i-disco/configs/nxwm/defconfig +++ b/boards/arm/stm32/stm32f429i-disco/configs/nxwm/defconfig @@ -83,7 +83,6 @@ CONFIG_NX_BLOCKING=y CONFIG_NX_KBD=y CONFIG_NX_XYINPUT_TOUCHSCREEN=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -115,4 +114,3 @@ CONFIG_TASK_NAME_SIZE=0 CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nxwm_main" CONFIG_VIDEO_FB=y -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32/stm32f429i-disco/configs/usbmsc/defconfig b/boards/arm/stm32/stm32f429i-disco/configs/usbmsc/defconfig index 397eccdbe86..ea6da9a0a5a 100644 --- a/boards/arm/stm32/stm32f429i-disco/configs/usbmsc/defconfig +++ b/boards/arm/stm32/stm32f429i-disco/configs/usbmsc/defconfig @@ -35,7 +35,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -61,4 +60,3 @@ CONFIG_TASK_NAME_SIZE=0 CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USBHOST_MSC=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32/stm32f429i-disco/configs/usbnsh/defconfig b/boards/arm/stm32/stm32f429i-disco/configs/usbnsh/defconfig index 679cb953ffc..2a50bb64279 100644 --- a/boards/arm/stm32/stm32f429i-disco/configs/usbnsh/defconfig +++ b/boards/arm/stm32/stm32f429i-disco/configs/usbnsh/defconfig @@ -43,7 +43,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -66,4 +65,3 @@ CONFIG_SYSTEM_RAMTEST=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USBDEV=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32/stm32f4discovery/configs/audio/defconfig b/boards/arm/stm32/stm32f4discovery/configs/audio/defconfig index a56d44b186b..7db7f385e36 100644 --- a/boards/arm/stm32/stm32f4discovery/configs/audio/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/audio/defconfig @@ -46,7 +46,6 @@ CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_NXPLAYER_DEFAULT_MEDIADIR="/mnt/music" CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y diff --git a/boards/arm/stm32/stm32f4discovery/configs/canard/defconfig b/boards/arm/stm32/stm32f4discovery/configs/canard/defconfig index 60670770c11..87f2ff63766 100644 --- a/boards/arm/stm32/stm32f4discovery/configs/canard/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/canard/defconfig @@ -36,7 +36,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y diff --git a/boards/arm/stm32/stm32f4discovery/configs/cxxtest/defconfig b/boards/arm/stm32/stm32f4discovery/configs/cxxtest/defconfig index 2a467d0c4d8..dc93aa12917 100644 --- a/boards/arm/stm32/stm32f4discovery/configs/cxxtest/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/cxxtest/defconfig @@ -26,7 +26,6 @@ CONFIG_MM_REGIONS=2 CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -46,4 +45,3 @@ CONFIG_USART2_RXBUFSIZE=128 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USART2_TXBUFSIZE=128 CONFIG_USER_ENTRYPOINT="cxxtest_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32/stm32f4discovery/configs/elf/defconfig b/boards/arm/stm32/stm32f4discovery/configs/elf/defconfig index aa56cc78292..2075a2c3d3a 100644 --- a/boards/arm/stm32/stm32f4discovery/configs/elf/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/elf/defconfig @@ -31,7 +31,6 @@ CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_PATH_INITIAL="/mnt/romfs" CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -47,4 +46,3 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USERMAIN_STACKSIZE=4096 CONFIG_USER_ENTRYPOINT="elf_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32/stm32f4discovery/configs/hciuart/defconfig b/boards/arm/stm32/stm32f4discovery/configs/hciuart/defconfig index b67ca6a4c83..16cac5c9951 100644 --- a/boards/arm/stm32/stm32f4discovery/configs/hciuart/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/hciuart/defconfig @@ -56,7 +56,6 @@ CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_MQ_MSGS=64 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y diff --git a/boards/arm/stm32/stm32f4discovery/configs/ipv6/defconfig b/boards/arm/stm32/stm32f4discovery/configs/ipv6/defconfig index 2320d04f184..e21697baa21 100644 --- a/boards/arm/stm32/stm32f4discovery/configs/ipv6/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/ipv6/defconfig @@ -58,7 +58,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y diff --git a/boards/arm/stm32/stm32f4discovery/configs/kostest/defconfig b/boards/arm/stm32/stm32f4discovery/configs/kostest/defconfig index 8bf46741299..746ae24dee5 100644 --- a/boards/arm/stm32/stm32f4discovery/configs/kostest/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/kostest/defconfig @@ -29,7 +29,6 @@ CONFIG_NFILE_STREAMS=8 CONFIG_NUTTX_USERSPACE=0x08020000 CONFIG_PASS1_BUILDIR="boards/arm/stm32/stm32f4discovery/kernel" CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -50,4 +49,3 @@ CONFIG_USART2_RXBUFSIZE=128 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USART2_TXBUFSIZE=128 CONFIG_USER_ENTRYPOINT="ostest_main" -CONFIG_WDOG_INTRESERVE=2 diff --git a/boards/arm/stm32/stm32f4discovery/configs/max31855/defconfig b/boards/arm/stm32/stm32f4discovery/configs/max31855/defconfig index 7171721e561..fa4183d48de 100644 --- a/boards/arm/stm32/stm32f4discovery/configs/max31855/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/max31855/defconfig @@ -35,7 +35,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y diff --git a/boards/arm/stm32/stm32f4discovery/configs/max7219/defconfig b/boards/arm/stm32/stm32f4discovery/configs/max7219/defconfig index 2bd76f9db79..8fd04653643 100644 --- a/boards/arm/stm32/stm32f4discovery/configs/max7219/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/max7219/defconfig @@ -66,7 +66,6 @@ CONFIG_NX_BLOCKING=y CONFIG_NX_MXCLIENTMSGS=32 CONFIG_PREALLOC_MQ_MSGS=16 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y diff --git a/boards/arm/stm32/stm32f4discovery/configs/mmcsdspi/defconfig b/boards/arm/stm32/stm32f4discovery/configs/mmcsdspi/defconfig index 69de73e9179..2e3587f1a23 100644 --- a/boards/arm/stm32/stm32f4discovery/configs/mmcsdspi/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/mmcsdspi/defconfig @@ -49,7 +49,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y diff --git a/boards/arm/stm32/stm32f4discovery/configs/module/defconfig b/boards/arm/stm32/stm32f4discovery/configs/module/defconfig index e223c7a947d..f7b1ddde224 100644 --- a/boards/arm/stm32/stm32f4discovery/configs/module/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/module/defconfig @@ -36,7 +36,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y diff --git a/boards/arm/stm32/stm32f4discovery/configs/netnsh/defconfig b/boards/arm/stm32/stm32f4discovery/configs/netnsh/defconfig index 36febb813a2..ea61af3212f 100644 --- a/boards/arm/stm32/stm32f4discovery/configs/netnsh/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/netnsh/defconfig @@ -63,7 +63,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y diff --git a/boards/arm/stm32/stm32f4discovery/configs/nsh/defconfig b/boards/arm/stm32/stm32f4discovery/configs/nsh/defconfig index c496bf8f61a..c0013abf4a2 100644 --- a/boards/arm/stm32/stm32f4discovery/configs/nsh/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/nsh/defconfig @@ -35,7 +35,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y diff --git a/boards/arm/stm32/stm32f4discovery/configs/nxlines/defconfig b/boards/arm/stm32/stm32f4discovery/configs/nxlines/defconfig index 0c5ba60ce50..00155edc4ef 100644 --- a/boards/arm/stm32/stm32f4discovery/configs/nxlines/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/nxlines/defconfig @@ -55,7 +55,6 @@ CONFIG_NX_BLOCKING=y CONFIG_NX_KBD=y CONFIG_NX_XYINPUT_MOUSE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -75,4 +74,3 @@ CONFIG_USART2_RXBUFSIZE=128 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USART2_TXBUFSIZE=128 CONFIG_USER_ENTRYPOINT="nxlines_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32/stm32f4discovery/configs/pm/defconfig b/boards/arm/stm32/stm32f4discovery/configs/pm/defconfig index 3bdd1b9bcac..344dfd3dec6 100644 --- a/boards/arm/stm32/stm32f4discovery/configs/pm/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/pm/defconfig @@ -36,7 +36,6 @@ CONFIG_NSH_READLINE=y CONFIG_PM=y CONFIG_PM_BUTTONS=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -58,4 +57,3 @@ CONFIG_USART2_RXBUFSIZE=128 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USART2_TXBUFSIZE=128 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32/stm32f4discovery/configs/posix_spawn/defconfig b/boards/arm/stm32/stm32f4discovery/configs/posix_spawn/defconfig index 47e14bbbf5a..59e661b880f 100644 --- a/boards/arm/stm32/stm32f4discovery/configs/posix_spawn/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/posix_spawn/defconfig @@ -34,7 +34,6 @@ CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_PATH_INITIAL="/mnt/romfs" CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -51,4 +50,3 @@ CONFIG_USART2_RXBUFSIZE=128 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USART2_TXBUFSIZE=128 CONFIG_USER_ENTRYPOINT="posix_spawn_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32/stm32f4discovery/configs/pseudoterm/defconfig b/boards/arm/stm32/stm32f4discovery/configs/pseudoterm/defconfig index 087058160de..e124b3a736e 100644 --- a/boards/arm/stm32/stm32f4discovery/configs/pseudoterm/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/pseudoterm/defconfig @@ -34,7 +34,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_PSEUDOTERM=y CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 diff --git a/boards/arm/stm32/stm32f4discovery/configs/rgbled/defconfig b/boards/arm/stm32/stm32f4discovery/configs/rgbled/defconfig index 81d7f99a58e..94af3117b96 100644 --- a/boards/arm/stm32/stm32f4discovery/configs/rgbled/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/rgbled/defconfig @@ -34,7 +34,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_PWM=y CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 diff --git a/boards/arm/stm32/stm32f4discovery/configs/rndis/defconfig b/boards/arm/stm32/stm32f4discovery/configs/rndis/defconfig index 87ce7bcfd71..b353824611f 100644 --- a/boards/arm/stm32/stm32f4discovery/configs/rndis/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/rndis/defconfig @@ -72,7 +72,6 @@ CONFIG_NSH_READLINE=y CONFIG_NSH_TELNETD_CLIENTSTACKSIZE=3072 CONFIG_PATH_INITIAL="/mnt/nfs/bin" CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y diff --git a/boards/arm/stm32/stm32f4discovery/configs/testlibcxx/defconfig b/boards/arm/stm32/stm32f4discovery/configs/testlibcxx/defconfig index d0db3831c5a..2d206a2b035 100644 --- a/boards/arm/stm32/stm32f4discovery/configs/testlibcxx/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/testlibcxx/defconfig @@ -33,7 +33,6 @@ CONFIG_NFILE_STREAMS=8 CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -53,4 +52,3 @@ CONFIG_USART2_RXBUFSIZE=128 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USART2_TXBUFSIZE=128 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32/stm32f4discovery/configs/usbmsc/defconfig b/boards/arm/stm32/stm32f4discovery/configs/usbmsc/defconfig index 50831f3aec6..2a107ddd893 100644 --- a/boards/arm/stm32/stm32f4discovery/configs/usbmsc/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/usbmsc/defconfig @@ -35,7 +35,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -62,4 +61,3 @@ CONFIG_USBDEV=y CONFIG_USBMSC=y CONFIG_USBMSC_REMOVABLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32/stm32f4discovery/configs/usbnsh/defconfig b/boards/arm/stm32/stm32f4discovery/configs/usbnsh/defconfig index 3891d1530a4..417a85830a7 100644 --- a/boards/arm/stm32/stm32f4discovery/configs/usbnsh/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/usbnsh/defconfig @@ -38,7 +38,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -57,4 +56,3 @@ CONFIG_SYSLOG_DEVPATH="/dev/ttyS0" CONFIG_SYSTEM_NSH=y CONFIG_USBDEV=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32/stm32f4discovery/configs/wifi/defconfig b/boards/arm/stm32/stm32f4discovery/configs/wifi/defconfig index cc7574dba53..cc979cfa667 100644 --- a/boards/arm/stm32/stm32f4discovery/configs/wifi/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/wifi/defconfig @@ -72,7 +72,6 @@ CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PATH_INITIAL="/mnt/sd0/bin" CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y diff --git a/boards/arm/stm32/stm32f4discovery/configs/winbuild/defconfig b/boards/arm/stm32/stm32f4discovery/configs/winbuild/defconfig index 4f9dfd9746c..31bcf625bca 100644 --- a/boards/arm/stm32/stm32f4discovery/configs/winbuild/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/winbuild/defconfig @@ -25,7 +25,6 @@ CONFIG_MM_REGIONS=2 CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -44,5 +43,4 @@ CONFIG_USART2_RXBUFSIZE=128 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USART2_TXBUFSIZE=128 CONFIG_USER_ENTRYPOINT="ostest_main" -CONFIG_WDOG_INTRESERVE=0 CONFIG_WINDOWS_NATIVE=y diff --git a/boards/arm/stm32/stm32f4discovery/configs/xen1210/defconfig b/boards/arm/stm32/stm32f4discovery/configs/xen1210/defconfig index 5816ee771d2..993f63f0151 100644 --- a/boards/arm/stm32/stm32f4discovery/configs/xen1210/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/xen1210/defconfig @@ -33,7 +33,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_PWM=y CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 diff --git a/boards/arm/stm32/stm32ldiscovery/configs/chrono/defconfig b/boards/arm/stm32/stm32ldiscovery/configs/chrono/defconfig index 5b653ca2828..6b80c427381 100644 --- a/boards/arm/stm32/stm32ldiscovery/configs/chrono/defconfig +++ b/boards/arm/stm32/stm32ldiscovery/configs/chrono/defconfig @@ -51,7 +51,6 @@ CONFIG_NSH_DISABLE_UMOUNT=y CONFIG_NSH_FILEIOSIZE=64 CONFIG_NUNGET_CHARS=0 CONFIG_PREALLOC_TIMERS=0 -CONFIG_PREALLOC_WDOGS=4 CONFIG_PTHREAD_STACK_DEFAULT=1536 CONFIG_RAM_SIZE=16384 CONFIG_RAM_START=0x20000000 @@ -75,4 +74,3 @@ CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536 CONFIG_TLS_NELEM=0 CONFIG_USERMAIN_STACKSIZE=1536 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32/stm32ldiscovery/configs/nsh/defconfig b/boards/arm/stm32/stm32ldiscovery/configs/nsh/defconfig index c7108ba0020..4eba952aada 100644 --- a/boards/arm/stm32/stm32ldiscovery/configs/nsh/defconfig +++ b/boards/arm/stm32/stm32ldiscovery/configs/nsh/defconfig @@ -39,7 +39,6 @@ CONFIG_NSH_DISABLE_UMOUNT=y CONFIG_NSH_FILEIOSIZE=64 CONFIG_NUNGET_CHARS=0 CONFIG_PREALLOC_TIMERS=0 -CONFIG_PREALLOC_WDOGS=4 CONFIG_PTHREAD_STACK_DEFAULT=1536 CONFIG_RAM_SIZE=16384 CONFIG_RAM_START=0x20000000 @@ -64,4 +63,3 @@ CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USART1_TXBUFSIZE=64 CONFIG_USERMAIN_STACKSIZE=1536 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32/stm32vldiscovery/configs/nsh/defconfig b/boards/arm/stm32/stm32vldiscovery/configs/nsh/defconfig index 55325ecc6c8..db1d53bedb6 100644 --- a/boards/arm/stm32/stm32vldiscovery/configs/nsh/defconfig +++ b/boards/arm/stm32/stm32vldiscovery/configs/nsh/defconfig @@ -39,7 +39,6 @@ CONFIG_NFILE_DESCRIPTORS=4 CONFIG_NFILE_STREAMS=4 CONFIG_NSH_BUILTIN_APPS=y CONFIG_PREALLOC_TIMERS=0 -CONFIG_PREALLOC_WDOGS=4 CONFIG_PTHREAD_STACK_DEFAULT=128 CONFIG_PTHREAD_STACK_MIN=128 CONFIG_RAM_SIZE=8192 @@ -62,4 +61,3 @@ CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USART1_TXBUFSIZE=128 CONFIG_USERMAIN_STACKSIZE=768 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32/viewtool-stm32f107/configs/ft80x/defconfig b/boards/arm/stm32/viewtool-stm32f107/configs/ft80x/defconfig index 64d35731a37..0023fac6ec8 100644 --- a/boards/arm/stm32/viewtool-stm32f107/configs/ft80x/defconfig +++ b/boards/arm/stm32/viewtool-stm32f107/configs/ft80x/defconfig @@ -30,7 +30,6 @@ CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x20000000 CONFIG_RR_INTERVAL=200 @@ -47,4 +46,3 @@ CONFIG_STM32_USART1=y CONFIG_SYSTEM_NSH=y CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32/viewtool-stm32f107/configs/highpri/defconfig b/boards/arm/stm32/viewtool-stm32f107/configs/highpri/defconfig index e2a845b928a..508d863ea43 100644 --- a/boards/arm/stm32/viewtool-stm32f107/configs/highpri/defconfig +++ b/boards/arm/stm32/viewtool-stm32f107/configs/highpri/defconfig @@ -22,7 +22,6 @@ CONFIG_MAX_TASKS=16 CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x20000000 CONFIG_RR_INTERVAL=200 @@ -41,4 +40,3 @@ CONFIG_TASK_NAME_SIZE=0 CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="highpri_main" CONFIG_VIEWTOOL_HIGHPRI=y -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32/viewtool-stm32f107/configs/netnsh/defconfig b/boards/arm/stm32/viewtool-stm32f107/configs/netnsh/defconfig index ca5b55b6b44..5dc32321696 100644 --- a/boards/arm/stm32/viewtool-stm32f107/configs/netnsh/defconfig +++ b/boards/arm/stm32/viewtool-stm32f107/configs/netnsh/defconfig @@ -54,7 +54,6 @@ CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_READLINE=y CONFIG_NSOCKET_DESCRIPTORS=10 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x20000000 CONFIG_RR_INTERVAL=200 @@ -79,4 +78,3 @@ CONFIG_SYSTEM_PING=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=2 diff --git a/boards/arm/stm32/viewtool-stm32f107/configs/nsh/defconfig b/boards/arm/stm32/viewtool-stm32f107/configs/nsh/defconfig index 95fb8b6dae3..63d4da6c8d5 100644 --- a/boards/arm/stm32/viewtool-stm32f107/configs/nsh/defconfig +++ b/boards/arm/stm32/viewtool-stm32f107/configs/nsh/defconfig @@ -25,7 +25,6 @@ CONFIG_NFILE_STREAMS=8 CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x20000000 CONFIG_RR_INTERVAL=200 @@ -43,4 +42,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32/viewtool-stm32f107/configs/tcpblaster/defconfig b/boards/arm/stm32/viewtool-stm32f107/configs/tcpblaster/defconfig index da144f61fa4..3c3cd1ce7dd 100644 --- a/boards/arm/stm32/viewtool-stm32f107/configs/tcpblaster/defconfig +++ b/boards/arm/stm32/viewtool-stm32f107/configs/tcpblaster/defconfig @@ -48,7 +48,6 @@ CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_READLINE=y CONFIG_NSOCKET_DESCRIPTORS=10 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x20000000 CONFIG_RR_INTERVAL=200 @@ -70,4 +69,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_PING=y CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=2 diff --git a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/adc/defconfig b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/adc/defconfig index 0c688324f13..5c041bc2b99 100644 --- a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/adc/defconfig +++ b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/adc/defconfig @@ -38,7 +38,6 @@ CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_NUNGET_CHARS=0 CONFIG_PREALLOC_TIMERS=0 -CONFIG_PREALLOC_WDOGS=4 CONFIG_PTHREAD_MUTEX_UNSAFE=y CONFIG_PTHREAD_STACK_DEFAULT=1536 CONFIG_RAM_SIZE=20480 @@ -63,4 +62,3 @@ CONFIG_TLS_NELEM=0 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USERMAIN_STACKSIZE=1536 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/nsh/defconfig b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/nsh/defconfig index 92d1d7ba176..750b7e7dfc9 100644 --- a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/nsh/defconfig +++ b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/nsh/defconfig @@ -34,7 +34,6 @@ CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_NUNGET_CHARS=0 CONFIG_PREALLOC_TIMERS=0 -CONFIG_PREALLOC_WDOGS=4 CONFIG_PTHREAD_MUTEX_UNSAFE=y CONFIG_PTHREAD_STACK_DEFAULT=1536 CONFIG_RAM_SIZE=20480 @@ -56,4 +55,3 @@ CONFIG_TLS_NELEM=0 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USERMAIN_STACKSIZE=1536 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/nxlines_oled/defconfig b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/nxlines_oled/defconfig index 27332cff18a..567dcecb007 100644 --- a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/nxlines_oled/defconfig +++ b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/nxlines_oled/defconfig @@ -44,7 +44,6 @@ CONFIG_NX=y CONFIG_NXFONT_MONO5X8=y CONFIG_NX_BLOCKING=y CONFIG_PREALLOC_TIMERS=0 -CONFIG_PREALLOC_WDOGS=4 CONFIG_PTHREAD_MUTEX_UNSAFE=y CONFIG_PTHREAD_STACK_DEFAULT=1536 CONFIG_RAM_SIZE=20480 @@ -68,4 +67,3 @@ CONFIG_TLS_NELEM=0 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USERMAIN_STACKSIZE=1536 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/sx127x/defconfig b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/sx127x/defconfig index 9f95dd8cd5f..0bb14e50d48 100644 --- a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/sx127x/defconfig +++ b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/sx127x/defconfig @@ -43,7 +43,6 @@ CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_NUNGET_CHARS=0 CONFIG_PREALLOC_TIMERS=0 -CONFIG_PREALLOC_WDOGS=4 CONFIG_PTHREAD_MUTEX_UNSAFE=y CONFIG_PTHREAD_STACK_DEFAULT=1536 CONFIG_RAM_SIZE=20480 @@ -67,4 +66,3 @@ CONFIG_TLS_NELEM=0 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USERMAIN_STACKSIZE=1536 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32f0l0g0/nucleo-f072rb/configs/nsh/defconfig b/boards/arm/stm32f0l0g0/nucleo-f072rb/configs/nsh/defconfig index a32ddf7cc51..c79fd174f21 100644 --- a/boards/arm/stm32f0l0g0/nucleo-f072rb/configs/nsh/defconfig +++ b/boards/arm/stm32f0l0g0/nucleo-f072rb/configs/nsh/defconfig @@ -41,7 +41,6 @@ CONFIG_NSH_DISABLE_UMOUNT=y CONFIG_NSH_FILEIOSIZE=64 CONFIG_NUNGET_CHARS=0 CONFIG_PREALLOC_TIMERS=0 -CONFIG_PREALLOC_WDOGS=4 CONFIG_PTHREAD_STACK_DEFAULT=1536 CONFIG_RAM_SIZE=16384 CONFIG_RAM_START=0x20000000 @@ -64,4 +63,3 @@ CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USART2_TXBUFSIZE=32 CONFIG_USERMAIN_STACKSIZE=1536 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32f0l0g0/nucleo-f091rc/configs/nsh/defconfig b/boards/arm/stm32f0l0g0/nucleo-f091rc/configs/nsh/defconfig index 6c79a34c4a8..f9bc083533b 100644 --- a/boards/arm/stm32f0l0g0/nucleo-f091rc/configs/nsh/defconfig +++ b/boards/arm/stm32f0l0g0/nucleo-f091rc/configs/nsh/defconfig @@ -43,7 +43,6 @@ CONFIG_NSH_DISABLE_UMOUNT=y CONFIG_NSH_FILEIOSIZE=64 CONFIG_NUNGET_CHARS=0 CONFIG_PREALLOC_TIMERS=0 -CONFIG_PREALLOC_WDOGS=4 CONFIG_PTHREAD_STACK_DEFAULT=1536 CONFIG_RAM_SIZE=32768 CONFIG_RAM_START=0x20000000 @@ -64,4 +63,3 @@ CONFIG_TLS_NELEM=0 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USERMAIN_STACKSIZE=1536 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32f0l0g0/nucleo-f091rc/configs/sx127x/defconfig b/boards/arm/stm32f0l0g0/nucleo-f091rc/configs/sx127x/defconfig index d9a7cb7d90a..2776e9e4dd5 100644 --- a/boards/arm/stm32f0l0g0/nucleo-f091rc/configs/sx127x/defconfig +++ b/boards/arm/stm32f0l0g0/nucleo-f091rc/configs/sx127x/defconfig @@ -42,7 +42,6 @@ CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_NUNGET_CHARS=0 CONFIG_PREALLOC_TIMERS=0 -CONFIG_PREALLOC_WDOGS=4 CONFIG_PTHREAD_MUTEX_UNSAFE=y CONFIG_PTHREAD_STACK_DEFAULT=1536 CONFIG_RAM_SIZE=20480 @@ -67,4 +66,3 @@ CONFIG_TLS_NELEM=0 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USERMAIN_STACKSIZE=1536 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32f0l0g0/nucleo-g070rb/configs/nsh/defconfig b/boards/arm/stm32f0l0g0/nucleo-g070rb/configs/nsh/defconfig index f57681a959c..43cb1e55319 100644 --- a/boards/arm/stm32f0l0g0/nucleo-g070rb/configs/nsh/defconfig +++ b/boards/arm/stm32f0l0g0/nucleo-g070rb/configs/nsh/defconfig @@ -48,7 +48,6 @@ CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_NUNGET_CHARS=0 CONFIG_PREALLOC_TIMERS=0 -CONFIG_PREALLOC_WDOGS=4 CONFIG_PTHREAD_MUTEX_UNSAFE=y CONFIG_PTHREAD_STACK_DEFAULT=1536 CONFIG_RAM_SIZE=20480 @@ -111,4 +110,3 @@ CONFIG_TLS_NELEM=0 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USERMAIN_STACKSIZE=1536 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32f0l0g0/nucleo-g071rb/configs/nsh/defconfig b/boards/arm/stm32f0l0g0/nucleo-g071rb/configs/nsh/defconfig index cf6eeaa8d62..ec81775419c 100644 --- a/boards/arm/stm32f0l0g0/nucleo-g071rb/configs/nsh/defconfig +++ b/boards/arm/stm32f0l0g0/nucleo-g071rb/configs/nsh/defconfig @@ -32,7 +32,6 @@ CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_NUNGET_CHARS=0 CONFIG_PREALLOC_TIMERS=0 -CONFIG_PREALLOC_WDOGS=4 CONFIG_PTHREAD_MUTEX_UNSAFE=y CONFIG_PTHREAD_STACK_DEFAULT=1536 CONFIG_RAM_SIZE=20480 @@ -54,4 +53,3 @@ CONFIG_TLS_NELEM=0 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USERMAIN_STACKSIZE=1536 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32f0l0g0/nucleo-l073rz/configs/nsh/defconfig b/boards/arm/stm32f0l0g0/nucleo-l073rz/configs/nsh/defconfig index 558e67385f0..5f4b00b4cc2 100644 --- a/boards/arm/stm32f0l0g0/nucleo-l073rz/configs/nsh/defconfig +++ b/boards/arm/stm32f0l0g0/nucleo-l073rz/configs/nsh/defconfig @@ -34,7 +34,6 @@ CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_NUNGET_CHARS=0 CONFIG_PREALLOC_TIMERS=0 -CONFIG_PREALLOC_WDOGS=4 CONFIG_PTHREAD_MUTEX_UNSAFE=y CONFIG_PTHREAD_STACK_DEFAULT=1536 CONFIG_RAM_SIZE=20480 @@ -56,4 +55,3 @@ CONFIG_TLS_NELEM=0 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USERMAIN_STACKSIZE=1536 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32f0l0g0/nucleo-l073rz/configs/sx127x/defconfig b/boards/arm/stm32f0l0g0/nucleo-l073rz/configs/sx127x/defconfig index 9ea77246d39..4ab2d6260e0 100644 --- a/boards/arm/stm32f0l0g0/nucleo-l073rz/configs/sx127x/defconfig +++ b/boards/arm/stm32f0l0g0/nucleo-l073rz/configs/sx127x/defconfig @@ -43,7 +43,6 @@ CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_NUNGET_CHARS=0 CONFIG_PREALLOC_TIMERS=0 -CONFIG_PREALLOC_WDOGS=4 CONFIG_PTHREAD_MUTEX_UNSAFE=y CONFIG_PTHREAD_STACK_DEFAULT=1536 CONFIG_RAM_SIZE=20480 @@ -67,4 +66,3 @@ CONFIG_TLS_NELEM=0 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USERMAIN_STACKSIZE=1536 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32f0l0g0/stm32f051-discovery/configs/nsh/defconfig b/boards/arm/stm32f0l0g0/stm32f051-discovery/configs/nsh/defconfig index cf1143b8344..22d398c22fb 100644 --- a/boards/arm/stm32f0l0g0/stm32f051-discovery/configs/nsh/defconfig +++ b/boards/arm/stm32f0l0g0/stm32f051-discovery/configs/nsh/defconfig @@ -37,7 +37,6 @@ CONFIG_NSH_DISABLE_UMOUNT=y CONFIG_NSH_FILEIOSIZE=64 CONFIG_NUNGET_CHARS=0 CONFIG_PREALLOC_TIMERS=0 -CONFIG_PREALLOC_WDOGS=4 CONFIG_PTHREAD_STACK_DEFAULT=1536 CONFIG_RAM_SIZE=8192 CONFIG_RAM_START=0x20000000 @@ -60,4 +59,3 @@ CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USART1_TXBUFSIZE=32 CONFIG_USERMAIN_STACKSIZE=1536 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32f0l0g0/stm32f072-discovery/configs/nsh/defconfig b/boards/arm/stm32f0l0g0/stm32f072-discovery/configs/nsh/defconfig index 2ee4baad256..64bc07b48e5 100644 --- a/boards/arm/stm32f0l0g0/stm32f072-discovery/configs/nsh/defconfig +++ b/boards/arm/stm32f0l0g0/stm32f072-discovery/configs/nsh/defconfig @@ -37,7 +37,6 @@ CONFIG_NSH_DISABLE_UMOUNT=y CONFIG_NSH_FILEIOSIZE=64 CONFIG_NUNGET_CHARS=0 CONFIG_PREALLOC_TIMERS=0 -CONFIG_PREALLOC_WDOGS=4 CONFIG_PTHREAD_STACK_DEFAULT=1536 CONFIG_RAM_SIZE=8192 CONFIG_RAM_START=0x20000000 @@ -60,4 +59,3 @@ CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USART1_TXBUFSIZE=32 CONFIG_USERMAIN_STACKSIZE=1536 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32f7/nucleo-144/configs/f722-nsh/defconfig b/boards/arm/stm32f7/nucleo-144/configs/f722-nsh/defconfig index 193d11e830a..a6bef9f5c56 100644 --- a/boards/arm/stm32f7/nucleo-144/configs/f722-nsh/defconfig +++ b/boards/arm/stm32f7/nucleo-144/configs/f722-nsh/defconfig @@ -34,7 +34,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=245760 CONFIG_RAM_START=0x20010000 CONFIG_RAW_BINARY=y @@ -53,4 +52,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART6_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32f7/nucleo-144/configs/f746-evalos/defconfig b/boards/arm/stm32f7/nucleo-144/configs/f746-evalos/defconfig index 54995a18576..e28e09019d5 100644 --- a/boards/arm/stm32f7/nucleo-144/configs/f746-evalos/defconfig +++ b/boards/arm/stm32f7/nucleo-144/configs/f746-evalos/defconfig @@ -40,7 +40,6 @@ CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_NUCLEO_CONSOLE_VIRTUAL=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_PRIORITY_INHERITANCE=y CONFIG_RAM_SIZE=245760 CONFIG_RAM_START=0x20010000 @@ -66,4 +65,3 @@ CONFIG_USART3_SERIAL_CONSOLE=y CONFIG_USERLED=y CONFIG_USERLED_LOWER=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32f7/nucleo-144/configs/f746-nsh/defconfig b/boards/arm/stm32f7/nucleo-144/configs/f746-nsh/defconfig index b274415942c..62cb8d56a2a 100644 --- a/boards/arm/stm32f7/nucleo-144/configs/f746-nsh/defconfig +++ b/boards/arm/stm32f7/nucleo-144/configs/f746-nsh/defconfig @@ -35,7 +35,6 @@ CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_NUCLEO_CONSOLE_VIRTUAL=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=245760 CONFIG_RAM_START=0x20010000 CONFIG_RAW_BINARY=y @@ -54,4 +53,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART3_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32f7/nucleo-144/configs/f767-evalos/defconfig b/boards/arm/stm32f7/nucleo-144/configs/f767-evalos/defconfig index d7fa041f062..48d5c1ef47a 100644 --- a/boards/arm/stm32f7/nucleo-144/configs/f767-evalos/defconfig +++ b/boards/arm/stm32f7/nucleo-144/configs/f767-evalos/defconfig @@ -40,7 +40,6 @@ CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_NUCLEO_CONSOLE_VIRTUAL=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_PRIORITY_INHERITANCE=y CONFIG_RAM_SIZE=245760 CONFIG_RAM_START=0x20010000 @@ -66,4 +65,3 @@ CONFIG_USART3_SERIAL_CONSOLE=y CONFIG_USERLED=y CONFIG_USERLED_LOWER=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32f7/nucleo-144/configs/f767-netnsh/defconfig b/boards/arm/stm32f7/nucleo-144/configs/f767-netnsh/defconfig index 20c161fe46d..85e6b32c66d 100644 --- a/boards/arm/stm32f7/nucleo-144/configs/f767-netnsh/defconfig +++ b/boards/arm/stm32f7/nucleo-144/configs/f767-netnsh/defconfig @@ -55,7 +55,6 @@ CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_NUCLEO_CONSOLE_VIRTUAL=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=245760 CONFIG_RAM_START=0x20010000 CONFIG_RAW_BINARY=y @@ -84,4 +83,3 @@ CONFIG_SYSTEM_PING=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART3_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32f7/nucleo-144/configs/f767-nsh/defconfig b/boards/arm/stm32f7/nucleo-144/configs/f767-nsh/defconfig index 0c9f06a309d..d9d6fcb18fd 100644 --- a/boards/arm/stm32f7/nucleo-144/configs/f767-nsh/defconfig +++ b/boards/arm/stm32f7/nucleo-144/configs/f767-nsh/defconfig @@ -35,7 +35,6 @@ CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_NUCLEO_CONSOLE_VIRTUAL=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=245760 CONFIG_RAM_START=0x20010000 CONFIG_RAW_BINARY=y @@ -51,4 +50,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART3_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32f7/stm32f746-ws/configs/nsh/defconfig b/boards/arm/stm32f7/stm32f746-ws/configs/nsh/defconfig index e5d9a5e9689..df3b8c94558 100644 --- a/boards/arm/stm32f7/stm32f746-ws/configs/nsh/defconfig +++ b/boards/arm/stm32f7/stm32f746-ws/configs/nsh/defconfig @@ -61,7 +61,6 @@ CONFIG_NSH_NESTDEPTH=8 CONFIG_NSH_READLINE=y CONFIG_PIPES=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_PTHREAD_STACK_MIN=512 CONFIG_RAM_SIZE=245760 CONFIG_RAM_START=0x20010000 @@ -100,4 +99,3 @@ CONFIG_USEC_PER_TICK=1000 CONFIG_USERMAIN_STACKSIZE=2500 CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WATCHDOG=y -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32f7/stm32f746g-disco/configs/fb/defconfig b/boards/arm/stm32f7/stm32f746g-disco/configs/fb/defconfig index dac16937ae1..6fbd66d17b9 100644 --- a/boards/arm/stm32f7/stm32f746g-disco/configs/fb/defconfig +++ b/boards/arm/stm32f7/stm32f746g-disco/configs/fb/defconfig @@ -43,7 +43,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=245760 CONFIG_RAM_START=0x20010000 CONFIG_RAW_BINARY=y @@ -64,4 +63,3 @@ CONFIG_TASK_NAME_SIZE=0 CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_VIDEO_FB=y -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32f7/stm32f746g-disco/configs/lvgl/defconfig b/boards/arm/stm32f7/stm32f746g-disco/configs/lvgl/defconfig index 9db0e4fc268..31b198e07d4 100644 --- a/boards/arm/stm32f7/stm32f746g-disco/configs/lvgl/defconfig +++ b/boards/arm/stm32f7/stm32f746g-disco/configs/lvgl/defconfig @@ -49,7 +49,6 @@ CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=245760 CONFIG_RAM_START=0x20010000 CONFIG_RAW_BINARY=y @@ -67,4 +66,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_VIDEO_FB=y -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32f7/stm32f746g-disco/configs/netnsh/defconfig b/boards/arm/stm32f7/stm32f746g-disco/configs/netnsh/defconfig index 7c8937bb1ef..8e535ec0737 100644 --- a/boards/arm/stm32f7/stm32f746g-disco/configs/netnsh/defconfig +++ b/boards/arm/stm32f7/stm32f746g-disco/configs/netnsh/defconfig @@ -57,7 +57,6 @@ CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PIPES=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_PTHREAD_MUTEX_TYPES=y CONFIG_RAM_SIZE=245760 CONFIG_RAM_START=0x20010000 @@ -82,4 +81,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32f7/stm32f746g-disco/configs/nsh/defconfig b/boards/arm/stm32f7/stm32f746g-disco/configs/nsh/defconfig index f53eccf2817..fb0b3f84cea 100644 --- a/boards/arm/stm32f7/stm32f746g-disco/configs/nsh/defconfig +++ b/boards/arm/stm32f7/stm32f746g-disco/configs/nsh/defconfig @@ -37,7 +37,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=245760 CONFIG_RAM_START=0x20010000 CONFIG_RAW_BINARY=y @@ -53,4 +52,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART6_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32f7/stm32f746g-disco/configs/nxdemo/defconfig b/boards/arm/stm32f7/stm32f746g-disco/configs/nxdemo/defconfig index bf479e71689..1ad6be5c1c6 100644 --- a/boards/arm/stm32f7/stm32f746g-disco/configs/nxdemo/defconfig +++ b/boards/arm/stm32f7/stm32f746g-disco/configs/nxdemo/defconfig @@ -53,7 +53,6 @@ CONFIG_NX=y CONFIG_NXFONT_SANS28X37=y CONFIG_NX_BLOCKING=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=245760 CONFIG_RAM_START=0x20010000 CONFIG_RAW_BINARY=y @@ -69,4 +68,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_VIDEO_FB=y -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32f7/stm32f746g-disco/configs/nxterm/defconfig b/boards/arm/stm32f7/stm32f746g-disco/configs/nxterm/defconfig index 966aef23897..f31a9daa2e4 100644 --- a/boards/arm/stm32f7/stm32f746g-disco/configs/nxterm/defconfig +++ b/boards/arm/stm32f7/stm32f746g-disco/configs/nxterm/defconfig @@ -46,7 +46,6 @@ CONFIG_NXFONT_SANS17X22=y CONFIG_NXTERM=y CONFIG_NX_BLOCKING=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=245760 CONFIG_RAM_START=0x20010000 CONFIG_RAW_BINARY=y @@ -62,4 +61,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_VIDEO_FB=y -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32f7/stm32f769i-disco/configs/netnsh/defconfig b/boards/arm/stm32f7/stm32f769i-disco/configs/netnsh/defconfig index 6a155521edd..1cc901186b0 100644 --- a/boards/arm/stm32f7/stm32f769i-disco/configs/netnsh/defconfig +++ b/boards/arm/stm32f7/stm32f769i-disco/configs/netnsh/defconfig @@ -54,7 +54,6 @@ CONFIG_NSH_LINELEN=64 CONFIG_NSH_MOTD=y CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=376832 CONFIG_RAM_START=0x20020000 CONFIG_RAW_BINARY=y @@ -90,4 +89,3 @@ CONFIG_SYSTEM_PING=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32f7/stm32f769i-disco/configs/nsh/defconfig b/boards/arm/stm32f7/stm32f769i-disco/configs/nsh/defconfig index b319eb5a34d..efb96d78348 100644 --- a/boards/arm/stm32f7/stm32f769i-disco/configs/nsh/defconfig +++ b/boards/arm/stm32f7/stm32f769i-disco/configs/nsh/defconfig @@ -35,7 +35,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=245760 CONFIG_RAM_START=0x20010000 CONFIG_RAW_BINARY=y @@ -49,4 +48,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32h7/nucleo-h743zi/configs/nsh/defconfig b/boards/arm/stm32h7/nucleo-h743zi/configs/nsh/defconfig index ee25b2842fc..d84532f14c3 100644 --- a/boards/arm/stm32h7/nucleo-h743zi/configs/nsh/defconfig +++ b/boards/arm/stm32h7/nucleo-h743zi/configs/nsh/defconfig @@ -35,7 +35,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=245760 CONFIG_RAM_START=0x20010000 CONFIG_RAW_BINARY=y @@ -51,4 +50,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART3_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32h7/nucleo-h743zi/configs/nxlines_oled/defconfig b/boards/arm/stm32h7/nucleo-h743zi/configs/nxlines_oled/defconfig index cf6b893d9f9..c0209b12fe7 100644 --- a/boards/arm/stm32h7/nucleo-h743zi/configs/nxlines_oled/defconfig +++ b/boards/arm/stm32h7/nucleo-h743zi/configs/nxlines_oled/defconfig @@ -53,7 +53,6 @@ CONFIG_NXFONTS_DISABLE_1BPP=y CONFIG_NXFONT_MONO5X8=y CONFIG_NX_BLOCKING=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=245760 CONFIG_RAM_START=0x20010000 CONFIG_RAW_BINARY=y @@ -69,4 +68,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART3_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32h7/nucleo-h743zi/configs/pwm/defconfig b/boards/arm/stm32h7/nucleo-h743zi/configs/pwm/defconfig index 38a030258bd..218d42bd08e 100644 --- a/boards/arm/stm32h7/nucleo-h743zi/configs/pwm/defconfig +++ b/boards/arm/stm32h7/nucleo-h743zi/configs/pwm/defconfig @@ -36,7 +36,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_PWM=y CONFIG_PWM_MULTICHAN=y CONFIG_PWM_NCHANNELS=4 @@ -69,4 +68,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART3_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32h7/stm32h747i-disco/configs/nsh/defconfig b/boards/arm/stm32h7/stm32h747i-disco/configs/nsh/defconfig index b7de5f58af2..5b4e0503e6a 100644 --- a/boards/arm/stm32h7/stm32h747i-disco/configs/nsh/defconfig +++ b/boards/arm/stm32h7/stm32h747i-disco/configs/nsh/defconfig @@ -35,7 +35,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=245760 CONFIG_RAM_START=0x20010000 CONFIG_RAW_BINARY=y @@ -51,4 +50,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/stm32l4/b-l475e-iot01a/configs/nsh/defconfig b/boards/arm/stm32l4/b-l475e-iot01a/configs/nsh/defconfig index 1ef69f175f0..4aab91a695b 100644 --- a/boards/arm/stm32l4/b-l475e-iot01a/configs/nsh/defconfig +++ b/boards/arm/stm32l4/b-l475e-iot01a/configs/nsh/defconfig @@ -36,7 +36,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y diff --git a/boards/arm/stm32l4/b-l475e-iot01a/configs/spirit-6lowpan/defconfig b/boards/arm/stm32l4/b-l475e-iot01a/configs/spirit-6lowpan/defconfig index c3cef00e399..9f14f5fdadb 100644 --- a/boards/arm/stm32l4/b-l475e-iot01a/configs/spirit-6lowpan/defconfig +++ b/boards/arm/stm32l4/b-l475e-iot01a/configs/spirit-6lowpan/defconfig @@ -75,7 +75,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y diff --git a/boards/arm/stm32l4/b-l475e-iot01a/configs/spirit-starhub/defconfig b/boards/arm/stm32l4/b-l475e-iot01a/configs/spirit-starhub/defconfig index 70cd861823f..e52fa3dc65b 100644 --- a/boards/arm/stm32l4/b-l475e-iot01a/configs/spirit-starhub/defconfig +++ b/boards/arm/stm32l4/b-l475e-iot01a/configs/spirit-starhub/defconfig @@ -66,7 +66,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y diff --git a/boards/arm/stm32l4/b-l475e-iot01a/configs/spirit-starpoint/defconfig b/boards/arm/stm32l4/b-l475e-iot01a/configs/spirit-starpoint/defconfig index 5e72af54065..0fdc6c13a45 100644 --- a/boards/arm/stm32l4/b-l475e-iot01a/configs/spirit-starpoint/defconfig +++ b/boards/arm/stm32l4/b-l475e-iot01a/configs/spirit-starpoint/defconfig @@ -77,7 +77,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y diff --git a/boards/arm/stm32l4/nucleo-l432kc/configs/nsh/defconfig b/boards/arm/stm32l4/nucleo-l432kc/configs/nsh/defconfig index a5cbf93dd2a..30d0b5135bf 100644 --- a/boards/arm/stm32l4/nucleo-l432kc/configs/nsh/defconfig +++ b/boards/arm/stm32l4/nucleo-l432kc/configs/nsh/defconfig @@ -37,7 +37,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -64,4 +63,3 @@ CONFIG_TASK_NAME_SIZE=0 CONFIG_TESTING_OSTEST=y CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32l4/nucleo-l432kc/configs/spwm/defconfig b/boards/arm/stm32l4/nucleo-l432kc/configs/spwm/defconfig index e01db9367e2..836f298f950 100644 --- a/boards/arm/stm32l4/nucleo-l432kc/configs/spwm/defconfig +++ b/boards/arm/stm32l4/nucleo-l432kc/configs/spwm/defconfig @@ -32,7 +32,6 @@ CONFIG_NFILE_STREAMS=8 CONFIG_NUCLEOL432KC_SPWM=y CONFIG_NUCLEOL432KC_SPWM_PWM_FREQ=200000 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -55,4 +54,3 @@ CONFIG_SYSTEM_READLINE=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="spwm_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32l4/nucleo-l452re/configs/nsh/defconfig b/boards/arm/stm32l4/nucleo-l452re/configs/nsh/defconfig index c7996a67f0d..0559b44c3ea 100644 --- a/boards/arm/stm32l4/nucleo-l452re/configs/nsh/defconfig +++ b/boards/arm/stm32l4/nucleo-l452re/configs/nsh/defconfig @@ -46,7 +46,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=131072 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -86,4 +85,3 @@ CONFIG_USART2_RXBUFSIZE=128 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USART2_TXBUFSIZE=128 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32l4/nucleo-l476rg/configs/nsh/defconfig b/boards/arm/stm32l4/nucleo-l476rg/configs/nsh/defconfig index a536cbbcc93..a0c2bb3fae3 100644 --- a/boards/arm/stm32l4/nucleo-l476rg/configs/nsh/defconfig +++ b/boards/arm/stm32l4/nucleo-l476rg/configs/nsh/defconfig @@ -37,7 +37,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=98304 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -64,4 +63,3 @@ CONFIG_TASK_NAME_SIZE=0 CONFIG_TESTING_OSTEST=y CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32l4/nucleo-l476rg/configs/nxdemo/defconfig b/boards/arm/stm32l4/nucleo-l476rg/configs/nxdemo/defconfig index 0587daa1857..b1f292dbe88 100644 --- a/boards/arm/stm32l4/nucleo-l476rg/configs/nxdemo/defconfig +++ b/boards/arm/stm32l4/nucleo-l476rg/configs/nxdemo/defconfig @@ -45,7 +45,6 @@ CONFIG_NX=y CONFIG_NXFONT_MONO5X8=y CONFIG_NX_BLOCKING=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=98304 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -73,4 +72,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32l4/nucleo-l496zg/configs/nsh/defconfig b/boards/arm/stm32l4/nucleo-l496zg/configs/nsh/defconfig index 6169654d923..9d045b65945 100644 --- a/boards/arm/stm32l4/nucleo-l496zg/configs/nsh/defconfig +++ b/boards/arm/stm32l4/nucleo-l496zg/configs/nsh/defconfig @@ -47,7 +47,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=98304 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -99,4 +98,3 @@ CONFIG_TASK_NAME_SIZE=0 CONFIG_TESTING_OSTEST=y CONFIG_USART3_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32l4/stm32l476-mdk/configs/nsh/defconfig b/boards/arm/stm32l4/stm32l476-mdk/configs/nsh/defconfig index 59a4337988a..383b084c108 100644 --- a/boards/arm/stm32l4/stm32l476-mdk/configs/nsh/defconfig +++ b/boards/arm/stm32l4/stm32l476-mdk/configs/nsh/defconfig @@ -42,7 +42,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=98304 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -69,4 +68,3 @@ CONFIG_USART3_SERIAL_CONSOLE=y CONFIG_USERLED=y CONFIG_USERLED_LOWER=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32l4/stm32l476vg-disco/configs/knsh/defconfig b/boards/arm/stm32l4/stm32l476vg-disco/configs/knsh/defconfig index a57ad2f6bea..3a882fd7eb7 100644 --- a/boards/arm/stm32l4/stm32l476vg-disco/configs/knsh/defconfig +++ b/boards/arm/stm32l4/stm32l476vg-disco/configs/knsh/defconfig @@ -49,7 +49,6 @@ CONFIG_NSH_READLINE=y CONFIG_NUTTX_USERSPACE=0x08020000 CONFIG_PASS1_BUILDIR="boards/arm/stm32l4/stm32l476vg-disco/kernel" CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=98304 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -76,4 +75,3 @@ CONFIG_SYS_RESERVED=8 CONFIG_TASK_NAME_SIZE=0 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32l4/stm32l476vg-disco/configs/nsh/defconfig b/boards/arm/stm32l4/stm32l476vg-disco/configs/nsh/defconfig index 2ae6eefb4fc..93da9d93a20 100644 --- a/boards/arm/stm32l4/stm32l476vg-disco/configs/nsh/defconfig +++ b/boards/arm/stm32l4/stm32l476vg-disco/configs/nsh/defconfig @@ -50,7 +50,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_READLINE=y CONFIG_NSH_ROMFSETC=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=98304 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -76,4 +75,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32l4/stm32l4r9ai-disco/configs/knsh/defconfig b/boards/arm/stm32l4/stm32l4r9ai-disco/configs/knsh/defconfig index 2c8614fb43e..086d817cd86 100644 --- a/boards/arm/stm32l4/stm32l4r9ai-disco/configs/knsh/defconfig +++ b/boards/arm/stm32l4/stm32l4r9ai-disco/configs/knsh/defconfig @@ -51,7 +51,6 @@ CONFIG_NSH_READLINE=y CONFIG_NUTTX_USERSPACE=0x08020000 CONFIG_PASS1_BUILDIR="boards/arm/stm32l4/stm32l4r9ai-disco/kernel" CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=98304 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -83,4 +82,3 @@ CONFIG_UART4_RXBUFSIZE=512 CONFIG_UART4_SERIAL_CONSOLE=y CONFIG_USERMAIN_STACKSIZE=3072 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/stm32l4/stm32l4r9ai-disco/configs/nsh/defconfig b/boards/arm/stm32l4/stm32l4r9ai-disco/configs/nsh/defconfig index 8a8387b5d1c..f6bc9309de6 100644 --- a/boards/arm/stm32l4/stm32l4r9ai-disco/configs/nsh/defconfig +++ b/boards/arm/stm32l4/stm32l4r9ai-disco/configs/nsh/defconfig @@ -51,7 +51,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_READLINE=y CONFIG_NSH_ROMFSETC=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=98304 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -82,4 +81,3 @@ CONFIG_UART4_BAUD=2000000 CONFIG_UART4_RXBUFSIZE=512 CONFIG_UART4_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/str71x/olimex-strp711/configs/nettest/defconfig b/boards/arm/str71x/olimex-strp711/configs/nettest/defconfig index 2113eb2b698..ec419484d42 100644 --- a/boards/arm/str71x/olimex-strp711/configs/nettest/defconfig +++ b/boards/arm/str71x/olimex-strp711/configs/nettest/defconfig @@ -34,7 +34,6 @@ CONFIG_NET_TCP=y CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NSOCKET_DESCRIPTORS=16 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -54,4 +53,3 @@ CONFIG_UART0_BAUD=38400 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART1_BAUD=38400 CONFIG_USER_ENTRYPOINT="nettest_main" -CONFIG_WDOG_INTRESERVE=2 diff --git a/boards/arm/str71x/olimex-strp711/configs/nsh/defconfig b/boards/arm/str71x/olimex-strp711/configs/nsh/defconfig index cbba77c2e23..e189f61e668 100644 --- a/boards/arm/str71x/olimex-strp711/configs/nsh/defconfig +++ b/boards/arm/str71x/olimex-strp711/configs/nsh/defconfig @@ -29,7 +29,6 @@ CONFIG_NSH_LINELEN=64 CONFIG_NSH_MMCSDSPIPORTNO=1 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -47,4 +46,3 @@ CONFIG_UART0_BAUD=38400 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART1_BAUD=38400 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/tiva/dk-tm4c129x/configs/ipv6/defconfig b/boards/arm/tiva/dk-tm4c129x/configs/ipv6/defconfig index 1fc625fcc3e..846e633bf89 100644 --- a/boards/arm/tiva/dk-tm4c129x/configs/ipv6/defconfig +++ b/boards/arm/tiva/dk-tm4c129x/configs/ipv6/defconfig @@ -52,7 +52,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=262144 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -76,4 +75,3 @@ CONFIG_TIVA_PHY_INTERRUPTS=y CONFIG_TIVA_UART0=y CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/tiva/dk-tm4c129x/configs/nsh/defconfig b/boards/arm/tiva/dk-tm4c129x/configs/nsh/defconfig index b583d68fd2a..eaa750a0271 100644 --- a/boards/arm/tiva/dk-tm4c129x/configs/nsh/defconfig +++ b/boards/arm/tiva/dk-tm4c129x/configs/nsh/defconfig @@ -54,7 +54,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=262144 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -78,4 +77,3 @@ CONFIG_TIVA_PHY_INTERRUPTS=y CONFIG_TIVA_UART0=y CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/tiva/eagle100/configs/httpd/defconfig b/boards/arm/tiva/eagle100/configs/httpd/defconfig index e62df9ae0aa..b32c79ed9e6 100644 --- a/boards/arm/tiva/eagle100/configs/httpd/defconfig +++ b/boards/arm/tiva/eagle100/configs/httpd/defconfig @@ -35,7 +35,6 @@ CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NSOCKET_DESCRIPTORS=16 CONFIG_NUNGET_CHARS=0 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -61,4 +60,3 @@ CONFIG_TIVA_UART0=y CONFIG_TLS_NELEM=0 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="webserver_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/tiva/eagle100/configs/nettest/defconfig b/boards/arm/tiva/eagle100/configs/nettest/defconfig index 7a70e1f77fa..25082f6c131 100644 --- a/boards/arm/tiva/eagle100/configs/nettest/defconfig +++ b/boards/arm/tiva/eagle100/configs/nettest/defconfig @@ -31,7 +31,6 @@ CONFIG_NET_TCP=y CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NUNGET_CHARS=0 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -56,4 +55,3 @@ CONFIG_TIVA_SSI0=y CONFIG_TIVA_UART0=y CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nettest_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/tiva/eagle100/configs/nsh/defconfig b/boards/arm/tiva/eagle100/configs/nsh/defconfig index c9bba3a746a..1e891b2c5cb 100644 --- a/boards/arm/tiva/eagle100/configs/nsh/defconfig +++ b/boards/arm/tiva/eagle100/configs/nsh/defconfig @@ -43,7 +43,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -70,4 +69,3 @@ CONFIG_TIVA_SSI0=y CONFIG_TIVA_UART0=y CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/tiva/eagle100/configs/nxflat/defconfig b/boards/arm/tiva/eagle100/configs/nxflat/defconfig index 0253505d647..4afd2c56d10 100644 --- a/boards/arm/tiva/eagle100/configs/nxflat/defconfig +++ b/boards/arm/tiva/eagle100/configs/nxflat/defconfig @@ -24,7 +24,6 @@ CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NXFLAT=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -47,4 +46,3 @@ CONFIG_TIVA_UART0=y CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USERMAIN_STACKSIZE=4096 CONFIG_USER_ENTRYPOINT="nxflat_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/tiva/eagle100/configs/thttpd/defconfig b/boards/arm/tiva/eagle100/configs/thttpd/defconfig index a32f5e506a7..a5a1461882c 100644 --- a/boards/arm/tiva/eagle100/configs/thttpd/defconfig +++ b/boards/arm/tiva/eagle100/configs/thttpd/defconfig @@ -37,7 +37,6 @@ CONFIG_NSOCKET_DESCRIPTORS=16 CONFIG_NUNGET_CHARS=0 CONFIG_NXFLAT=y CONFIG_PIPES=y -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -66,4 +65,3 @@ CONFIG_TIVA_UART0=y CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USERMAIN_STACKSIZE=8192 CONFIG_USER_ENTRYPOINT="thttp_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/tiva/ekk-lm3s9b96/configs/nsh/defconfig b/boards/arm/tiva/ekk-lm3s9b96/configs/nsh/defconfig index 3ce1a900d5c..d8cdbfc8c80 100644 --- a/boards/arm/tiva/ekk-lm3s9b96/configs/nsh/defconfig +++ b/boards/arm/tiva/ekk-lm3s9b96/configs/nsh/defconfig @@ -45,7 +45,6 @@ CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_NSOCKET_DESCRIPTORS=40 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=98304 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -70,4 +69,3 @@ CONFIG_TIVA_GPIOG_IRQS=y CONFIG_TIVA_UART0=y CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/tiva/lm3s6432-s2e/configs/nsh/defconfig b/boards/arm/tiva/lm3s6432-s2e/configs/nsh/defconfig index 2d4f25e5689..c5539c0556e 100644 --- a/boards/arm/tiva/lm3s6432-s2e/configs/nsh/defconfig +++ b/boards/arm/tiva/lm3s6432-s2e/configs/nsh/defconfig @@ -39,7 +39,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=32768 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -60,4 +59,3 @@ CONFIG_TIVA_UART0=y CONFIG_TIVA_UART1=y CONFIG_UART1_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/tiva/lm3s6965-ek/configs/discover/defconfig b/boards/arm/tiva/lm3s6965-ek/configs/discover/defconfig index ceed2a072cf..2ab07ce2ea1 100644 --- a/boards/arm/tiva/lm3s6965-ek/configs/discover/defconfig +++ b/boards/arm/tiva/lm3s6965-ek/configs/discover/defconfig @@ -49,7 +49,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -81,4 +80,3 @@ CONFIG_TIVA_SSI0=y CONFIG_TIVA_UART0=y CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/tiva/lm3s6965-ek/configs/nsh/defconfig b/boards/arm/tiva/lm3s6965-ek/configs/nsh/defconfig index 57ce19464b7..17ca765cd78 100644 --- a/boards/arm/tiva/lm3s6965-ek/configs/nsh/defconfig +++ b/boards/arm/tiva/lm3s6965-ek/configs/nsh/defconfig @@ -46,7 +46,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -72,4 +71,3 @@ CONFIG_TIVA_SSI0=y CONFIG_TIVA_UART0=y CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/tiva/lm3s6965-ek/configs/nx/defconfig b/boards/arm/tiva/lm3s6965-ek/configs/nx/defconfig index d6c78a8a98a..10f85c45da8 100644 --- a/boards/arm/tiva/lm3s6965-ek/configs/nx/defconfig +++ b/boards/arm/tiva/lm3s6965-ek/configs/nx/defconfig @@ -46,7 +46,6 @@ CONFIG_NX_KBD=y CONFIG_NX_XYINPUT_MOUSE=y CONFIG_P14201_FREQUENCY=3500000 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -69,4 +68,3 @@ CONFIG_TIVA_SSI0=y CONFIG_TIVA_UART0=y CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nx_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/tiva/lm3s6965-ek/configs/tcpecho/defconfig b/boards/arm/tiva/lm3s6965-ek/configs/tcpecho/defconfig index 1da190b00eb..24cdb1002a5 100644 --- a/boards/arm/tiva/lm3s6965-ek/configs/tcpecho/defconfig +++ b/boards/arm/tiva/lm3s6965-ek/configs/tcpecho/defconfig @@ -45,7 +45,6 @@ CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NSOCKET_DESCRIPTORS=16 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -69,4 +68,3 @@ CONFIG_TIVA_SSI0=y CONFIG_TIVA_UART0=y CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="tcpecho_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/tiva/lm3s8962-ek/configs/nsh/defconfig b/boards/arm/tiva/lm3s8962-ek/configs/nsh/defconfig index f09c552ac75..9aceae08a87 100644 --- a/boards/arm/tiva/lm3s8962-ek/configs/nsh/defconfig +++ b/boards/arm/tiva/lm3s8962-ek/configs/nsh/defconfig @@ -45,7 +45,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -71,4 +70,3 @@ CONFIG_TIVA_SSI0=y CONFIG_TIVA_UART0=y CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/arm/tiva/lm3s8962-ek/configs/nx/defconfig b/boards/arm/tiva/lm3s8962-ek/configs/nx/defconfig index 05695d7ffe3..dc738fa8af0 100644 --- a/boards/arm/tiva/lm3s8962-ek/configs/nx/defconfig +++ b/boards/arm/tiva/lm3s8962-ek/configs/nx/defconfig @@ -46,7 +46,6 @@ CONFIG_NX_KBD=y CONFIG_NX_XYINPUT_MOUSE=y CONFIG_P14201_FREQUENCY=3500000 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -69,4 +68,3 @@ CONFIG_TIVA_SSI0=y CONFIG_TIVA_UART0=y CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nx_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/tiva/lm4f120-launchpad/configs/nsh/defconfig b/boards/arm/tiva/lm4f120-launchpad/configs/nsh/defconfig index 9816db6ccf8..9fe15c1400e 100644 --- a/boards/arm/tiva/lm4f120-launchpad/configs/nsh/defconfig +++ b/boards/arm/tiva/lm4f120-launchpad/configs/nsh/defconfig @@ -28,7 +28,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=32768 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -50,4 +49,3 @@ CONFIG_TIVA_SSI0=y CONFIG_TIVA_UART0=y CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/tiva/tm4c123g-launchpad/configs/mcp2515/defconfig b/boards/arm/tiva/tm4c123g-launchpad/configs/mcp2515/defconfig index 85f43ce546c..9be9a990bb8 100644 --- a/boards/arm/tiva/tm4c123g-launchpad/configs/mcp2515/defconfig +++ b/boards/arm/tiva/tm4c123g-launchpad/configs/mcp2515/defconfig @@ -38,7 +38,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=32768 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -61,4 +60,3 @@ CONFIG_TIVA_SSI2=y CONFIG_TIVA_UART0=y CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/tiva/tm4c123g-launchpad/configs/nsh/defconfig b/boards/arm/tiva/tm4c123g-launchpad/configs/nsh/defconfig index 22f9f5fb6a6..385d527bf95 100644 --- a/boards/arm/tiva/tm4c123g-launchpad/configs/nsh/defconfig +++ b/boards/arm/tiva/tm4c123g-launchpad/configs/nsh/defconfig @@ -30,7 +30,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=32768 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -51,4 +50,3 @@ CONFIG_TIVA_SSI0=y CONFIG_TIVA_UART0=y CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/tiva/tm4c1294-launchpad/configs/ipv6/defconfig b/boards/arm/tiva/tm4c1294-launchpad/configs/ipv6/defconfig index 31332e09254..25d2bfc903e 100644 --- a/boards/arm/tiva/tm4c1294-launchpad/configs/ipv6/defconfig +++ b/boards/arm/tiva/tm4c1294-launchpad/configs/ipv6/defconfig @@ -51,7 +51,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=262144 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -71,4 +70,3 @@ CONFIG_TIVA_PHY_INTERRUPTS=y CONFIG_TIVA_UART0=y CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/arm/tiva/tm4c1294-launchpad/configs/nsh/defconfig b/boards/arm/tiva/tm4c1294-launchpad/configs/nsh/defconfig index 909f17d54b3..e9d74c5e00f 100644 --- a/boards/arm/tiva/tm4c1294-launchpad/configs/nsh/defconfig +++ b/boards/arm/tiva/tm4c1294-launchpad/configs/nsh/defconfig @@ -52,7 +52,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=262144 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -70,4 +69,3 @@ CONFIG_TIVA_PHY_INTERRUPTS=y CONFIG_TIVA_UART0=y CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/avr/at32uc3/avr32dev1/configs/nsh/defconfig b/boards/avr/at32uc3/avr32dev1/configs/nsh/defconfig index d15ff0f30d2..a697972ec3a 100644 --- a/boards/avr/at32uc3/avr32dev1/configs/nsh/defconfig +++ b/boards/avr/at32uc3/avr32dev1/configs/nsh/defconfig @@ -33,7 +33,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=32768 CONFIG_RAM_START=0x00000000 CONFIG_SDCLONE_DISABLE=y @@ -45,4 +44,3 @@ CONFIG_TASK_NAME_SIZE=0 CONFIG_USART1_BAUD=57600 CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/avr/at32uc3/avr32dev1/configs/ostest/defconfig b/boards/avr/at32uc3/avr32dev1/configs/ostest/defconfig index 8356992cd8b..caf8a04afee 100644 --- a/boards/avr/at32uc3/avr32dev1/configs/ostest/defconfig +++ b/boards/avr/at32uc3/avr32dev1/configs/ostest/defconfig @@ -30,7 +30,6 @@ CONFIG_MAX_TASKS=16 CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=32768 CONFIG_RAM_START=0x00000000 CONFIG_SDCLONE_DISABLE=y @@ -44,4 +43,3 @@ CONFIG_TESTING_OSTEST_STACKSIZE=1024 CONFIG_USART1_BAUD=57600 CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="ostest_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/avr/at90usb/micropendous3/configs/hello/defconfig b/boards/avr/at90usb/micropendous3/configs/hello/defconfig index 16efffe536c..b05c42305df 100644 --- a/boards/avr/at90usb/micropendous3/configs/hello/defconfig +++ b/boards/avr/at90usb/micropendous3/configs/hello/defconfig @@ -29,7 +29,6 @@ CONFIG_NFILE_DESCRIPTORS=4 CONFIG_NFILE_STREAMS=4 CONFIG_NUNGET_CHARS=0 CONFIG_PREALLOC_TIMERS=0 -CONFIG_PREALLOC_WDOGS=4 CONFIG_PTHREAD_STACK_DEFAULT=1024 CONFIG_RAM_SIZE=4096 CONFIG_RAM_START=0x800100 @@ -43,4 +42,3 @@ CONFIG_USART1_BAUD=38400 CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USERMAIN_STACKSIZE=512 CONFIG_USER_ENTRYPOINT="hello_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/avr/at90usb/teensy-2.0/configs/hello/defconfig b/boards/avr/at90usb/teensy-2.0/configs/hello/defconfig index 452a2fe32df..de9c607f1b6 100644 --- a/boards/avr/at90usb/teensy-2.0/configs/hello/defconfig +++ b/boards/avr/at90usb/teensy-2.0/configs/hello/defconfig @@ -29,7 +29,6 @@ CONFIG_NFILE_DESCRIPTORS=4 CONFIG_NFILE_STREAMS=4 CONFIG_NUNGET_CHARS=0 CONFIG_PREALLOC_TIMERS=0 -CONFIG_PREALLOC_WDOGS=4 CONFIG_PTHREAD_STACK_DEFAULT=1024 CONFIG_RAM_SIZE=8192 CONFIG_RAM_START=0x800100 @@ -43,4 +42,3 @@ CONFIG_USART1_BAUD=38400 CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USERMAIN_STACKSIZE=512 CONFIG_USER_ENTRYPOINT="hello_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/avr/at90usb/teensy-2.0/configs/nsh/defconfig b/boards/avr/at90usb/teensy-2.0/configs/nsh/defconfig index 50b1ae4f4d9..68bf5a73e69 100644 --- a/boards/avr/at90usb/teensy-2.0/configs/nsh/defconfig +++ b/boards/avr/at90usb/teensy-2.0/configs/nsh/defconfig @@ -31,7 +31,6 @@ CONFIG_NFILE_DESCRIPTORS=6 CONFIG_NFILE_STREAMS=6 CONFIG_NUNGET_CHARS=0 CONFIG_PREALLOC_TIMERS=0 -CONFIG_PREALLOC_WDOGS=4 CONFIG_PTHREAD_STACK_DEFAULT=512 CONFIG_RAM_SIZE=8192 CONFIG_RAM_START=0x800100 @@ -47,4 +46,3 @@ CONFIG_USART1_BAUD=38400 CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USERMAIN_STACKSIZE=512 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/avr/at90usb/teensy-2.0/configs/usbmsc/defconfig b/boards/avr/at90usb/teensy-2.0/configs/usbmsc/defconfig index a3c97364fa3..05470e21808 100644 --- a/boards/avr/at90usb/teensy-2.0/configs/usbmsc/defconfig +++ b/boards/avr/at90usb/teensy-2.0/configs/usbmsc/defconfig @@ -32,7 +32,6 @@ CONFIG_NFILE_DESCRIPTORS=6 CONFIG_NFILE_STREAMS=6 CONFIG_NUNGET_CHARS=0 CONFIG_PREALLOC_TIMERS=0 -CONFIG_PREALLOC_WDOGS=6 CONFIG_PTHREAD_STACK_DEFAULT=512 CONFIG_RAM_SIZE=8192 CONFIG_RAM_START=0x800100 @@ -62,4 +61,3 @@ CONFIG_USBMSC_SCSI_STACKSIZE=512 CONFIG_USBMSC_VERSIONNO=0x0399 CONFIG_USERMAIN_STACKSIZE=512 CONFIG_USER_ENTRYPOINT="msconn_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/avr/atmega/amber/configs/hello/defconfig b/boards/avr/atmega/amber/configs/hello/defconfig index 8166d3786dd..7ecb55b1b87 100644 --- a/boards/avr/atmega/amber/configs/hello/defconfig +++ b/boards/avr/atmega/amber/configs/hello/defconfig @@ -29,7 +29,6 @@ CONFIG_NFILE_DESCRIPTORS=4 CONFIG_NFILE_STREAMS=4 CONFIG_NUNGET_CHARS=0 CONFIG_PREALLOC_TIMERS=0 -CONFIG_PREALLOC_WDOGS=4 CONFIG_PTHREAD_STACK_DEFAULT=1024 CONFIG_RAM_SIZE=4096 CONFIG_RAM_START=0x800100 @@ -43,4 +42,3 @@ CONFIG_USART0_BAUD=38400 CONFIG_USART0_SERIAL_CONSOLE=y CONFIG_USERMAIN_STACKSIZE=512 CONFIG_USER_ENTRYPOINT="hello_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/avr/atmega/arduino-mega2560/configs/hello/defconfig b/boards/avr/atmega/arduino-mega2560/configs/hello/defconfig index b07994021c1..dfad4c4981d 100644 --- a/boards/avr/atmega/arduino-mega2560/configs/hello/defconfig +++ b/boards/avr/atmega/arduino-mega2560/configs/hello/defconfig @@ -31,7 +31,6 @@ CONFIG_NFILE_DESCRIPTORS=4 CONFIG_NFILE_STREAMS=4 CONFIG_NUNGET_CHARS=0 CONFIG_PREALLOC_TIMERS=0 -CONFIG_PREALLOC_WDOGS=4 CONFIG_PTHREAD_STACK_DEFAULT=128 CONFIG_PTHREAD_STACK_MIN=128 CONFIG_RAM_SIZE=8192 @@ -46,4 +45,3 @@ CONFIG_USART0_BAUD=38400 CONFIG_USART0_SERIAL_CONSOLE=y CONFIG_USERMAIN_STACKSIZE=128 CONFIG_USER_ENTRYPOINT="hello_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/avr/atmega/arduino-mega2560/configs/nsh/defconfig b/boards/avr/atmega/arduino-mega2560/configs/nsh/defconfig index 4e2605af0d9..f71ba7c7fd0 100644 --- a/boards/avr/atmega/arduino-mega2560/configs/nsh/defconfig +++ b/boards/avr/atmega/arduino-mega2560/configs/nsh/defconfig @@ -30,7 +30,6 @@ CONFIG_NFILE_STREAMS=4 CONFIG_NUNGET_CHARS=0 CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=512 CONFIG_PREALLOC_TIMERS=0 -CONFIG_PREALLOC_WDOGS=4 CONFIG_PTHREAD_STACK_DEFAULT=128 CONFIG_PTHREAD_STACK_MIN=128 CONFIG_RAM_SIZE=8192 @@ -47,4 +46,3 @@ CONFIG_USART0_BAUD=38400 CONFIG_USART0_SERIAL_CONSOLE=y CONFIG_USERMAIN_STACKSIZE=768 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/avr/atmega/moteino-mega/configs/hello/defconfig b/boards/avr/atmega/moteino-mega/configs/hello/defconfig index d4fd49e4610..dbe044b0f78 100644 --- a/boards/avr/atmega/moteino-mega/configs/hello/defconfig +++ b/boards/avr/atmega/moteino-mega/configs/hello/defconfig @@ -29,7 +29,6 @@ CONFIG_NFILE_DESCRIPTORS=4 CONFIG_NFILE_STREAMS=4 CONFIG_NUNGET_CHARS=0 CONFIG_PREALLOC_TIMERS=0 -CONFIG_PREALLOC_WDOGS=4 CONFIG_PTHREAD_STACK_DEFAULT=512 CONFIG_RAM_SIZE=16384 CONFIG_RAM_START=0x800100 @@ -41,4 +40,3 @@ CONFIG_TASK_NAME_SIZE=0 CONFIG_USART0_SERIAL_CONSOLE=y CONFIG_USERMAIN_STACKSIZE=512 CONFIG_USER_ENTRYPOINT="hello_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/avr/atmega/moteino-mega/configs/nsh/defconfig b/boards/avr/atmega/moteino-mega/configs/nsh/defconfig index 8c8e0d2ab31..cbb5e1290ac 100644 --- a/boards/avr/atmega/moteino-mega/configs/nsh/defconfig +++ b/boards/avr/atmega/moteino-mega/configs/nsh/defconfig @@ -31,7 +31,6 @@ CONFIG_NFILE_DESCRIPTORS=6 CONFIG_NFILE_STREAMS=6 CONFIG_NUNGET_CHARS=0 CONFIG_PREALLOC_TIMERS=0 -CONFIG_PREALLOC_WDOGS=4 CONFIG_PTHREAD_STACK_DEFAULT=512 CONFIG_RAM_SIZE=16384 CONFIG_RAM_START=0x800100 @@ -45,4 +44,3 @@ CONFIG_TASK_NAME_SIZE=0 CONFIG_USART0_SERIAL_CONSOLE=y CONFIG_USERMAIN_STACKSIZE=512 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/hc/m9s12/demo9s12ne64/configs/ostest/defconfig b/boards/hc/m9s12/demo9s12ne64/configs/ostest/defconfig index 467a907bf3f..08a25e32049 100644 --- a/boards/hc/m9s12/demo9s12ne64/configs/ostest/defconfig +++ b/boards/hc/m9s12/demo9s12ne64/configs/ostest/defconfig @@ -30,7 +30,6 @@ CONFIG_NFILE_DESCRIPTORS=3 CONFIG_NFILE_STREAMS=0 CONFIG_NUNGET_CHARS=0 CONFIG_PREALLOC_TIMERS=0 -CONFIG_PREALLOC_WDOGS=4 CONFIG_PTHREAD_STACK_DEFAULT=256 CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x20000000 @@ -49,4 +48,3 @@ CONFIG_TESTING_OSTEST_NBARRIER_THREADS=3 CONFIG_TESTING_OSTEST_STACKSIZE=512 CONFIG_USERMAIN_STACKSIZE=512 CONFIG_USER_ENTRYPOINT="ostest_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/hc/m9s12/ne64badge/configs/ostest/defconfig b/boards/hc/m9s12/ne64badge/configs/ostest/defconfig index 6ff48a9a072..93087989306 100644 --- a/boards/hc/m9s12/ne64badge/configs/ostest/defconfig +++ b/boards/hc/m9s12/ne64badge/configs/ostest/defconfig @@ -29,7 +29,6 @@ CONFIG_NFILE_DESCRIPTORS=3 CONFIG_NFILE_STREAMS=0 CONFIG_NUNGET_CHARS=0 CONFIG_PREALLOC_TIMERS=0 -CONFIG_PREALLOC_WDOGS=4 CONFIG_PTHREAD_STACK_DEFAULT=256 CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x20000000 @@ -49,4 +48,3 @@ CONFIG_TESTING_OSTEST_NBARRIER_THREADS=3 CONFIG_TESTING_OSTEST_STACKSIZE=512 CONFIG_USERMAIN_STACKSIZE=512 CONFIG_USER_ENTRYPOINT="ostest_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/mips/pic32mx/mirtoo/configs/nsh/defconfig b/boards/mips/pic32mx/mirtoo/configs/nsh/defconfig index fa2e65a9ec6..7c0f79cf7ce 100644 --- a/boards/mips/pic32mx/mirtoo/configs/nsh/defconfig +++ b/boards/mips/pic32mx/mirtoo/configs/nsh/defconfig @@ -35,7 +35,6 @@ CONFIG_PIC32MX_OSCOUT=1 CONFIG_PIC32MX_PROGFLASHWP=0xff CONFIG_PIC32MX_UART1=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=32768 CONFIG_RAM_START=0xa0000000 CONFIG_SCHED_WAITPID=y @@ -47,4 +46,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_UART1_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/mips/pic32mx/mirtoo/configs/nxffs/defconfig b/boards/mips/pic32mx/mirtoo/configs/nxffs/defconfig index 9c6afda940e..239bfdd99ed 100644 --- a/boards/mips/pic32mx/mirtoo/configs/nxffs/defconfig +++ b/boards/mips/pic32mx/mirtoo/configs/nxffs/defconfig @@ -44,7 +44,6 @@ CONFIG_PIC32MX_OSCOUT=1 CONFIG_PIC32MX_SPI2=y CONFIG_PIC32MX_UART1=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=32768 CONFIG_RAM_START=0xa0000000 CONFIG_SDCLONE_DISABLE=y @@ -57,4 +56,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_UART1_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/mips/pic32mx/pic32mx-starterkit/configs/nsh/defconfig b/boards/mips/pic32mx/pic32mx-starterkit/configs/nsh/defconfig index 13ae3cc479b..e636eb5ffbf 100644 --- a/boards/mips/pic32mx/pic32mx-starterkit/configs/nsh/defconfig +++ b/boards/mips/pic32mx/pic32mx-starterkit/configs/nsh/defconfig @@ -40,7 +40,6 @@ CONFIG_PIC32MX_FETHIO=0 CONFIG_PIC32MX_FMIIEN=0 CONFIG_PIC32MX_UART1=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=131072 CONFIG_RAM_START=0xa0000000 CONFIG_RR_INTERVAL=200 @@ -53,4 +52,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_UART1_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/mips/pic32mx/pic32mx-starterkit/configs/nsh2/defconfig b/boards/mips/pic32mx/pic32mx-starterkit/configs/nsh2/defconfig index cf5ab8bbc2d..164a7e1f6cc 100644 --- a/boards/mips/pic32mx/pic32mx-starterkit/configs/nsh2/defconfig +++ b/boards/mips/pic32mx/pic32mx-starterkit/configs/nsh2/defconfig @@ -63,7 +63,6 @@ CONFIG_PIC32MX_ETH_NTXDESC=7 CONFIG_PIC32MX_FETHIO=0 CONFIG_PIC32MX_FMIIEN=0 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAMLOG=y CONFIG_RAMLOG_BUFSIZE=16384 CONFIG_RAMLOG_SYSLOG=y @@ -81,4 +80,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_PING=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=2 diff --git a/boards/mips/pic32mx/pic32mx7mmb/configs/nsh/defconfig b/boards/mips/pic32mx/pic32mx7mmb/configs/nsh/defconfig index 3b0d23053ef..035939581b2 100644 --- a/boards/mips/pic32mx/pic32mx7mmb/configs/nsh/defconfig +++ b/boards/mips/pic32mx/pic32mx7mmb/configs/nsh/defconfig @@ -71,7 +71,6 @@ CONFIG_PIC32MX_SPI1=y CONFIG_PIC32MX_UART1=y CONFIG_PIC32MX_USBDEV=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=131072 CONFIG_RAM_START=0xa0000000 CONFIG_RR_INTERVAL=200 @@ -98,4 +97,3 @@ CONFIG_USBMSC_PRODUCTSTR="USBdev Storage" CONFIG_USBMSC_REMOVABLE=y CONFIG_USBMSC_VERSIONNO=0x0399 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/mips/pic32mx/sure-pic32mx/configs/nsh/defconfig b/boards/mips/pic32mx/sure-pic32mx/configs/nsh/defconfig index 50b5ea833d1..093e5972d54 100644 --- a/boards/mips/pic32mx/sure-pic32mx/configs/nsh/defconfig +++ b/boards/mips/pic32mx/sure-pic32mx/configs/nsh/defconfig @@ -33,7 +33,6 @@ CONFIG_NSH_READLINE=y CONFIG_PIC32MX_DEBUGGER=2 CONFIG_PIC32MX_UART2=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=32768 CONFIG_RAM_START=0xa0000000 CONFIG_SCHED_WAITPID=y @@ -47,4 +46,3 @@ CONFIG_UART2_RXBUFSIZE=64 CONFIG_UART2_SERIAL_CONSOLE=y CONFIG_UART2_TXBUFSIZE=64 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/mips/pic32mx/sure-pic32mx/configs/usbnsh/defconfig b/boards/mips/pic32mx/sure-pic32mx/configs/usbnsh/defconfig index b10fb1bfb23..b668439d1cd 100644 --- a/boards/mips/pic32mx/sure-pic32mx/configs/usbnsh/defconfig +++ b/boards/mips/pic32mx/sure-pic32mx/configs/usbnsh/defconfig @@ -40,7 +40,6 @@ CONFIG_PIC32MX_DEBUGGER=2 CONFIG_PIC32MX_UART2=y CONFIG_PIC32MX_USBDEV=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=32768 CONFIG_RAM_START=0xa0000000 CONFIG_SCHED_WAITPID=y @@ -56,4 +55,3 @@ CONFIG_UART2_RXBUFSIZE=64 CONFIG_UART2_TXBUFSIZE=64 CONFIG_USBDEV=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/mips/pic32mx/ubw32/configs/nsh/defconfig b/boards/mips/pic32mx/ubw32/configs/nsh/defconfig index cd256e68fc0..d048ba93f0e 100644 --- a/boards/mips/pic32mx/ubw32/configs/nsh/defconfig +++ b/boards/mips/pic32mx/ubw32/configs/nsh/defconfig @@ -39,7 +39,6 @@ CONFIG_NSH_READLINE=y CONFIG_PIC32MX_DEBUGGER=2 CONFIG_PIC32MX_UART1=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=32768 CONFIG_RAM_START=0xa0000000 CONFIG_SCHED_WAITPID=y @@ -51,4 +50,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_UART1_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/mips/pic32mz/flipnclick-pic32mz/configs/nsh/defconfig b/boards/mips/pic32mz/flipnclick-pic32mz/configs/nsh/defconfig index 10a20cfb63d..c4c7cc91d7d 100644 --- a/boards/mips/pic32mz/flipnclick-pic32mz/configs/nsh/defconfig +++ b/boards/mips/pic32mz/flipnclick-pic32mz/configs/nsh/defconfig @@ -40,7 +40,6 @@ CONFIG_NSH_READLINE=y CONFIG_PIC32MZ_ICESEL_CH2=y CONFIG_PIC32MZ_UART3=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=131072 CONFIG_RAM_START=0xa0000000 CONFIG_RR_INTERVAL=200 @@ -52,4 +51,3 @@ CONFIG_START_YEAR=2012 CONFIG_SYSTEM_NSH=y CONFIG_UART3_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/mips/pic32mz/flipnclick-pic32mz/configs/nxlines/defconfig b/boards/mips/pic32mz/flipnclick-pic32mz/configs/nxlines/defconfig index 3a13ff24ec4..3ffea39fcd5 100644 --- a/boards/mips/pic32mz/flipnclick-pic32mz/configs/nxlines/defconfig +++ b/boards/mips/pic32mz/flipnclick-pic32mz/configs/nxlines/defconfig @@ -53,7 +53,6 @@ CONFIG_PIC32MZ_SPI2=y CONFIG_PIC32MZ_UART3=y CONFIG_PREALLOC_MQ_MSGS=8 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=131072 CONFIG_RAM_START=0xa0000000 CONFIG_RR_INTERVAL=200 @@ -64,4 +63,3 @@ CONFIG_START_MONTH=2 CONFIG_SYSTEM_NSH=y CONFIG_UART3_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/mips/pic32mz/pic32mz-starterkit/configs/nsh/defconfig b/boards/mips/pic32mz/pic32mz-starterkit/configs/nsh/defconfig index 29a68626830..5361aca98b3 100644 --- a/boards/mips/pic32mz/pic32mz-starterkit/configs/nsh/defconfig +++ b/boards/mips/pic32mz/pic32mz-starterkit/configs/nsh/defconfig @@ -40,7 +40,6 @@ CONFIG_NSH_READLINE=y CONFIG_PIC32MZ_ICESEL_CH2=y CONFIG_PIC32MZ_UART1=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=131072 CONFIG_RAM_START=0xa0000000 CONFIG_RR_INTERVAL=200 @@ -53,4 +52,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_UART1_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/misoc/lm32/misoc/configs/hello/defconfig b/boards/misoc/lm32/misoc/configs/hello/defconfig index e949ecfa35e..5c79139d1b7 100644 --- a/boards/misoc/lm32/misoc/configs/hello/defconfig +++ b/boards/misoc/lm32/misoc/configs/hello/defconfig @@ -67,7 +67,6 @@ CONFIG_NFILE_DESCRIPTORS=4 CONFIG_NFILE_STREAMS=4 CONFIG_NSH_BUILTIN_APPS=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=67108864 CONFIG_RAM_START=0x40000000 CONFIG_RAW_BINARY=y @@ -84,4 +83,3 @@ CONFIG_TASK_NAME_SIZE=0 CONFIG_TESTING_OSTEST=y CONFIG_UART1_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/misoc/lm32/misoc/configs/nsh/defconfig b/boards/misoc/lm32/misoc/configs/nsh/defconfig index 005c439427d..8d5852a87fc 100644 --- a/boards/misoc/lm32/misoc/configs/nsh/defconfig +++ b/boards/misoc/lm32/misoc/configs/nsh/defconfig @@ -60,7 +60,6 @@ CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_READLINE=y CONFIG_NUNGET_CHARS=0 CONFIG_PREALLOC_TIMERS=0 -CONFIG_PREALLOC_WDOGS=4 CONFIG_PTHREAD_STACK_DEFAULT=4096 CONFIG_PTHREAD_STACK_MIN=2048 CONFIG_RAM_SIZE=33554432 @@ -78,4 +77,3 @@ CONFIG_TESTING_OSTEST=y CONFIG_UART1_SERIAL_CONSOLE=y CONFIG_USERMAIN_STACKSIZE=4096 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/or1k/mor1kx/or1k/configs/nsh/defconfig b/boards/or1k/mor1kx/or1k/configs/nsh/defconfig index 52bd30e80ff..4679061c13e 100644 --- a/boards/or1k/mor1kx/or1k/configs/nsh/defconfig +++ b/boards/or1k/mor1kx/or1k/configs/nsh/defconfig @@ -78,7 +78,6 @@ CONFIG_NSH_FILEIOSIZE=1024 CONFIG_NSH_LINELEN=40 CONFIG_NUNGET_CHARS=0 CONFIG_PREALLOC_TIMERS=0 -CONFIG_PREALLOC_WDOGS=4 CONFIG_PTHREAD_STACK_DEFAULT=1024 CONFIG_RAM_SIZE=4194304 CONFIG_RAM_START=0x0000 @@ -94,4 +93,3 @@ CONFIG_TASK_NAME_SIZE=0 CONFIG_TESTING_OSTEST=y CONFIG_USERMAIN_STACKSIZE=1024 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/renesas/m16c/skp16c26/configs/ostest/defconfig b/boards/renesas/m16c/skp16c26/configs/ostest/defconfig index 8a6c0897208..4297d76e06d 100644 --- a/boards/renesas/m16c/skp16c26/configs/ostest/defconfig +++ b/boards/renesas/m16c/skp16c26/configs/ostest/defconfig @@ -27,7 +27,6 @@ CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NUNGET_CHARS=0 CONFIG_PREALLOC_TIMERS=0 -CONFIG_PREALLOC_WDOGS=8 CONFIG_PTHREAD_STACK_DEFAULT=256 CONFIG_PTHREAD_STACK_MIN=64 CONFIG_RAM_SIZE=2048 @@ -44,4 +43,3 @@ CONFIG_TESTING_OSTEST=y CONFIG_TLS_NELEM=0 CONFIG_USERMAIN_STACKSIZE=256 CONFIG_USER_ENTRYPOINT="ostest_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/renesas/sh1/us7032evb1/configs/nsh/defconfig b/boards/renesas/sh1/us7032evb1/configs/nsh/defconfig index 20430490317..fb242e12142 100644 --- a/boards/renesas/sh1/us7032evb1/configs/nsh/defconfig +++ b/boards/renesas/sh1/us7032evb1/configs/nsh/defconfig @@ -30,7 +30,6 @@ CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_NUNGET_CHARS=0 CONFIG_PREALLOC_TIMERS=0 -CONFIG_PREALLOC_WDOGS=4 CONFIG_PTHREAD_STACK_DEFAULT=1024 CONFIG_RAM_SIZE=57344 CONFIG_RAM_START=0x0a002000 @@ -47,4 +46,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USERMAIN_STACKSIZE=1024 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/renesas/sh1/us7032evb1/configs/ostest/defconfig b/boards/renesas/sh1/us7032evb1/configs/ostest/defconfig index fa5a0d3ad65..c734b7bb9c8 100644 --- a/boards/renesas/sh1/us7032evb1/configs/ostest/defconfig +++ b/boards/renesas/sh1/us7032evb1/configs/ostest/defconfig @@ -27,7 +27,6 @@ CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NUNGET_CHARS=0 CONFIG_PREALLOC_TIMERS=0 -CONFIG_PREALLOC_WDOGS=4 CONFIG_PTHREAD_STACK_DEFAULT=1024 CONFIG_RAM_SIZE=57344 CONFIG_RAM_START=0x0a002000 @@ -46,4 +45,3 @@ CONFIG_TESTING_OSTEST_NBARRIER_THREADS=3 CONFIG_TESTING_OSTEST_STACKSIZE=4096 CONFIG_USERMAIN_STACKSIZE=1024 CONFIG_USER_ENTRYPOINT="ostest_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/risc-v/fe310/hifive1-revb/configs/nsh/defconfig b/boards/risc-v/fe310/hifive1-revb/configs/nsh/defconfig index f500f306436..5343858ccc2 100644 --- a/boards/risc-v/fe310/hifive1-revb/configs/nsh/defconfig +++ b/boards/risc-v/fe310/hifive1-revb/configs/nsh/defconfig @@ -59,7 +59,6 @@ CONFIG_NSH_DISABLE_UMOUNT=y CONFIG_NSH_FILEIOSIZE=64 CONFIG_NSH_STRERROR=y CONFIG_PREALLOC_TIMERS=0 -CONFIG_PREALLOC_WDOGS=4 CONFIG_PTHREAD_STACK_DEFAULT=1536 CONFIG_RAM_SIZE=16384 CONFIG_RAM_START=0x80000000 @@ -80,4 +79,3 @@ CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART0_TXBUFSIZE=32 CONFIG_USERMAIN_STACKSIZE=1536 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/risc-v/gap8/gapuino/configs/nsh/defconfig b/boards/risc-v/gap8/gapuino/configs/nsh/defconfig index 89e075a5e5d..1516d18b9e9 100644 --- a/boards/risc-v/gap8/gapuino/configs/nsh/defconfig +++ b/boards/risc-v/gap8/gapuino/configs/nsh/defconfig @@ -36,7 +36,6 @@ CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_NSH_STRERROR=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=524288 CONFIG_RAM_START=0x1C000000 CONFIG_RAW_BINARY=y @@ -50,4 +49,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_UART_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/risc-v/k210/maix-bit/configs/elf/defconfig b/boards/risc-v/k210/maix-bit/configs/elf/defconfig index 31cfbb5a0ab..b86fc0c487b 100644 --- a/boards/risc-v/k210/maix-bit/configs/elf/defconfig +++ b/boards/risc-v/k210/maix-bit/configs/elf/defconfig @@ -38,7 +38,6 @@ CONFIG_PATH_INITIAL="/mnt/romfs" CONFIG_PIPES=y CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=3072 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=2097152 CONFIG_RAM_START=0x80400000 CONFIG_RAW_BINARY=y @@ -53,4 +52,3 @@ CONFIG_TASK_NAME_SIZE=20 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USERMAIN_STACKSIZE=3072 CONFIG_USER_ENTRYPOINT="elf_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/risc-v/k210/maix-bit/configs/knsh/defconfig b/boards/risc-v/k210/maix-bit/configs/knsh/defconfig index c171f4186df..2908cd4d5de 100644 --- a/boards/risc-v/k210/maix-bit/configs/knsh/defconfig +++ b/boards/risc-v/k210/maix-bit/configs/knsh/defconfig @@ -36,7 +36,6 @@ CONFIG_NSH_READLINE=y CONFIG_NUTTX_USERSPACE=0x80100000 CONFIG_PASS1_BUILDIR="boards/risc-v/k210/maix-bit/kernel" CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=2097152 CONFIG_RAM_START=0x80400000 CONFIG_RAW_BINARY=y @@ -55,4 +54,3 @@ CONFIG_TESTING_OSTEST=y CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USERMAIN_STACKSIZE=3072 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/risc-v/k210/maix-bit/configs/kostest/defconfig b/boards/risc-v/k210/maix-bit/configs/kostest/defconfig index 8c095b11ec3..d84db54c2cf 100644 --- a/boards/risc-v/k210/maix-bit/configs/kostest/defconfig +++ b/boards/risc-v/k210/maix-bit/configs/kostest/defconfig @@ -34,7 +34,6 @@ CONFIG_NFILE_STREAMS=8 CONFIG_NUTTX_USERSPACE=0x80100000 CONFIG_PASS1_BUILDIR="boards/risc-v/k210/maix-bit/kernel" CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=2097152 CONFIG_RAM_START=0x80400000 CONFIG_RAW_BINARY=y @@ -50,4 +49,3 @@ CONFIG_TESTING_OSTEST=y CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USERMAIN_STACKSIZE=3072 CONFIG_USER_ENTRYPOINT="ostest_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/risc-v/k210/maix-bit/configs/module/defconfig b/boards/risc-v/k210/maix-bit/configs/module/defconfig index 102e74770b7..4599a9cb91f 100644 --- a/boards/risc-v/k210/maix-bit/configs/module/defconfig +++ b/boards/risc-v/k210/maix-bit/configs/module/defconfig @@ -40,7 +40,6 @@ CONFIG_PATH_INITIAL="/mnt/romfs" CONFIG_PIPES=y CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=3072 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=2097152 CONFIG_RAM_START=0x80400000 CONFIG_RAW_BINARY=y @@ -55,4 +54,3 @@ CONFIG_TASK_NAME_SIZE=20 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USERMAIN_STACKSIZE=3072 CONFIG_USER_ENTRYPOINT="module_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/risc-v/k210/maix-bit/configs/nsh/defconfig b/boards/risc-v/k210/maix-bit/configs/nsh/defconfig index 5043a75968a..2916f650c2a 100644 --- a/boards/risc-v/k210/maix-bit/configs/nsh/defconfig +++ b/boards/risc-v/k210/maix-bit/configs/nsh/defconfig @@ -39,7 +39,6 @@ CONFIG_NSH_DISABLE_UMOUNT=y CONFIG_NSH_READLINE=y CONFIG_NSH_STRERROR=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=2097152 CONFIG_RAM_START=0x80400000 CONFIG_RAW_BINARY=y @@ -57,4 +56,3 @@ CONFIG_TESTING_OSTEST=y CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USERMAIN_STACKSIZE=3072 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/risc-v/k210/maix-bit/configs/posix_spawn/defconfig b/boards/risc-v/k210/maix-bit/configs/posix_spawn/defconfig index 5e411709562..2f25b4a6917 100644 --- a/boards/risc-v/k210/maix-bit/configs/posix_spawn/defconfig +++ b/boards/risc-v/k210/maix-bit/configs/posix_spawn/defconfig @@ -37,7 +37,6 @@ CONFIG_PATH_INITIAL="/mnt/romfs" CONFIG_PIPES=y CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=2048 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=2097152 CONFIG_RAM_START=0x80400000 CONFIG_RAW_BINARY=y @@ -52,4 +51,3 @@ CONFIG_TASK_NAME_SIZE=20 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_USERMAIN_STACKSIZE=3072 CONFIG_USER_ENTRYPOINT="posix_spawn_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/risc-v/k210/maix-bit/configs/smp/defconfig b/boards/risc-v/k210/maix-bit/configs/smp/defconfig index 4a4fc08f41d..3eeba6b9952 100644 --- a/boards/risc-v/k210/maix-bit/configs/smp/defconfig +++ b/boards/risc-v/k210/maix-bit/configs/smp/defconfig @@ -42,7 +42,6 @@ CONFIG_NSH_READLINE=y CONFIG_NSH_STRERROR=y CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=2048 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=2097152 CONFIG_RAM_START=0x80400000 CONFIG_RAW_BINARY=y diff --git a/boards/risc-v/litex/arty_a7/configs/nsh/defconfig b/boards/risc-v/litex/arty_a7/configs/nsh/defconfig index e442fc8bc37..4b39f7fa7d7 100644 --- a/boards/risc-v/litex/arty_a7/configs/nsh/defconfig +++ b/boards/risc-v/litex/arty_a7/configs/nsh/defconfig @@ -47,7 +47,6 @@ CONFIG_NSH_DISABLE_UMOUNT=y CONFIG_NSH_FILEIOSIZE=64 CONFIG_NSH_STRERROR=y CONFIG_PREALLOC_TIMERS=0 -CONFIG_PREALLOC_WDOGS=4 CONFIG_PTHREAD_STACK_DEFAULT=8192 CONFIG_RAM_SIZE=134217728 CONFIG_RAM_START=0xc0800000 @@ -69,4 +68,3 @@ CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART0_TXBUFSIZE=128 CONFIG_USERMAIN_STACKSIZE=8192 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/risc-v/nr5m100/nr5m100-nexys4/configs/nsh/defconfig b/boards/risc-v/nr5m100/nr5m100-nexys4/configs/nsh/defconfig index 5db8ff373c3..fca75b0e6d0 100644 --- a/boards/risc-v/nr5m100/nr5m100-nexys4/configs/nsh/defconfig +++ b/boards/risc-v/nr5m100/nr5m100-nexys4/configs/nsh/defconfig @@ -42,7 +42,6 @@ CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_NSH_STRERROR=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y @@ -55,4 +54,3 @@ CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_UART1_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/sim/sim/sim/src/sim_gpio.c b/boards/sim/sim/sim/src/sim_gpio.c index 8ebe213dda2..03f13e37efe 100644 --- a/boards/sim/sim/sim/src/sim_gpio.c +++ b/boards/sim/sim/sim/src/sim_gpio.c @@ -65,7 +65,7 @@ struct simgpio_dev_s struct simgpint_dev_s { struct simgpio_dev_s simgpio; - WDOG_ID wdog; + struct wdog_s wdog; pin_interrupt_t callback; }; @@ -185,7 +185,7 @@ static int gpint_attach(FAR struct gpio_dev_s *dev, FAR struct simgpint_dev_s *simgpint = (FAR struct simgpint_dev_s *)dev; gpioinfo("Cancel 1 second timer\n"); - wd_cancel(simgpint->wdog); + wd_cancel(&simgpint->wdog); gpioinfo("Attach %p\n", callback); simgpint->callback = callback; @@ -201,14 +201,14 @@ static int gpint_enable(FAR struct gpio_dev_s *dev, bool enable) if (simgpint->callback != NULL) { gpioinfo("Start 1 second timer\n"); - wd_start(simgpint->wdog, SEC2TICK(1), + wd_start(&simgpint->wdog, SEC2TICK(1), sim_interrupt, 1, (wdparm_t)dev); } } else { gpioinfo("Cancel 1 second timer\n"); - wd_cancel(simgpint->wdog); + wd_cancel(&simgpint->wdog); } return OK; @@ -228,9 +228,6 @@ static int gpint_enable(FAR struct gpio_dev_s *dev, bool enable) int sim_gpio_initialize(void) { - g_gpint.wdog = wd_create(); - DEBUGASSERT(g_gpint.wdog != NULL); - gpio_pin_register(&g_gpin.gpio, g_gpin.id); gpio_pin_register(&g_gpout.gpio, g_gpout.id); gpio_pin_register(&g_gpint.simgpio.gpio, g_gpint.simgpio.id); diff --git a/boards/xtensa/esp32/esp32-core/configs/netnsh/defconfig b/boards/xtensa/esp32/esp32-core/configs/netnsh/defconfig index 03e6ed3981a..38c6dc41f91 100644 --- a/boards/xtensa/esp32/esp32-core/configs/netnsh/defconfig +++ b/boards/xtensa/esp32/esp32-core/configs/netnsh/defconfig @@ -55,7 +55,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y diff --git a/boards/xtensa/esp32/esp32-core/configs/nsh/defconfig b/boards/xtensa/esp32/esp32-core/configs/nsh/defconfig index 6da7d69623c..e5ace69bad0 100644 --- a/boards/xtensa/esp32/esp32-core/configs/nsh/defconfig +++ b/boards/xtensa/esp32/esp32-core/configs/nsh/defconfig @@ -35,7 +35,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y diff --git a/boards/xtensa/esp32/esp32-core/configs/ostest/defconfig b/boards/xtensa/esp32/esp32-core/configs/ostest/defconfig index b5f06b8d449..e21a9f6b533 100644 --- a/boards/xtensa/esp32/esp32-core/configs/ostest/defconfig +++ b/boards/xtensa/esp32/esp32-core/configs/ostest/defconfig @@ -28,7 +28,6 @@ CONFIG_MM_REGIONS=2 CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y diff --git a/boards/xtensa/esp32/esp32-core/configs/smp/defconfig b/boards/xtensa/esp32/esp32-core/configs/smp/defconfig index e767afdd017..5182655b552 100644 --- a/boards/xtensa/esp32/esp32-core/configs/smp/defconfig +++ b/boards/xtensa/esp32/esp32-core/configs/smp/defconfig @@ -38,7 +38,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_RAM_SIZE=114688 CONFIG_RAM_START=0x20000000 CONFIG_RAW_BINARY=y diff --git a/boards/z16/z16f/z16f2800100zcog/configs/nsh/defconfig b/boards/z16/z16f/z16f2800100zcog/configs/nsh/defconfig index 5e1430f303c..623f8c74b7b 100644 --- a/boards/z16/z16f/z16f2800100zcog/configs/nsh/defconfig +++ b/boards/z16/z16f/z16f2800100zcog/configs/nsh/defconfig @@ -27,7 +27,6 @@ CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=16 CONFIG_PTHREAD_STACK_DEFAULT=1536 CONFIG_RAM_SIZE=65536 CONFIG_RR_INTERVAL=200 @@ -41,4 +40,3 @@ CONFIG_UART0_BAUD=57600 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART1_BAUD=57600 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=2 diff --git a/boards/z16/z16f/z16f2800100zcog/configs/ostest/defconfig b/boards/z16/z16f/z16f2800100zcog/configs/ostest/defconfig index c988eb1b60a..2d1d17ecec1 100644 --- a/boards/z16/z16f/z16f2800100zcog/configs/ostest/defconfig +++ b/boards/z16/z16f/z16f2800100zcog/configs/ostest/defconfig @@ -21,7 +21,6 @@ CONFIG_MAX_TASKS=16 CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_PTHREAD_STACK_DEFAULT=4096 CONFIG_RAM_SIZE=65536 CONFIG_RR_INTERVAL=200 @@ -36,4 +35,3 @@ CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART1_BAUD=57600 CONFIG_USERMAIN_STACKSIZE=4096 CONFIG_USER_ENTRYPOINT="ostest_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/z80/ez80/ez80f910200kitg/configs/ostest/defconfig b/boards/z80/ez80/ez80f910200kitg/configs/ostest/defconfig index 6dd1230f49d..22ecae615ce 100644 --- a/boards/z80/ez80/ez80f910200kitg/configs/ostest/defconfig +++ b/boards/z80/ez80/ez80f910200kitg/configs/ostest/defconfig @@ -28,7 +28,6 @@ CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NUNGET_CHARS=0 CONFIG_PREALLOC_TIMERS=0 -CONFIG_PREALLOC_WDOGS=4 CONFIG_PTHREAD_STACK_DEFAULT=1024 CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0 @@ -47,4 +46,3 @@ CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART0_TXBUFSIZE=32 CONFIG_USERMAIN_STACKSIZE=1024 CONFIG_USER_ENTRYPOINT="ostest_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/z80/ez80/ez80f910200zco/configs/dhcpd/defconfig b/boards/z80/ez80/ez80f910200zco/configs/dhcpd/defconfig index fe42243ff04..473bf7ff786 100644 --- a/boards/z80/ez80/ez80f910200zco/configs/dhcpd/defconfig +++ b/boards/z80/ez80/ez80f910200zco/configs/dhcpd/defconfig @@ -39,7 +39,6 @@ CONFIG_NET_UDP_CHECKSUMS=y CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NUNGET_CHARS=0 -CONFIG_PREALLOC_WDOGS=8 CONFIG_PTHREAD_STACK_DEFAULT=1024 CONFIG_RAM_SIZE=65536 CONFIG_RR_INTERVAL=200 @@ -57,4 +56,3 @@ CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART0_TXBUFSIZE=32 CONFIG_USERMAIN_STACKSIZE=1024 CONFIG_USER_ENTRYPOINT="dhcpd_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/z80/ez80/ez80f910200zco/configs/httpd/defconfig b/boards/z80/ez80/ez80f910200zco/configs/httpd/defconfig index 0abc5c080b6..707ef94cc49 100644 --- a/boards/z80/ez80/ez80f910200zco/configs/httpd/defconfig +++ b/boards/z80/ez80/ez80f910200zco/configs/httpd/defconfig @@ -39,7 +39,6 @@ CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NSOCKET_DESCRIPTORS=16 CONFIG_NUNGET_CHARS=0 -CONFIG_PREALLOC_WDOGS=8 CONFIG_RAM_SIZE=65536 CONFIG_RR_INTERVAL=200 CONFIG_SCHED_HPWORK=y @@ -57,4 +56,3 @@ CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART0_TXBUFSIZE=32 CONFIG_USERMAIN_STACKSIZE=1024 CONFIG_USER_ENTRYPOINT="webserver_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/z80/ez80/ez80f910200zco/configs/nettest/defconfig b/boards/z80/ez80/ez80f910200zco/configs/nettest/defconfig index 12a87fde516..45bd5f9e207 100644 --- a/boards/z80/ez80/ez80f910200zco/configs/nettest/defconfig +++ b/boards/z80/ez80/ez80f910200zco/configs/nettest/defconfig @@ -36,7 +36,6 @@ CONFIG_NET_TCP=y CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NUNGET_CHARS=0 -CONFIG_PREALLOC_WDOGS=8 CONFIG_PTHREAD_STACK_DEFAULT=1024 CONFIG_RAM_SIZE=65536 CONFIG_RR_INTERVAL=200 @@ -54,4 +53,3 @@ CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART0_TXBUFSIZE=32 CONFIG_USERMAIN_STACKSIZE=1024 CONFIG_USER_ENTRYPOINT="nettest_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/z80/ez80/ez80f910200zco/configs/nsh/defconfig b/boards/z80/ez80/ez80f910200zco/configs/nsh/defconfig index d762eac4208..40b67244d0a 100644 --- a/boards/z80/ez80/ez80f910200zco/configs/nsh/defconfig +++ b/boards/z80/ez80/ez80f910200zco/configs/nsh/defconfig @@ -45,7 +45,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_PTHREAD_STACK_DEFAULT=1024 CONFIG_RAM_SIZE=65536 CONFIG_RR_INTERVAL=200 @@ -63,4 +62,3 @@ CONFIG_UART0_RXBUFSIZE=192 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART0_TXBUFSIZE=64 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/z80/ez80/ez80f910200zco/configs/poll/defconfig b/boards/z80/ez80/ez80f910200zco/configs/poll/defconfig index a257a9922d6..da9d45f6b8a 100644 --- a/boards/z80/ez80/ez80f910200zco/configs/poll/defconfig +++ b/boards/z80/ez80/ez80f910200zco/configs/poll/defconfig @@ -37,7 +37,6 @@ CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_NUNGET_CHARS=0 CONFIG_PIPES=y -CONFIG_PREALLOC_WDOGS=8 CONFIG_PTHREAD_STACK_DEFAULT=1024 CONFIG_RAM_SIZE=65536 CONFIG_RR_INTERVAL=200 @@ -56,4 +55,3 @@ CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART0_TXBUFSIZE=32 CONFIG_USERMAIN_STACKSIZE=1024 CONFIG_USER_ENTRYPOINT="poll_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/z80/ez80/makerlisp/configs/nsh_flash/defconfig b/boards/z80/ez80/makerlisp/configs/nsh_flash/defconfig index a2539b1a357..90cb53b468c 100644 --- a/boards/z80/ez80/makerlisp/configs/nsh_flash/defconfig +++ b/boards/z80/ez80/makerlisp/configs/nsh_flash/defconfig @@ -38,7 +38,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_PTHREAD_STACK_DEFAULT=1024 CONFIG_RAM_SIZE=65536 CONFIG_RR_INTERVAL=200 @@ -55,4 +54,3 @@ CONFIG_UART0_RXBUFSIZE=192 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART0_TXBUFSIZE=64 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/z80/ez80/makerlisp/configs/nsh_ram/defconfig b/boards/z80/ez80/makerlisp/configs/nsh_ram/defconfig index 62dae712334..5024c9a5382 100644 --- a/boards/z80/ez80/makerlisp/configs/nsh_ram/defconfig +++ b/boards/z80/ez80/makerlisp/configs/nsh_ram/defconfig @@ -39,7 +39,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_PTHREAD_STACK_DEFAULT=1024 CONFIG_RAM_SIZE=65536 CONFIG_RR_INTERVAL=200 @@ -56,4 +55,3 @@ CONFIG_UART0_RXBUFSIZE=192 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART0_TXBUFSIZE=64 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/z80/ez80/makerlisp/configs/sdboot/defconfig b/boards/z80/ez80/makerlisp/configs/sdboot/defconfig index 79ba11c8a65..7deae763aed 100644 --- a/boards/z80/ez80/makerlisp/configs/sdboot/defconfig +++ b/boards/z80/ez80/makerlisp/configs/sdboot/defconfig @@ -33,7 +33,6 @@ CONFIG_MMCSD_MULTIBLOCK_DISABLE=y CONFIG_NFILE_DESCRIPTORS=6 CONFIG_NFILE_STREAMS=6 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_PTHREAD_STACK_DEFAULT=1024 CONFIG_RAM_SIZE=65536 CONFIG_RR_INTERVAL=200 @@ -48,4 +47,3 @@ CONFIG_UART0_RXBUFSIZE=192 CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_UART0_TXBUFSIZE=64 CONFIG_USER_ENTRYPOINT="sd_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/z80/ez80/z20x/configs/hello/defconfig b/boards/z80/ez80/z20x/configs/hello/defconfig index ee86430fa31..3cc57d7040b 100644 --- a/boards/z80/ez80/z20x/configs/hello/defconfig +++ b/boards/z80/ez80/z20x/configs/hello/defconfig @@ -25,7 +25,6 @@ CONFIG_MAX_TASKS=16 CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_STREAMS=8 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_PTHREAD_STACK_DEFAULT=1024 CONFIG_RAM_SIZE=65536 CONFIG_SDCLONE_DISABLE=y @@ -38,4 +37,3 @@ CONFIG_UART1_RXBUFSIZE=64 CONFIG_UART1_SERIAL_CONSOLE=y CONFIG_UART1_TXBUFSIZE=64 CONFIG_USER_ENTRYPOINT="hello_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/z80/ez80/z20x/configs/nsh/defconfig b/boards/z80/ez80/z20x/configs/nsh/defconfig index c3a95764411..5bfa59aa16f 100644 --- a/boards/z80/ez80/z20x/configs/nsh/defconfig +++ b/boards/z80/ez80/z20x/configs/nsh/defconfig @@ -39,7 +39,6 @@ CONFIG_NSH_FILEIOSIZE=512 CONFIG_NSH_LINELEN=64 CONFIG_NSH_READLINE=y CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=8 CONFIG_PTHREAD_STACK_DEFAULT=1024 CONFIG_RAM_SIZE=65536 CONFIG_RR_INTERVAL=200 @@ -56,4 +55,3 @@ CONFIG_UART1_RXBUFSIZE=192 CONFIG_UART1_SERIAL_CONSOLE=y CONFIG_UART1_TXBUFSIZE=64 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=1 diff --git a/boards/z80/ez80/z20x/configs/sdboot/defconfig b/boards/z80/ez80/z20x/configs/sdboot/defconfig index ddd3fc97d75..f37a2b33345 100644 --- a/boards/z80/ez80/z20x/configs/sdboot/defconfig +++ b/boards/z80/ez80/z20x/configs/sdboot/defconfig @@ -31,7 +31,6 @@ CONFIG_MMCSD_MULTIBLOCK_DISABLE=y CONFIG_NFILE_DESCRIPTORS=6 CONFIG_NFILE_STREAMS=6 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_PTHREAD_STACK_DEFAULT=1024 CONFIG_RAM_SIZE=65536 CONFIG_SDCLONE_DISABLE=y @@ -44,5 +43,4 @@ CONFIG_UART1_RXBUFSIZE=64 CONFIG_UART1_SERIAL_CONSOLE=y CONFIG_UART1_TXBUFSIZE=64 CONFIG_USER_ENTRYPOINT="sd_main" -CONFIG_WDOG_INTRESERVE=1 CONFIG_Z20X_SDBOOT=y diff --git a/boards/z80/ez80/z20x/configs/w25boot/defconfig b/boards/z80/ez80/z20x/configs/w25boot/defconfig index bf29c019f01..805b9875c7c 100644 --- a/boards/z80/ez80/z20x/configs/w25boot/defconfig +++ b/boards/z80/ez80/z20x/configs/w25boot/defconfig @@ -26,7 +26,6 @@ CONFIG_MTD_W25=y CONFIG_NFILE_DESCRIPTORS=6 CONFIG_NFILE_STREAMS=6 CONFIG_PREALLOC_TIMERS=4 -CONFIG_PREALLOC_WDOGS=4 CONFIG_PTHREAD_STACK_DEFAULT=1024 CONFIG_RAM_SIZE=65536 CONFIG_SDCLONE_DISABLE=y @@ -37,5 +36,4 @@ CONFIG_UART1_BITS=0 CONFIG_UART1_RXBUFSIZE=4096 CONFIG_UART1_SERIAL_CONSOLE=y CONFIG_USER_ENTRYPOINT="w25_main" -CONFIG_WDOG_INTRESERVE=1 CONFIG_Z20X_W25BOOT=y diff --git a/boards/z80/z180/p112/configs/ostest/defconfig b/boards/z80/z180/p112/configs/ostest/defconfig index d561db9a5b5..68d950acf96 100644 --- a/boards/z80/z180/p112/configs/ostest/defconfig +++ b/boards/z80/z180/p112/configs/ostest/defconfig @@ -26,7 +26,6 @@ CONFIG_NFILE_DESCRIPTORS=3 CONFIG_NFILE_STREAMS=0 CONFIG_NUNGET_CHARS=0 CONFIG_PREALLOC_TIMERS=0 -CONFIG_PREALLOC_WDOGS=4 CONFIG_PTHREAD_STACK_DEFAULT=1024 CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x0000 @@ -41,6 +40,5 @@ CONFIG_TESTING_OSTEST_NBARRIER_THREADS=4 CONFIG_TESTING_OSTEST_STACKSIZE=1024 CONFIG_USERMAIN_STACKSIZE=1024 CONFIG_USER_ENTRYPOINT="ostest_main" -CONFIG_WDOG_INTRESERVE=0 CONFIG_WINDOWS_NATIVE=y CONFIG_Z180_ESCCA=y diff --git a/boards/z80/z8/z8encore000zco/configs/ostest/defconfig b/boards/z80/z8/z8encore000zco/configs/ostest/defconfig index d99334832bc..3551946f660 100644 --- a/boards/z80/z8/z8encore000zco/configs/ostest/defconfig +++ b/boards/z80/z8/z8encore000zco/configs/ostest/defconfig @@ -27,7 +27,6 @@ CONFIG_NFILE_DESCRIPTORS=3 CONFIG_NFILE_STREAMS=0 CONFIG_NUNGET_CHARS=0 CONFIG_PREALLOC_TIMERS=0 -CONFIG_PREALLOC_WDOGS=4 CONFIG_PTHREAD_STACK_DEFAULT=256 CONFIG_PTHREAD_STACK_MIN=128 CONFIG_RAM_SIZE=65536 @@ -48,5 +47,4 @@ CONFIG_UART1_RXBUFSIZE=0 CONFIG_UART1_TXBUFSIZE=0 CONFIG_USERMAIN_STACKSIZE=256 CONFIG_USER_ENTRYPOINT="ostest_main" -CONFIG_WDOG_INTRESERVE=0 CONFIG_Z8_ZDSII_V522=y diff --git a/boards/z80/z8/z8f64200100kit/configs/ostest/defconfig b/boards/z80/z8/z8f64200100kit/configs/ostest/defconfig index c60a423180d..cb8fbf81f50 100644 --- a/boards/z80/z8/z8f64200100kit/configs/ostest/defconfig +++ b/boards/z80/z8/z8f64200100kit/configs/ostest/defconfig @@ -26,7 +26,6 @@ CONFIG_NFILE_DESCRIPTORS=3 CONFIG_NFILE_STREAMS=0 CONFIG_NUNGET_CHARS=0 CONFIG_PREALLOC_TIMERS=0 -CONFIG_PREALLOC_WDOGS=4 CONFIG_PTHREAD_STACK_DEFAULT=256 CONFIG_PTHREAD_STACK_MIN=128 CONFIG_RAM_SIZE=65536 @@ -47,5 +46,4 @@ CONFIG_UART1_RXBUFSIZE=0 CONFIG_UART1_TXBUFSIZE=0 CONFIG_USERMAIN_STACKSIZE=256 CONFIG_USER_ENTRYPOINT="ostest_main" -CONFIG_WDOG_INTRESERVE=0 CONFIG_Z8_ZDSII_V522=y diff --git a/boards/z80/z80/z80sim/configs/nsh/defconfig b/boards/z80/z80/z80sim/configs/nsh/defconfig index ab1742209c2..6d394b01e0c 100644 --- a/boards/z80/z80/z80sim/configs/nsh/defconfig +++ b/boards/z80/z80/z80sim/configs/nsh/defconfig @@ -37,7 +37,6 @@ CONFIG_NSH_FILEIOSIZE=1024 CONFIG_NSH_LINELEN=40 CONFIG_NUNGET_CHARS=0 CONFIG_PREALLOC_TIMERS=0 -CONFIG_PREALLOC_WDOGS=4 CONFIG_PTHREAD_STACK_DEFAULT=1024 CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x0000 @@ -52,4 +51,3 @@ CONFIG_UART_RXBUFSIZE=64 CONFIG_UART_TXBUFSIZE=64 CONFIG_USERMAIN_STACKSIZE=1024 CONFIG_USER_ENTRYPOINT="nsh_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/z80/z80/z80sim/configs/ostest/defconfig b/boards/z80/z80/z80sim/configs/ostest/defconfig index f61fdef20e7..cbf37a586c7 100644 --- a/boards/z80/z80/z80sim/configs/ostest/defconfig +++ b/boards/z80/z80/z80sim/configs/ostest/defconfig @@ -22,7 +22,6 @@ CONFIG_NFILE_DESCRIPTORS=3 CONFIG_NFILE_STREAMS=0 CONFIG_NUNGET_CHARS=0 CONFIG_PREALLOC_TIMERS=0 -CONFIG_PREALLOC_WDOGS=4 CONFIG_PTHREAD_STACK_DEFAULT=1024 CONFIG_RAM_SIZE=65536 CONFIG_RAM_START=0x0000 @@ -40,4 +39,3 @@ CONFIG_UART_SERIAL_CONSOLE=y CONFIG_UART_TXBUFSIZE=64 CONFIG_USERMAIN_STACKSIZE=1024 CONFIG_USER_ENTRYPOINT="ostest_main" -CONFIG_WDOG_INTRESERVE=0 diff --git a/drivers/input/ads7843e.c b/drivers/input/ads7843e.c index baeefccf43f..7f45a0af6de 100644 --- a/drivers/input/ads7843e.c +++ b/drivers/input/ads7843e.c @@ -480,7 +480,7 @@ static int ads7843e_schedule(FAR struct ads7843e_dev_s *priv) * while the pen remains down. */ - wd_cancel(priv->wdog); + wd_cancel(&priv->wdog); /* Transfer processing to the worker thread. Since ADS7843E interrupts are * disabled while the work is pending, no special action should be required @@ -537,7 +537,7 @@ static void ads7843e_worker(FAR void *arg) * by this function and this function is serialized on the worker thread. */ - wd_cancel(priv->wdog); + wd_cancel(&priv->wdog); /* Lock the SPI bus so that we have exclusive access */ @@ -602,7 +602,7 @@ static void ads7843e_worker(FAR void *arg) * later. */ - wd_start(priv->wdog, ADS7843E_WDOG_DELAY, + wd_start(&priv->wdog, ADS7843E_WDOG_DELAY, ads7843e_wdog, 1, (wdparm_t)priv); goto ignored; } @@ -637,7 +637,7 @@ static void ads7843e_worker(FAR void *arg) /* Continue to sample the position while the pen is down */ - wd_start(priv->wdog, ADS7843E_WDOG_DELAY, + wd_start(&priv->wdog, ADS7843E_WDOG_DELAY, ads7843e_wdog, 1, (wdparm_t)priv); /* Check the thresholds. Bail if there is no significant difference */ @@ -1171,7 +1171,6 @@ int ads7843e_register(FAR struct spi_dev_s *spi, memset(priv, 0, sizeof(struct ads7843e_dev_s)); priv->spi = spi; /* Save the SPI device handle */ priv->config = config; /* Save the board configuration */ - priv->wdog = wd_create(); /* Create a watchdog timer */ priv->threshx = INVALID_THRESHOLD; /* Initialize thresholding logic */ priv->threshy = INVALID_THRESHOLD; /* Initialize thresholding logic */ diff --git a/drivers/input/ads7843e.h b/drivers/input/ads7843e.h index e30ac40b645..5d38a839d3b 100644 --- a/drivers/input/ads7843e.h +++ b/drivers/input/ads7843e.h @@ -149,7 +149,7 @@ struct ads7843e_dev_s FAR struct spi_dev_s *spi; /* Saved SPI driver instance */ struct work_s work; /* Supports the interrupt handling "bottom half" */ struct ads7843e_sample_s sample; /* Last sampled touch point data */ - WDOG_ID wdog; /* Poll the position while the pen is down */ + struct wdog_s wdog; /* Poll the position while the pen is down */ /* The following is a list if poll structures of threads waiting for * driver events. The 'struct pollfd' reference for each open is also diff --git a/drivers/input/ft5x06.c b/drivers/input/ft5x06.c index ed983654e47..7a942505c98 100644 --- a/drivers/input/ft5x06.c +++ b/drivers/input/ft5x06.c @@ -141,7 +141,7 @@ struct ft5x06_dev_s struct work_s work; /* Supports the interrupt * handling "bottom half" */ #ifdef CONFIG_FT5X06_POLLMODE - WDOG_ID polltimer; /* Poll timer */ + struct wdog_s polltimer; /* Poll timer */ #endif uint8_t touchbuf[FT5X06_TOUCH_DATA_LEN]; /* Raw touch data */ @@ -363,7 +363,7 @@ static void ft5x06_data_worker(FAR void *arg) #ifdef CONFIG_FT5X06_POLLMODE /* Exit, re-starting the poll. */ - wd_start(priv->polltimer, priv->delay, + wd_start(&priv->polltimer, priv->delay, ft5x06_poll_timeout, 1, (wdparm_t)priv); #else @@ -764,7 +764,7 @@ static void ft5x06_shutdown(FAR struct ft5x06_dev_s *priv) #ifdef CONFIG_FT5X06_POLLMODE /* Stop the poll timer */ - wd_cancel(priv->polltimer); + wd_cancel(&priv->polltimer); #else FAR const struct ft5x06_config_s *config = priv->config; @@ -1176,13 +1176,6 @@ int ft5x06_register(FAR struct i2c_master_s *i2c, /* Allocate a timer for polling the FT5x06 */ priv->delay = POLL_MAXDELAY; - priv->polltimer = wd_create(); - if (priv->polltimer == NULL) - { - ierr("ERROR: Failed to allocate polltimer\n"); - ret = -EBUSY; - goto errout_with_priv; - } #else /* Make sure that the FT5x06 interrupt interrupt is disabled */ @@ -1196,7 +1189,7 @@ int ft5x06_register(FAR struct i2c_master_s *i2c, if (ret < 0) { ierr("ERROR: Failed to attach interrupt\n"); - goto errout_with_timer; + goto errout_with_priv; } #endif @@ -1209,7 +1202,7 @@ int ft5x06_register(FAR struct i2c_master_s *i2c, if (ret < 0) { ierr("ERROR: register_driver() failed: %d\n", ret); - goto errout_with_timer; + goto errout_with_priv; } /* Schedule work to perform the initial sampling and to set the data @@ -1220,19 +1213,14 @@ int ft5x06_register(FAR struct i2c_master_s *i2c, if (ret < 0) { ierr("ERROR: Failed to queue work: %d\n", ret); - goto errout_with_timer; + goto errout_with_priv; } /* And return success */ return OK; -errout_with_timer: -#ifdef CONFIG_FT5X06_POLLMODE - wd_delete(priv->polltimer); - errout_with_priv: -#endif nxsem_destroy(&priv->devsem); kmm_free(priv); return ret; diff --git a/drivers/input/max11802.c b/drivers/input/max11802.c index 5fd352a773d..fb5a8d9a286 100644 --- a/drivers/input/max11802.c +++ b/drivers/input/max11802.c @@ -439,7 +439,7 @@ static int max11802_schedule(FAR struct max11802_dev_s *priv) * while the pen remains down. */ - wd_cancel(priv->wdog); + wd_cancel(&priv->wdog); /* Transfer processing to the worker thread. Since MAX11802 interrupts are * disabled while the work is pending, no special action should be required @@ -497,7 +497,7 @@ static void max11802_worker(FAR void *arg) * by this function and this function is serialized on the worker thread. */ - wd_cancel(priv->wdog); + wd_cancel(&priv->wdog); /* Lock the SPI bus so that we have exclusive access */ @@ -580,7 +580,7 @@ static void max11802_worker(FAR void *arg) iinfo("Previous pen up event still in buffer\n"); max11802_notify(priv); - wd_start(priv->wdog, MAX11802_WDOG_DELAY, + wd_start(&priv->wdog, MAX11802_WDOG_DELAY, max11802_wdog, 1, (wdparm_t)priv); goto ignored; } @@ -620,7 +620,7 @@ static void max11802_worker(FAR void *arg) /* Continue to sample the position while the pen is down */ - wd_start(priv->wdog, MAX11802_WDOG_DELAY, + wd_start(&priv->wdog, MAX11802_WDOG_DELAY, max11802_wdog, 1, (wdparm_t)priv); /* Check if data is valid */ @@ -1165,7 +1165,6 @@ int max11802_register(FAR struct spi_dev_s *spi, memset(priv, 0, sizeof(struct max11802_dev_s)); priv->spi = spi; /* Save the SPI device handle */ priv->config = config; /* Save the board configuration */ - priv->wdog = wd_create(); /* Create a watchdog timer */ priv->threshx = INVALID_THRESHOLD; /* Initialize thresholding logic */ priv->threshy = INVALID_THRESHOLD; /* Initialize thresholding logic */ diff --git a/drivers/input/max11802.h b/drivers/input/max11802.h index 1a2dc41f4f5..69380fac172 100644 --- a/drivers/input/max11802.h +++ b/drivers/input/max11802.h @@ -141,7 +141,7 @@ struct max11802_dev_s FAR struct spi_dev_s *spi; /* Saved SPI driver instance */ struct work_s work; /* Supports the interrupt handling "bottom half" */ struct max11802_sample_s sample; /* Last sampled touch point data */ - WDOG_ID wdog; /* Poll the position while the pen is down */ + struct wdog_s wdog; /* Poll the position while the pen is down */ /* The following is a list if poll structures of threads waiting for * driver events. The 'struct pollfd' reference for each open is also diff --git a/drivers/input/stmpe811.h b/drivers/input/stmpe811.h index dccdf4860ff..b0cee62cc53 100644 --- a/drivers/input/stmpe811.h +++ b/drivers/input/stmpe811.h @@ -160,7 +160,7 @@ struct stmpe811_dev_s sem_t waitsem; /* Used to wait for the availability of data */ struct work_s timeout; /* Supports tiemeout work */ - WDOG_ID wdog; /* Timeout to detect missing pen down events */ + struct wdog_s wdog; /* Timeout to detect missing pen down events */ struct stmpe811_sample_s sample; /* Last sampled touch point data */ /* The following is a list if poll structures of threads waiting for diff --git a/drivers/input/stmpe811_tsc.c b/drivers/input/stmpe811_tsc.c index 5f41edf117c..2fa0957e064 100644 --- a/drivers/input/stmpe811_tsc.c +++ b/drivers/input/stmpe811_tsc.c @@ -894,16 +894,6 @@ int stmpe811_register(STMPE811_HANDLE handle, int minor) priv->threshx = 0; priv->threshy = 0; - /* Create a timer for catching missed pen up conditions */ - - priv->wdog = wd_create(); - if (!priv->wdog) - { - ierr("ERROR: Failed to create a watchdog\n", errno); - nxsem_post(&priv->exclsem); - return -ENOSPC; - } - /* Register the character driver */ snprintf(devname, DEV_NAMELEN, DEV_FORMAT, minor); @@ -949,7 +939,7 @@ void stmpe811_tscworker(FAR struct stmpe811_dev_s *priv, uint8_t intsta) /* Cancel the missing pen up timer */ - wd_cancel(priv->wdog); + wd_cancel(&priv->wdog); /* Check for pen up or down from the TSC_STA bit in STMPE811_TSC_CTRL. */ @@ -1092,7 +1082,7 @@ ignored: if (priv->sample.contact == CONTACT_DOWN || priv->sample.contact == CONTACT_MOVE) { - wd_start(priv->wdog, STMPE811_PENUP_TICKS, + wd_start(&priv->wdog, STMPE811_PENUP_TICKS, stmpe811_timeout, 1, (wdparm_t)priv); } diff --git a/drivers/ioexpander/pcf8574.c b/drivers/ioexpander/pcf8574.c index c0193f5ac91..0267b63e35c 100644 --- a/drivers/ioexpander/pcf8574.c +++ b/drivers/ioexpander/pcf8574.c @@ -987,7 +987,7 @@ static void pcf8574_irqworker(void *arg) /* Re-start the poll timer */ sched_lock(); - ret = wd_start(priv->wdog, PCF8574_POLLDELAY, + ret = wd_start(&priv->wdog, PCF8574_POLLDELAY, pcf8574_poll_expiry, 1, (wdparm_t)priv); if (ret < 0) { @@ -1036,7 +1036,7 @@ static void pcf8574_interrupt(FAR void *arg) #ifdef CONFIG_PCF8574_INT_POLL /* Cancel the poll timer */ - wd_cancel(priv->wdog); + wd_cancel(&priv->wdog); #endif /* Disable interrupts */ @@ -1158,10 +1158,7 @@ FAR struct ioexpander_dev_s *pcf8574_initialize(FAR struct i2c_master_s *i2c, #ifdef CONFIG_PCF8574_INT_POLL /* Set up a timer to poll for missed interrupts */ - priv->wdog = wd_create(); - DEBUGASSERT(priv->wdog != NULL); - - ret = wd_start(priv->wdog, PCF8574_POLLDELAY, + ret = wd_start(&priv->wdog, PCF8574_POLLDELAY, pcf8574_poll_expiry, 1, (wdparm_t)priv); if (ret < 0) { diff --git a/drivers/ioexpander/pcf8574.h b/drivers/ioexpander/pcf8574.h index e1d23a5e079..356ea4a1177 100644 --- a/drivers/ioexpander/pcf8574.h +++ b/drivers/ioexpander/pcf8574.h @@ -149,7 +149,7 @@ struct pcf8574_dev_s #ifdef CONFIG_IOEXPANDER_INT_ENABLE #ifdef CONFIG_PCF8574_INT_POLL - WDOG_ID wdog; /* Timer used to poll for missed interrupts */ + struct wdog_s wdog; /* Timer used to poll for missed interrupts */ #endif uint8_t input; /* Last input registers */ diff --git a/drivers/ioexpander/tca64xx.c b/drivers/ioexpander/tca64xx.c index 46040bf5503..2f7b316cc2d 100644 --- a/drivers/ioexpander/tca64xx.c +++ b/drivers/ioexpander/tca64xx.c @@ -1261,7 +1261,7 @@ errout_with_restart: /* Re-start the poll timer */ sched_lock(); - ret = wd_start(priv->wdog, TCA64XX_POLLDELAY, + ret = wd_start(&priv->wdog, TCA64XX_POLLDELAY, tca64_poll_expiry, 1, (wdparm_t)priv); if (ret < 0) { @@ -1310,7 +1310,7 @@ static void tca64_interrupt(FAR void *arg) #ifdef CONFIG_TCA64XX_INT_POLL /* Cancel the poll timer */ - wd_cancel(priv->wdog); + wd_cancel(&priv->wdog); #endif /* Disable interrupts */ @@ -1431,10 +1431,7 @@ FAR struct ioexpander_dev_s *tca64_initialize(FAR struct i2c_master_s *i2c, #ifdef CONFIG_TCA64XX_INT_POLL /* Set up a timer to poll for missed interrupts */ - priv->wdog = wd_create(); - DEBUGASSERT(priv->wdog != NULL); - - ret = wd_start(priv->wdog, TCA64XX_POLLDELAY, + ret = wd_start(&priv->wdog, TCA64XX_POLLDELAY, tca64_poll_expiry, 1, (wdparm_t)priv); if (ret < 0) { diff --git a/drivers/ioexpander/tca64xx.h b/drivers/ioexpander/tca64xx.h index 6f4e999e317..59141f010ac 100644 --- a/drivers/ioexpander/tca64xx.h +++ b/drivers/ioexpander/tca64xx.h @@ -221,7 +221,7 @@ struct tca64_dev_s #ifdef CONFIG_IOEXPANDER_INT_ENABLE #ifdef CONFIG_TCA64XX_INT_POLL - WDOG_ID wdog; /* Timer used to poll for missed interrupts */ + struct wdog_s wdog; /* Timer used to poll for missed interrupts */ #endif ioe_pinset_t input; /* Last input registers */ diff --git a/drivers/net/dm90x0.c b/drivers/net/dm90x0.c index 01ffbe19794..c2649b92a8a 100644 --- a/drivers/net/dm90x0.c +++ b/drivers/net/dm90x0.c @@ -323,8 +323,8 @@ struct dm9x_driver_s bool dm_b100m; /* true:speed == 100M; false:speed == 10M */ uint8_t dm_ntxpending; /* Count of packets pending transmission */ uint8_t ncrxpackets; /* Number of continuous rx packets */ - WDOG_ID dm_txpoll; /* TX poll timer */ - WDOG_ID dm_txtimeout; /* TX timeout timer */ + struct wdog_s dm_txpoll; /* TX poll timer */ + struct wdog_s dm_txtimeout; /* TX timeout timer */ struct work_s dm_irqwork; /* For deferring interrupt work to the work queue */ struct work_s dm_pollwork; /* For deferring poll work to the work queue */ @@ -768,7 +768,7 @@ static int dm9x_transmit(FAR struct dm9x_driver_s *priv) /* Setup the TX timeout watchdog (perhaps restarting the timer) */ - wd_start(priv->dm_txtimeout, DM6X_TXTIMEOUT, + wd_start(&priv->dm_txtimeout, DM6X_TXTIMEOUT, dm9x_txtimeout_expiry, 1, (wdparm_t)priv); return OK; } @@ -1119,7 +1119,7 @@ static void dm9x_txdone(FAR struct dm9x_driver_s *priv) if (priv->dm_ntxpending == 0) { - wd_cancel(priv->dm_txtimeout); + wd_cancel(&priv->dm_txtimeout); } /* Then poll the network for new XMIT data */ @@ -1291,7 +1291,7 @@ static int dm9x_interrupt(int irq, FAR void *context, FAR void *arg) * expiration and the deferred interrupt processing. */ - wd_cancel(priv->dm_txtimeout); + wd_cancel(&priv->dm_txtimeout); } /* Schedule to perform the interrupt processing on the worker thread. */ @@ -1427,7 +1427,7 @@ static void dm9x_poll_work(FAR void *arg) /* Setup the watchdog poll timer again */ - wd_start(priv->dm_txpoll, DM9X_WDDELAY, + wd_start(&priv->dm_txpoll, DM9X_WDDELAY, dm9x_poll_expiry, 1, (wdparm_t)priv); net_unlock(); } @@ -1563,7 +1563,7 @@ static int dm9x_ifup(FAR struct net_driver_s *dev) /* Set and activate a timer process */ - wd_start(priv->dm_txpoll, DM9X_WDDELAY, + wd_start(&priv->dm_txpoll, DM9X_WDDELAY, dm9x_poll_expiry, 1, (wdparm_t)priv); /* Enable the DM9X interrupt */ @@ -1604,8 +1604,8 @@ static int dm9x_ifdown(FAR struct net_driver_s *dev) /* Cancel the TX poll timer and TX timeout timers */ - wd_cancel(priv->dm_txpoll); - wd_cancel(priv->dm_txtimeout); + wd_cancel(&priv->dm_txpoll); + wd_cancel(&priv->dm_txtimeout); /* Reset the device */ @@ -1887,8 +1887,8 @@ static void dm9x_reset(FAR struct dm9x_driver_s *priv) /* Cancel the TX poll timer and TX timeout timers */ - wd_cancel(priv->dm_txpoll); - wd_cancel(priv->dm_txtimeout); + wd_cancel(&priv->dm_txpoll); + wd_cancel(&priv->dm_txtimeout); /* Save previous register address */ @@ -1985,12 +1985,7 @@ int dm9x_initialize(void) g_dm9x[0].dm_dev.d_addmac = dm9x_addmac; /* Add multicast MAC address */ g_dm9x[0].dm_dev.d_rmmac = dm9x_rmmac; /* Remove multicast MAC address */ #endif - g_dm9x[0].dm_dev.d_private = (FAR void *)g_dm9x; /* Used to recover private state from dev */ - - /* Create a watchdog for timing polling for and timing of transmissions */ - - g_dm9x[0].dm_txpoll = wd_create(); /* Create periodic poll timer */ - g_dm9x[0].dm_txtimeout = wd_create(); /* Create TX timeout timer */ + g_dm9x[0].dm_dev.d_private = g_dm9x; /* Used to recover private state from dev */ /* Read the MAC address */ diff --git a/drivers/net/enc28j60.c b/drivers/net/enc28j60.c index 3c2c8e7ee9c..c88befbe82d 100644 --- a/drivers/net/enc28j60.c +++ b/drivers/net/enc28j60.c @@ -242,8 +242,8 @@ struct enc_driver_s /* Timing */ - WDOG_ID txpoll; /* TX poll timer */ - WDOG_ID txtimeout; /* TX timeout timer */ + struct wdog_s txpoll; /* TX poll timer */ + struct wdog_s txtimeout; /* TX timeout timer */ /* If we don't own the SPI bus, then we cannot do SPI accesses from the * interrupt handler. @@ -1158,7 +1158,7 @@ static int enc_transmit(FAR struct enc_driver_s *priv) * the timer is started? */ - wd_start(priv->txtimeout, ENC_TXTIMEOUT, + wd_start(&priv->txtimeout, ENC_TXTIMEOUT, enc_txtimeout, 1, (wdparm_t)priv); return OK; } @@ -1295,7 +1295,7 @@ static void enc_txif(FAR struct enc_driver_s *priv) /* If no further xmits are pending, then cancel the TX timeout */ - wd_cancel(priv->txtimeout); + wd_cancel(&priv->txtimeout); /* Then poll the network for new XMIT data */ @@ -2016,7 +2016,7 @@ static void enc_pollworker(FAR void *arg) /* Setup the watchdog poll timer again */ - wd_start(priv->txpoll, ENC_WDDELAY, + wd_start(&priv->txpoll, ENC_WDDELAY, enc_polltimer, 1, (wdparm_t)arg); } @@ -2116,7 +2116,7 @@ static int enc_ifup(struct net_driver_s *dev) /* Set and activate a timer process */ - wd_start(priv->txpoll, ENC_WDDELAY, + wd_start(&priv->txpoll, ENC_WDDELAY, enc_polltimer, 1, (wdparm_t)priv); /* Mark the interface up and enable the Ethernet interrupt at the @@ -2170,8 +2170,8 @@ static int enc_ifdown(struct net_driver_s *dev) /* Cancel the TX poll timer and TX timeout timers */ - wd_cancel(priv->txpoll); - wd_cancel(priv->txtimeout); + wd_cancel(&priv->txpoll); + wd_cancel(&priv->txtimeout); /* Reset the device and leave in the power save state */ @@ -2656,13 +2656,8 @@ int enc_initialize(FAR struct spi_dev_s *spi, priv->dev.d_rmmac = enc_rmmac; /* Remove multicast MAC address */ #endif priv->dev.d_private = priv; /* Used to recover private state from dev */ - - /* Create a watchdog for timing polling for and timing of transmissions */ - - priv->txpoll = wd_create(); /* Create periodic poll timer */ - priv->txtimeout = wd_create(); /* Create TX timeout timer */ - priv->spi = spi; /* Save the SPI instance */ - priv->lower = lower; /* Save the low-level MCU interface */ + priv->spi = spi; /* Save the SPI instance */ + priv->lower = lower; /* Save the low-level MCU interface */ /* The interface should be in the down state. However, this function is * called too early in initialization to perform the ENC28J60 reset in diff --git a/drivers/net/encx24j600.c b/drivers/net/encx24j600.c index a431b1962e5..16d2e10424a 100644 --- a/drivers/net/encx24j600.c +++ b/drivers/net/encx24j600.c @@ -245,8 +245,8 @@ struct enc_driver_s /* Timing */ - WDOG_ID txpoll; /* TX poll timer */ - WDOG_ID txtimeout; /* TX timeout timer */ + struct wdog_s txpoll; /* TX poll timer */ + struct wdog_s txtimeout; /* TX timeout timer */ /* Avoid SPI accesses from the interrupt handler by using the work queue */ @@ -1064,7 +1064,7 @@ static int enc_transmit(FAR struct enc_driver_s *priv) * the timer is started? */ - wd_start(priv->txtimeout, ENC_TXTIMEOUT, + wd_start(&priv->txtimeout, ENC_TXTIMEOUT, enc_txtimeout, 1, (wdparm_t)priv); /* free the descriptor */ @@ -1296,7 +1296,7 @@ static void enc_txif(FAR struct enc_driver_s *priv) { /* If no further xmits are pending, then cancel the TX timeout */ - wd_cancel(priv->txtimeout); + wd_cancel(&priv->txtimeout); /* Poll for TX packets from the networking layer */ @@ -2170,7 +2170,7 @@ static void enc_pollworker(FAR void *arg) /* Setup the watchdog poll timer again */ - wd_start(priv->txpoll, ENC_WDDELAY, enc_polltimer, 1, (wdparm_t)arg); + wd_start(&priv->txpoll, ENC_WDDELAY, enc_polltimer, 1, (wdparm_t)arg); } /**************************************************************************** @@ -2272,7 +2272,7 @@ static int enc_ifup(struct net_driver_s *dev) /* Set and activate a timer process */ - wd_start(priv->txpoll, ENC_WDDELAY, + wd_start(&priv->txpoll, ENC_WDDELAY, enc_polltimer, 1, (wdparm_t)priv); /* Mark the interface up and enable the Ethernet interrupt at the @@ -2327,8 +2327,8 @@ static int enc_ifdown(struct net_driver_s *dev) /* Cancel the TX poll timer and TX timeout timers */ - wd_cancel(priv->txpoll); - wd_cancel(priv->txtimeout); + wd_cancel(&priv->txpoll); + wd_cancel(&priv->txtimeout); /* Reset the device and leave in the power save state */ @@ -2851,13 +2851,8 @@ int enc_initialize(FAR struct spi_dev_s *spi, priv->dev.d_rmmac = enc_rmmac; /* Remove multicast MAC address */ #endif priv->dev.d_private = priv; /* Used to recover private state from dev */ - - /* Create a watchdog for timing polling for and timing of transmissions */ - - priv->txpoll = wd_create(); /* Create periodic poll timer */ - priv->txtimeout = wd_create(); /* Create TX timeout timer */ - priv->spi = spi; /* Save the SPI instance */ - priv->lower = lower; /* Save the low-level MCU interface */ + priv->spi = spi; /* Save the SPI instance */ + priv->lower = lower; /* Save the low-level MCU interface */ /* The interface should be in the down state. However, this function is * called too early in initialization to perform the ENCX24J600 reset in diff --git a/drivers/net/ftmac100.c b/drivers/net/ftmac100.c index 5d76bce891a..f0b9fc0afef 100644 --- a/drivers/net/ftmac100.c +++ b/drivers/net/ftmac100.c @@ -177,8 +177,8 @@ struct ftmac100_driver_s /* NuttX net data */ bool ft_bifup; /* true:ifup false:ifdown */ - WDOG_ID ft_txpoll; /* TX poll timer */ - WDOG_ID ft_txtimeout; /* TX timeout timer */ + struct wdog_s ft_txpoll; /* TX poll timer */ + struct wdog_s ft_txtimeout; /* TX timeout timer */ unsigned int status; /* Last ISR status */ struct work_s ft_irqwork; /* For deferring work to the work queue */ struct work_s ft_pollwork; /* For deferring work to the work queue */ @@ -329,7 +329,7 @@ static int ftmac100_transmit(FAR struct ftmac100_driver_s *priv) /* Setup the TX timeout watchdog (perhaps restarting the timer) */ - wd_start(priv->ft_txtimeout, FTMAC100_TXTIMEOUT, + wd_start(&priv->ft_txtimeout, FTMAC100_TXTIMEOUT, ftmac100_txtimeout_expiry, 1, (wdparm_t)priv); return OK; @@ -865,7 +865,7 @@ static void ftmac100_txdone(FAR struct ftmac100_driver_s *priv) /* Cancel the TX timeout */ - wd_cancel(priv->ft_txtimeout); + wd_cancel(&priv->ft_txtimeout); /* Then poll the network for new XMIT data */ @@ -1027,7 +1027,7 @@ static int ftmac100_interrupt(int irq, FAR void *context, FAR void *arg) */ ninfo("\n\nTXDONE 0\n\n"); - wd_cancel(priv->ft_txtimeout); + wd_cancel(&priv->ft_txtimeout); } /* Schedule to perform the interrupt processing on the worker thread. */ @@ -1144,7 +1144,7 @@ static void ftmac100_poll_work(FAR void *arg) /* Setup the watchdog poll timer again */ - wd_start(priv->ft_txpoll, FTMAC100_WDDELAY, + wd_start(&priv->ft_txpoll, FTMAC100_WDDELAY, ftmac100_poll_expiry, 1, (wdparm_t)priv); net_unlock(); } @@ -1230,7 +1230,7 @@ static int ftmac100_ifup(struct net_driver_s *dev) /* Set and activate a timer process */ - wd_start(priv->ft_txpoll, FTMAC100_WDDELAY, + wd_start(&priv->ft_txpoll, FTMAC100_WDDELAY, ftmac100_poll_expiry, 1, (wdparm_t)priv); /* Enable the Ethernet interrupt */ @@ -1271,8 +1271,8 @@ static int ftmac100_ifdown(struct net_driver_s *dev) /* Cancel the TX poll timer and TX timeout timers */ - wd_cancel(priv->ft_txpoll); - wd_cancel(priv->ft_txtimeout); + wd_cancel(&priv->ft_txpoll); + wd_cancel(&priv->ft_txtimeout); /* Put the EMAC in its reset, non-operational state. This should be * a known configuration that will guarantee the ftmac100_ifup() always @@ -1599,14 +1599,8 @@ int ftmac100_initialize(int intf) priv->ft_dev.d_addmac = ftmac100_addmac; /* Add multicast MAC address */ priv->ft_dev.d_rmmac = ftmac100_rmmac; /* Remove multicast MAC address */ #endif - priv->ft_dev.d_private = (FAR void *)g_ftmac100; /* Used to recover private state from dev */ - - /* Create a watchdog for timing polling for and timing of transmissions */ - - priv->ft_txpoll = wd_create(); /* Create periodic poll timer */ - priv->ft_txtimeout = wd_create(); /* Create TX timeout timer */ - - priv->iobase = CONFIG_FTMAC100_BASE; + priv->ft_dev.d_private = g_ftmac100; /* Used to recover private state from dev */ + priv->iobase = CONFIG_FTMAC100_BASE; /* Put the interface in the down state. This usually amounts to resetting * the device and/or calling ftmac100_ifdown(). diff --git a/drivers/net/lan91c111.c b/drivers/net/lan91c111.c index 4787c9c020b..f5930bfe401 100644 --- a/drivers/net/lan91c111.c +++ b/drivers/net/lan91c111.c @@ -106,7 +106,7 @@ struct lan91c111_driver_s uintptr_t base; /* Base address */ int irq; /* IRQ number */ uint16_t bank; /* Current bank */ - WDOG_ID txpoll; /* TX poll timer */ + struct wdog_s txpoll; /* TX poll timer */ struct work_s irqwork; /* For deferring interrupt work to the work queue */ struct work_s pollwork; /* For deferring poll work to the work queue */ uint8_t pktbuf[MAX_NETDEV_PKTSIZE + 4]; /* +4 due to getregs32/putregs32 */ @@ -1041,7 +1041,7 @@ static void lan91c111_poll_work(FAR void *arg) /* Setup the watchdog poll timer again */ - wd_start(priv->txpoll, LAN91C111_WDDELAY, + wd_start(&priv->txpoll, LAN91C111_WDDELAY, lan91c111_poll_expiry, 1, (wdparm_t)dev); net_unlock(); } @@ -1142,7 +1142,7 @@ static int lan91c111_ifup(FAR struct net_driver_s *dev) /* Set and activate a timer process */ - wd_start(priv->txpoll, LAN91C111_WDDELAY, + wd_start(&priv->txpoll, LAN91C111_WDDELAY, lan91c111_poll_expiry, 1, (wdparm_t)dev); net_unlock(); @@ -1181,7 +1181,7 @@ static int lan91c111_ifdown(FAR struct net_driver_s *dev) /* Cancel the TX poll timer and work */ - wd_cancel(priv->txpoll); + wd_cancel(&priv->txpoll); work_cancel(LAN91C111_WORK, &priv->irqwork); work_cancel(LAN91C111_WORK, &priv->pollwork); @@ -1624,11 +1624,6 @@ int lan91c111_initialize(uintptr_t base, int irq) #endif dev->d_private = priv; /* Used to recover private state from dev */ - /* Create a watchdog for timing polling for transmissions */ - - priv->txpoll = wd_create(); /* Create periodic poll timer */ - DEBUGASSERT(priv->txpoll != NULL); - /* Put the interface in the down state. This usually amounts to resetting * the device and/or calling lan91c111_ifdown(). */ diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c index e102612dd97..2632515921a 100644 --- a/drivers/net/loopback.c +++ b/drivers/net/loopback.c @@ -98,7 +98,7 @@ struct lo_driver_s { bool lo_bifup; /* true:ifup false:ifdown */ bool lo_txdone; /* One RX packet was looped back */ - WDOG_ID lo_polldog; /* TX poll timer */ + struct wdog_s lo_polldog; /* TX poll timer */ struct work_s lo_work; /* For deferring poll work to the work queue */ /* This holds the information visible to the NuttX network */ @@ -251,7 +251,7 @@ static void lo_poll_work(FAR void *arg) /* Setup the watchdog poll timer again */ - wd_start(priv->lo_polldog, LO_WDDELAY, lo_poll_expiry, 1, (wdparm_t)priv); + wd_start(&priv->lo_polldog, LO_WDDELAY, lo_poll_expiry, 1, (wdparm_t)priv); net_unlock(); } @@ -318,7 +318,7 @@ static int lo_ifup(FAR struct net_driver_s *dev) /* Set and activate a timer process */ - wd_start(priv->lo_polldog, LO_WDDELAY, + wd_start(&priv->lo_polldog, LO_WDDELAY, lo_poll_expiry, 1, (wdparm_t)priv); priv->lo_bifup = true; @@ -347,7 +347,7 @@ static int lo_ifdown(FAR struct net_driver_s *dev) /* Cancel the TX poll timer and TX timeout timers */ - wd_cancel(priv->lo_polldog); + wd_cancel(&priv->lo_polldog); /* Mark the device "down" */ @@ -525,10 +525,6 @@ int localhost_initialize(void) priv->lo_dev.d_buf = g_iobuffer; /* Attach the IO buffer */ priv->lo_dev.d_private = priv; /* Used to recover private state from dev */ - /* Create a watchdog for timing polling for and timing of transmissions */ - - priv->lo_polldog = wd_create(); /* Create periodic poll timer */ - /* Register the loopabck device with the OS so that socket IOCTLs can b * performed. */ diff --git a/drivers/net/rpmsgdrv.c b/drivers/net/rpmsgdrv.c index 0b2aa631a8f..4227cd63885 100644 --- a/drivers/net/rpmsgdrv.c +++ b/drivers/net/rpmsgdrv.c @@ -166,7 +166,7 @@ struct net_rpmsg_drv_s FAR const char *cpuname; FAR const char *devname; struct rpmsg_endpoint ept; - WDOG_ID txpoll; /* TX poll timer */ + struct wdog_s txpoll; /* TX poll timer */ struct work_s pollwork; /* For deferring poll work to the work queue */ /* This holds the information visible to the NuttX network */ @@ -843,7 +843,7 @@ static void net_rpmsg_drv_poll_work(FAR void *arg) /* Setup the watchdog poll timer again */ - wd_start(priv->txpoll, NET_RPMSG_DRV_WDDELAY, + wd_start(&priv->txpoll, NET_RPMSG_DRV_WDDELAY, net_rpmsg_drv_poll_expiry, 1, (wdparm_t)dev); net_unlock(); } @@ -968,7 +968,7 @@ static int net_rpmsg_drv_ifup(FAR struct net_driver_s *dev) /* Set and activate a timer process */ - wd_start(priv->txpoll, NET_RPMSG_DRV_WDDELAY, + wd_start(&priv->txpoll, NET_RPMSG_DRV_WDDELAY, net_rpmsg_drv_poll_expiry, 1, (wdparm_t)dev); net_unlock(); @@ -1039,7 +1039,7 @@ static int net_rpmsg_drv_ifdown(FAR struct net_driver_s *dev) /* Cancel the TX poll timer and work */ - wd_cancel(priv->txpoll); + wd_cancel(&priv->txpoll); work_cancel(LPWORK, &priv->pollwork); leave_critical_section(flags); @@ -1395,11 +1395,6 @@ int net_rpmsg_drv_init(FAR const char *cpuname, #endif dev->d_private = priv; /* Used to recover private state from dev */ - /* Create a watchdog for timing polling for transmissions */ - - priv->txpoll = wd_create(); /* Create periodic poll timer */ - DEBUGASSERT(priv->txpoll != NULL); - /* Register the device with the openamp */ rpmsg_register_callback(dev, diff --git a/drivers/net/skeleton.c b/drivers/net/skeleton.c index d324277c743..011331db6a2 100644 --- a/drivers/net/skeleton.c +++ b/drivers/net/skeleton.c @@ -116,8 +116,8 @@ struct skel_driver_s { bool sk_bifup; /* true:ifup false:ifdown */ - WDOG_ID sk_txpoll; /* TX poll timer */ - WDOG_ID sk_txtimeout; /* TX timeout timer */ + struct wdog_s sk_txpoll; /* TX poll timer */ + struct wdog_s sk_txtimeout; /* TX timeout timer */ struct work_s sk_irqwork; /* For deferring interrupt work to the work queue */ struct work_s sk_pollwork; /* For deferring poll work to the work queue */ @@ -241,7 +241,7 @@ static int skel_transmit(FAR struct skel_driver_s *priv) /* Setup the TX timeout watchdog (perhaps restarting the timer) */ - wd_start(priv->sk_txtimeout, SKELETON_TXTIMEOUT, + wd_start(&priv->sk_txtimeout, SKELETON_TXTIMEOUT, skel_txtimeout_expiry, 1, (wdparm_t)priv); return OK; } @@ -519,7 +519,7 @@ static void skel_txdone(FAR struct skel_driver_s *priv) * disable further Tx interrupts. */ - wd_cancel(priv->sk_txtimeout); + wd_cancel(&priv->sk_txtimeout); /* And disable further TX interrupts. */ @@ -620,7 +620,7 @@ static int skel_interrupt(int irq, FAR void *context, FAR void *arg) * expiration and the deferred interrupt processing. */ - wd_cancel(priv->sk_txtimeout); + wd_cancel(&priv->sk_txtimeout); } /* Schedule to perform the interrupt processing on the worker thread. */ @@ -747,7 +747,7 @@ static void skel_poll_work(FAR void *arg) /* Setup the watchdog poll timer again */ - wd_start(priv->sk_txpoll, SKELETON_WDDELAY, + wd_start(&priv->sk_txpoll, SKELETON_WDDELAY, skel_poll_expiry, 1, (wdparm_t)priv); net_unlock(); } @@ -827,7 +827,7 @@ static int skel_ifup(FAR struct net_driver_s *dev) /* Set and activate a timer process */ - wd_start(priv->sk_txpoll, SKELETON_WDDELAY, + wd_start(&priv->sk_txpoll, SKELETON_WDDELAY, skel_poll_expiry, 1, (wdparm_t)priv); /* Enable the Ethernet interrupt */ @@ -867,8 +867,8 @@ static int skel_ifdown(FAR struct net_driver_s *dev) /* Cancel the TX poll timer and TX timeout timers */ - wd_cancel(priv->sk_txpoll); - wd_cancel(priv->sk_txtimeout); + wd_cancel(&priv->sk_txpoll); + wd_cancel(&priv->sk_txtimeout); /* Put the EMAC in its reset, non-operational state. This should be * a known configuration that will guarantee the skel_ifup() always @@ -1190,14 +1190,7 @@ int skel_initialize(int intf) #ifdef CONFIG_NETDEV_IOCTL priv->sk_dev.d_ioctl = skel_ioctl; /* Handle network IOCTL commands */ #endif - priv->sk_dev.d_private = (FAR void *)g_skel; /* Used to recover private state from dev */ - - /* Create a watchdog for timing polling for and timing of transmissions */ - - priv->sk_txpoll = wd_create(); /* Create periodic poll timer */ - priv->sk_txtimeout = wd_create(); /* Create TX timeout timer */ - - DEBUGASSERT(priv->sk_txpoll != NULL && priv->sk_txtimeout != NULL); + priv->sk_dev.d_private = g_skel; /* Used to recover private state from dev */ /* Put the interface in the down state. This usually amounts to resetting * the device and/or calling skel_ifdown(). diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 5daeaf65636..f92f6b6e810 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -137,7 +137,7 @@ struct tun_device_s bool bifup; /* true:ifup false:ifdown */ bool read_wait; bool write_wait; - WDOG_ID txpoll; /* TX poll timer */ + struct wdog_s txpoll; /* TX poll timer */ struct work_s work; /* For deferring poll work to the work queue */ FAR struct pollfd *poll_fds; sem_t waitsem; @@ -811,7 +811,7 @@ static void tun_poll_work(FAR void *arg) /* Setup the watchdog poll timer again */ - wd_start(priv->txpoll, TUN_WDDELAY, tun_poll_expiry, 1, (wdparm_t)priv); + wd_start(&priv->txpoll, TUN_WDDELAY, tun_poll_expiry, 1, (wdparm_t)priv); net_unlock(); tun_unlock(priv); @@ -879,7 +879,7 @@ static int tun_ifup(FAR struct net_driver_s *dev) /* Set and activate a timer process */ - wd_start(priv->txpoll, TUN_WDDELAY, + wd_start(&priv->txpoll, TUN_WDDELAY, tun_poll_expiry, 1, (wdparm_t)priv); priv->bifup = true; @@ -911,7 +911,7 @@ static int tun_ifdown(FAR struct net_driver_s *dev) /* Cancel the TX poll timer */ - wd_cancel(priv->txpoll); + wd_cancel(&priv->txpoll); /* Mark the device "down" */ @@ -1092,7 +1092,7 @@ static int tun_dev_init(FAR struct tun_device_s *priv, priv->dev.d_addmac = tun_addmac; /* Add multicast MAC address */ priv->dev.d_rmmac = tun_rmmac; /* Remove multicast MAC address */ #endif - priv->dev.d_private = (FAR void *)priv; /* Used to recover private state from dev */ + priv->dev.d_private = priv; /* Used to recover private state from dev */ /* Initialize the mutual exlcusion and wait semaphore */ @@ -1107,10 +1107,6 @@ static int tun_dev_init(FAR struct tun_device_s *priv, nxsem_set_protocol(&priv->read_wait_sem, SEM_PRIO_NONE); nxsem_set_protocol(&priv->write_wait_sem, SEM_PRIO_NONE); - /* Create a watchdog for timing polling for and timing of transmissions */ - - priv->txpoll = wd_create(); /* Create periodic poll timer */ - /* Assign d_ifname if specified. */ if (devfmt) diff --git a/drivers/power/activity_governor.c b/drivers/power/activity_governor.c index 4faab88a39c..af2170a5c5e 100644 --- a/drivers/power/activity_governor.c +++ b/drivers/power/activity_governor.c @@ -114,7 +114,7 @@ struct pm_domain_state_s /* Timer to decrease state */ - WDOG_ID wdog; + struct wdog_s wdog; }; struct pm_activity_governor_s @@ -589,30 +589,25 @@ static void governor_timer(int domain) pdomstate = &g_pm_activity_governor.domain_states[domain]; state = pdom->state; - if (!pdomstate->wdog) - { - pdomstate->wdog = wd_create(); - } - if (state < PM_SLEEP && !pdom->stay[pdom->state]) { int delay = pmtick[state] + pdomstate->btime - clock_systime_ticks(); - int left = wd_gettime(pdomstate->wdog); + int left = wd_gettime(&pdomstate->wdog); if (delay <= 0) { delay = 1; } - if (!WDOG_ISACTIVE(pdomstate->wdog) || + if (!WDOG_ISACTIVE(&pdomstate->wdog) || abs(delay - left) > PM_TIMER_GAP) { - wd_start(pdomstate->wdog, delay, (wdentry_t)governor_timer_cb, 0); + wd_start(&pdomstate->wdog, delay, (wdentry_t)governor_timer_cb, 0); } } else { - wd_cancel(pdomstate->wdog); + wd_cancel(&pdomstate->wdog); } } diff --git a/drivers/sensors/ak09912.c b/drivers/sensors/ak09912.c index b81ae152c7b..3dacff0ea32 100644 --- a/drivers/sensors/ak09912.c +++ b/drivers/sensors/ak09912.c @@ -165,7 +165,7 @@ struct ak09912_dev_s struct sensi_data_s asa_data; /* sensitivity data */ uint8_t mode; /* power mode */ uint8_t nsf; /* noise suppression filter setting */ - WDOG_ID wd; + struct wdog_s wd; sem_t wait; }; @@ -421,7 +421,7 @@ static int ak09912_read_mag_uncomp_data(FAR struct ak09912_dev_s *priv, uint8_t state = 0; uint8_t buffer[8]; /* TMPS and ST2 is read, but the value is omitted. */ - wd_start(priv->wd, AK09912_POLLING_TIMEOUT, + wd_start(&priv->wd, AK09912_POLLING_TIMEOUT, ak09912_wd_timeout, 1, (wdparm_t)priv); state = ak09912_getreg8(priv, AK09912_ST1); while (! (state & 0x1)) @@ -429,7 +429,7 @@ static int ak09912_read_mag_uncomp_data(FAR struct ak09912_dev_s *priv, nxsem_wait(&priv->wait); } - wd_cancel(priv->wd); + wd_cancel(&priv->wd); ret = ak09912_getreg(priv, AK09912_HXL, buffer, sizeof(buffer)); mag_data->x = MERGE_BYTE(buffer[0], buffer[1]); @@ -687,7 +687,6 @@ int ak09912_register(FAR const char *devpath, FAR struct i2c_master_s *i2c) priv->addr = AK09912_ADDR; priv->freq = AK09912_FREQ; priv->compensated = ENABLE_COMPENSATED; - priv->wd = wd_create(); nxsem_init(&priv->wait, 0, 0); /* set default noise suppression filter. */ diff --git a/drivers/timers/watchdog.c b/drivers/timers/watchdog.c index 0cab155ad7e..1c38686ada8 100644 --- a/drivers/timers/watchdog.c +++ b/drivers/timers/watchdog.c @@ -78,7 +78,7 @@ struct watchdog_upperhalf_s { #ifdef CONFIG_WATCHDOG_AUTOMONITOR #if defined(CONFIG_WATCHDOG_AUTOMONITOR_BY_TIMER) - WDOG_ID wdog; + struct wdog_s wdog; #elif defined(CONFIG_WATCHDOG_AUTOMONITOR_BY_WORKER) struct work_s work; #elif defined(CONFIG_WATCHDOG_AUTOMONITOR_BY_IDLE) @@ -151,7 +151,7 @@ static void watchdog_automonitor_timer(int argc, wdparm_t arg1, ...) if (upper->monitor) { lower->ops->keepalive(lower); - wd_start(upper->wdog, WATCHDOG_AUTOMONITOR_TIMEOUT_TICK / 2, + wd_start(&upper->wdog, WATCHDOG_AUTOMONITOR_TIMEOUT_TICK / 2, watchdog_automonitor_timer, 1, (wdparm_t)upper); } } @@ -194,8 +194,7 @@ static void watchdog_automonitor_start(FAR struct watchdog_upperhalf_s #if defined(CONFIG_WATCHDOG_AUTOMONITOR_BY_CAPTURE) lower->ops->capture(lower, watchdog_automonitor_capture); #elif defined(CONFIG_WATCHDOG_AUTOMONITOR_BY_TIMER) - upper->wdog = wd_create(); - wd_start(upper->wdog, WATCHDOG_AUTOMONITOR_TIMEOUT_TICK / 2, + wd_start(&upper->wdog, WATCHDOG_AUTOMONITOR_TIMEOUT_TICK / 2, watchdog_automonitor_timer, 1, (wdparm_t)upper); #elif defined(CONFIG_WATCHDOG_AUTOMONITOR_BY_WORKER) work_queue(LPWORK, &upper->work, watchdog_automonitor_worker, @@ -224,7 +223,7 @@ static void watchdog_automonitor_stop(FAR struct watchdog_upperhalf_s *upper) #if defined(CONFIG_WATCHDOG_AUTOMONITOR_BY_CAPTURE) lower->ops->capture(lower, NULL); #elif defined(CONFIG_WATCHDOG_AUTOMONITOR_BY_TIMER) - wd_delete(upper->wdog); + wd_cancel(&upper->wdog); #elif defined(CONFIG_WATCHDOG_AUTOMONITOR_BY_WORKER) work_cancel(LPWORK, &upper->work); #elif defined(CONFIG_WATCHDOG_AUTOMONITOR_BY_IDLE) diff --git a/drivers/usbdev/cdcacm.c b/drivers/usbdev/cdcacm.c index 0e56fc0e2d6..ed65abee77e 100644 --- a/drivers/usbdev/cdcacm.c +++ b/drivers/usbdev/cdcacm.c @@ -125,7 +125,7 @@ struct cdcacm_dev_s FAR struct usbdev_ep_s *epbulkin; /* Bulk IN endpoint structure */ FAR struct usbdev_ep_s *epbulkout; /* Bulk OUT endpoint structure */ FAR struct usbdev_req_s *ctrlreq; /* Allocated control request */ - WDOG_ID rxfailsafe; /* Failsafe timer to prevent RX stalls */ + struct wdog_s rxfailsafe; /* Failsafe timer to prevent RX stalls */ struct sq_queue_s txfree; /* Available write request containers */ struct sq_queue_s rxpending; /* Pending read request containers */ @@ -679,7 +679,7 @@ static int cdcacm_release_rxpending(FAR struct cdcacm_dev_s *priv) /* Cancel any pending failsafe timer */ - wd_cancel(priv->rxfailsafe); + wd_cancel(&priv->rxfailsafe); /* If RX "interrupts" are enabled and if input flow control is not in * effect, then pass the packet at the head of the pending RX packet list @@ -746,7 +746,7 @@ static int cdcacm_release_rxpending(FAR struct cdcacm_dev_s *priv) if (!sq_empty(&priv->rxpending)) { - wd_start(priv->rxfailsafe, CDCACM_RXDELAY, + wd_start(&priv->rxfailsafe, CDCACM_RXDELAY, cdcacm_rxtimeout, 1, (wdparm_t)priv); } @@ -2933,13 +2933,6 @@ int cdcacm_classobject(int minor, FAR struct usbdev_devinfo_s *devinfo, memcpy(&priv->devinfo, devinfo, sizeof(struct usbdev_devinfo_s)); - /* Allocate a failsafe time so that we can be assured that RX data - * can never stall in the priv->rxpending queue. - */ - - priv->rxfailsafe = wd_create(); - DEBUGASSERT(priv->rxfailsafe != NULL); - #ifdef CONFIG_CDCACM_IFLOWCONTROL /* SerialState */ @@ -3008,7 +3001,6 @@ int cdcacm_classobject(int minor, FAR struct usbdev_devinfo_s *devinfo, return OK; errout_with_class: - wd_delete(priv->rxfailsafe); kmm_free(alloc); return ret; } @@ -3142,7 +3134,7 @@ void cdcacm_uninitialize(FAR void *handle) * free the memory resources. */ - wd_delete(priv->rxfailsafe); + wd_cancel(&priv->rxfailsafe); kmm_free(priv); return; } @@ -3174,7 +3166,7 @@ void cdcacm_uninitialize(FAR void *handle) /* And free the memory resources. */ - wd_delete(priv->rxfailsafe); + wd_cancel(&priv->rxfailsafe); kmm_free(priv); #else diff --git a/drivers/usbdev/cdcecm.c b/drivers/usbdev/cdcecm.c index 612382a3a6b..95d38950d30 100644 --- a/drivers/usbdev/cdcecm.c +++ b/drivers/usbdev/cdcecm.c @@ -158,7 +158,7 @@ struct cdcecm_driver_s /* Network device */ bool bifup; /* true:ifup false:ifdown */ - WDOG_ID txpoll; /* TX poll timer */ + struct wdog_s txpoll; /* TX poll timer */ struct work_s irqwork; /* For deferring interrupt work * to the work queue */ struct work_s pollwork; /* For deferring poll work to @@ -707,7 +707,7 @@ static void cdcecm_poll_work(FAR void *arg) /* Setup the watchdog poll timer again */ - wd_start(self->txpoll, CDCECM_WDDELAY, + wd_start(&self->txpoll, CDCECM_WDDELAY, cdcecm_poll_expiry, 1, (wdparm_t)self); net_unlock(); @@ -788,7 +788,7 @@ static int cdcecm_ifup(FAR struct net_driver_s *dev) /* Set and activate a timer process */ - wd_start(priv->txpoll, CDCECM_WDDELAY, + wd_start(&priv->txpoll, CDCECM_WDDELAY, cdcecm_poll_expiry, 1, (wdparm_t)priv); priv->bifup = true; @@ -824,7 +824,7 @@ static int cdcecm_ifdown(FAR struct net_driver_s *dev) /* Cancel the TX poll timer and TX timeout timers */ - wd_cancel(priv->txpoll); + wd_cancel(&priv->txpoll); /* Put the EMAC in its reset, non-operational state. This should be * a known configuration that will guarantee the cdcecm_ifup() always @@ -2130,13 +2130,7 @@ static int cdcecm_classobject(int minor, #ifdef CONFIG_NETDEV_IOCTL self->dev.d_ioctl = cdcecm_ioctl; /* Handle network IOCTL commands */ #endif - self->dev.d_private = (FAR void *)self; /* Used to recover private state from dev */ - - /* Create a watchdog for timing polling for and timing of transmissions */ - - self->txpoll = wd_create(); /* Create periodic poll timer */ - - DEBUGASSERT(self->txpoll != NULL); + self->dev.d_private = self; /* Used to recover private state from dev */ /* USB device initialization */ diff --git a/drivers/usbdev/rndis.c b/drivers/usbdev/rndis.c index c7f7b17f55f..fce8045b7ab 100644 --- a/drivers/usbdev/rndis.c +++ b/drivers/usbdev/rndis.c @@ -152,7 +152,7 @@ struct rndis_dev_s struct rndis_req_s wrreqs[CONFIG_RNDIS_NWRREQS]; struct work_s rxwork; /* Worker for dispatching RX packets */ - WDOG_ID txpoll; /* TX poll watchdog */ + struct wdog_s txpoll; /* TX poll watchdog */ struct work_s pollwork; /* TX poll worker */ bool registered; /* Has netdev_register() been called */ @@ -1123,7 +1123,7 @@ static void rndis_polltimer(int argc, wdparm_t arg, ...) /* Setup the watchdog poll timer again */ - wd_start(priv->txpoll, RNDIS_WDDELAY, + wd_start(&priv->txpoll, RNDIS_WDDELAY, rndis_polltimer, 1, (wdparm_t)arg); } @@ -1139,7 +1139,7 @@ static int rndis_ifup(FAR struct net_driver_s *dev) { FAR struct rndis_dev_s *priv = (FAR struct rndis_dev_s *)dev->d_private; - wd_start(priv->txpoll, RNDIS_WDDELAY, + wd_start(&priv->txpoll, RNDIS_WDDELAY, rndis_polltimer, 1, (wdparm_t)priv); return OK; } @@ -1156,7 +1156,7 @@ static int rndis_ifdown(FAR struct net_driver_s *dev) { FAR struct rndis_dev_s *priv = (FAR struct rndis_dev_s *)dev->d_private; - wd_cancel(priv->txpoll); + wd_cancel(&priv->txpoll); return OK; } @@ -2774,7 +2774,6 @@ static int usbclass_classobject(int minor, sq_init(&priv->reqlist); memcpy(priv->host_mac_address, g_rndis_default_mac_addr, 6); - priv->txpoll = wd_create(); priv->netdev.d_private = priv; priv->netdev.d_ifup = &rndis_ifup; priv->netdev.d_ifdown = &rndis_ifdown; diff --git a/drivers/usbhost/usbhost_cdcmbim.c b/drivers/usbhost/usbhost_cdcmbim.c index 6f6f77346e8..f03646a9c5e 100644 --- a/drivers/usbhost/usbhost_cdcmbim.c +++ b/drivers/usbhost/usbhost_cdcmbim.c @@ -228,7 +228,7 @@ struct usbhost_cdcmbim_s /* Network device members */ - WDOG_ID txpoll; /* TX poll timer */ + struct wdog_s txpoll; /* TX poll timer */ bool bifup; /* true:ifup false:ifdown */ struct net_driver_s netdev; /* Interface understood by the network */ uint8_t txpktbuf[MAX_NETDEV_PKTSIZE]; @@ -1662,7 +1662,6 @@ static inline int usbhost_devinit(FAR struct usbhost_cdcmbim_s *priv) priv->netdev.d_ifdown = cdcmbim_ifdown; priv->netdev.d_txavail = cdcmbim_txavail; priv->netdev.d_private = priv; - priv->txpoll = wd_create(); /* Register the network device */ @@ -2321,7 +2320,7 @@ static void cdcmbim_txpoll_work(void *arg) /* setup the watchdog poll timer again */ - wd_start(priv->txpoll, (1 * CLK_TCK), + wd_start(&priv->txpoll, (1 * CLK_TCK), cdcmbim_txpoll_expiry, 1, (wdparm_t)priv); net_unlock(); } @@ -2428,7 +2427,7 @@ static int cdcmbim_ifup(struct net_driver_s *dev) /* Start network TX poll */ - wd_start(priv->txpoll, (1 * CLK_TCK), + wd_start(&priv->txpoll, (1 * CLK_TCK), cdcmbim_txpoll_expiry, 1, (wdparm_t)priv); priv->bifup = true; return OK; @@ -2458,7 +2457,7 @@ static int cdcmbim_ifdown(struct net_driver_s *dev) flags = enter_critical_section(); - wd_cancel(priv->txpoll); + wd_cancel(&priv->txpoll); /* Mark the device "down" */ diff --git a/drivers/wireless/ieee80211/bcm43xxx/bcmf_driver.c b/drivers/wireless/ieee80211/bcm43xxx/bcmf_driver.c index 4560ab74dd1..b331e51f370 100644 --- a/drivers/wireless/ieee80211/bcm43xxx/bcmf_driver.c +++ b/drivers/wireless/ieee80211/bcm43xxx/bcmf_driver.c @@ -219,12 +219,6 @@ FAR struct bcmf_dev_s *bcmf_allocate_device(void) /* Init scan timeout timer */ priv->scan_status = BCMF_SCAN_DISABLED; - priv->scan_timeout = wd_create(); - if (!priv->scan_timeout) - { - ret = -ENOMEM; - goto exit_free_priv; - } return priv; @@ -941,7 +935,7 @@ wl_escan_result_processed: wlinfo("escan done event %d %d\n", status, bcmf_getle32(&event->reason)); - wd_cancel(priv->scan_timeout); + wd_cancel(&priv->scan_timeout); priv->scan_status = BCMF_SCAN_DONE; nxsem_post(&priv->control_mutex); @@ -1147,7 +1141,7 @@ int bcmf_wl_start_scan(FAR struct bcmf_dev_s *priv, struct iwreq *iwr) /* Start scan_timeout timer */ - wd_start(priv->scan_timeout, BCMF_SCAN_TIMEOUT_TICK, + wd_start(&priv->scan_timeout, BCMF_SCAN_TIMEOUT_TICK, bcmf_wl_scan_timeout, 1, (wdparm_t)priv); return OK; diff --git a/drivers/wireless/ieee80211/bcm43xxx/bcmf_driver.h b/drivers/wireless/ieee80211/bcm43xxx/bcmf_driver.h index d2529be4150..dafd48d19ab 100644 --- a/drivers/wireless/ieee80211/bcm43xxx/bcmf_driver.h +++ b/drivers/wireless/ieee80211/bcm43xxx/bcmf_driver.h @@ -67,7 +67,7 @@ struct bcmf_dev_s FAR struct bcmf_bus_dev_s *bus; /* Bus interface structure */ bool bc_bifup; /* true:ifup false:ifdown */ - WDOG_ID bc_txpoll; /* TX poll timer */ + struct wdog_s bc_txpoll; /* TX poll timer */ struct work_s bc_irqwork; /* For deferring interrupt work to the work queue */ struct work_s bc_pollwork; /* For deferring poll work to the work queue */ @@ -92,7 +92,7 @@ struct bcmf_dev_s * During scan, control_mutex is locked to prevent control requests */ int scan_status; /* Current scan status */ - WDOG_ID scan_timeout; /* Scan timeout timer */ + struct wdog_s scan_timeout; /* Scan timeout timer */ FAR uint8_t *scan_result; /* Temp buffer that holds results */ unsigned int scan_result_size; /* Current size of temp buffer */ diff --git a/drivers/wireless/ieee80211/bcm43xxx/bcmf_netdev.c b/drivers/wireless/ieee80211/bcm43xxx/bcmf_netdev.c index c9d28c1653c..d2061cd81da 100644 --- a/drivers/wireless/ieee80211/bcm43xxx/bcmf_netdev.c +++ b/drivers/wireless/ieee80211/bcm43xxx/bcmf_netdev.c @@ -625,7 +625,7 @@ static void bcmf_poll_work(FAR void *arg) /* Setup the watchdog poll timer again */ - wd_start(priv->bc_txpoll, BCMF_WDDELAY, + wd_start(&priv->bc_txpoll, BCMF_WDDELAY, bcmf_poll_expiry, 1, (wdparm_t)priv); exit_unlock: net_unlock(); @@ -701,7 +701,7 @@ static int bcmf_ifup(FAR struct net_driver_s *dev) /* Set and activate a timer process */ - wd_start(priv->bc_txpoll, BCMF_WDDELAY, + wd_start(&priv->bc_txpoll, BCMF_WDDELAY, bcmf_poll_expiry, 1, (wdparm_t)priv); /* Enable the hardware interrupt */ @@ -738,7 +738,7 @@ static int bcmf_ifdown(FAR struct net_driver_s *dev) /* Cancel the TX poll timer */ - wd_cancel(priv->bc_txpoll); + wd_cancel(&priv->bc_txpoll); /* Put the EMAC in its reset, non-operational state. This should be * a known configuration that will guarantee the bcmf_ifup() always @@ -1125,13 +1125,7 @@ int bcmf_netdev_register(FAR struct bcmf_dev_s *priv) #ifdef CONFIG_NETDEV_IOCTL priv->bc_dev.d_ioctl = bcmf_ioctl; /* Handle network IOCTL commands */ #endif - priv->bc_dev.d_private = (FAR void *)priv; /* Used to recover private state from dev */ - - /* Create a watchdog for timing polling */ - - priv->bc_txpoll = wd_create(); /* Create periodic poll timer */ - - DEBUGASSERT(priv->bc_txpoll != NULL); + priv->bc_dev.d_private = priv; /* Used to recover private state from dev */ /* Initialize network stack interface buffer */ diff --git a/drivers/wireless/ieee80211/bcm43xxx/bcmf_sdio.c b/drivers/wireless/ieee80211/bcm43xxx/bcmf_sdio.c index 2bc960ee94f..20790a1320d 100644 --- a/drivers/wireless/ieee80211/bcm43xxx/bcmf_sdio.c +++ b/drivers/wireless/ieee80211/bcm43xxx/bcmf_sdio.c @@ -696,21 +696,12 @@ int bcmf_bus_sdio_initialize(FAR struct bcmf_dev_s *priv, goto exit_free_bus; } - /* Init thread waitdog */ - - sbus->waitdog = wd_create(); - if (!sbus->waitdog) - { - ret = -ENOMEM; - goto exit_free_bus; - } - /* Initialize device hardware */ ret = bcmf_hwinitialize(sbus); if (ret != OK) { - goto exit_free_waitdog; + goto exit_free_bus; } /* Probe device */ @@ -755,7 +746,7 @@ int bcmf_bus_sdio_initialize(FAR struct bcmf_dev_s *priv, /* Start the waitdog timer */ - wd_start(sbus->waitdog, BCMF_WAITDOG_TIMEOUT_TICK, + wd_start(&sbus->waitdog, BCMF_WAITDOG_TIMEOUT_TICK, bcmf_sdio_waitdog_timeout, 1, (wdparm_t)priv); /* Spawn bcmf daemon thread */ @@ -780,9 +771,6 @@ int bcmf_bus_sdio_initialize(FAR struct bcmf_dev_s *priv, exit_uninit_hw: bcmf_hwuninitialize(sbus); -exit_free_waitdog: - wd_delete(sbus->waitdog); - exit_free_bus: kmm_free(sbus); priv->bus = NULL; @@ -864,7 +852,7 @@ int bcmf_sdio_thread(int argc, char **argv) /* Restart the waitdog timer */ - wd_start(sbus->waitdog, BCMF_WAITDOG_TIMEOUT_TICK, + wd_start(&sbus->waitdog, BCMF_WAITDOG_TIMEOUT_TICK, bcmf_sdio_waitdog_timeout, 1, (wdparm_t)priv); /* Wake up device */ diff --git a/drivers/wireless/ieee802154/xbee/xbee.c b/drivers/wireless/ieee802154/xbee/xbee.c index 7c3035f295e..89e4bd1c8fb 100644 --- a/drivers/wireless/ieee802154/xbee/xbee.c +++ b/drivers/wireless/ieee802154/xbee/xbee.c @@ -659,7 +659,7 @@ static void xbee_process_apiframes(FAR struct xbee_priv_s *priv, if (frame->io_data[frame->io_offset] != 0xff && frame->io_data[frame->io_offset] != 0x13) { - wd_cancel(priv->assocwd); + wd_cancel(&priv->assocwd); priv->associating = false; primitive = ieee802154_primitive_allocate(); @@ -752,7 +752,7 @@ static void xbee_process_apiframes(FAR struct xbee_priv_s *priv, if ((priv->querycmd[0] == *command) && (priv->querycmd[1] == *(command + 1))) { - wd_cancel(priv->atquery_wd); + wd_cancel(&priv->atquery_wd); priv->querydone = true; nxsem_post(&priv->atresp_sem); } @@ -956,7 +956,7 @@ static void xbee_process_txstatus(FAR struct xbee_priv_s *priv, if (priv->frameid == frameid) { - wd_cancel(priv->reqdata_wd); + wd_cancel(&priv->reqdata_wd); priv->txdone = true; nxsem_post(&priv->txdone_sem); } @@ -1202,7 +1202,7 @@ static void xbee_backup_worker(FAR void *arg) static void xbee_lockupcheck_reschedule(FAR struct xbee_priv_s *priv) { - wd_cancel(priv->lockup_wd); + wd_cancel(&priv->lockup_wd); /* Kickoff the watchdog timer that will query the XBee periodically (if * naturally occurring queries do not occur). We query periodically to @@ -1211,7 +1211,7 @@ static void xbee_lockupcheck_reschedule(FAR struct xbee_priv_s *priv) * it back in a working state */ - wd_start(priv->lockup_wd, XBEE_LOCKUP_QUERYTIME, + wd_start(&priv->lockup_wd, XBEE_LOCKUP_QUERYTIME, xbee_lockupcheck_timeout, 1, (wdparm_t)priv); } @@ -1275,14 +1275,6 @@ XBEEHANDLE xbee_init(FAR struct spi_dev_s *spi, ieee802154_primitivepool_initialize(); sq_init(&priv->primitive_queue); - - priv->assocwd = wd_create(); - priv->atquery_wd = wd_create(); - priv->reqdata_wd = wd_create(); -#ifdef CONFIG_XBEE_LOCKUP_WORKAROUND - priv->lockup_wd = wd_create(); -#endif - priv->frameid = 0; /* Frame ID should never be 0, but it is incremented * in xbee_next_frameid before being used so it will be 1 */ priv->querycmd[0] = 0; @@ -1585,7 +1577,7 @@ int xbee_atquery(FAR struct xbee_priv_s *priv, FAR const char *atcommand) { /* Setup a timeout */ - wd_start(priv->atquery_wd, XBEE_ATQUERY_TIMEOUT, + wd_start(&priv->atquery_wd, XBEE_ATQUERY_TIMEOUT, xbee_atquery_timeout, 1, (wdparm_t)priv); } @@ -1600,7 +1592,7 @@ int xbee_atquery(FAR struct xbee_priv_s *priv, FAR const char *atcommand) ret = nxsem_wait(&priv->atresp_sem); if (ret < 0) { - wd_cancel(priv->atquery_wd); + wd_cancel(&priv->atquery_wd); priv->querycmd[0] = 0; priv->querycmd[1] = 0; nxsem_post(&priv->atquery_sem); diff --git a/drivers/wireless/ieee802154/xbee/xbee.h b/drivers/wireless/ieee802154/xbee/xbee.h index 8510280af14..ecec5e3e561 100644 --- a/drivers/wireless/ieee802154/xbee/xbee.h +++ b/drivers/wireless/ieee802154/xbee/xbee.h @@ -165,21 +165,21 @@ struct xbee_priv_s sem_t primitive_sem; /* Exclusive access to the primitive queue */ sq_queue_t primitive_queue; /* Queue of primitives to pass via notify() * callback to registered receivers */ - WDOG_ID assocwd; /* Association watchdog */ + struct wdog_s assocwd; /* Association watchdog */ struct work_s assocwork; /* For polling for association status */ bool associating; /* Are we currently associating */ sem_t atquery_sem; /* Only allow one AT query at a time */ sem_t atresp_sem; /* For signaling pending AT response received */ char querycmd[2]; /* Stores the pending AT Query command */ bool querydone; /* Used to tell waiting thread query is done*/ - WDOG_ID atquery_wd; /* Support AT Query timeout and retry */ - WDOG_ID reqdata_wd; /* Support send timeout and retry */ + struct wdog_s atquery_wd; /* Support AT Query timeout and retry */ + struct wdog_s reqdata_wd; /* Support send timeout and retry */ uint8_t frameid; /* For differentiating AT request/response */ sem_t tx_sem; /* Support a single pending transmit */ sem_t txdone_sem; /* For signalling tx is completed */ bool txdone; #ifdef CONFIG_XBEE_LOCKUP_WORKAROUND - WDOG_ID lockup_wd; /* Watchdog to protect for XBee lockup */ + struct wdog_s lockup_wd; /* Watchdog to protect for XBee lockup */ struct work_s lockupwork; /* For deferring lockup query check to LPWORK queue*/ struct work_s backupwork; /* For deferring backing up parameters to LPWORK queue*/ #endif diff --git a/drivers/wireless/ieee802154/xbee/xbee_mac.c b/drivers/wireless/ieee802154/xbee/xbee_mac.c index 456c2de5694..52320598244 100644 --- a/drivers/wireless/ieee802154/xbee/xbee_mac.c +++ b/drivers/wireless/ieee802154/xbee/xbee_mac.c @@ -155,7 +155,7 @@ static void xbee_assocworker(FAR void *arg) { xbee_send_atquery(priv, "AI"); - wd_start(priv->assocwd, XBEE_ASSOC_POLLDELAY, + wd_start(&priv->assocwd, XBEE_ASSOC_POLLDELAY, xbee_assoctimer, 1, (wdparm_t)arg); } } @@ -382,7 +382,7 @@ int xbee_req_data(XBEEHANDLE xbee, { /* Setup a timeout in case the XBee never responds with a tx status */ - wd_start(priv->reqdata_wd, XBEE_RESPONSE_TIMEOUT, + wd_start(&priv->reqdata_wd, XBEE_RESPONSE_TIMEOUT, xbee_reqdata_timeout, 1, (wdparm_t)priv); /* Send the frame */ @@ -705,7 +705,7 @@ int xbee_req_associate(XBEEHANDLE xbee, * an update. */ - return wd_start(priv->assocwd, XBEE_ASSOC_POLLDELAY, + return wd_start(&priv->assocwd, XBEE_ASSOC_POLLDELAY, xbee_assoctimer, 1, (wdparm_t)priv); } diff --git a/drivers/wireless/ieee802154/xbee/xbee_netdev.c b/drivers/wireless/ieee802154/xbee/xbee_netdev.c index 4729378906e..b0372015c6c 100644 --- a/drivers/wireless/ieee802154/xbee/xbee_netdev.c +++ b/drivers/wireless/ieee802154/xbee/xbee_netdev.c @@ -152,7 +152,7 @@ struct xbeenet_driver_s struct xbeenet_callback_s xd_cb; /* Callback information */ XBEEHANDLE xd_mac; /* Contained XBee MAC interface */ bool xd_bifup; /* true:ifup false:ifdown */ - WDOG_ID xd_txpoll; /* TX poll timer */ + struct wdog_s xd_txpoll; /* TX poll timer */ struct work_s xd_pollwork; /* Defer poll work to the work queue */ /* Hold a list of events */ @@ -629,7 +629,7 @@ static void xbeenet_txpoll_work(FAR void *arg) /* Setup the watchdog poll timer again */ - wd_start(priv->xd_txpoll, TXPOLL_WDDELAY, + wd_start(&priv->xd_txpoll, TXPOLL_WDDELAY, xbeenet_txpoll_expiry, 1, (wdparm_t)priv); net_unlock(); } @@ -780,7 +780,7 @@ static int xbeenet_ifup(FAR struct net_driver_s *dev) #endif /* Set and activate a timer process */ - wd_start(priv->xd_txpoll, TXPOLL_WDDELAY, + wd_start(&priv->xd_txpoll, TXPOLL_WDDELAY, xbeenet_txpoll_expiry, 1, (wdparm_t)priv); /* The interface is now up */ @@ -820,7 +820,7 @@ static int xbeenet_ifdown(FAR struct net_driver_s *dev) /* Cancel the TX poll timer and TX timeout timers */ - wd_cancel(priv->xd_txpoll); + wd_cancel(&priv->xd_txpoll); /* TODO: Put the xbee driver in its reset, non-operational state. This * should be a known configuration that will guarantee the xbeenet_ifup() @@ -1375,12 +1375,8 @@ int xbee_netdev_register(XBEEHANDLE xbee) #ifdef CONFIG_NETDEV_IOCTL dev->d_ioctl = xbeenet_ioctl; /* Handle network IOCTL commands */ #endif - dev->d_private = (FAR void *)priv; /* Used to recover private state from dev */ - - /* Create a watchdog for timing polling for and timing of transmissions */ - + dev->d_private = priv; /* Used to recover private state from dev */ priv->xd_mac = xbee; /* Save the MAC interface instance */ - priv->xd_txpoll = wd_create(); /* Create periodic poll timer */ /* Setup a locking semaphore for exclusive device driver access */ @@ -1425,10 +1421,6 @@ int xbee_netdev_register(XBEEHANDLE xbee) { nerr("ERROR: Failed to bind the XBee MAC callbacks: %d\n", ret); - /* Release wdog timers */ - - wd_delete(priv->xd_txpoll); - /* Free memory and return the error */ kmm_free(priv); diff --git a/drivers/wireless/spirit/drivers/spirit_netdev.c b/drivers/wireless/spirit/drivers/spirit_netdev.c index 479bf4b4e0b..2d3dc04dfbd 100644 --- a/drivers/wireless/spirit/drivers/spirit_netdev.c +++ b/drivers/wireless/spirit/drivers/spirit_netdev.c @@ -268,8 +268,8 @@ struct spirit_driver_s struct work_s txwork; /* TX work queue support (HP) */ struct work_s rxwork; /* RX work queue support (LP) */ struct work_s pollwork; /* TX network poll work (LP) */ - WDOG_ID txpoll; /* TX poll timer */ - WDOG_ID txtimeout; /* TX timeout timer */ + struct wdog_s txpoll; /* TX poll timer */ + struct wdog_s txtimeout; /* TX timeout timer */ sem_t rxsem; /* Exclusive access to the RX queue */ sem_t txsem; /* Exclusive access to the TX queue */ bool ifup; /* Spirit is on and interface is up */ @@ -926,7 +926,7 @@ static void spirit_transmit_work(FAR void *arg) /* Setup the TX timeout watchdog (perhaps restarting the timer) */ - wd_start(priv->txtimeout, SPIRIT_TXTIMEOUT, + wd_start(&priv->txtimeout, SPIRIT_TXTIMEOUT, spirit_txtimeout_expiry, 1, (wdparm_t)priv); } @@ -1221,7 +1221,7 @@ static void spirit_interrupt_work(FAR void *arg) { /* Yes.. Cancel the TX timeout */ - wd_cancel(priv->txtimeout); + wd_cancel(&priv->txtimeout); /* Revert the sending state */ @@ -1251,7 +1251,7 @@ static void spirit_interrupt_work(FAR void *arg) /* Cancel the TX timeout */ - wd_cancel(priv->txtimeout); + wd_cancel(&priv->txtimeout); /* Put the Spirit back in the receiving state */ @@ -1806,7 +1806,7 @@ static void spirit_txpoll_work(FAR void *arg) /* Setup the watchdog poll timer again */ - wd_start(priv->txpoll, SPIRIT_WDDELAY, + wd_start(&priv->txpoll, SPIRIT_WDDELAY, spirit_txpoll_expiry, 1, (wdparm_t)priv); } else @@ -1945,7 +1945,7 @@ static int spirit_ifup(FAR struct net_driver_s *dev) /* Set and activate a timer process */ - wd_start(priv->txpoll, SPIRIT_WDDELAY, + wd_start(&priv->txpoll, SPIRIT_WDDELAY, spirit_txpoll_expiry, 1, (wdparm_t)priv); /* Enables the interrupts from the SPIRIT1 */ @@ -2009,8 +2009,8 @@ static int spirit_ifdown(FAR struct net_driver_s *dev) /* Cancel the TX poll timer and TX timeout timers */ - wd_cancel(priv->txpoll); - wd_cancel(priv->txtimeout); + wd_cancel(&priv->txpoll); + wd_cancel(&priv->txtimeout); leave_critical_section(flags); /* First stop Rx/Tx @@ -2808,16 +2808,8 @@ int spirit_netdev_initialize(FAR struct spi_dev_s *spi, /* Attach the interface, lower driver, and devops */ priv->lower = lower; - - /* Create a watchdog for timing polling for and timing of transmissions */ - - priv->txpoll = wd_create(); /* Create periodic poll timer */ - priv->txtimeout = wd_create(); /* Create TX timeout timer */ - - DEBUGASSERT(priv->txpoll != NULL && priv->txtimeout != NULL); - - nxsem_init(&priv->rxsem, 0, 1); /* Access to RX packet queue */ - nxsem_init(&priv->txsem, 0, 1); /* Access to TX packet queue */ + nxsem_init(&priv->rxsem, 0, 1); /* Access to RX packet queue */ + nxsem_init(&priv->txsem, 0, 1); /* Access to TX packet queue */ /* Initialize the IEEE 802.15.4 network device fields */ @@ -2839,7 +2831,7 @@ int spirit_netdev_initialize(FAR struct spi_dev_s *spi, #ifdef CONFIG_NETDEV_IOCTL dev->d_ioctl = spirit_ioctl; /* Handle network IOCTL commands */ #endif - dev->d_private = (FAR void *)priv; /* Used to recover private state from dev */ + dev->d_private = priv; /* Used to recover private state from dev */ /* Make sure that the PktRadio common logic has been initialized */ diff --git a/fs/mount/fs_automount.c b/fs/mount/fs_automount.c index 44ae4269c6d..a38e3aae5e3 100644 --- a/fs/mount/fs_automount.c +++ b/fs/mount/fs_automount.c @@ -72,7 +72,7 @@ struct automounter_state_s { FAR const struct automount_lower_s *lower; /* Board level interfaces */ struct work_s work; /* Work queue support */ - WDOG_ID wdog; /* Delay to retry un-mounts */ + struct wdog_s wdog; /* Delay to retry un-mounts */ bool mounted; /* True: Volume has been mounted */ bool inserted; /* True: Media has been inserted */ }; @@ -293,7 +293,7 @@ static int automount_unmount(FAR struct automounter_state_s *priv) /* Start a timer to retry the umount2 after a delay */ - ret = wd_start(priv->wdog, lower->udelay, + ret = wd_start(&priv->wdog, lower->udelay, automount_timeout, 1, (wdparm_t)priv); if (ret < 0) { @@ -493,7 +493,7 @@ static int automount_interrupt(FAR const struct automount_lower_s *lower, { /* Cancel any retry delays */ - wd_cancel(priv->wdog); + wd_cancel(&priv->wdog); } return OK; @@ -541,16 +541,6 @@ FAR void *automount_initialize(FAR const struct automount_lower_s *lower) priv->lower = lower; - /* Get a timer to handle unmount retries */ - - priv->wdog = wd_create(); - if (!priv->wdog) - { - ferr("ERROR: Failed to create a timer\n"); - automount_uninitialize(priv); - return NULL; - } - /* Handle the initial state of the mount on the caller's thread */ priv->inserted = AUTOMOUNT_INSERTED(lower); @@ -611,9 +601,9 @@ void automount_uninitialize(FAR void *handle) AUTOMOUNT_DISABLE(lower); AUTOMOUNT_DETACH(lower); - /* Release resources */ + /* Cancel the watchdog timer */ - wd_delete(priv->wdog); + wd_cancel(&priv->wdog); /* And free the state structure */ diff --git a/include/nuttx/net/mld.h b/include/nuttx/net/mld.h index ab129595880..7144a67d4ba 100644 --- a/include/nuttx/net/mld.h +++ b/include/nuttx/net/mld.h @@ -385,8 +385,8 @@ struct mld_mcast_listen_done_s struct mld_netdev_s { sq_queue_t grplist; /* MLD group list */ - WDOG_ID gendog; /* General query timer */ - WDOG_ID v1dog; /* MLDv1 compatibility timer */ + struct wdog_s gendog; /* General query timer */ + struct wdog_s v1dog; /* MLDv1 compatibility timer */ uint8_t flags; /* See MLD_ flags definitions */ }; diff --git a/include/nuttx/sched.h b/include/nuttx/sched.h index a5ecd9e06c1..c9272fd7d07 100644 --- a/include/nuttx/sched.h +++ b/include/nuttx/sched.h @@ -282,7 +282,7 @@ struct sporadic_s; struct replenishment_s { FAR struct tcb_s *tcb; /* The parent TCB structure */ - WDOG_ID timer; /* Timer dedicated to this interval */ + struct wdog_s timer; /* Timer dedicated to this interval */ uint32_t budget; /* Current budget time */ uint8_t flags; /* See SPORADIC_FLAG_* definitions */ }; @@ -677,7 +677,7 @@ struct tcb_s FAR struct sporadic_s *sporadic; /* Sporadic scheduling parameters */ #endif - WDOG_ID waitdog; /* All timed waits use this timer */ + struct wdog_s waitdog; /* All timed waits use this timer */ /* Stack-Related Fields *******************************************************/ diff --git a/include/nuttx/wdog.h b/include/nuttx/wdog.h index d222c4da932..e86daf4eb35 100644 --- a/include/nuttx/wdog.h +++ b/include/nuttx/wdog.h @@ -34,56 +34,15 @@ * Pre-processor Definitions ****************************************************************************/ -/* Configuration ************************************************************/ - -#ifndef CONFIG_PREALLOC_WDOGS -# define CONFIG_PREALLOC_WDOGS 32 -#endif - -#ifndef CONFIG_WDOG_INTRESERVE -# if CONFIG_PREALLOC_WDOGS > 16 -# define CONFIG_WDOG_INTRESERVE 4 -# elif CONFIG_PREALLOC_WDOGS > 8 -# define CONFIG_WDOG_INTRESERVE 2 -# else -# define CONFIG_WDOG_INTRESERVE 1 -# endif -#endif - -#if CONFIG_WDOG_INTRESERVE >= CONFIG_PREALLOC_WDOGS -# error CONFIG_WDOG_INTRESERVE >= CONFIG_PREALLOC_WDOGS -#endif - /* Watchdog Definitions *****************************************************/ /* Flag bits for the flags field of struct wdog_s */ #define WDOGF_ACTIVE (1 << 0) /* Bit 0: 1=Watchdog is actively timing */ -#define WDOGF_ALLOCED (1 << 1) /* Bit 1: 0=Pre-allocated, 1=Allocated */ -#define WDOGF_STATIC (1 << 2) /* Bit 2: 0=[Pre-]allocated, 1=Static */ #define WDOG_SETACTIVE(w) do { (w)->flags |= WDOGF_ACTIVE; } while (0) -#define WDOG_SETALLOCED(w) do { (w)->flags |= WDOGF_ALLOCED; } while (0) -#define WDOG_SETSTATIC(w) do { (w)->flags |= WDOGF_STATIC; } while (0) - #define WDOG_CLRACTIVE(w) do { (w)->flags &= ~WDOGF_ACTIVE; } while (0) -#define WDOG_CLRALLOCED(w) do { (w)->flags &= ~WDOGF_ALLOCED; } while (0) -#define WDOG_CLRSTATIC(w) do { (w)->flags &= ~WDOGF_STATIC; } while (0) - #define WDOG_ISACTIVE(w) (((w)->flags & WDOGF_ACTIVE) != 0) -#define WDOG_ISALLOCED(w) (((w)->flags & WDOGF_ALLOCED) != 0) -#define WDOG_ISSTATIC(w) (((w)->flags & WDOGF_STATIC) != 0) - -/* Initialization of statically allocated timers ****************************/ - -#define wd_static(w) \ - do { (w)->next = NULL; (w)->flags = WDOGF_STATIC; } while (0) - -#ifdef CONFIG_PIC -# define WDOG_INITIAILIZER { NULL, NULL, NULL, 0, WDOGF_STATIC, 0 } -#else -# define WDOG_INITIAILIZER { NULL, NULL, 0, WDOGF_STATIC, 0 } -#endif /**************************************************************************** * Public Type Declarations @@ -116,9 +75,7 @@ typedef uint32_t wdparm_t; typedef CODE void (*wdentry_t)(int argc, wdparm_t arg1, ...); -/* This is the internal representation of the watchdog timer structure. The - * WDOG_ID is a pointer to a watchdog structure. - */ +/* This is the internal representation of the watchdog timer structure. */ struct wdog_s { @@ -133,14 +90,6 @@ struct wdog_s wdparm_t parm[CONFIG_MAX_WDOGPARMS]; }; -/* Watchdog 'handle' */ - -typedef FAR struct wdog_s *WDOG_ID; - -/**************************************************************************** - * Public Data - ****************************************************************************/ - /**************************************************************************** * Pubic Function Prototypes ****************************************************************************/ @@ -153,47 +102,6 @@ extern "C" #define EXTERN extern #endif -/**************************************************************************** - * Name: wd_create - * - * Description: - * The wd_create function will create a watchdog timer by allocating one - * from the list of free watchdog timers. - * - * Input Parameters: - * None - * - * Returned Value: - * Pointer to watchdog (i.e., the watchdog ID), or NULL if insufficient - * watchdogs are available. - * - ****************************************************************************/ - -WDOG_ID wd_create(void); - -/**************************************************************************** - * Name: wd_delete - * - * Description: - * The wd_delete() function will deallocate a watchdog timer by returning - * it to the free pool of watchdog timers. The watchdog timer will be - * removed from the active timer queue if had been started. - * - * Input Parameters: - * wdog - The watchdog ID to delete. This is actually a pointer to a - * watchdog structure. - * - * Returned Value: - * Zero (OK) is returned on success; a negated errno value is return to - * indicate the nature of any failure. - * - * Assumptions: - * The caller has assured that the watchdog is no longer in use. - * - ****************************************************************************/ - -int wd_delete(WDOG_ID wdog); - /**************************************************************************** * Name: wd_start * @@ -230,7 +138,8 @@ int wd_delete(WDOG_ID wdog); * ****************************************************************************/ -int wd_start(WDOG_ID wdog, int32_t delay, wdentry_t wdentry, int argc, ...); +int wd_start(FAR struct wdog_s *wdog, int32_t delay, + wdentry_t wdentry, int argc, ...); /**************************************************************************** * Name: wd_cancel @@ -248,7 +157,7 @@ int wd_start(WDOG_ID wdog, int32_t delay, wdentry_t wdentry, int argc, ...); * ****************************************************************************/ -int wd_cancel(WDOG_ID wdog); +int wd_cancel(FAR struct wdog_s *wdog); /**************************************************************************** * Name: wd_gettime @@ -267,7 +176,7 @@ int wd_cancel(WDOG_ID wdog); * ****************************************************************************/ -int wd_gettime(WDOG_ID wdog); +int wd_gettime(FAR struct wdog_s *wdog); #undef EXTERN #ifdef __cplusplus diff --git a/net/igmp/igmp.h b/net/igmp/igmp.h index e2f94791beb..4e387745820 100644 --- a/net/igmp/igmp.h +++ b/net/igmp/igmp.h @@ -80,6 +80,7 @@ #include #include #include +#include #ifdef CONFIG_NET_IGMP @@ -121,13 +122,12 @@ * from all the other groups */ -typedef FAR struct wdog_s *WDOG_ID; struct igmp_group_s { struct igmp_group_s *next; /* Implements a singly-linked list */ struct work_s work; /* For deferred timeout operations */ in_addr_t grpaddr; /* Group IPv4 address */ - WDOG_ID wdog; /* WDOG used to detect timeouts */ + struct wdog_s wdog; /* WDOG used to detect timeouts */ sem_t sem; /* Used to wait for message transmission */ uint8_t ifindex; /* Interface index */ uint8_t flags; /* See IGMP_ flags definitions */ diff --git a/net/igmp/igmp_group.c b/net/igmp/igmp_group.c index 158cee1e02c..1adf873d071 100644 --- a/net/igmp/igmp_group.c +++ b/net/igmp/igmp_group.c @@ -126,11 +126,6 @@ FAR struct igmp_group_s *igmp_grpalloc(FAR struct net_driver_s *dev, nxsem_init(&group->sem, 0, 0); nxsem_set_protocol(&group->sem, SEM_PRIO_NONE); - /* Initialize the group timer (but don't start it yet) */ - - group->wdog = wd_create(); - DEBUGASSERT(group->wdog); - /* Save the interface index */ group->ifindex = dev->d_ifindex; @@ -222,7 +217,7 @@ void igmp_grpfree(FAR struct net_driver_s *dev, /* Cancel the wdog */ - wd_cancel(group->wdog); + wd_cancel(&group->wdog); /* Remove the group structure from the group list in the device structure */ @@ -232,9 +227,9 @@ void igmp_grpfree(FAR struct net_driver_s *dev, nxsem_destroy(&group->sem); - /* Destroy the wdog */ + /* Cancel the watchdog timer */ - wd_delete(group->wdog); + wd_cancel(&group->wdog); /* Then release the group structure resources. */ diff --git a/net/igmp/igmp_input.c b/net/igmp/igmp_input.c index e0689dbbca9..751a8ecbc26 100644 --- a/net/igmp/igmp_input.c +++ b/net/igmp/igmp_input.c @@ -285,7 +285,7 @@ void igmp_input(struct net_driver_s *dev) { /* This is on a specific group we have already looked up */ - wd_cancel(group->wdog); + wd_cancel(&group->wdog); SET_IDLEMEMBER(group->flags); CLR_LASTREPORT(group->flags); } diff --git a/net/igmp/igmp_leave.c b/net/igmp/igmp_leave.c index f81a1bd7352..e026340832d 100644 --- a/net/igmp/igmp_leave.c +++ b/net/igmp/igmp_leave.c @@ -144,7 +144,7 @@ int igmp_leavegroup(struct net_driver_s *dev, * Reports that could interfere with the Leave Group. */ - wd_cancel(group->wdog); + wd_cancel(&group->wdog); CLR_SCHEDMSG(group->flags); CLR_WAITMSG(group->flags); diff --git a/net/igmp/igmp_timer.c b/net/igmp/igmp_timer.c index c37aac406b0..2070c36748f 100644 --- a/net/igmp/igmp_timer.c +++ b/net/igmp/igmp_timer.c @@ -197,7 +197,7 @@ void igmp_startticks(FAR struct igmp_group_s *group, unsigned int ticks) gtmrinfo("ticks: %d\n", ticks); - ret = wd_start(group->wdog, ticks, igmp_timeout, 1, (wdparm_t)group); + ret = wd_start(&group->wdog, ticks, igmp_timeout, 1, (wdparm_t)group); DEBUGASSERT(ret == OK); UNUSED(ret); @@ -242,7 +242,7 @@ bool igmp_cmptimer(FAR struct igmp_group_s *group, int maxticks) * the watchdog was never started. */ - remaining = wd_gettime(group->wdog); + remaining = wd_gettime(&group->wdog); /* A remaining time of zero means that the watchdog was never started * or has already expired. That case should be covered in the following @@ -254,7 +254,7 @@ bool igmp_cmptimer(FAR struct igmp_group_s *group, int maxticks) { /* Cancel the watchdog timer and return true */ - wd_cancel(group->wdog); + wd_cancel(&group->wdog); leave_critical_section(flags); return true; } diff --git a/net/mld/mld.h b/net/mld/mld.h index e4a73b18418..61514a36289 100644 --- a/net/mld/mld.h +++ b/net/mld/mld.h @@ -113,6 +113,7 @@ #include #include #include +#include #include "devif/devif.h" #include "socket/socket.h" @@ -201,13 +202,12 @@ enum mld_msgtype_e * for each device interface structure. */ -typedef FAR struct wdog_s *WDOG_ID; struct mld_group_s { struct mld_group_s *next; /* Implements a singly-linked list */ net_ipv6addr_t grpaddr; /* Group IPv6 address */ struct work_s work; /* For deferred timeout operations */ - WDOG_ID polldog; /* Timer used for periodic or delayed events */ + struct wdog_s polldog; /* Timer used for periodic or delayed events */ sem_t sem; /* Used to wait for message transmission */ #ifdef CONFIG_NET_MLD_ROUTER uint16_t members; /* Number of members currently reporting (excludes us) */ diff --git a/net/mld/mld_group.c b/net/mld/mld_group.c index 88c648499b2..67cb1427b47 100644 --- a/net/mld/mld_group.c +++ b/net/mld/mld_group.c @@ -133,15 +133,6 @@ FAR struct mld_group_s *mld_grpalloc(FAR struct net_driver_s *dev, nxsem_init(&group->sem, 0, 0); nxsem_set_protocol(&group->sem, SEM_PRIO_NONE); - /* Initialize the group timers */ - - group->polldog = wd_create(); - DEBUGASSERT(group->polldog != NULL); - if (group->polldog == NULL) - { - goto errout_with_sem; - } - /* Save the interface index */ group->ifindex = dev->d_ifindex; @@ -251,7 +242,7 @@ void mld_grpfree(FAR struct net_driver_s *dev, FAR struct mld_group_s *group) /* Cancel the timers */ - wd_cancel(group->polldog); + wd_cancel(&group->polldog); /* Remove the group structure from the group list in the device structure */ @@ -261,9 +252,9 @@ void mld_grpfree(FAR struct net_driver_s *dev, FAR struct mld_group_s *group) nxsem_destroy(&group->sem); - /* Destroy the timers */ + /* Cancel the watchdog timer */ - wd_delete(group->polldog); + wd_cancel(&group->polldog); /* Then release the group structure resources. */ @@ -277,8 +268,8 @@ void mld_grpfree(FAR struct net_driver_s *dev, FAR struct mld_group_s *group) if (mld_ngroups(dev) == 0) { - wd_cancel(dev->d_mld.gendog); - wd_cancel(dev->d_mld.v1dog); + wd_cancel(&dev->d_mld.gendog); + wd_cancel(&dev->d_mld.v1dog); } #endif } diff --git a/net/mld/mld_initialize.c b/net/mld/mld_initialize.c index 4277b5ddb6a..5d354604083 100644 --- a/net/mld/mld_initialize.c +++ b/net/mld/mld_initialize.c @@ -84,10 +84,6 @@ void mld_devinit(struct net_driver_s *dev) memset(&dev->d_mld, 0, sizeof(struct mld_netdev_s)); - dev->d_mld.gendog = wd_create(); - dev->d_mld.v1dog = wd_create(); - DEBUGASSERT(dev->d_mld.gendog != NULL && dev->d_mld.v1dog != NULL); - /* All routers start up as a Querier on each of their attached links. */ SET_MLD_QUERIER(dev->d_mld.flags); diff --git a/net/mld/mld_leave.c b/net/mld/mld_leave.c index afc85e68913..42d6e170e6a 100644 --- a/net/mld/mld_leave.c +++ b/net/mld/mld_leave.c @@ -192,7 +192,7 @@ int mld_leavegroup(FAR const struct ipv6_mreq *mrec) * could interfere with freeing the group. */ - wd_cancel(group->polldog); + wd_cancel(&group->polldog); CLR_MLD_SCHEDMSG(group->flags); CLR_MLD_WAITMSG(group->flags); diff --git a/net/mld/mld_timer.c b/net/mld/mld_timer.c index 28359571840..b65af7b4fbe 100644 --- a/net/mld/mld_timer.c +++ b/net/mld/mld_timer.c @@ -443,7 +443,7 @@ void mld_start_gentimer(FAR struct net_driver_s *dev, clock_t ticks) mldinfo("ticks: %lu\n", (unsigned long)ticks); - ret = wd_start(dev->d_mld.gendog, ticks, + ret = wd_start(&dev->d_mld.gendog, ticks, mld_gendog_timout, 1, (wdparm_t)dev->d_ifindex); DEBUGASSERT(ret == OK); @@ -468,7 +468,7 @@ void mld_start_v1timer(FAR struct net_driver_s *dev, clock_t ticks) mldinfo("ticks: %lu\n", (unsigned long)ticks); - ret = wd_start(dev->d_mld.v1dog, ticks, + ret = wd_start(&dev->d_mld.v1dog, ticks, mld_v1dog_timout, 1, (wdparm_t)dev->d_ifindex); DEBUGASSERT(ret == OK); @@ -491,7 +491,7 @@ void mld_start_polltimer(FAR struct mld_group_s *group, clock_t ticks) mldinfo("ticks: %lu\n", (unsigned long)ticks); - ret = wd_start(group->polldog, ticks, + ret = wd_start(&group->polldog, ticks, mld_polldog_timout, 1, (wdparm_t)group); DEBUGASSERT(ret == OK); diff --git a/sched/Kconfig b/sched/Kconfig index 641e53e8b45..259ea43a6cd 100644 --- a/sched/Kconfig +++ b/sched/Kconfig @@ -223,28 +223,6 @@ config MAX_WDOGPARMS ---help--- Maximum number of parameters that can be passed to a watchdog handler -config PREALLOC_WDOGS - int "Number of pre-allocated watchdog timers" - default 32 - ---help--- - The number of pre-allocated watchdog structures. The system manages - a pool of preallocated watchdog structures to minimize dynamic - allocations. Dynamic allocations will still be made if this pool is - exhausted. You will, however, get better performance and memory - usage if this value is tuned to minimize such allocations. - -config WDOG_INTRESERVE - int "Watchdog structures reserved for interrupt handlers" - default 4 - ---help--- - Watchdog structures may be allocated from normal task and also from - interrupt handlers. Interrupt handlers, however, can only use pre- - allocated watchdog timer. So, in order to keep normal task - allocations from exhausting all watchdog structures, a small number - of pre-allocated watchdog timers must be reserved for exclusive use - by interrupt handler. This setting determines that number of - reserved watchdogs. - config PREALLOC_TIMERS int "Number of pre-allocated POSIX timers" default 8 diff --git a/sched/mqueue/mq_timedreceive.c b/sched/mqueue/mq_timedreceive.c index 98a92d7e9fb..dff982fb204 100644 --- a/sched/mqueue/mq_timedreceive.c +++ b/sched/mqueue/mq_timedreceive.c @@ -143,7 +143,7 @@ ssize_t nxmq_timedreceive(mqd_t mqdes, FAR char *msg, size_t msglen, irqstate_t flags; int ret; - DEBUGASSERT(up_interrupt_context() == false && rtcb->waitdog == NULL); + DEBUGASSERT(up_interrupt_context() == false); /* Verify the input parameters and, in case of an error, set * errno appropriately. @@ -160,17 +160,6 @@ ssize_t nxmq_timedreceive(mqd_t mqdes, FAR char *msg, size_t msglen, return -EINVAL; } - /* Create a watchdog. We will not actually need this watchdog - * unless the queue is not empty, but we will reserve it up front - * before we enter the following critical section. - */ - - rtcb->waitdog = wd_create(); - if (!rtcb->waitdog) - { - return -ENOMEM; - } - /* Get the next message from the message queue. We will disable * pre-emption until we have completed the message received. This * is not too bad because if the receipt takes a long time, it will @@ -215,16 +204,13 @@ ssize_t nxmq_timedreceive(mqd_t mqdes, FAR char *msg, size_t msglen, { leave_critical_section(flags); sched_unlock(); - - wd_delete(rtcb->waitdog); - rtcb->waitdog = NULL; - return -result; } /* Start the watchdog */ - wd_start(rtcb->waitdog, ticks, nxmq_rcvtimeout, 1, (wdparm_t)getpid()); + wd_start(&rtcb->waitdog, ticks, + nxmq_rcvtimeout, 1, (wdparm_t)getpid()); } /* Get the message from the message queue */ @@ -235,7 +221,7 @@ ssize_t nxmq_timedreceive(mqd_t mqdes, FAR char *msg, size_t msglen, * it was never started) */ - wd_cancel(rtcb->waitdog); + wd_cancel(&rtcb->waitdog); /* We can now restore interrupts */ @@ -256,8 +242,6 @@ ssize_t nxmq_timedreceive(mqd_t mqdes, FAR char *msg, size_t msglen, } sched_unlock(); - wd_delete(rtcb->waitdog); - rtcb->waitdog = NULL; return ret; } diff --git a/sched/mqueue/mq_timedsend.c b/sched/mqueue/mq_timedsend.c index ad3c17aa4f3..7035a3afbdc 100644 --- a/sched/mqueue/mq_timedsend.c +++ b/sched/mqueue/mq_timedsend.c @@ -153,7 +153,7 @@ int nxmq_timedsend(mqd_t mqdes, FAR const char *msg, size_t msglen, int result; int ret; - DEBUGASSERT(up_interrupt_context() == false && rtcb->waitdog == NULL); + DEBUGASSERT(up_interrupt_context() == false); /* Verify the input parameters on any failures to verify. */ @@ -215,18 +215,6 @@ int nxmq_timedsend(mqd_t mqdes, FAR const char *msg, size_t msglen, goto errout_with_mqmsg; } - /* Create a watchdog. We will not actually need this watchdog - * unless the queue is full, but we will reserve it up front - * before we enter the following critical section. - */ - - rtcb->waitdog = wd_create(); - if (!rtcb->waitdog) - { - ret = -EINVAL; - goto errout_with_mqmsg; - } - /* We are not in an interrupt handler and the message queue is full. * Set up a timed wait for the message queue to become non-full. * @@ -256,7 +244,7 @@ int nxmq_timedsend(mqd_t mqdes, FAR const char *msg, size_t msglen, /* Start the watchdog and begin the wait for MQ not full */ - wd_start(rtcb->waitdog, ticks, nxmq_sndtimeout, 1, (wdparm_t)getpid()); + wd_start(&rtcb->waitdog, ticks, nxmq_sndtimeout, 1, (wdparm_t)getpid()); /* And wait for the message queue to be non-empty */ @@ -266,7 +254,7 @@ int nxmq_timedsend(mqd_t mqdes, FAR const char *msg, size_t msglen, * or ETIMEOUT. Cancel the watchdog timer in any event. */ - wd_cancel(rtcb->waitdog); + wd_cancel(&rtcb->waitdog); /* Check if nxmq_wait_send() failed */ @@ -291,8 +279,6 @@ int nxmq_timedsend(mqd_t mqdes, FAR const char *msg, size_t msglen, ret = nxmq_do_send(mqdes, mqmsg, msg, msglen, prio); sched_unlock(); - wd_delete(rtcb->waitdog); - rtcb->waitdog = NULL; leave_cancellation_point(); return ret; @@ -302,8 +288,6 @@ int nxmq_timedsend(mqd_t mqdes, FAR const char *msg, size_t msglen, errout_in_critical_section: leave_critical_section(flags); - wd_delete(rtcb->waitdog); - rtcb->waitdog = NULL; /* Exit here with (1) the scheduler locked and 2) a message allocated. The * error code is in 'result' diff --git a/sched/pthread/pthread_condclockwait.c b/sched/pthread/pthread_condclockwait.c index c741c031cd4..0b31e0dd122 100644 --- a/sched/pthread/pthread_condclockwait.c +++ b/sched/pthread/pthread_condclockwait.c @@ -165,8 +165,6 @@ int pthread_cond_clockwait(FAR pthread_cond_t *cond, sinfo("cond=0x%p mutex=0x%p abstime=0x%p\n", cond, mutex, abstime); - DEBUGASSERT(rtcb->waitdog == NULL); - /* pthread_cond_clockwait() is a cancellation point */ enter_cancellation_point(); @@ -196,164 +194,153 @@ int pthread_cond_clockwait(FAR pthread_cond_t *cond, else { - /* Create a watchdog */ + sinfo("Give up mutex...\n"); - rtcb->waitdog = wd_create(); - if (!rtcb->waitdog) + /* We must disable pre-emption and interrupts here so that + * the time stays valid until the wait begins. This adds + * complexity because we assure that interrupts and + * pre-emption are re-enabled correctly. + */ + + sched_lock(); + flags = enter_critical_section(); + + /* Convert the timespec to clock ticks. We must disable pre- + * emption here so that this time stays valid until the wait + * begins. + */ + + ret = clock_abstime2ticks(clockid, abstime, &ticks); + if (ret) { - ret = EINVAL; + /* Restore interrupts (pre-emption will be enabled when + * we fall through the if/then/else) + */ + + leave_critical_section(flags); } else { - sinfo("Give up mutex...\n"); - - /* We must disable pre-emption and interrupts here so that - * the time stays valid until the wait begins. This adds - * complexity because we assure that interrupts and - * pre-emption are re-enabled correctly. + /* Check the absolute time to wait. If it is now or in the + * past, then just return with the timedout condition. */ - sched_lock(); - flags = enter_critical_section(); - - /* Convert the timespec to clock ticks. We must disable pre- - * emption here so that this time stays valid until the wait - * begins. - */ - - ret = clock_abstime2ticks(clockid, abstime, &ticks); - if (ret) + if (ticks <= 0) { - /* Restore interrupts (pre-emption will be enabled when - * we fall through the if/then/else) + /* Restore interrupts and indicate that we have already + * timed out. (pre-emption will be enabled when we fall + * through the if/then/else */ leave_critical_section(flags); + ret = ETIMEDOUT; } else { - /* Check the absolute time to wait. If it is now or in the - * past, then just return with the timedout condition. - */ +#ifndef CONFIG_PTHREAD_MUTEX_UNSAFE + uint8_t mflags; +#endif +#ifdef CONFIG_PTHREAD_MUTEX_TYPES + uint8_t type; + int16_t nlocks; +#endif + /* Give up the mutex */ - if (ticks <= 0) + mutex->pid = -1; +#ifndef CONFIG_PTHREAD_MUTEX_UNSAFE + mflags = mutex->flags; +#endif +#ifdef CONFIG_PTHREAD_MUTEX_TYPES + type = mutex->type; + nlocks = mutex->nlocks; +#endif + ret = pthread_mutex_give(mutex); + if (ret != 0) { - /* Restore interrupts and indicate that we have already - * timed out. (pre-emption will be enabled when we fall - * through the if/then/else + /* Restore interrupts (pre-emption will be enabled + * when we fall through the if/then/else) */ leave_critical_section(flags); - ret = ETIMEDOUT; } else { -#ifndef CONFIG_PTHREAD_MUTEX_UNSAFE - uint8_t mflags; -#endif -#ifdef CONFIG_PTHREAD_MUTEX_TYPES - uint8_t type; - int16_t nlocks; -#endif - /* Give up the mutex */ + /* Start the watchdog */ - mutex->pid = -1; -#ifndef CONFIG_PTHREAD_MUTEX_UNSAFE - mflags = mutex->flags; -#endif -#ifdef CONFIG_PTHREAD_MUTEX_TYPES - type = mutex->type; - nlocks = mutex->nlocks; -#endif - ret = pthread_mutex_give(mutex); - if (ret != 0) + wd_start(&rtcb->waitdog, ticks, + (wdentry_t)pthread_condtimedout, 2, + (wdparm_t)mypid, (wdparm_t)SIGCONDTIMEDOUT); + + /* Take the condition semaphore. Do not restore + * interrupts until we return from the wait. This is + * necessary to make sure that the watchdog timer and + * the condition wait are started atomically. + */ + + status = nxsem_wait((FAR sem_t *)&cond->sem); + + /* Did we get the condition semaphore. */ + + if (status < 0) { - /* Restore interrupts (pre-emption will be enabled - * when we fall through the if/then/else) + /* NO.. Handle the special case where the semaphore + * wait was awakened by the receipt of a signal -- + * presumably the signal posted by + * pthread_condtimedout(). */ - leave_critical_section(flags); - } - else - { - /* Start the watchdog */ - - wd_start(rtcb->waitdog, ticks, - (wdentry_t)pthread_condtimedout, 2, - (wdparm_t)mypid, (wdparm_t)SIGCONDTIMEDOUT); - - /* Take the condition semaphore. Do not restore - * interrupts until we return from the wait. This is - * necessary to make sure that the watchdog timer and - * the condition wait are started atomically. - */ - - status = nxsem_wait((FAR sem_t *)&cond->sem); - - /* Did we get the condition semaphore. */ - - if (status < 0) + if (status == -EINTR) { - /* NO.. Handle the special case where the semaphore - * wait was awakened by the receipt of a signal -- - * presumably the signal posted by - * pthread_condtimedout(). - */ - - if (status == -EINTR) - { - swarn("WARNING: Timedout!\n"); - ret = ETIMEDOUT; - } - else - { - ret = status; - } + swarn("WARNING: Timedout!\n"); + ret = ETIMEDOUT; + } + else + { + ret = status; } - - /* The interrupts stay disabled until after we sample - * the errno. This is because when debug is enabled - * and the console is used for debug output, then the - * errno can be altered by interrupt handling! (bad) - */ - - leave_critical_section(flags); } - /* Reacquire the mutex (retaining the ret). */ + /* The interrupts stay disabled until after we sample + * the errno. This is because when debug is enabled + * and the console is used for debug output, then the + * errno can be altered by interrupt handling! (bad) + */ - sinfo("Re-locking...\n"); - - status = pthread_mutex_take(mutex, NULL, false); - if (status == OK) - { - mutex->pid = mypid; -#ifndef CONFIG_PTHREAD_MUTEX_UNSAFE - mutex->flags = mflags; -#endif -#ifdef CONFIG_PTHREAD_MUTEX_TYPES - mutex->type = type; - mutex->nlocks = nlocks; -#endif - } - else if (ret == 0) - { - ret = status; - } + leave_critical_section(flags); } - /* Re-enable pre-emption (It is expected that interrupts - * have already been re-enabled in the above logic) - */ + /* Reacquire the mutex (retaining the ret). */ - sched_unlock(); + sinfo("Re-locking...\n"); + + status = pthread_mutex_take(mutex, NULL, false); + if (status == OK) + { + mutex->pid = mypid; +#ifndef CONFIG_PTHREAD_MUTEX_UNSAFE + mutex->flags = mflags; +#endif +#ifdef CONFIG_PTHREAD_MUTEX_TYPES + mutex->type = type; + mutex->nlocks = nlocks; +#endif + } + else if (ret == 0) + { + ret = status; + } } - /* We no longer need the watchdog */ + /* Re-enable pre-emption (It is expected that interrupts + * have already been re-enabled in the above logic) + */ - wd_delete(rtcb->waitdog); - rtcb->waitdog = NULL; + sched_unlock(); } + + /* We no longer need the watchdog */ + + wd_cancel(&rtcb->waitdog); } leave_cancellation_point(); diff --git a/sched/semaphore/sem_clockwait.c b/sched/semaphore/sem_clockwait.c index 83f46042e61..62467a66a87 100644 --- a/sched/semaphore/sem_clockwait.c +++ b/sched/semaphore/sem_clockwait.c @@ -96,7 +96,7 @@ int nxsem_clockwait(FAR sem_t *sem, clockid_t clockid, int status; int ret = ERROR; - DEBUGASSERT(up_interrupt_context() == false && rtcb->waitdog == NULL); + DEBUGASSERT(up_interrupt_context() == false); /* Verify the input parameters and, in case of an error, set * errno appropriately. @@ -109,17 +109,6 @@ int nxsem_clockwait(FAR sem_t *sem, clockid_t clockid, } #endif - /* Create a watchdog. We will not actually need this watchdog - * unless the semaphore is unavailable, but we will reserve it up - * front before we enter the following critical section. - */ - - rtcb->waitdog = wd_create(); - if (!rtcb->waitdog) - { - return -ENOMEM; - } - /* We will disable interrupts until we have completed the semaphore * wait. We need to do this (as opposed to just disabling pre-emption) * because there could be interrupt handlers that are asynchronously @@ -177,7 +166,7 @@ int nxsem_clockwait(FAR sem_t *sem, clockid_t clockid, /* Start the watchdog */ - wd_start(rtcb->waitdog, ticks, nxsem_timeout, 1, (wdparm_t)getpid()); + wd_start(&rtcb->waitdog, ticks, nxsem_timeout, 1, (wdparm_t)getpid()); /* Now perform the blocking wait. If nxsem_wait() fails, the * negated errno value will be returned below. @@ -187,15 +176,13 @@ int nxsem_clockwait(FAR sem_t *sem, clockid_t clockid, /* Stop the watchdog timer */ - wd_cancel(rtcb->waitdog); + wd_cancel(&rtcb->waitdog); /* We can now restore interrupts and delete the watchdog */ success_with_irqdisabled: errout_with_irqdisabled: leave_critical_section(flags); - wd_delete(rtcb->waitdog); - rtcb->waitdog = NULL; return ret; } diff --git a/sched/semaphore/sem_tickwait.c b/sched/semaphore/sem_tickwait.c index 1e604f2e1f5..d2449f54cac 100644 --- a/sched/semaphore/sem_tickwait.c +++ b/sched/semaphore/sem_tickwait.c @@ -74,19 +74,7 @@ int nxsem_tickwait(FAR sem_t *sem, clock_t start, uint32_t delay) clock_t elapsed; int ret; - DEBUGASSERT(sem != NULL && up_interrupt_context() == false && - rtcb->waitdog == NULL); - - /* Create a watchdog. We will not actually need this watchdog - * unless the semaphore is unavailable, but we will reserve it up - * front before we enter the following critical section. - */ - - rtcb->waitdog = wd_create(); - if (!rtcb->waitdog) - { - return -ENOMEM; - } + DEBUGASSERT(sem != NULL && up_interrupt_context() == false); /* We will disable interrupts until we have completed the semaphore * wait. We need to do this (as opposed to just disabling pre-emption) @@ -132,21 +120,22 @@ int nxsem_tickwait(FAR sem_t *sem, clock_t start, uint32_t delay) /* Start the watchdog with interrupts still disabled */ - wd_start(rtcb->waitdog, delay, nxsem_timeout, 1, (wdparm_t)getpid()); + wd_start(&rtcb->waitdog, delay, nxsem_timeout, 1, (wdparm_t)getpid()); /* Now perform the blocking wait */ ret = nxsem_wait(sem); + + /* Stop the watchdog timer */ + + wd_cancel(&rtcb->waitdog); + if (ret < 0) { goto errout_with_irqdisabled; } - /* Stop the watchdog timer */ - - wd_cancel(rtcb->waitdog); - - /* We can now restore interrupts and delete the watchdog */ + /* We can now restore interrupts */ /* Success exits */ @@ -156,8 +145,6 @@ success_with_irqdisabled: errout_with_irqdisabled: leave_critical_section(flags); - wd_delete(rtcb->waitdog); - rtcb->waitdog = NULL; return ret; } diff --git a/sched/signal/sig_timedwait.c b/sched/signal/sig_timedwait.c index 9d873464304..d446e10ddc5 100644 --- a/sched/signal/sig_timedwait.c +++ b/sched/signal/sig_timedwait.c @@ -247,7 +247,7 @@ int nxsig_timedwait(FAR const sigset_t *set, FAR struct siginfo *info, int32_t waitticks; int ret; - DEBUGASSERT(set != NULL && rtcb->waitdog == NULL); + DEBUGASSERT(set != NULL); /* Several operations must be performed below: We must determine if any * signal is pending and, if not, wait for the signal. Since signals can @@ -340,43 +340,30 @@ int nxsig_timedwait(FAR const sigset_t *set, FAR struct siginfo *info, waitticks = MSEC2TICK(waitmsec); #endif - /* Create a watchdog */ - - rtcb->waitdog = wd_create(); - DEBUGASSERT(rtcb->waitdog); - - if (rtcb->waitdog) - { - /* This little bit of nonsense is necessary for some - * processors where sizeof(pointer) < sizeof(uint32_t). - * see wdog.h. - */ - - union wdparm_u wdparm; - wdparm.pvarg = (FAR void *)rtcb; - - /* Start the watchdog */ - - wd_start(rtcb->waitdog, waitticks, - nxsig_timeout, 1, wdparm.pvarg); - - /* Now wait for either the signal or the watchdog, but - * first, make sure this is not the idle task, - * descheduling that isn't going to end well. - */ - - DEBUGASSERT(NULL != rtcb->flink); - up_block_task(rtcb, TSTATE_WAIT_SIG); - - /* We no longer need the watchdog */ - - wd_delete(rtcb->waitdog); - rtcb->waitdog = NULL; - } - - /* REVISIT: And do what if there are no watchdog timers? The wait - * will fail and we will return something bogus. + /* This little bit of nonsense is necessary for some + * processors where sizeof(pointer) < sizeof(uint32_t). + * see wdog.h. */ + + union wdparm_u wdparm; + wdparm.pvarg = (FAR void *)rtcb; + + /* Start the watchdog */ + + wd_start(&rtcb->waitdog, waitticks, + nxsig_timeout, 1, wdparm.pvarg); + + /* Now wait for either the signal or the watchdog, but + * first, make sure this is not the idle task, + * descheduling that isn't going to end well. + */ + + DEBUGASSERT(NULL != rtcb->flink); + up_block_task(rtcb, TSTATE_WAIT_SIG); + + /* We no longer need the watchdog */ + + wd_cancel(&rtcb->waitdog); } /* No timeout, just wait */ diff --git a/sched/timer/timer.h b/sched/timer/timer.h index 83948bc60ba..70c18e10610 100644 --- a/sched/timer/timer.h +++ b/sched/timer/timer.h @@ -55,7 +55,7 @@ struct posix_timer_s pid_t pt_owner; /* Creator of timer */ int pt_delay; /* If non-zero, used to reset repetitive timers */ int pt_last; /* Last value used to set watchdog */ - WDOG_ID pt_wdog; /* The watchdog that provides the timing */ + struct wdog_s pt_wdog; /* The watchdog that provides the timing */ struct sigevent pt_event; /* Notification information */ struct sigwork_s pt_work; }; diff --git a/sched/timer/timer_create.c b/sched/timer/timer_create.c index 24a84a1dafc..43703883d37 100644 --- a/sched/timer/timer_create.c +++ b/sched/timer/timer_create.c @@ -156,7 +156,6 @@ int timer_create(clockid_t clockid, FAR struct sigevent *evp, FAR timer_t *timerid) { FAR struct posix_timer_s *ret; - WDOG_ID wdog; /* Sanity checks. Also, we support only CLOCK_REALTIME */ @@ -166,21 +165,11 @@ int timer_create(clockid_t clockid, FAR struct sigevent *evp, return ERROR; } - /* Allocate a watchdog to provide the underling CLOCK_REALTIME timer */ - - wdog = wd_create(); - if (!wdog) - { - set_errno(EAGAIN); - return ERROR; - } - /* Allocate a timer instance to contain the watchdog */ ret = timer_allocate(); if (!ret) { - wd_delete(wdog); set_errno(EAGAIN); return ERROR; } @@ -190,7 +179,6 @@ int timer_create(clockid_t clockid, FAR struct sigevent *evp, ret->pt_crefs = 1; ret->pt_owner = getpid(); ret->pt_delay = 0; - ret->pt_wdog = wdog; /* Was a struct sigevent provided? */ diff --git a/sched/timer/timer_gettime.c b/sched/timer/timer_gettime.c index dfa66a962e8..17aceb5e304 100644 --- a/sched/timer/timer_gettime.c +++ b/sched/timer/timer_gettime.c @@ -81,7 +81,7 @@ int timer_gettime(timer_t timerid, FAR struct itimerspec *value) /* Get the number of ticks before the underlying watchdog expires */ - ticks = wd_gettime(timer->pt_wdog); + ticks = wd_gettime(&timer->pt_wdog); /* Convert that to a struct timespec and return it */ diff --git a/sched/timer/timer_release.c b/sched/timer/timer_release.c index 0312f07dc91..9660d85a2db 100644 --- a/sched/timer/timer_release.c +++ b/sched/timer/timer_release.c @@ -119,11 +119,9 @@ int timer_release(FAR struct posix_timer_s *timer) return 1; } - /* Free the underlying watchdog instance (the timer will be canceled by the - * watchdog logic before it is actually deleted) - */ + /* Cancel the underlying watchdog instance */ - wd_delete(timer->pt_wdog); + wd_cancel(&timer->pt_wdog); /* Cancel any pending notification */ diff --git a/sched/timer/timer_settime.c b/sched/timer/timer_settime.c index 21c4733859c..abd4b58e73c 100644 --- a/sched/timer/timer_settime.c +++ b/sched/timer/timer_settime.c @@ -98,7 +98,7 @@ static inline void timer_restart(FAR struct posix_timer_s *timer, if (timer->pt_delay) { timer->pt_last = timer->pt_delay; - wd_start(timer->pt_wdog, timer->pt_delay, + wd_start(&timer->pt_wdog, timer->pt_delay, timer_timeout, 1, (wdparm_t)itimer); } } @@ -236,7 +236,7 @@ int timer_settime(timer_t timerid, int flags, { /* Get the number of ticks before the underlying watchdog expires */ - delay = wd_gettime(timer->pt_wdog); + delay = wd_gettime(&timer->pt_wdog); /* Convert that to a struct timespec and return it */ @@ -248,7 +248,7 @@ int timer_settime(timer_t timerid, int flags, * timer_settime() is called). */ - wd_cancel(timer->pt_wdog); + wd_cancel(&timer->pt_wdog); /* Cancel any pending notification */ @@ -323,7 +323,7 @@ int timer_settime(timer_t timerid, int flags, */ timer->pt_last = delay; - ret = wd_start(timer->pt_wdog, delay, + ret = wd_start(&timer->pt_wdog, delay, timer_timeout, 1, (wdparm_t)timer); if (ret < 0) { diff --git a/sched/wdog/Make.defs b/sched/wdog/Make.defs index 43be20cb123..68aa7f4b2bf 100644 --- a/sched/wdog/Make.defs +++ b/sched/wdog/Make.defs @@ -18,8 +18,7 @@ # ############################################################################ -CSRCS += wd_initialize.c wd_create.c wd_start.c wd_cancel.c wd_delete.c -CSRCS += wd_gettime.c wd_recover.c +CSRCS += wd_initialize.c wd_start.c wd_cancel.c wd_gettime.c wd_recover.c # Include wdog build support diff --git a/sched/wdog/wd_cancel.c b/sched/wdog/wd_cancel.c index f7354bfcd4e..54067a3922c 100644 --- a/sched/wdog/wd_cancel.c +++ b/sched/wdog/wd_cancel.c @@ -55,7 +55,7 @@ * ****************************************************************************/ -int wd_cancel(WDOG_ID wdog) +int wd_cancel(FAR struct wdog_s *wdog) { FAR struct wdog_s *curr; FAR struct wdog_s *prev; diff --git a/sched/wdog/wd_create.c b/sched/wdog/wd_create.c deleted file mode 100644 index b9c91c68cd5..00000000000 --- a/sched/wdog/wd_create.c +++ /dev/null @@ -1,130 +0,0 @@ -/**************************************************************************** - * sched/wdog/wd_create.c - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. The - * ASF licenses this file to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the - * License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - ****************************************************************************/ - -/**************************************************************************** - * Included Files - ****************************************************************************/ - -#include - -#include -#include - -#include -#include -#include -#include - -#include "wdog/wdog.h" - -/**************************************************************************** - * Public Functions - ****************************************************************************/ - -/**************************************************************************** - * Name: wd_create - * - * Description: - * The wd_create function will create a watchdog timer by allocating one - * from the list of free watchdog timers. - * - * Input Parameters: - * None - * - * Returned Value: - * Pointer to watchdog (i.e., the watchdog ID), or NULL if insufficient - * watchdogs are available. - * - ****************************************************************************/ - -WDOG_ID wd_create (void) -{ - FAR struct wdog_s *wdog; - irqstate_t flags; - - /* These actions must be atomic with respect to other tasks and also with - * respect to interrupt handlers that may be allocating or freeing watchdog - * timers. - */ - - flags = enter_critical_section(); - - /* If we are in an interrupt handler -OR- if the number of pre-allocated - * timer structures exceeds the reserve, then take the next timer from - * the head of the free list. - */ - - if (g_wdnfree > CONFIG_WDOG_INTRESERVE || up_interrupt_context()) - { - /* Remove the watchdog timer from the free list */ - - wdog = (FAR struct wdog_s *)sq_remfirst(&g_wdfreelist); - - /* Did we get one? */ - - if (wdog != NULL) - { - /* Yes.. decrement the count of free, pre-allocated timers (all - * with interrupts disabled). - */ - - DEBUGASSERT(g_wdnfree > 0); - g_wdnfree--; - - /* Clear the forward link and all flags */ - - wdog->next = NULL; - wdog->flags = 0; - } - else - { - /* We didn't get one... The count should then be exactly zero */ - - DEBUGASSERT(g_wdnfree == 0); - } - - leave_critical_section(flags); - } - - /* We are in a normal tasking context AND there are not enough unreserved, - * pre-allocated watchdog timers. We need to allocate one from the kernel - * heap. - */ - - else - { - /* We do not require that interrupts be disabled to do this. */ - - leave_critical_section(flags); - wdog = (FAR struct wdog_s *)kmm_malloc(sizeof(struct wdog_s)); - - /* Did we get one? */ - - if (wdog) - { - /* Yes.. Clear the forward link and set the allocated flag */ - - wdog->next = NULL; - wdog->flags = WDOGF_ALLOCED; - } - } - - return (WDOG_ID)wdog; -} diff --git a/sched/wdog/wd_delete.c b/sched/wdog/wd_delete.c deleted file mode 100644 index 98376d6bf83..00000000000 --- a/sched/wdog/wd_delete.c +++ /dev/null @@ -1,126 +0,0 @@ -/**************************************************************************** - * sched/wdog/wd_delete.c - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. The - * ASF licenses this file to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the - * License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - ****************************************************************************/ - -/**************************************************************************** - * Included Files - ****************************************************************************/ - -#include - -#include -#include -#include - -#include -#include -#include -#include - -#include "wdog/wdog.h" - -/**************************************************************************** - * Public Functions - ****************************************************************************/ - -/**************************************************************************** - * Name: wd_delete - * - * Description: - * The wd_delete() function will deallocate a watchdog timer by returning - * it to the free pool of watchdog timers. The watchdog timer will be - * removed from the active timer queue if had been started. - * - * Input Parameters: - * wdog - The watchdog ID to delete. This is actually a pointer to a - * watchdog structure. - * - * Returned Value: - * Zero (OK) is returned on success; a negated errno value is return to - * indicate the nature of any failure. - * - * Assumptions: - * The caller has assured that the watchdog is no longer in use. - * - ****************************************************************************/ - -int wd_delete(WDOG_ID wdog) -{ - irqstate_t flags; - - DEBUGASSERT(wdog != NULL); - - /* The following steps are atomic... the watchdog must not be active when - * it is being deallocated. - */ - - flags = enter_critical_section(); - - /* Check if the watchdog has been started. */ - - if (WDOG_ISACTIVE(wdog)) - { - /* Yes.. stop it */ - - wd_cancel(wdog); - } - - /* Did this watchdog come from the pool of pre-allocated timers? Or, was - * it allocated from the heap? - */ - - if (WDOG_ISALLOCED(wdog)) - { - /* It was allocated from the heap. Use kmm_free() to release the - * memory. If the timer was released from an interrupt handler, - * kmm_free() will defer the actual deallocation of the memory - * until a more appropriate time. - * - * We don't need interrupts disabled to do this. - */ - - leave_critical_section(flags); - kmm_free(wdog); - } - - /* Check if this is pre-allocated timer. */ - - else if (!WDOG_ISSTATIC(wdog)) - { - /* Put the timer back on the free list and increment the count of free - * timers, all with interrupts disabled. - */ - - sq_addlast((FAR sq_entry_t *)wdog, &g_wdfreelist); - g_wdnfree++; - DEBUGASSERT(g_wdnfree <= CONFIG_PREALLOC_WDOGS); - leave_critical_section(flags); - } - - /* This function should not be called for statically allocated timers. */ - - else - { - leave_critical_section(flags); - } - - /* Return success */ - - return OK; -} diff --git a/sched/wdog/wd_gettime.c b/sched/wdog/wd_gettime.c index 2cb096269e2..429e78a5f69 100644 --- a/sched/wdog/wd_gettime.c +++ b/sched/wdog/wd_gettime.c @@ -50,7 +50,7 @@ * ****************************************************************************/ -int wd_gettime(WDOG_ID wdog) +int wd_gettime(FAR struct wdog_s *wdog) { irqstate_t flags; diff --git a/sched/wdog/wd_initialize.c b/sched/wdog/wd_initialize.c index 08e67804a1b..4062802f0df 100644 --- a/sched/wdog/wd_initialize.c +++ b/sched/wdog/wd_initialize.c @@ -32,12 +32,6 @@ * Public Data ****************************************************************************/ -/* The g_wdfreelist data structure is a singly linked list of watchdogs - * available to the system for delayed function use. - */ - -sq_queue_t g_wdfreelist; - /* The g_wdactivelist data structure is a singly linked list ordered by * watchdog expiration time. When watchdog timers expire,the functions on * this linked list are removed and the function is called. @@ -45,13 +39,6 @@ sq_queue_t g_wdfreelist; sq_queue_t g_wdactivelist; -/* This is the number of free, pre-allocated watchdog structures in the - * g_wdfreelist. This value is used to enforce a reserve for interrupt - * handlers. - */ - -uint16_t g_wdnfree; - /* This is wdog tickbase, for wd_gettime() may called many times * between 2 times of wd_timer(), we use it to update wd_gettime(). */ @@ -60,16 +47,6 @@ uint16_t g_wdnfree; clock_t g_wdtickbase; #endif -/**************************************************************************** - * Private Data - ****************************************************************************/ - -/* g_wdpool is a list of pre-allocated watchdogs. The number of watchdogs - * in the pool is a configuration item. - */ - -static struct wdog_s g_wdpool[CONFIG_PREALLOC_WDOGS]; - /**************************************************************************** * Public Functions ****************************************************************************/ @@ -95,24 +72,7 @@ static struct wdog_s g_wdpool[CONFIG_PREALLOC_WDOGS]; void wd_initialize(void) { - FAR struct wdog_s *wdog = g_wdpool; - int i; - /* Initialize watchdog lists */ - sq_init(&g_wdfreelist); sq_init(&g_wdactivelist); - - /* The g_wdfreelist must be loaded at initialization time to hold the - * configured number of watchdogs. - */ - - for (i = 0; i < CONFIG_PREALLOC_WDOGS; i++) - { - sq_addlast((FAR sq_entry_t *)wdog++, &g_wdfreelist); - } - - /* All watchdogs are free */ - - g_wdnfree = CONFIG_PREALLOC_WDOGS; } diff --git a/sched/wdog/wd_recover.c b/sched/wdog/wd_recover.c index 24f0d78b080..2b2e9c58946 100644 --- a/sched/wdog/wd_recover.c +++ b/sched/wdog/wd_recover.c @@ -56,22 +56,12 @@ void wd_recover(FAR struct tcb_s *tcb) { - irqstate_t flags; - /* The task is being deleted. If it is waiting for any timed event, then - * tcb->waitdog will be non-NULL. Cancel the watchdog now so that no - * events occur after the watchdog expires. Obviously there are lots of - * race conditions here so this will most certainly have to be revisited in - * the future. + * cancel the watchdog now so that no events occur after the watchdog + * expires. Obviously there are lots of race conditions here so this will + * most certainly have to be revisited in the future. + * */ - flags = enter_critical_section(); - if (tcb->waitdog) - { - wd_cancel(tcb->waitdog); - wd_delete(tcb->waitdog); - tcb->waitdog = NULL; - } - - leave_critical_section(flags); + wd_cancel(&tcb->waitdog); } diff --git a/sched/wdog/wd_start.c b/sched/wdog/wd_start.c index 4d8558437a4..20d94934f4d 100644 --- a/sched/wdog/wd_start.c +++ b/sched/wdog/wd_start.c @@ -168,7 +168,8 @@ static inline void wd_expiration(void) * ****************************************************************************/ -int wd_start(WDOG_ID wdog, int32_t delay, wdentry_t wdentry, int argc, ...) +int wd_start(FAR struct wdog_s *wdog, int32_t delay, + wdentry_t wdentry, int argc, ...) { va_list ap; FAR struct wdog_s *curr; diff --git a/sched/wdog/wdog.h b/sched/wdog/wdog.h index e525080a939..24b75c76f9a 100644 --- a/sched/wdog/wdog.h +++ b/sched/wdog/wdog.h @@ -67,12 +67,6 @@ extern "C" #define EXTERN extern #endif -/* The g_wdfreelist data structure is a singly linked list of watchdogs - * available to the system for delayed function use. - */ - -extern sq_queue_t g_wdfreelist; - /* The g_wdactivelist data structure is a singly linked list ordered by * watchdog expiration time. When watchdog timers expire,the functions on * this linked list are removed and the function is called. @@ -80,13 +74,6 @@ extern sq_queue_t g_wdfreelist; extern sq_queue_t g_wdactivelist; -/* This is the number of free, pre-allocated watchdog structures in the - * g_wdfreelist. This value is used to enforce a reserve for interrupt - * handlers. - */ - -extern uint16_t g_wdnfree; - /* This is wdog tickbase, for wd_gettime() may called many times * between 2 times of wd_timer(), we use it to update wd_gettime(). */ diff --git a/wireless/bluetooth/bt_netdev.c b/wireless/bluetooth/bt_netdev.c index 456207dce63..057159b2731 100644 --- a/wireless/bluetooth/bt_netdev.c +++ b/wireless/bluetooth/bt_netdev.c @@ -123,7 +123,7 @@ struct btnet_driver_s sem_t bd_exclsem; /* Exclusive access to struct */ bool bd_bifup; /* true:ifup false:ifdown */ - WDOG_ID bd_txpoll; /* TX poll timer */ + struct wdog_s bd_txpoll; /* TX poll timer */ struct work_s bd_pollwork; /* Defer poll work to the work queue */ struct bt_conn_cb_s bd_hcicb; /* HCI connection status callbacks */ struct bt_l2cap_chan_s bd_l2capcb; /* L2CAP status callbacks */ @@ -549,7 +549,7 @@ static void btnet_txpoll_work(FAR void *arg) /* Setup the watchdog poll timer again */ - wd_start(priv->bd_txpoll, TXPOLL_WDDELAY, + wd_start(&priv->bd_txpoll, TXPOLL_WDDELAY, btnet_txpoll_expiry, 1, (wdparm_t)priv); net_unlock(); } @@ -629,7 +629,7 @@ static int btnet_ifup(FAR struct net_driver_s *netdev) /* Set and activate a timer process */ - wd_start(priv->bd_txpoll, TXPOLL_WDDELAY, + wd_start(&priv->bd_txpoll, TXPOLL_WDDELAY, btnet_txpoll_expiry, 1, (wdparm_t)priv); /* The interface is now up */ @@ -669,7 +669,7 @@ static int btnet_ifdown(FAR struct net_driver_s *netdev) /* Cancel the TX poll timer and TX timeout timers */ - wd_cancel(priv->bd_txpoll); + wd_cancel(&priv->bd_txpoll); /* Put the EMAC in its reset, non-operational state. This should be * a known configuration that will guarantee the btnet_ifup() always @@ -1039,7 +1039,7 @@ int bt_netdev_register(FAR const struct bt_driver_s *btdev) #ifdef CONFIG_NETDEV_IOCTL netdev->d_ioctl = btnet_ioctl; /* Handle network IOCTL commands */ #endif - netdev->d_private = (FAR void *)priv; /* Used to recover private state from netdev */ + netdev->d_private = priv; /* Used to recover private state from netdev */ /* Connection status change callbacks */ @@ -1061,10 +1061,6 @@ int bt_netdev_register(FAR const struct bt_driver_s *btdev) bt_l2cap_chan_default(l2capcb); - /* Create a watchdog for timing polling for and timing of transmissions */ - - priv->bd_txpoll = wd_create(); /* Create periodic poll timer */ - /* Setup a locking semaphore for exclusive device driver access */ nxsem_init(&priv->bd_exclsem, 0, 1); @@ -1137,10 +1133,6 @@ int bt_netdev_register(FAR const struct bt_driver_s *btdev) errout: - /* Release wdog timers */ - - wd_delete(priv->bd_txpoll); - /* Un-initialize semaphores */ nxsem_destroy(&priv->bd_exclsem); diff --git a/wireless/ieee802154/mac802154_loopback.c b/wireless/ieee802154/mac802154_loopback.c index 9a58fe72064..1d5e6e17f98 100644 --- a/wireless/ieee802154/mac802154_loopback.c +++ b/wireless/ieee802154/mac802154_loopback.c @@ -123,7 +123,7 @@ struct lo_driver_s bool lo_bifup; /* true:ifup false:ifdown */ bool lo_pending; /* True: TX poll pending */ uint8_t lo_panid[2]; /* Fake PAN ID for testing */ - WDOG_ID lo_polldog; /* TX poll timer */ + struct wdog_s lo_polldog; /* TX poll timer */ struct work_s lo_work; /* For deferring poll work to the work queue */ FAR struct iob_s *lo_head; /* Head of IOBs queued for loopback */ FAR struct iob_s *lo_tail; /* Tail of IOBs queued for loopback */ @@ -491,7 +491,7 @@ static void lo_poll_work(FAR void *arg) /* Setup the watchdog poll timer again */ - wd_start(priv->lo_polldog, LO_WDDELAY, lo_poll_expiry, 1, (wdparm_t)priv); + wd_start(&priv->lo_polldog, LO_WDDELAY, lo_poll_expiry, 1, (wdparm_t)priv); net_unlock(); } @@ -594,7 +594,7 @@ static int lo_ifup(FAR struct net_driver_s *dev) /* Set and activate a timer process */ - wd_start(priv->lo_polldog, LO_WDDELAY, + wd_start(&priv->lo_polldog, LO_WDDELAY, lo_poll_expiry, 1, (wdparm_t)priv); priv->lo_bifup = true; @@ -625,7 +625,7 @@ static int lo_ifdown(FAR struct net_driver_s *dev) /* Cancel the TX poll timer and TX timeout timers */ - wd_cancel(priv->lo_polldog); + wd_cancel(&priv->lo_polldog); /* Mark the device "down" */ @@ -1102,7 +1102,7 @@ int ieee8021514_loopback(void) #ifdef CONFIG_NETDEV_IOCTL dev->d_ioctl = lo_ioctl; /* Handle network IOCTL commands */ #endif - dev->d_private = (FAR void *)priv; /* Used to recover private state from dev */ + dev->d_private = priv; /* Used to recover private state from dev */ /* Set the network mask and advertise our MAC-based IP address */ @@ -1115,10 +1115,6 @@ int ieee8021514_loopback(void) radio->r_req_data = lo_req_data; /* Enqueue frame for transmission */ radio->r_properties = lo_properties; /* Returns radio properties */ - /* Create a watchdog for timing polling for and timing of transmissions */ - - priv->lo_polldog = wd_create(); /* Create periodic poll timer */ - #ifdef CONFIG_NET_6LOWPAN /* Make sure the our single packet buffer is attached. * We must do this before registering the device since, once the device diff --git a/wireless/ieee802154/mac802154_netdev.c b/wireless/ieee802154/mac802154_netdev.c index d130038d270..855595662f7 100644 --- a/wireless/ieee802154/mac802154_netdev.c +++ b/wireless/ieee802154/mac802154_netdev.c @@ -156,7 +156,7 @@ struct macnet_driver_s struct macnet_callback_s md_cb; /* Callback information */ MACHANDLE md_mac; /* Contained MAC interface */ bool md_bifup; /* true:ifup false:ifdown */ - WDOG_ID md_txpoll; /* TX poll timer */ + struct wdog_s md_txpoll; /* TX poll timer */ struct work_s md_pollwork; /* Defer poll work to the work queue */ /* Hold a list of events */ @@ -590,7 +590,7 @@ static void macnet_txpoll_work(FAR void *arg) /* Setup the watchdog poll timer again */ - wd_start(priv->md_txpoll, TXPOLL_WDDELAY, + wd_start(&priv->md_txpoll, TXPOLL_WDDELAY, macnet_txpoll_expiry, 1, (wdparm_t)priv); net_unlock(); } @@ -778,7 +778,7 @@ static int macnet_ifup(FAR struct net_driver_s *dev) /* Set and activate a timer process */ - wd_start(priv->md_txpoll, TXPOLL_WDDELAY, + wd_start(&priv->md_txpoll, TXPOLL_WDDELAY, macnet_txpoll_expiry, 1, (wdparm_t)priv); ret = OK; @@ -818,7 +818,7 @@ static int macnet_ifdown(FAR struct net_driver_s *dev) /* Cancel the TX poll timer and TX timeout timers */ - wd_cancel(priv->md_txpoll); + wd_cancel(&priv->md_txpoll); /* Put the EMAC in its reset, non-operational state. This should be * a known configuration that will guarantee the macnet_ifup() always @@ -1370,12 +1370,8 @@ int mac802154netdev_register(MACHANDLE mac) #ifdef CONFIG_NETDEV_IOCTL dev->d_ioctl = macnet_ioctl; /* Handle network IOCTL commands */ #endif - dev->d_private = (FAR void *)priv; /* Used to recover private state from dev */ - - /* Create a watchdog for timing polling for and timing of transmissions */ - + dev->d_private = priv; /* Used to recover private state from dev */ priv->md_mac = mac; /* Save the MAC interface instance */ - priv->md_txpoll = wd_create(); /* Create periodic poll timer */ /* Setup a locking semaphore for exclusive device driver access */ @@ -1452,10 +1448,6 @@ int mac802154netdev_register(MACHANDLE mac) errout: - /* Release wdog timers */ - - wd_delete(priv->md_txpoll); - /* Free memory and return the error */ kmm_free(priv); diff --git a/wireless/pktradio/pktradio_loopback.c b/wireless/pktradio/pktradio_loopback.c index 10cf1559d37..5989909da5a 100644 --- a/wireless/pktradio/pktradio_loopback.c +++ b/wireless/pktradio/pktradio_loopback.c @@ -118,7 +118,7 @@ struct lo_driver_s bool lo_bifup; /* true:ifup false:ifdown */ bool lo_pending; /* True: TX poll pending */ uint8_t lo_panid[2]; /* Fake PAN ID for testing */ - WDOG_ID lo_polldog; /* TX poll timer */ + struct wdog_s lo_polldog; /* TX poll timer */ struct work_s lo_work; /* For deferring poll work to the work queue */ FAR struct iob_s *lo_head; /* Head of IOBs queued for loopback */ FAR struct iob_s *lo_tail; /* Tail of IOBs queued for loopback */ @@ -449,7 +449,7 @@ static void lo_poll_work(FAR void *arg) /* Setup the watchdog poll timer again */ - wd_start(priv->lo_polldog, LO_WDDELAY, lo_poll_expiry, 1, (wdparm_t)priv); + wd_start(&priv->lo_polldog, LO_WDDELAY, lo_poll_expiry, 1, (wdparm_t)priv); net_unlock(); } @@ -533,7 +533,7 @@ static int lo_ifup(FAR struct net_driver_s *dev) /* Set and activate a timer process */ - wd_start(priv->lo_polldog, LO_WDDELAY, + wd_start(&priv->lo_polldog, LO_WDDELAY, lo_poll_expiry, 1, (wdparm_t)priv); priv->lo_bifup = true; @@ -564,7 +564,7 @@ static int lo_ifdown(FAR struct net_driver_s *dev) /* Cancel the TX poll timer and TX timeout timers */ - wd_cancel(priv->lo_polldog); + wd_cancel(&priv->lo_polldog); /* Mark the device "down" */ @@ -1045,7 +1045,7 @@ int pktradio_loopback(void) #ifdef CONFIG_NETDEV_IOCTL dev->d_ioctl = lo_ioctl; /* Handle network IOCTL commands */ #endif - dev->d_private = (FAR void *)priv; /* Used to recover private state from dev */ + dev->d_private = priv; /* Used to recover private state from dev */ /* Set the network mask and advertise our MAC-based IP address */ @@ -1058,10 +1058,6 @@ int pktradio_loopback(void) radio->r_req_data = lo_req_data; /* Enqueue frame for transmission */ radio->r_properties = lo_properties; /* Returns radio properties */ - /* Create a watchdog for timing polling for and timing of transmissions */ - - priv->lo_polldog = wd_create(); /* Create periodic poll timer */ - #ifdef CONFIG_NET_6LOWPAN /* Make sure the our single packet buffer is attached. * We must do this before registering the device since,