Trunk Build 672

tuxera · Jun 27, 2016 · 1d2dae2 · 1d2dae2
1 parent 8c1287b
commit 1d2dae2
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 12 deletions.
diff --git a/doc/release_notes.md b/doc/release_notes.md
@@ -5,6 +5,11 @@ recent releases and a list of known issues.
 
 ## Release History and Changes
 
+### Reliance Edge v1.0.3, June 2016
+
+- Added support for static memory allocation configuration in FreeRTOS
+  version 9.  No common code changes.
+
 ### Reliance Edge v1.0.2, February 2016
 
 #### Common Code Changes

diff --git a/doc/release_notes.txt b/doc/release_notes.txt
@@ -9,6 +9,11 @@ course of recent releases and a list of known issues.
 
 Release History and Changes
 
+Reliance Edge v1.0.3, June 2016
+
+-   Added support for static memory allocation configuration in FreeRTOS
+    version 9. No common code changes.
+
 Reliance Edge v1.0.2, February 2016
 
 Common Code Changes

diff --git a/include/redver.h b/include/redver.h
@@ -33,7 +33,7 @@
 
     <!-- This macro is updated automatically: do not edit! -->
 */
-#define RED_BUILD_NUMBER "671"
+#define RED_BUILD_NUMBER "672"
 
 #define RED_KIT_GPL         0U  /* Open source GPL kit. */
 #define RED_KIT_COMMERCIAL  1U  /* Commercially-licensed kit. */
@@ -48,7 +48,7 @@
 
 /** @brief Version number to display in output.
 */
-#define RED_VERSION "v1.0.2"
+#define RED_VERSION "v1.0.3"
 
 
 /** @brief On-disk version number.
@@ -83,7 +83,7 @@
 
 /** @brief Product copyright.
 */
-#define RED_PRODUCT_LEGAL "Copyright (c) 2014-2015 Datalight, Inc.  All Rights Reserved Worldwide."
+#define RED_PRODUCT_LEGAL "Copyright (c) 2014-2016 Datalight, Inc.  All Rights Reserved Worldwide."
 
 
 /** @brief Product patents.

diff --git a/os/freertos/services/osmutex.c b/os/freertos/services/osmutex.c
@@ -35,6 +35,9 @@
 
 
 static SemaphoreHandle_t xMutex;
+#if defined(configSUPPORT_STATIC_ALLOCATION) && (configSUPPORT_STATIC_ALLOCATION == 1)
+static StaticSemaphore_t xMutexBuffer;
+#endif
 
 
 /** @brief Initialize the mutex.
@@ -50,17 +53,27 @@ static SemaphoreHandle_t xMutex;
 */
 REDSTATUS RedOsMutexInit(void)
 {
-    REDSTATUS ret;
-
-    xMutex = xSemaphoreCreateMutex();
-    if(xMutex != NULL)
+    REDSTATUS ret = 0;
+
+  #if defined(configSUPPORT_STATIC_ALLOCATION) && (configSUPPORT_STATIC_ALLOCATION == 1)
+    xMutex = xSemaphoreCreateMutexStatic(&xMutexBuffer);
+
+    if(xMutex == NULL)
     {
-        ret = 0;
-    }
-    else
+        /*  The only error case for xSemaphoreCreateMutexStatic is that the mutex
+            buffer parameter is NULL, which is not the case.
+        */
+        REDERROR();
+        ret = -RED_EINVAL;
+    }        
+
+  #else
+    xMutex = xSemaphoreCreateMutex();
+    if(xMutex == NULL)
     {
         ret = -RED_ENOMEM;
     }
+  #endif
 
     return ret;
 }

diff --git a/projects/freertos/atmel/sam4e-ek/README.txt b/projects/freertos/atmel/sam4e-ek/README.txt
@@ -58,7 +58,7 @@ driver, but it might not be enabled (see the macros in that file).
 Tested Versions
 ---------------
 
-This project has been tested with FreeRTOS v8.2.0 and Atmel Studio 6.2.
+This project has been tested with FreeRTOS v8.2-v9.0 and Atmel Studio 6.2.
 Modifications may be required for other software versions.
 
 Resources

diff --git a/projects/freertos/atmel/sam4s-xplained-pro/README.txt b/projects/freertos/atmel/sam4s-xplained-pro/README.txt
@@ -70,7 +70,7 @@ driver, but it might not be enabled (see the macros in that file).
 Tested Versions
 ---------------
 
-This project has been tested with FreeRTOS v8.2.0 and Atmel Studio 6.2.
+This project has been tested with FreeRTOS v8.2-v9.0 and Atmel Studio 6.2.
 Modifications may be required for other software versions.
 
 Resources