Skip to content

Commit c260dad

Browse files
committed
update tinyusb header
1 parent 839336a commit c260dad

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

cores/nRF5/TinyUSB/Adafruit_USBD_CDC.h

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ class Adafruit_USBD_CDC : public Stream, public Adafruit_USBD_Interface
3636
Adafruit_USBD_CDC(void);
3737

3838
// fron Adafruit_USBD_Interface
39-
virtual uint16_t getDescriptor(uint8_t itfnum, uint8_t* buf, uint16_t bufsize);
39+
virtual uint16_t getInterfaceDescriptor(uint8_t itfnum, uint8_t* buf, uint16_t bufsize);
4040

4141
void setPins(uint8_t pin_rx, uint8_t pin_tx) { (void) pin_rx; (void) pin_tx; }
42-
void begin(uint32_t baud_count);
42+
void begin(uint32_t baud);
4343
void begin(uint32_t baud, uint8_t config);
4444
void end(void);
4545

@@ -65,6 +65,10 @@ class Adafruit_USBD_CDC : public Stream, public Adafruit_USBD_Interface
6565
virtual int availableForWrite(void);
6666
using Print::write; // pull in write(str) from Print
6767
operator bool();
68+
69+
private:
70+
bool _begun;
71+
uint8_t _itf;
6872
};
6973

7074
extern Adafruit_USBD_CDC Serial;

cores/nRF5/TinyUSB/Adafruit_USBD_Interface.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,10 @@ class Adafruit_USBD_Interface
3535
public:
3636
Adafruit_USBD_Interface(void) { _desc_str = NULL; }
3737

38-
virtual uint16_t getDescriptor(uint8_t itfnum, uint8_t* buf, uint16_t bufsize) = 0;
38+
// Get Interface Descriptor
39+
// Device fill descriptor and return its length
40+
virtual uint16_t getInterfaceDescriptor(uint8_t itfnum, uint8_t* buf, uint16_t bufsize) = 0;
41+
3942
void setStringDescriptor(const char* str) { _desc_str = str; }
4043
const char* getStringDescriptor(void) { return _desc_str; }
4144
};

0 commit comments

Comments
 (0)