@@ -460,57 +460,41 @@ static void can_irq(CANName name, int id)
460
460
}
461
461
462
462
#if defined(TARGET_STM32F0 )
463
- void CAN_IRQHandler (void )
464
- {
463
+ void CAN_IRQHandler (void ) {
465
464
can_irq (CAN_1 , 0 );
466
465
}
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 ) {
472
468
can_irq (CAN_1 , 0 );
473
469
}
474
- void CAN1_TX_IRQHandler (void )
475
- {
470
+ void CAN_TX_IRQHandler (void ) {
476
471
can_irq (CAN_1 , 0 );
477
472
}
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 ) {
480
484
can_irq (CAN_1 , 0 );
481
485
}
482
486
#if defined(CAN2_BASE ) && (CAN_NUM == 2 )
483
- void CAN2_RX0_IRQHandler (void )
484
- {
487
+ void CAN2_RX0_IRQHandler (void ) {
485
488
can_irq (CAN_2 , 1 );
486
489
}
487
-
488
- void CAN2_TX_IRQHandler (void )
489
- {
490
+ void CAN2_TX_IRQHandler (void ) {
490
491
can_irq (CAN_2 , 1 );
491
492
}
492
-
493
- void CAN2_SCE_IRQHandler (void )
494
- {
493
+ void CAN2_SCE_IRQHandler (void ) {
495
494
can_irq (CAN_2 , 1 );
496
495
}
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
514
498
515
499
void can_irq_set (can_t * obj , CanIrqType type , uint32_t enable )
516
500
{
0 commit comments