Skip to content

Failed to advance buffer ptrs in usb_cdc.Serial properly #4922

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 25, 2021
Merged

Failed to advance buffer ptrs in usb_cdc.Serial properly #4922

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions shared-module/usb_cdc/Serial.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,10 @@ size_t common_hal_usb_cdc_serial_read(usb_cdc_serial_obj_t *self, uint8_t *data,
uint32_t total_num_read = tud_cdc_n_read(self->idx, data, len);

if (wait_forever || wait_for_timeout) {
// Continue filling the buffer past what we already read.
len -= total_num_read;
data += total_num_read;

// Read more if we have time.
// Use special routine to avoid pulling in uint64-float-compatible math routines.
uint64_t timeout_ms = float_to_uint64(self->timeout * 1000); // Junk value if timeout < 0.
Expand Down Expand Up @@ -78,6 +82,10 @@ size_t common_hal_usb_cdc_serial_write(usb_cdc_serial_obj_t *self, const uint8_t
tud_cdc_n_write_flush(self->idx);

if (wait_forever || wait_for_timeout) {
// Continue writing the rest of the buffer.
len -= total_num_written;
data += total_num_written;

// Write more if we have time.
// Use special routine to avoid pulling in uint64-float-compatible math routines.
uint64_t timeout_ms = float_to_uint64(self->write_timeout * 1000); // Junk value if write_timeout < 0.
Expand Down