add itfnum to getDescriptor()

Author: hathach

src/Adafruit_USBD_HID.cpp

@@ -74,14 +74,14 @@ void Adafruit_USBD_HID::setReportCallback(get_report_callback_t get_report, set_
   _set_report_cb = set_report;
 }
 
-uint16_t Adafruit_USBD_HID::getDescriptor(uint8_t* buf, uint16_t bufsize)
+uint16_t Adafruit_USBD_HID::getDescriptor(uint8_t itfnum, uint8_t* buf, uint16_t bufsize)
 {
   if ( !_desc_report_len ) return 0;
 
   if ( _out_endpoint )
   {
-    // usb core will automatically update interface number and endpoint number
-    uint8_t desc[] = { TUD_HID_INOUT_DESCRIPTOR(0, 0, _protocol, _desc_report_len, EPIN, EPOUT, CFG_TUD_HID_BUFSIZE, _interval_ms) };
+    // usb core will automatically update endpoint number
+    uint8_t desc[] = { TUD_HID_INOUT_DESCRIPTOR(itfnum, 0, _protocol, _desc_report_len, EPIN, EPOUT, CFG_TUD_HID_BUFSIZE, _interval_ms) };
     uint16_t const len = sizeof(desc);
 
     if ( bufsize < len ) return 0;
@@ -90,8 +90,8 @@ uint16_t Adafruit_USBD_HID::getDescriptor(uint8_t* buf, uint16_t bufsize)
     return len;
   }else
   {
-    // usb core will automatically update interface number and endpoint number
-    uint8_t desc[] = { TUD_HID_DESCRIPTOR(0, 0, _protocol, _desc_report_len, EPIN, CFG_TUD_HID_BUFSIZE, _interval_ms) };
+    // usb core will automatically update endpoint number
+    uint8_t desc[] = { TUD_HID_DESCRIPTOR(itfnum, 0, _protocol, _desc_report_len, EPIN, CFG_TUD_HID_BUFSIZE, _interval_ms) };
     uint16_t const len = sizeof(desc);
 
     if ( bufsize < len ) return 0;

src/Adafruit_USBD_HID.h

@@ -59,7 +59,7 @@ class Adafruit_USBD_HID : Adafruit_USBD_Interface
     static inline bool mouseButtonRelease(uint8_t report_id);
 
     // from Adafruit_USBD_Interface
-    virtual uint16_t getDescriptor(uint8_t* buf, uint16_t bufsize);
+    virtual uint16_t getDescriptor(uint8_t itfnum, uint8_t* buf, uint16_t bufsize);
 
   private:
     uint8_t _interval_ms;

src/Adafruit_USBD_MIDI.cpp

@@ -45,10 +45,10 @@ bool Adafruit_USBD_MIDI::begin(void)
   return true;
 }
 
-uint16_t Adafruit_USBD_MIDI::getDescriptor(uint8_t* buf, uint16_t bufsize)
+uint16_t Adafruit_USBD_MIDI::getDescriptor(uint8_t itfnum, uint8_t* buf, uint16_t bufsize)
 {
-  // usb core will automatically update interface number and endpoint number
-  uint8_t desc[] = { TUD_MIDI_DESCRIPTOR(0, 0, EPOUT, EPIN, EPSIZE) };
+  // usb core will automatically update endpoint number
+  uint8_t desc[] = { TUD_MIDI_DESCRIPTOR(itfnum, 0, EPOUT, EPIN, EPSIZE) };
   uint16_t const len = sizeof(desc);
 
   if ( bufsize < len ) return 0;

src/Adafruit_USBD_MIDI.h

@@ -45,7 +45,7 @@ class Adafruit_USBD_MIDI : public Stream, Adafruit_USBD_Interface
     virtual void   flush      ( void );
 
     // fron Adafruit_USBD_Interface
-    virtual uint16_t getDescriptor(uint8_t* buf, uint16_t bufsize);
+    virtual uint16_t getDescriptor(uint8_t itfnum, uint8_t* buf, uint16_t bufsize);
 };
 
 #endif /* ADAFRUIT_USBD_MIDI_H_ */

src/Adafruit_USBD_MSC.cpp

@@ -36,10 +36,10 @@ Adafruit_USBD_MSC::Adafruit_USBD_MSC(void)
   memset(_lun, 0, sizeof(_lun));
 }
 
-uint16_t Adafruit_USBD_MSC::getDescriptor(uint8_t* buf, uint16_t bufsize)
+uint16_t Adafruit_USBD_MSC::getDescriptor(uint8_t itfnum, uint8_t* buf, uint16_t bufsize)
 {
-  // usb core will automatically update interface number and endpoint number
-  uint8_t desc[] = { TUD_MSC_DESCRIPTOR(0, 0, EPOUT, EPIN, EPSIZE) };
+  // usb core will automatically update endpoint number
+  uint8_t desc[] = { TUD_MSC_DESCRIPTOR(itfnum, 0, EPOUT, EPIN, EPSIZE) };
   uint16_t const len = sizeof(desc);
 
   if ( bufsize < len ) return 0;

src/Adafruit_USBD_MSC.h

@@ -76,7 +76,7 @@ class Adafruit_USBD_MSC : Adafruit_USBD_Interface
     }
 
     // from Adafruit_USBD_Interface
-    virtual uint16_t getDescriptor(uint8_t* buf, uint16_t bufsize);
+    virtual uint16_t getDescriptor(uint8_t itfnum, uint8_t* buf, uint16_t bufsize);
 
   private:
     enum { MAX_LUN = 2 };