Revert "drop itfnum in signature of Adafruit_USBD_Interface::getInterfaceDescriptor()"

This reverts commit 0df71c0.

Author: hathach

examples/Vendor/i2c_tiny_usb_adapter/Adafruit_USBD_I2C.cpp

@@ -64,7 +64,7 @@ Adafruit_USBD_I2C::Adafruit_USBD_I2C(TwoWire* wire) {
   setStringDescriptor("I2C Interface");
 }
 
-uint16_t Adafruit_USBD_I2C::getInterfaceDescriptor(uint8_t* buf, uint16_t bufsize) {
+uint16_t Adafruit_USBD_I2C::getInterfaceDescriptor(uint8_t itfnum_deprecated, uint8_t* buf, uint16_t bufsize) {
   uint8_t itfnum = 0;
   uint8_t ep_in = 0;
   uint8_t ep_out = 0;

examples/Vendor/i2c_tiny_usb_adapter/Adafruit_USBD_I2C.h

@@ -93,7 +93,7 @@ class Adafruit_USBD_I2C : public Adafruit_USBD_Interface {
   bool handleControlTransfer(uint8_t rhport, uint8_t stage, tusb_control_request_t const* request);
 
   // from Adafruit_USBD_Interface
-  virtual uint16_t getInterfaceDescriptor(uint8_t* buf, uint16_t bufsize);
+  virtual uint16_t getInterfaceDescriptor(uint8_t itfnum, uint8_t* buf, uint16_t bufsize);
 
 private:
   TwoWire* _wire;

src/arduino/Adafruit_USBD_CDC.cpp

@@ -46,7 +46,8 @@ Adafruit_USBD_CDC::Adafruit_USBD_CDC(void) { _instance = INVALID_INSTANCE; }
 
 #if CFG_TUD_ENABLED
 
-uint16_t Adafruit_USBD_CDC::getInterfaceDescriptor(uint8_t *buf,
+uint16_t Adafruit_USBD_CDC::getInterfaceDescriptor(uint8_t itfnum_deprecated,
+                                                   uint8_t *buf,
                                                    uint16_t bufsize) {
   // CDC is mostly always existed for DFU
   uint8_t itfnum = 0;

src/arduino/Adafruit_USBD_CDC.h

@@ -80,7 +80,8 @@ class Adafruit_USBD_CDC : public Stream, public Adafruit_USBD_Interface {
   operator bool();
 
   // from Adafruit_USBD_Interface
-  virtual uint16_t getInterfaceDescriptor(uint8_t *buf, uint16_t bufsize);
+  virtual uint16_t getInterfaceDescriptor(uint8_t itfnum_deprecated,
+                                          uint8_t *buf, uint16_t bufsize);
 
 private:
   enum { INVALID_INSTANCE = 0xffu };

src/arduino/Adafruit_USBD_Device.cpp

@@ -233,8 +233,8 @@ void Adafruit_USBD_Device::clearConfiguration(void) {
 // - Endpoint number is updated to be unique
 bool Adafruit_USBD_Device::addInterface(Adafruit_USBD_Interface &itf) {
   uint8_t *desc = _desc_cfg + _desc_cfg_len;
-  uint16_t const len =
-      itf.getInterfaceDescriptor(desc, _desc_cfg_maxlen - _desc_cfg_len);
+  uint16_t const len = itf.getInterfaceDescriptor(
+      _itf_count, desc, _desc_cfg_maxlen - _desc_cfg_len);
 
   if (!len) {
     return false;

src/arduino/Adafruit_USBD_Interface.h

@@ -37,10 +37,11 @@ class Adafruit_USBD_Interface {
 
   // Get Interface Descriptor
   // Fill the descriptor (if buf is not NULL) and return its length
-  virtual uint16_t getInterfaceDescriptor(uint8_t *buf, uint16_t bufsize) = 0;
+  virtual uint16_t getInterfaceDescriptor(uint8_t itfnum, uint8_t *buf,
+                                          uint16_t bufsize) = 0;
   // Get Interface Descriptor Length
   uint16_t getInterfaceDescriptorLen() {
-    return getInterfaceDescriptor(NULL, 0);
+    return getInterfaceDescriptor(0, NULL, 0);
   }
 
   void setStringDescriptor(const char *str);

src/arduino/hid/Adafruit_USBD_HID.cpp

@@ -158,7 +158,8 @@ uint16_t Adafruit_USBD_HID::makeItfDesc(uint8_t itfnum, uint8_t *buf,
   return len;
 }
 
-uint16_t Adafruit_USBD_HID::getInterfaceDescriptor(uint8_t *buf,
+uint16_t Adafruit_USBD_HID::getInterfaceDescriptor(uint8_t itfnum_deprecated,
+                                                   uint8_t *buf,
                                                    uint16_t bufsize) {
   uint8_t itfnum = 0;
   uint8_t ep_in = 0;

src/arduino/hid/Adafruit_USBD_HID.h

@@ -80,7 +80,8 @@ class Adafruit_USBD_HID : public Adafruit_USBD_Interface {
   bool mouseButtonRelease(uint8_t report_id);
 
   // from Adafruit_USBD_Interface
-  virtual uint16_t getInterfaceDescriptor(uint8_t *buf, uint16_t bufsize);
+  virtual uint16_t getInterfaceDescriptor(uint8_t itfnum, uint8_t *buf,
+                                          uint16_t bufsize);
 
   // internal use only
   uint16_t makeItfDesc(uint8_t itfnum, uint8_t *buf, uint16_t bufsize,

src/arduino/midi/Adafruit_USBD_MIDI.cpp

@@ -153,7 +153,8 @@ uint16_t Adafruit_USBD_MIDI::makeItfDesc(uint8_t itfnum, uint8_t *buf,
   return desc_len;
 }
 
-uint16_t Adafruit_USBD_MIDI::getInterfaceDescriptor(uint8_t *buf,
+uint16_t Adafruit_USBD_MIDI::getInterfaceDescriptor(uint8_t itfnum_deprecated,
+                                                    uint8_t *buf,
                                                     uint16_t bufsize) {
   uint8_t itfnum = 0;
   uint8_t ep_in = 0;

src/arduino/midi/Adafruit_USBD_MIDI.h

@@ -60,7 +60,8 @@ class Adafruit_USBD_MIDI : public Stream, public Adafruit_USBD_Interface {
   bool readPacket(uint8_t packet[4]);
 
   // from Adafruit_USBD_Interface
-  virtual uint16_t getInterfaceDescriptor(uint8_t *buf, uint16_t bufsize);
+  virtual uint16_t getInterfaceDescriptor(uint8_t itfnum, uint8_t *buf,
+                                          uint16_t bufsize);
 
   // internal use only
   uint16_t makeItfDesc(uint8_t itfnum, uint8_t *buf, uint16_t bufsize,