Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-05-23 05:24:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

usb_uart_bridge: open and close vcp record once

Browse Source
This commit is contained in:
Anna Antonenko
2025-04-15 03:45:37 +04:00
parent 63cfa2d684
commit 086a9185fc
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
applications/main/gpio/usb_uart_bridge.c
View File

@@ -60,6 +60,8 @@ struct UsbUartBridge {
FuriApiLock cfg_lock; FuriApiLock cfg_lock;
CliVcp* cli_vcp;
uint8_t rx_buf[USB_CDC_PKT_LEN]; uint8_t rx_buf[USB_CDC_PKT_LEN];
}; };
@@ -105,15 +107,11 @@ static void usb_uart_on_irq_rx_dma_cb(
static void usb_uart_vcp_init(UsbUartBridge* usb_uart, uint8_t vcp_ch) { static void usb_uart_vcp_init(UsbUartBridge* usb_uart, uint8_t vcp_ch) {
furi_hal_usb_unlock(); furi_hal_usb_unlock();
if(vcp_ch == 0) { if(vcp_ch == 0) {
CliVcp* cli_vcp = furi_record_open(RECORD_CLI_VCP); cli_vcp_disable(usb_uart->cli_vcp);
cli_vcp_disable(cli_vcp);
furi_record_close(RECORD_CLI_VCP);
furi_check(furi_hal_usb_set_config(&usb_cdc_single, NULL) == true); furi_check(furi_hal_usb_set_config(&usb_cdc_single, NULL) == true);
} else { } else {
furi_check(furi_hal_usb_set_config(&usb_cdc_dual, NULL) == true); furi_check(furi_hal_usb_set_config(&usb_cdc_dual, NULL) == true);
CliVcp* cli_vcp = furi_record_open(RECORD_CLI_VCP); cli_vcp_enable(usb_uart->cli_vcp);
cli_vcp_enable(cli_vcp);
furi_record_close(RECORD_CLI_VCP);
} }
furi_hal_cdc_set_callbacks(vcp_ch, (CdcCallbacks*)&cdc_cb, usb_uart); furi_hal_cdc_set_callbacks(vcp_ch, (CdcCallbacks*)&cdc_cb, usb_uart);
} }
@@ -122,9 +120,7 @@ static void usb_uart_vcp_deinit(UsbUartBridge* usb_uart, uint8_t vcp_ch) {
UNUSED(usb_uart); UNUSED(usb_uart);
furi_hal_cdc_set_callbacks(vcp_ch, NULL, NULL); furi_hal_cdc_set_callbacks(vcp_ch, NULL, NULL);
if(vcp_ch != 0) { if(vcp_ch != 0) {
CliVcp* cli_vcp = furi_record_open(RECORD_CLI_VCP); cli_vcp_disable(usb_uart->cli_vcp);
cli_vcp_disable(cli_vcp);
furi_record_close(RECORD_CLI_VCP);
} }
} }
@@ -176,6 +172,8 @@ static int32_t usb_uart_worker(void* context) {
memcpy(&usb_uart->cfg, &usb_uart->cfg_new, sizeof(UsbUartConfig)); memcpy(&usb_uart->cfg, &usb_uart->cfg_new, sizeof(UsbUartConfig));
usb_uart->cli_vcp = furi_record_open(RECORD_CLI_VCP);
usb_uart->rx_stream = furi_stream_buffer_alloc(USB_UART_RX_BUF_SIZE, 1); usb_uart->rx_stream = furi_stream_buffer_alloc(USB_UART_RX_BUF_SIZE, 1);
usb_uart->tx_sem = furi_semaphore_alloc(1, 1); usb_uart->tx_sem = furi_semaphore_alloc(1, 1);
@@ -308,8 +306,8 @@ static int32_t usb_uart_worker(void* context) {
furi_hal_usb_unlock(); furi_hal_usb_unlock();
furi_check(furi_hal_usb_set_config(&usb_cdc_single, NULL) == true); furi_check(furi_hal_usb_set_config(&usb_cdc_single, NULL) == true);
CliVcp* cli_vcp = furi_record_open(RECORD_CLI_VCP); cli_vcp_enable(usb_uart->cli_vcp);
cli_vcp_enable(cli_vcp);
furi_record_close(RECORD_CLI_VCP); furi_record_close(RECORD_CLI_VCP);
return 0; return 0;