Skip to content

Commit 4eca9f8

Browse files
committed
Use tu_fifo_remaining instead of tu_fifo_count
rename low level CDC functions to tud_cdc_n_write_available and tud_cdc_write_available
1 parent d7de810 commit 4eca9f8

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

cores/nRF5/Adafruit_TinyUSB_Core/Adafruit_USBD_CDC.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ size_t Adafruit_USBD_CDC::write(const uint8_t *buffer, size_t size)
127127

128128
size_t Adafruit_USBD_CDC::availableForWrite(void)
129129
{
130-
return tud_cdc_availableForWrite();
130+
return tud_cdc_write_available();
131131
}
132132

133133
extern "C"

cores/nRF5/Adafruit_TinyUSB_Core/tinyusb/src/class/cdc/cdc_device.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,9 +190,9 @@ bool tud_cdc_n_write_flush (uint8_t itf)
190190
return true;
191191
}
192192

193-
uint32_t tud_cdc_n_availableForWrite (uint8_t itf)
193+
uint32_t tud_cdc_n_write_available (uint8_t itf)
194194
{
195-
return CFG_TUD_CDC_TX_BUFSIZE - tu_fifo_count(&_cdcd_itf[itf].tx_ff);
195+
return tu_fifo_remaining(&_cdcd_itf[itf].tx_ff);
196196
}
197197

198198

cores/nRF5/Adafruit_TinyUSB_Core/tinyusb/src/class/cdc/cdc_device.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ uint32_t tud_cdc_n_write_char (uint8_t itf, char ch);
6666
uint32_t tud_cdc_n_write (uint8_t itf, void const* buffer, uint32_t bufsize);
6767
uint32_t tud_cdc_n_write_str (uint8_t itf, char const* str);
6868
bool tud_cdc_n_write_flush (uint8_t itf);
69-
uint32_t tud_cdc_n_availableForWrite (uint8_t itf);
69+
uint32_t tud_cdc_n_write_available (uint8_t itf);
7070

7171
//--------------------------------------------------------------------+
7272
// Application API (Interface0)
@@ -86,7 +86,7 @@ static inline uint32_t tud_cdc_write_char (char ch);
8686
static inline uint32_t tud_cdc_write (void const* buffer, uint32_t bufsize);
8787
static inline uint32_t tud_cdc_write_str (char const* str);
8888
static inline bool tud_cdc_write_flush (void);
89-
static inline uint32_t tud_cdc_availableForWrite(void);
89+
static inline uint32_t tud_cdc_write_available (void);
9090

9191
//--------------------------------------------------------------------+
9292
// Application Callback API (weak is optional)
@@ -172,9 +172,9 @@ static inline bool tud_cdc_write_flush (void)
172172
return tud_cdc_n_write_flush(0);
173173
}
174174

175-
static inline uint32_t tud_cdc_availableForWrite(void)
175+
static inline uint32_t tud_cdc_write_available(void)
176176
{
177-
return tud_cdc_n_availableForWrite(0);
177+
return tud_cdc_n_write_available(0);
178178
}
179179

180180
/** @} */

0 commit comments

Comments
 (0)