summaryrefslogtreecommitdiff
path: root/src/common/tusb_fifo.c
diff options
context:
space:
mode:
authorhathach <[email protected]>2018-08-23 20:09:28 +0700
committerhathach <[email protected]>2018-08-23 20:09:28 +0700
commitc5d2f661e76adbe2f047c2f3a405ed60262ecb9b (patch)
treef0a2f3a6a85773af9e87ad0b71724bf1b3099b86 /src/common/tusb_fifo.c
parentb350d8a0869c13d241ac5e7ae84ab77081bad114 (diff)
rename common func to avoid conflict
Diffstat (limited to 'src/common/tusb_fifo.c')
-rw-r--r--src/common/tusb_fifo.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/common/tusb_fifo.c b/src/common/tusb_fifo.c
index 09763bee0..e90264f8b 100644
--- a/src/common/tusb_fifo.c
+++ b/src/common/tusb_fifo.c
@@ -54,7 +54,7 @@
#endif
-static inline uint16_t min16_of(uint16_t x, uint16_t y)
+static inline uint16_t tu_min16(uint16_t x, uint16_t y)
{
return (x < y) ? x : y;
}
@@ -136,7 +136,7 @@ uint16_t tu_fifo_read_n (tu_fifo_t* f, void * p_buffer, uint16_t count)
if( tu_fifo_empty(f) ) return 0;
/* Limit up to fifo's count */
- count = min16_of(count, f->count);
+ count = tu_min16(count, f->count);
if( count == 0 ) return 0;
mutex_lock_if_needed(f);
@@ -145,7 +145,7 @@ uint16_t tu_fifo_read_n (tu_fifo_t* f, void * p_buffer, uint16_t count)
* case 1: ....RxxxxW.......
* case 2: xxxxxW....Rxxxxxx
*/
-// uint16_t index2upper = min16_of(count, f->count-f->rd_idx);
+// uint16_t index2upper = tu_min16(count, f->count-f->rd_idx);
uint8_t* p_buf = (uint8_t*) p_buffer;
uint16_t len = 0;