Update the ARM Cortex-M core and peripherals configuration declaration.

At-EC · At-EC · commit e08d97346e4a · 2024-02-15T20:57:59.000+08:00
diff --git a/include/arch.h b/include/arch.h
@@ -28,37 +28,67 @@ typedef enum IRQn {
     SysTick_IRQn = -1,           /*!< 15 Cortex-Mx System Tick Interrupt               */
 } IRQn_Type;
 
-#if ( (defined ( __CC_ARM ) && defined ( __TARGET_FPU_VFP ))                         \
-      || (defined ( __CLANG_ARM ) && defined ( __VFP_FP__ ) && !defined(__SOFTFP__)) \
-      || (defined ( __ICCARM__ ) && defined ( __ARMVFP__ ))                          \
-      || (defined ( __GNUC__ ) && defined ( __VFP_FP__ ) && !defined(__SOFTFP__)) )
-    #define __FPU_PRESENT   1
-#else
-    #define __FPU_PRESENT   0
+/* Configuration of the Cortex-M Processor and Core Peripherals */
+/* SAU regions present */
+#if !defined ( __SAUREGION_PRESENT )
+    #if defined ( ARCH_SAUREGION_PRESENT )
+        #define __SAUREGION_PRESENT                 ARCH_SAUREGION_PRESENT
+    #endif
 #endif
 
-/* Default Setting */
-#if defined ( ARCH_MPU_PRESENT )
-    #define __MPU_PRESENT               1
+/* MPU present */
+#if !defined ( __MPU_PRESENT ) 
+    #if defined ( ARCH_MPU_PRESENT )
+        #define __MPU_PRESENT                       ARCH_MPU_PRESENT
+    #endif
 #endif
 
-#if !defined ( __MPU_PRESENT )
-    #define __MPU_PRESENT               1
+/* MPU present */
+#if !defined ( __VTOR_PRESENT )
+    #if defined ( ARCH_VTOR_PRESENT )
+        #define __VTOR_PRESENT                      ARCH_VTOR_PRESENT
+    #endif
 #endif
 
-#if !defined  ( __NVIC_PRIO_BITS )
-    #define __NVIC_PRIO_BITS            8
+/* VTOR present */
+#if !defined ( __VTOR_PRESENT )
+    #if defined ( ARCH_VTOR_PRESENT )
+        #define __VTOR_PRESENT                      ARCH_VTOR_PRESENT
+    #endif
 #endif
 
-#if !defined  ( __Vendor_SysTickConfig )
-    #define __Vendor_SysTickConfig      0
+    
+/* DSP extension present */
+#if !defined ( __DSP_PRESENT )
+    #if defined ( ARCH_DSP_PRESENT )
+        #define __DSP_PRESENT                       ARCH_DSP_PRESENT
+    #endif
 #endif
 
-#if !defined  ( __VTOR_PRESENT )
-    #define __VTOR_PRESENT              1
+/* FPU present */
+#if !defined ( __FPU_PRESENT )
+    #if defined ( ARCH_FPU_PRESENT )
+        #define __FPU_PRESENT                       ARCH_FPU_PRESENT
+    #endif
+#endif
+    
+/* Number of Bits used for Priority Levels */
+#if !defined ( __NVIC_PRIO_BITS )
+    #if defined ( ARCH_NVIC_PRIO_BITS )
+        #define __NVIC_PRIO_BITS                    ARCH_NVIC_PRIO_BITS
+    #else
+        #error "No __NVIC_PRIO_BITS or ARCH_NVIC_PRIO_BITS is defined in head of this file"
+    #endif
+#endif
+    
+/* Set to 1 if different SysTick Config is used */
+#if !defined ( __Vendor_SysTickConfig )
+    #if defined ( ARCH_Vendor_SysTickConfig )
+        #define __Vendor_SysTickConfig              ARCH_Vendor_SysTickConfig
+    #else
+        #error "No __Vendor_SysTickConfig or ARCH_Vendor_SysTickConfig is defined in head of this file"
+    #endif
 #endif
-
-#define __DSP_PRESENT                   1
 
 #if defined ( ARCH_ARM_CORTEX_CM0 )
     #include "../arch/arch32/arm/cmsis/include/core_cm0.h"
@@ -76,15 +106,6 @@ typedef enum IRQn {
     #include "../arch/arch32/arm/cmsis/include/core_cm23.h"
 
 #elif defined ( ARCH_ARM_CORTEX_CM33 )
-    // #define __CM33_REV                0x0000U   /*!< Core revision r0p1 */
-    // #define __SAUREGION_PRESENT       1U        /*!< SAU regions present */
-    // #define __MPU_PRESENT             1U        /*!< MPU present */
-    // #define __VTOR_PRESENT            1U        /*!< VTOR present */
-    // #define __NVIC_PRIO_BITS          4U        /*!< Number of Bits used for Priority Levels */
-    // #define __Vendor_SysTickConfig    0U        /*!< Set to 1 if different SysTick Config is used */
-    // #define __FPU_PRESENT             1U        /*!< FPU present */
-    // #define __DSP_PRESENT             1U        /*!< DSP extension present */
-
     #include "../arch/arch32/arm/cmsis/include/core_cm33.h"
 
 #elif defined ARCH_ARM_CORTEX_CM7
@@ -93,10 +114,10 @@ typedef enum IRQn {
 #elif defined ARCH_NATIVE_GCC
     // Nothing to do
 #else
-    #error "No ARM Arch is defined"
+    #error "No ARM Arch is defined in head of this file"
 #endif
 
-#if !defined ARCH_NATIVE_GCC
+#if !defined( ARCH_NATIVE_GCC )
     #define ARCH_ENTER_CRITICAL_SECTION()   vu32_t PRIMASK_Bit = __get_PRIMASK();        \
                                               __disable_irq();                           \
                                               __DSB();                                   \
diff --git a/include/kernal/configuration.h b/include/kernal/configuration.h
@@ -78,6 +78,31 @@ extern "C" {
     #define KERNAL_THREAD_STACK_SIZE                  (1024u)
 #endif
 
+/* Configuration of the Cortex-M Processor and Core Peripherals.
+ * You should check the chip header file or datasheet to check the following declaration symbol that support ARM Cortex-M Processor and Core Peripherals, and put it here. 
+ * It looks like this.
+ *
+ * #define __SAUREGION_PRESENT                          (1u) // SAU regions present
+ * #define __MPU_PRESENT                                (1u) // MPU present
+ * #define __VTOR_PRESENT                               (1u) // VTOR present
+ * #define __NVIC_PRIO_BITS                             (4u) // Number of Bits used for Priority Levels
+ * #define __Vendor_SysTickConfig                       (0u) // Set to 1 if different SysTick Config is used
+ * #define __FPU_PRESENT                                (1u) // FPU present
+ * #define __DSP_PRESENT                                (1u) // DSP extension present
+ *
+ * Or you can manually defined it according to your using ARM Cortex M seiral chip here with the following declaration symbol.
+ *
+ * #define ARCH_SAUREGION_PRESENT                        (1u) // SAU regions present
+ * #define ARCH_MPU_PRESENT                              (1u) // MPU present
+ * #define ARCH_VTOR_PRESENT                             (1u) // VTOR present
+ * #define ARCH_NVIC_PRIO_BITS                           (4u) // Number of Bits used for Priority Levels
+ * #define ARCH_Vendor_SysTickConfig                     (0u) // Set to 1 if different SysTick Config is used
+ * #define ARCH_FPU_PRESENT                              (1u) // FPU present
+ * #define ARCH_DSP_PRESENT                              (1u) // DSP extension present
+ *
+ * There is no default setting, which must be set in the atos_configuration.h file.
+ */
+
 #if !defined __CC_ARM &&  \
     !defined (__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050) && \
     !defined __ICCARM__ &&  \
@@ -87,7 +112,6 @@ extern "C" {
     !defined ARCH_NATIVE_GCC
 
     #warning Not supported compiler type
-
 #endif
 
 #ifdef __cplusplus
diff --git a/include/template/atos_configuration.h b/include/template/atos_configuration.h
@@ -22,7 +22,37 @@ extern "C" {
  * ARCH_ARM_CORTEX_CM33
  * ARCH_ARM_CORTEX_CM7
  **/
-#define ARCH_ARM_CORTEX_CM4
+#define ARCH_ARM_CORTEX_CM33
+
+/* Configuration of the Cortex-M Processor and Core Peripherals.
+ * You should check the chip header file or datasheet to check the following declaration symbol that support ARM Cortex-M Processor and Core Peripherals, and put it here. 
+ * It looks like this.
+ *
+ * #define __SAUREGION_PRESENT                          (1u) // SAU regions present
+ * #define __MPU_PRESENT                                (1u) // MPU present
+ * #define __VTOR_PRESENT                               (1u) // VTOR present
+ * #define __NVIC_PRIO_BITS                             (4u) // Number of Bits used for Priority Levels
+ * #define __Vendor_SysTickConfig                       (0u) // Set to 1 if different SysTick Config is used
+ * #define __FPU_PRESENT                                (1u) // FPU present
+ * #define __DSP_PRESENT                                (1u) // DSP extension present
+ *
+ * Or you can manually defined it according to your using ARM Cortex M seiral chip here with the following declaration symbol.
+ *
+ * #define ARCH_SAUREGION_PRESENT                        (1u) // SAU regions present
+ * #define ARCH_MPU_PRESENT                              (1u) // MPU present
+ * #define ARCH_VTOR_PRESENT                             (1u) // VTOR present
+ * #define ARCH_NVIC_PRIO_BITS                           (4u) // Number of Bits used for Priority Levels
+ * #define ARCH_Vendor_SysTickConfig                     (0u) // Set to 1 if different SysTick Config is used
+ * #define ARCH_FPU_PRESENT                              (1u) // FPU present
+ * #define ARCH_DSP_PRESENT                              (1u) // DSP extension present
+ */
+#define ARCH_SAUREGION_PRESENT                        (1u) // SAU regions present
+#define ARCH_MPU_PRESENT                              (1u) // MPU present
+#define ARCH_VTOR_PRESENT                             (1u) // VTOR present
+#define ARCH_NVIC_PRIO_BITS                           (4u) // Number of Bits used for Priority Levels
+#define ARCH_Vendor_SysTickConfig                     (0u) // Set to 1 if different SysTick Config is used
+#define ARCH_FPU_PRESENT                              (1u) // FPU present
+#define ARCH_DSP_PRESENT                              (1u) // DSP extension present
 
 /**
  * If you are use ARM Cortex M seiral architecture and use the system tick as the kernal timer.
@@ -31,7 +61,7 @@ extern "C" {
  * The default value is set to 120mhz. Your application will certainly need a different value so set this correctly.
  * This is very often, but not always, equal to the main system clock frequency.
  **/
-#define PORTAL_SYSTEM_CORE_CLOCK_MHZ              (120u)
+#define PORTAL_SYSTEM_CORE_CLOCK_MHZ              (180u)
 
 /**
  * If you are use ARM Cortex M seiral architecture and use the system tick as the kernal timer.
@@ -46,49 +76,49 @@ extern "C" {
  * The defaule value is set to 3. Your application will certainly need a different value so set this correctly.
  * This is very often, but not always, according to the actual thread instance number that you created.
  **/
-#define THREAD_INSTANCE_SUPPORTED_NUMBER          (3u)
+#define THREAD_INSTANCE_SUPPORTED_NUMBER          (20u)
 
 /**
  * This symbol defined the semaphore instance number that your application is using.
  * The defaule value is set to 3. Your application will certainly need a different value so set this correctly.
  * This is very often, but not always, according to the actual semaphore instance number that you created.
  **/
-#define SEMAPHORE_INSTANCE_SUPPORTED_NUMBER       (3u)
+#define SEMAPHORE_INSTANCE_SUPPORTED_NUMBER       (10u)
 
 /**
  * This symbol defined the event instance number that your application is using.
  * The defaule value is set to 3. Your application will certainly need a different value so set this correctly.
  * This is very often, but not always, according to the actual event instance number that you created.
  **/
-#define EVENT_INSTANCE_SUPPORTED_NUMBER           (3u)
+#define EVENT_INSTANCE_SUPPORTED_NUMBER           (10u)
 
 /**
  * This symbol defined the mutex instance number that your application is using.
  * The defaule value is set to 3. Your application will certainly need a different value so set this correctly.
  * This is very often, but not always, according to the actual mutex instance number that you created.
  **/
-#define MUTEX_INSTANCE_SUPPORTED_NUMBER           (3u)
+#define MUTEX_INSTANCE_SUPPORTED_NUMBER           (10u)
 
 /**
  * This symbol defined the queue instance number that your application is using.
  * The defaule value is set to 5. Your application will certainly need a different value so set this correctly.
  * This is very often, but not always, according to the actual queue instance number that you created.
  **/
-#define QUEUE_INSTANCE_SUPPORTED_NUMBER           (3u)
+#define QUEUE_INSTANCE_SUPPORTED_NUMBER           (10u)
 
 /**
  * This symbol defined the timer instance number that your application is using.
  * The defaule value is set to 5. Your application will certainly need a different value so set this correctly.
  * This is very often, but not always, according to the actual timer instance number that you created.
  **/
-#define TIMER_INSTANCE_SUPPORTED_NUMBER           (3u)
+#define TIMER_INSTANCE_SUPPORTED_NUMBER           (10u)
 
 /**
  * This symbol defined your thread running mode, if the thread runs at the privileged mode.
  * The defaule value is set to 0. Your application will certainly need a different value so set this correctly.
  * This is very often, but not always, according to the security level that you want.
  **/
-#define THREAD_PSP_WITH_PRIVILEGED                (3u)
+#define THREAD_PSP_WITH_PRIVILEGED                (10u)
 
 #ifdef __cplusplus
 }
diff --git a/include/template/native_gcc/atos_configuration.h b/include/template/native_gcc/atos_configuration.h
@@ -25,6 +25,36 @@ extern "C" {
  **/
 #define ARCH_NATIVE_GCC
 
+/* Configuration of the Cortex-M Processor and Core Peripherals.
+ * You should check the chip header file or datasheet to check the following declaration symbol that support ARM Cortex-M Processor and Core Peripherals, and put it here. 
+ * It looks like this.
+ *
+ * #define __SAUREGION_PRESENT                          (1u) // SAU regions present
+ * #define __MPU_PRESENT                                (1u) // MPU present
+ * #define __VTOR_PRESENT                               (1u) // VTOR present
+ * #define __NVIC_PRIO_BITS                             (4u) // Number of Bits used for Priority Levels
+ * #define __Vendor_SysTickConfig                       (0u) // Set to 1 if different SysTick Config is used
+ * #define __FPU_PRESENT                                (1u) // FPU present
+ * #define __DSP_PRESENT                                (1u) // DSP extension present
+ *
+ * Or you can manually defined it according to your using ARM Cortex M seiral chip here with the following declaration symbol.
+ *
+ * #define ARCH_SAUREGION_PRESENT                        (1u) // SAU regions present
+ * #define ARCH_MPU_PRESENT                              (1u) // MPU present
+ * #define ARCH_VTOR_PRESENT                             (1u) // VTOR present
+ * #define ARCH_NVIC_PRIO_BITS                           (4u) // Number of Bits used for Priority Levels
+ * #define ARCH_Vendor_SysTickConfig                     (0u) // Set to 1 if different SysTick Config is used
+ * #define ARCH_FPU_PRESENT                              (1u) // FPU present
+ * #define ARCH_DSP_PRESENT                              (1u) // DSP extension present
+ */
+#define ARCH_SAUREGION_PRESENT                        (1u) // SAU regions present
+#define ARCH_MPU_PRESENT                              (1u) // MPU present
+#define ARCH_VTOR_PRESENT                             (1u) // VTOR present
+#define ARCH_NVIC_PRIO_BITS                           (4u) // Number of Bits used for Priority Levels
+#define ARCH_Vendor_SysTickConfig                     (0u) // Set to 1 if different SysTick Config is used
+#define ARCH_FPU_PRESENT                              (1u) // FPU present
+#define ARCH_DSP_PRESENT                              (1u) // DSP extension present
+
 /**
  * If you are use ARM Cortex M seiral architecture and use the system tick as the kernal timer.
  * In most cases, PORTAL_SYSTEM_CORE_CLOCK_MHZ must be set to the frequency of the clock
diff --git a/kernal_version.h b/kernal_version.h
@@ -12,11 +12,11 @@
 extern "C" {
 #endif
 
-#define ATOS_BUILD_TIME                             "2024-02-15,11:24"
-#define ATOS_COMMIT_HEAD_ID                         "b8344c54828813787ac4cafa0a177ff7c0741796"
+#define ATOS_BUILD_TIME                             "2024-02-15,20:56"
+#define ATOS_COMMIT_HEAD_ID                         "5c95f1a3f050128d4a5c180e8f9b93f6737421f4"
 #define ATOS_VERSION_MAJOR_NUMBER                   (0u)
 #define ATOS_VERSION_MINOR_NUMBER                   (3u)
-#define ATOS_VERSION_PATCH_NUMBER                   (6u)
+#define ATOS_VERSION_PATCH_NUMBER                   (7u)
 
 #define ATOS_VERSION_MAJOR_NUMBER_MASK              (0x03FFu)
 #define ATOS_VERSION_MAJOR_NUMBER_POS               (22u)
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name":  "At-RTOS",
-    "version":  "0.3.6",
-    "timestamp":  "2024-02-15,11:24",
-    "commit_id":  "b8344c54828813787ac4cafa0a177ff7c0741797"
+    "version":  "0.3.7",
+    "timestamp":  "2024-02-15,20:56",
+    "commit_id":  "b8344c54828813787ac4cafa0a177ff7c0741796"
 }
diff --git a/port/port_keil_ac5.c b/port/port_keil_ac5.c
@@ -15,8 +15,8 @@ extern "C" {
 #include "compiler.h"
 #include "port.h"
 
-#if defined ( __TARGET_FPU_VFP )
-    #define FPU_ENABLED  __TARGET_FPU_VFP
+#if defined ( __FPU_PRESENT )
+    #define FPU_ENABLED  __FPU_PRESENT
 #else
     #define FPU_ENABLED  0
 #endif

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "At-RTOS",`
`3`		`- "version": "0.3.6",`
`4`		`- "timestamp": "2024-02-15,11:24",`
`5`		`- "commit_id": "b8344c54828813787ac4cafa0a177ff7c0741797"`
	`3`	`+ "version": "0.3.7",`
	`4`	`+ "timestamp": "2024-02-15,20:56",`
	`5`	`+ "commit_id": "b8344c54828813787ac4cafa0a177ff7c0741796"`
`6`	`6`	`}`