git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7790 35acf78f-673a-0410-8e92-d51de3d6d3f4

1 files changed, 6 insertions, 6 deletions

diff --git a/os/common/ports/ARMCMx/devices/STM32F1xx/cmparams.h b/os/common/ports/ARMCMx/devices/STM32F1xx/cmparams.h
index 723a8b9b2..30d81bcc9 100644
--- a/os/common/ports/ARMCMx/devices/STM32F1xx/cmparams.h
+++ b/os/common/ports/ARMCMx/devices/STM32F1xx/cmparams.h
@@ -46,10 +46,6 @@
  */

 #define CORTEX_PRIORITY_BITS    4

 

-/* The following code is not processed when the file is included from an

-   asm module.*/

-#if !defined(_FROM_ASM_)

-

 /* If the device type is not externally defined, for example from the Makefile,

    then a file named board.h is included. This file must contain a device

    definition compatible with the vendor include file.*/

@@ -60,6 +56,10 @@
 #include "board.h"

 #endif

 

+/* The following code is not processed when the file is included from an

+   asm module.*/

+#if !defined(_FROM_ASM_)

+

 /* Including the device CMSIS header. Note, we are not using the definitions

    from this header because we need this file to be usable also from

    assembler source files. We verify that the info matches instead.*/

@@ -73,6 +73,8 @@
 #error "CMSIS __NVIC_PRIO_BITS mismatch"

 #endif

 

+#endif /* !defined(_FROM_ASM_) */

+

 #if defined(STM32F10X_CL)

 #define __NVECTORS              72

 #elif defined(STM32F10X_XL)

@@ -96,8 +98,6 @@
  */

 #define CORTEX_NUM_VECTORS      __NVECTORS

 

-#endif /* !defined(_FROM_ASM_) */

-

 #endif /* _CMPARAMS_H_ */

 

 /** @} */