8000 shared/tinyusb: Wake main task if needed at end of USB ISR. · micropython/micropython@67d9d67 · GitHub
[go: up one dir, main page]
Skip to content

Commit 67d9d67

Browse files
pi-anlpi-anl
committed
shared/tinyusb: Wake main task if needed at end of USB ISR.
Signed-off-by: Andrew Leech <andrew@alelec.net>
1 parent b89e91f commit 67d9d67

File tree

6 files changed

+22
-2
lines changed

6 files changed

+22
-2
lines changed

‎ports/mimxrt/mphalport.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,10 @@ __attribute__((always_inline)) static inline uint32_t disable_irq(void) {
109109

110110
void mp_hal_set_interrupt_char(int c);
111111

112+
static inline void mp_hal_wake_main_task_from_isr(void) {
113+
// Defined for tinyusb support, nothing needs to be done here.
114+
}
115+
112116
static inline mp_uint_t mp_hal_ticks_ms(void) {
113117
return ticks_ms32();
114118
}

‎ports/nrf/mphalport.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,10 @@ void mp_hal_set_interrupt_char(int c); // -1 to disable
5353
int mp_hal_stdin_rx_chr(void);
5454
void mp_hal_stdout_tx_str(const char *str);
5555

56+
static inline void mp_hal_wake_main_task_from_isr(void) {
57+
// Defined for tinyusb support, nothing needs to be done here.
58+
}
59+
5660
void mp_hal_delay_ms(mp_uint_t ms);
5761
void mp_hal_delay_us(mp_uint_t us);
5862

‎ports/renesas-ra/mphalport.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,10 @@ static inline int mp_hal_status_to_neg_errno(HAL_StatusTypeDef status) {
5252
NORETURN void mp_hal_raise(HAL_StatusTypeDef status);
5353
void mp_hal_set_interrupt_char(int c); // -1 to disable
5454

55+
static inline void mp_hal_wake_main_task_from_isr(void) {
56+
// Defined for tinyusb support, nothing needs to be done here.
57+
}
58+
5559
// timing functions
5660

5761
#include "irq.h"
@@ -117,5 +121,3 @@ enum {
117121
};
118122

119123
void mp_hal_get_mac(int idx, uint8_t buf[6]);
120-
121-
void mp_hal_set_interrupt_char(int c); // -1 to disable

‎ports/rp2/mphalport.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,10 @@ void mp_thread_end_atomic_section(uint32_t);
7777
void mp_hal_set_interrupt_char(int c);
7878
void mp_hal_time_ns_set_from_rtc(void);
7979

80+
static inline void mp_hal_wake_main_task_from_isr(v 10000 oid) {
81+
// Defined for tinyusb support, nothing needs to be done here.
82+
}
83+
8084
static inline void mp_hal_delay_us_fast(mp_uint_t us) {
8185
busy_wait_us(us);
8286
}

‎ports/samd/mphalport.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,10 @@ uint64_t mp_hal_ticks_us_64(void);
5050

5151
void mp_hal_set_interrupt_char(int c);
5252

53+
static inline void mp_hal_wake_main_task_from_isr(void) {
54+
// Defined for tinyusb support, nothing needs to be done here.
55+
}
56+
5357
__attribute__((always_inline)) static inline void enable_irq(uint32_t state) {
5458
__set_PRIMASK(state);
5559
}

‎shared/tinyusb/mp_usbd.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
*/
2626

2727
#include "py/mpconfig.h"
28+
#include "mphalport.h"
2829

2930
#if MICROPY_HW_ENABLE_USBDEV
3031

@@ -55,6 +56,7 @@ extern void __real_dcd_event_handler(dcd_event_t const *event, bool in_isr);
5556
TU_ATTR_FAST_FUNC void __wrap_dcd_event_handler(dcd_event_t const *event, bool in_isr) {
5657
__real_dcd_event_handler(event, in_isr);
5758
mp_usbd_schedule_task();
59+
mp_hal_wake_main_task_from_isr();
5860
}
5961

6062
TU_ATTR_FAST_FUNC void mp_usbd_schedule_task(void) {

0 commit comments

Comments
 (0)
0