diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2010-12-11 08:37:28 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2010-12-11 08:37:28 +0000 |
| commit | 6f0b15aba33406fb080b6dcee17367a4c2882401 (patch) | |
| tree | af1e2d7fc8a5d955fb7690a67110d1f6f1e12db4 /os | |
| parent | c6960b928e5dbe932669edb99b8a9a3ce0131075 (diff) | |
| download | ChibiOS-6f0b15aba33406fb080b6dcee17367a4c2882401.tar.gz ChibiOS-6f0b15aba33406fb080b6dcee17367a4c2882401.tar.bz2 ChibiOS-6f0b15aba33406fb080b6dcee17367a4c2882401.zip | |
Implemented CR on STM32 CAN driver.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2466 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os')
| -rw-r--r-- | os/hal/platforms/STM32/can_lld.c | 2 | ||||
| -rw-r--r-- | os/kernel/include/ch.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/os/hal/platforms/STM32/can_lld.c b/os/hal/platforms/STM32/can_lld.c index 0d9d173db..24a944c0f 100644 --- a/os/hal/platforms/STM32/can_lld.c +++ b/os/hal/platforms/STM32/can_lld.c @@ -145,7 +145,7 @@ CH_IRQ_HANDLER(CAN1_SCE_IRQHandler) { if ((esr & CAN_ESR_LEC) > 0)
flags |= CAN_FRAMING_ERROR;
chSysLockFromIsr();
- canAddFlagsI(&CAND1, flags);
+ canAddFlagsI(&CAND1, flags | (canstatus_t)(flags < 16));
chEvtBroadcastI(&CAND1.cd_error_event);
chSysUnlockFromIsr();
}
diff --git a/os/kernel/include/ch.h b/os/kernel/include/ch.h index 87c1c478e..f4dcfede0 100644 --- a/os/kernel/include/ch.h +++ b/os/kernel/include/ch.h @@ -39,7 +39,7 @@ /**
* @brief Kernel version string.
*/
-#define CH_KERNEL_VERSION "2.1.5unstable"
+#define CH_KERNEL_VERSION "2.1.6unstable"
/**
* @brief Kernel version major number.
@@ -54,7 +54,7 @@ /**
* @brief Kernel version patch number.
*/
-#define CH_KERNEL_PATCH 5
+#define CH_KERNEL_PATCH 6
/*
* Common values.
|