summaryrefslogtreecommitdiff
path: root/supervisor/shared/usb
diff options
context:
space:
mode:
authorDavePutz <dwputz@gmail.com>2020-05-21 11:05:24 -0500
committerGitHub <noreply@github.com>2020-05-21 11:05:24 -0500
commit1f40f9e04ff9be0eb82f56014bde5749be604ad9 (patch)
treecac462c8edf2c5f34bca1b9063652be4f2b6f2e4 /supervisor/shared/usb
parent7fa5009674c7741436fd45a3d2009019280aa6f6 (diff)
parentedc5d8938e0360a61fcea03344d3c525d836048d (diff)
Merge pull request #5 from adafruit/master
update from adafruit
Diffstat (limited to 'supervisor/shared/usb')
-rw-r--r--supervisor/shared/usb/tusb_config.h2
-rw-r--r--supervisor/shared/usb/usb.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/supervisor/shared/usb/tusb_config.h b/supervisor/shared/usb/tusb_config.h
index 1b0c83416..627de743e 100644
--- a/supervisor/shared/usb/tusb_config.h
+++ b/supervisor/shared/usb/tusb_config.h
@@ -52,7 +52,9 @@
#define CFG_TUSB_DEBUG 0
/*------------- RTOS -------------*/
+#ifndef CFG_TUSB_OS
#define CFG_TUSB_OS OPT_OS_NONE
+#endif
//#define CFG_TUD_TASK_QUEUE_SZ 16
//#define CFG_TUD_TASK_PRIO 0
//#define CFG_TUD_TASK_STACK_SZ 150
diff --git a/supervisor/shared/usb/usb.c b/supervisor/shared/usb/usb.c
index 774055a82..edf810118 100644
--- a/supervisor/shared/usb/usb.c
+++ b/supervisor/shared/usb/usb.c
@@ -75,7 +75,9 @@ void usb_init(void) {
void usb_background(void) {
if (usb_enabled()) {
+ #if CFG_TUSB_OS == OPT_OS_NONE
tud_task();
+ #endif
tud_cdc_write_flush();
}
}