mirror/tinyusb
1
0
Fork 0
mirror of https://github.com/hathach/tinyusb.git synced 2025-03-29 19:20:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge osal_queue_send_isr to osal_queue_send, osal_semaphore_post_isr to osal_semaphore_post

Browse Source
This commit is contained in:
hathach 2018-10-23 15:53:29 +07:00
parent 9ba624a974
commit 3dd635f4c1
4 changed files with 15 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/osal/osal.h
View File

@ -80,15 +80,13 @@ typedef void (*osal_task_func_t)( void * );
* osal_queue_def_t, osal_queue_t * osal_queue_def_t, osal_queue_t
* osal_queue_t osal_queue_create(osal_queue_def_t* qdef) * osal_queue_t osal_queue_create(osal_queue_def_t* qdef)
* osal_queue_receive (osal_queue_t const queue_hdl, void *p_data, uint32_t msec, tusb_error_t *p_error) * osal_queue_receive (osal_queue_t const queue_hdl, void *p_data, uint32_t msec, tusb_error_t *p_error)
* bool osal_queue_send_isr(osal_queue_t const queue_hdl, void const * data) * bool osal_queue_send(osal_queue_t const queue_hdl, void const * data, bool in_isr)
* bool osal_queue_send(osal_queue_t const queue_hdl, void const * data)
* osal_queue_flush() TODO remove * osal_queue_flush() TODO remove
* *
* Semaphore * Semaphore
* 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_isr(osal_semaphore_t sem_hdl) * bool osal_semaphore_post(osal_semaphore_t sem_hdl, bool in_isr)
* bool osal_semaphore_post(osal_semaphore_t sem_hdl)
* void osal_semaphore_wait(osal_semaphore_t sem_hdl, uint32_t msec, tusb_error_t *p_error) * void osal_semaphore_wait(osal_semaphore_t sem_hdl, uint32_t msec, tusb_error_t *p_error)
* void osal_semaphore_reset_isr(osal_semaphore_t const sem_hdl) * void osal_semaphore_reset_isr(osal_semaphore_t const sem_hdl)
* *

18
src/osal/osal_freertos.h
View File

@ -120,14 +120,9 @@ 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) static inline bool osal_queue_send(osal_queue_t const queue_hdl, void const * data, bool in_isr)
{ {
return xQueueSendToBackFromISR(queue_hdl, data, NULL); return in_isr ? xQueueSendToBackFromISR(queue_hdl, data, NULL) : xQueueSendToBack(queue_hdl, data, OSAL_TIMEOUT_WAIT_FOREVER);
}
static inline bool osal_queue_send(osal_queue_t const queue_hdl, void const * data)
{
return xQueueSendToBack(queue_hdl, data, OSAL_TIMEOUT_WAIT_FOREVER) == pdTRUE;
} }
static inline void osal_queue_flush(osal_queue_t const queue_hdl) static inline void osal_queue_flush(osal_queue_t const queue_hdl)
@ -147,14 +142,9 @@ static inline osal_semaphore_t osal_semaphore_create(osal_semaphore_def_t* semde
return xSemaphoreCreateBinaryStatic(semdef); return xSemaphoreCreateBinaryStatic(semdef);
} }
static inline bool osal_semaphore_post_isr(osal_semaphore_t sem_hdl) static inline bool osal_semaphore_post(osal_semaphore_t sem_hdl, bool in_isr)
{ {
return xSemaphoreGiveFromISR(sem_hdl, NULL) == pdTRUE; return in_isr ? xSemaphoreGiveFromISR(sem_hdl, NULL) : xSemaphoreGive(sem_hdl);
}
static inline bool osal_semaphore_post(osal_semaphore_t sem_hdl)
{
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)

11
src/osal/osal_mynewt.h
View File

@ -129,10 +129,10 @@ static inline void osal_queue_receive (osal_queue_t const queue_hdl, void *p_dat
*p_error = TUSB_ERROR_NONE; *p_error = TUSB_ERROR_NONE;
} }
#define osal_queue_send_isr osal_queue_send static inline bool osal_queue_send(osal_queue_t const queue_hdl, void const * data, bool in_isr)
static inline bool osal_queue_send(osal_queue_t const queue_hdl, void const * data)
{ {
(void) in_isr;
// get a block from mem pool for data // get a block from mem pool for data
void* ptr = os_memblock_get(&queue_hdl->mpool); void* ptr = os_memblock_get(&queue_hdl->mpool);
if (!ptr) return false; if (!ptr) return false;
@ -169,10 +169,9 @@ static inline osal_semaphore_t osal_semaphore_create(osal_semaphore_def_t* semde
return (os_sem_init(semdef, 0) == OS_OK) ? (osal_semaphore_t) semdef : NULL; return (os_sem_init(semdef, 0) == OS_OK) ? (osal_semaphore_t) semdef : NULL;
} }
#define osal_semaphore_post_isr osal_semaphore_post static inline bool osal_semaphore_post(osal_semaphore_t sem_hdl, bool in_isr)
static inline bool osal_semaphore_post(osal_semaphore_t sem_hdl)
{ {
(void) in_isr;
return os_sem_release(sem_hdl) == OS_OK; return os_sem_release(sem_hdl) == OS_OK;
} }

10
src/osal/osal_none.h
View File

@ -133,13 +133,12 @@ static inline osal_queue_t osal_queue_create(osal_queue_def_t* qdef)
return (osal_queue_t) qdef; return (osal_queue_t) qdef;
} }
static inline bool osal_queue_send_isr(osal_queue_t const queue_hdl, void const * data) static inline bool osal_queue_send(osal_queue_t const queue_hdl, void const * data, bool in_isr)
{ {
(void) in_isr;
return tu_fifo_write( (tu_fifo_t*) queue_hdl, data); return tu_fifo_write( (tu_fifo_t*) queue_hdl, data);
} }
#define osal_queue_send osal_queue_send_isr
static inline void osal_queue_flush(osal_queue_t const queue_hdl) static inline void osal_queue_flush(osal_queue_t const queue_hdl)
{ {
queue_hdl->count = queue_hdl->rd_idx = queue_hdl->wr_idx = 0; queue_hdl->count = queue_hdl->rd_idx = queue_hdl->wr_idx = 0;
@ -182,10 +181,9 @@ static inline osal_semaphore_t osal_semaphore_create(osal_semaphore_def_t* semde
return semdef; return semdef;
} }
#define osal_semaphore_post_isr osal_semaphore_post static inline bool osal_semaphore_post(osal_semaphore_t sem_hdl, bool in_isr)
static inline bool osal_semaphore_post(osal_semaphore_t sem_hdl)
{ {
(void) in_isr;
if (sem_hdl->count < sem_hdl->max_count ) sem_hdl->count++; if (sem_hdl->count < sem_hdl->max_count ) sem_hdl->count++;
return true; return true;
} }