zcy
/
tinySA
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed bug 3606673. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@5393 35acf78f-673a-0410-8e92-d51de3d6d3f4
master
gdisirio 2013-03-09 11:33:50 +00:00
parent 80f779fde8
commit 34f8704815
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
os/hal/platforms/STM32/can_lld.c
View File

@ -569,7 +569,8 @@ bool_t can_lld_is_rx_nonempty(CANDriver *canp, canmbx_t mailbox) {
switch (mailbox) { switch (mailbox) {
case CAN_ANY_MAILBOX: case CAN_ANY_MAILBOX:
return (canp->can->RF0R & (CAN_RF0R_FMP0 | CAN_RF1R_FMP1)) != 0; return ((canp->can->RF0R & CAN_RF0R_FMP0) != 0 ||
(canp->can->RF1R & CAN_RF1R_FMP1) != 0);
case 1: case 1:
return (canp->can->RF0R & CAN_RF0R_FMP0) != 0; return (canp->can->RF0R & CAN_RF0R_FMP0) != 0;
case 2: case 2:

1
readme.txt
View File

@ -87,6 +87,7 @@
*** 2.5.2 *** *** 2.5.2 ***
- FIX: Fixed surprising non-CRLF lines in source (bug 3607380). - FIX: Fixed surprising non-CRLF lines in source (bug 3607380).
- FIX: Fixed STM32 CAN mailbox receive for second fifo (bug 3606673).
- FIX: Fixed CAN_USE_SLEEP_MODE compilation problem (bug 3606616)(backported - FIX: Fixed CAN_USE_SLEEP_MODE compilation problem (bug 3606616)(backported
to 2.4.4)(backported to 2.2.10). to 2.4.4)(backported to 2.2.10).
- FIX: Fixed missing HSE bypass option for STM32F103 (bug 3606274). - FIX: Fixed missing HSE bypass option for STM32F103 (bug 3606274).