Skip to content

Commit 0df71c0

Browse files
hathachhathach
committed
drop itfnum in signature of Adafruit_USBD_Interface::getInterfaceDescriptor()
1 parent 52fca11 commit 0df71c0

15 files changed

+17
-30
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 itfnum_deprecated, uint8_t* buf, uint16_t bufsize) {
67+
uint16_t Adafruit_USBD_I2C::getInterfaceDescriptor(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 itfnum, uint8_t* buf, uint16_t bufsize);
96+
virtual uint16_t getInterfaceDescriptor(uint8_t* buf, uint16_t bufsize);
9797

9898
private:
9999
TwoWire* _wire;

‎src/arduino/Adafruit_USBD_CDC.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,7 @@ 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 itfnum_deprecated,
50-
uint8_t *buf,
49+
uint16_t Adafruit_USBD_CDC::getInterfaceDescriptor(uint8_t *buf,
5150
uint16_t bufsize) {
5251
// CDC is mostly always existed for DFU
5352
uint8_t itfnum = 0;

‎src/arduino/Adafruit_USBD_CDC.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,7 @@ 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 itfnum_deprecated,
84-
uint8_t *buf, uint16_t bufsize);
83+
virtual uint16_t getInterfaceDescriptor(uint8_t *buf, uint16_t bufsize);
8584

8685
private:
8786
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 = itf.getInterfaceDescriptor(
237-
_itf_count, desc, _desc_cfg_maxlen - _desc_cfg_len);
236+
uint16_t const len =
237+
itf.getInterfaceDescriptor(desc, _desc_cfg_maxlen - _desc_cfg_len);
238238

239239
if (!len) {
240240
return false;

‎src/arduino/Adafruit_USBD_Interface.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,10 @@ 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 itfnum, uint8_t *buf,
41-
uint16_t bufsize) = 0;
40+
virtual uint16_t getInterfaceDescriptor(uint8_t *buf, uint16_t bufsize) = 0;
4241
// Get Interface Descriptor Length
4342
uint16_t getInterfaceDescriptorLen() {
44-
return getInterfaceDescriptor(0, NULL, 0);
43+
return getInterfaceDescriptor(NULL, 0);
4544
}
4645

4746
void setStringDescriptor(const char *str);

‎src/arduino/hid/Adafruit_USBD_HID.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,7 @@ 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 itfnum_deprecated,
162-
uint8_t *buf,
161+
uint16_t Adafruit_USBD_HID::getInterfaceDescriptor(uint8_t *buf,
163162
uint16_t bufsize) {
164163
uint8_t itfnum = 0;
165164
uint8_t ep_in = 0;

‎src/arduino/hid/Adafruit_USBD_HID.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,7 @@ 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 itfnum, uint8_t *buf,
84-
uint16_t bufsize);
83+
virtual uint16_t getInterfaceDescriptor(uint8_t *buf, uint16_t bufsize);
8584

8685
// internal use only
8786
uint16_t makeItfDesc(uint8_t itfnum, uint8_t *buf, uint16_t bufsize,

‎src/arduino/midi/Adafruit_USBD_MIDI.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,7 @@ 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 itfnum_deprecated,
157-
uint8_t *buf,
156+
uint16_t Adafruit_USBD_MIDI::getInterfaceDescriptor(uint8_t *buf,
158157
uint16_t bufsize) {
159158
uint8_t itfnum = 0;
160159
uint8_t ep_in = 0;

‎src/arduino/midi/Adafruit_USBD_MIDI.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,7 @@ 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 itfnum, uint8_t *buf,
64-
uint16_t bufsize);
63+
virtual uint16_t getInterfaceDescriptor(uint8_t *buf, uint16_t bufsize);
6564

6665
// internal use only
6766
uint16_t makeItfDesc(uint8_t itfnum, uint8_t *buf, uint16_t bufsize,

‎src/arduino/msc/Adafruit_USBD_MSC.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,16 +76,14 @@ 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 itfnum_deprecated,
80-
uint8_t *buf,
79+
uint16_t Adafruit_USBD_MSC::getInterfaceDescriptor(uint8_t *buf,
8180
uint16_t bufsize) {
8281
// null buffer is used to get the length of descriptor only
8382
if (!buf) {
8483
return TUD_MSC_DESC_LEN;
8584
}
8685

8786
uint8_t const itfnum = TinyUSBDevice.allocInterface(1);
88-
;
8987
uint8_t const ep_in = TinyUSBDevice.allocEndpoint(TUSB_DIR_IN);
9088
uint8_t const ep_out = TinyUSBDevice.allocEndpoint(TUSB_DIR_OUT);
9189

‎src/arduino/msc/Adafruit_USBD_MSC.h

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

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

8988
// internal use only
9089
uint16_t makeItfDesc(uint8_t itfnum, uint8_t *buf, uint16_t bufsize,

‎src/arduino/video/Adafruit_USBD_Video.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@ 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 itfnum, uint8_t *buf,
43-
uint16_t bufsize);
42+
virtual uint16_t getInterfaceDescriptor(uint8_t *buf, uint16_t bufsize);
4443

4544
private:
4645
uint8_t const *_desc_itf;

‎src/arduino/webusb/Adafruit_USBD_WebUSB.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,8 +202,7 @@ 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 itfnum_deprecated,
206-
uint8_t *buf,
205+
uint16_t Adafruit_USBD_WebUSB::getInterfaceDescriptor(uint8_t *buf,
207206
uint16_t bufsize) {
208207
if (!buf) {
209208
return TUD_VENDOR_DESC_LEN;

‎src/arduino/webusb/Adafruit_USBD_WebUSB.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,7 @@ 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 itfnum, uint8_t *buf,
69-
uint16_t bufsize);
68+
virtual uint16_t getInterfaceDescriptor(uint8_t *buf, uint16_t bufsize);
7069

7170
// internal use only
7271
uint16_t makeItfDesc(uint8_t itfnum, uint8_t *buf, uint16_t bufsize,

0 commit comments

Comments
 (0)