aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2013-03-09 12:15:50 +0000
committergdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2013-03-09 12:15:50 +0000
commitfcadc8a00add3b61c790ad801d507069a8093094 (patch)
tree524b97c976605d9f7d571ed409a763e84a37820d
parent34f87048152152afa2f828d5b4c7623a3791690b (diff)
downloadChibiOS-fcadc8a00add3b61c790ad801d507069a8093094.tar.gz
ChibiOS-fcadc8a00add3b61c790ad801d507069a8093094.tar.bz2
ChibiOS-fcadc8a00add3b61c790ad801d507069a8093094.zip
Fixed bug 3606675.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@5394 35acf78f-673a-0410-8e92-d51de3d6d3f4
-rw-r--r--os/hal/platforms/STM32/can_lld.c2
-rw-r--r--readme.txt1
2 files changed, 2 insertions, 1 deletions
diff --git a/os/hal/platforms/STM32/can_lld.c b/os/hal/platforms/STM32/can_lld.c
index 382322fff..8afe43355 100644
--- a/os/hal/platforms/STM32/can_lld.c
+++ b/os/hal/platforms/STM32/can_lld.c
@@ -187,7 +187,7 @@ static void can_lld_rx1_handler(CANDriver *canp) {
chSysLockFromIsr();
while (chSemGetCounterI(&canp->rxsem) < 0)
chSemSignalI(&canp->rxsem);
- chEvtBroadcastFlagsI(&canp->rxfull_event, CAN_MAILBOX_TO_MASK(1));
+ chEvtBroadcastFlagsI(&canp->rxfull_event, CAN_MAILBOX_TO_MASK(2));
chSysUnlockFromIsr();
}
if ((rf1r & CAN_RF1R_FOVR1) > 0) {
diff --git a/readme.txt b/readme.txt
index a9e3a6310..d1e4b089b 100644
--- a/readme.txt
+++ b/readme.txt
@@ -87,6 +87,7 @@
*** 2.5.2 ***
- FIX: Fixed surprising non-CRLF lines in source (bug 3607380).
+- FIX: Fixed STM32 CAN broadcast typo (bug 3606675).
- FIX: Fixed STM32 CAN mailbox receive for second fifo (bug 3606673).
- FIX: Fixed CAN_USE_SLEEP_MODE compilation problem (bug 3606616)(backported
to 2.4.4)(backported to 2.2.10).