Skip to content

Commit efcc2b6

Browse files
authored
Merge pull request #2334 from hathach/fix-cond-typo
fix typo in cdc line coding enum
2 parents 41e2da7 + aedc92f commit efcc2b6

File tree

4 files changed

+14
-12
lines changed

4 files changed

+14
-12
lines changed

examples/host/cdc_msc_hid/src/tusb_config.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@
118118

119119
// Set Line Coding on enumeration/mounted, value for cdc_line_coding_t
120120
// bit rate = 115200, 1 stop bit, no parity, 8 bit data width
121-
#define CFG_TUH_CDC_LINE_CODING_ON_ENUM { 115200, CDC_LINE_CONDING_STOP_BITS_1, CDC_LINE_CODING_PARITY_NONE, 8 }
121+
#define CFG_TUH_CDC_LINE_CODING_ON_ENUM { 115200, CDC_LINE_CODING_STOP_BITS_1, CDC_LINE_CODING_PARITY_NONE, 8 }
122122

123123

124124
#ifdef __cplusplus

examples/host/cdc_msc_hid_freertos/src/tusb_config.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@
123123

124124
// Set Line Coding on enumeration/mounted, value for cdc_line_coding_t
125125
// bit rate = 115200, 1 stop bit, no parity, 8 bit data width
126-
#define CFG_TUH_CDC_LINE_CODING_ON_ENUM { 115200, CDC_LINE_CONDING_STOP_BITS_1, CDC_LINE_CODING_PARITY_NONE, 8 }
126+
#define CFG_TUH_CDC_LINE_CODING_ON_ENUM { 115200, CDC_LINE_CODING_STOP_BITS_1, CDC_LINE_CODING_PARITY_NONE, 8 }
127127

128128

129129
#ifdef __cplusplus

src/class/cdc/cdc.h

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -182,21 +182,23 @@ typedef enum
182182
CDC_REQUEST_MDLM_SEMANTIC_MODEL = 0x60,
183183
}cdc_management_request_t;
184184

185-
enum
186-
{
185+
enum {
187186
CDC_CONTROL_LINE_STATE_DTR = 0x01,
188187
CDC_CONTROL_LINE_STATE_RTS = 0x02,
189188
};
190189

191-
enum
192-
{
193-
CDC_LINE_CONDING_STOP_BITS_1 = 0, // 1 bit
194-
CDC_LINE_CONDING_STOP_BITS_1_5 = 1, // 1.5 bits
195-
CDC_LINE_CONDING_STOP_BITS_2 = 2, // 2 bits
190+
enum {
191+
CDC_LINE_CODING_STOP_BITS_1 = 0, // 1 bit
192+
CDC_LINE_CODING_STOP_BITS_1_5 = 1, // 1.5 bits
193+
CDC_LINE_CODING_STOP_BITS_2 = 2, // 2 bits
196194
};
197195

198-
enum
199-
{
196+
// TODO Backward compatible for typos. Maybe removed in the future release
197+
#define CDC_LINE_CONDING_STOP_BITS_1 CDC_LINE_CODING_STOP_BITS_1
198+
#define CDC_LINE_CONDING_STOP_BITS_1_5 CDC_LINE_CODING_STOP_BITS_1_5
199+
#define CDC_LINE_CONDING_STOP_BITS_2 CDC_LINE_CODING_STOP_BITS_2
200+
201+
enum {
200202
CDC_LINE_CODING_PARITY_NONE = 0,
201203
CDC_LINE_CODING_PARITY_ODD = 1,
202204
CDC_LINE_CODING_PARITY_EVEN = 2,

src/class/cdc/cdc_host.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444

4545
// Set Line Coding on enumeration/mounted, value for cdc_line_coding_t
4646
//#ifndef CFG_TUH_CDC_LINE_CODING_ON_ENUM
47-
//#define CFG_TUH_CDC_LINE_CODING_ON_ENUM { 115200, CDC_LINE_CONDING_STOP_BITS_1, CDC_LINE_CODING_PARITY_NONE, 8 }
47+
//#define CFG_TUH_CDC_LINE_CODING_ON_ENUM { 115200, CDC_LINE_CODING_STOP_BITS_1, CDC_LINE_CODING_PARITY_NONE, 8 }
4848
//#endif
4949

5050
// RX FIFO size

0 commit comments

Comments
 (0)