diff options
| author | Stefan Agner <stefan@agner.ch> | 2016-07-18 13:12:11 -0700 |
|---|---|---|
| committer | Stefan Agner <stefan@agner.ch> | 2016-08-09 14:53:37 -0700 |
| commit | cd6c66301a83dde9ad4eaf675459a0348f4732cf (patch) | |
| tree | b979a88a80abded65470b80d88c351b5bc11ff9c /platform/drivers/src/flexcan.c | |
| parent | 21d6d84123de8e6e2ebdf5543b530403951b3059 (diff) | |
resync with FreeRTOS_iMX7D_1.0.1 GAColibri_iMX7_M4_FreeRTOS_V1.0.1_20160810
Diffstat (limited to 'platform/drivers/src/flexcan.c')
| -rw-r--r-- | platform/drivers/src/flexcan.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/platform/drivers/src/flexcan.c b/platform/drivers/src/flexcan.c index 2fb1d16..bd9290a 100644 --- a/platform/drivers/src/flexcan.c +++ b/platform/drivers/src/flexcan.c @@ -257,14 +257,14 @@ void FLEXCAN_SetTiming(CAN_Type* base, const flexcan_timing_t* timing) *END**************************************************************************/ void FLEXCAN_SetOperatingMode(CAN_Type* base, uint8_t mode) { - assert((mode & flexCanNormalMode) || + assert((mode & flexcanNormalMode) || (mode & flexcanListenOnlyMode) || (mode & flexcanLoopBackMode)); /* Assert Freeze mode*/ FLEXCAN_EnterFreezeMode(base); - if (mode & flexCanNormalMode) + if (mode & flexcanNormalMode) CAN_MCR_REG(base) &= ~CAN_MCR_SUPV_MASK; else CAN_MCR_REG(base) |= CAN_MCR_SUPV_MASK; |