Skip to content

Commit a75a324

Browse files
hathachhathach
committed
fix TinyUSB stack read signed char
1 parent 404c9e4 commit a75a324

File tree

2 files changed

+34
-34
lines changed

2 files changed

+34
-34
lines changed

‎cores/arduino/Adafruit_TinyUSB_Core/tinyusb/src/class/cdc/cdc_device.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,9 @@ uint32_t tud_cdc_n_available(uint8_t itf)
126126
return tu_fifo_count(&_cdcd_itf[itf].rx_ff);
127127
}
128128

129-
char tud_cdc_n_read_char(uint8_t itf)
129+
signed char tud_cdc_n_read_char(uint8_t itf)
130130
{
131-
char ch;
131+
signed char ch;
132132
return tud_cdc_n_read(itf, &ch, 1) ? ch : (-1);
133133
}
134134

@@ -139,9 +139,9 @@ uint32_t tud_cdc_n_read(uint8_t itf, void* buffer, uint32_t bufsize)
139139
return num_read;
140140
}
141141

142-
char tud_cdc_n_peek(uint8_t itf, int pos)
142+
signed char tud_cdc_n_peek(uint8_t itf, int pos)
143143
{
144-
char ch;
144+
signed char ch;
145145
return tu_fifo_peek_at(&_cdcd_itf[itf].rx_ff, pos, &ch) ? ch : (-1);
146146
}
147147

‎cores/arduino/Adafruit_TinyUSB_Core/tinyusb/src/class/cdc/cdc_device.h

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -51,40 +51,40 @@
5151
// APPLICATION API (Multiple Interfaces)
5252
// CFG_TUD_CDC > 1
5353
//--------------------------------------------------------------------+
54-
bool tud_cdc_n_connected (uint8_t itf);
55-
uint8_t tud_cdc_n_get_line_state (uint8_t itf);
56-
void tud_cdc_n_get_line_coding (uint8_t itf, cdc_line_coding_t* coding);
57-
void tud_cdc_n_set_wanted_char (uint8_t itf, char wanted);
58-
59-
uint32_t tud_cdc_n_available (uint8_t itf);
60-
char tud_cdc_n_read_char (uint8_t itf);
61-
uint32_t tud_cdc_n_read (uint8_t itf, void* buffer, uint32_t bufsize);
62-
void tud_cdc_n_read_flush (uint8_t itf);
63-
char tud_cdc_n_peek (uint8_t itf, int pos);
64-
65-
uint32_t tud_cdc_n_write_char (uint8_t itf, char ch);
66-
uint32_t tud_cdc_n_write (uint8_t itf, void const* buffer, uint32_t bufsize);
67-
uint32_t tud_cdc_n_write_str (uint8_t itf, char const* str);
68-
bool tud_cdc_n_write_flush (uint8_t itf);
54+
bool tud_cdc_n_connected (uint8_t itf);
55+
uint8_t tud_cdc_n_get_line_state (uint8_t itf);
56+
void tud_cdc_n_get_line_coding (uint8_t itf, cdc_line_coding_t* coding);
57+
void tud_cdc_n_set_wanted_char (uint8_t itf, char wanted);
58+
59+
uint32_t tud_cdc_n_available (uint8_t itf);
60+
signed char tud_cdc_n_read_char (uint8_t itf);
61+
uint32_t tud_cdc_n_read (uint8_t itf, void* buffer, uint32_t bufsize);
62+
void tud_cdc_n_read_flush (uint8_t itf);
63+
signed char tud_cdc_n_peek (uint8_t itf, int pos);
64+
65+
uint32_t tud_cdc_n_write_char (uint8_t itf, char ch);
66+
uint32_t tud_cdc_n_write (uint8_t itf, void const* buffer, uint32_t bufsize);
67+
uint32_t tud_cdc_n_write_str (uint8_t itf, char const* str);
68+
bool tud_cdc_n_write_flush (uint8_t itf);
6969

7070
//--------------------------------------------------------------------+
7171
// APPLICATION API (Interface0)
7272
//--------------------------------------------------------------------+
73-
static inline bool tud_cdc_connected (void) { return tud_cdc_n_connected(0); }
74-
static inline uint8_t tud_cdc_get_line_state (void) { return tud_cdc_n_get_line_state(0); }
75-
static inline void tud_cdc_get_line_coding (cdc_line_coding_t* coding) { return tud_cdc_n_get_line_coding(0, coding);}
76-
static inline void tud_cdc_set_wanted_char (char wanted) { tud_cdc_n_set_wanted_char(0, wanted); }
77-
78-
static inline uint32_t tud_cdc_available (void) { return tud_cdc_n_available(0); }
79-
static inline char tud_cdc_read_char (void) { return tud_cdc_n_read_char(0); }
80-
static inline uint32_t tud_cdc_read (void* buffer, uint32_t bufsize) { return tud_cdc_n_read(0, buffer, bufsize); }
81-
static inline void tud_cdc_read_flush (void) { tud_cdc_n_read_flush(0); }
82-
static inline char tud_cdc_peek (int pos) { return tud_cdc_n_peek(0, pos); }
83-
84-
static inline uint32_t tud_cdc_write_char (char ch) { return tud_cdc_n_write_char(0, ch); }
85-
static inline uint32_t tud_cdc_write (void const* buffer, uint32_t bufsize) { return tud_cdc_n_write(0, buffer, bufsize); }
86-
static inline uint32_t tud_cdc_write_str (char const* str) { return tud_cdc_n_write_str(0, str); }
87-
static inline bool tud_cdc_write_flush (void) { return tud_cdc_n_write_flush(0); }
73+
static inline bool tud_cdc_connected (void) { return tud_cdc_n_connected(0); }
74+
static inline uint8_t tud_cdc_get_line_state (void) { return tud_cdc_n_get_line_state(0); }
75+
static inline void tud_cdc_get_line_coding (cdc_line_coding_t* coding) { return tud_cdc_n_get_line_coding(0, coding);}
76+
static inline void tud_cdc_set_wanted_char (char wanted) { tud_cdc_n_set_wanted_char(0, wanted); }
77+
78+
static inline uint32_t tud_cdc_available (void) { return tud_cdc_n_available(0); }
79+
static inline signed char tud_cdc_read_char (void) { return tud_cdc_n_read_char(0); }
80+
static inline uint32_t tud_cdc_read (void* buffer, uint32_t bufsize) { return tud_cdc_n_read(0, buffer, bufsize); }
81+
static inline void tud_cdc_read_flush (void) { tud_cdc_n_read_flush(0); }
82+
static inline signed char tud_cdc_peek (int pos) { return tud_cdc_n_peek(0, pos); }
83+
84+
static inline uint32_t tud_cdc_write_char (char ch) { return tud_cdc_n_write_char(0, ch); }
85+
static inline uint32_t tud_cdc_write (void const* buffer, uint32_t bufsize) { return tud_cdc_n_write(0, buffer, bufsize); }
86+
static inline uint32_t tud_cdc_write_str (char const* str) { return tud_cdc_n_write_str(0, str); }
87+
static inline bool tud_cdc_write_flush (void) { return tud_cdc_n_write_flush(0); }
8888

8989
//--------------------------------------------------------------------+
9090
// APPLICATION CALLBACK API (WEAK is optional)

0 commit comments

Comments
 (0)