Skip to content

Commit eec6e10

Browse files
committed
Add a #else to cover default STM32 devices for the IRQHandler functions.
Change also the coding style for the "{".
1 parent 8568b40 commit eec6e10

File tree

1 file changed

+20
-36
lines changed

1 file changed

+20
-36
lines changed

targets/TARGET_STM/can_api.c

Lines changed: 20 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -460,57 +460,41 @@ static void can_irq(CANName name, int id)
460460
}
461461

462462
#if defined(TARGET_STM32F0)
463-
void CAN_IRQHandler(void)
464-
{
463+
void CAN_IRQHandler(void) {
465464
can_irq(CAN_1, 0);
466465
}
467-
#endif
468-
469-
#if defined(TARGET_STM32F1) || defined(TARGET_STM32F2) || defined(TARGET_STM32F4) || defined(TARGET_STM32F7) || defined(TARGET_STM32L4)
470-
void CAN1_RX0_IRQHandler(void )
471-
{
466+
#elif defined(TARGET_STM32F3)
467+
void CAN_RX0_IRQHandler(void) {
472468
can_irq(CAN_1, 0);
473469
}
474-
void CAN1_TX_IRQHandler(void)
475-
{
470+
void CAN_TX_IRQHandler(void) {
476471
can_irq(CAN_1, 0);
477472
}
478-
void CAN1_SCE_IRQHandler(void)
479-
{
473+
void CAN_SCE_IRQHandler(void) {
474+
can_irq(CAN_1, 0);
475+
}
476+
#else
477+
void CAN1_RX0_IRQHandler(void) {
478+
can_irq(CAN_1, 0);
479+
}
480+
void CAN1_TX_IRQHandler(void) {
481+
can_irq(CAN_1, 0);
482+
}
483+
void CAN1_SCE_IRQHandler(void) {
480484
can_irq(CAN_1, 0);
481485
}
482486
#if defined(CAN2_BASE) && (CAN_NUM == 2)
483-
void CAN2_RX0_IRQHandler(void)
484-
{
487+
void CAN2_RX0_IRQHandler(void) {
485488
can_irq(CAN_2, 1);
486489
}
487-
488-
void CAN2_TX_IRQHandler(void)
489-
{
490+
void CAN2_TX_IRQHandler(void) {
490491
can_irq(CAN_2, 1);
491492
}
492-
493-
void CAN2_SCE_IRQHandler(void)
494-
{
493+
void CAN2_SCE_IRQHandler(void) {
495494
can_irq(CAN_2, 1);
496495
}
497-
#endif
498-
#endif
499-
500-
#if defined(TARGET_STM32F3)
501-
void CAN_RX0_IRQHandler(void )
502-
{
503-
can_irq(CAN_1, 0);
504-
}
505-
void CAN_TX_IRQHandler(void)
506-
{
507-
can_irq(CAN_1, 0);
508-
}
509-
void CAN_SCE_IRQHandler(void)
510-
{
511-
can_irq(CAN_1, 0);
512-
}
513-
#endif
496+
#endif // defined(CAN2_BASE) && (CAN_NUM == 2)
497+
#endif // else
514498

515499
void can_irq_set(can_t *obj, CanIrqType type, uint32_t enable)
516500
{

0 commit comments

Comments
 (0)