Skip to content

Commit

Permalink
Merging COREA-21 to default
Browse files Browse the repository at this point in the history
  • Loading branch information
Michael Lundell committed Nov 19, 2014
2 parents 38c164c + d2e5693 commit c8c6e20
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions arch/ppc/mpc55xx/drivers/Can.c
Original file line number Diff line number Diff line change
Expand Up @@ -623,16 +623,15 @@ static void Can_Isr_Rx(Can_UnitType *uPtr)
#if (USE_CAN_STATISTICS == STD_ON)
uPtr->stats.fifoOverflow++;
#endif
canHw->IFRL.B.BUF07I = 1;

clearMbFlag(canHw, 7);
DET_REPORTERROR(MODULE_ID_CAN,0,0, CAN_E_DATALOST); /** @req 4.0.3/CAN395 */
}

#if (USE_CAN_STATISTICS == STD_ON)
/* Check warning */
if (iFlag & (1 << 6)) {
uPtr->stats.fifoWarning++;
canHw->IFRL.B.BUF06I = 1;
clearMbFlag(canHw, 6);
}
#endif

Expand Down Expand Up @@ -674,8 +673,7 @@ static void Can_Isr_Rx(Can_UnitType *uPtr)
}

// Clear the interrupt
canHw->IFRL.B.BUF05I = 1;

clearMbFlag(canHw, 5);
if( canHw->IFRL.B.BUF05I == 0 ) {
iFlag ^= 1ull << mbNr;
}
Expand Down

0 comments on commit c8c6e20

Please sign in to comment.