andy/tinyUSB
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #1286 from hathach/fix-fifo-mutex-when-full

Browse Source 
fix locked mutex when fifo is full
This commit is contained in:
Ha Thach
2022-01-19 10:45:33 +07:00
committed by GitHub
parent 983abfd6d8 161ba73c8b
commit 0b6b4f2441
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/common/tusb_fifo.c
View File

@@ -741,10 +741,14 @@ bool tu_fifo_write(tu_fifo_t* f, const void * data)
{ {
_ff_lock(f->mutex_wr); _ff_lock(f->mutex_wr);
uint16_t w = f->wr_idx; bool ret;
uint16_t const w = f->wr_idx;
if ( _tu_fifo_full(f, w, f->rd_idx) && !f->overwritable ) return false;
if ( _tu_fifo_full(f, w, f->rd_idx) && !f->overwritable )
{
ret = false;
}else
{
uint16_t wRel = get_relative_pointer(f, w); uint16_t wRel = get_relative_pointer(f, w);
// Write data // Write data
@@ -753,9 +757,12 @@ bool tu_fifo_write(tu_fifo_t* f, const void * data)
// Advance pointer // Advance pointer
f->wr_idx = advance_pointer(f, w, 1); f->wr_idx = advance_pointer(f, w, 1);
ret = true;
}
_ff_unlock(f->mutex_wr); _ff_unlock(f->mutex_wr);
return true; return ret;
} }
/******************************************************************************/ /******************************************************************************/