Merge branch 'master' into develop

Author: hathach

cores/nRF5/Adafruit_TinyUSB_Core/Adafruit_USBD_CDC.cpp

@@ -96,7 +96,7 @@ int Adafruit_USBD_CDC::peek(void)
 
 int Adafruit_USBD_CDC::read(void)
 {
-  return (int) tud_cdc_read_char();
+  return tud_cdc_read_char();
 }
 
 void Adafruit_USBD_CDC::flush(void)
@@ -125,6 +125,11 @@ size_t Adafruit_USBD_CDC::write(const uint8_t *buffer, size_t size)
   return size - remain;
 }
 
+size_t Adafruit_USBD_CDC::availableForWrite(void)
+{
+  return tud_cdc_write_available();
+}
+
 extern "C"
 {
 

cores/nRF5/Adafruit_TinyUSB_Core/Adafruit_USBD_CDC.h

@@ -50,6 +50,7 @@ class Adafruit_USBD_CDC : public Stream, Adafruit_USBD_Interface
 	size_t write(const char *buffer, size_t size) {
 	  return write((const uint8_t *)buffer, size);
 	}
+        size_t availableForWrite(void);
 	operator bool();
 };
 

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

@@ -121,9 +121,9 @@ uint32_t tud_cdc_n_available(uint8_t itf)
   return tu_fifo_count(&_cdcd_itf[itf].rx_ff);
 }
 
-signed char tud_cdc_n_read_char(uint8_t itf)
+int32_t tud_cdc_n_read_char(uint8_t itf)
 {
-  signed char ch;
+  unsigned char ch;
   return tud_cdc_n_read(itf, &ch, 1) ? ch : (-1);
 }
 
@@ -134,9 +134,9 @@ uint32_t tud_cdc_n_read(uint8_t itf, void* buffer, uint32_t bufsize)
   return num_read;
 }
 
-signed char tud_cdc_n_peek(uint8_t itf, int pos)
+int32_t tud_cdc_n_peek(uint8_t itf, int pos)
 {
-  signed char ch;
+  unsigned char ch;
   return tu_fifo_peek_at(&_cdcd_itf[itf].rx_ff, pos, &ch) ? ch : (-1);
 }
 
@@ -190,6 +190,11 @@ bool tud_cdc_n_write_flush (uint8_t itf)
   return true;
 }
 
+uint32_t tud_cdc_n_write_available (uint8_t itf)
+{
+  return tu_fifo_remaining(&_cdcd_itf[itf].tx_ff);
+}
+
 
 //--------------------------------------------------------------------+
 // USBD Driver API

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

@@ -57,15 +57,16 @@ void        tud_cdc_n_get_line_coding (uint8_t itf, cdc_line_coding_t* coding);
 void        tud_cdc_n_set_wanted_char (uint8_t itf, char wanted);
 
 uint32_t    tud_cdc_n_available       (uint8_t itf);
-signed char tud_cdc_n_read_char       (uint8_t itf);
+int32_t     tud_cdc_n_read_char       (uint8_t itf);
 uint32_t    tud_cdc_n_read            (uint8_t itf, void* buffer, uint32_t bufsize);
 void        tud_cdc_n_read_flush      (uint8_t itf);
-signed char tud_cdc_n_peek            (uint8_t itf, int pos);
+int32_t     tud_cdc_n_peek            (uint8_t itf, int pos);
 
 uint32_t    tud_cdc_n_write_char      (uint8_t itf, char ch);
 uint32_t    tud_cdc_n_write           (uint8_t itf, void const* buffer, uint32_t bufsize);
 uint32_t    tud_cdc_n_write_str       (uint8_t itf, char const* str);
 bool        tud_cdc_n_write_flush     (uint8_t itf);
+uint32_t    tud_cdc_n_write_available (uint8_t itf);
 
 //--------------------------------------------------------------------+
 // Application API (Interface0)
@@ -76,15 +77,16 @@ static inline void        tud_cdc_get_line_coding (cdc_line_coding_t* coding);
 static inline void        tud_cdc_set_wanted_char (char wanted);
 
 static inline uint32_t    tud_cdc_available       (void);
-static inline signed char tud_cdc_read_char       (void);
+static inline int32_t     tud_cdc_read_char       (void);
 static inline uint32_t    tud_cdc_read            (void* buffer, uint32_t bufsize);
 static inline void        tud_cdc_read_flush      (void);
-static inline signed char tud_cdc_peek            (int pos);
+static inline int32_t     tud_cdc_peek            (int pos);
 
 static inline uint32_t    tud_cdc_write_char      (char ch);
 static inline uint32_t    tud_cdc_write           (void const* buffer, uint32_t bufsize);
 static inline uint32_t    tud_cdc_write_str       (char const* str);
 static inline bool        tud_cdc_write_flush     (void);
+static inline uint32_t    tud_cdc_write_available (void);
 
 //--------------------------------------------------------------------+
 // Application Callback API (weak is optional)
@@ -130,7 +132,7 @@ static inline uint32_t tud_cdc_available (void)
   return tud_cdc_n_available(0);
 }
 
-static inline signed char tud_cdc_read_char (void)
+static inline int32_t tud_cdc_read_char (void)
 {
   return tud_cdc_n_read_char(0);
 }
@@ -145,7 +147,7 @@ static inline void tud_cdc_read_flush (void)
   tud_cdc_n_read_flush(0);
 }
 
-static inline signed char tud_cdc_peek (int pos)
+static inline int32_t tud_cdc_peek (int pos)
 {
   return tud_cdc_n_peek(0, pos);
 }
@@ -170,6 +172,11 @@ static inline bool tud_cdc_write_flush (void)
   return tud_cdc_n_write_flush(0);
 }
 
+static inline uint32_t tud_cdc_write_available(void)
+{
+  return tud_cdc_n_write_available(0);
+}
+
 /** @} */
 /** @} */