Skip to content

Commit e0048cb

Browse files
committed
drivers: fix attach sleep locking
attach/detach can be multiple invoked. Therefore lock/unlock deep sleep only for the very first time it is invoked (when callbacks are actually changed).
1 parent 18ed12c commit e0048cb

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

drivers/CAN.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,10 @@ void CAN::attach(Callback<void()> func, IrqType type) {
122122
_irq[(CanIrqType)type] = func;
123123
can_irq_set(&_can, (CanIrqType)type, 1);
124124
} else {
125-
sleep_manager_unlock_deep_sleep();
125+
// unlock deep sleep only the first time
126+
if (_irq[(CanIrqType)type] != callback(donothing)) {
127+
sleep_manager_unlock_deep_sleep();
128+
}
126129
_irq[(CanIrqType)type] = callback(donothing);
127130
can_irq_set(&_can, (CanIrqType)type, 0);
128131
}

drivers/I2C.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,11 +125,11 @@ void I2C::unlock() {
125125
int I2C::transfer(int address, const char *tx_buffer, int tx_length, char *rx_buffer, int rx_length, const event_callback_t& callback, int event, bool repeated)
126126
{
127127
lock();
128-
sleep_manager_lock_deep_sleep();
129128
if (i2c_active(&_i2c)) {
130129
unlock();
131130
return -1; // transaction ongoing
132131
}
132+
sleep_manager_lock_deep_sleep();
133133
aquire();
134134

135135
_callback = callback;

drivers/SerialBase.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,10 @@ void SerialBase::attach(Callback<void()> func, IrqType type) {
8383
_irq[type] = func;
8484
serial_irq_set(&_serial, (SerialIrq)type, 1);
8585
} else {
86-
sleep_manager_unlock_deep_sleep();
86+
// unlock deep sleep only the first time
87+
if (_irq[type] != donothing) {
88+
sleep_manager_unlock_deep_sleep();
89+
}
8790
_irq[type] = donothing;
8891
serial_irq_set(&_serial, (SerialIrq)type, 0);
8992
}
@@ -247,6 +250,7 @@ void SerialBase::start_read(void *buffer, int buffer_size, char buffer_width, co
247250
{
248251
_rx_callback = callback;
249252
_thunk_irq.callback(&SerialBase::interrupt_handler_asynch);
253+
sleep_manager_lock_deep_sleep();
250254
serial_rx_asynch(&_serial, buffer, buffer_size, buffer_width, _thunk_irq.entry(), event, char_match, _rx_usage);
251255
}
252256

0 commit comments

Comments
 (0)