Fixed bug 3606616.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_2.4.x@5392 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
parent
4ec7f799dc
commit
5f67a1b3ef
|
@ -138,11 +138,15 @@ CH_IRQ_HANDLER(CAN1_SCE_IRQHandler) {
|
|||
msr = CAN1->MSR;
|
||||
CAN1->MSR = CAN_MSR_ERRI | CAN_MSR_WKUI | CAN_MSR_SLAKI;
|
||||
/* Wakeup event.*/
|
||||
#if CAN_USE_SLEEP_MODE
|
||||
if (msr & CAN_MSR_WKUI) {
|
||||
CAND1.state = CAN_READY;
|
||||
CAND1.can->MCR &= ~CAN_MCR_SLEEP;
|
||||
chSysLockFromIsr();
|
||||
chEvtBroadcastI(&CAND1.wakeup_event);
|
||||
chSysUnlockFromIsr();
|
||||
}
|
||||
#endif /* CAN_USE_SLEEP_MODE */
|
||||
/* Error event.*/
|
||||
if (msr & CAN_MSR_ERRI) {
|
||||
canstatus_t flags;
|
||||
|
|
|
@ -79,6 +79,7 @@
|
|||
*****************************************************************************
|
||||
|
||||
*** 2.4.4 ***
|
||||
- FIX: Fixed CAN_USE_SLEEP_MODE compilation problem (bug 3606616).
|
||||
- FIX: Fixed misplaced brace in icu_lld.c (bug 3605832).
|
||||
- FIX: Fixed bug prevents calling adcStartConversionI() within ISR (bug
|
||||
3605053).
|
||||
|
|
Loading…
Reference in New Issue