ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #5667 from productize/fix-stm32-can3 

STM32: Fix CAN3
pull/5693/head
Martin Kojtal 2017-12-12 17:39:41 +00:00 committed by GitHub
parent 992c905580 f08c04d81f
commit cee180f472
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
targets/TARGET_STM/TARGET_STM32F4/can_device.h
View File

@ -25,7 +25,7 @@ extern "C" {
#ifdef DEVICE_CAN #ifdef DEVICE_CAN
#if defined(CAN3_BASE) && defined(CAN_3) #if defined(CAN3_BASE)
#define CAN_NUM 3 // Number of CAN peripherals present in the STM32 serie #define CAN_NUM 3 // Number of CAN peripherals present in the STM32 serie

3
targets/TARGET_STM/TARGET_STM32F7/TARGET_STM32F769xI/TARGET_DISCO_F769NI/PeripheralNames.h
View File

@ -94,7 +94,8 @@ typedef enum {
typedef enum { typedef enum {
CAN_1 = (int)CAN1_BASE, CAN_1 = (int)CAN1_BASE,
CAN_2 = (int)CAN2_BASE CAN_2 = (int)CAN2_BASE,
CAN_3 = (int)CAN3_BASE
} CANName; } CANName;
#ifdef __cplusplus #ifdef __cplusplus

2
targets/TARGET_STM/TARGET_STM32F7/can_device.h
View File

@ -25,7 +25,7 @@ extern "C" {
#ifdef DEVICE_CAN #ifdef DEVICE_CAN
#if defined(CAN3_BASE) && defined(CAN_3) #if defined(CAN3_BASE)
#define CAN_NUM 3 // Number of CAN peripherals present in the STM32 serie #define CAN_NUM 3 // Number of CAN peripherals present in the STM32 serie

29
targets/TARGET_STM/can_api.c
View File

@ -57,14 +57,14 @@ void can_init_freq (can_t *obj, PinName rd, PinName td, int hz)
__HAL_RCC_CAN1_CLK_ENABLE(); __HAL_RCC_CAN1_CLK_ENABLE();
obj->index = 0; obj->index = 0;
} }
#if defined(CAN2_BASE) && defined(CAN_2) #if defined(CAN2_BASE) && (CAN_NUM > 1)
else if (can == CAN_2) { else if (can == CAN_2) {
__HAL_RCC_CAN1_CLK_ENABLE(); // needed to set filters __HAL_RCC_CAN1_CLK_ENABLE(); // needed to set filters
__HAL_RCC_CAN2_CLK_ENABLE(); __HAL_RCC_CAN2_CLK_ENABLE();
obj->index = 1; obj->index = 1;
} }
#endif #endif
#if defined(CAN3_BASE) && defined(CAN_3) #if defined(CAN3_BASE) && (CAN_NUM > 2)
else if (can == CAN_3) { else if (can == CAN_3) {
__HAL_RCC_CAN3_CLK_ENABLE(); __HAL_RCC_CAN3_CLK_ENABLE();
obj->index = 2; obj->index = 2;
@ -103,7 +103,13 @@ void can_init_freq (can_t *obj, PinName rd, PinName td, int hz)
can_registers_init(obj); can_registers_init(obj);
/* Bits 27:14 are available for dual CAN configuration and are reserved for
single CAN configuration: */
#if defined(CAN3_BASE) && (CAN_NUM > 2)
uint32_t filter_number = (can == CAN_1 || can == CAN_3) ? 0 : 14;
#else
uint32_t filter_number = (can == CAN_1) ? 0 : 14; uint32_t filter_number = (can == CAN_1) ? 0 : 14;
#endif
can_filter(obj, 0, 0, CANStandard, filter_number); can_filter(obj, 0, 0, CANStandard, filter_number);
} }
@ -132,14 +138,14 @@ void can_free(can_t *obj)
__HAL_RCC_CAN1_RELEASE_RESET(); __HAL_RCC_CAN1_RELEASE_RESET();
__HAL_RCC_CAN1_CLK_DISABLE(); __HAL_RCC_CAN1_CLK_DISABLE();
} }
#if defined(CAN2_BASE) && defined(CAN_2) #if defined(CAN2_BASE) && (CAN_NUM > 1)
if (can == CAN_2) { if (can == CAN_2) {
__HAL_RCC_CAN2_FORCE_RESET(); __HAL_RCC_CAN2_FORCE_RESET();
__HAL_RCC_CAN2_RELEASE_RESET(); __HAL_RCC_CAN2_RELEASE_RESET();
__HAL_RCC_CAN2_CLK_DISABLE(); __HAL_RCC_CAN2_CLK_DISABLE();
} }
#endif #endif
#if defined(CAN3_BASE) && defined(CAN_3) #if defined(CAN3_BASE) && (CAN_NUM > 2)
if (can == CAN_3) { if (can == CAN_3) {
__HAL_RCC_CAN3_FORCE_RESET(); __HAL_RCC_CAN3_FORCE_RESET();
__HAL_RCC_CAN3_RELEASE_RESET(); __HAL_RCC_CAN3_RELEASE_RESET();
@ -562,7 +568,7 @@ void CAN1_SCE_IRQHandler(void)
{ {
can_irq(CAN_1, 0); can_irq(CAN_1, 0);
} }
#if defined(CAN2_BASE) && defined(CAN_2) #if defined(CAN2_BASE) && (CAN_NUM > 1)
void CAN2_RX0_IRQHandler(void) void CAN2_RX0_IRQHandler(void)
{ {
can_irq(CAN_2, 1); can_irq(CAN_2, 1);
@ -576,18 +582,18 @@ void CAN2_SCE_IRQHandler(void)
can_irq(CAN_2, 1); can_irq(CAN_2, 1);
} }
#endif #endif
#if defined(CAN3_BASE) && defined(CAN_3) #if defined(CAN3_BASE) && (CAN_NUM > 2)
void CAN3_RX0_IRQHandler(void) void CAN3_RX0_IRQHandler(void)
{ {
can_irq(CAN_3, 1); can_irq(CAN_3, 2);
} }
void CAN3_TX_IRQHandler(void) void CAN3_TX_IRQHandler(void)
{ {
can_irq(CAN_3, 1); can_irq(CAN_3, 2);
} }
void CAN3_SCE_IRQHandler(void) void CAN3_SCE_IRQHandler(void)
{ {
can_irq(CAN_3, 1); can_irq(CAN_3, 2);
} }
#endif #endif
#endif // else #endif // else
@ -630,7 +636,7 @@ void can_irq_set(can_t *obj, CanIrqType type, uint32_t enable)
return; return;
} }
} }
#if defined(CAN2_BASE) && defined(CAN_2) #if defined(CAN2_BASE) && (CAN_NUM > 1)
else if ((CANName) can == CAN_2) { else if ((CANName) can == CAN_2) {
switch (type) { switch (type) {
case IRQ_RX: case IRQ_RX:
@ -663,7 +669,7 @@ void can_irq_set(can_t *obj, CanIrqType type, uint32_t enable)
} }
} }
#endif #endif
#if defined(CAN3_BASE) && defined(CAN_3) #if defined(CAN3_BASE) && (CAN_NUM > 2)
else if ((CANName) can == CAN_3) { else if ((CANName) can == CAN_3) {
switch (type) { switch (type) {
case IRQ_RX: case IRQ_RX:
@ -711,4 +717,3 @@ void can_irq_set(can_t *obj, CanIrqType type, uint32_t enable)
} }
#endif // DEVICE_CAN #endif // DEVICE_CAN