Merge pull request #8463 from cmonr/rollup

Rollup PR
pull/8272/head
Cruz Monrreal 2018-10-18 08:13:58 -05:00 committed by GitHub
commit 514ee00a72
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 182 additions and 182 deletions

File diff suppressed because it is too large Load Diff

View File

@ -60,7 +60,7 @@ namespace mbed {
template <typename Lockable>
class ScopedLock : private NonCopyable<ScopedLock<Lockable> > {
public:
/** Locks given locable object
/** Locks given lockable object
*
* @param lockable reference to the instance of Lockable object
* @note lockable object should outlive the ScopedLock object

View File

@ -29,11 +29,11 @@
extern "C" {
#endif
/** Internal mbed assert function which is invoked when MBED_ASSERT macro failes.
/** Internal mbed assert function which is invoked when MBED_ASSERT macro fails.
* This function is active only if NDEBUG is not defined prior to including this
* assert header file.
* In case of MBED_ASSERT failing condition, error() is called with the assertation message.
* @param expr Expresion to be checked.
* @param expr Expression to be checked.
* @param file File where assertation failed.
* @param line Failing assertation line number.
*/

View File

@ -39,7 +39,7 @@ extern "C" {
* This function can be called to determine whether or not interrupts are currently enabled.
* @note
* NOTE:
* This function works for both cortex-A and cortex-M, although the underlyng implementation
* This function works for both cortex-A and cortex-M, although the underlying implementation
* differs.
* @return true if interrupts are enabled, false otherwise
*/
@ -50,7 +50,7 @@ bool core_util_are_interrupts_enabled(void);
* This function can be called to determine if the code is running on interrupt context.
* @note
* NOTE:
* This function works for both cortex-A and cortex-M, although the underlyng implementation
* This function works for both cortex-A and cortex-M, although the underlying implementation
* differs.
* @return true if in an isr, false otherwise
*/

View File

@ -157,7 +157,7 @@ bool sleep_manager_can_deep_sleep(void);
*/
bool sleep_manager_can_deep_sleep_test_check(void);
/** Enter auto selected sleep mode. It chooses the sleep or deeepsleep modes based
/** Enter auto selected sleep mode. It chooses the sleep or deepsleep modes based
* on the deepsleep locking counter
*
* This function is IRQ and thread safe

View File

@ -31,7 +31,7 @@ extern "C" {
*
* Provides mechanisms to set and read the current time, based
* on the microcontroller Real-Time Clock (RTC), plus some
* standard C manipulation and formating functions.
* standard C manipulation and formatting functions.
*
* Example:
* @code
@ -84,7 +84,7 @@ void set_time(time_t t);
*
* @param read_rtc pointer to function which returns current UNIX timestamp
* @param write_rtc pointer to function which sets current UNIX timestamp, can be NULL
* @param init_rtc pointer to funtion which initializes RTC, can be NULL
* @param init_rtc pointer to function which initializes RTC, can be NULL
* @param isenabled_rtc pointer to function which returns if the RTC is enabled, can be NULL
*/
void attach_rtc(time_t (*read_rtc)(void), void (*write_rtc)(time_t), void (*init_rtc)(void), int (*isenabled_rtc)(void));