diff --git a/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/TARGET_MCU_NRF52840/device/TOOLCHAIN_ARM_STD/nRF52832.sct b/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/TARGET_MCU_NRF52840/device/TOOLCHAIN_ARM_STD/nRF52832.sct index 2d68e31833..5cecefb903 100644 --- a/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/TARGET_MCU_NRF52840/device/TOOLCHAIN_ARM_STD/nRF52832.sct +++ b/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/TARGET_MCU_NRF52840/device/TOOLCHAIN_ARM_STD/nRF52832.sct @@ -4,10 +4,10 @@ LR_IROM1 0x21000 0x00DF000 { *(InRoot$$Sections) .ANY (+RO) } - RW_IRAM0 0x20002EF8 UNINIT 0x000000F4 { ;no init section + RW_IRAM0 0x20002EF8 UNINIT 0x000000F8 { ;no init section *(noinit) } - RW_IRAM1 0x20002FEC 0x0003D014 { + RW_IRAM1 0x20002FF0 0x0003D010 { .ANY (+RW +ZI) } } diff --git a/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/TARGET_MCU_NRF52840/sdk/sdk_config.h b/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/TARGET_MCU_NRF52840/sdk/sdk_config.h index 846390ff60..ded519da30 100644 --- a/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/TARGET_MCU_NRF52840/sdk/sdk_config.h +++ b/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/TARGET_MCU_NRF52840/sdk/sdk_config.h @@ -2312,7 +2312,7 @@ // TWI_ENABLED - nrf_drv_twi - TWI/TWIM peripheral driver //========================================================== #ifndef TWI_ENABLED -#define TWI_ENABLED 0 +#define TWI_ENABLED 1 #endif #if TWI_ENABLED // TWI_DEFAULT_CONFIG_FREQUENCY - Frequency @@ -2779,7 +2779,7 @@ // APP_SCHEDULER_ENABLED - app_scheduler - Events scheduler //========================================================== #ifndef APP_SCHEDULER_ENABLED -#define APP_SCHEDULER_ENABLED 0 +#define APP_SCHEDULER_ENABLED 1 #endif #if APP_SCHEDULER_ENABLED // APP_SCHEDULER_WITH_PAUSE - Enabling pause feature @@ -2802,7 +2802,7 @@ // APP_TIMER_ENABLED - app_timer - Application timer functionality //========================================================== #ifndef APP_TIMER_ENABLED -#define APP_TIMER_ENABLED 0 +#define APP_TIMER_ENABLED 1 #endif #if APP_TIMER_ENABLED // APP_TIMER_WITH_PROFILER - Enable app_timer profiling @@ -2835,7 +2835,7 @@ // APP_UART_ENABLED - app_uart - UART driver //========================================================== #ifndef APP_UART_ENABLED -#define APP_UART_ENABLED 0 +#define APP_UART_ENABLED 1 #endif #if APP_UART_ENABLED // APP_UART_DRIVER_INSTANCE - UART instance used @@ -2860,14 +2860,14 @@ #ifndef APP_USBD_CLASS_HID_ENABLED -#define APP_USBD_CLASS_HID_ENABLED 0 +#define APP_USBD_CLASS_HID_ENABLED 1 #endif // APP_USBD_HID_GENERIC_ENABLED - app_usbd_hid_generic - USB HID generic #ifndef APP_USBD_HID_GENERIC_ENABLED -#define APP_USBD_HID_GENERIC_ENABLED 0 +#define APP_USBD_HID_GENERIC_ENABLED 1 #endif // APP_USBD_HID_KBD_ENABLED - app_usbd_hid_kbd - USB HID keyboard @@ -2881,7 +2881,7 @@ #ifndef APP_USBD_HID_MOUSE_ENABLED -#define APP_USBD_HID_MOUSE_ENABLED 0 +#define APP_USBD_HID_MOUSE_ENABLED 1 #endif // BUTTON_ENABLED - app_button - buttons handling module diff --git a/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/drivers_nrf/spi_master/nrf_drv_spi.c b/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/drivers_nrf/spi_master/nrf_drv_spi.c index e7ffa06acb..b015d55805 100644 --- a/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/drivers_nrf/spi_master/nrf_drv_spi.c +++ b/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/drivers_nrf/spi_master/nrf_drv_spi.c @@ -601,6 +601,27 @@ ret_code_t nrf_drv_spi_xfer(nrf_drv_spi_t const * const p_instance, return err_code; ) } + +// modification for mbed-os +#if __MBED__ +void nrf_drv_spi_abort(nrf_drv_spi_t const * p_instance) +{ + spi_control_block_t * p_cb = &m_cb[p_instance->drv_inst_idx]; + ASSERT(p_cb->state != NRF_DRV_STATE_UNINITIALIZED); + + CODE_FOR_SPIM + ( + nrf_spim_task_trigger(p_instance, NRF_SPIM_TASK_STOP); + while (!nrf_spim_event_check(p_instance, NRF_SPIM_EVENT_STOPPED)) {} + p_cb->transfer_in_progress = false; + ) + CODE_FOR_SPI + ( + p_cb->abort = true; + ) +} +#endif + #ifdef SPIM_IN_USE static void irq_handler_spim(NRF_SPIM_Type * p_spim, spi_control_block_t * p_cb) { diff --git a/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/drivers_nrf/spi_master/nrf_drv_spi.h b/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/drivers_nrf/spi_master/nrf_drv_spi.h index 9b4ab898fd..fad2dddcb3 100644 --- a/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/drivers_nrf/spi_master/nrf_drv_spi.h +++ b/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/drivers_nrf/spi_master/nrf_drv_spi.h @@ -397,6 +397,11 @@ uint32_t nrf_drv_spi_start_task_get(nrf_drv_spi_t const * p_instance); */ uint32_t nrf_drv_spi_end_event_get(nrf_drv_spi_t const * p_instance); +// modification for mbed-os +#if __MBED__ +void nrf_drv_spi_abort(nrf_drv_spi_t const * p_instance); +#endif + #ifdef __cplusplus } #endif diff --git a/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/drivers_nrf/twi_master/nrf_drv_twi.c b/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/drivers_nrf/twi_master/nrf_drv_twi.c index fde2cefa11..2b203748ae 100644 --- a/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/drivers_nrf/twi_master/nrf_drv_twi.c +++ b/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/drivers_nrf/twi_master/nrf_drv_twi.c @@ -683,7 +683,18 @@ __STATIC_INLINE ret_code_t twi_xfer(twi_control_block_t * p_cb, } #endif +// modification for mbed-os +#if __MBED__ +bool nrf_drv_twi_is_busy(nrf_drv_twi_t const * p_instance) +{ + twi_control_block_t * p_cb = &m_cb[p_instance->drv_inst_idx]; + return p_cb->busy; +} +#endif + #ifdef TWIM_IN_USE + + __STATIC_INLINE void twim_list_enable_handle(NRF_TWIM_Type * p_twim, uint32_t flags) { if (NRF_DRV_TWI_FLAG_TX_POSTINC & flags) diff --git a/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/drivers_nrf/twi_master/nrf_drv_twi.h b/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/drivers_nrf/twi_master/nrf_drv_twi.h index 52916c563c..c24d33c2b3 100644 --- a/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/drivers_nrf/twi_master/nrf_drv_twi.h +++ b/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/drivers_nrf/twi_master/nrf_drv_twi.h @@ -380,6 +380,19 @@ ret_code_t nrf_drv_twi_xfer(nrf_drv_twi_t const * p_instance, nrf_drv_twi_xfer_desc_t const * p_xfer_desc, uint32_t flags); +// modification for mbed-os +#if __MBED__ +/** + * @brief Function for checking the TWI driver state. + * + * @param[in] p_instance TWI instance. + * + * @retval true If the TWI driver is currently busy performing a transfer. + * @retval false If the TWI driver is ready for a new transfer. + */ +bool nrf_drv_twi_is_busy(nrf_drv_twi_t const * p_instance); +#endif + /** * @brief Function for getting the transferred data count. * diff --git a/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/timer/app_timer.c b/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/timer/app_timer.c index 057e5fb34f..87e5292d84 100644 --- a/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/timer/app_timer.c +++ b/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/timer/app_timer.c @@ -9,6 +9,8 @@ * the file. * */ +#ifndef __MBED_CMSIS_RTOS_CM + #include "sdk_common.h" #if NRF_MODULE_ENABLED(APP_TIMER) #include "app_timer.h" @@ -1048,3 +1050,4 @@ uint8_t app_timer_op_queue_utilization_get(void) } #endif #endif //NRF_MODULE_ENABLED(APP_TIMER) +#endif // __MBED_CMSIS_RTOS_CM diff --git a/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/timer/app_timer_ble_gzll.c b/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/timer/app_timer_ble_gzll.c deleted file mode 100644 index e39c329464..0000000000 --- a/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/timer/app_timer_ble_gzll.c +++ /dev/null @@ -1,1050 +0,0 @@ -/* Copyright (c) 2012 Nordic Semiconductor. All Rights Reserved. - * - * The information contained herein is property of Nordic Semiconductor ASA. - * Terms and conditions of usage are described in detail in NORDIC - * SEMICONDUCTOR STANDARD SOFTWARE LICENSE AGREEMENT. - * - * Licensees are granted free, non-transferable use of the information. NO - * WARRANTY of ANY KIND is provided. This heading must NOT be removed from - * the file. - * - */ -#include "sdk_common.h" -#if NRF_MODULE_ENABLED(APP_TIMER) -#include "app_timer.h" -#include -#include "nrf.h" -#include "nrf_soc.h" -#include "app_error.h" -#include "nrf_delay.h" -#include "app_util_platform.h" - -#define RTC1_IRQ_PRI APP_IRQ_PRIORITY_LOWEST /**< Priority of the RTC1 interrupt (used for checking for timeouts and executing timeout handlers). */ -#define SWI_IRQ_PRI APP_IRQ_PRIORITY_LOWEST /**< Priority of the SWI interrupt (used for updating the timer list). */ - -// The current design assumes that both interrupt handlers run at the same interrupt level. -// If this is to be changed, protection must be added to prevent them from interrupting each other -// (e.g. by using guard/trigger flags). -STATIC_ASSERT(RTC1_IRQ_PRI == SWI_IRQ_PRI); - -#define MAX_RTC_COUNTER_VAL 0x00FFFFFF /**< Maximum value of the RTC counter. */ - -#define RTC_COMPARE_OFFSET_MIN 3 /**< Minimum offset between the current RTC counter value and the Capture Compare register. Although the nRF51 Series User Specification recommends this value to be 2, we use 3 to be safer.*/ - -#define MAX_RTC_TASKS_DELAY 47 /**< Maximum delay until an RTC task is executed. */ - -#define SWI_IRQn SWI1_IRQn -#define SWI_IRQHandler SWI1_IRQHandler - -#define MODULE_INITIALIZED (m_op_queue.p_user_op_queue != NULL) /**< Macro designating whether the module has been initialized properly. */ - -/**@brief Timer node type. The nodes will be used form a linked list of running timers. */ -typedef struct -{ - uint32_t ticks_to_expire; /**< Number of ticks from previous timer interrupt to timer expiry. */ - uint32_t ticks_at_start; /**< Current RTC counter value when the timer was started. */ - uint32_t ticks_first_interval; /**< Number of ticks in the first timer interval. */ - uint32_t ticks_periodic_interval; /**< Timer period (for repeating timers). */ - bool is_running; /**< True if timer is running, False otherwise. */ - app_timer_mode_t mode; /**< Timer mode. */ - app_timer_timeout_handler_t p_timeout_handler; /**< Pointer to function to be executed when the timer expires. */ - void * p_context; /**< General purpose pointer. Will be passed to the timeout handler when the timer expires. */ - void * next; /**< Pointer to the next node. */ -} timer_node_t; - -STATIC_ASSERT(sizeof(timer_node_t) == APP_TIMER_NODE_SIZE); - -/**@brief Set of available timer operation types. */ -typedef enum -{ - TIMER_USER_OP_TYPE_NONE, /**< Invalid timer operation type. */ - TIMER_USER_OP_TYPE_START, /**< Timer operation type Start. */ - TIMER_USER_OP_TYPE_STOP, /**< Timer operation type Stop. */ - TIMER_USER_OP_TYPE_STOP_ALL /**< Timer operation type Stop All. */ -} timer_user_op_type_t; - -/**@brief Structure describing a timer start operation. */ -typedef struct -{ - uint32_t ticks_at_start; /**< Current RTC counter value when the timer was started. */ - uint32_t ticks_first_interval; /**< Number of ticks in the first timer interval. */ - uint32_t ticks_periodic_interval; /**< Timer period (for repeating timers). */ - void * p_context; /**< General purpose pointer. Will be passed to the timeout handler when the timer expires. */ -} timer_user_op_start_t; - -/**@brief Structure describing a timer operation. */ -typedef struct -{ - timer_user_op_type_t op_type; /**< Id of timer on which the operation is to be performed. */ - timer_node_t * p_node; - union - { - timer_user_op_start_t start; /**< Structure describing a timer start operation. */ - } params; -} timer_user_op_t; - -STATIC_ASSERT(sizeof(timer_user_op_t) <= APP_TIMER_USER_OP_SIZE); -STATIC_ASSERT(sizeof(timer_user_op_t) % 4 == 0); - -/**@brief Structure describing a timer operations queue. - * - * @details This queue will hold timer operations issued by the application - * until the timer interrupt handler processes these operations. - */ -typedef struct -{ - uint8_t first; /**< Index of first entry to have been inserted in the queue (i.e. the next entry to be executed). */ - uint8_t last; /**< Index of last entry to have been inserted in the queue. */ - uint8_t size; /**< Queue size. */ - timer_user_op_t * p_user_op_queue; /**< Queue buffer. */ -} timer_op_queue_t; - -STATIC_ASSERT(sizeof(timer_op_queue_t) % 4 == 0); - -#define CONTEXT_QUEUE_SIZE_MAX (2) - -static timer_op_queue_t m_op_queue; /**< Timer operations queue. */ -static timer_node_t * mp_timer_id_head; /**< First timer in list of running timers. */ -static uint32_t m_ticks_latest; /**< Last known RTC counter value. */ -static uint32_t m_ticks_elapsed[CONTEXT_QUEUE_SIZE_MAX]; /**< Timer internal elapsed ticks queue. */ -static uint8_t m_ticks_elapsed_q_read_ind; /**< Timer internal elapsed ticks queue read index. */ -static uint8_t m_ticks_elapsed_q_write_ind; /**< Timer internal elapsed ticks queue write index. */ -static app_timer_evt_schedule_func_t m_evt_schedule_func; /**< Pointer to function for propagating timeout events to the scheduler. */ -static bool m_rtc1_running; /**< Boolean indicating if RTC1 is running. */ -static bool m_rtc1_reset; /**< Boolean indicating if RTC1 counter has been reset due to last timer removed from timer list during the timer list handling. */ - -#if APP_TIMER_WITH_PROFILER -static uint8_t m_max_user_op_queue_utilization; /**< Maximum observed timer user operations queue utilization. */ -#endif - -/**@brief Function for initializing the RTC1 counter. - * - * @param[in] prescaler Value of the RTC1 PRESCALER register. Set to 0 for no prescaling. - */ -static void rtc1_init(uint32_t prescaler) -{ - NRF_RTC1->PRESCALER = prescaler; - NVIC_SetPriority(RTC1_IRQn, RTC1_IRQ_PRI); -} - - -/**@brief Function for starting the RTC1 timer. - */ -static void rtc1_start(void) -{ - NRF_RTC1->EVTENSET = RTC_EVTEN_COMPARE0_Msk; - NRF_RTC1->INTENSET = RTC_INTENSET_COMPARE0_Msk; - - NVIC_ClearPendingIRQ(RTC1_IRQn); - NVIC_EnableIRQ(RTC1_IRQn); - - NRF_RTC1->TASKS_START = 1; - nrf_delay_us(MAX_RTC_TASKS_DELAY); - - m_rtc1_running = true; -} - - -/**@brief Function for stopping the RTC1 timer. - */ -static void rtc1_stop(void) -{ - NVIC_DisableIRQ(RTC1_IRQn); - - NRF_RTC1->EVTENCLR = RTC_EVTEN_COMPARE0_Msk; - NRF_RTC1->INTENCLR = RTC_INTENSET_COMPARE0_Msk; - - NRF_RTC1->TASKS_STOP = 1; - nrf_delay_us(MAX_RTC_TASKS_DELAY); - - NRF_RTC1->TASKS_CLEAR = 1; - m_ticks_latest = 0; - nrf_delay_us(MAX_RTC_TASKS_DELAY); - - m_rtc1_running = false; -} - - -/**@brief Function for returning the current value of the RTC1 counter. - * - * @return Current value of the RTC1 counter. - */ -static __INLINE uint32_t rtc1_counter_get(void) -{ - return NRF_RTC1->COUNTER; -} - - -/**@brief Function for computing the difference between two RTC1 counter values. - * - * @return Number of ticks elapsed from ticks_old to ticks_now. - */ -static __INLINE uint32_t ticks_diff_get(uint32_t ticks_now, uint32_t ticks_old) -{ - return ((ticks_now - ticks_old) & MAX_RTC_COUNTER_VAL); -} - - -/**@brief Function for setting the RTC1 Capture Compare register 0, and enabling the corresponding - * event. - * - * @param[in] value New value of Capture Compare register 0. - */ -static __INLINE void rtc1_compare0_set(uint32_t value) -{ - NRF_RTC1->CC[0] = value; -} - - -/**@brief Function for inserting a timer in the timer list. - * - * @param[in] timer_id Id of timer to insert. - */ -static void timer_list_insert(timer_node_t * p_timer) -{ - if (mp_timer_id_head == NULL) - { - mp_timer_id_head = p_timer; - } - else - { - if (p_timer->ticks_to_expire <= mp_timer_id_head->ticks_to_expire) - { - mp_timer_id_head->ticks_to_expire -= p_timer->ticks_to_expire; - - p_timer->next = mp_timer_id_head; - mp_timer_id_head = p_timer; - } - else - { - timer_node_t * p_previous; - timer_node_t * p_current; - uint32_t ticks_to_expire; - - ticks_to_expire = p_timer->ticks_to_expire; - p_previous = mp_timer_id_head; - p_current = mp_timer_id_head; - - while ((p_current != NULL) && (ticks_to_expire > p_current->ticks_to_expire)) - { - ticks_to_expire -= p_current->ticks_to_expire; - p_previous = p_current; - p_current = p_current->next; - } - - if (p_current != NULL) - { - p_current->ticks_to_expire -= ticks_to_expire; - } - - p_timer->ticks_to_expire = ticks_to_expire; - p_timer->next = p_current; - p_previous->next = p_timer; - } - } -} - - -/**@brief Function for removing a timer from the timer queue. - * - * @param[in] timer_id Id of timer to remove. - */ -static void timer_list_remove(timer_node_t * p_timer) -{ - timer_node_t * p_previous; - timer_node_t * p_current; - uint32_t timeout; - - // Find the timer's position in timer list. - p_previous = mp_timer_id_head; - p_current = p_previous; - - while (p_current != NULL) - { - if (p_current == p_timer) - { - break; - } - p_previous = p_current; - p_current = p_current->next; - } - - // Timer not in active list. - if (p_current == NULL) - { - return; - } - - // Timer is the first in the list - if (p_previous == p_current) - { - mp_timer_id_head = mp_timer_id_head->next; - - // No more timers in the list. Reset RTC1 in case Start timer operations are present in the queue. - if (mp_timer_id_head == NULL) - { - NRF_RTC1->TASKS_CLEAR = 1; - m_ticks_latest = 0; - m_rtc1_reset = true; - } - } - - // Remaining timeout between next timeout. - timeout = p_current->ticks_to_expire; - - // Link previous timer with next of this timer, i.e. removing the timer from list. - p_previous->next = p_current->next; - - // If this is not the last timer, increment the next timer by this timer timeout. - p_current = p_previous->next; - if (p_current != NULL) - { - p_current->ticks_to_expire += timeout; - } -} - - -/**@brief Function for scheduling a check for timeouts by generating a RTC1 interrupt. - */ -static void timer_timeouts_check_sched(void) -{ - NVIC_SetPendingIRQ(RTC1_IRQn); -} - - -/**@brief Function for scheduling a timer list update by generating a SWI interrupt. - */ -static void timer_list_handler_sched(void) -{ - NVIC_SetPendingIRQ(SWI_IRQn); -} - - -/**@brief Function for executing an application timeout handler, either by calling it directly, or - * by passing an event to the @ref app_scheduler. - * - * @param[in] p_timer Pointer to expired timer. - */ -static void timeout_handler_exec(timer_node_t * p_timer) -{ - if (m_evt_schedule_func != NULL) - { - uint32_t err_code = m_evt_schedule_func(p_timer->p_timeout_handler, p_timer->p_context); - APP_ERROR_CHECK(err_code); - } - else - { - p_timer->p_timeout_handler(p_timer->p_context); - } -} - - -/**@brief Function for checking for expired timers. - */ -static void timer_timeouts_check(void) -{ - // Handle expired of timer - if (mp_timer_id_head != NULL) - { - timer_node_t * p_timer; - timer_node_t * p_previous_timer; - uint32_t ticks_elapsed; - uint32_t ticks_expired; - - // Initialize actual elapsed ticks being consumed to 0. - ticks_expired = 0; - - // ticks_elapsed is collected here, job will use it. - ticks_elapsed = ticks_diff_get(rtc1_counter_get(), m_ticks_latest); - - // Auto variable containing the head of timers expiring. - p_timer = mp_timer_id_head; - - // Expire all timers within ticks_elapsed and collect ticks_expired. - while (p_timer != NULL) - { - // Do nothing if timer did not expire. - if (ticks_elapsed < p_timer->ticks_to_expire) - { - break; - } - - // Decrement ticks_elapsed and collect expired ticks. - ticks_elapsed -= p_timer->ticks_to_expire; - ticks_expired += p_timer->ticks_to_expire; - - // Move to next timer. - p_previous_timer = p_timer; - p_timer = p_timer->next; - - // Execute Task. - if (p_previous_timer->is_running) - { - p_previous_timer->is_running = false; - timeout_handler_exec(p_previous_timer); - } - } - - // Prepare to queue the ticks expired in the m_ticks_elapsed queue. - if (m_ticks_elapsed_q_read_ind == m_ticks_elapsed_q_write_ind) - { - // The read index of the queue is equal to the write index. This means the new - // value of ticks_expired should be stored at a new location in the m_ticks_elapsed - // queue (which is implemented as a double buffer). - - // Check if there will be a queue overflow. - if (++m_ticks_elapsed_q_write_ind == CONTEXT_QUEUE_SIZE_MAX) - { - // There will be a queue overflow. Hence the write index should point to the start - // of the queue. - m_ticks_elapsed_q_write_ind = 0; - } - } - - // Queue the ticks expired. - m_ticks_elapsed[m_ticks_elapsed_q_write_ind] = ticks_expired; - - timer_list_handler_sched(); - } -} - - -/**@brief Function for acquiring the number of ticks elapsed. - * - * @param[out] p_ticks_elapsed Number of ticks elapsed. - * - * @return TRUE if elapsed ticks was read from queue, FALSE otherwise. - */ -static bool elapsed_ticks_acquire(uint32_t * p_ticks_elapsed) -{ - // Pick the elapsed value from queue. - if (m_ticks_elapsed_q_read_ind != m_ticks_elapsed_q_write_ind) - { - // Dequeue elapsed value. - m_ticks_elapsed_q_read_ind++; - if (m_ticks_elapsed_q_read_ind == CONTEXT_QUEUE_SIZE_MAX) - { - m_ticks_elapsed_q_read_ind = 0; - } - - *p_ticks_elapsed = m_ticks_elapsed[m_ticks_elapsed_q_read_ind]; - - m_ticks_latest += *p_ticks_elapsed; - m_ticks_latest &= MAX_RTC_COUNTER_VAL; - - return true; - } - else - { - // No elapsed value in queue. - *p_ticks_elapsed = 0; - return false; - } -} - - -/**@brief Function for handling the timer list deletions. - * - * @return TRUE if Capture Compare register must be updated, FALSE otherwise. - */ -static bool list_deletions_handler(void) -{ - timer_node_t * p_timer_old_head; - uint8_t user_ops_first = m_op_queue.first; - - // Remember the old head, so as to decide if new compare needs to be set. - p_timer_old_head = mp_timer_id_head; - - while (user_ops_first != m_op_queue.last) - { - timer_user_op_t * p_user_op = &m_op_queue.p_user_op_queue[user_ops_first]; - - // Traverse to next operation in queue. - user_ops_first++; - if (user_ops_first == m_op_queue.size) - { - user_ops_first = 0; - } - - switch (p_user_op->op_type) - { - case TIMER_USER_OP_TYPE_STOP: - // Delete node if timer is running. - timer_list_remove(p_user_op->p_node); - break; - - case TIMER_USER_OP_TYPE_STOP_ALL: - // Delete list of running timers, and mark all timers as not running. - while (mp_timer_id_head != NULL) - { - timer_node_t * p_head = mp_timer_id_head; - - p_head->is_running = false; - mp_timer_id_head = p_head->next; - } - break; - - default: - // No implementation needed. - break; - } - } - - // Detect change in head of the list. - return (mp_timer_id_head != p_timer_old_head); -} - - -/**@brief Function for updating the timer list for expired timers. - * - * @param[in] ticks_elapsed Number of elapsed ticks. - * @param[in] ticks_previous Previous known value of the RTC counter. - * @param[out] p_restart_list_head List of repeating timers to be restarted. - */ -static void expired_timers_handler(uint32_t ticks_elapsed, - uint32_t ticks_previous, - timer_node_t ** p_restart_list_head) -{ - uint32_t ticks_expired = 0; - - while (mp_timer_id_head != NULL) - { - timer_node_t * p_timer; - timer_node_t * p_timer_expired; - - // Auto variable for current timer node. - p_timer = mp_timer_id_head; - - // Do nothing if timer did not expire - if (ticks_elapsed < p_timer->ticks_to_expire) - { - p_timer->ticks_to_expire -= ticks_elapsed; - break; - } - - // Decrement ticks_elapsed and collect expired ticks. - ticks_elapsed -= p_timer->ticks_to_expire; - ticks_expired += p_timer->ticks_to_expire; - - // Timer expired, set ticks_to_expire zero. - p_timer->ticks_to_expire = 0; - - // Remove the expired timer from head. - p_timer_expired = mp_timer_id_head; - mp_timer_id_head = p_timer->next; - - // Timer will be restarted if periodic. - if (p_timer->ticks_periodic_interval != 0) - { - p_timer->ticks_at_start = (ticks_previous + ticks_expired) & MAX_RTC_COUNTER_VAL; - p_timer->ticks_first_interval = p_timer->ticks_periodic_interval; - p_timer->next = *p_restart_list_head; - *p_restart_list_head = p_timer_expired; - } - } -} - - -/**@brief Function for handling timer list insertions. - * - * @param[in] p_restart_list_head List of repeating timers to be restarted. - * - * @return TRUE if Capture Compare register must be updated, FALSE otherwise. - */ -static bool list_insertions_handler(timer_node_t * p_restart_list_head) -{ - timer_node_t * p_timer_id_old_head; - - // Remember the old head, so as to decide if new compare needs to be set. - p_timer_id_old_head = mp_timer_id_head; - - // Handle insertions of timers. - while ((p_restart_list_head != NULL) || (m_op_queue.first != m_op_queue.last)) - { - timer_node_t * p_timer; - - if (p_restart_list_head != NULL) - { - p_timer = p_restart_list_head; - p_restart_list_head = p_timer->next; - } - else - { - timer_user_op_t * p_user_op = &m_op_queue.p_user_op_queue[m_op_queue.first]; - - m_op_queue.first++; - if (m_op_queue.first == m_op_queue.size) - { - m_op_queue.first = 0; - } - - p_timer = p_user_op->p_node; - - if ((p_user_op->op_type != TIMER_USER_OP_TYPE_START) || p_timer->is_running) - { - continue; - } - - p_timer->ticks_at_start = p_user_op->params.start.ticks_at_start; - p_timer->ticks_first_interval = p_user_op->params.start.ticks_first_interval; - p_timer->ticks_periodic_interval = p_user_op->params.start.ticks_periodic_interval; - p_timer->p_context = p_user_op->params.start.p_context; - - if (m_rtc1_reset) - { - p_timer->ticks_at_start = 0; - } - } - - // Prepare the node to be inserted. - if ( - ((p_timer->ticks_at_start - m_ticks_latest) & MAX_RTC_COUNTER_VAL) - < - (MAX_RTC_COUNTER_VAL / 2) - ) - { - p_timer->ticks_to_expire = ticks_diff_get(p_timer->ticks_at_start, m_ticks_latest) + - p_timer->ticks_first_interval; - } - else - { - uint32_t delta_current_start; - - delta_current_start = ticks_diff_get(m_ticks_latest, p_timer->ticks_at_start); - if (p_timer->ticks_first_interval > delta_current_start) - { - p_timer->ticks_to_expire = p_timer->ticks_first_interval - delta_current_start; - } - else - { - p_timer->ticks_to_expire = 0; - } - } - - p_timer->ticks_at_start = 0; - p_timer->ticks_first_interval = 0; - p_timer->is_running = true; - p_timer->next = NULL; - - // Insert into list - timer_list_insert(p_timer); - } - - return (mp_timer_id_head != p_timer_id_old_head); -} - - -/**@brief Function for updating the Capture Compare register. - */ -static void compare_reg_update(timer_node_t * p_timer_id_head_old) -{ - // Setup the timeout for timers on the head of the list - if (mp_timer_id_head != NULL) - { - uint32_t ticks_to_expire = mp_timer_id_head->ticks_to_expire; - uint32_t pre_counter_val = rtc1_counter_get(); - uint32_t cc = m_ticks_latest; - uint32_t ticks_elapsed = ticks_diff_get(pre_counter_val, cc) + RTC_COMPARE_OFFSET_MIN; - - if (!m_rtc1_running) - { - // No timers were already running, start RTC - rtc1_start(); - } - - cc += (ticks_elapsed < ticks_to_expire) ? ticks_to_expire : ticks_elapsed; - cc &= MAX_RTC_COUNTER_VAL; - - rtc1_compare0_set(cc); - - uint32_t post_counter_val = rtc1_counter_get(); - - if ( - (ticks_diff_get(post_counter_val, pre_counter_val) + RTC_COMPARE_OFFSET_MIN) - > - ticks_diff_get(cc, pre_counter_val) - ) - { - // When this happens the COMPARE event may not be triggered by the RTC. - // The nRF51 Series User Specification states that if the COUNTER value is N - // (i.e post_counter_val = N), writing N or N + 1 to a CC register may not trigger a - // COMPARE event. Hence the RTC interrupt is forcefully pended by calling the following - // function. - rtc1_compare0_set(rtc1_counter_get()); // this should prevent CC to fire again in the background while the code is in RTC-ISR - nrf_delay_us(MAX_RTC_TASKS_DELAY); - timer_timeouts_check_sched(); - } - } - else - { -#if (APP_TIMER_KEEPS_RTC_ACTIVE == 0) - // No timers are running, stop RTC - rtc1_stop(); -#endif //(APP_TIMER_KEEPS_RTC_ACTIVE == 0) - } -} - - -/**@brief Function for handling changes to the timer list. - */ -static void timer_list_handler(void) -{ - timer_node_t * p_restart_list_head = NULL; - - uint32_t ticks_elapsed; - uint32_t ticks_previous; - bool ticks_have_elapsed; - bool compare_update; - timer_node_t * p_timer_id_head_old; - -#if APP_TIMER_WITH_PROFILER - { - uint8_t size = m_op_queue.size; - uint8_t first = m_op_queue.first; - uint8_t last = m_op_queue.last; - uint8_t utilization = (first <= last) ? (last - first) : (size + 1 - first + last); - - if (utilization > m_max_user_op_queue_utilization) - { - m_max_user_op_queue_utilization = utilization; - } - } -#endif - - // Back up the previous known tick and previous list head - ticks_previous = m_ticks_latest; - p_timer_id_head_old = mp_timer_id_head; - - // Get number of elapsed ticks - ticks_have_elapsed = elapsed_ticks_acquire(&ticks_elapsed); - - // Handle list deletions - compare_update = list_deletions_handler(); - - // Handle expired timers - if (ticks_have_elapsed) - { - expired_timers_handler(ticks_elapsed, ticks_previous, &p_restart_list_head); - compare_update = true; - } - - // Handle list insertions - if (list_insertions_handler(p_restart_list_head)) - { - compare_update = true; - } - - // Update compare register if necessary - if (compare_update) - { - compare_reg_update(p_timer_id_head_old); - } - m_rtc1_reset = false; -} - - -/**@brief Function for enqueueing a new operations queue entry. - * - * @param[in] last_index Index of the next last index to be enqueued. - */ -static void user_op_enque(uint8_t last_index) -{ - m_op_queue.last = last_index; -} - - -/**@brief Function for allocating a new operations queue entry. - * - * @param[out] p_last_index Index of the next last index to be enqueued. - * - * @return Pointer to allocated queue entry, or NULL if queue is full. - */ -static timer_user_op_t * user_op_alloc( uint8_t * p_last_index) -{ - uint8_t last; - timer_user_op_t * p_user_op; - - last = m_op_queue.last + 1; - if (last == m_op_queue.size) - { - // Overflow case. - last = 0; - } - if (last == m_op_queue.first) - { - // Queue is full. - return NULL; - } - - *p_last_index = last; - p_user_op = &m_op_queue.p_user_op_queue[m_op_queue.last]; - - return p_user_op; -} - - -/**@brief Function for scheduling a Timer Start operation. - * - * @param[in] timer_id Id of timer to start. - * @param[in] timeout_initial Time (in ticks) to first timer expiry. - * @param[in] timeout_periodic Time (in ticks) between periodic expiries. - * @param[in] p_context General purpose pointer. Will be passed to the timeout handler when - * the timer expires. - * @return NRF_SUCCESS on success, otherwise an error code. - */ - -static uint32_t timer_start_op_schedule(timer_node_t * p_node, - uint32_t timeout_initial, - uint32_t timeout_periodic, - void * p_context) -{ - uint8_t last_index; - uint32_t err_code = NRF_SUCCESS; - - CRITICAL_REGION_ENTER(); - timer_user_op_t * p_user_op = user_op_alloc(&last_index); - if (p_user_op == NULL) - { - err_code = NRF_ERROR_NO_MEM; - } - else - { - - p_user_op->op_type = TIMER_USER_OP_TYPE_START; - p_user_op->p_node = p_node; - p_user_op->params.start.ticks_at_start = rtc1_counter_get(); - p_user_op->params.start.ticks_first_interval = timeout_initial; - p_user_op->params.start.ticks_periodic_interval = timeout_periodic; - p_user_op->params.start.p_context = p_context; - - user_op_enque(last_index); - } - CRITICAL_REGION_EXIT(); - - if (err_code == NRF_SUCCESS) - { - timer_list_handler_sched(); - } - - return err_code; -} - - -/**@brief Function for scheduling a Timer Stop operation. - * - * @param[in] timer_id Id of timer to stop. - * @param[in] op_type Type of stop operation - * - * @return NRF_SUCCESS on successful scheduling a timer stop operation. NRF_ERROR_NO_MEM when there - * is no memory left to schedule the timer stop operation. - */ -static uint32_t timer_stop_op_schedule(timer_node_t * p_node, - timer_user_op_type_t op_type) -{ - uint8_t last_index; - uint32_t err_code = NRF_SUCCESS; - - CRITICAL_REGION_ENTER(); - timer_user_op_t * p_user_op = user_op_alloc(&last_index); - if (p_user_op == NULL) - { - err_code = NRF_ERROR_NO_MEM; - } - else - { - p_user_op->op_type = op_type; - p_user_op->p_node = p_node; - - user_op_enque(last_index); - } - CRITICAL_REGION_EXIT(); - - if (err_code == NRF_SUCCESS) - { - timer_list_handler_sched(); - } - - return err_code; -} - -/**@brief Function for handling the RTC1 interrupt. - * - * @details Checks for timeouts, and executes timeout handlers for expired timers. - */ -void RTC1_IRQHandler(void) -{ - // Clear all events (also unexpected ones) - NRF_RTC1->EVENTS_COMPARE[0] = 0; - NRF_RTC1->EVENTS_COMPARE[1] = 0; - NRF_RTC1->EVENTS_COMPARE[2] = 0; - NRF_RTC1->EVENTS_COMPARE[3] = 0; - NRF_RTC1->EVENTS_TICK = 0; - NRF_RTC1->EVENTS_OVRFLW = 0; - - // Check for expired timers - timer_timeouts_check(); -} - - -/**@brief Function for handling the SWI interrupt. - * - * @details Performs all updates to the timer list. - */ -void SWI_IRQHandler(void) -{ - timer_list_handler(); -} - - -uint32_t app_timer_init(uint32_t prescaler, - uint8_t op_queue_size, - void * p_buffer, - app_timer_evt_schedule_func_t evt_schedule_func) -{ - // Check that buffer is correctly aligned - if (!is_word_aligned(p_buffer)) - { - return NRF_ERROR_INVALID_PARAM; - } - // Check for NULL buffer - if (p_buffer == NULL) - { - return NRF_ERROR_INVALID_PARAM; - } - - // Stop RTC to prevent any running timers from expiring (in case of reinitialization) - rtc1_stop(); - - m_evt_schedule_func = evt_schedule_func; - - // Initialize operation queue - m_op_queue.first = 0; - m_op_queue.last = 0; - m_op_queue.size = op_queue_size; - m_op_queue.p_user_op_queue = p_buffer; - - mp_timer_id_head = NULL; - m_ticks_elapsed_q_read_ind = 0; - m_ticks_elapsed_q_write_ind = 0; - -#if APP_TIMER_WITH_PROFILER - m_max_user_op_queue_utilization = 0; -#endif - - NVIC_ClearPendingIRQ(SWI_IRQn); - NVIC_SetPriority(SWI_IRQn, SWI_IRQ_PRI); - NVIC_EnableIRQ(SWI_IRQn); - - rtc1_init(prescaler); - - m_ticks_latest = rtc1_counter_get(); - - return NRF_SUCCESS; -} - - -uint32_t app_timer_create(app_timer_id_t const * p_timer_id, - app_timer_mode_t mode, - app_timer_timeout_handler_t timeout_handler) -{ - // Check state and parameters - VERIFY_MODULE_INITIALIZED(); - - if (timeout_handler == NULL) - { - return NRF_ERROR_INVALID_PARAM; - } - if (p_timer_id == NULL) - { - return NRF_ERROR_INVALID_PARAM; - } - if (((timer_node_t*)*p_timer_id)->is_running) - { - return NRF_ERROR_INVALID_STATE; - } - - timer_node_t * p_node = (timer_node_t *)*p_timer_id; - p_node->is_running = false; - p_node->mode = mode; - p_node->p_timeout_handler = timeout_handler; - return NRF_SUCCESS; -} - -uint32_t app_timer_start(app_timer_id_t timer_id, uint32_t timeout_ticks, void * p_context) -{ - uint32_t timeout_periodic; - timer_node_t * p_node = (timer_node_t*)timer_id; - - // Check state and parameters - VERIFY_MODULE_INITIALIZED(); - - if (timer_id == 0) - { - return NRF_ERROR_INVALID_STATE; - } - if (timeout_ticks < APP_TIMER_MIN_TIMEOUT_TICKS) - { - return NRF_ERROR_INVALID_PARAM; - } - if (p_node->p_timeout_handler == NULL) - { - return NRF_ERROR_INVALID_STATE; - } - - // Schedule timer start operation - timeout_periodic = (p_node->mode == APP_TIMER_MODE_REPEATED) ? timeout_ticks : 0; - - return timer_start_op_schedule(p_node, - timeout_ticks, - timeout_periodic, - p_context); -} - - -uint32_t app_timer_stop(app_timer_id_t timer_id) -{ - timer_node_t * p_node = (timer_node_t*)timer_id; - // Check state and parameters - VERIFY_MODULE_INITIALIZED(); - - if ((timer_id == NULL) || (p_node->p_timeout_handler == NULL)) - { - return NRF_ERROR_INVALID_STATE; - } - - p_node->is_running = false; - // Schedule timer stop operation - return timer_stop_op_schedule(p_node, TIMER_USER_OP_TYPE_STOP); -} - - -uint32_t app_timer_stop_all(void) -{ - // Check state - VERIFY_MODULE_INITIALIZED(); - - return timer_stop_op_schedule(NULL, TIMER_USER_OP_TYPE_STOP_ALL); -} - - -uint32_t app_timer_cnt_get(void) -{ - return rtc1_counter_get(); -} - - -uint32_t app_timer_cnt_diff_compute(uint32_t ticks_to, - uint32_t ticks_from, - uint32_t * p_ticks_diff) -{ - *p_ticks_diff = ticks_diff_get(ticks_to, ticks_from); - return NRF_SUCCESS; -} - -#if APP_TIMER_WITH_PROFILER -uint8_t app_timer_op_queue_utilization_get(void) -{ - return m_max_user_op_queue_utilization; -} -#endif -#endif //NRF_MODULE_ENABLED(APP_TIMER) diff --git a/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/timer/app_timer_freertos.c b/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/timer/app_timer_freertos.c deleted file mode 100644 index b7414b488e..0000000000 --- a/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/timer/app_timer_freertos.c +++ /dev/null @@ -1,230 +0,0 @@ -/* Copyright (c) 2014 Nordic Semiconductor. All Rights Reserved. - * - * The information contained herein is property of Nordic Semiconductor ASA. - * Terms and conditions of usage are described in detail in NORDIC - * SEMICONDUCTOR STANDARD SOFTWARE LICENSE AGREEMENT. - * - * Licensees are granted free, non-transferable use of the information. NO - * WARRANTY of ANY KIND is provided. This heading must NOT be removed from - * the file. - * - */ -#include "sdk_common.h" -#if NRF_MODULE_ENABLED(APP_TIMER) -#include "FreeRTOS.h" -#include "task.h" -#include "timers.h" - -#include "app_timer.h" -#include -#include -#include "nrf.h" -#include "app_error.h" - -/* Check if RTC FreeRTOS version is used */ -#if configTICK_SOURCE != FREERTOS_USE_RTC -#error app_timer in FreeRTOS variant have to be used with RTC tick source configuration. Default configuration have to be used in other case. -#endif - -/** - * @brief Waiting time for the timer queue - * - * Number of system ticks to wait for the timer queue to put the message. - * It is strongly recommended to set this to the value bigger than 1. - * In other case if timer message queue is full - any operation on timer may fail. - * @note - * Timer functions called from interrupt context would never wait. - */ -#define APP_TIMER_WAIT_FOR_QUEUE 2 - -/**@brief This structure keeps information about osTimer.*/ -typedef struct -{ - void * argument; - TimerHandle_t osHandle; - app_timer_timeout_handler_t func; - /** - * This member is to make sure that timer function is only called if timer is running. - * FreeRTOS may have timer running even after stop function is called, - * because it processes commands in Timer task and stopping function only puts command into the queue. */ - bool active; -}app_timer_info_t; - -/** - * @brief Prescaler that was set by the user - * - * In FreeRTOS version of app_timer the prescaler setting is constant and done by the operating system. - * But the application expect the prescaler to be set according to value given in setup and then - * calculate required ticks using this value. - * For compatibility we remember the value set and use it for recalculation of required timer setting. - */ -static uint32_t m_prescaler; - -/* Check if freeRTOS timers are activated */ -#if configUSE_TIMERS == 0 - #error app_timer for freeRTOS requires configUSE_TIMERS option to be activated. -#endif - -/* Check if app_timer_t variable type can held our app_timer_info_t structure */ -STATIC_ASSERT(sizeof(app_timer_info_t) <= sizeof(app_timer_t)); - - -/** - * @brief Internal callback function for the system timer - * - * Internal function that is called from the system timer. - * It gets our parameter from timer data and sends it to user function. - * @param[in] xTimer Timer handler - */ -static void app_timer_callback(TimerHandle_t xTimer) -{ - app_timer_info_t * pinfo = (app_timer_info_t*)(pvTimerGetTimerID(xTimer)); - ASSERT(pinfo->osHandle == xTimer); - ASSERT(pinfo->func != NULL); - - if (pinfo->active) - pinfo->func(pinfo->argument); -} - - -uint32_t app_timer_init(uint32_t prescaler, - uint8_t op_queues_size, - void * p_buffer, - app_timer_evt_schedule_func_t evt_schedule_func) -{ - UNUSED_PARAMETER(op_queues_size); - UNUSED_PARAMETER(p_buffer); - UNUSED_PARAMETER(evt_schedule_func); - - m_prescaler = prescaler + 1; - - return NRF_SUCCESS; -} - - -uint32_t app_timer_create(app_timer_id_t const * p_timer_id, - app_timer_mode_t mode, - app_timer_timeout_handler_t timeout_handler) -{ - app_timer_info_t * pinfo = (app_timer_info_t*)(*p_timer_id); - uint32_t err_code = NRF_SUCCESS; - unsigned long timer_mode; - - if ((timeout_handler == NULL) || (p_timer_id == NULL)) - { - return NRF_ERROR_INVALID_PARAM; - } - if (pinfo->active) - { - return NRF_ERROR_INVALID_STATE; - } - - if (pinfo->osHandle == NULL) - { - /* New timer is created */ - memset(pinfo, 0, sizeof(app_timer_info_t)); - - if (mode == APP_TIMER_MODE_SINGLE_SHOT) - timer_mode = pdFALSE; - else - timer_mode = pdTRUE; - - pinfo->func = timeout_handler; - pinfo->osHandle = xTimerCreate(" ", 1000, timer_mode, pinfo, app_timer_callback); - - if (pinfo->osHandle == NULL) - err_code = NRF_ERROR_NULL; - } - else - { - /* Timer cannot be reinitialized using FreeRTOS API */ - return NRF_ERROR_INVALID_STATE; - } - - return err_code; -} - - -uint32_t app_timer_start(app_timer_id_t timer_id, uint32_t timeout_ticks, void * p_context) -{ - app_timer_info_t * pinfo = (app_timer_info_t*)(timer_id); - TimerHandle_t hTimer = pinfo->osHandle; - uint32_t rtc_prescaler = portNRF_RTC_REG->PRESCALER + 1; - /* Get back the microseconds to wait */ - uint32_t timeout_corrected = ROUNDED_DIV(timeout_ticks * m_prescaler, rtc_prescaler); - - if (hTimer == NULL) - { - return NRF_ERROR_INVALID_STATE; - } - if (pinfo->active && (xTimerIsTimerActive(hTimer) != pdFALSE)) - { - // Timer already running - exit silently - return NRF_SUCCESS; - } - - pinfo->argument = p_context; - - if (__get_IPSR() != 0) - { - BaseType_t yieldReq = pdFALSE; - if (xTimerChangePeriodFromISR(hTimer, timeout_corrected, &yieldReq) != pdPASS) - { - return NRF_ERROR_NO_MEM; - } - - if ( xTimerStartFromISR(hTimer, &yieldReq) != pdPASS ) - { - return NRF_ERROR_NO_MEM; - } - - portYIELD_FROM_ISR(yieldReq); - } - else - { - if (xTimerChangePeriod(hTimer, timeout_corrected, APP_TIMER_WAIT_FOR_QUEUE) != pdPASS) - { - return NRF_ERROR_NO_MEM; - } - - if (xTimerStart(hTimer, APP_TIMER_WAIT_FOR_QUEUE) != pdPASS) - { - return NRF_ERROR_NO_MEM; - } - } - - pinfo->active = true; - return NRF_SUCCESS; -} - - -uint32_t app_timer_stop(app_timer_id_t timer_id) -{ - app_timer_info_t * pinfo = (app_timer_info_t*)(timer_id); - TimerHandle_t hTimer = pinfo->osHandle; - if (hTimer == NULL) - { - return NRF_ERROR_INVALID_STATE; - } - - if (__get_IPSR() != 0) - { - BaseType_t yieldReq = pdFALSE; - if (xTimerStopFromISR(timer_id, &yieldReq) != pdPASS) - { - return NRF_ERROR_NO_MEM; - } - portYIELD_FROM_ISR(yieldReq); - } - else - { - if (xTimerStop(timer_id, APP_TIMER_WAIT_FOR_QUEUE) != pdPASS) - { - return NRF_ERROR_NO_MEM; - } - } - - pinfo->active = false; - return NRF_SUCCESS; -} -#endif //NRF_MODULE_ENABLED(APP_TIMER) diff --git a/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/timer/app_timer_rtx.c b/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/timer/app_timer_rtx.c index 117cba287e..5ce1b7abc8 100644 --- a/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/timer/app_timer_rtx.c +++ b/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/sdk/libraries/timer/app_timer_rtx.c @@ -9,7 +9,8 @@ * the file. * */ - +#ifdef __MBED_CMSIS_RTOS_CM + #include "sdk_common.h" #if NRF_MODULE_ENABLED(APP_TIMER) #include "app_timer.h" @@ -254,3 +255,5 @@ uint32_t app_timer_cnt_diff_compute(uint32_t ticks_to, return NRF_SUCCESS; } #endif //NRF_MODULE_ENABLED(APP_TIMER) + +#endif // __MBED_CMSIS_RTOS_CM