diff options
| author | Giovanni Di Sirio <gdisirio@gmail.com> | 2015-12-03 13:49:06 +0000 |
|---|---|---|
| committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2015-12-03 13:49:06 +0000 |
| commit | 304c76dddd3f2a84062588c434c034d83f82fa52 (patch) | |
| tree | f3a86a734b76dd6b8084abe4ac0fa15447b47f3c /os/hal/src | |
| parent | 69492747606d30c64b7719172d4a5ec804421b99 (diff) | |
| download | ChibiOS-304c76dddd3f2a84062588c434c034d83f82fa52.tar.gz ChibiOS-304c76dddd3f2a84062588c434c034d83f82fa52.tar.bz2 ChibiOS-304c76dddd3f2a84062588c434c034d83f82fa52.zip | |
Added watchdog driver model (WDG), to be completed and tested.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8555 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/hal/src')
| -rw-r--r-- | os/hal/src/hal.c | 3 | ||||
| -rw-r--r-- | os/hal/src/spi.c | 6 | ||||
| -rw-r--r-- | os/hal/src/wdg.c | 120 |
3 files changed, 126 insertions, 3 deletions
diff --git a/os/hal/src/hal.c b/os/hal/src/hal.c index 9654ac84d..055cde8a6 100644 --- a/os/hal/src/hal.c +++ b/os/hal/src/hal.c @@ -118,6 +118,9 @@ void halInit(void) { #if (HAL_USE_RTC == TRUE) || defined(__DOXYGEN__)
rtcInit();
#endif
+#if (HAL_USE_WDG == TRUE) || defined(__DOXYGEN__)
+ wdgInit();
+#endif
/* Community driver overlay initialization.*/
#if defined(HAL_USE_COMMUNITY) || defined(__DOXYGEN__)
diff --git a/os/hal/src/spi.c b/os/hal/src/spi.c index dfa7f91a9..ac7ff2c13 100644 --- a/os/hal/src/spi.c +++ b/os/hal/src/spi.c @@ -102,9 +102,9 @@ void spiStart(SPIDriver *spip, const SPIConfig *config) { }
/**
- * @brief Deactivates the SPI peripheral.
- * @note Deactivating the peripheral also enforces a release of the slave
- * select line.
+ * @brief Deactivates the SPI peripheral.
+ * @note Deactivating the peripheral also enforces a release of the slave
+ * select line.
*
* @param[in] spip pointer to the @p SPIDriver object
*
diff --git a/os/hal/src/wdg.c b/os/hal/src/wdg.c new file mode 100644 index 000000000..deb8e0ce9 --- /dev/null +++ b/os/hal/src/wdg.c @@ -0,0 +1,120 @@ +/*
+ ChibiOS - Copyright (C) 2006..2015 Giovanni Di Sirio
+
+ Licensed 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.
+*/
+
+/**
+ * @file wdg.c
+ * @brief WDG Driver code.
+ *
+ * @addtogroup WDG
+ * @{
+ */
+
+#include "hal.h"
+
+#if HAL_USE_WDG || defined(__DOXYGEN__)
+
+/*===========================================================================*/
+/* Driver local definitions. */
+/*===========================================================================*/
+
+/*===========================================================================*/
+/* Driver exported variables. */
+/*===========================================================================*/
+
+/*===========================================================================*/
+/* Driver local variables. */
+/*===========================================================================*/
+
+/*===========================================================================*/
+/* Driver local functions. */
+/*===========================================================================*/
+
+/*===========================================================================*/
+/* Driver exported functions. */
+/*===========================================================================*/
+
+/**
+ * @brief WDG Driver initialization.
+ * @note This function is implicitly invoked by @p halInit(), there is
+ * no need to explicitly initialize the driver.
+ *
+ * @init
+ */
+void wdgInit(void) {
+
+ wdg_lld_init();
+}
+
+/**
+ * @brief Configures and activates the WDG peripheral.
+ *
+ * @param[in] wdgp pointer to the @p WDGDriver object
+ * @param[in] config pointer to the @p WDGConfig object
+ *
+ * @api
+ */
+void wdgStart(WDGDriver *wdgp, const WDGConfig *config) {
+
+ osalDbgCheck((wdgp != NULL) && (config != NULL));
+
+ osalSysLock();
+ osalDbgAssert((wdgp->state == WDG_STOP) || (wdgp->state == WDG_READY),
+ "invalid state");
+ wdgp->config = config;
+ wdg_lld_start(wdgp);
+ wdgp->state = WDG_READY;
+ osalSysUnlock();
+}
+
+/**
+ * @brief Deactivates the WDG peripheral.
+ *
+ * @param[in] wdgp pointer to the @p WDGDriver object
+ *
+ * @api
+ */
+void wdgStop(WDGDriver *wdgp) {
+
+ osalDbgCheck(wdgp != NULL);
+
+ osalSysLock();
+ osalDbgAssert((wdgp->state == WDG_STOP) || (wdgp->state == WDG_READY),
+ "invalid state");
+ wdg_lld_stop(wdgp);
+ wdgp->state = WDG_STOP;
+ osalSysUnlock();
+}
+
+/**
+ * @brief Resets WDG's counter.
+ *
+ * @param[in] wdgp pointer to the @p WDGDriver object
+ *
+ * @api
+ */
+void wdgReset(WDGDriver *wdgp) {
+
+ osalDbgCheck(wdgp != NULL);
+
+ osalSysLock();
+ osalDbgAssert(wdgp->state == WDG_READY, "not ready");
+ wdgResetI(wdgp);
+ osalSysUnlock();
+}
+
+#endif /* HAL_USE_WDG */
+
+/** @} */
|