mbed library sources. Supersedes mbed-src.
Dependents: Nucleo_Hello_Encoder BLE_iBeaconScan AM1805_DEMO DISCO-F429ZI_ExportTemplate1 ... more
Diff: platform/mbed_wait_api_rtos.cpp
- Revision:
- 189:f392fc9709a3
- Parent:
- 187:0387e8f68319
--- a/platform/mbed_wait_api_rtos.cpp Thu Nov 08 11:46:34 2018 +0000 +++ b/platform/mbed_wait_api_rtos.cpp Wed Feb 20 22:31:08 2019 +0000 @@ -1,5 +1,6 @@ /* mbed Microcontroller Library * Copyright (c) 2006-2013 ARM Limited + * SPDX-License-Identifier: Apache-2.0 * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,29 +21,26 @@ #include "platform/mbed_wait_api.h" #include "hal/us_ticker_api.h" -#include "rtos/rtos.h" +#include "rtos/ThisThread.h" #include "platform/mbed_critical.h" #include "platform/mbed_power_mgmt.h" +#include "platform/mbed_error.h" +#include "rtos/ThisThread.h" void wait(float s) { - wait_us(s * 1000000.0f); -} + if ((s >= 0.01f) && core_util_are_interrupts_enabled()) { + wait_ms(s * 1000.0f); + return; + } -void wait_ms(int ms) -{ - wait_us(ms * 1000); -} - -void wait_us(int us) -{ + uint32_t us = (s * 1000000.0f); const ticker_data_t *const ticker = get_us_ticker_data(); - uint32_t start = ticker_read(ticker); if ((us >= 1000) && core_util_are_interrupts_enabled()) { // Use the RTOS to wait for millisecond delays if possible sleep_manager_lock_deep_sleep(); - Thread::wait((uint32_t)us / 1000); + rtos::ThisThread::sleep_for((uint32_t)us / 1000); sleep_manager_unlock_deep_sleep(); } // Use busy waiting for sub-millisecond delays, or for the whole @@ -50,5 +48,32 @@ while ((ticker_read(ticker) - start) < (uint32_t)us); } +/* The actual time delay may be up to one timer tick less - 1 msec */ +void wait_ms(int ms) +{ + if (core_util_is_isr_active() || !core_util_are_interrupts_enabled()) { +#if defined(MBED_TRAP_ERRORS_ENABLED) && MBED_TRAP_ERRORS_ENABLED + MBED_ERROR(MBED_MAKE_ERROR(MBED_MODULE_PLATFORM, MBED_ERROR_INVALID_OPERATION), + "Deprecated behavior: milli-sec delay should not be used in interrupt.\n"); +#else + wait_us(ms * 1000); +#endif + } else { + rtos::ThisThread::sleep_for(ms); + } +} + +/* The actual time delay may be 1 less usec */ +void wait_us(int us) +{ + if (us > 10000) { + MBED_WARNING(MBED_MAKE_ERROR(MBED_MODULE_PLATFORM, MBED_ERROR_UNKNOWN), + "wait_us blocks deep sleep, wait_ms recommended for long delays\n"); + } + const ticker_data_t *const ticker = get_us_ticker_data(); + uint32_t start = ticker_read(ticker); + while ((ticker_read(ticker) - start) < (uint32_t)us); +} + #endif // #if MBED_CONF_RTOS_PRESENT