ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix for the Ci build issue

pull/11023/head
Rajkumar Kanagaraj 2019-03-12 18:05:46 +00:00 committed by Martin Kojtal
parent 17be727821
commit a644886d5d
5 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
UNITTESTS/stubs/watchdog_api_stub.c
View File

@ -29,20 +29,20 @@ void hal_watchdog_kick(void)
watchdog_status_t hal_watchdog_stop(void) watchdog_status_t hal_watchdog_stop(void)
{ {
return WATCHDOG_STATUS_OK; return WATCHDOG_STATUS_OK;
} }
uint32_t hal_watchdog_get_reload_value(void) uint32_t hal_watchdog_get_reload_value(void)
{ {
return (500); return (500);
} }
watchdog_features_t hal_watchdog_get_platform_features(void) watchdog_features_t hal_watchdog_get_platform_features(void)
{ {
watchdog_features_t features; watchdog_features_t features;
features.max_timeout = 0xFFFFFFFF; features.max_timeout = 0xFFFFFFFF;
return features; return features;
} }
#endif // DEVICE_WATCHDOG #endif // DEVICE_WATCHDOG

2
UNITTESTS/target_h/platform/mbed_power_mgmt.h
View File

@ -21,6 +21,6 @@
*/ */
extern void mock_system_reset(); extern void mock_system_reset();
MBED_NORETURN static inline void system_reset(void) MBED_NORETURN static inline void system_reset(void)
{ {
mock_system_reset(); mock_system_reset();
} }

1
drivers/Watchdog.h
View File

@ -22,7 +22,6 @@
#include <cstdio> #include <cstdio>
#include "mbed_error.h" #include "mbed_error.h"
#include "rtos/ThisThread.h"
#include "platform/mbed_critical.h" #include "platform/mbed_critical.h"
#include "platform/mbed_power_mgmt.h" #include "platform/mbed_power_mgmt.h"
namespace mbed { namespace mbed {

9
platform/mbed_watchdog_mgr.cpp
View File

@ -29,13 +29,12 @@ MBED_STATIC_ASSERT((HW_WATCHDOG_TIMEOUT > 0), "Timeout must be greater than zero
* its only going to call process to verify all registered users/threads in alive state * its only going to call process to verify all registered users/threads in alive state
* *
*/ */
Watchdog watchdog(0, "Platform Watchdog"); mbed::Watchdog watchdog(0, "Platform Watchdog");
/** Create singleton instance of LowPowerTicker for watchdog periodic call back of kick. /** Create singleton instance of LowPowerTicker for watchdog periodic call back of kick.
*/ */
static LowPowerTicker *get_ticker() static mbed::LowPowerTicker *get_ticker()
{ {
static LowPowerTicker ticker; static mbed::LowPowerTicker ticker;
return &ticker; return &ticker;
} }
@ -78,7 +77,7 @@ bool mbed_wdog_manager_start()
core_util_critical_section_exit(); core_util_critical_section_exit();
if (is_watchdog_started){ if (is_watchdog_started){
us_timestamp_t timeout = (MS_TO_US(((elapsed_ms <= 0) ? 1 : elapsed_ms))); us_timestamp_t timeout = (MS_TO_US(((elapsed_ms <= 0) ? 1 : elapsed_ms)));
get_ticker()->attach_us(callback(&mbed_wdog_manager_kick), timeout); get_ticker()->attach_us(mbed::callback(&mbed_wdog_manager_kick), timeout);
} }
return is_watchdog_started; return is_watchdog_started;
} }

4
platform/mbed_watchdog_mgr.h
View File

@ -22,7 +22,7 @@
#include "watchdog_api.h" #include "watchdog_api.h"
#include "mbed_error.h" #include "mbed_error.h"
#include "mbed.h" #include "platform/Callback.h"
#include "platform/mbed_critical.h" #include "platform/mbed_critical.h"
#include "LowPowerTicker.h" #include "LowPowerTicker.h"
#include "Watchdog.h" #include "Watchdog.h"
@ -62,7 +62,7 @@ bool mbed_wdog_manager_start();
* Calling this function will attempt to disable any currently running * Calling this function will attempt to disable any currently running
* watchdog timers if supported by the current platform. * watchdog timers if supported by the current platform.
* *
* @return Returns true if the watchdog timer was succesfully * @return Returns true if the watchdog timer was successfully
* stopped, Returns false if the watchdog cannot be disabled * stopped, Returns false if the watchdog cannot be disabled
* on the current platform or if the timer was never started. * on the current platform or if the timer was never started.
*/ */