andy/tinyUSB
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

change osal_queue_receive() signature

Browse Source 
- fix build issue with freertos
This commit is contained in:
hathach
2018-11-14 16:31:28 +07:00
parent 5732be224c
commit 10bf41f718
8 changed files with 47 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/osal/osal.h
View File

@@ -62,10 +62,6 @@ typedef void (*osal_task_func_t)( void * );
#if CFG_TUSB_OS == OPT_OS_NONE
#include "osal_none.h"
#define OSAL_TASK_BEGIN
#define OSAL_TASK_END
#else
/* RTOS Porting API
*
@@ -105,8 +101,7 @@ typedef void (*osal_task_func_t)( void * );
#error CFG_TUSB_OS is not defined or OS is not supported yet
#endif
#define OSAL_TASK_BEGIN while(1) {
#define OSAL_TASK_END }
// TODO remove subtask related macros later
//------------- Sub Task -------------//
#define OSAL_SUBTASK_BEGIN

5
src/osal/osal_freertos.h
View File

@@ -159,10 +159,9 @@ static inline osal_queue_t osal_queue_create(osal_queue_def_t* qdef)
return xQueueCreateStatic(qdef->depth, qdef->item_sz, (uint8_t*) qdef->buf, &qdef->sq);
}
static inline void osal_queue_receive (osal_queue_t const queue_hdl, void *p_data, uint32_t msec, uint32_t *err)
static inline bool osal_queue_receive(osal_queue_t const queue_hdl, void* data)
{
uint32_t const ticks = (msec == OSAL_TIMEOUT_WAIT_FOREVER) ? portMAX_DELAY : pdMS_TO_TICKS(msec);
(*err) = ( xQueueReceive(queue_hdl, p_data, ticks) ? TUSB_ERROR_NONE : TUSB_ERROR_OSAL_TIMEOUT);
return xQueueReceive(queue_hdl, data, portMAX_DELAY);
}
static inline bool osal_queue_send(osal_queue_t const queue_hdl, void const * data, bool in_isr)

11
src/osal/osal_none.h
View File

@@ -89,6 +89,7 @@ static inline osal_semaphore_t osal_semaphore_create(osal_semaphore_def_t* semde
static inline bool osal_semaphore_post(osal_semaphore_t sem_hdl, bool in_isr)
{
(void) in_isr;
sem_hdl->count++;
return true;
}
@@ -157,11 +158,11 @@ static inline void osal_queue_reset(osal_queue_t const queue_hdl)
queue_hdl->count = queue_hdl->rd_idx = queue_hdl->wr_idx = 0;
}
static inline tusb_error_t osal_queue_receive(osal_queue_t const queue_hdl, void* data) {
if (!tu_fifo_read(queue_hdl, data)) {
return TUSB_ERROR_OSAL_WAITING;
}
return TUSB_ERROR_NONE;
static inline bool osal_queue_receive(osal_queue_t const queue_hdl, void* data)
{
// osal none return immediately without blocking
return tu_fifo_read(queue_hdl, data);
}