5873390226
Prior to this commit, the USB CDC OUT endpoint got NACK'd if a character was received but not consumed by the application, e.g. via sys.stdin.read(). This meant that USB CDC was blocked and no additional characters could be sent from the host. In particular a ctrl-C could not interrupt the application if another character was pending. To fix the issue, the approach in this commit uses a callback tud_cdc_rx_cb which is called by the TinyUSB stack on reception of new CDC data. By consuming the data immediately, the endpoint does not stall anymore. The previous handler tud_cdc_rx_wanted_cb was made obsolete and removed. In addition some cleanup was done along the way: by adding interrupt_char.c and removing the existing code mp_hal_set_interrupt_char(). Also, there is now only one (stdin) ringbuffer. Fixes issue #7996.
167 lines
5.0 KiB
C
167 lines
5.0 KiB
C
/*
|
|
* This file is part of the MicroPython project, http://micropython.org/
|
|
*
|
|
* The MIT License (MIT)
|
|
*
|
|
* Copyright (c) 2020-2021 Damien P. George
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
* in the Software without restriction, including without limitation the rights
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
* furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
* THE SOFTWARE.
|
|
*/
|
|
|
|
#include "py/runtime.h"
|
|
#include "py/stream.h"
|
|
#include "py/mphal.h"
|
|
#include "extmod/misc.h"
|
|
#include "shared/runtime/interrupt_char.h"
|
|
#include "shared/timeutils/timeutils.h"
|
|
#include "tusb.h"
|
|
#include "uart.h"
|
|
#include "hardware/rtc.h"
|
|
|
|
#if MICROPY_HW_ENABLE_UART_REPL || MICROPY_HW_ENABLE_USBDEV
|
|
|
|
#ifndef MICROPY_HW_STDIN_BUFFER_LEN
|
|
#define MICROPY_HW_STDIN_BUFFER_LEN 512
|
|
#endif
|
|
|
|
STATIC uint8_t stdin_ringbuf_array[MICROPY_HW_STDIN_BUFFER_LEN];
|
|
ringbuf_t stdin_ringbuf = { stdin_ringbuf_array, sizeof(stdin_ringbuf_array) };
|
|
|
|
#endif
|
|
|
|
#if MICROPY_HW_ENABLE_USBDEV
|
|
|
|
uint8_t cdc_itf_pending; // keep track of cdc interfaces which need attention to poll
|
|
|
|
void poll_cdc_interfaces(void) {
|
|
// any CDC interfaces left to poll?
|
|
if (cdc_itf_pending && ringbuf_free(&stdin_ringbuf)) {
|
|
for (uint8_t itf = 0; itf < 8; ++itf) {
|
|
if (cdc_itf_pending & (1 << itf)) {
|
|
tud_cdc_rx_cb(itf);
|
|
if (!cdc_itf_pending) {
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
void tud_cdc_rx_cb(uint8_t itf) {
|
|
// consume pending USB data immediately to free usb buffer and keep the endpoint from stalling.
|
|
// in case the ringbuffer is full, mark the CDC interface that need attention later on for polling
|
|
cdc_itf_pending &= ~(1 << itf);
|
|
for (uint32_t bytes_avail = tud_cdc_n_available(itf); bytes_avail > 0; --bytes_avail) {
|
|
if (ringbuf_free(&stdin_ringbuf)) {
|
|
int data_char = tud_cdc_read_char();
|
|
if (data_char == mp_interrupt_char) {
|
|
mp_sched_keyboard_interrupt();
|
|
} else {
|
|
ringbuf_put(&stdin_ringbuf, data_char);
|
|
}
|
|
} else {
|
|
cdc_itf_pending |= (1 << itf);
|
|
return;
|
|
}
|
|
}
|
|
}
|
|
|
|
#endif
|
|
|
|
uintptr_t mp_hal_stdio_poll(uintptr_t poll_flags) {
|
|
uintptr_t ret = 0;
|
|
#if MICROPY_HW_ENABLE_USBDEV
|
|
poll_cdc_interfaces();
|
|
#endif
|
|
#if MICROPY_HW_ENABLE_UART_REPL || MICROPY_HW_ENABLE_USBDEV
|
|
if ((poll_flags & MP_STREAM_POLL_RD) && ringbuf_peek(&stdin_ringbuf) != -1) {
|
|
ret |= MP_STREAM_POLL_RD;
|
|
}
|
|
#endif
|
|
#if MICROPY_PY_OS_DUPTERM
|
|
ret |= mp_uos_dupterm_poll(poll_flags);
|
|
#endif
|
|
return ret;
|
|
}
|
|
|
|
// Receive single character
|
|
int mp_hal_stdin_rx_chr(void) {
|
|
for (;;) {
|
|
#if MICROPY_HW_ENABLE_USBDEV
|
|
poll_cdc_interfaces();
|
|
#endif
|
|
|
|
int c = ringbuf_get(&stdin_ringbuf);
|
|
if (c != -1) {
|
|
return c;
|
|
}
|
|
#if MICROPY_PY_OS_DUPTERM
|
|
int dupterm_c = mp_uos_dupterm_rx_chr();
|
|
if (dupterm_c >= 0) {
|
|
return dupterm_c;
|
|
}
|
|
#endif
|
|
MICROPY_EVENT_POLL_HOOK
|
|
}
|
|
}
|
|
|
|
// Send string of given length
|
|
void mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
|
|
#if MICROPY_HW_ENABLE_UART_REPL
|
|
mp_uart_write_strn(str, len);
|
|
#endif
|
|
|
|
#if MICROPY_HW_ENABLE_USBDEV
|
|
if (tud_cdc_connected()) {
|
|
for (size_t i = 0; i < len;) {
|
|
uint32_t n = len - i;
|
|
if (n > CFG_TUD_CDC_EP_BUFSIZE) {
|
|
n = CFG_TUD_CDC_EP_BUFSIZE;
|
|
}
|
|
while (n > tud_cdc_write_available()) {
|
|
MICROPY_EVENT_POLL_HOOK
|
|
}
|
|
uint32_t n2 = tud_cdc_write(str + i, n);
|
|
tud_cdc_write_flush();
|
|
i += n2;
|
|
}
|
|
}
|
|
#endif
|
|
|
|
#if MICROPY_PY_OS_DUPTERM
|
|
mp_uos_dupterm_tx_strn(str, len);
|
|
#endif
|
|
}
|
|
|
|
void mp_hal_delay_ms(mp_uint_t ms) {
|
|
absolute_time_t t = make_timeout_time_ms(ms);
|
|
while (!time_reached(t)) {
|
|
mp_handle_pending(true);
|
|
best_effort_wfe_or_timeout(t);
|
|
MICROPY_HW_USBDEV_TASK_HOOK
|
|
}
|
|
}
|
|
|
|
uint64_t mp_hal_time_ns(void) {
|
|
datetime_t t;
|
|
rtc_get_datetime(&t);
|
|
uint64_t s = timeutils_seconds_since_epoch(t.year, t.month, t.day, t.hour, t.min, t.sec);
|
|
return s * 1000000000ULL;
|
|
}
|