@@ -558,12 +558,8 @@ void HAL_FDCAN_TxBufferCompleteCallback(FDCAN_HandleTypeDef *hfdcan, uint32_t Bu
558558 rt_hw_can_isr (& st_DrvCan2 .device , RT_CAN_EVENT_TX_DONE | ((BufferIndexes - 1 ) << 8 ));
559559#endif
560560 }
561-
562561}
563562
564-
565-
566-
567563void HAL_FDCAN_TxFifoEmptyCallback (FDCAN_HandleTypeDef * hfdcan )
568564{
569565 if (hfdcan -> Instance == FDCAN1 )
@@ -589,8 +585,7 @@ void HAL_FDCAN_ErrorCallback(FDCAN_HandleTypeDef *hfdcan)
589585 if (hfdcan -> Instance == FDCAN1 )
590586 {
591587#ifdef BSP_USING_FDCAN1
592- //can1
593- if ( (ret & FDCAN_IT_ARB_PROTOCOL_ERROR ) &&
588+ if ((ret & FDCAN_IT_ARB_PROTOCOL_ERROR ) &&
594589 (hfdcan -> Instance -> CCCR & FDCAN_CCCR_INIT_Msk ))
595590 {
596591 //hfdcan->Instance->CCCR |= FDCAN_CCCR_CCE_Msk;
@@ -634,7 +629,6 @@ void HAL_FDCAN_ErrorCallback(FDCAN_HandleTypeDef *hfdcan)
634629}
635630
636631#ifdef BSP_USING_FDCAN1
637-
638632void FDCAN1_IT0_IRQHandler (void ) /* FDCAN1 interrupt line 0 */
639633{
640634 rt_interrupt_enter ();
@@ -648,9 +642,7 @@ void FDCAN1_IT1_IRQHandler(void) /* FDCAN1 interrupt line 1 */
648642 HAL_FDCAN_IRQHandler (& st_DrvCan1 .fdcanHandle );
649643 rt_interrupt_leave ();
650644}
651-
652645#endif /*BSP_USING_FDCAN1*/
653-
654646#ifdef BSP_USING_FDCAN2
655647void FDCAN2_IT0_IRQHandler (void ) /* FDCAN2 interrupt line 0 */
656648{
@@ -667,7 +659,6 @@ void FDCAN2_IT1_IRQHandler(void) /* FDCAN2 interrupt line 1 */
667659}
668660#endif /*BSP_USING_FDCAN2*/
669661
670-
671662static int rt_hw_can_init (void )
672663{
673664 struct can_configure config ;
@@ -684,7 +675,6 @@ static int rt_hw_can_init(void)
684675 config .baud_rate_fd = CAN1MBaud * 8 ;
685676 config .enable_canfd = 1 ;
686677#endif
687-
688678 /* config default filter */
689679 FDCAN_FilterTypeDef sFilterConfig ;
690680 sFilterConfig .IdType = FDCAN_STANDARD_ID ;
@@ -693,24 +683,18 @@ static int rt_hw_can_init(void)
693683 sFilterConfig .FilterConfig = FDCAN_FILTER_TO_RXFIFO0 ;
694684 sFilterConfig .FilterID1 = 0 ;
695685 sFilterConfig .FilterID2 = 0x7FF ;
696-
697686#ifdef BSP_USING_FDCAN1
698-
699687 st_DrvCan1 .FilterConfig = sFilterConfig ;
700688 st_DrvCan1 .device .config = config ;
701-
702689 /* register FDCAN1 device */
703690 rt_hw_can_register (& st_DrvCan1 .device , st_DrvCan1 .name , & _can_ops , & st_DrvCan1 );
704691#endif /* BSP_USING_FDCAN1 */
705-
706692#ifdef BSP_USING_FDCAN2
707693 st_DrvCan2 .FilterConfig = sFilterConfig ;
708694 st_DrvCan2 .device .config = config ;
709-
710695 /* register FDCAN2 device */
711696 rt_hw_can_register (& st_DrvCan2 .device , st_DrvCan2 .name , & _can_ops , & st_DrvCan2 );
712697#endif /* BSP_USING_FDCAN2 */
713-
714698 return 0 ;
715699}
716700INIT_BOARD_EXPORT (rt_hw_can_init );
0 commit comments