kopia lustrzana https://github.com/micropython/micropython
samd/mphalport: Use shared/tinyusb cdc functions.
Signed-off-by: Andrew Leech <andrew@alelec.net>
rodzic
d3345d7511
commit
44052876c9
|
@ -30,6 +30,7 @@
|
|||
#include "py/stream.h"
|
||||
#include "shared/runtime/interrupt_char.h"
|
||||
#include "shared/tinyusb/mp_usbd.h"
|
||||
#include "shared/tinyusb/mp_cdc_common.h"
|
||||
#include "extmod/misc.h"
|
||||
#include "samd_soc.h"
|
||||
#include "tusb.h"
|
||||
|
@ -51,48 +52,6 @@ ringbuf_t stdin_ringbuf = { stdin_ringbuf_array, sizeof(stdin_ringbuf_array), 0,
|
|||
mp_usbd_task(); \
|
||||
} while (0)
|
||||
|
||||
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 MICROPY_KBD_EXCEPTION
|
||||
if (data_char == mp_interrupt_char) {
|
||||
// Clear the ring buffer
|
||||
stdin_ringbuf.iget = stdin_ringbuf.iput = 0;
|
||||
// and stop
|
||||
mp_sched_keyboard_interrupt();
|
||||
} else {
|
||||
ringbuf_put(&stdin_ringbuf, data_char);
|
||||
}
|
||||
#else
|
||||
ringbuf_put(&stdin_ringbuf, data_char);
|
||||
#endif
|
||||
} else {
|
||||
cdc_itf_pending |= (1 << itf);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void mp_hal_set_pin_mux(mp_hal_pin_obj_t pin, uint8_t mux) {
|
||||
int pin_grp = pin / 32;
|
||||
int port_grp = (pin % 32) / 2;
|
||||
|
@ -166,7 +125,7 @@ uint64_t mp_hal_ticks_us_64(void) {
|
|||
uintptr_t mp_hal_stdio_poll(uintptr_t poll_flags) {
|
||||
uintptr_t ret = 0;
|
||||
|
||||
poll_cdc_interfaces();
|
||||
tud_cdc_poll_interfaces();
|
||||
if ((poll_flags & MP_STREAM_POLL_RD) && ringbuf_peek(&stdin_ringbuf) != -1) {
|
||||
ret |= MP_STREAM_POLL_RD;
|
||||
}
|
||||
|
@ -184,7 +143,7 @@ uintptr_t mp_hal_stdio_poll(uintptr_t poll_flags) {
|
|||
int mp_hal_stdin_rx_chr(void) {
|
||||
for (;;) {
|
||||
|
||||
poll_cdc_interfaces();
|
||||
tud_cdc_poll_interfaces();
|
||||
int c = ringbuf_get(&stdin_ringbuf);
|
||||
if (c != -1) {
|
||||
return c;
|
||||
|
@ -203,28 +162,10 @@ int mp_hal_stdin_rx_chr(void) {
|
|||
mp_uint_t mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
|
||||
mp_uint_t ret = len;
|
||||
bool did_write = false;
|
||||
if (tud_cdc_connected()) {
|
||||
size_t i = 0;
|
||||
while (i < len) {
|
||||
uint32_t n = len - i;
|
||||
if (n > CFG_TUD_CDC_EP_BUFSIZE) {
|
||||
n = CFG_TUD_CDC_EP_BUFSIZE;
|
||||
}
|
||||
int timeout = 0;
|
||||
// Wait with a max of USC_CDC_TIMEOUT ms
|
||||
while (n > tud_cdc_write_available() && timeout++ < MICROPY_HW_USB_CDC_TX_TIMEOUT) {
|
||||
MICROPY_EVENT_POLL_HOOK_WITH_USB;
|
||||
}
|
||||
if (timeout >= MICROPY_HW_USB_CDC_TX_TIMEOUT) {
|
||||
ret = i;
|
||||
break;
|
||||
}
|
||||
uint32_t n2 = tud_cdc_write(str + i, n);
|
||||
tud_cdc_write_flush();
|
||||
i += n2;
|
||||
}
|
||||
ret = MIN(i, ret);
|
||||
mp_uint_t cdc_res = tud_cdc_tx_strn(str, len);
|
||||
if (cdc_res > 0) {
|
||||
did_write = true;
|
||||
ret = MIN(cdc_res, ret);
|
||||
}
|
||||
#if MICROPY_PY_OS_DUPTERM
|
||||
int dupterm_res = mp_os_dupterm_tx_strn(str, len);
|
||||
|
|
Ładowanie…
Reference in New Issue