Skip to content

Commit b5fb020

Browse files
hathachhathach
committed
rename itfnum to itfnum_deprecated instead of dropping
1 parent 9047e04 commit b5fb020

11 files changed

+25
-15
lines changed

‎src/arduino/Adafruit_USBD_CDC.cpp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ Adafruit_USBD_CDC::Adafruit_USBD_CDC(void) { _instance = INVALID_INSTANCE; }
4949
uint16_t Adafruit_USBD_CDC::getInterfaceDescriptor(uint8_t itfnum_deprecated,
5050
uint8_t *buf,
5151
uint16_t bufsize) {
52+
(void)itfnum_deprecated;
53+
5254
// CDC is mostly always existed for DFU
5355
uint8_t itfnum = 0;
5456
uint8_t ep_notif = 0;
@@ -281,9 +283,10 @@ void tud_cdc_line_state_cb(uint8_t instance, bool dtr, bool rts) {
281283
// Device stack is not enabled (probably in host mode)
282284
#warning "TinyUSB Host selected. No output to Serial will occur!"
283285

284-
uint16_t Adafruit_USBD_CDC::getInterfaceDescriptor(uint8_t itfnum, uint8_t *buf,
286+
uint16_t Adafruit_USBD_CDC::getInterfaceDescriptor(uint8_t itfnum_deprecated,
287+
uint8_t *buf,
285288
uint16_t bufsize) {
286-
(void)itfnum;
289+
(void)itfnum_deprecated;
287290
(void)buf;
288291
(void)bufsize;
289292

‎src/arduino/Adafruit_USBD_Interface.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ 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 itfnum_deprecated,
41+
uint8_t *buf, uint16_t bufsize) = 0;
4242
// Get Interface Descriptor Length
4343
uint16_t getInterfaceDescriptorLen() {
4444
return getInterfaceDescriptor(0, NULL, 0);

‎src/arduino/hid/Adafruit_USBD_HID.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,8 @@ uint16_t Adafruit_USBD_HID::makeItfDesc(uint8_t itfnum, uint8_t *buf,
161161
uint16_t Adafruit_USBD_HID::getInterfaceDescriptor(uint8_t itfnum_deprecated,
162162
uint8_t *buf,
163163
uint16_t bufsize) {
164+
(void)itfnum_deprecated;
165+
164166
uint8_t itfnum = 0;
165167
uint8_t ep_in = 0;
166168
uint8_t ep_out = 0;

‎src/arduino/hid/Adafruit_USBD_HID.h

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

8686
// internal use only
8787
uint16_t makeItfDesc(uint8_t itfnum, uint8_t *buf, uint16_t bufsize,

‎src/arduino/midi/Adafruit_USBD_MIDI.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,8 @@ uint16_t Adafruit_USBD_MIDI::makeItfDesc(uint8_t itfnum, uint8_t *buf,
156156
uint16_t Adafruit_USBD_MIDI::getInterfaceDescriptor(uint8_t itfnum_deprecated,
157157
uint8_t *buf,
158158
uint16_t bufsize) {
159+
(void)itfnum_deprecated;
160+
159161
uint8_t itfnum = 0;
160162
uint8_t ep_in = 0;
161163
uint8_t ep_out = 0;

‎src/arduino/midi/Adafruit_USBD_MIDI.h

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

6666
// internal use only
6767
uint16_t makeItfDesc(uint8_t itfnum, uint8_t *buf, uint16_t bufsize,

‎src/arduino/msc/Adafruit_USBD_MSC.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,13 +79,14 @@ uint16_t Adafruit_USBD_MSC::makeItfDesc(uint8_t itfnum, uint8_t *buf,
7979
uint16_t Adafruit_USBD_MSC::getInterfaceDescriptor(uint8_t itfnum_deprecated,
8080
uint8_t *buf,
8181
uint16_t bufsize) {
82+
(void)itfnum_deprecated;
83+
8284
// null buffer is used to get the length of descriptor only
8385
if (!buf) {
8486
return TUD_MSC_DESC_LEN;
8587
}
8688

8789
uint8_t const itfnum = TinyUSBDevice.allocInterface(1);
88-
;
8990
uint8_t const ep_in = TinyUSBDevice.allocEndpoint(TUSB_DIR_IN);
9091
uint8_t const ep_out = TinyUSBDevice.allocEndpoint(TUSB_DIR_OUT);
9192

‎src/arduino/msc/Adafruit_USBD_MSC.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ 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 itfnum_deprecated,
87+
uint8_t *buf, uint16_t bufsize);
8888

8989
// internal use only
9090
uint16_t makeItfDesc(uint8_t itfnum, uint8_t *buf, uint16_t bufsize,

‎src/arduino/video/Adafruit_USBD_Video.h

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

4545
private:
4646
uint8_t const *_desc_itf;

‎src/arduino/webusb/Adafruit_USBD_WebUSB.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,8 @@ uint16_t Adafruit_USBD_WebUSB::makeItfDesc(uint8_t itfnum, uint8_t *buf,
205205
uint16_t Adafruit_USBD_WebUSB::getInterfaceDescriptor(uint8_t itfnum_deprecated,
206206
uint8_t *buf,
207207
uint16_t bufsize) {
208+
(void)itfnum_deprecated;
209+
208210
if (!buf) {
209211
return TUD_VENDOR_DESC_LEN;
210212
}

‎src/arduino/webusb/Adafruit_USBD_WebUSB.h

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

7171
// internal use only
7272
uint16_t makeItfDesc(uint8_t itfnum, uint8_t *buf, uint16_t bufsize,

0 commit comments

Comments
 (0)