drashna/qmk_firmware
1
0
Fork 0
Code Activity Actions

[BUG] Fix deadlocks on disconnected secondary half (#17423)

Browse source
This commit is contained in:
Stefan Kerkmann 2022-06-21 00:24:53 +02:00 • committed by GitHub
parent 62eaec52e0
commit 2703ecc9e9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 38 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

11
platforms/chibios/drivers/serial.c
View file

@ -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);
}