From 6d39793855c42e6cf9758b90883a9a8dbd539d77 Mon Sep 17 00:00:00 2001
From: Pavel Kirienko <pavel.kirienko@gmail.com>
Date: Tue, 29 Apr 2014 13:50:54 +0400
Subject: [PATCH] STM32: IRQ definitions fix

---
 .../stm32/driver/src/uc_stm32_can.cpp         | 26 +++++++++----------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/libuavcan_drivers/stm32/driver/src/uc_stm32_can.cpp b/libuavcan_drivers/stm32/driver/src/uc_stm32_can.cpp
index 77ec452295..71bbb466bc 100644
--- a/libuavcan_drivers/stm32/driver/src/uc_stm32_can.cpp
+++ b/libuavcan_drivers/stm32/driver/src/uc_stm32_can.cpp
@@ -8,6 +8,18 @@
 #include <uavcan_stm32/clock.hpp>
 #include "internal.hpp"
 
+
+#if !(defined(STM32F10X_CL) || defined(STM32F2XX) || defined(STM32F4XX))
+// IRQ numbers
+# define CAN1_RX0_IRQn USB_LP_CAN1_RX0_IRQn
+# define CAN1_TX_IRQn USB_HP_CAN1_TX_IRQn
+// IRQ vectors
+# if !defined(CAN1_RX0_IRQHandler) || !defined(CAN1_TX_IRQHandler)
+#  define CAN1_TX_IRQHandler   USB_HP_CAN1_TX_IRQHandler
+#  define CAN1_RX0_IRQHandler  USB_LP_CAN1_RX0_IRQHandler
+# endif
+#endif
+
 namespace uavcan_stm32
 {
 namespace
@@ -672,20 +684,6 @@ bool CanDriver::hadActivity()
 /*
  * Interrupt handlers
  */
-#if !(defined(STM32F10X_CL) || defined(STM32F2XX) || defined(STM32F4XX))
-
-// IRQ numbers
-#define CAN1_RX0_IRQn USB_LP_CAN1_RX0_IRQn
-#define CAN1_TX_IRQn USB_HP_CAN1_TX_IRQn
-
-// IRQ vectors
-#if !defined(CAN1_RX0_IRQHandler) || !defined(CAN1_TX_IRQHandler)
-# define CAN1_TX_IRQHandler   USB_HP_CAN1_TX_IRQHandler
-# define CAN1_RX0_IRQHandler  USB_LP_CAN1_RX0_IRQHandler
-#endif
-
-#endif
-
 extern "C"
 {