merge default into stable for release v1.06

dimonomid · Jan 2, 2015 · c022ba5 · c022ba5
2 parents 38dc943 + 32c485e
commit c022ba5
Show file tree

Hide file tree

Showing 19 changed files with 55 additions and 31 deletions.
diff --git a/...arch/cortex_m/stm32f4-discovery/tn_stm32f4_example_basic/tn_stm32f4_example_basic.uvprojx b/...arch/cortex_m/stm32f4-discovery/tn_stm32f4_example_basic/tn_stm32f4_example_basic.uvprojx
@@ -414,9 +414,19 @@
               <FilePath>..\tn_stm32f4_example_basic.c</FilePath>
             </File>
             <File>
-              <FileName>tneo_cortex_m4f_keil5.lib</FileName>
+              <FileName>tn_app_check.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\..\..\src\tn_app_check.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>lib</GroupName>
+          <Files>
+            <File>
+              <FileName>tneo_cortex_m4f_keil_rv.lib</FileName>
               <FileType>4</FileType>
-              <FilePath>..\tneo_cortex_m4f_keil5.lib</FilePath>
+              <FilePath>..\tneo_cortex_m4f_keil_rv.lib</FilePath>
             </File>
           </Files>
         </Group>

diff --git a/examples/basic/arch/cortex_m/stm32f4-discovery/tneo_cortex_m4f_keil5.lib b/examples/basic/arch/cortex_m/stm32f4-discovery/tneo_cortex_m4f_keil5.lib
diff --git a/examples/basic/arch/cortex_m/stm32f4-discovery/tneo_cortex_m4f_keil_rv.lib b/examples/basic/arch/cortex_m/stm32f4-discovery/tneo_cortex_m4f_keil_rv.lib
diff --git a/examples/basic/arch/pic24/tn_pic24_example_basic.X/nbproject/configurations.xml b/examples/basic/arch/pic24/tn_pic24_example_basic.X/nbproject/configurations.xml
@@ -13,6 +13,7 @@
                    displayName="Source Files"
                    projectFiles="true">
       <itemPath>../tn_pic24_example_basic.c</itemPath>
+      <itemPath>../../../../../src/tn_app_check.c</itemPath>
     </logicalFolder>
     <logicalFolder name="ExternalFiles"
                    displayName="Important Files"
@@ -22,9 +23,8 @@
   </logicalFolder>
   <sourceRootList>
     <Elem>../../../../src/arch/pic32</Elem>
-    <Elem>../../../../../src/arch/pic32</Elem>
     <Elem>..</Elem>
-    <Elem>../../../../../src/arch/pic24_dspic</Elem>
+    <Elem>../../../../../src</Elem>
   </sourceRootList>
   <projectmakefile>Makefile</projectmakefile>
   <confs>
@@ -43,12 +43,12 @@
         <linkerTool>
           <linkerLibItems>
             <linkerLibProjectItem>
-              <makeArtifact PL="../../../../../src/arch/pic24_dspic/tneo_pic24_dspic.X"
+              <makeArtifact PL="../../../../../lib_project/pic24_dspic/tneo_pic24_dspic.X"
                             CT="3"
                             CN="no_eds"
                             AC="false"
                             BL="true"
-                            WD="../../../../../src/arch/pic24_dspic/tneo_pic24_dspic.X"
+                            WD="../../../../../lib_project/pic24_dspic/tneo_pic24_dspic.X"
                             BC="${MAKE}  -f Makefile CONF=no_eds"
                             DBC="${MAKE}  -f Makefile CONF=no_eds TYPE_IMAGE=DEBUG_RUN"
                             CC="rm -rf &quot;build/no_eds&quot; &quot;dist/no_eds&quot;"

diff --git a/examples/basic/arch/pic24/tn_pic24_example_basic.X/nbproject/project.xml b/examples/basic/arch/pic24/tn_pic24_example_basic.X/nbproject/project.xml
@@ -11,7 +11,7 @@
             <asminc-extensions/>
             <sourceEncoding>UTF-8</sourceEncoding>
             <make-dep-projects>
-                <make-dep-project>../../../../../src/arch/pic24_dspic/tneo_pic24_dspic.X</make-dep-project>
+                <make-dep-project>../../../../../lib_project/pic24_dspic/tneo_pic24_dspic.X</make-dep-project>
             </make-dep-projects>
         </data>
     </configuration>

diff --git a/examples/basic/arch/pic32/tn_pic32_example_basic.X/nbproject/configurations.xml b/examples/basic/arch/pic32/tn_pic32_example_basic.X/nbproject/configurations.xml
@@ -14,6 +14,7 @@
                    projectFiles="true">
       <itemPath>../../../../../src/arch/pic32/tn_arch_pic32_int_vec1.S</itemPath>
       <itemPath>../tn_pic32_example_basic.c</itemPath>
+      <itemPath>../../../../../src/tn_app_check.c</itemPath>
     </logicalFolder>
     <logicalFolder name="ExternalFiles"
                    displayName="Important Files"
@@ -23,8 +24,8 @@
   </logicalFolder>
   <sourceRootList>
     <Elem>../../../../src/arch/pic32</Elem>
-    <Elem>../../../../../src/arch/pic32</Elem>
     <Elem>..</Elem>
+    <Elem>../../../../../src</Elem>
   </sourceRootList>
   <projectmakefile>Makefile</projectmakefile>
   <confs>
@@ -43,12 +44,12 @@
         <linkerTool>
           <linkerLibItems>
             <linkerLibProjectItem>
-              <makeArtifact PL="../../../../../src/arch/pic32/tneo_pic32.X"
+              <makeArtifact PL="../../../../../lib_project/pic32/tneo_pic32.X"
                             CT="3"
                             CN="default"
                             AC="true"
                             BL="true"
-                            WD="../../../../../src/arch/pic32/tneo_pic32.X"
+                            WD="../../../../../lib_project/pic32/tneo_pic32.X"
                             BC="${MAKE}  -f Makefile CONF=default"
                             DBC="${MAKE}  -f Makefile CONF=default TYPE_IMAGE=DEBUG_RUN"
                             CC="rm -rf &quot;build/default&quot; &quot;dist/default&quot;"

diff --git a/examples/basic/arch/pic32/tn_pic32_example_basic.X/nbproject/project.xml b/examples/basic/arch/pic32/tn_pic32_example_basic.X/nbproject/project.xml
@@ -11,7 +11,7 @@
             <asminc-extensions/>
             <sourceEncoding>UTF-8</sourceEncoding>
             <make-dep-projects>
-                <make-dep-project>../../../../../src/arch/pic32/tneo_pic32.X</make-dep-project>
+                <make-dep-project>../../../../../lib_project/pic32/tneo_pic32.X</make-dep-project>
             </make-dep-projects>
         </data>
     </configuration>

diff --git a/examples/queue/arch/pic24/example_queue_pic24.X/nbproject/configurations.xml b/examples/queue/arch/pic24/example_queue_pic24.X/nbproject/configurations.xml
@@ -19,6 +19,7 @@
       <itemPath>../../../queue_example.c</itemPath>
       <itemPath>../../../task_consumer.c</itemPath>
       <itemPath>../../../task_producer.c</itemPath>
+      <itemPath>../../../../../src/tn_app_check.c</itemPath>
     </logicalFolder>
     <logicalFolder name="ExternalFiles"
                    displayName="Important Files"
@@ -28,8 +29,8 @@
   </logicalFolder>
   <sourceRootList>
     <Elem>../../../../common/queue</Elem>
-    <Elem>../../../../../src/arch/pic32</Elem>
     <Elem>../../..</Elem>
+    <Elem>../../../../../src</Elem>
   </sourceRootList>
   <projectmakefile>Makefile</projectmakefile>
   <confs>
@@ -48,12 +49,12 @@
         <linkerTool>
           <linkerLibItems>
             <linkerLibProjectItem>
-              <makeArtifact PL="../../../../../src/arch/pic24_dspic/tneo_pic24_dspic.X"
+              <makeArtifact PL="../../../../../lib_project/pic24_dspic/tneo_pic24_dspic.X"
                             CT="3"
                             CN="no_eds"
                             AC="false"
                             BL="true"
-                            WD="../../../../../src/arch/pic24_dspic/tneo_pic24_dspic.X"
+                            WD="../../../../../lib_project/pic24_dspic/tneo_pic24_dspic.X"
                             BC="${MAKE}  -f Makefile CONF=no_eds"
                             DBC="${MAKE}  -f Makefile CONF=no_eds TYPE_IMAGE=DEBUG_RUN"
                             CC="rm -rf &quot;build/no_eds&quot; &quot;dist/no_eds&quot;"

diff --git a/examples/queue/arch/pic24/example_queue_pic24.X/nbproject/project.xml b/examples/queue/arch/pic24/example_queue_pic24.X/nbproject/project.xml
@@ -11,7 +11,7 @@
             <asminc-extensions/>
             <sourceEncoding>UTF-8</sourceEncoding>
             <make-dep-projects>
-                <make-dep-project>../../../../../src/arch/pic24_dspic/tneo_pic24_dspic.X</make-dep-project>
+                <make-dep-project>../../../../../lib_project/pic24_dspic/tneo_pic24_dspic.X</make-dep-project>
             </make-dep-projects>
         </data>
     </configuration>

diff --git a/examples/queue/arch/pic32/example_queue_pic32.X/nbproject/configurations.xml b/examples/queue/arch/pic32/example_queue_pic32.X/nbproject/configurations.xml
@@ -20,6 +20,7 @@
       <itemPath>../../../queue_example.c</itemPath>
       <itemPath>../../../task_consumer.c</itemPath>
       <itemPath>../../../task_producer.c</itemPath>
+      <itemPath>../../../../../src/tn_app_check.c</itemPath>
     </logicalFolder>
     <logicalFolder name="ExternalFiles"
                    displayName="Important Files"
@@ -29,8 +30,8 @@
   </logicalFolder>
   <sourceRootList>
     <Elem>../../../../common/queue</Elem>
-    <Elem>../../../../../src/arch/pic32</Elem>
     <Elem>../../..</Elem>
+    <Elem>../../../../../src</Elem>
   </sourceRootList>
   <projectmakefile>Makefile</projectmakefile>
   <confs>
@@ -49,12 +50,12 @@
         <linkerTool>
           <linkerLibItems>
             <linkerLibProjectItem>
-              <makeArtifact PL="../../../../../src/arch/pic32/tneo_pic32.X"
+              <makeArtifact PL="../../../../../lib_project/pic32/tneo_pic32.X"
                             CT="3"
                             CN="default"
                             AC="true"
                             BL="true"
-                            WD="../../../../../src/arch/pic32/tneo_pic32.X"
+                            WD="../../../../../lib_project/pic32/tneo_pic32.X"
                             BC="${MAKE}  -f Makefile CONF=default"
                             DBC="${MAKE}  -f Makefile CONF=default TYPE_IMAGE=DEBUG_RUN"
                             CC="rm -rf &quot;build/default&quot; &quot;dist/default&quot;"

diff --git a/examples/queue/arch/pic32/example_queue_pic32.X/nbproject/project.xml b/examples/queue/arch/pic32/example_queue_pic32.X/nbproject/project.xml
@@ -11,7 +11,7 @@
             <asminc-extensions/>
             <sourceEncoding>UTF-8</sourceEncoding>
             <make-dep-projects>
-                <make-dep-project>../../../../../src/arch/pic32/tneo_pic32.X</make-dep-project>
+                <make-dep-project>../../../../../lib_project/pic32/tneo_pic32.X</make-dep-project>
             </make-dep-projects>
         </data>
     </configuration>

diff --git a/...eventgrp_conn/arch/pic24/example_queue_eventgrp_conn_pic24.X/nbproject/configurations.xml b/...eventgrp_conn/arch/pic24/example_queue_eventgrp_conn_pic24.X/nbproject/configurations.xml
@@ -19,6 +19,7 @@
       <itemPath>../../../example_queue_eventgrp_conn.c</itemPath>
       <itemPath>../../../task_consumer.c</itemPath>
       <itemPath>../../../task_producer.c</itemPath>
+      <itemPath>../../../../../src/tn_app_check.c</itemPath>
     </logicalFolder>
     <logicalFolder name="ExternalFiles"
                    displayName="Important Files"
@@ -28,6 +29,7 @@
   </logicalFolder>
   <sourceRootList>
     <Elem>../../..</Elem>
+    <Elem>../../../../../src</Elem>
   </sourceRootList>
   <projectmakefile>Makefile</projectmakefile>
   <confs>
@@ -46,12 +48,12 @@
         <linkerTool>
           <linkerLibItems>
             <linkerLibProjectItem>
-              <makeArtifact PL="../../../../../src/arch/pic24_dspic/tneo_pic24_dspic.X"
+              <makeArtifact PL="../../../../../lib_project/pic24_dspic/tneo_pic24_dspic.X"
                             CT="3"
                             CN="no_eds"
                             AC="false"
                             BL="true"
-                            WD="../../../../../src/arch/pic24_dspic/tneo_pic24_dspic.X"
+                            WD="../../../../../lib_project/pic24_dspic/tneo_pic24_dspic.X"
                             BC="${MAKE}  -f Makefile CONF=no_eds"
                             DBC="${MAKE}  -f Makefile CONF=no_eds TYPE_IMAGE=DEBUG_RUN"
                             CC="rm -rf &quot;build/no_eds&quot; &quot;dist/no_eds&quot;"

diff --git a/.../queue_eventgrp_conn/arch/pic24/example_queue_eventgrp_conn_pic24.X/nbproject/project.xml b/.../queue_eventgrp_conn/arch/pic24/example_queue_eventgrp_conn_pic24.X/nbproject/project.xml
@@ -11,7 +11,7 @@
             <asminc-extensions/>
             <sourceEncoding>UTF-8</sourceEncoding>
             <make-dep-projects>
-                <make-dep-project>../../../../../src/arch/pic24_dspic/tneo_pic24_dspic.X</make-dep-project>
+                <make-dep-project>../../../../../lib_project/pic24_dspic/tneo_pic24_dspic.X</make-dep-project>
             </make-dep-projects>
         </data>
     </configuration>

diff --git a/...eventgrp_conn/arch/pic32/example_queue_eventgrp_conn_pic32.X/nbproject/configurations.xml b/...eventgrp_conn/arch/pic32/example_queue_eventgrp_conn_pic32.X/nbproject/configurations.xml
@@ -20,6 +20,7 @@
       <itemPath>../../../task_consumer.c</itemPath>
       <itemPath>../../../task_producer.c</itemPath>
       <itemPath>../../../example_queue_eventgrp_conn.c</itemPath>
+      <itemPath>../../../../../src/tn_app_check.c</itemPath>
     </logicalFolder>
     <logicalFolder name="ExternalFiles"
                    displayName="Important Files"
@@ -29,8 +30,8 @@
   </logicalFolder>
   <sourceRootList>
     <Elem>../../../../common/queue</Elem>
-    <Elem>../../../../../src/arch/pic32</Elem>
     <Elem>../../..</Elem>
+    <Elem>../../../../../src</Elem>
   </sourceRootList>
   <projectmakefile>Makefile</projectmakefile>
   <confs>
@@ -49,12 +50,12 @@
         <linkerTool>
           <linkerLibItems>
             <linkerLibProjectItem>
-              <makeArtifact PL="../../../../../src/arch/pic32/tneo_pic32.X"
+              <makeArtifact PL="../../../../../lib_project/pic32/tneo_pic32.X"
                             CT="3"
                             CN="default"
                             AC="true"
                             BL="true"
-                            WD="../../../../../src/arch/pic32/tneo_pic32.X"
+                            WD="../../../../../lib_project/pic32/tneo_pic32.X"
                             BC="${MAKE}  -f Makefile CONF=default"
                             DBC="${MAKE}  -f Makefile CONF=default TYPE_IMAGE=DEBUG_RUN"
                             CC="rm -rf &quot;build/default&quot; &quot;dist/default&quot;"

diff --git a/.../queue_eventgrp_conn/arch/pic32/example_queue_eventgrp_conn_pic32.X/nbproject/project.xml b/.../queue_eventgrp_conn/arch/pic32/example_queue_eventgrp_conn_pic32.X/nbproject/project.xml
@@ -11,7 +11,7 @@
             <asminc-extensions/>
             <sourceEncoding>UTF-8</sourceEncoding>
             <make-dep-projects>
-                <make-dep-project>../../../../../src/arch/pic32/tneo_pic32.X</make-dep-project>
+                <make-dep-project>../../../../../lib_project/pic32/tneo_pic32.X</make-dep-project>
             </make-dep-projects>
         </data>
     </configuration>

diff --git a/src/arch/tn_arch_detect.h b/src/arch/tn_arch_detect.h
@@ -106,6 +106,15 @@
 #  if defined(__TARGET_CPU_CORTEX_M0)
 #     define __TN_ARCH_CORTEX_M0__
 #     define __TN_ARCHFEAT_CORTEX_M_ARMv6M_ISA__
+
+/*
+ * For Cortex-M0+, ARMCC defines pretty nasty macro __TARGET_CPU_CORTEX_M0_,
+ * see some details here:
+ * http://stackoverflow.com/questions/25973956/predefined-cpu-target-macro-for-cortex-m0
+ */
+#  elif defined(__TARGET_CPU_CORTEX_M0_)
+#     define __TN_ARCH_CORTEX_M0__
+#     define __TN_ARCHFEAT_CORTEX_M_ARMv6M_ISA__
 #  elif defined(__TARGET_CPU_CORTEX_M3)
 #     define __TN_ARCH_CORTEX_M3__
 #     define __TN_ARCHFEAT_CORTEX_M_ARMv6M_ISA__

diff --git a/src/core/tn_eventgrp.h b/src/core/tn_eventgrp.h
@@ -311,7 +311,7 @@ static _TN_INLINE enum TN_RCode tn_eventgrp_create(
 #if TN_OLD_EVENT_API
          (TN_EVENTGRP_ATTR_MULTI),
 #else
-         (0),
+         (TN_EVENTGRP_ATTR_NONE),
 #endif
          initial_pattern
          );

diff --git a/stuff/doc_pages/changelog.dox b/stuff/doc_pages/changelog.dox
@@ -5,7 +5,7 @@
 
 TNeo changelog
 
-\section changelog_v1_05 v1.05
+\section changelog_v1_06 v1.06
 
 Release date: 2015-01-02.
 

diff --git a/stuff/doc_pages/mainpage.dox b/stuff/doc_pages/mainpage.dox
@@ -1,9 +1,8 @@
 /**
 \mainpage TNeo overview
 
-TNeo is a compact and fast real-time kernel for the embedded 32/16 bits
-microprocessors. It performs a preemptive priority-based scheduling and a
-round-robin scheduling for the tasks with identical priority.
+TNeo is a compact and fast real-time kernel for embedded 32/16 bits
+microprocessors. It performs a preemptive priority-based scheduling.
 
 TNeo was born as a thorough review and re-implementation of
 [TNKernel](http://tnkernel.com) 2.7.  The new kernel has well-formed code,