Fix UART deinit issues and crashes

Remove interrupt callback before stopping thread Prevents race condition of interrupt setting flag on free'd thread Also correctly stop async rx events
Next-Flip · Mar 22, 2024 · 7424373 · 7424373
1 parent 245ee64
commit 7424373
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/applications/debug/uart_echo/uart_echo.c b/applications/debug/uart_echo/uart_echo.c
@@ -283,13 +283,14 @@ static UartEchoApp* uart_echo_app_alloc(uint32_t baudrate) {
 static void uart_echo_app_free(UartEchoApp* app) {
     furi_assert(app);
 
+    furi_hal_serial_async_rx_stop(app->serial_handle);
+    furi_hal_serial_deinit(app->serial_handle);
+    furi_hal_serial_control_release(app->serial_handle);
+
     furi_thread_flags_set(furi_thread_get_id(app->worker_thread), WorkerEventStop);
     furi_thread_join(app->worker_thread);
     furi_thread_free(app->worker_thread);
 
-    furi_hal_serial_deinit(app->serial_handle);
-    furi_hal_serial_control_release(app->serial_handle);
-
     // Free views
     view_dispatcher_remove_view(app->view_dispatcher, 0);
 

diff --git a/applications/external b/applications/external
diff --git a/applications/main/subghz/helpers/subghz_gps.c b/applications/main/subghz/helpers/subghz_gps.c
@@ -147,6 +147,7 @@ SubGhzGPS* subghz_gps_init() {
 void subghz_gps_deinit(SubGhzGPS* subghz_gps) {
     furi_assert(subghz_gps);
 
+    furi_hal_serial_async_rx_stop(subghz_gps->serial_handle);
     furi_hal_serial_deinit(subghz_gps->serial_handle);
     furi_hal_serial_control_release(subghz_gps->serial_handle);
+5 −4		camera_suite/views/camera_suite_view_camera.c
+2 −0		dap_link/dap_link.c
+4 −3		esp8266_deauth/esp8266_deauth.c
+4 −3		esp_flasher/esp_flasher_uart.c
+3 −3		evil_portal/evil_portal_uart.c
+1 −0		gpio_reader_b/usb_uart_bridge.c
+1 −0		gps_nmea/gps_uart.c
+4 −3		magspoof/scenes/mag_scene_read.c
+1 −0		mayhem_camera/camera.c
+4 −3		mayhem_marauder/wifi_marauder_uart.c
+4 −3		mayhem_morseflash/uart_terminal_uart.c
+1 −0		mayhem_motion/uart_echo.c
+1 −0		mayhem_nannycam/uart_echo.c
+1 −0		mayhem_qrcode/uart_echo.c
+4 −3		uart_terminal/uart_terminal_uart.c
+10 −8		wardriver/wardriver_uart.c
+4 −3		wifi_deauther/wifi_deauther_uart.c
+4 −3		wifi_marauder_companion/wifi_marauder_uart.c
+1 −0		wifi_scanner/wifi_scanner.c