Skip to content

Commit c63bf0e

Browse files
hathachhathach
committed
clang format
1 parent 7bd22e6 commit c63bf0e

9 files changed

+79
-89
lines changed

‎src/arduino/Adafruit_USBD_Device.cpp

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -140,22 +140,20 @@ bool Adafruit_USBD_Device::attach(void) { return tud_connect(); }
140140
// Therefore most of descriptors are stubs only
141141
#ifdef ARDUINO_ARCH_ESP32
142142

143-
void Adafruit_USBD_Device::clearConfiguration(void) {
144-
145-
}
143+
void Adafruit_USBD_Device::clearConfiguration(void) {}
146144

147145
bool Adafruit_USBD_Device::addInterface(Adafruit_USBD_Interface &itf) {
148146
(void)itf;
149147
return true;
150148
}
151149

152150
bool Adafruit_USBD_Device::begin(uint8_t rhport) {
153-
(void) rhport;
151+
(void)rhport;
154152
return true;
155153
}
156154

157155
uint8_t Adafruit_USBD_Device::getSerialDescriptor(uint16_t *serial_utf16) {
158-
(void) serial_utf16;
156+
(void)serial_utf16;
159157
return 0;
160158
}
161159

@@ -341,7 +339,6 @@ uint16_t const *Adafruit_USBD_Device::descriptor_string_cb(uint8_t index,
341339
// TinyUSB stack callbacks
342340
//--------------------------------------------------------------------+
343341

344-
345342
extern "C" {
346343

347344
// Invoked when received GET DEVICE DESCRIPTOR

‎src/arduino/hid/Adafruit_USBD_HID.cpp

Lines changed: 17 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -36,42 +36,39 @@ uint8_t const _ascii2keycode[128][2] = {HID_ASCII_TO_KEYCODE};
3636
// TODO multiple instances
3737
static Adafruit_USBD_HID *_hid_dev = NULL;
3838

39-
4039
#ifdef ARDUINO_ARCH_ESP32
41-
static uint16_t hid_load_descriptor(uint8_t * dst, uint8_t * itf)
42-
{
40+
static uint16_t hid_load_descriptor(uint8_t *dst, uint8_t *itf) {
4341
// uint8_t str_index = tinyusb_add_string_descriptor("TinyUSB HID");
4442
uint8_t str_index = 0;
4543

46-
TU_VERIFY (_hid_dev);
44+
TU_VERIFY(_hid_dev);
4745

4846
uint8_t ep_in = tinyusb_get_free_in_endpoint();
49-
TU_VERIFY (ep_in != 0);
47+
TU_VERIFY(ep_in != 0);
5048
ep_in |= 0x80;
5149

5250
uint8_t ep_out = 0;
53-
if (_hid_dev->isOutEndpointEnabled())
54-
{
51+
if (_hid_dev->isOutEndpointEnabled()) {
5552
ep_out = tinyusb_get_free_out_endpoint();
56-
TU_VERIFY (ep_out != 0);
53+
TU_VERIFY(ep_out != 0);
5754
}
5855

59-
uint16_t const desc_len = _hid_dev->makeItfDesc(*itf, dst, TUD_HID_INOUT_DESC_LEN, ep_in, ep_out);
56+
uint16_t const desc_len =
57+
_hid_dev->makeItfDesc(*itf, dst, TUD_HID_INOUT_DESC_LEN, ep_in, ep_out);
6058

61-
*itf+=1;
59+
*itf += 1;
6260
return desc_len;
6361
}
6462
#endif
6563

6664
//------------- IMPLEMENTATION -------------//
6765

68-
Adafruit_USBD_HID::Adafruit_USBD_HID(void) :
69-
Adafruit_USBD_HID(NULL, 0, HID_ITF_PROTOCOL_NONE, 4, false) {
70-
71-
}
66+
Adafruit_USBD_HID::Adafruit_USBD_HID(void)
67+
: Adafruit_USBD_HID(NULL, 0, HID_ITF_PROTOCOL_NONE, 4, false) {}
7268

73-
Adafruit_USBD_HID::Adafruit_USBD_HID(uint8_t const *desc_report, uint16_t len, uint8_t protocol, uint8_t interval_ms, bool has_out_endpoint)
74-
{
69+
Adafruit_USBD_HID::Adafruit_USBD_HID(uint8_t const *desc_report, uint16_t len,
70+
uint8_t protocol, uint8_t interval_ms,
71+
bool has_out_endpoint) {
7572
_interval_ms = interval_ms;
7673
_protocol = protocol;
7774

@@ -100,9 +97,7 @@ void Adafruit_USBD_HID::setBootProtocol(uint8_t protocol) {
10097
_protocol = protocol;
10198
}
10299

103-
bool Adafruit_USBD_HID::isOutEndpointEnabled(void) {
104-
return _out_endpoint;
105-
}
100+
bool Adafruit_USBD_HID::isOutEndpointEnabled(void) { return _out_endpoint; }
106101

107102
void Adafruit_USBD_HID::enableOutEndpoint(bool enable) {
108103
_out_endpoint = enable;
@@ -120,8 +115,9 @@ void Adafruit_USBD_HID::setReportCallback(get_report_callback_t get_report,
120115
_set_report_cb = set_report;
121116
}
122117

123-
uint16_t Adafruit_USBD_HID::makeItfDesc(uint8_t itfnum, uint8_t *buf, uint16_t bufsize, uint8_t ep_in, uint8_t ep_out)
124-
{
118+
uint16_t Adafruit_USBD_HID::makeItfDesc(uint8_t itfnum, uint8_t *buf,
119+
uint16_t bufsize, uint8_t ep_in,
120+
uint8_t ep_out) {
125121
if (!_desc_report_len) {
126122
return 0;
127123
}

‎src/arduino/hid/Adafruit_USBD_HID.h

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,7 @@ class Adafruit_USBD_HID : public Adafruit_USBD_Interface {
4040
Adafruit_USBD_HID(void);
4141
Adafruit_USBD_HID(uint8_t const *desc_report, uint16_t len,
4242
uint8_t protocol = HID_ITF_PROTOCOL_NONE,
43-
uint8_t interval_ms = 4,
44-
bool has_out_endpoint = false
45-
);
43+
uint8_t interval_ms = 4, bool has_out_endpoint = false);
4644

4745
void setPollInterval(uint8_t interval_ms);
4846
void setBootProtocol(uint8_t protocol); // 0: None, 1: Keyboard, 2:Mouse
@@ -82,7 +80,8 @@ class Adafruit_USBD_HID : public Adafruit_USBD_Interface {
8280
uint16_t bufsize);
8381

8482
// internal use only
85-
uint16_t makeItfDesc(uint8_t itfnum, uint8_t *buf, uint16_t bufsize, uint8_t ep_in, uint8_t ep_out);
83+
uint16_t makeItfDesc(uint8_t itfnum, uint8_t *buf, uint16_t bufsize,
84+
uint8_t ep_in, uint8_t ep_out);
8685

8786
private:
8887
uint8_t _interval_ms;

‎src/arduino/midi/Adafruit_USBD_MIDI.cpp

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,28 +38,26 @@
3838
// TODO multiple instances
3939
static Adafruit_USBD_MIDI *_midi_dev = NULL;
4040

41-
4241
#ifdef ARDUINO_ARCH_ESP32
43-
static uint16_t midi_load_descriptor(uint8_t * dst, uint8_t * itf)
44-
{
42+
static uint16_t midi_load_descriptor(uint8_t *dst, uint8_t *itf) {
4543
// uint8_t str_index = tinyusb_add_string_descriptor("TinyUSB HID");
4644
uint8_t str_index = 0;
4745

4846
uint8_t ep_in = tinyusb_get_free_in_endpoint();
4947
uint8_t ep_out = tinyusb_get_free_out_endpoint();
50-
TU_VERIFY (ep_in && ep_out);
48+
TU_VERIFY(ep_in && ep_out);
5149
ep_in |= 0x80;
5250

5351
uint16_t desc_len = _midi_dev->getInterfaceDescriptor(0, NULL, 0);
5452

5553
desc_len = _midi_dev->makeItfDesc(*itf, dst, desc_len, ep_in, ep_out);
5654

57-
*itf+=2;
55+
*itf += 2;
5856
return desc_len;
5957
}
6058
#endif
6159

62-
Adafruit_USBD_MIDI::Adafruit_USBD_MIDI(uint8_t n_cables){
60+
Adafruit_USBD_MIDI::Adafruit_USBD_MIDI(uint8_t n_cables) {
6361
_n_cables = n_cables;
6462

6563
#ifdef ARDUINO_ARCH_ESP32
@@ -81,8 +79,12 @@ bool Adafruit_USBD_MIDI::begin(void) {
8179
return true;
8280
}
8381

84-
uint16_t Adafruit_USBD_MIDI::makeItfDesc(uint8_t itfnum, uint8_t *buf, uint16_t bufsize, uint8_t ep_in, uint8_t ep_out) {
85-
uint16_t const desc_len = TUD_MIDI_DESC_HEAD_LEN + TUD_MIDI_DESC_JACK_LEN * _n_cables + 2 * TUD_MIDI_DESC_EP_LEN(_n_cables);
82+
uint16_t Adafruit_USBD_MIDI::makeItfDesc(uint8_t itfnum, uint8_t *buf,
83+
uint16_t bufsize, uint8_t ep_in,
84+
uint8_t ep_out) {
85+
uint16_t const desc_len = TUD_MIDI_DESC_HEAD_LEN +
86+
TUD_MIDI_DESC_JACK_LEN * _n_cables +
87+
2 * TUD_MIDI_DESC_EP_LEN(_n_cables);
8688

8789
// null buf is for length only
8890
if (!buf) {
@@ -135,7 +137,7 @@ uint16_t Adafruit_USBD_MIDI::makeItfDesc(uint8_t itfnum, uint8_t *buf, uint16_t
135137
len += sizeof(jack);
136138
}
137139

138-
if ( len != desc_len ) {
140+
if (len != desc_len) {
139141
// TODO should throw an error message
140142
return 0;
141143
}

‎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
uint16_t bufsize);
6161

6262
// internal use only
63-
uint16_t makeItfDesc(uint8_t itfnum, uint8_t *buf, uint16_t bufsize, uint8_t ep_in, uint8_t ep_out);
63+
uint16_t makeItfDesc(uint8_t itfnum, uint8_t *buf, uint16_t bufsize,
64+
uint8_t ep_in, uint8_t ep_out);
6465

6566
private:
6667
uint8_t _n_cables;

‎src/arduino/msc/Adafruit_USBD_MSC.cpp

Lines changed: 27 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -35,24 +35,22 @@
3535
static Adafruit_USBD_MSC *_msc_dev = NULL;
3636

3737
#ifdef ARDUINO_ARCH_ESP32
38-
static uint16_t msc_load_descriptor(uint8_t * dst, uint8_t * itf)
39-
{
40-
// uint8_t str_index = tinyusb_add_string_descriptor("TinyUSB MSC");
41-
uint8_t str_index = 0;
42-
43-
uint8_t ep_in = tinyusb_get_free_in_endpoint();
44-
uint8_t ep_out = tinyusb_get_free_out_endpoint();
45-
TU_VERIFY (ep_in && ep_out);
46-
ep_in |= 0x80;
47-
48-
uint8_t const descriptor[TUD_MSC_DESC_LEN] = {
49-
// Interface number, string index, EP Out & EP In address, EP size
50-
TUD_MSC_DESCRIPTOR(*itf, str_index, ep_out, ep_in, EPSIZE)
51-
};
52-
53-
*itf+=1;
54-
memcpy(dst, descriptor, TUD_MSC_DESC_LEN);
55-
return TUD_MSC_DESC_LEN;
38+
static uint16_t msc_load_descriptor(uint8_t *dst, uint8_t *itf) {
39+
// uint8_t str_index = tinyusb_add_string_descriptor("TinyUSB MSC");
40+
uint8_t str_index = 0;
41+
42+
uint8_t ep_in = tinyusb_get_free_in_endpoint();
43+
uint8_t ep_out = tinyusb_get_free_out_endpoint();
44+
TU_VERIFY(ep_in && ep_out);
45+
ep_in |= 0x80;
46+
47+
uint8_t const descriptor[TUD_MSC_DESC_LEN] = {
48+
// Interface number, string index, EP Out & EP In address, EP size
49+
TUD_MSC_DESCRIPTOR(*itf, str_index, ep_out, ep_in, EPSIZE)};
50+
51+
*itf += 1;
52+
memcpy(dst, descriptor, TUD_MSC_DESC_LEN);
53+
return TUD_MSC_DESC_LEN;
5654
}
5755
#endif
5856

@@ -62,7 +60,8 @@ Adafruit_USBD_MSC::Adafruit_USBD_MSC(void) {
6260

6361
#ifdef ARDUINO_ARCH_ESP32
6462
// ESP32 requires setup configuration descriptor on declaration
65-
tinyusb_enable_interface(USB_INTERFACE_MSC, TUD_MSC_DESC_LEN, msc_load_descriptor);
63+
tinyusb_enable_interface(USB_INTERFACE_MSC, TUD_MSC_DESC_LEN,
64+
msc_load_descriptor);
6665
#endif
6766
}
6867

@@ -143,15 +142,15 @@ void tud_msc_inquiry_cb(uint8_t lun, uint8_t vendor_id[8],
143142
}
144143

145144
// If not set use default ID "Adafruit - Mass Storage - 1.0"
146-
const char *vid =
147-
(_msc_dev->_lun_info[lun]._inquiry_vid ? _msc_dev->_lun_info[lun]._inquiry_vid
148-
: "Adafruit");
149-
const char *pid =
150-
(_msc_dev->_lun_info[lun]._inquiry_pid ? _msc_dev->_lun_info[lun]._inquiry_pid
151-
: "Mass Storage");
152-
const char *rev =
153-
(_msc_dev->_lun_info[lun]._inquiry_rev ? _msc_dev->_lun_info[lun]._inquiry_rev
154-
: "1.0");
145+
const char *vid = (_msc_dev->_lun_info[lun]._inquiry_vid
146+
? _msc_dev->_lun_info[lun]._inquiry_vid
147+
: "Adafruit");
148+
const char *pid = (_msc_dev->_lun_info[lun]._inquiry_pid
149+
? _msc_dev->_lun_info[lun]._inquiry_pid
150+
: "Mass Storage");
151+
const char *rev = (_msc_dev->_lun_info[lun]._inquiry_rev
152+
? _msc_dev->_lun_info[lun]._inquiry_rev
153+
: "1.0");
155154

156155
memcpy(vendor_id, vid, tu_min32(strlen(vid), 8));
157156
memcpy(product_id, pid, tu_min32(strlen(pid), 16));

‎src/arduino/ports/esp32/Adafruit_TinyUSB_esp32.cpp

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,9 @@
3333

3434
void TinyUSB_Port_EnterDFU(void) {}
3535

36-
void TinyUSB_Port_InitDevice(uint8_t rhport) {
37-
(void) rhport;
38-
}
36+
void TinyUSB_Port_InitDevice(uint8_t rhport) { (void)rhport; }
3937

40-
uint8_t TinyUSB_Port_GetSerialNumber(uint8_t serial_id[16]) {
41-
(void) serial_id;
42-
}
38+
uint8_t TinyUSB_Port_GetSerialNumber(uint8_t serial_id[16]) { (void)serial_id; }
4339

4440
#if 0
4541

@@ -73,8 +69,8 @@ uint8_t TinyUSB_Port_GetSerialNumber(uint8_t serial_id[16]) {
7369
#include "driver/gpio.h"
7470
#include "driver/periph_ctrl.h"
7571

76-
#include "esp_rom_gpio.h"
7772
#include "esp32-hal.h"
73+
#include "esp_rom_gpio.h"
7874

7975
#include "esp32s2/rom/usb/chip_usb_dw_wrapper.h"
8076
#include "esp32s2/rom/usb/usb_dc.h"

‎src/arduino/webusb/Adafruit_USBD_WebUSB.cpp

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,7 @@ uint8_t const desc_bos[] = {
7474
TUD_BOS_WEBUSB_DESCRIPTOR(VENDOR_REQUEST_WEBUSB, 1),
7575

7676
// Microsoft OS 2.0 descriptor
77-
TUD_BOS_MS_OS_20_DESCRIPTOR(MS_OS_20_DESC_LEN, VENDOR_REQUEST_MICROSOFT)
78-
};
77+
TUD_BOS_MS_OS_20_DESCRIPTOR(MS_OS_20_DESC_LEN, VENDOR_REQUEST_MICROSOFT)};
7978

8079
uint8_t desc_ms_os_20[] = {
8180
// Set header: length, type, windows version, total length
@@ -123,29 +122,27 @@ TU_VERIFY_STATIC(sizeof(desc_ms_os_20) == MS_OS_20_DESC_LEN, "Incorrect size");
123122
//--------------------------------------------------------------------+
124123

125124
#ifdef ARDUINO_ARCH_ESP32
126-
static uint16_t webusb_load_descriptor(uint8_t * dst, uint8_t * itf)
127-
{
125+
static uint16_t webusb_load_descriptor(uint8_t *dst, uint8_t *itf) {
128126
// uint8_t str_index = tinyusb_add_string_descriptor("TinyUSB MSC");
129127
uint8_t str_index = 0;
130128

131129
uint8_t ep_in = tinyusb_get_free_in_endpoint();
132130
uint8_t ep_out = tinyusb_get_free_out_endpoint();
133-
TU_VERIFY (ep_in && ep_out);
131+
TU_VERIFY(ep_in && ep_out);
134132
ep_in |= 0x80;
135133

136134
uint16_t desc_len = _webusb_dev->getInterfaceDescriptor(0, NULL, 0);
137135

138136
desc_len = _webusb_dev->makeItfDesc(*itf, dst, desc_len, ep_in, ep_out);
139137

140-
*itf+=1;
138+
*itf += 1;
141139
return desc_len;
142140
}
143141
#endif
144142

145-
146143
Adafruit_USBD_WebUSB::Adafruit_USBD_WebUSB(const void *url) {
147144
_connected = false;
148-
_url = (const uint8_t *) url;
145+
_url = (const uint8_t *)url;
149146
_linestate_cb = NULL;
150147

151148
#ifdef ARDUINO_ARCH_ESP32
@@ -156,7 +153,8 @@ Adafruit_USBD_WebUSB::Adafruit_USBD_WebUSB(const void *url) {
156153

157154
_webusb_dev = this;
158155
uint16_t const desc_len = getInterfaceDescriptor(0, NULL, 0);
159-
tinyusb_enable_interface(USB_INTERFACE_VENDOR, desc_len, webusb_load_descriptor);
156+
tinyusb_enable_interface(USB_INTERFACE_VENDOR, desc_len,
157+
webusb_load_descriptor);
160158
#endif
161159
}
162160

@@ -181,12 +179,14 @@ void Adafruit_USBD_WebUSB::setLineStateCallback(linestate_callback_t fp) {
181179
_linestate_cb = fp;
182180
}
183181

184-
uint16_t Adafruit_USBD_WebUSB::makeItfDesc(uint8_t itfnum, uint8_t *buf, uint16_t bufsize, uint8_t ep_in, uint8_t ep_out) {
182+
uint16_t Adafruit_USBD_WebUSB::makeItfDesc(uint8_t itfnum, uint8_t *buf,
183+
uint16_t bufsize, uint8_t ep_in,
184+
uint8_t ep_out) {
185185
uint8_t desc[] = {TUD_VENDOR_DESCRIPTOR(itfnum, 0, ep_out, ep_in, EPSIZE)};
186186
uint16_t const len = sizeof(desc);
187187

188188
// null buffer for length only
189-
if ( buf ) {
189+
if (buf) {
190190
if (bufsize < len) {
191191
return 0;
192192
}
@@ -340,7 +340,6 @@ bool tud_vendor_control_xfer_cb(uint8_t rhport, uint8_t stage,
340340

341341
return true;
342342
}
343-
344343
}
345344

346345
#endif // TUSB_OPT_DEVICE_ENABLED

‎src/arduino/webusb/Adafruit_USBD_WebUSB.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,8 @@ class Adafruit_USBD_WebUSB : public Stream, public Adafruit_USBD_Interface {
6666
uint16_t bufsize);
6767

6868
// internal use only
69-
uint16_t makeItfDesc(uint8_t itfnum, uint8_t *buf, uint16_t bufsize, uint8_t ep_in, uint8_t ep_out);
69+
uint16_t makeItfDesc(uint8_t itfnum, uint8_t *buf, uint16_t bufsize,
70+
uint8_t ep_in, uint8_t ep_out);
7071

7172
private:
7273
bool _connected;

0 commit comments

Comments
 (0)