diff --git a/TESTS/mbed_hal/lp_us_tickers/main.cpp b/TESTS/mbed_hal/common_tickers/main.cpp similarity index 93% rename from TESTS/mbed_hal/lp_us_tickers/main.cpp rename to TESTS/mbed_hal/common_tickers/main.cpp index 7d8ee713b6..ed53a71634 100644 --- a/TESTS/mbed_hal/lp_us_tickers/main.cpp +++ b/TESTS/mbed_hal/common_tickers/main.cpp @@ -30,7 +30,7 @@ #define TICKER_DELTA 10 #define LP_TICKER_OVERFLOW_DELTA 0 // this will allow to detect that ticker counter rollovers to 0 -#define HF_TICKER_OVERFLOW_DELTA 50 +#define US_TICKER_OVERFLOW_DELTA 50 #define TICKER_100_TICKS 100 @@ -396,7 +396,7 @@ void overflow_protect() while (intf->read() > ticks_now); } -utest::v1::status_t hf_ticker_setup(const Case *const source, const size_t index_of_case) +utest::v1::status_t us_ticker_setup(const Case *const source, const size_t index_of_case) { intf = get_us_ticker_data()->interface; @@ -404,7 +404,7 @@ utest::v1::status_t hf_ticker_setup(const Case *const source, const size_t index set_us_ticker_irq_handler(ticker_event_handler_stub); - ticker_overflow_delta = HF_TICKER_OVERFLOW_DELTA; + ticker_overflow_delta = US_TICKER_OVERFLOW_DELTA; overflow_protect(); @@ -435,15 +435,15 @@ utest::v1::status_t test_setup(const size_t number_of_cases) } Case cases[] = { - Case("hf ticker init is safe to call repeatedly", hf_ticker_setup, ticker_init_test), - Case("hf ticker info test", hf_ticker_setup, ticker_info_test), - Case("hf ticker interrupt test", hf_ticker_setup, ticker_interrupt_test), - Case("hf ticker past interrupt test", hf_ticker_setup, ticker_past_test), - Case("hf ticker reschedule test", hf_ticker_setup, ticker_repeat_reschedule_test), - Case("hf ticker fire interrupt", hf_ticker_setup, ticker_fire_now_test), - Case("hf ticker overflow test", hf_ticker_setup, ticker_overflow_test), - Case("hf ticker increment test", hf_ticker_setup, ticker_increment_test), - Case("hf ticker speed test", hf_ticker_setup, ticker_speed_test), + Case("Microsecond ticker init is safe to call repeatedly", us_ticker_setup, ticker_init_test), + Case("Microsecond ticker info test", us_ticker_setup, ticker_info_test), + Case("Microsecond ticker interrupt test", us_ticker_setup, ticker_interrupt_test), + Case("Microsecond ticker past interrupt test", us_ticker_setup, ticker_past_test), + Case("Microsecond ticker reschedule test", us_ticker_setup, ticker_repeat_reschedule_test), + Case("Microsecond ticker fire interrupt", us_ticker_setup, ticker_fire_now_test), + Case("Microsecond ticker overflow test", us_ticker_setup, ticker_overflow_test), + Case("Microsecond ticker increment test", us_ticker_setup, ticker_increment_test), + Case("Microsecond ticker speed test", us_ticker_setup, ticker_speed_test), #if DEVICE_LPTICKER Case("lp ticker init is safe to call repeatedly", lp_ticker_setup, ticker_init_test), Case("lp ticker info test", lp_ticker_setup, ticker_info_test), diff --git a/TESTS/mbed_hal/lp_us_tickers/ticker_api_tests.h b/TESTS/mbed_hal/common_tickers/ticker_api_tests.h similarity index 100% rename from TESTS/mbed_hal/lp_us_tickers/ticker_api_tests.h rename to TESTS/mbed_hal/common_tickers/ticker_api_tests.h diff --git a/TESTS/mbed_hal/lp_us_tickers_freq/main.cpp b/TESTS/mbed_hal/common_tickers_freq/main.cpp similarity index 94% rename from TESTS/mbed_hal/lp_us_tickers_freq/main.cpp rename to TESTS/mbed_hal/common_tickers_freq/main.cpp index 879b801cc0..2a44f0e7f6 100644 --- a/TESTS/mbed_hal/lp_us_tickers_freq/main.cpp +++ b/TESTS/mbed_hal/common_tickers_freq/main.cpp @@ -104,7 +104,7 @@ void ticker_frequency_test() intf->disable_interrupt(); } -utest::v1::status_t hf_ticker_case_setup_handler_t(const Case * const source, const size_t index_of_case) +utest::v1::status_t us_ticker_case_setup_handler_t(const Case * const source, const size_t index_of_case) { intf = get_us_ticker_data()->interface; set_us_ticker_irq_handler(ticker_event_handler_stub); @@ -128,10 +128,10 @@ utest::v1::status_t ticker_case_teardown_handler_t(const Case * const source, co // Test cases Case cases[] = { - Case("hf ticker frequency test", hf_ticker_case_setup_handler_t, ticker_frequency_test, + Case("Microsecond ticker frequency test", us_ticker_case_setup_handler_t, ticker_frequency_test, ticker_case_teardown_handler_t), #if DEVICE_LPTICKER - Case("lp ticker frequency test", lp_ticker_case_setup_handler_t, ticker_frequency_test, + Case("Low power ticker frequency test", lp_ticker_case_setup_handler_t, ticker_frequency_test, ticker_case_teardown_handler_t), #endif }; diff --git a/TESTS/mbed_hal/lp_us_tickers_freq/ticker_api_test_freq.h b/TESTS/mbed_hal/common_tickers_freq/ticker_api_test_freq.h similarity index 100% rename from TESTS/mbed_hal/lp_us_tickers_freq/ticker_api_test_freq.h rename to TESTS/mbed_hal/common_tickers_freq/ticker_api_test_freq.h diff --git a/hal/lp_ticker_api.h b/hal/lp_ticker_api.h index 51c35bd7a3..a6fc6929a0 100644 --- a/hal/lp_ticker_api.h +++ b/hal/lp_ticker_api.h @@ -57,7 +57,7 @@ extern "C" { * * To run the low power ticker hal tests use the command: * - * mbed test -t -m -n tests-mbed_hal-us_lp_ticker*,tests-mbed_hal-lp_ticker* + * mbed test -t -m -n tests-mbed_hal-common_ticker*,tests-mbed_hal-lp_ticker* * */ diff --git a/hal/us_ticker_api.h b/hal/us_ticker_api.h index df77d89083..3b40805b9b 100644 --- a/hal/us_ticker_api.h +++ b/hal/us_ticker_api.h @@ -49,7 +49,7 @@ extern "C" { * * To run the microsecond ticker hal tests use the command: * - * mbed test -t -m -n tests-mbed_hal-us_lp_ticker*,tests-mbed_hal-us_ticker* + * mbed test -t -m -n tests-mbed_hal-common_ticker*,tests-mbed_hal-us_ticker* * * @see hal_ticker_tests * @@ -96,7 +96,7 @@ extern "C" { * * To run the ticker hal tests use the command: * - * mbed test -t -m -n tests-mbed_hal-us_lp_ticker* + * mbed test -t -m -n tests-mbed_hal-common_ticker* * * @ingroup hal_us_ticker * @ingroup hal_lp_ticker