Skip to content

Commit 5705388

Browse files
committed
Make Serial::read and dependant functions 8-bit clean.
1 parent e873acd commit 5705388

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

cores/nRF5/Adafruit_TinyUSB_Core/Adafruit_USBD_CDC.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ int Adafruit_USBD_CDC::peek(void)
9696

9797
int Adafruit_USBD_CDC::read(void)
9898
{
99-
return (int) tud_cdc_read_char();
99+
return tud_cdc_read_char();
100100
}
101101

102102
void Adafruit_USBD_CDC::flush(void)

cores/nRF5/Adafruit_TinyUSB_Core/tinyusb/src/class/cdc/cdc_device.c

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

124-
signed char tud_cdc_n_read_char(uint8_t itf)
124+
int tud_cdc_n_read_char(uint8_t itf)
125125
{
126-
signed char ch;
126+
unsigned char ch;
127127
return tud_cdc_n_read(itf, &ch, 1) ? ch : (-1);
128128
}
129129

@@ -134,9 +134,9 @@ uint32_t tud_cdc_n_read(uint8_t itf, void* buffer, uint32_t bufsize)
134134
return num_read;
135135
}
136136

137-
signed char tud_cdc_n_peek(uint8_t itf, int pos)
137+
int tud_cdc_n_peek(uint8_t itf, int pos)
138138
{
139-
signed char ch;
139+
unsigned char ch;
140140
return tu_fifo_peek_at(&_cdcd_itf[itf].rx_ff, pos, &ch) ? ch : (-1);
141141
}
142142

cores/nRF5/Adafruit_TinyUSB_Core/tinyusb/src/class/cdc/cdc_device.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,10 @@ void tud_cdc_n_get_line_coding (uint8_t itf, cdc_line_coding_t* coding);
5757
void tud_cdc_n_set_wanted_char (uint8_t itf, char wanted);
5858

5959
uint32_t tud_cdc_n_available (uint8_t itf);
60-
signed char tud_cdc_n_read_char (uint8_t itf);
60+
int tud_cdc_n_read_char (uint8_t itf);
6161
uint32_t tud_cdc_n_read (uint8_t itf, void* buffer, uint32_t bufsize);
6262
void tud_cdc_n_read_flush (uint8_t itf);
63-
signed char tud_cdc_n_peek (uint8_t itf, int pos);
63+
int tud_cdc_n_peek (uint8_t itf, int pos);
6464

6565
uint32_t tud_cdc_n_write_char (uint8_t itf, char ch);
6666
uint32_t tud_cdc_n_write (uint8_t itf, void const* buffer, uint32_t bufsize);
@@ -76,10 +76,10 @@ static inline void tud_cdc_get_line_coding (cdc_line_coding_t* coding);
7676
static inline void tud_cdc_set_wanted_char (char wanted);
7777

7878
static inline uint32_t tud_cdc_available (void);
79-
static inline signed char tud_cdc_read_char (void);
79+
static inline int tud_cdc_read_char (void);
8080
static inline uint32_t tud_cdc_read (void* buffer, uint32_t bufsize);
8181
static inline void tud_cdc_read_flush (void);
82-
static inline signed char tud_cdc_peek (int pos);
82+
static inline int tud_cdc_peek (int pos);
8383

8484
static inline uint32_t tud_cdc_write_char (char ch);
8585
static inline uint32_t tud_cdc_write (void const* buffer, uint32_t bufsize);
@@ -130,7 +130,7 @@ static inline uint32_t tud_cdc_available (void)
130130
return tud_cdc_n_available(0);
131131
}
132132

133-
static inline signed char tud_cdc_read_char (void)
133+
static inline int tud_cdc_read_char (void)
134134
{
135135
return tud_cdc_n_read_char(0);
136136
}
@@ -145,7 +145,7 @@ static inline void tud_cdc_read_flush (void)
145145
tud_cdc_n_read_flush(0);
146146
}
147147

148-
static inline signed char tud_cdc_peek (int pos)
148+
static inline int tud_cdc_peek (int pos)
149149
{
150150
return tud_cdc_n_peek(0, pos);
151151
}

0 commit comments

Comments
 (0)