Crash_Override/pico-uart-bridge
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

uart-bridge: add LC mutex

Browse source 
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
This commit is contained in:
Álvaro Fernández Rojas 2021-02-06 11:05:12 +01:00
parent 8d9d952dde
commit 3f9c9fadde
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
uart-bridge.c
View file

@ -32,6 +32,7 @@ typedef struct {
typedef struct { typedef struct {
cdc_line_coding_t usb_lc; cdc_line_coding_t usb_lc;
cdc_line_coding_t uart_lc; cdc_line_coding_t uart_lc;
mutex_t lc_mtx;
uint8_t uart_buffer[BUFFER_SIZE]; uint8_t uart_buffer[BUFFER_SIZE];
uint32_t uart_pos; uint32_t uart_pos;
mutex_t uart_mtx; mutex_t uart_mtx;
@ -95,6 +96,8 @@ void update_uart_cfg(uint8_t itf)
const uart_id_t *ui = &UART_ID[itf]; const uart_id_t *ui = &UART_ID[itf];
uart_data_t *ud = &UART_DATA[itf]; uart_data_t *ud = &UART_DATA[itf];
mutex_enter_blocking(&ud->lc_mtx);
if (ud->usb_lc.bit_rate != ud->uart_lc.bit_rate) { if (ud->usb_lc.bit_rate != ud->uart_lc.bit_rate) {
uart_set_baudrate(ui->inst, ud->usb_lc.bit_rate); uart_set_baudrate(ui->inst, ud->usb_lc.bit_rate);
ud->uart_lc.bit_rate = ud->usb_lc.bit_rate; ud->uart_lc.bit_rate = ud->usb_lc.bit_rate;
@ -111,6 +114,8 @@ void update_uart_cfg(uint8_t itf)
ud->uart_lc.parity = ud->usb_lc.parity; ud->uart_lc.parity = ud->usb_lc.parity;
ud->uart_lc.stop_bits = ud->usb_lc.stop_bits; ud->uart_lc.stop_bits = ud->usb_lc.stop_bits;
} }
mutex_exit(&ud->lc_mtx);
} }
void usb_read_bytes(uint8_t itf) { void usb_read_bytes(uint8_t itf) {
@ -155,7 +160,10 @@ void usb_cdc_process(uint8_t itf)
{ {
uart_data_t *ud = &UART_DATA[itf]; uart_data_t *ud = &UART_DATA[itf];
mutex_enter_blocking(&ud->lc_mtx);
tud_cdc_n_get_line_coding(itf, &ud->usb_lc); tud_cdc_n_get_line_coding(itf, &ud->usb_lc);
mutex_exit(&ud->lc_mtx);
usb_read_bytes(itf); usb_read_bytes(itf);
usb_write_bytes(itf); usb_write_bytes(itf);
} }
@ -239,6 +247,7 @@ void init_uart_data(uint8_t itf) {
ud->usb_pos = 0; ud->usb_pos = 0;
/* Mutex */ /* Mutex */
mutex_init(&ud->lc_mtx);
mutex_init(&ud->uart_mtx); mutex_init(&ud->uart_mtx);
mutex_init(&ud->usb_mtx); mutex_init(&ud->usb_mtx);