Fixed bug #935.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@11915 110e8d01-0319-4d1e-a829-52ad28d1bb01

11 files changed, 109 insertions, 108 deletions

diff --git a/os/common/startup/ARMCMx/compilers/GCC/crt1.c b/os/common/startup/ARMCMx/compilers/GCC/crt1.c
index 1ece4f979..87179c4ab 100644
--- a/os/common/startup/ARMCMx/compilers/GCC/crt1.c
+++ b/os/common/startup/ARMCMx/compilers/GCC/crt1.c
@@ -22,6 +22,7 @@
  * @{

  */

 

+#include <stdint.h>

 #include <stdbool.h>

 

 #include "cmparams.h"

diff --git a/os/common/startup/ARMCMx/devices/STM32F0xx/cmparams.h b/os/common/startup/ARMCMx/devices/STM32F0xx/cmparams.h
index 8afef19a1..3dcb1b356 100644
--- a/os/common/startup/ARMCMx/devices/STM32F0xx/cmparams.h
+++ b/os/common/startup/ARMCMx/devices/STM32F0xx/cmparams.h
@@ -43,17 +43,6 @@
  */

 #define CORTEX_PRIORITY_BITS    2

 

-/**

- * @brief   Number of interrupt vectors.

- * @note    This number does not include the 16 system vectors and must be

- *          rounded to a multiple of 8.

- */

-#define CORTEX_NUM_VECTORS      32

-

-/* 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.*/

@@ -66,6 +55,17 @@
 #include "board.h"

 #endif

 

+/**

+ * @brief   Number of interrupt vectors.

+ * @note    This number does not include the 16 system vectors and must be

+ *          rounded to a multiple of 8.

+ */

+#define CORTEX_NUM_VECTORS      32

+

+/* 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.*/

diff --git a/os/common/startup/ARMCMx/devices/STM32F1xx/cmparams.h b/os/common/startup/ARMCMx/devices/STM32F1xx/cmparams.h
index d2ec31d37..8ac35ed2e 100644
--- a/os/common/startup/ARMCMx/devices/STM32F1xx/cmparams.h
+++ b/os/common/startup/ARMCMx/devices/STM32F1xx/cmparams.h
@@ -43,17 +43,6 @@
  */

 #define CORTEX_PRIORITY_BITS    4

 

-/**

- * @brief   Number of interrupt vectors.

- * @note    This number does not include the 16 system vectors and must be

- *          rounded to a multiple of 8.

- */

-#define CORTEX_NUM_VECTORS      72

-

-/* 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.*/

@@ -67,6 +56,17 @@
 #include "board.h"

 #endif

 

+/**

+ * @brief   Number of interrupt vectors.

+ * @note    This number does not include the 16 system vectors and must be

+ *          rounded to a multiple of 8.

+ */

+#define CORTEX_NUM_VECTORS      72

+

+/* 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.*/

diff --git a/os/common/startup/ARMCMx/devices/STM32F2xx/cmparams.h b/os/common/startup/ARMCMx/devices/STM32F2xx/cmparams.h
index 67852c437..04511349b 100644
--- a/os/common/startup/ARMCMx/devices/STM32F2xx/cmparams.h
+++ b/os/common/startup/ARMCMx/devices/STM32F2xx/cmparams.h
@@ -43,6 +43,13 @@
  */

 #define CORTEX_PRIORITY_BITS    4

 

+/* 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.*/

+#if !defined(STM32F2XX)

+#include "board.h"

+#endif

+

 /**

  * @brief   Number of interrupt vectors.

  * @note    This number does not include the 16 system vectors and must be

@@ -54,13 +61,6 @@
    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.*/

-#if !defined(STM32F2XX)

-#include "board.h"

-#endif

-

 /* 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.*/

diff --git a/os/common/startup/ARMCMx/devices/STM32F3xx/cmparams.h b/os/common/startup/ARMCMx/devices/STM32F3xx/cmparams.h
index 8ad514dcd..8c2877ec6 100644
--- a/os/common/startup/ARMCMx/devices/STM32F3xx/cmparams.h
+++ b/os/common/startup/ARMCMx/devices/STM32F3xx/cmparams.h
@@ -43,17 +43,6 @@
  */

 #define CORTEX_PRIORITY_BITS    4

 

-/**

- * @brief   Number of interrupt vectors.

- * @note    This number does not include the 16 system vectors and must be

- *          rounded to a multiple of 8.

- */

-#define CORTEX_NUM_VECTORS      88

-

-/* 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.*/

@@ -66,6 +55,17 @@
 #include "board.h"

 #endif

 

+/**

+ * @brief   Number of interrupt vectors.

+ * @note    This number does not include the 16 system vectors and must be

+ *          rounded to a multiple of 8.

+ */

+#define CORTEX_NUM_VECTORS      88

+

+/* 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.*/

diff --git a/os/common/startup/ARMCMx/devices/STM32F4xx/cmparams.h b/os/common/startup/ARMCMx/devices/STM32F4xx/cmparams.h
index 70c6704f9..377c0dc11 100644
--- a/os/common/startup/ARMCMx/devices/STM32F4xx/cmparams.h
+++ b/os/common/startup/ARMCMx/devices/STM32F4xx/cmparams.h
@@ -43,17 +43,6 @@
  */

 #define CORTEX_PRIORITY_BITS    4

 

-/**

- * @brief   Number of interrupt vectors.

- * @note    This number does not include the 16 system vectors and must be

- *          rounded to a multiple of 8.

- */

-#define CORTEX_NUM_VECTORS      104

-

-/* 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.*/

@@ -68,6 +57,17 @@
 #include "board.h"

 #endif

 

+/**

+ * @brief   Number of interrupt vectors.

+ * @note    This number does not include the 16 system vectors and must be

+ *          rounded to a multiple of 8.

+ */

+#define CORTEX_NUM_VECTORS      104

+

+/* 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.*/

diff --git a/os/common/startup/ARMCMx/devices/STM32F7xx/cmparams.h b/os/common/startup/ARMCMx/devices/STM32F7xx/cmparams.h
index cd255884d..fae63949b 100644
--- a/os/common/startup/ARMCMx/devices/STM32F7xx/cmparams.h
+++ b/os/common/startup/ARMCMx/devices/STM32F7xx/cmparams.h
@@ -43,17 +43,6 @@
  */

 #define CORTEX_PRIORITY_BITS    4

 

-/**

- * @brief   Number of interrupt vectors.

- * @note    This number does not include the 16 system vectors and must be

- *          rounded to a multiple of 8.

- */

-#define CORTEX_NUM_VECTORS      112

-

-/* 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.*/

@@ -66,6 +55,17 @@
 #include "board.h"

 #endif

 

+/**

+ * @brief   Number of interrupt vectors.

+ * @note    This number does not include the 16 system vectors and must be

+ *          rounded to a multiple of 8.

+ */

+#define CORTEX_NUM_VECTORS      112

+

+/* 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.*/

diff --git a/os/common/startup/ARMCMx/devices/STM32H7xx/cmparams.h b/os/common/startup/ARMCMx/devices/STM32H7xx/cmparams.h
index 5068a538a..272f42998 100644
--- a/os/common/startup/ARMCMx/devices/STM32H7xx/cmparams.h
+++ b/os/common/startup/ARMCMx/devices/STM32H7xx/cmparams.h
@@ -43,6 +43,13 @@
  */

 #define CORTEX_PRIORITY_BITS    4

 

+/* 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.*/

+#if !defined(STM32H743xx) && !defined(STM32H753xx)

+#include "board.h"

+#endif

+

 /**

  * @brief   Number of interrupt vectors.

  * @note    This number does not include the 16 system vectors and must be

@@ -54,13 +61,6 @@
    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.*/

-#if !defined(STM32H743xx) && !defined(STM32H753xx)

-#include "board.h"

-#endif

-

 /* 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.*/

diff --git a/os/common/startup/ARMCMx/devices/STM32L0xx/cmparams.h b/os/common/startup/ARMCMx/devices/STM32L0xx/cmparams.h
index 8fe99d004..1913a6789 100644
--- a/os/common/startup/ARMCMx/devices/STM32L0xx/cmparams.h
+++ b/os/common/startup/ARMCMx/devices/STM32L0xx/cmparams.h
@@ -43,17 +43,6 @@
  */

 #define CORTEX_PRIORITY_BITS    2

 

-/**

- * @brief   Number of interrupt vectors.

- * @note    This number does not include the 16 system vectors and must be

- *          rounded to a multiple of 8.

- */

-#define CORTEX_NUM_VECTORS      32

-

-/* 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.*/

@@ -65,6 +54,17 @@
 #include "board.h"

 #endif

 

+/**

+ * @brief   Number of interrupt vectors.

+ * @note    This number does not include the 16 system vectors and must be

+ *          rounded to a multiple of 8.

+ */

+#define CORTEX_NUM_VECTORS      32

+

+/* 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.*/

diff --git a/os/common/startup/ARMCMx/devices/STM32L1xx/cmparams.h b/os/common/startup/ARMCMx/devices/STM32L1xx/cmparams.h
index fbb8475af..5b3f5f4bf 100644
--- a/os/common/startup/ARMCMx/devices/STM32L1xx/cmparams.h
+++ b/os/common/startup/ARMCMx/devices/STM32L1xx/cmparams.h
@@ -43,17 +43,6 @@
  */

 #define CORTEX_PRIORITY_BITS    4

 

-/**

- * @brief   Number of interrupt vectors.

- * @note    This number does not include the 16 system vectors and must be

- *          rounded to a multiple of 8.

- */

-#define CORTEX_NUM_VECTORS      64

-

-/* 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.*/

@@ -71,6 +60,17 @@
 #include "board.h"

 #endif

 

+/**

+ * @brief   Number of interrupt vectors.

+ * @note    This number does not include the 16 system vectors and must be

+ *          rounded to a multiple of 8.

+ */

+#define CORTEX_NUM_VECTORS      64

+

+/* 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.*/

diff --git a/os/common/startup/ARMCMx/devices/STM32L4xx/cmparams.h b/os/common/startup/ARMCMx/devices/STM32L4xx/cmparams.h
index 1315dc472..3b727008f 100644
--- a/os/common/startup/ARMCMx/devices/STM32L4xx/cmparams.h
+++ b/os/common/startup/ARMCMx/devices/STM32L4xx/cmparams.h
@@ -43,6 +43,23 @@
  */

 #define CORTEX_PRIORITY_BITS    4

 

+/* 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.*/

+#if !defined(STM32L431xx) && !defined(STM32L432xx) &&                       \

+    !defined(STM32L433xx) && !defined(STM32L442xx) &&                       \

+    !defined(STM32L443xx) && !defined(STM32L451xx) &&                       \

+    !defined(STM32L452xx) && !defined(STM32L462xx) &&                       \

+    !defined(STM32L471xx) && !defined(STM32L475xx) &&                       \

+    !defined(STM32L476xx) && !defined(STM32L485xx) &&                       \

+    !defined(STM32L486xx) && !defined(STM32L496xx) &&                       \

+    !defined(STM32L4A6xx) &&                                                \

+    !defined(STM32L4R5xx) && !defined(STM32L4R7xx) &&                       \

+    !defined(STM32L4R9xx) && !defined(STM32L4S5xx) &&                       \

+    !defined(STM32L4S7xx) && !defined(STM32L4S9xx)

+#include "board.h"

+#endif

+

 /**

  * @brief   Number of interrupt vectors.

  * @note    This number does not include the 16 system vectors and must be

@@ -60,23 +77,6 @@
    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.*/

-#if !defined(STM32L431xx) && !defined(STM32L432xx) &&                       \

-    !defined(STM32L433xx) && !defined(STM32L442xx) &&                       \

-    !defined(STM32L443xx) && !defined(STM32L451xx) &&                       \

-    !defined(STM32L452xx) && !defined(STM32L462xx) &&                       \

-    !defined(STM32L471xx) && !defined(STM32L475xx) &&                       \

-    !defined(STM32L476xx) && !defined(STM32L485xx) &&                       \

-    !defined(STM32L486xx) && !defined(STM32L496xx) &&                       \

-    !defined(STM32L4A6xx) &&                                                \

-    !defined(STM32L4R5xx) && !defined(STM32L4R7xx) &&                       \

-    !defined(STM32L4R9xx) && !defined(STM32L4S5xx) &&                       \

-    !defined(STM32L4S7xx) && !defined(STM32L4S9xx) &&                       \

-#include "board.h"

-#endif

-

 /* 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.*/