rename getInterfaceDescriptor()

Author: hathach

src/Adafruit_USBD_CDC.h

@@ -36,7 +36,7 @@ class Adafruit_USBD_CDC : public Stream, public Adafruit_USBD_Interface
 	Adafruit_USBD_CDC(void);
 
 	// fron Adafruit_USBD_Interface
-	virtual uint16_t getDescriptor(uint8_t itfnum, uint8_t* buf, uint16_t bufsize);
+	virtual uint16_t getInterfaceDescriptor(uint8_t itfnum, uint8_t* buf, uint16_t bufsize);
 
 	void setPins(uint8_t pin_rx, uint8_t pin_tx) { (void) pin_rx; (void) pin_tx; }
 	void begin(uint32_t baud);

src/Adafruit_USBD_Interface.h

@@ -35,7 +35,7 @@ class Adafruit_USBD_Interface
   public:
     Adafruit_USBD_Interface(void) { _desc_str = NULL; }
 
-    virtual uint16_t getDescriptor(uint8_t itfnum, uint8_t* buf, uint16_t bufsize) = 0;
+    virtual uint16_t getInterfaceDescriptor(uint8_t itfnum, uint8_t* buf, uint16_t bufsize) = 0;
     void setStringDescriptor(const char* str) { _desc_str = str; }
     const char* getStringDescriptor(void) { return _desc_str; }
 };

src/arduino/Adafruit_USBD_CDC.cpp

@@ -44,7 +44,7 @@ Adafruit_USBD_CDC::Adafruit_USBD_CDC(void)
   _itf = 0;
 }
 
-uint16_t Adafruit_USBD_CDC::getDescriptor(uint8_t itfnum, uint8_t* buf, uint16_t bufsize)
+uint16_t Adafruit_USBD_CDC::getInterfaceDescriptor(uint8_t itfnum, uint8_t* buf, uint16_t bufsize)
 {
   // CDC is mostly always existed for DFU
   // usb core will automatically update endpoint number

src/arduino/Adafruit_USBD_Device.cpp

@@ -116,7 +116,7 @@ void Adafruit_USBD_Device::clearConfiguration(void)
 bool Adafruit_USBD_Device::addInterface(Adafruit_USBD_Interface& itf)
 {
   uint8_t* desc = _desc_cfg+_desc_cfg_len;
-  uint16_t const len = itf.getDescriptor(_itf_count, desc, _desc_cfg_maxlen-_desc_cfg_len);
+  uint16_t const len = itf.getInterfaceDescriptor(_itf_count, desc, _desc_cfg_maxlen-_desc_cfg_len);
   uint8_t* desc_end = desc+len;
 
   const char* desc_str = itf.getStringDescriptor();

src/arduino/Adafruit_USBD_HID.cpp

@@ -72,7 +72,7 @@ void Adafruit_USBD_HID::setReportCallback(get_report_callback_t get_report,
   _set_report_cb = set_report;
 }
 
-uint16_t Adafruit_USBD_HID::getDescriptor(uint8_t itfnum, uint8_t *buf,
+uint16_t Adafruit_USBD_HID::getInterfaceDescriptor(uint8_t itfnum, uint8_t *buf,
                                           uint16_t bufsize) {
   if (!_desc_report_len)
     return 0;

src/arduino/Adafruit_USBD_HID.h

@@ -70,8 +70,7 @@ class Adafruit_USBD_HID : public Adafruit_USBD_Interface {
   bool mouseButtonRelease(uint8_t report_id);
 
   // from Adafruit_USBD_Interface
-  virtual uint16_t getDescriptor(uint8_t itfnum, uint8_t *buf,
-                                 uint16_t bufsize);
+  virtual uint16_t getInterfaceDescriptor(uint8_t itfnum, uint8_t *buf, uint16_t bufsize);
 
 private:
   uint8_t _interval_ms;

src/arduino/Adafruit_USBD_MIDI.cpp

@@ -46,7 +46,7 @@ bool Adafruit_USBD_MIDI::begin(void) {
   return true;
 }
 
-uint16_t Adafruit_USBD_MIDI::getDescriptor(uint8_t itfnum, uint8_t *buf,
+uint16_t Adafruit_USBD_MIDI::getInterfaceDescriptor(uint8_t itfnum, uint8_t *buf,
                                            uint16_t bufsize) {
   uint16_t len = 0;
 

src/arduino/Adafruit_USBD_MIDI.h

@@ -54,8 +54,7 @@ class Adafruit_USBD_MIDI : public Stream, public Adafruit_USBD_Interface {
   bool readPacket(uint8_t packet[4]);
 
   // from Adafruit_USBD_Interface
-  virtual uint16_t getDescriptor(uint8_t itfnum, uint8_t *buf,
-                                 uint16_t bufsize);
+  virtual uint16_t getInterfaceDescriptor(uint8_t itfnum, uint8_t *buf, uint16_t bufsize);
 
   void setCables(uint8_t n_cables);
 

src/arduino/Adafruit_USBD_MSC.cpp

@@ -37,7 +37,7 @@ Adafruit_USBD_MSC::Adafruit_USBD_MSC(void) {
   memset(_lun, 0, sizeof(_lun));
 }
 
-uint16_t Adafruit_USBD_MSC::getDescriptor(uint8_t itfnum, uint8_t *buf,
+uint16_t Adafruit_USBD_MSC::getInterfaceDescriptor(uint8_t itfnum, uint8_t *buf,
                                           uint16_t bufsize) {
   // usb core will automatically update endpoint number
   uint8_t desc[] = {TUD_MSC_DESCRIPTOR(itfnum, 0, EPOUT, EPIN, EPSIZE)};

src/arduino/Adafruit_USBD_MSC.h

@@ -72,8 +72,7 @@ class Adafruit_USBD_MSC : public Adafruit_USBD_Interface {
   void setReadyCallback(ready_callback_t cb) { setReadyCallback(0, cb); }
 
   // from Adafruit_USBD_Interface
-  virtual uint16_t getDescriptor(uint8_t itfnum, uint8_t *buf,
-                                 uint16_t bufsize);
+  virtual uint16_t getInterfaceDescriptor(uint8_t itfnum, uint8_t *buf, uint16_t bufsize);
 
 private:
   enum { MAX_LUN = 2 };

src/arduino/Adafruit_USBD_WebUSB.cpp

@@ -146,7 +146,7 @@ void Adafruit_USBD_WebUSB::setLineStateCallback(linestate_callback_t fp) {
   _linestate_cb = fp;
 }
 
-uint16_t Adafruit_USBD_WebUSB::getDescriptor(uint8_t itfnum, uint8_t *buf,
+uint16_t Adafruit_USBD_WebUSB::getInterfaceDescriptor(uint8_t itfnum, uint8_t *buf,
                                              uint16_t bufsize) {
   // usb core will automatically update endpoint number
   uint8_t desc[] = {TUD_VENDOR_DESCRIPTOR(itfnum, 0, EPOUT, EPIN, 64)};
@@ -288,8 +288,7 @@ bool tud_vendor_control_xfer_cb(uint8_t rhport, uint8_t stage, tusb_control_requ
 }
 
 // Invoked when DATA Stage of VENDOR's request is complete
-bool tud_vendor_control_complete_cb(uint8_t rhport,
-                                    tusb_control_request_t const *request) {
+bool tud_vendor_control_complete_cb(uint8_t rhport, tusb_control_request_t const *request) {
   (void)rhport;
   (void)request;
 

src/arduino/Adafruit_USBD_WebUSB.h

@@ -62,8 +62,7 @@ class Adafruit_USBD_WebUSB : public Stream, public Adafruit_USBD_Interface {
   operator bool();
 
   // from Adafruit_USBD_Interface
-  virtual uint16_t getDescriptor(uint8_t itfnum, uint8_t *buf,
-                                 uint16_t bufsize);
+  virtual uint16_t getInterfaceDescriptor(uint8_t itfnum, uint8_t *buf, uint16_t bufsize);
 
 private:
   bool _connected;