Skip to content

Commit 37110f4

Browse files
committed
clang
1 parent 9f8e08c commit 37110f4

File tree

3 files changed

+40
-50
lines changed

3 files changed

+40
-50
lines changed

src/arduino/cdc/Adafruit_USBH_CDC.cpp

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,11 @@
3030

3131
#include "Adafruit_USBH_CDC.h"
3232

33-
Adafruit_USBH_CDC::Adafruit_USBH_CDC(void) {
34-
_idx = TUSB_INDEX_INVALID;
35-
}
33+
Adafruit_USBH_CDC::Adafruit_USBH_CDC(void) { _idx = TUSB_INDEX_INVALID; }
3634

37-
void Adafruit_USBH_CDC::begin(uint8_t idx) {
38-
_idx = idx;
39-
}
35+
void Adafruit_USBH_CDC::begin(uint8_t idx) { _idx = idx; }
4036

41-
void Adafruit_USBH_CDC::end(void) {
42-
_idx = TUSB_INDEX_INVALID;
43-
}
37+
void Adafruit_USBH_CDC::end(void) { _idx = TUSB_INDEX_INVALID; }
4438

4539
bool Adafruit_USBH_CDC::connected(void) {
4640
return (_idx != TUSB_INDEX_INVALID) && tuh_cdc_connected(_idx);
@@ -51,7 +45,7 @@ Adafruit_USBH_CDC::operator bool() {
5145
}
5246

5347
int Adafruit_USBH_CDC::available(void) {
54-
return (int) tuh_cdc_read_available(_idx);
48+
return (int)tuh_cdc_read_available(_idx);
5549
}
5650

5751
int Adafruit_USBH_CDC::peek(void) {
@@ -61,20 +55,16 @@ int Adafruit_USBH_CDC::peek(void) {
6155

6256
int Adafruit_USBH_CDC::read(void) {
6357
uint8_t ch;
64-
return read(&ch, 1) ? (int) ch : -1;
58+
return read(&ch, 1) ? (int)ch : -1;
6559
}
6660

6761
size_t Adafruit_USBH_CDC::read(uint8_t *buffer, size_t size) {
6862
return tuh_cdc_read(_idx, buffer, size);
6963
}
7064

71-
void Adafruit_USBH_CDC::flush(void) {
72-
(void) tuh_cdc_write_flush(_idx);
73-
}
65+
void Adafruit_USBH_CDC::flush(void) { (void)tuh_cdc_write_flush(_idx); }
7466

75-
size_t Adafruit_USBH_CDC::write(uint8_t ch) {
76-
return write(&ch, 1);
77-
}
67+
size_t Adafruit_USBH_CDC::write(uint8_t ch) { return write(&ch, 1); }
7868

7969
size_t Adafruit_USBH_CDC::write(const uint8_t *buffer, size_t size) {
8070
size_t remain = size;
@@ -95,7 +85,7 @@ size_t Adafruit_USBH_CDC::write(const uint8_t *buffer, size_t size) {
9585
}
9686

9787
int Adafruit_USBH_CDC::availableForWrite(void) {
98-
return (int) tuh_cdc_write_available(_idx);
88+
return (int)tuh_cdc_write_available(_idx);
9989
}
10090

10191
#endif

src/arduino/cdc/Adafruit_USBH_CDC.h

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*
1+
/*
22
* The MIT License (MIT)
33
*
44
* Copyright (c) 2022 Ha Thach (tinyusb.org) for Adafruit Industries
@@ -29,43 +29,43 @@
2929

3030
class Adafruit_USBH_CDC : public Stream {
3131
public:
32-
Adafruit_USBH_CDC(void);
32+
Adafruit_USBH_CDC(void);
3333

34-
// Init/Bind to an specific cdc interface
35-
void begin(uint8_t idx = 0);
34+
// Init/Bind to an specific cdc interface
35+
void begin(uint8_t idx = 0);
3636

37-
// unbind cdc interface
38-
void end(void);
37+
// unbind cdc interface
38+
void end(void);
3939

40-
// Get index of cdc interface
41-
uint8_t getIndex(void) { return _idx; }
40+
// Get index of cdc interface
41+
uint8_t getIndex(void) { return _idx; }
4242

43-
// If cdc is mounted
44-
operator bool();
43+
// If cdc is mounted
44+
operator bool();
4545

46-
// if cdc's DTR is asserted
47-
bool connected(void);
46+
// if cdc's DTR is asserted
47+
bool connected(void);
4848

49-
//------------- Stream API -------------//
50-
virtual int available(void);
51-
virtual int peek(void);
49+
//------------- Stream API -------------//
50+
virtual int available(void);
51+
virtual int peek(void);
5252

53-
virtual int read(void);
54-
size_t read(uint8_t *buffer, size_t size);
53+
virtual int read(void);
54+
size_t read(uint8_t *buffer, size_t size);
5555

56-
virtual void flush(void);
57-
virtual size_t write(uint8_t ch);
56+
virtual void flush(void);
57+
virtual size_t write(uint8_t ch);
5858

59-
virtual size_t write(const uint8_t *buffer, size_t size);
60-
size_t write(const char *buffer, size_t size) {
61-
return write((const uint8_t *)buffer, size);
62-
}
59+
virtual size_t write(const uint8_t *buffer, size_t size);
60+
size_t write(const char *buffer, size_t size) {
61+
return write((const uint8_t *)buffer, size);
62+
}
6363

64-
virtual int availableForWrite(void);
65-
using Print::write; // pull in write(str) from Print
64+
virtual int availableForWrite(void);
65+
using Print::write; // pull in write(str) from Print
6666

6767
private:
68-
uint8_t _idx; // TinyUSB CDC Interface Index
68+
uint8_t _idx; // TinyUSB CDC Interface Index
6969
};
7070

7171
#endif

src/arduino/ports/rp2040/tusb_config_rp2040.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -116,18 +116,18 @@ extern int serial1_printf(const char *__restrict __format, ...);
116116
#define CFG_TUH_CDC 1
117117

118118
// RX & TX fifo size
119-
#define CFG_TUH_CDC_RX_BUFSIZE 128
120-
#define CFG_TUH_CDC_TX_BUFSIZE 128
121-
119+
#define CFG_TUH_CDC_RX_BUFSIZE 128
120+
#define CFG_TUH_CDC_TX_BUFSIZE 128
122121

123122
// Set Line Control state on enumeration/mounted:
124123
// DTR ( bit 0), RTS (bit 1)
125-
#define CFG_TUH_CDC_LINE_CONTROL_ON_ENUM 0x03
124+
#define CFG_TUH_CDC_LINE_CONTROL_ON_ENUM 0x03
126125

127126
// Set Line Coding on enumeration/mounted, value for cdc_line_coding_t
128127
// bit rate = 115200, 1 stop bit, no parity, 8 bit data width
129-
// This need https://github.com/sekigon-gonnoc/Pico-PIO-USB/pull/58 to be merged first
130-
// #define CFG_TUH_CDC_LINE_CODING_ON_ENUM { 115200, CDC_LINE_CONDING_STOP_BITS_1, CDC_LINE_CODING_PARITY_NONE, 8 }
128+
// This need https://github.com/sekigon-gonnoc/Pico-PIO-USB/pull/58 to be merged
129+
// first #define CFG_TUH_CDC_LINE_CODING_ON_ENUM { 115200,
130+
// CDC_LINE_CONDING_STOP_BITS_1, CDC_LINE_CODING_PARITY_NONE, 8 }
131131

132132
#ifdef __cplusplus
133133
}

0 commit comments

Comments
 (0)