Skip to content

Commit f334816

Browse files
committed
stm32/uart: Make sure user IRQs are handled even with a keyboard intr.
1 parent 7bdbea9 commit f334816

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

ports/stm32/uart.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -729,17 +729,17 @@ void uart_irq_handler(mp_uint_t uart_id) {
729729
int data = self->uartx->DR; // clears UART_FLAG_RXNE
730730
#endif
731731
data &= self->char_mask;
732-
// Handle interrupt coming in on a UART REPL
733732
if (self->attached_to_repl && data == mp_interrupt_char) {
733+
// Handle interrupt coming in on a UART REPL
734734
pendsv_kbd_intr();
735-
return;
736-
}
737-
if (self->char_width == CHAR_WIDTH_9BIT) {
738-
((uint16_t*)self->read_buf)[self->read_buf_head] = data;
739735
} else {
740-
self->read_buf[self->read_buf_head] = data;
736+
if (self->char_width == CHAR_WIDTH_9BIT) {
737+
((uint16_t*)self->read_buf)[self->read_buf_head] = data;
738+
} else {
739+
self->read_buf[self->read_buf_head] = data;
740+
}
741+
self->read_buf_head = next_head;
741742
}
742-
self->read_buf_head = next_head;
743743
} else { // No room: leave char in buf, disable interrupt
744744
UART_RXNE_IT_DIS(self->uartx);
745745
}

0 commit comments

Comments
 (0)