diff options
author | Stefan Kerkmann <[email protected]> | 2022-06-21 00:24:53 +0200 |
---|---|---|
committer | GitHub <[email protected]> | 2022-06-21 08:24:53 +1000 |
commit | 2703ecc9e98819ab4d13bdb6da6e0d02ee840d86 (patch) | |
tree | a6ffe98a5dea71199255f23e612e469fa3bda3c0 /platforms/chibios/drivers/serial.c | |
parent | 62eaec52e0b6aadfea629e7457d1d7d8647e840c (diff) | |
download | qmk_firmware-2703ecc9e98819ab4d13bdb6da6e0d02ee840d86.tar.gz qmk_firmware-2703ecc9e98819ab4d13bdb6da6e0d02ee840d86.zip |
[BUG] Fix deadlocks on disconnected secondary half (#17423)
Diffstat (limited to 'platforms/chibios/drivers/serial.c')
-rw-r--r-- | platforms/chibios/drivers/serial.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/platforms/chibios/drivers/serial.c b/platforms/chibios/drivers/serial.c index e5f346ba33..3fae5cd3a4 100644 --- a/platforms/chibios/drivers/serial.c +++ b/platforms/chibios/drivers/serial.c @@ -87,10 +87,7 @@ static THD_FUNCTION(Thread1, arg) { chRegSetThreadName("blinker"); while (true) { palWaitLineTimeout(SOFT_SERIAL_PIN, TIME_INFINITE); - - split_shared_memory_lock(); interrupt_handler(NULL); - split_shared_memory_unlock(); } } @@ -155,6 +152,7 @@ static void __attribute__((noinline)) serial_write_byte(uint8_t data) { // interrupt handle to be used by the slave device void interrupt_handler(void *arg) { + split_shared_memory_lock_autounlock(); chSysLockFromISR(); sync_send(); @@ -212,6 +210,8 @@ void interrupt_handler(void *arg) { static inline bool initiate_transaction(uint8_t sstd_index) { if (sstd_index > NUM_TOTAL_TRANSACTIONS) return false; + split_shared_memory_lock_autounlock(); + split_transaction_desc_t *trans = &split_transaction_table[sstd_index]; // TODO: remove extra delay between transactions @@ -292,8 +292,5 @@ static inline bool initiate_transaction(uint8_t sstd_index) { // // this code is very time dependent, so we need to disable interrupts bool soft_serial_transaction(int sstd_index) { - split_shared_memory_lock(); - bool result = initiate_transaction((uint8_t)sstd_index); - split_shared_memory_unlock(); - return result; + return initiate_transaction((uint8_t)sstd_index); } |