summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhathach <[email protected]>2023-01-06 10:56:19 +0700
committerhathach <[email protected]>2023-01-06 10:56:19 +0700
commit9c73c1a532649630de5e55400632bcca90ebea06 (patch)
tree14d2567f176602b257d2e636b85017ceaae389a2
parentb42d298b8162de232b985879732e44d3c86c889f (diff)
minor clean up
-rw-r--r--src/common/tusb_fifo.c4
-rw-r--r--src/common/tusb_fifo.h8
2 files changed, 5 insertions, 7 deletions
diff --git a/src/common/tusb_fifo.c b/src/common/tusb_fifo.c
index 6862a6f43..d3875a7d4 100644
--- a/src/common/tusb_fifo.c
+++ b/src/common/tusb_fifo.c
@@ -39,12 +39,12 @@
// implement mutex lock and unlock
#if CFG_FIFO_MUTEX
-static inline void _ff_lock(tu_fifo_mutex_t mutex)
+static inline void _ff_lock(osal_mutex_t mutex)
{
if (mutex) osal_mutex_lock(mutex, OSAL_TIMEOUT_WAIT_FOREVER);
}
-static inline void _ff_unlock(tu_fifo_mutex_t mutex)
+static inline void _ff_unlock(osal_mutex_t mutex)
{
if (mutex) osal_mutex_unlock(mutex);
}
diff --git a/src/common/tusb_fifo.h b/src/common/tusb_fifo.h
index f1810e39c..f72ff295b 100644
--- a/src/common/tusb_fifo.h
+++ b/src/common/tusb_fifo.h
@@ -44,8 +44,6 @@ extern "C" {
#include "common/tusb_common.h"
#include "osal/osal.h"
-#define tu_fifo_mutex_t osal_mutex_t
-
// mutex is only needed for RTOS
// for OS None, we don't get preempted
#define CFG_FIFO_MUTEX OSAL_MUTEX_REQUIRED
@@ -121,8 +119,8 @@ typedef struct
volatile uint16_t rd_idx ; ///< read index
#if OSAL_MUTEX_REQUIRED
- tu_fifo_mutex_t mutex_wr;
- tu_fifo_mutex_t mutex_rd;
+ osal_mutex_t mutex_wr;
+ osal_mutex_t mutex_rd;
#endif
} tu_fifo_t;
@@ -155,7 +153,7 @@ bool tu_fifo_config(tu_fifo_t *f, void* buffer, uint16_t depth, uint16_t item_si
#if OSAL_MUTEX_REQUIRED
TU_ATTR_ALWAYS_INLINE static inline
-void tu_fifo_config_mutex(tu_fifo_t *f, tu_fifo_mutex_t wr_mutex, tu_fifo_mutex_t rd_mutex)
+void tu_fifo_config_mutex(tu_fifo_t *f, osal_mutex_t wr_mutex, osal_mutex_t rd_mutex)
{
f->mutex_wr = wr_mutex;
f->mutex_rd = rd_mutex;