andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Implemented CR on STM32 CAN driver. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2466 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
gdisirio 2010-12-11 08:37:28 +00:00
parent c6960b928e
commit 6f0b15aba3
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/Doxyfile
View File

@ -31,7 +31,7 @@ PROJECT_NAME = ChibiOS/RT
# This could be handy for archiving the generated documentation or # This could be handy for archiving the generated documentation or
# if some version control system is used. # if some version control system is used.
PROJECT_NUMBER = 2.1.5 PROJECT_NUMBER = 2.1.6
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put. # base path where the generated documentation will be put.

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

@ -145,7 +145,7 @@ CH_IRQ_HANDLER(CAN1_SCE_IRQHandler) {
if ((esr & CAN_ESR_LEC) > 0) if ((esr & CAN_ESR_LEC) > 0)
flags |= CAN_FRAMING_ERROR; flags |= CAN_FRAMING_ERROR;
chSysLockFromIsr(); chSysLockFromIsr();
canAddFlagsI(&CAND1, flags); canAddFlagsI(&CAND1, flags | (canstatus_t)(flags < 16));
chEvtBroadcastI(&CAND1.cd_error_event); chEvtBroadcastI(&CAND1.cd_error_event);
chSysUnlockFromIsr(); chSysUnlockFromIsr();
} }

4
os/kernel/include/ch.h
View File

@ -39,7 +39,7 @@
/** /**
* @brief Kernel version string. * @brief Kernel version string.
*/ */
#define CH_KERNEL_VERSION "2.1.5unstable" #define CH_KERNEL_VERSION "2.1.6unstable"
/** /**
* @brief Kernel version major number. * @brief Kernel version major number.
@ -54,7 +54,7 @@
/** /**
* @brief Kernel version patch number. * @brief Kernel version patch number.
*/ */
#define CH_KERNEL_PATCH 5 #define CH_KERNEL_PATCH 6
/* /*
* Common values. * Common values.

5
readme.txt
View File

@ -64,6 +64,11 @@
*** Releases *** *** Releases ***
***************************************************************************** *****************************************************************************
*** 2.1.6 ***
- NEW: Now the STM32 CAN driver puts the lower half word of the ESR
register in the upper half word of the can status word for easier
debug.
*** 2.1.5 *** *** 2.1.5 ***
- FIX: Fixed references to non-existing SSP1 device in LPC13xx SPI device - FIX: Fixed references to non-existing SSP1 device in LPC13xx SPI device
driver (bug 3127926). driver (bug 3127926).