diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2014-06-08 08:52:27 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2014-06-08 08:52:27 +0000 |
| commit | 7b584490f3ce37e9559d7e1ffe17bcb1a2fc2fae (patch) | |
| tree | 7df2e9144522afc0df4e72fb582a3ba9029fa8c4 | |
| parent | 8bcf3434a822c9d64b71f87272fb7ad2358ca962 (diff) | |
| download | ChibiOS-7b584490f3ce37e9559d7e1ffe17bcb1a2fc2fae.tar.gz ChibiOS-7b584490f3ce37e9559d7e1ffe17bcb1a2fc2fae.tar.bz2 ChibiOS-7b584490f3ce37e9559d7e1ffe17bcb1a2fc2fae.zip | |
Fixed the fix...
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@6985 35acf78f-673a-0410-8e92-d51de3d6d3f4
| -rw-r--r-- | os/hal/ports/STM32/LLD/can_lld.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/os/hal/ports/STM32/LLD/can_lld.c b/os/hal/ports/STM32/LLD/can_lld.c index 01a05083f..8070cefc8 100644 --- a/os/hal/ports/STM32/LLD/can_lld.c +++ b/os/hal/ports/STM32/LLD/can_lld.c @@ -114,6 +114,9 @@ static void can_lld_set_filters(uint32_t can2sb, #if STM32_HAS_CAN2
CAN1->FS1R = 1 | (1 << can2sb);
CAN1->FA1R = 1 | (1 << can2sb);
+#else
+ CAN1->FS1R = 1;
+ CAN1->FA1R = 1;
#endif
}
CAN1->FMR &= ~CAN_FMR_FINIT;
@@ -688,7 +691,7 @@ void can_lld_wakeup(CANDriver *canp) { void canSTM32SetFilters(uint32_t can2sb, uint32_t num, const CANFilter *cfp) {
osalDbgCheck((can2sb >= 1) && (can2sb < STM32_CAN_MAX_FILTERS) &&
- (num <? STM32_CAN_MAX_FILTERS));
+ (num <= STM32_CAN_MAX_FILTERS));
#if STM32_CAN_USE_CAN1
osalDbgAssert(CAND1.state == CAN_STOP, "invalid state");
|