mirror/tinyusb
1
0
Fork 0
mirror of https://github.com/hathach/tinyusb.git synced 2025-02-19 06:40:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

change osal_semaphore_wait to return bool

Browse Source
This commit is contained in:
hathach 2018-12-06 17:31:25 +07:00
parent 5f7d7a34f5
commit 1d3583785f
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/osal/osal.h
View File

@ -83,7 +83,7 @@ typedef void (*osal_task_func_t)( void * );
* osal_semaphore_def_t, osal_semaphore_t * osal_semaphore_def_t, osal_semaphore_t
* osal_semaphore_t osal_semaphore_create(osal_semaphore_def_t* semdef) * osal_semaphore_t osal_semaphore_create(osal_semaphore_def_t* semdef)
* bool osal_semaphore_post(osal_semaphore_t sem_hdl, bool in_isr) * bool osal_semaphore_post(osal_semaphore_t sem_hdl, bool in_isr)
* void osal_semaphore_wait(osal_semaphore_t sem_hdl, uint32_t msec, uint32_t *p_error) * bool osal_semaphore_wait(osal_semaphore_t sem_hdl, uint32_t msec)
* void osal_semaphore_reset(osal_semaphore_t const sem_hdl) * void osal_semaphore_reset(osal_semaphore_t const sem_hdl)
* *
* Mutex * Mutex

4
src/osal/osal_freertos.h
View File

@ -107,10 +107,10 @@ static inline bool osal_semaphore_post(osal_semaphore_t sem_hdl, bool in_isr)
return in_isr ? xSemaphoreGiveFromISR(sem_hdl, NULL) : xSemaphoreGive(sem_hdl); return in_isr ? xSemaphoreGiveFromISR(sem_hdl, NULL) : xSemaphoreGive(sem_hdl);
} }
static inline tusb_error_t osal_semaphore_wait(osal_semaphore_t sem_hdl, uint32_t msec) static inline bool osal_semaphore_wait (osal_semaphore_t sem_hdl, uint32_t msec)
{ {
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);
return (xSemaphoreTake(sem_hdl, ticks) ? TUSB_ERROR_NONE : TUSB_ERROR_OSAL_TIMEOUT); return xSemaphoreTake(sem_hdl, ticks);
} }
static inline void osal_semaphore_reset(osal_semaphore_t const sem_hdl) static inline void osal_semaphore_reset(osal_semaphore_t const sem_hdl)

6
src/osal/osal_none.h
View File

@ -96,15 +96,15 @@ static inline void osal_semaphore_reset(osal_semaphore_t sem_hdl)
sem_hdl->count = 0; sem_hdl->count = 0;
} }
static inline tusb_error_t osal_semaphore_wait(osal_semaphore_t sem_hdl, uint32_t msec) // TODO blocking for now
static inline bool osal_semaphore_wait (osal_semaphore_t sem_hdl, uint32_t msec)
{ {
(void) msec; (void) msec;
// TODO blocking for now
while (sem_hdl->count == 0) { } while (sem_hdl->count == 0) { }
sem_hdl->count--; sem_hdl->count--;
return TUSB_ERROR_NONE; return true;
} }
//--------------------------------------------------------------------+ //--------------------------------------------------------------------+