You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by GitBox <gi...@apache.org> on 2021/07/05 15:21:05 UTC
[GitHub] [incubator-nuttx] fjpanag opened a new pull request #4072: lpc17xx: Added WDT driver.
fjpanag opened a new pull request #4072:
URL: https://github.com/apache/incubator-nuttx/pull/4072
## Summary
Added the Watchdog Timer (WDT) driver for the LPC17xx & LPC40xx families of MCUs.
The new driver registers a new watchdog device, which can also use the "auto-monitor" function of the kernel.
It is "inspired" by the relevant STM32 driver.
## Impact
A new driver.
## Testing
Tested on custom hardware using the LPC1769 MCU.
All functionality works perfect, I also simulated a timeout event. The auto-monitor function was also tested.
Note! I observed that the LPC176x series of MCUs have a difference than the rest of the family.
The have 3 possible clock sources for the WDT, while the others have a dedicated oscillator.
Since I don't have access to such hardware, I just followed what the datasheet states, without any ability to test it. I would appreciate a test by someone who actually uses any of the other MCUs.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@nuttx.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-nuttx] acassis commented on a change in pull request #4072: lpc17xx: Added WDT driver.
Posted by GitBox <gi...@apache.org>.
acassis commented on a change in pull request #4072:
URL: https://github.com/apache/incubator-nuttx/pull/4072#discussion_r664032202
##########
File path: arch/arm/src/lpc17xx_40xx/hardware/lpc17_40_wdt.h
##########
@@ -89,6 +89,8 @@
/* Watchdog feed sequence register */
+#define WDT_FEED_KEY_1 (0xAA) /* Watchdog feed key 1 */
Review comment:
please change to 0xaa (NuttX coding style uses hexacode in lower case)
##########
File path: arch/arm/src/lpc17xx_40xx/lpc17_40_wdt.c
##########
@@ -0,0 +1,358 @@
+/****************************************************************************
+ * arch/arm/src/lpc17xx_40xx/lpc17_40_wdt.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 <nuttx/config.h>
+#include <nuttx/arch.h>
+
+#include <stdint.h>
+#include <stdbool.h>
+#include <assert.h>
+#include <errno.h>
+
+#include <nuttx/timers/watchdog.h>
+#include <arch/board/board.h>
+#include <nuttx/clock.h>
+
+#include "chip.h"
+#include "arm_arch.h"
+#include "hardware/lpc17_40_wdt.h"
+#include "hardware/lpc17_40_syscon.h"
+#include "lpc17_40_wdt.h"
+
+#if defined(CONFIG_WATCHDOG) && defined(CONFIG_LPC17_40_WDT)
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/* Default WDT timeout value, in ms. */
+
+#define LPC17_40_WDT_DEFTIMEOUT 1000
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+/* This structure provides the private representation of the "lower-half"
+ * driver state structure. This structure must be cast-compatible with the
+ * well-known watchdog_lowerhalf_s structure.
+ */
+
+struct lpc17_40_lowerhalf_s
+{
+ FAR const struct watchdog_ops_s *ops; /* Lower half operations */
+ uint32_t timeout; /* The (actual) selected timeout */
+ uint32_t lastreset; /* The last reset time */
+ bool started; /* true: The watchdog timer has been started */
+};
+
+/****************************************************************************
+ * Private Function Prototypes
+ ****************************************************************************/
+
+/* "Lower half" driver methods **********************************************/
+
+static int lpc17_40_start(FAR struct watchdog_lowerhalf_s *lower);
+static int lpc17_40_stop(FAR struct watchdog_lowerhalf_s *lower);
+static int lpc17_40_keepalive(FAR struct watchdog_lowerhalf_s *lower);
+static int lpc17_40_getstatus(FAR struct watchdog_lowerhalf_s *lower,
+ FAR struct watchdog_status_s *status);
+static int lpc17_40_settimeout(FAR struct watchdog_lowerhalf_s *lower,
+ uint32_t timeout);
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+/* "Lower half" driver methods */
+
+static const struct watchdog_ops_s g_wdgops =
+{
+ .start = lpc17_40_start,
+ .stop = lpc17_40_stop,
+ .keepalive = lpc17_40_keepalive,
+ .getstatus = lpc17_40_getstatus,
+ .settimeout = lpc17_40_settimeout,
+ .capture = NULL,
+ .ioctl = NULL,
+};
+
+/* "Lower half" driver state */
+
+static struct lpc17_40_lowerhalf_s g_wdgdev;
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: lpc17_40_start
+ *
+ * Description:
+ * Start the watchdog timer, resetting the time to the current timeout.
+ *
+ * Input Parameters:
+ * lower - A pointer to the publicly visible representation of the
+ * "lower-half" driver state structure.
+ *
+ * Returned Value:
+ * Zero on success; a negated errno value on failure.
+ *
+ ****************************************************************************/
+
+static int lpc17_40_start(FAR struct watchdog_lowerhalf_s *lower)
+{
+ FAR struct lpc17_40_lowerhalf_s *priv =
+ (FAR struct lpc17_40_lowerhalf_s *)lower;
+ irqstate_t flags;
+ uint32_t wdmod;
+
+ DEBUGASSERT(priv);
+
+ /* Have we already been started? */
+
+ if (!priv->started)
+ {
+ flags = enter_critical_section();
+
+ priv->started = true;
+ priv->lastreset = clock_systime_ticks();
+
+ wdmod = getreg32(LPC17_40_WDT_MOD);
+ wdmod |= (WDT_MOD_WDEN | WDT_MOD_WDRESET);
+ putreg32(wdmod, LPC17_40_WDT_MOD);
+
+ putreg32(WDT_FEED_KEY_1, LPC17_40_WDT_FEED);
+ putreg32(WDT_FEED_KEY_2, LPC17_40_WDT_FEED);
+
+ leave_critical_section(flags);
+ }
+
+ return OK;
+}
+
+/****************************************************************************
+ * Name: lpc17_40_stop
+ *
+ * Description:
+ * Stop the watchdog timer.
+ *
+ * Input Parameters:
+ * lower - A pointer to the publicly visible representation of the
+ * "lower-half" driver state structure.
+ *
+ * Returned Value:
+ * Zero on success; a negated errno value on failure.
+ *
+ ****************************************************************************/
+
+static int lpc17_40_stop(FAR struct watchdog_lowerhalf_s *lower)
+{
+ /* There is no way to disable WDT once it has been started. */
+
+ return -ENOSYS;
+}
+
+/****************************************************************************
+ * Name: lpc17_40_keepalive
+ *
+ * Description:
+ * Reset the watchdog timer to the current timeout value, prevent any
+ * imminent watchdog timeouts. This is sometimes referred as "pinging"
+ * the watchdog timer or "petting the dog".
+ *
+ * Input Parameters:
+ * lower - A pointer the publicly visible representation of the
+ * "lower-half" driver state structure.
+ *
+ * Returned Value:
+ * Zero on success; a negated errno value on failure.
+ *
+ ****************************************************************************/
+
+static int lpc17_40_keepalive(FAR struct watchdog_lowerhalf_s *lower)
+{
+ FAR struct lpc17_40_lowerhalf_s *priv =
+ (FAR struct lpc17_40_lowerhalf_s *)lower;
+ irqstate_t flags;
+
+ /* Reload the WDT. */
+
+ flags = enter_critical_section();
+ putreg32(WDT_FEED_KEY_1, LPC17_40_WDT_FEED);
+ putreg32(WDT_FEED_KEY_2, LPC17_40_WDT_FEED);
+ priv->lastreset = clock_systime_ticks();
+ leave_critical_section(flags);
+
+ return OK;
+}
+
+/****************************************************************************
+ * Name: lpc17_40_getstatus
+ *
+ * Description:
+ * Get the current watchdog timer status.
+ *
+ * Input Parameters:
+ * lower - A pointer to the publicly visible representation of the
+ * "lower-half" driver state structure.
+ * status - The location to return the watchdog status information.
+ *
+ * Returned Value:
+ * Zero on success; a negated errno value on failure.
+ *
+ ****************************************************************************/
+
+static int lpc17_40_getstatus(FAR struct watchdog_lowerhalf_s *lower,
+ FAR struct watchdog_status_s *status)
+{
+ FAR struct lpc17_40_lowerhalf_s *priv =
+ (FAR struct lpc17_40_lowerhalf_s *)lower;
+ uint32_t ticks;
+ uint32_t elapsed;
+
+ DEBUGASSERT(priv);
+
+ /* Return the status bit. */
+
+ status->flags = WDFLAGS_RESET;
+ if (priv->started)
+ {
+ status->flags |= WDFLAGS_ACTIVE;
+ }
+
+ /* Return the actual timeout in milliseconds. */
+
+ status->timeout = priv->timeout;
+
+ /* Get the elapsed time since the last ping. */
+
+ ticks = clock_systime_ticks() - priv->lastreset;
+ elapsed = (int32_t)TICK2MSEC(ticks);
+
+ if (elapsed > priv->timeout)
+ {
+ elapsed = priv->timeout;
+ }
+
+ /* Return the approximate time until the watchdog timer expiration. */
+
+ status->timeleft = priv->timeout - elapsed;
+
+ return OK;
+}
+
+/****************************************************************************
+ * Name: lpc17_40_settimeout
+ *
+ * Description:
+ * Set a new timeout value.
+ *
+ * Input Parameters:
+ * lower - A pointer to the publicly visible representation of the
+ * "lower-half" driver state structure.
+ * timeout - The new timeout value in milliseconds.
+ *
+ * Returned Value:
+ * Zero on success; a negated errno value on failure.
+ *
+ ****************************************************************************/
+
+static int lpc17_40_settimeout(FAR struct watchdog_lowerhalf_s *lower,
+ uint32_t timeout)
+{
+ FAR struct lpc17_40_lowerhalf_s *priv =
+ (FAR struct lpc17_40_lowerhalf_s *)lower;
+ uint64_t wdt_clk;
+ uint64_t wdtc;
+
+ priv->timeout = timeout;
+
+#ifdef LPC176x
Review comment:
This lower case "x" needs to be changed to upper case: LPC176X, probably it was there before the nxstyle enforcement
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@nuttx.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-nuttx] fjpanag commented on a change in pull request #4072: lpc17xx: Added WDT driver.
Posted by GitBox <gi...@apache.org>.
fjpanag commented on a change in pull request #4072:
URL: https://github.com/apache/incubator-nuttx/pull/4072#discussion_r664339115
##########
File path: arch/arm/src/lpc17xx_40xx/hardware/lpc17_40_wdt.h
##########
@@ -89,6 +89,8 @@
/* Watchdog feed sequence register */
+#define WDT_FEED_KEY_1 (0xAA) /* Watchdog feed key 1 */
Review comment:
Oh, I wasn't aware of this.
Do I need a new PR, or can I force push to a merged PR?
##########
File path: arch/arm/src/lpc17xx_40xx/lpc17_40_wdt.c
##########
@@ -0,0 +1,358 @@
+/****************************************************************************
+ * arch/arm/src/lpc17xx_40xx/lpc17_40_wdt.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 <nuttx/config.h>
+#include <nuttx/arch.h>
+
+#include <stdint.h>
+#include <stdbool.h>
+#include <assert.h>
+#include <errno.h>
+
+#include <nuttx/timers/watchdog.h>
+#include <arch/board/board.h>
+#include <nuttx/clock.h>
+
+#include "chip.h"
+#include "arm_arch.h"
+#include "hardware/lpc17_40_wdt.h"
+#include "hardware/lpc17_40_syscon.h"
+#include "lpc17_40_wdt.h"
+
+#if defined(CONFIG_WATCHDOG) && defined(CONFIG_LPC17_40_WDT)
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/* Default WDT timeout value, in ms. */
+
+#define LPC17_40_WDT_DEFTIMEOUT 1000
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+/* This structure provides the private representation of the "lower-half"
+ * driver state structure. This structure must be cast-compatible with the
+ * well-known watchdog_lowerhalf_s structure.
+ */
+
+struct lpc17_40_lowerhalf_s
+{
+ FAR const struct watchdog_ops_s *ops; /* Lower half operations */
+ uint32_t timeout; /* The (actual) selected timeout */
+ uint32_t lastreset; /* The last reset time */
+ bool started; /* true: The watchdog timer has been started */
+};
+
+/****************************************************************************
+ * Private Function Prototypes
+ ****************************************************************************/
+
+/* "Lower half" driver methods **********************************************/
+
+static int lpc17_40_start(FAR struct watchdog_lowerhalf_s *lower);
+static int lpc17_40_stop(FAR struct watchdog_lowerhalf_s *lower);
+static int lpc17_40_keepalive(FAR struct watchdog_lowerhalf_s *lower);
+static int lpc17_40_getstatus(FAR struct watchdog_lowerhalf_s *lower,
+ FAR struct watchdog_status_s *status);
+static int lpc17_40_settimeout(FAR struct watchdog_lowerhalf_s *lower,
+ uint32_t timeout);
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+/* "Lower half" driver methods */
+
+static const struct watchdog_ops_s g_wdgops =
+{
+ .start = lpc17_40_start,
+ .stop = lpc17_40_stop,
+ .keepalive = lpc17_40_keepalive,
+ .getstatus = lpc17_40_getstatus,
+ .settimeout = lpc17_40_settimeout,
+ .capture = NULL,
+ .ioctl = NULL,
+};
+
+/* "Lower half" driver state */
+
+static struct lpc17_40_lowerhalf_s g_wdgdev;
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: lpc17_40_start
+ *
+ * Description:
+ * Start the watchdog timer, resetting the time to the current timeout.
+ *
+ * Input Parameters:
+ * lower - A pointer to the publicly visible representation of the
+ * "lower-half" driver state structure.
+ *
+ * Returned Value:
+ * Zero on success; a negated errno value on failure.
+ *
+ ****************************************************************************/
+
+static int lpc17_40_start(FAR struct watchdog_lowerhalf_s *lower)
+{
+ FAR struct lpc17_40_lowerhalf_s *priv =
+ (FAR struct lpc17_40_lowerhalf_s *)lower;
+ irqstate_t flags;
+ uint32_t wdmod;
+
+ DEBUGASSERT(priv);
+
+ /* Have we already been started? */
+
+ if (!priv->started)
+ {
+ flags = enter_critical_section();
+
+ priv->started = true;
+ priv->lastreset = clock_systime_ticks();
+
+ wdmod = getreg32(LPC17_40_WDT_MOD);
+ wdmod |= (WDT_MOD_WDEN | WDT_MOD_WDRESET);
+ putreg32(wdmod, LPC17_40_WDT_MOD);
+
+ putreg32(WDT_FEED_KEY_1, LPC17_40_WDT_FEED);
+ putreg32(WDT_FEED_KEY_2, LPC17_40_WDT_FEED);
+
+ leave_critical_section(flags);
+ }
+
+ return OK;
+}
+
+/****************************************************************************
+ * Name: lpc17_40_stop
+ *
+ * Description:
+ * Stop the watchdog timer.
+ *
+ * Input Parameters:
+ * lower - A pointer to the publicly visible representation of the
+ * "lower-half" driver state structure.
+ *
+ * Returned Value:
+ * Zero on success; a negated errno value on failure.
+ *
+ ****************************************************************************/
+
+static int lpc17_40_stop(FAR struct watchdog_lowerhalf_s *lower)
+{
+ /* There is no way to disable WDT once it has been started. */
+
+ return -ENOSYS;
+}
+
+/****************************************************************************
+ * Name: lpc17_40_keepalive
+ *
+ * Description:
+ * Reset the watchdog timer to the current timeout value, prevent any
+ * imminent watchdog timeouts. This is sometimes referred as "pinging"
+ * the watchdog timer or "petting the dog".
+ *
+ * Input Parameters:
+ * lower - A pointer the publicly visible representation of the
+ * "lower-half" driver state structure.
+ *
+ * Returned Value:
+ * Zero on success; a negated errno value on failure.
+ *
+ ****************************************************************************/
+
+static int lpc17_40_keepalive(FAR struct watchdog_lowerhalf_s *lower)
+{
+ FAR struct lpc17_40_lowerhalf_s *priv =
+ (FAR struct lpc17_40_lowerhalf_s *)lower;
+ irqstate_t flags;
+
+ /* Reload the WDT. */
+
+ flags = enter_critical_section();
+ putreg32(WDT_FEED_KEY_1, LPC17_40_WDT_FEED);
+ putreg32(WDT_FEED_KEY_2, LPC17_40_WDT_FEED);
+ priv->lastreset = clock_systime_ticks();
+ leave_critical_section(flags);
+
+ return OK;
+}
+
+/****************************************************************************
+ * Name: lpc17_40_getstatus
+ *
+ * Description:
+ * Get the current watchdog timer status.
+ *
+ * Input Parameters:
+ * lower - A pointer to the publicly visible representation of the
+ * "lower-half" driver state structure.
+ * status - The location to return the watchdog status information.
+ *
+ * Returned Value:
+ * Zero on success; a negated errno value on failure.
+ *
+ ****************************************************************************/
+
+static int lpc17_40_getstatus(FAR struct watchdog_lowerhalf_s *lower,
+ FAR struct watchdog_status_s *status)
+{
+ FAR struct lpc17_40_lowerhalf_s *priv =
+ (FAR struct lpc17_40_lowerhalf_s *)lower;
+ uint32_t ticks;
+ uint32_t elapsed;
+
+ DEBUGASSERT(priv);
+
+ /* Return the status bit. */
+
+ status->flags = WDFLAGS_RESET;
+ if (priv->started)
+ {
+ status->flags |= WDFLAGS_ACTIVE;
+ }
+
+ /* Return the actual timeout in milliseconds. */
+
+ status->timeout = priv->timeout;
+
+ /* Get the elapsed time since the last ping. */
+
+ ticks = clock_systime_ticks() - priv->lastreset;
+ elapsed = (int32_t)TICK2MSEC(ticks);
+
+ if (elapsed > priv->timeout)
+ {
+ elapsed = priv->timeout;
+ }
+
+ /* Return the approximate time until the watchdog timer expiration. */
+
+ status->timeleft = priv->timeout - elapsed;
+
+ return OK;
+}
+
+/****************************************************************************
+ * Name: lpc17_40_settimeout
+ *
+ * Description:
+ * Set a new timeout value.
+ *
+ * Input Parameters:
+ * lower - A pointer to the publicly visible representation of the
+ * "lower-half" driver state structure.
+ * timeout - The new timeout value in milliseconds.
+ *
+ * Returned Value:
+ * Zero on success; a negated errno value on failure.
+ *
+ ****************************************************************************/
+
+static int lpc17_40_settimeout(FAR struct watchdog_lowerhalf_s *lower,
+ uint32_t timeout)
+{
+ FAR struct lpc17_40_lowerhalf_s *priv =
+ (FAR struct lpc17_40_lowerhalf_s *)lower;
+ uint64_t wdt_clk;
+ uint64_t wdtc;
+
+ priv->timeout = timeout;
+
+#ifdef LPC176x
Review comment:
I think that this does not belong to this PR. The definition lives elsewhere (it was not introduced in this PR) and I think it will affect lots of other drivers too.
Also, I guess all other definitions of this family would need fixing too...
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@nuttx.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-nuttx] xiaoxiang781216 merged pull request #4072: lpc17xx: Added WDT driver.
Posted by GitBox <gi...@apache.org>.
xiaoxiang781216 merged pull request #4072:
URL: https://github.com/apache/incubator-nuttx/pull/4072
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@nuttx.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-nuttx] xiaoxiang781216 merged pull request #4072: lpc17xx: Added WDT driver.
Posted by GitBox <gi...@apache.org>.
xiaoxiang781216 merged pull request #4072:
URL: https://github.com/apache/incubator-nuttx/pull/4072
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@nuttx.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-nuttx] acassis commented on a change in pull request #4072: lpc17xx: Added WDT driver.
Posted by GitBox <gi...@apache.org>.
acassis commented on a change in pull request #4072:
URL: https://github.com/apache/incubator-nuttx/pull/4072#discussion_r664684564
##########
File path: arch/arm/src/lpc17xx_40xx/hardware/lpc17_40_wdt.h
##########
@@ -89,6 +89,8 @@
/* Watchdog feed sequence register */
+#define WDT_FEED_KEY_1 (0xAA) /* Watchdog feed key 1 */
Review comment:
I suggest you to send a new PR to fix it. Thank you!
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@nuttx.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-nuttx] fjpanag commented on a change in pull request #4072: lpc17xx: Added WDT driver.
Posted by GitBox <gi...@apache.org>.
fjpanag commented on a change in pull request #4072:
URL: https://github.com/apache/incubator-nuttx/pull/4072#discussion_r664339115
##########
File path: arch/arm/src/lpc17xx_40xx/hardware/lpc17_40_wdt.h
##########
@@ -89,6 +89,8 @@
/* Watchdog feed sequence register */
+#define WDT_FEED_KEY_1 (0xAA) /* Watchdog feed key 1 */
Review comment:
Oh, I wasn't aware of this.
Do I need a new PR, or can I force push to a merged PR?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@nuttx.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-nuttx] fjpanag commented on a change in pull request #4072: lpc17xx: Added WDT driver.
Posted by GitBox <gi...@apache.org>.
fjpanag commented on a change in pull request #4072:
URL: https://github.com/apache/incubator-nuttx/pull/4072#discussion_r664341175
##########
File path: arch/arm/src/lpc17xx_40xx/lpc17_40_wdt.c
##########
@@ -0,0 +1,358 @@
+/****************************************************************************
+ * arch/arm/src/lpc17xx_40xx/lpc17_40_wdt.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 <nuttx/config.h>
+#include <nuttx/arch.h>
+
+#include <stdint.h>
+#include <stdbool.h>
+#include <assert.h>
+#include <errno.h>
+
+#include <nuttx/timers/watchdog.h>
+#include <arch/board/board.h>
+#include <nuttx/clock.h>
+
+#include "chip.h"
+#include "arm_arch.h"
+#include "hardware/lpc17_40_wdt.h"
+#include "hardware/lpc17_40_syscon.h"
+#include "lpc17_40_wdt.h"
+
+#if defined(CONFIG_WATCHDOG) && defined(CONFIG_LPC17_40_WDT)
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/* Default WDT timeout value, in ms. */
+
+#define LPC17_40_WDT_DEFTIMEOUT 1000
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+/* This structure provides the private representation of the "lower-half"
+ * driver state structure. This structure must be cast-compatible with the
+ * well-known watchdog_lowerhalf_s structure.
+ */
+
+struct lpc17_40_lowerhalf_s
+{
+ FAR const struct watchdog_ops_s *ops; /* Lower half operations */
+ uint32_t timeout; /* The (actual) selected timeout */
+ uint32_t lastreset; /* The last reset time */
+ bool started; /* true: The watchdog timer has been started */
+};
+
+/****************************************************************************
+ * Private Function Prototypes
+ ****************************************************************************/
+
+/* "Lower half" driver methods **********************************************/
+
+static int lpc17_40_start(FAR struct watchdog_lowerhalf_s *lower);
+static int lpc17_40_stop(FAR struct watchdog_lowerhalf_s *lower);
+static int lpc17_40_keepalive(FAR struct watchdog_lowerhalf_s *lower);
+static int lpc17_40_getstatus(FAR struct watchdog_lowerhalf_s *lower,
+ FAR struct watchdog_status_s *status);
+static int lpc17_40_settimeout(FAR struct watchdog_lowerhalf_s *lower,
+ uint32_t timeout);
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+/* "Lower half" driver methods */
+
+static const struct watchdog_ops_s g_wdgops =
+{
+ .start = lpc17_40_start,
+ .stop = lpc17_40_stop,
+ .keepalive = lpc17_40_keepalive,
+ .getstatus = lpc17_40_getstatus,
+ .settimeout = lpc17_40_settimeout,
+ .capture = NULL,
+ .ioctl = NULL,
+};
+
+/* "Lower half" driver state */
+
+static struct lpc17_40_lowerhalf_s g_wdgdev;
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: lpc17_40_start
+ *
+ * Description:
+ * Start the watchdog timer, resetting the time to the current timeout.
+ *
+ * Input Parameters:
+ * lower - A pointer to the publicly visible representation of the
+ * "lower-half" driver state structure.
+ *
+ * Returned Value:
+ * Zero on success; a negated errno value on failure.
+ *
+ ****************************************************************************/
+
+static int lpc17_40_start(FAR struct watchdog_lowerhalf_s *lower)
+{
+ FAR struct lpc17_40_lowerhalf_s *priv =
+ (FAR struct lpc17_40_lowerhalf_s *)lower;
+ irqstate_t flags;
+ uint32_t wdmod;
+
+ DEBUGASSERT(priv);
+
+ /* Have we already been started? */
+
+ if (!priv->started)
+ {
+ flags = enter_critical_section();
+
+ priv->started = true;
+ priv->lastreset = clock_systime_ticks();
+
+ wdmod = getreg32(LPC17_40_WDT_MOD);
+ wdmod |= (WDT_MOD_WDEN | WDT_MOD_WDRESET);
+ putreg32(wdmod, LPC17_40_WDT_MOD);
+
+ putreg32(WDT_FEED_KEY_1, LPC17_40_WDT_FEED);
+ putreg32(WDT_FEED_KEY_2, LPC17_40_WDT_FEED);
+
+ leave_critical_section(flags);
+ }
+
+ return OK;
+}
+
+/****************************************************************************
+ * Name: lpc17_40_stop
+ *
+ * Description:
+ * Stop the watchdog timer.
+ *
+ * Input Parameters:
+ * lower - A pointer to the publicly visible representation of the
+ * "lower-half" driver state structure.
+ *
+ * Returned Value:
+ * Zero on success; a negated errno value on failure.
+ *
+ ****************************************************************************/
+
+static int lpc17_40_stop(FAR struct watchdog_lowerhalf_s *lower)
+{
+ /* There is no way to disable WDT once it has been started. */
+
+ return -ENOSYS;
+}
+
+/****************************************************************************
+ * Name: lpc17_40_keepalive
+ *
+ * Description:
+ * Reset the watchdog timer to the current timeout value, prevent any
+ * imminent watchdog timeouts. This is sometimes referred as "pinging"
+ * the watchdog timer or "petting the dog".
+ *
+ * Input Parameters:
+ * lower - A pointer the publicly visible representation of the
+ * "lower-half" driver state structure.
+ *
+ * Returned Value:
+ * Zero on success; a negated errno value on failure.
+ *
+ ****************************************************************************/
+
+static int lpc17_40_keepalive(FAR struct watchdog_lowerhalf_s *lower)
+{
+ FAR struct lpc17_40_lowerhalf_s *priv =
+ (FAR struct lpc17_40_lowerhalf_s *)lower;
+ irqstate_t flags;
+
+ /* Reload the WDT. */
+
+ flags = enter_critical_section();
+ putreg32(WDT_FEED_KEY_1, LPC17_40_WDT_FEED);
+ putreg32(WDT_FEED_KEY_2, LPC17_40_WDT_FEED);
+ priv->lastreset = clock_systime_ticks();
+ leave_critical_section(flags);
+
+ return OK;
+}
+
+/****************************************************************************
+ * Name: lpc17_40_getstatus
+ *
+ * Description:
+ * Get the current watchdog timer status.
+ *
+ * Input Parameters:
+ * lower - A pointer to the publicly visible representation of the
+ * "lower-half" driver state structure.
+ * status - The location to return the watchdog status information.
+ *
+ * Returned Value:
+ * Zero on success; a negated errno value on failure.
+ *
+ ****************************************************************************/
+
+static int lpc17_40_getstatus(FAR struct watchdog_lowerhalf_s *lower,
+ FAR struct watchdog_status_s *status)
+{
+ FAR struct lpc17_40_lowerhalf_s *priv =
+ (FAR struct lpc17_40_lowerhalf_s *)lower;
+ uint32_t ticks;
+ uint32_t elapsed;
+
+ DEBUGASSERT(priv);
+
+ /* Return the status bit. */
+
+ status->flags = WDFLAGS_RESET;
+ if (priv->started)
+ {
+ status->flags |= WDFLAGS_ACTIVE;
+ }
+
+ /* Return the actual timeout in milliseconds. */
+
+ status->timeout = priv->timeout;
+
+ /* Get the elapsed time since the last ping. */
+
+ ticks = clock_systime_ticks() - priv->lastreset;
+ elapsed = (int32_t)TICK2MSEC(ticks);
+
+ if (elapsed > priv->timeout)
+ {
+ elapsed = priv->timeout;
+ }
+
+ /* Return the approximate time until the watchdog timer expiration. */
+
+ status->timeleft = priv->timeout - elapsed;
+
+ return OK;
+}
+
+/****************************************************************************
+ * Name: lpc17_40_settimeout
+ *
+ * Description:
+ * Set a new timeout value.
+ *
+ * Input Parameters:
+ * lower - A pointer to the publicly visible representation of the
+ * "lower-half" driver state structure.
+ * timeout - The new timeout value in milliseconds.
+ *
+ * Returned Value:
+ * Zero on success; a negated errno value on failure.
+ *
+ ****************************************************************************/
+
+static int lpc17_40_settimeout(FAR struct watchdog_lowerhalf_s *lower,
+ uint32_t timeout)
+{
+ FAR struct lpc17_40_lowerhalf_s *priv =
+ (FAR struct lpc17_40_lowerhalf_s *)lower;
+ uint64_t wdt_clk;
+ uint64_t wdtc;
+
+ priv->timeout = timeout;
+
+#ifdef LPC176x
Review comment:
I think that this does not belong to this PR. The definition lives elsewhere (it was not introduced in this PR) and I think it will affect lots of other drivers too.
Also, I guess all other definitions of this family would need fixing too...
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@nuttx.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-nuttx] acassis commented on a change in pull request #4072: lpc17xx: Added WDT driver.
Posted by GitBox <gi...@apache.org>.
acassis commented on a change in pull request #4072:
URL: https://github.com/apache/incubator-nuttx/pull/4072#discussion_r664684186
##########
File path: arch/arm/src/lpc17xx_40xx/lpc17_40_wdt.c
##########
@@ -0,0 +1,358 @@
+/****************************************************************************
+ * arch/arm/src/lpc17xx_40xx/lpc17_40_wdt.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 <nuttx/config.h>
+#include <nuttx/arch.h>
+
+#include <stdint.h>
+#include <stdbool.h>
+#include <assert.h>
+#include <errno.h>
+
+#include <nuttx/timers/watchdog.h>
+#include <arch/board/board.h>
+#include <nuttx/clock.h>
+
+#include "chip.h"
+#include "arm_arch.h"
+#include "hardware/lpc17_40_wdt.h"
+#include "hardware/lpc17_40_syscon.h"
+#include "lpc17_40_wdt.h"
+
+#if defined(CONFIG_WATCHDOG) && defined(CONFIG_LPC17_40_WDT)
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/* Default WDT timeout value, in ms. */
+
+#define LPC17_40_WDT_DEFTIMEOUT 1000
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+/* This structure provides the private representation of the "lower-half"
+ * driver state structure. This structure must be cast-compatible with the
+ * well-known watchdog_lowerhalf_s structure.
+ */
+
+struct lpc17_40_lowerhalf_s
+{
+ FAR const struct watchdog_ops_s *ops; /* Lower half operations */
+ uint32_t timeout; /* The (actual) selected timeout */
+ uint32_t lastreset; /* The last reset time */
+ bool started; /* true: The watchdog timer has been started */
+};
+
+/****************************************************************************
+ * Private Function Prototypes
+ ****************************************************************************/
+
+/* "Lower half" driver methods **********************************************/
+
+static int lpc17_40_start(FAR struct watchdog_lowerhalf_s *lower);
+static int lpc17_40_stop(FAR struct watchdog_lowerhalf_s *lower);
+static int lpc17_40_keepalive(FAR struct watchdog_lowerhalf_s *lower);
+static int lpc17_40_getstatus(FAR struct watchdog_lowerhalf_s *lower,
+ FAR struct watchdog_status_s *status);
+static int lpc17_40_settimeout(FAR struct watchdog_lowerhalf_s *lower,
+ uint32_t timeout);
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+/* "Lower half" driver methods */
+
+static const struct watchdog_ops_s g_wdgops =
+{
+ .start = lpc17_40_start,
+ .stop = lpc17_40_stop,
+ .keepalive = lpc17_40_keepalive,
+ .getstatus = lpc17_40_getstatus,
+ .settimeout = lpc17_40_settimeout,
+ .capture = NULL,
+ .ioctl = NULL,
+};
+
+/* "Lower half" driver state */
+
+static struct lpc17_40_lowerhalf_s g_wdgdev;
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: lpc17_40_start
+ *
+ * Description:
+ * Start the watchdog timer, resetting the time to the current timeout.
+ *
+ * Input Parameters:
+ * lower - A pointer to the publicly visible representation of the
+ * "lower-half" driver state structure.
+ *
+ * Returned Value:
+ * Zero on success; a negated errno value on failure.
+ *
+ ****************************************************************************/
+
+static int lpc17_40_start(FAR struct watchdog_lowerhalf_s *lower)
+{
+ FAR struct lpc17_40_lowerhalf_s *priv =
+ (FAR struct lpc17_40_lowerhalf_s *)lower;
+ irqstate_t flags;
+ uint32_t wdmod;
+
+ DEBUGASSERT(priv);
+
+ /* Have we already been started? */
+
+ if (!priv->started)
+ {
+ flags = enter_critical_section();
+
+ priv->started = true;
+ priv->lastreset = clock_systime_ticks();
+
+ wdmod = getreg32(LPC17_40_WDT_MOD);
+ wdmod |= (WDT_MOD_WDEN | WDT_MOD_WDRESET);
+ putreg32(wdmod, LPC17_40_WDT_MOD);
+
+ putreg32(WDT_FEED_KEY_1, LPC17_40_WDT_FEED);
+ putreg32(WDT_FEED_KEY_2, LPC17_40_WDT_FEED);
+
+ leave_critical_section(flags);
+ }
+
+ return OK;
+}
+
+/****************************************************************************
+ * Name: lpc17_40_stop
+ *
+ * Description:
+ * Stop the watchdog timer.
+ *
+ * Input Parameters:
+ * lower - A pointer to the publicly visible representation of the
+ * "lower-half" driver state structure.
+ *
+ * Returned Value:
+ * Zero on success; a negated errno value on failure.
+ *
+ ****************************************************************************/
+
+static int lpc17_40_stop(FAR struct watchdog_lowerhalf_s *lower)
+{
+ /* There is no way to disable WDT once it has been started. */
+
+ return -ENOSYS;
+}
+
+/****************************************************************************
+ * Name: lpc17_40_keepalive
+ *
+ * Description:
+ * Reset the watchdog timer to the current timeout value, prevent any
+ * imminent watchdog timeouts. This is sometimes referred as "pinging"
+ * the watchdog timer or "petting the dog".
+ *
+ * Input Parameters:
+ * lower - A pointer the publicly visible representation of the
+ * "lower-half" driver state structure.
+ *
+ * Returned Value:
+ * Zero on success; a negated errno value on failure.
+ *
+ ****************************************************************************/
+
+static int lpc17_40_keepalive(FAR struct watchdog_lowerhalf_s *lower)
+{
+ FAR struct lpc17_40_lowerhalf_s *priv =
+ (FAR struct lpc17_40_lowerhalf_s *)lower;
+ irqstate_t flags;
+
+ /* Reload the WDT. */
+
+ flags = enter_critical_section();
+ putreg32(WDT_FEED_KEY_1, LPC17_40_WDT_FEED);
+ putreg32(WDT_FEED_KEY_2, LPC17_40_WDT_FEED);
+ priv->lastreset = clock_systime_ticks();
+ leave_critical_section(flags);
+
+ return OK;
+}
+
+/****************************************************************************
+ * Name: lpc17_40_getstatus
+ *
+ * Description:
+ * Get the current watchdog timer status.
+ *
+ * Input Parameters:
+ * lower - A pointer to the publicly visible representation of the
+ * "lower-half" driver state structure.
+ * status - The location to return the watchdog status information.
+ *
+ * Returned Value:
+ * Zero on success; a negated errno value on failure.
+ *
+ ****************************************************************************/
+
+static int lpc17_40_getstatus(FAR struct watchdog_lowerhalf_s *lower,
+ FAR struct watchdog_status_s *status)
+{
+ FAR struct lpc17_40_lowerhalf_s *priv =
+ (FAR struct lpc17_40_lowerhalf_s *)lower;
+ uint32_t ticks;
+ uint32_t elapsed;
+
+ DEBUGASSERT(priv);
+
+ /* Return the status bit. */
+
+ status->flags = WDFLAGS_RESET;
+ if (priv->started)
+ {
+ status->flags |= WDFLAGS_ACTIVE;
+ }
+
+ /* Return the actual timeout in milliseconds. */
+
+ status->timeout = priv->timeout;
+
+ /* Get the elapsed time since the last ping. */
+
+ ticks = clock_systime_ticks() - priv->lastreset;
+ elapsed = (int32_t)TICK2MSEC(ticks);
+
+ if (elapsed > priv->timeout)
+ {
+ elapsed = priv->timeout;
+ }
+
+ /* Return the approximate time until the watchdog timer expiration. */
+
+ status->timeleft = priv->timeout - elapsed;
+
+ return OK;
+}
+
+/****************************************************************************
+ * Name: lpc17_40_settimeout
+ *
+ * Description:
+ * Set a new timeout value.
+ *
+ * Input Parameters:
+ * lower - A pointer to the publicly visible representation of the
+ * "lower-half" driver state structure.
+ * timeout - The new timeout value in milliseconds.
+ *
+ * Returned Value:
+ * Zero on success; a negated errno value on failure.
+ *
+ ****************************************************************************/
+
+static int lpc17_40_settimeout(FAR struct watchdog_lowerhalf_s *lower,
+ uint32_t timeout)
+{
+ FAR struct lpc17_40_lowerhalf_s *priv =
+ (FAR struct lpc17_40_lowerhalf_s *)lower;
+ uint64_t wdt_clk;
+ uint64_t wdtc;
+
+ priv->timeout = timeout;
+
+#ifdef LPC176x
Review comment:
Yes, it why I said: "probably it was there"
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@nuttx.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-nuttx] acassis commented on a change in pull request #4072: lpc17xx: Added WDT driver.
Posted by GitBox <gi...@apache.org>.
acassis commented on a change in pull request #4072:
URL: https://github.com/apache/incubator-nuttx/pull/4072#discussion_r664032202
##########
File path: arch/arm/src/lpc17xx_40xx/hardware/lpc17_40_wdt.h
##########
@@ -89,6 +89,8 @@
/* Watchdog feed sequence register */
+#define WDT_FEED_KEY_1 (0xAA) /* Watchdog feed key 1 */
Review comment:
please change to 0xaa (NuttX coding style uses hexacode in lower case)
##########
File path: arch/arm/src/lpc17xx_40xx/lpc17_40_wdt.c
##########
@@ -0,0 +1,358 @@
+/****************************************************************************
+ * arch/arm/src/lpc17xx_40xx/lpc17_40_wdt.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 <nuttx/config.h>
+#include <nuttx/arch.h>
+
+#include <stdint.h>
+#include <stdbool.h>
+#include <assert.h>
+#include <errno.h>
+
+#include <nuttx/timers/watchdog.h>
+#include <arch/board/board.h>
+#include <nuttx/clock.h>
+
+#include "chip.h"
+#include "arm_arch.h"
+#include "hardware/lpc17_40_wdt.h"
+#include "hardware/lpc17_40_syscon.h"
+#include "lpc17_40_wdt.h"
+
+#if defined(CONFIG_WATCHDOG) && defined(CONFIG_LPC17_40_WDT)
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/* Default WDT timeout value, in ms. */
+
+#define LPC17_40_WDT_DEFTIMEOUT 1000
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+/* This structure provides the private representation of the "lower-half"
+ * driver state structure. This structure must be cast-compatible with the
+ * well-known watchdog_lowerhalf_s structure.
+ */
+
+struct lpc17_40_lowerhalf_s
+{
+ FAR const struct watchdog_ops_s *ops; /* Lower half operations */
+ uint32_t timeout; /* The (actual) selected timeout */
+ uint32_t lastreset; /* The last reset time */
+ bool started; /* true: The watchdog timer has been started */
+};
+
+/****************************************************************************
+ * Private Function Prototypes
+ ****************************************************************************/
+
+/* "Lower half" driver methods **********************************************/
+
+static int lpc17_40_start(FAR struct watchdog_lowerhalf_s *lower);
+static int lpc17_40_stop(FAR struct watchdog_lowerhalf_s *lower);
+static int lpc17_40_keepalive(FAR struct watchdog_lowerhalf_s *lower);
+static int lpc17_40_getstatus(FAR struct watchdog_lowerhalf_s *lower,
+ FAR struct watchdog_status_s *status);
+static int lpc17_40_settimeout(FAR struct watchdog_lowerhalf_s *lower,
+ uint32_t timeout);
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+/* "Lower half" driver methods */
+
+static const struct watchdog_ops_s g_wdgops =
+{
+ .start = lpc17_40_start,
+ .stop = lpc17_40_stop,
+ .keepalive = lpc17_40_keepalive,
+ .getstatus = lpc17_40_getstatus,
+ .settimeout = lpc17_40_settimeout,
+ .capture = NULL,
+ .ioctl = NULL,
+};
+
+/* "Lower half" driver state */
+
+static struct lpc17_40_lowerhalf_s g_wdgdev;
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: lpc17_40_start
+ *
+ * Description:
+ * Start the watchdog timer, resetting the time to the current timeout.
+ *
+ * Input Parameters:
+ * lower - A pointer to the publicly visible representation of the
+ * "lower-half" driver state structure.
+ *
+ * Returned Value:
+ * Zero on success; a negated errno value on failure.
+ *
+ ****************************************************************************/
+
+static int lpc17_40_start(FAR struct watchdog_lowerhalf_s *lower)
+{
+ FAR struct lpc17_40_lowerhalf_s *priv =
+ (FAR struct lpc17_40_lowerhalf_s *)lower;
+ irqstate_t flags;
+ uint32_t wdmod;
+
+ DEBUGASSERT(priv);
+
+ /* Have we already been started? */
+
+ if (!priv->started)
+ {
+ flags = enter_critical_section();
+
+ priv->started = true;
+ priv->lastreset = clock_systime_ticks();
+
+ wdmod = getreg32(LPC17_40_WDT_MOD);
+ wdmod |= (WDT_MOD_WDEN | WDT_MOD_WDRESET);
+ putreg32(wdmod, LPC17_40_WDT_MOD);
+
+ putreg32(WDT_FEED_KEY_1, LPC17_40_WDT_FEED);
+ putreg32(WDT_FEED_KEY_2, LPC17_40_WDT_FEED);
+
+ leave_critical_section(flags);
+ }
+
+ return OK;
+}
+
+/****************************************************************************
+ * Name: lpc17_40_stop
+ *
+ * Description:
+ * Stop the watchdog timer.
+ *
+ * Input Parameters:
+ * lower - A pointer to the publicly visible representation of the
+ * "lower-half" driver state structure.
+ *
+ * Returned Value:
+ * Zero on success; a negated errno value on failure.
+ *
+ ****************************************************************************/
+
+static int lpc17_40_stop(FAR struct watchdog_lowerhalf_s *lower)
+{
+ /* There is no way to disable WDT once it has been started. */
+
+ return -ENOSYS;
+}
+
+/****************************************************************************
+ * Name: lpc17_40_keepalive
+ *
+ * Description:
+ * Reset the watchdog timer to the current timeout value, prevent any
+ * imminent watchdog timeouts. This is sometimes referred as "pinging"
+ * the watchdog timer or "petting the dog".
+ *
+ * Input Parameters:
+ * lower - A pointer the publicly visible representation of the
+ * "lower-half" driver state structure.
+ *
+ * Returned Value:
+ * Zero on success; a negated errno value on failure.
+ *
+ ****************************************************************************/
+
+static int lpc17_40_keepalive(FAR struct watchdog_lowerhalf_s *lower)
+{
+ FAR struct lpc17_40_lowerhalf_s *priv =
+ (FAR struct lpc17_40_lowerhalf_s *)lower;
+ irqstate_t flags;
+
+ /* Reload the WDT. */
+
+ flags = enter_critical_section();
+ putreg32(WDT_FEED_KEY_1, LPC17_40_WDT_FEED);
+ putreg32(WDT_FEED_KEY_2, LPC17_40_WDT_FEED);
+ priv->lastreset = clock_systime_ticks();
+ leave_critical_section(flags);
+
+ return OK;
+}
+
+/****************************************************************************
+ * Name: lpc17_40_getstatus
+ *
+ * Description:
+ * Get the current watchdog timer status.
+ *
+ * Input Parameters:
+ * lower - A pointer to the publicly visible representation of the
+ * "lower-half" driver state structure.
+ * status - The location to return the watchdog status information.
+ *
+ * Returned Value:
+ * Zero on success; a negated errno value on failure.
+ *
+ ****************************************************************************/
+
+static int lpc17_40_getstatus(FAR struct watchdog_lowerhalf_s *lower,
+ FAR struct watchdog_status_s *status)
+{
+ FAR struct lpc17_40_lowerhalf_s *priv =
+ (FAR struct lpc17_40_lowerhalf_s *)lower;
+ uint32_t ticks;
+ uint32_t elapsed;
+
+ DEBUGASSERT(priv);
+
+ /* Return the status bit. */
+
+ status->flags = WDFLAGS_RESET;
+ if (priv->started)
+ {
+ status->flags |= WDFLAGS_ACTIVE;
+ }
+
+ /* Return the actual timeout in milliseconds. */
+
+ status->timeout = priv->timeout;
+
+ /* Get the elapsed time since the last ping. */
+
+ ticks = clock_systime_ticks() - priv->lastreset;
+ elapsed = (int32_t)TICK2MSEC(ticks);
+
+ if (elapsed > priv->timeout)
+ {
+ elapsed = priv->timeout;
+ }
+
+ /* Return the approximate time until the watchdog timer expiration. */
+
+ status->timeleft = priv->timeout - elapsed;
+
+ return OK;
+}
+
+/****************************************************************************
+ * Name: lpc17_40_settimeout
+ *
+ * Description:
+ * Set a new timeout value.
+ *
+ * Input Parameters:
+ * lower - A pointer to the publicly visible representation of the
+ * "lower-half" driver state structure.
+ * timeout - The new timeout value in milliseconds.
+ *
+ * Returned Value:
+ * Zero on success; a negated errno value on failure.
+ *
+ ****************************************************************************/
+
+static int lpc17_40_settimeout(FAR struct watchdog_lowerhalf_s *lower,
+ uint32_t timeout)
+{
+ FAR struct lpc17_40_lowerhalf_s *priv =
+ (FAR struct lpc17_40_lowerhalf_s *)lower;
+ uint64_t wdt_clk;
+ uint64_t wdtc;
+
+ priv->timeout = timeout;
+
+#ifdef LPC176x
Review comment:
This lower case "x" needs to be changed to upper case: LPC176X, probably it was there before the nxstyle enforcement
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@nuttx.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org