kingkevin
/
espressif_tinyusb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add TU_FIFO_INIT() to help with tu_fifo declaration 

tu_fifo_clear() also reset max_pointer_idx and non_used_index_space
This commit is contained in:
hathach 2021-02-19 11:57:56 +07:00
parent be9f86ca9e
commit 2a04ee68b8
4 changed files with 25 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/tusb_fifo.c
View File

@ -598,6 +598,8 @@ bool tu_fifo_clear(tu_fifo_t *f)
{ {
tu_fifo_lock(f); tu_fifo_lock(f);
f->rd_idx = f->wr_idx = 0; f->rd_idx = f->wr_idx = 0;
f->max_pointer_idx = 2*f->depth-1;
f->non_used_index_space = UINT16_MAX - f->max_pointer_idx;
tu_fifo_unlock(f); tu_fifo_unlock(f);
return true; return true;

25
src/common/tusb_fifo.h
View File

@ -66,8 +66,8 @@ typedef struct
uint16_t item_size ; ///< size of each item uint16_t item_size ; ///< size of each item
bool overwritable ; bool overwritable ;
uint16_t non_used_index_space ; ///< required for non-power-of-two buffer length
uint16_t max_pointer_idx ; ///< maximum absolute pointer index uint16_t max_pointer_idx ; ///< maximum absolute pointer index
uint16_t non_used_index_space ; ///< required for non-power-of-two buffer length
volatile uint16_t wr_idx ; ///< write pointer volatile uint16_t wr_idx ; ///< write pointer
volatile uint16_t rd_idx ; ///< read pointer volatile uint16_t rd_idx ; ///< read pointer
@ -78,16 +78,19 @@ typedef struct
} tu_fifo_t; } tu_fifo_t;
#define TU_FIFO_DEF(_name, _depth, _type, _overwritable) \ #define TU_FIFO_INIT(_buffer, _depth, _type, _overwritable) \
uint8_t _name##_buf[_depth*sizeof(_type)]; \ { \
tu_fifo_t _name = { \ .buffer = _buffer, \
.buffer = _name##_buf, \ .depth = _depth, \
.depth = _depth, \ .item_size = sizeof(_type), \
.item_size = sizeof(_type), \ .overwritable = _overwritable, \
.overwritable = _overwritable, \ .max_pointer_idx = 2*(_depth)-1, \
.max_pointer_idx = 2*_depth-1, \ .non_used_index_space = UINT16_MAX - (2*(_depth)-1) \
.non_used_index_space = UINT16_MAX - (2*_depth-1), \ }
}
#define TU_FIFO_DEF(_name, _depth, _type, _overwritable) \
uint8_t _name##_buf[_depth*sizeof(_type)]; \
tu_fifo_t _name = TU_FIFO_INIT(_name##_buf, _depth, _type, _overwritable)
bool tu_fifo_set_overwritable(tu_fifo_t *f, bool overwritable); bool tu_fifo_set_overwritable(tu_fifo_t *f, bool overwritable);
bool tu_fifo_clear(tu_fifo_t *f); bool tu_fifo_clear(tu_fifo_t *f);

17
src/osal/osal_none.h
View File

@ -130,18 +130,11 @@ typedef struct
typedef osal_queue_def_t* osal_queue_t; typedef osal_queue_def_t* osal_queue_t;
// role device/host is used by OS NONE for mutex (disable usb isr) only // role device/host is used by OS NONE for mutex (disable usb isr) only
#define OSAL_QUEUE_DEF(_role, _name, _depth, _type) \ #define OSAL_QUEUE_DEF(_role, _name, _depth, _type) \
uint8_t _name##_buf[_depth*sizeof(_type)]; \ uint8_t _name##_buf[_depth*sizeof(_type)]; \
osal_queue_def_t _name = { \ osal_queue_def_t _name = { \
.role = _role, \ .role = _role, \
.ff = { \ .ff = TU_FIFO_INIT(_name##_buf, _depth, _type, false) \
.buffer = _name##_buf, \
.depth = _depth, \
.item_size = sizeof(_type), \
.overwritable = false, \
.max_pointer_idx = (2*(_depth))-1, \
.non_used_index_space = 0xFFFF-((2*(_depth))-1),\
}\
} }
// lock queue by disable USB interrupt // lock queue by disable USB interrupt

15
src/osal/osal_pico.h
View File

@ -115,17 +115,10 @@ typedef struct
typedef osal_queue_def_t* osal_queue_t; typedef osal_queue_def_t* osal_queue_t;
// role device/host is used by OS NONE for mutex (disable usb isr) only // role device/host is used by OS NONE for mutex (disable usb isr) only
#define OSAL_QUEUE_DEF(_role, _name, _depth, _type) \ #define OSAL_QUEUE_DEF(_role, _name, _depth, _type) \
uint8_t _name##_buf[_depth*sizeof(_type)]; \ uint8_t _name##_buf[_depth*sizeof(_type)]; \
osal_queue_def_t _name = { \ osal_queue_def_t _name = { \
.ff = { \ .ff = TU_FIFO_INIT(_name##_buf, _depth, _type, false) \
.buffer = _name##_buf, \
.depth = _depth, \
.item_size = sizeof(_type), \
.overwritable = false, \
.max_pointer_idx = 2*_depth-1, \
.non_used_index_space = UINT16_MAX - (2*_depth-1), \
}\
} }
// lock queue by disable USB interrupt // lock queue by disable USB interrupt