fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-26 05:03:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Added proper support for ChibiOS 4; added compile-time check that fails if IRQ vectors are not properly defined

Browse Source
This commit is contained in:
Pavel Kirienko
2017-01-23 04:09:00 +03:00
parent dcbb573972
commit f1fc72ef7a
3 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan_drivers/stm32/driver/src/uc_stm32_can.cpp
+15 -1
View File
@@ -34,7 +34,7 @@
# endif
#endif
#if (UAVCAN_STM32_CHIBIOS && CH_KERNEL_MAJOR == 3)
#if (UAVCAN_STM32_CHIBIOS && (CH_KERNEL_MAJOR == 3 || CH_KERNEL_MAJOR == 4))
#define CAN1_TX_IRQHandler STM32_CAN1_TX_HANDLER
#define CAN1_RX0_IRQHandler STM32_CAN1_RX0_HANDLER
#define CAN1_RX1_IRQHandler STM32_CAN1_RX1_HANDLER
@@ -1084,7 +1084,15 @@ static int can2_irq(const int irq, void*)
}
# endif
#else // UAVCAN_STM32_NUTTX
#if !defined(CAN1_TX_IRQHandler) ||\
!defined(CAN1_RX0_IRQHandler) ||\
!defined(CAN1_RX1_IRQHandler)
# error "Misconfigured build"
#endif
UAVCAN_STM32_IRQ_HANDLER(CAN1_TX_IRQHandler);
UAVCAN_STM32_IRQ_HANDLER(CAN1_TX_IRQHandler)
{
@@ -1111,6 +1119,12 @@ UAVCAN_STM32_IRQ_HANDLER(CAN1_RX1_IRQHandler)
# if UAVCAN_STM32_NUM_IFACES > 1
#if !defined(CAN2_TX_IRQHandler) ||\
!defined(CAN2_RX0_IRQHandler) ||\
!defined(CAN2_RX1_IRQHandler)
# error "Misconfigured build"
#endif
UAVCAN_STM32_IRQ_HANDLER(CAN2_TX_IRQHandler);
UAVCAN_STM32_IRQ_HANDLER(CAN2_TX_IRQHandler)
{