Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow the use of non-static allocation for FreeRTOS mutexes & queues #1767

Merged
merged 8 commits into from Dec 5, 2022
Merged

Allow the use of non-static allocation for FreeRTOS mutexes & queues #1767

Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d588167
Modify FreeRTOS integration to allow non-static allocation.
pete-pjb Nov 30, 2022
0ddd559
Merge branch 'hathach:master' into master
pete-pjb Nov 30, 2022
25abb10
Fix white space issue.
pete-pjb Nov 30, 2022
ae588d7
Alter tuh_task_ext() function so no need to return when using FreeRTOS
Dec 1, 2022
c31b95c
Added CFG_TUSB_MEM_SECTION define to struct _ctrl_xfer in usbh.c
pete-pjb Dec 1, 2022
3816869
Some reverts and changes after discussion.
pete-pjb Dec 2, 2022
52261ac
Back out another of my changes I am still investigating.
pete-pjb Dec 2, 2022
de5a67b
clean osal_freertos, update freertos examples to work with configSUPP…
hathach Dec 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
23 changes: 22 additions & 1 deletion src/osal/osal_freertos.h
View file
Open in desktop
Expand Up @@ -62,12 +62,20 @@ TU_ATTR_ALWAYS_INLINE static inline void osal_task_delay(uint32_t msec)
//--------------------------------------------------------------------+
// Semaphore API
//--------------------------------------------------------------------+
#if configSUPPORT_STATIC_ALLOCATION == 1
typedef StaticSemaphore_t osal_semaphore_def_t;
#else
typedef SemaphoreHandle_t osal_semaphore_def_t;
#endif
typedef SemaphoreHandle_t osal_semaphore_t;

TU_ATTR_ALWAYS_INLINE static inline osal_semaphore_t osal_semaphore_create(osal_semaphore_def_t* semdef)
{
#if configSUPPORT_STATIC_ALLOCATION == 1
return xSemaphoreCreateBinaryStatic(semdef);
#else
return xSemaphoreCreateBinary();
hathach marked this conversation as resolved.
Show resolved Hide resolved
#endif
}

TU_ATTR_ALWAYS_INLINE static inline bool osal_semaphore_post(osal_semaphore_t sem_hdl, bool in_isr)
Expand Down Expand Up @@ -105,12 +113,21 @@ TU_ATTR_ALWAYS_INLINE static inline void osal_semaphore_reset(osal_semaphore_t c
//--------------------------------------------------------------------+
// MUTEX API (priority inheritance)
//--------------------------------------------------------------------+
#if configSUPPORT_STATIC_ALLOCATION == 1
typedef StaticSemaphore_t osal_mutex_def_t;
#else
typedef SemaphoreHandle_t osal_mutex_def_t;
#endif
typedef SemaphoreHandle_t osal_mutex_t;

TU_ATTR_ALWAYS_INLINE static inline osal_mutex_t osal_mutex_create(osal_mutex_def_t* mdef)
{
#if configSUPPORT_STATIC_ALLOCATION == 1
return xSemaphoreCreateMutexStatic(mdef);
#else
return xSemaphoreCreateMutex();
#endif

}

TU_ATTR_ALWAYS_INLINE static inline bool osal_mutex_lock (osal_mutex_t mutex_hdl, uint32_t msec)
Expand Down Expand Up @@ -145,7 +162,11 @@ typedef QueueHandle_t osal_queue_t;

TU_ATTR_ALWAYS_INLINE 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);
#if configSUPPORT_STATIC_ALLOCATION == 1
return xQueueCreateStatic(qdef->depth, qdef->item_sz, (uint8_t*) qdef->buf, &qdef->sq);
hathach marked this conversation as resolved.
Show resolved Hide resolved
#else
return xQueueCreate(qdef->depth, qdef->item_sz);
#endif
}

TU_ATTR_ALWAYS_INLINE static inline bool osal_queue_receive(osal_queue_t qhdl, void* data, uint32_t msec)
Expand Down