zcy
/
tinySA
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

master
Giovanni Di Sirio 2015-03-22 10:46:21 +00:00
parent d7d7513ca8
commit f11fa0ce07
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
os/common/ports/ARMCMx/devices/STM32F1xx/cmparams.h
View File

@ -46,10 +46,6 @@
*/ */
#define CORTEX_PRIORITY_BITS 4 #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, /* 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 then a file named board.h is included. This file must contain a device
definition compatible with the vendor include file.*/ definition compatible with the vendor include file.*/
@ -60,6 +56,10 @@
#include "board.h" #include "board.h"
#endif #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 /* 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 from this header because we need this file to be usable also from
assembler source files. We verify that the info matches instead.*/ assembler source files. We verify that the info matches instead.*/
@ -73,6 +73,8 @@
#error "CMSIS __NVIC_PRIO_BITS mismatch" #error "CMSIS __NVIC_PRIO_BITS mismatch"
#endif #endif
#endif /* !defined(_FROM_ASM_) */
#if defined(STM32F10X_CL) #if defined(STM32F10X_CL)
#define __NVECTORS 72 #define __NVECTORS 72
#elif defined(STM32F10X_XL) #elif defined(STM32F10X_XL)
@ -96,8 +98,6 @@
*/ */
#define CORTEX_NUM_VECTORS __NVECTORS #define CORTEX_NUM_VECTORS __NVECTORS
#endif /* !defined(_FROM_ASM_) */
#endif /* _CMPARAMS_H_ */ #endif /* _CMPARAMS_H_ */
/** @} */ /** @} */