Skip to content

Commit 9047e04

Browse files
hathachhathach
committed
Revert "drop itfnum in signature of Adafruit_USBD_Interface::getInterfaceDescriptor()"
This reverts commit 0df71c0.
1 parent 0df71c0 commit 9047e04

15 files changed

+30
-17
lines changed

‎examples/Vendor/i2c_tiny_usb_adapter/Adafruit_USBD_I2C.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ Adafruit_USBD_I2C::Adafruit_USBD_I2C(TwoWire* wire) {
6464
setStringDescriptor("I2C Interface");
6565
}
6666

67-
uint16_t Adafruit_USBD_I2C::getInterfaceDescriptor(uint8_t* buf, uint16_t bufsize) {
67+
uint16_t Adafruit_USBD_I2C::getInterfaceDescriptor(uint8_t itfnum_deprecated, uint8_t* buf, uint16_t bufsize) {
6868
uint8_t itfnum = 0;
6969
uint8_t ep_in = 0;
7070
uint8_t ep_out = 0;

‎examples/Vendor/i2c_tiny_usb_adapter/Adafruit_USBD_I2C.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ class Adafruit_USBD_I2C : public Adafruit_USBD_Interface {
9393
bool handleControlTransfer(uint8_t rhport, uint8_t stage, tusb_control_request_t const* request);
9494

9595
// from Adafruit_USBD_Interface
96-
virtual uint16_t getInterfaceDescriptor(uint8_t* buf, uint16_t bufsize);
96+
virtual uint16_t getInterfaceDescriptor(uint8_t itfnum, uint8_t* buf, uint16_t bufsize);
9797

9898
private:
9999
TwoWire* _wire;

‎src/arduino/Adafruit_USBD_CDC.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@ Adafruit_USBD_CDC::Adafruit_USBD_CDC(void) { _instance = INVALID_INSTANCE; }
4646

4747
#if CFG_TUD_ENABLED
4848

49-
uint16_t Adafruit_USBD_CDC::getInterfaceDescriptor(uint8_t *buf,
49+
uint16_t Adafruit_USBD_CDC::getInterfaceDescriptor(uint8_t itfnum_deprecated,
50+
uint8_t *buf,
5051
uint16_t bufsize) {
5152
// CDC is mostly always existed for DFU
5253
uint8_t itfnum = 0;

‎src/arduino/Adafruit_USBD_CDC.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,8 @@ class Adafruit_USBD_CDC : public Stream, public Adafruit_USBD_Interface {
8080
operator bool();
8181

8282
// from Adafruit_USBD_Interface
83-
virtual uint16_t getInterfaceDescriptor(uint8_t *buf, uint16_t bufsize);
83+
virtual uint16_t getInterfaceDescriptor(uint8_t itfnum_deprecated,
84+
uint8_t *buf, uint16_t bufsize);
8485

8586
private:
8687
enum { INVALID_INSTANCE = 0xffu };

‎src/arduino/Adafruit_USBD_Device.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,8 +233,8 @@ void Adafruit_USBD_Device::clearConfiguration(void) {
233233
// - Endpoint number is updated to be unique
234234
bool Adafruit_USBD_Device::addInterface(Adafruit_USBD_Interface &itf) {
235235
uint8_t *desc = _desc_cfg + _desc_cfg_len;
236-
uint16_t const len =
237-
itf.getInterfaceDescriptor(desc, _desc_cfg_maxlen - _desc_cfg_len);
236+
uint16_t const len = itf.getInterfaceDescriptor(
237+
_itf_count, desc, _desc_cfg_maxlen - _desc_cfg_len);
238238

239239
if (!len) {
240240
return false;

‎src/arduino/Adafruit_USBD_Interface.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,11 @@ class Adafruit_USBD_Interface {
3737

3838
// Get Interface Descriptor
3939
// Fill the descriptor (if buf is not NULL) and return its length
40-
virtual uint16_t getInterfaceDescriptor(uint8_t *buf, uint16_t bufsize) = 0;
40+
virtual uint16_t getInterfaceDescriptor(uint8_t itfnum, uint8_t *buf,
41+
uint16_t bufsize) = 0;
4142
// Get Interface Descriptor Length
4243
uint16_t getInterfaceDescriptorLen() {
43-
return getInterfaceDescriptor(NULL, 0);
44+
return getInterfaceDescriptor(0, NULL, 0);
4445
}
4546

4647
void setStringDescriptor(const char *str);

‎src/arduino/hid/Adafruit_USBD_HID.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,8 @@ uint16_t Adafruit_USBD_HID::makeItfDesc(uint8_t itfnum, uint8_t *buf,
158158
return len;
159159
}
160160

161-
uint16_t Adafruit_USBD_HID::getInterfaceDescriptor(uint8_t *buf,
161+
uint16_t Adafruit_USBD_HID::getInterfaceDescriptor(uint8_t itfnum_deprecated,
162+
uint8_t *buf,
162163
uint16_t bufsize) {
163164
uint8_t itfnum = 0;
164165
uint8_t ep_in = 0;

‎src/arduino/hid/Adafruit_USBD_HID.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,8 @@ class Adafruit_USBD_HID : public Adafruit_USBD_Interface {
8080
bool mouseButtonRelease(uint8_t report_id);
8181

8282
// from Adafruit_USBD_Interface
83-
virtual uint16_t getInterfaceDescriptor(uint8_t *buf, uint16_t bufsize);
83+
virtual uint16_t getInterfaceDescriptor(uint8_t itfnum, uint8_t *buf,
84+
uint16_t bufsize);
8485

8586
// internal use only
8687
uint16_t makeItfDesc(uint8_t itfnum, uint8_t *buf, uint16_t bufsize,

‎src/arduino/midi/Adafruit_USBD_MIDI.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,8 @@ uint16_t Adafruit_USBD_MIDI::makeItfDesc(uint8_t itfnum, uint8_t *buf,
153153
return desc_len;
154154
}
155155

156-
uint16_t Adafruit_USBD_MIDI::getInterfaceDescriptor(uint8_t *buf,
156+
uint16_t Adafruit_USBD_MIDI::getInterfaceDescriptor(uint8_t itfnum_deprecated,
157+
uint8_t *buf,
157158
uint16_t bufsize) {
158159
uint8_t itfnum = 0;
159160
uint8_t ep_in = 0;

‎src/arduino/midi/Adafruit_USBD_MIDI.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@ class Adafruit_USBD_MIDI : public Stream, public Adafruit_USBD_Interface {
6060
bool readPacket(uint8_t packet[4]);
6161

6262
// from Adafruit_USBD_Interface
63-
virtual uint16_t getInterfaceDescriptor(uint8_t *buf, uint16_t bufsize);
63+
virtual uint16_t getInterfaceDescriptor(uint8_t itfnum, uint8_t *buf,
64+
uint16_t bufsize);
6465

6566
// internal use only
6667
uint16_t makeItfDesc(uint8_t itfnum, uint8_t *buf, uint16_t bufsize,

‎src/arduino/msc/Adafruit_USBD_MSC.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,14 +76,16 @@ uint16_t Adafruit_USBD_MSC::makeItfDesc(uint8_t itfnum, uint8_t *buf,
7676
return len;
7777
}
7878

79-
uint16_t Adafruit_USBD_MSC::getInterfaceDescriptor(uint8_t *buf,
79+
uint16_t Adafruit_USBD_MSC::getInterfaceDescriptor(uint8_t itfnum_deprecated,
80+
uint8_t *buf,
8081
uint16_t bufsize) {
8182
// null buffer is used to get the length of descriptor only
8283
if (!buf) {
8384
return TUD_MSC_DESC_LEN;
8485
}
8586

8687
uint8_t const itfnum = TinyUSBDevice.allocInterface(1);
88+
;
8789
uint8_t const ep_in = TinyUSBDevice.allocEndpoint(TUSB_DIR_IN);
8890
uint8_t const ep_out = TinyUSBDevice.allocEndpoint(TUSB_DIR_OUT);
8991

‎src/arduino/msc/Adafruit_USBD_MSC.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,8 @@ class Adafruit_USBD_MSC : public Adafruit_USBD_Interface {
8383
}
8484

8585
// from Adafruit_USBD_Interface
86-
virtual uint16_t getInterfaceDescriptor(uint8_t *buf, uint16_t bufsize);
86+
virtual uint16_t getInterfaceDescriptor(uint8_t itfnum, uint8_t *buf,
87+
uint16_t bufsize);
8788

8889
// internal use only
8990
uint16_t makeItfDesc(uint8_t itfnum, uint8_t *buf, uint16_t bufsize,

‎src/arduino/video/Adafruit_USBD_Video.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ class Adafruit_USBD_Video : public Adafruit_USBD_Interface {
3939
// bool isStreaming(uint8_t stream_idx);
4040

4141
// from Adafruit_USBD_Interface
42-
virtual uint16_t getInterfaceDescriptor(uint8_t *buf, uint16_t bufsize);
42+
virtual uint16_t getInterfaceDescriptor(uint8_t itfnum, uint8_t *buf,
43+
uint16_t bufsize);
4344

4445
private:
4546
uint8_t const *_desc_itf;

‎src/arduino/webusb/Adafruit_USBD_WebUSB.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,8 @@ uint16_t Adafruit_USBD_WebUSB::makeItfDesc(uint8_t itfnum, uint8_t *buf,
202202
return len;
203203
}
204204

205-
uint16_t Adafruit_USBD_WebUSB::getInterfaceDescriptor(uint8_t *buf,
205+
uint16_t Adafruit_USBD_WebUSB::getInterfaceDescriptor(uint8_t itfnum_deprecated,
206+
uint8_t *buf,
206207
uint16_t bufsize) {
207208
if (!buf) {
208209
return TUD_VENDOR_DESC_LEN;

‎src/arduino/webusb/Adafruit_USBD_WebUSB.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@ class Adafruit_USBD_WebUSB : public Stream, public Adafruit_USBD_Interface {
6565
operator bool();
6666

6767
// from Adafruit_USBD_Interface
68-
virtual uint16_t getInterfaceDescriptor(uint8_t *buf, uint16_t bufsize);
68+
virtual uint16_t getInterfaceDescriptor(uint8_t itfnum, uint8_t *buf,
69+
uint16_t bufsize);
6970

7071
// internal use only
7172
uint16_t makeItfDesc(uint8_t itfnum, uint8_t *buf, uint16_t bufsize,

0 commit comments

Comments
 (0)