Skip to content
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

Jump to bottom

Add call to tud_task in getchar() #918

Merged
merged 9 commits into from
Aug 8, 2022
Merged

Add call to tud_task in getchar() #918

Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a3b7d32
Add call to tud_task in getchar() if no characters are available, in …
kilograham Jul 13, 2022
647d6fc
Fix possible tud_task skipping due to removal of periodic timer
kilograham Jul 13, 2022
6124bc9
stop creation of multiple timers when not useing repeating timers
kilograham Jul 20, 2022
182c4c8
oops
kilograham Jul 20, 2022
c4338dc
oops - accidental bump of tinyusb
kilograham Jul 20, 2022
dc2a6b3
ugh this is more complicated than I thought - added some comments to …
kilograham Jul 20, 2022
cde95d8
move some data inside #ifdef
kilograham Jul 20, 2022
d095c41
added method to get alarm_pool core_num so stdio_usb_init can fail early
kilograham Aug 8, 2022
e43f154
fix comment
kilograham Aug 8, 2022
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
24 changes: 18 additions & 6 deletions src/rp2_common/pico_stdio_usb/stdio_usb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,13 @@ static_assert(PICO_STDIO_USB_LOW_PRIORITY_IRQ >= NUM_IRQS - NUM_USER_IRQS, "");
#else
static uint8_t low_priority_irq_num;
#endif
static bool using_periodic_timer;

static int64_t timer_task(__unused alarm_id_t id, __unused void *user_data) {
assert(stdio_usb_core_num == get_core_num()); // if this fails, you have initialized stdio_usb on the wrong core
Wren6991 marked this conversation as resolved.
Show resolved Hide resolved
irq_set_pending(low_priority_irq_num);
return using_periodic_timer ? PICO_STDIO_USB_TASK_INTERVAL_US : 0;
}

static void low_priority_worker_irq(void) {
// if the mutex is already owned, then we are in user code
Expand All @@ -39,18 +46,18 @@ static void low_priority_worker_irq(void) {
if (mutex_try_enter(&stdio_usb_mutex, NULL)) {
tud_task();
mutex_exit(&stdio_usb_mutex);
} else {
// if we don't have a periodic timer, then we need to make sure the tud_task is tried again later
if (!using_periodic_timer) {
add_alarm_in_us(PICO_STDIO_USB_TASK_INTERVAL_US, timer_task, NULL, true);
}
}
}

static void usb_irq(void) {
irq_set_pending(low_priority_irq_num);
}

static int64_t timer_task(__unused alarm_id_t id, __unused void *user_data) {
assert(stdio_usb_core_num == get_core_num()); // if this fails, you have initialized stdio_usb on the wrong core
irq_set_pending(low_priority_irq_num);
return PICO_STDIO_USB_TASK_INTERVAL_US;
}
#endif

static void stdio_usb_out_chars(const char *buf, int length) {
Expand Down Expand Up @@ -97,6 +104,9 @@ int stdio_usb_in_chars(char *buf, int length) {
if (tud_cdc_connected() && tud_cdc_available()) {
int count = (int) tud_cdc_read(buf, (uint32_t) length);
rc = count ? count : PICO_ERROR_NO_DATA;
} else {
// because our mutex use may starve out the background task, run tud_task here (we own the mutex)
tud_task();
}
mutex_exit(&stdio_usb_mutex);
return rc;
Expand Down Expand Up @@ -139,8 +149,10 @@ bool stdio_usb_init(void) {
if (irq_has_shared_handler(USBCTRL_IRQ)) {
// we can use a shared handler to notice when there may be work to do
irq_add_shared_handler(USBCTRL_IRQ, usb_irq, PICO_SHARED_IRQ_HANDLER_LOWEST_ORDER_PRIORITY);
using_periodic_timer = false;
} else {
rc = add_alarm_in_us(PICO_STDIO_USB_TASK_INTERVAL_US, timer_task, NULL, true);
rc = add_alarm_in_us(PICO_STDIO_USB_TASK_INTERVAL_US, timer_task, NULL, true) >= 0;
using_periodic_timer = rc;
}
#endif
if (rc) {
Expand Down