diff --git a/core/SConscript.firmware b/core/SConscript.firmware index 5e199f261..ca818a3a5 100644 --- a/core/SConscript.firmware +++ b/core/SConscript.firmware @@ -295,7 +295,6 @@ SOURCE_MICROPYTHON = [ 'vendor/micropython/shared/runtime/stdout_helpers.c', 'vendor/micropython/shared/timeutils/timeutils.c', 'vendor/micropython/ports/stm32/gccollect.c', - 'vendor/micropython/ports/stm32/pendsv.c', 'vendor/micropython/py/argcheck.c', 'vendor/micropython/py/asmarm.c', 'vendor/micropython/py/asmbase.c', diff --git a/core/embed/extmod/modtrezorio/modtrezorio-vcp.h b/core/embed/extmod/modtrezorio/modtrezorio-vcp.h index d063ba143..fc9ae5261 100644 --- a/core/embed/extmod/modtrezorio/modtrezorio-vcp.h +++ b/core/embed/extmod/modtrezorio/modtrezorio-vcp.h @@ -17,8 +17,6 @@ * along with this program. If not, see . */ -void pendsv_kbd_intr(void); - /// package: trezorio.__init__ /// class VCP: @@ -93,7 +91,7 @@ STATIC mp_obj_t mod_trezorio_VCP_make_new(const mp_obj_type_t *type, o->info.rx_buffer = m_new(uint8_t, vcp_buffer_len); o->info.tx_buffer_len = vcp_buffer_len; o->info.rx_buffer_len = vcp_buffer_len; - o->info.rx_intr_fn = pendsv_kbd_intr; + o->info.rx_intr_fn = NULL; o->info.rx_intr_byte = 3; // Ctrl-C o->info.iface_num = (uint8_t)(iface_num); o->info.data_iface_num = (uint8_t)(data_iface_num); diff --git a/core/embed/firmware/main.c b/core/embed/firmware/main.c index fc59514d3..cd19d3809 100644 --- a/core/embed/firmware/main.c +++ b/core/embed/firmware/main.c @@ -187,7 +187,6 @@ int main(void) { #endif // Init peripherals - pendsv_init(); fault_handlers_init(); diff --git a/core/embed/trezorhal/stm32f4/irq.h b/core/embed/trezorhal/stm32f4/irq.h index 319755f1c..6d1fe0b0a 100644 --- a/core/embed/trezorhal/stm32f4/irq.h +++ b/core/embed/trezorhal/stm32f4/irq.h @@ -155,10 +155,7 @@ static inline void restore_irq_pri(uint32_t state) { #define IRQ_PRI_EXTINT NVIC_EncodePriority(NVIC_PRIORITYGROUP_4, 14, 0) -// PENDSV should be at the lowst priority so that other interrupts complete -// before exception is raised. -#define IRQ_PRI_PENDSV NVIC_EncodePriority(NVIC_PRIORITYGROUP_4, 15, 0) -#define IRQ_PRI_RTC_WKUP NVIC_EncodePriority(NVIC_PRIORITYGROUP_4, 15, 0) +//?#define IRQ_PRI_RTC_WKUP NVIC_EncodePriority(NVIC_PRIORITYGROUP_4, 15, 0) // !@# TAMPER interrupt priority should be probably much higher #define IRQ_PRI_TAMP NVIC_EncodePriority(NVIC_PRIORITYGROUP_4, 15, 0) diff --git a/core/embed/trezorhal/unix/usb.c b/core/embed/trezorhal/unix/usb.c index f5c1a00e7..e57f5120c 100644 --- a/core/embed/trezorhal/unix/usb.c +++ b/core/embed/trezorhal/unix/usb.c @@ -280,8 +280,6 @@ int usb_webusb_write_blocking(uint8_t iface_num, const uint8_t *buf, return usb_webusb_write(iface_num, buf, len); } -void pendsv_kbd_intr(void) {} - void mp_hal_set_vcp_iface(int iface_num) {} secbool usb_configured(void) {