jesus/tinyusb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add os FromISR support for freeRTOS

Browse Source
This commit is contained in:
hathach
2018-05-17 15:07:53 +07:00
parent 013bd621f5
commit b5de2595d3
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tinyusb/osal/osal_freeRTOS.h
+13 -6
View File
@@ -56,8 +56,6 @@ extern "C" {
#if 0 #if 0
// Helper to determine if we are in ISR to use ISR API (only cover ARM Cortex) // Helper to determine if we are in ISR to use ISR API (only cover ARM Cortex)
// Note: Actually we don't need this since any event signal (queue send, semaphore post)
// is done in ISR, other event receive (queue receive, semaphore wait ) in in thread
static inline bool in_isr(void) static inline bool in_isr(void)
{ {
return (SCB->ICSR & SCB_ICSR_VECTACTIVE_Msk); return (SCB->ICSR & SCB_ICSR_VECTACTIVE_Msk);
@@ -98,11 +96,14 @@ static inline void osal_queue_receive (osal_queue_t const queue_hdl, void *p_dat
(*p_error) = ( xQueueReceive(queue_hdl, p_data, ticks) ? TUSB_ERROR_NONE : TUSB_ERROR_OSAL_TIMEOUT); (*p_error) = ( xQueueReceive(queue_hdl, p_data, ticks) ? TUSB_ERROR_NONE : TUSB_ERROR_OSAL_TIMEOUT);
} }
static inline bool osal_queue_send_isr(osal_queue_t const queue_hdl, void const * data)
{
return xQueueSendToFrontFromISR(queue_hdl, data, NULL);
}
static inline bool osal_queue_send(osal_queue_t const queue_hdl, void const * data) static inline bool osal_queue_send(osal_queue_t const queue_hdl, void const * data)
{ {
// queue send used by msc device for retrying read10/write10 return xQueueSendToFront(queue_hdl, data, OSAL_TIMEOUT_WAIT_FOREVER) == pdTRUE;
verify_breakpoint();
return xQueueSendToFrontFromISR(queue_hdl, data, NULL);
} }
static inline void osal_queue_flush(osal_queue_t const queue_hdl) static inline void osal_queue_flush(osal_queue_t const queue_hdl)
@@ -122,11 +123,17 @@ static inline osal_semaphore_t osal_semaphore_create(uint32_t max, uint32_t init
} }
// TODO add timeout (with instant return from ISR option) for semaphore post & queue send // TODO add timeout (with instant return from ISR option) for semaphore post & queue send
static inline bool osal_semaphore_post_isr(osal_semaphore_t sem_hdl)
{
return xSemaphoreGiveFromISR(sem_hdl, NULL) == pdTRUE;
}
static inline bool osal_semaphore_post(osal_semaphore_t sem_hdl) static inline bool osal_semaphore_post(osal_semaphore_t sem_hdl)
{ {
return xSemaphoreGiveFromISR(sem_hdl, NULL); return xSemaphoreGive(sem_hdl) == pdTRUE;
} }
static inline void osal_semaphore_wait(osal_semaphore_t sem_hdl, uint32_t msec, tusb_error_t *p_error) static inline void osal_semaphore_wait(osal_semaphore_t sem_hdl, uint32_t msec, tusb_error_t *p_error)
{ {
uint32_t const ticks = (msec == OSAL_TIMEOUT_WAIT_FOREVER) ? portMAX_DELAY : pdMS_TO_TICKS(msec); uint32_t const ticks = (msec == OSAL_TIMEOUT_WAIT_FOREVER) ? portMAX_DELAY : pdMS_TO_TICKS(msec);