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

rename some fifo functions to be more consistent

Browse Source
This commit is contained in:
hathach
2013-01-16 22:37:10 +07:00
parent 095129887e
commit 53739ccd28
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tinyusb/common/fifo.c
View File

@@ -115,7 +115,7 @@ bool fifo_init(fifo_t* f, uint8_t* buffer, uint16_t size, bool overwritable, IRQ
/**************************************************************************/
bool fifo_read(fifo_t* f, uint8_t *data)
{
if (fifo_isEmpty(f))
if (fifo_is_empty(f))
return false;
mutex_lock(f);
@@ -143,7 +143,7 @@ bool fifo_read(fifo_t* f, uint8_t *data)
@returns The actual number of bytes read from the FIFO
*/
/**************************************************************************/
uint16_t fifo_readArray(fifo_t* f, uint8_t* rx, uint16_t maxlen)
uint16_t fifo_read_n(fifo_t* f, uint8_t* rx, uint16_t maxlen)
{
uint16_t len = 0;
@@ -175,7 +175,7 @@ uint16_t fifo_readArray(fifo_t* f, uint8_t* rx, uint16_t maxlen)
/**************************************************************************/
bool fifo_write(fifo_t* f, uint8_t data)
{
if ( fifo_isFull(f) && f->overwritable == false)
if ( fifo_is_full(f) && f->overwritable == false)
return false;
mutex_lock(f);
@@ -183,7 +183,7 @@ bool fifo_write(fifo_t* f, uint8_t data)
f->buf[f->wr_ptr] = data;
f->wr_ptr = (f->wr_ptr + 1) % f->size;
if (fifo_isFull(f))
if (fifo_is_full(f))
{
f->rd_ptr = f->wr_ptr; // keep the full state (rd == wr && len = size)
}else

8
tinyusb/common/fifo.h
View File

@@ -72,20 +72,20 @@ typedef struct _fifo_t
bool fifo_init(fifo_t* f, uint8_t* buffer, uint16_t size, bool overwritable, IRQn_Type irq);
bool fifo_write(fifo_t* f, uint8_t data);
bool fifo_read(fifo_t* f, uint8_t *data);
uint16_t fifo_readArray(fifo_t* f, uint8_t * rx, uint16_t maxlen);
uint16_t fifo_read_n(fifo_t* f, uint8_t * rx, uint16_t maxlen);
void fifo_clear(fifo_t *f);
static inline bool fifo_isEmpty(fifo_t* f)
static inline bool fifo_is_empty(fifo_t* f)
{
return (f->len == 0);
}
static inline bool fifo_isFull(fifo_t* f)
static inline bool fifo_is_full(fifo_t* f)
{
return (f->len == f->size);
}
static inline uint16_t fifo_getLength(fifo_t* f)
static inline uint16_t fifo_get_length(fifo_t* f)
{
return f->len;
}