Skip to content

Commit fe9e880

Browse files
committed
change helper function signature a bit
1 parent 015735a commit fe9e880

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

src/arduino/Adafruit_USBD_Interface.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class Adafruit_USBD_Interface {
3636
Adafruit_USBD_Interface(void) { _desc_str = NULL; }
3737

3838
// Get Interface Descriptor
39-
// Device fill descriptor and return its length
39+
// Fill the descriptor (if buf is not NULL) and return its length
4040
virtual uint16_t getInterfaceDescriptor(uint8_t itfnum, uint8_t *buf,
4141
uint16_t bufsize) = 0;
4242

src/arduino/hid/Adafruit_USBD_HID.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ static uint16_t hid_load_descriptor(uint8_t * dst, uint8_t * itf)
5555
TU_VERIFY (ep_out != 0);
5656
}
5757

58-
uint16_t const desc_len = _hid_dev->makeItfDesc(*itf, 0x80 | ep_in, ep_out, dst, TUD_HID_INOUT_DESC_LEN);
58+
uint16_t const desc_len = _hid_dev->makeItfDesc(*itf, dst, TUD_HID_INOUT_DESC_LEN, 0x80 | ep_in, ep_out);
5959

6060
*itf+=1;
6161
return desc_len;
@@ -84,9 +84,9 @@ Adafruit_USBD_HID::Adafruit_USBD_HID(uint8_t const *desc_report, uint16_t len, u
8484
_set_report_cb = NULL;
8585

8686
#ifdef ARDUINO_ARCH_ESP32
87-
// ESP32 requires setup configuration descriptor wihtin constructor
87+
// ESP32 requires setup configuration descriptor within constructor
8888
_hid_dev = this;
89-
uint16_t const desc_len = makeItfDesc(0, EPIN, EPOUT, NULL, 0);
89+
uint16_t const desc_len = getInterfaceDescriptor(0, NULL, 0);
9090
tinyusb_enable_interface(USB_INTERFACE_HID, desc_len, hid_load_descriptor);
9191
#endif
9292
}
@@ -119,7 +119,7 @@ void Adafruit_USBD_HID::setReportCallback(get_report_callback_t get_report,
119119
_set_report_cb = set_report;
120120
}
121121

122-
uint16_t Adafruit_USBD_HID::makeItfDesc(uint8_t itfnum, uint8_t ep_in, uint8_t ep_out, uint8_t *buf, uint16_t bufsize)
122+
uint16_t Adafruit_USBD_HID::makeItfDesc(uint8_t itfnum, uint8_t *buf, uint16_t bufsize, uint8_t ep_in, uint8_t ep_out)
123123
{
124124
if (!_desc_report_len) {
125125
return 0;
@@ -158,7 +158,7 @@ uint16_t Adafruit_USBD_HID::makeItfDesc(uint8_t itfnum, uint8_t ep_in, uint8_t e
158158
uint16_t Adafruit_USBD_HID::getInterfaceDescriptor(uint8_t itfnum, uint8_t *buf,
159159
uint16_t bufsize) {
160160
// usb core will automatically update endpoint number
161-
return makeItfDesc(itfnum, EPIN, EPOUT, buf, bufsize);
161+
return makeItfDesc(itfnum, buf, bufsize, EPIN, EPOUT);
162162
}
163163

164164
bool Adafruit_USBD_HID::begin(void) {

src/arduino/hid/Adafruit_USBD_HID.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ class Adafruit_USBD_HID : public Adafruit_USBD_Interface {
8282
uint16_t bufsize);
8383

8484
// internal use only
85-
uint16_t makeItfDesc(uint8_t itfnum, uint8_t ep_in, uint8_t ep_out, uint8_t *buf, uint16_t bufsize);
85+
uint16_t makeItfDesc(uint8_t itfnum, uint8_t *buf, uint16_t bufsize, uint8_t ep_in, uint8_t ep_out);
8686

8787
private:
8888
uint8_t _interval_ms;

0 commit comments

Comments
 (0)