Merge branch 'develop'

MaJerle · Jun 1, 2021 · 28bf545 · 28bf545
2 parents 65f4100 + 2b3f8c5
commit 28bf545
Show file tree

Hide file tree

Showing 21 changed files with 370 additions and 192 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## Develop
 
+## v1.5.3
+
+- Update CMSIS OS driver to support FreeRTOS aware kernel
+
 ## v1.5.2
 
 - Fix missing region parameter in some allocation or reallocation cases

diff --git a/dev/VisualStudio/lwmem_opts.h b/dev/VisualStudio/lwmem_opts.h
@@ -29,7 +29,7 @@
  * This file is part of Lightweight dynamic memory manager library.
  *
  * Author:          Tilen MAJERLE <[email protected]>
- * Version:         v1.5.2
+ * Version:         v1.5.3
  */
 #ifndef LWMEM_HDR_OPTS_H
 #define LWMEM_HDR_OPTS_H

diff --git a/examples/stm32/lwmem_rtos_stm32l496_discovery/STM32CubeIDE/.cproject b/examples/stm32/lwmem_rtos_stm32l496_discovery/STM32CubeIDE/.cproject
diff --git a/examples/stm32/lwmem_rtos_stm32l496_discovery/inc/lwmem_opts.h b/examples/stm32/lwmem_rtos_stm32l496_discovery/inc/lwmem_opts.h
@@ -29,7 +29,7 @@
  * This file is part of LwMEM - Lightweight dynamic memory manager library.
  *
  * Author:          Tilen MAJERLE <[email protected]>
- * Version:         v1.5.2
+ * Version:         v1.5.3
  */
 #ifndef LWMEM_HDR_OPTS_H
 #define LWMEM_HDR_OPTS_H

diff --git a/examples/stm32/lwmem_rtos_stm32l496_discovery/inc/main.h b/examples/stm32/lwmem_rtos_stm32l496_discovery/inc/main.h
@@ -27,7 +27,7 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  *
  * Author:          Tilen MAJERLE <[email protected]>
- * Version:         v1.5.2
+ * Version:         v1.5.3
  */
 #ifndef __MAIN_H
 #define __MAIN_H

diff --git a/examples/stm32/lwmem_rtos_stm32l496_discovery/src/main.c b/examples/stm32/lwmem_rtos_stm32l496_discovery/src/main.c
@@ -27,7 +27,7 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  *
  * Author:          Tilen MAJERLE <[email protected]>
- * Version:         v1.5.2
+ * Version:         v1.5.3
  */
 #include "main.h"
 #include "cmsis_os.h"

diff --git a/examples/stm32/lwmem_stm32l496_discovery/inc/lwmem_opts.h b/examples/stm32/lwmem_stm32l496_discovery/inc/lwmem_opts.h
@@ -29,7 +29,7 @@
  * This file is part of LwMEM - Lightweight dynamic memory manager library.
  *
  * Author:          Tilen MAJERLE <[email protected]>
- * Version:         v1.5.2
+ * Version:         v1.5.3
  */
 #ifndef LWMEM_HDR_OPTS_H
 #define LWMEM_HDR_OPTS_H

diff --git a/examples/stm32/lwmem_stm32l496_discovery/inc/main.h b/examples/stm32/lwmem_stm32l496_discovery/inc/main.h
@@ -27,7 +27,7 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  *
  * Author:          Tilen MAJERLE <[email protected]>
- * Version:         v1.5.2
+ * Version:         v1.5.3
  */
 #ifndef __MAIN_H
 #define __MAIN_H

diff --git a/examples/stm32/lwmem_stm32l496_discovery/src/main.c b/examples/stm32/lwmem_stm32l496_discovery/src/main.c
@@ -27,7 +27,7 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  *
  * Author:          Tilen MAJERLE <[email protected]>
- * Version:         v1.5.2
+ * Version:         v1.5.3
  */
 #include "main.h"
 #include "lwmem/lwmem.h"

diff --git a/examples/win32/lwmem/lwmem_opts.h b/examples/win32/lwmem/lwmem_opts.h
@@ -29,7 +29,7 @@
  * This file is part of LwMEM - Lightweight dynamic memory manager library.
  *
  * Author:          Tilen MAJERLE <[email protected]>
- * Version:         v1.5.2
+ * Version:         v1.5.3
  */
 #ifndef LWMEM_HDR_OPTS_H
 #define LWMEM_HDR_OPTS_H

diff --git a/examples/win32/lwmem_multi_ins_multi_region/lwmem_opts.h b/examples/win32/lwmem_multi_ins_multi_region/lwmem_opts.h
@@ -29,7 +29,7 @@
  * This file is part of LwMEM - Lightweight dynamic memory manager library.
  *
  * Author:          Tilen MAJERLE <[email protected]>
- * Version:         v1.5.2
+ * Version:         v1.5.3
  */
 #ifndef LWMEM_HDR_OPTS_H
 #define LWMEM_HDR_OPTS_H

diff --git a/examples/win32/lwmem_multi_region/lwmem_opts.h b/examples/win32/lwmem_multi_region/lwmem_opts.h
@@ -29,7 +29,7 @@
  * This file is part of LwMEM - Lightweight dynamic memory manager library.
  *
  * Author:          Tilen MAJERLE <[email protected]>
- * Version:         v1.5.2
+ * Version:         v1.5.3
  */
 #ifndef LWMEM_HDR_OPTS_H
 #define LWMEM_HDR_OPTS_H

diff --git a/examples/win32/lwmem_os/lwmem_opts.h b/examples/win32/lwmem_os/lwmem_opts.h
@@ -29,7 +29,7 @@
  * This file is part of LwMEM - Lightweight dynamic memory manager library.
  *
  * Author:          Tilen MAJERLE <[email protected]>
- * Version:         v1.5.2
+ * Version:         v1.5.3
  */
 #ifndef LWMEM_HDR_OPTS_H
 #define LWMEM_HDR_OPTS_H

diff --git a/lwmem/src/include/lwmem/lwmem.h b/lwmem/src/include/lwmem/lwmem.h
@@ -29,7 +29,7 @@
  * This file is part of LwMEM - Lightweight dynamic memory manager library.
  *
  * Author:          Tilen MAJERLE <[email protected]>
- * Version:         v1.5.2
+ * Version:         v1.5.3
  */
 #ifndef LWMEM_HDR_H
 #define LWMEM_HDR_H

diff --git a/lwmem/src/include/lwmem/lwmem_opt.h b/lwmem/src/include/lwmem/lwmem_opt.h
@@ -29,7 +29,7 @@
  * This file is part of LwMEM - Lightweight dynamic memory manager library.
  *
  * Author:          Tilen MAJERLE <[email protected]>
- * Version:         v1.5.2
+ * Version:         v1.5.3
  */
 #ifndef LWMEM_HDR_OPT_H
 #define LWMEM_HDR_OPT_H

diff --git a/lwmem/src/include/lwmem/lwmem_opts_template.h b/lwmem/src/include/lwmem/lwmem_opts_template.h
@@ -29,7 +29,7 @@
  * This file is part of LwMEM - Lightweight dynamic memory manager library.
  *
  * Author:          Tilen MAJERLE <[email protected]>
- * Version:         v1.5.2
+ * Version:         v1.5.3
  */
 #ifndef LWMEM_HDR_OPTS_H
 #define LWMEM_HDR_OPTS_H

diff --git a/lwmem/src/include/system/lwmem_sys.h b/lwmem/src/include/system/lwmem_sys.h
@@ -29,7 +29,7 @@
  * This file is part of LwMEM - Lightweight dynamic memory manager library.
  *
  * Author:          Tilen MAJERLE <[email protected]>
- * Version:         v1.5.2
+ * Version:         v1.5.3
  */
 #ifndef LWMEM_HDR_SYS_H
 #define LWMEM_HDR_SYS_H

diff --git a/lwmem/src/lwmem/lwmem.c b/lwmem/src/lwmem/lwmem.c
@@ -29,7 +29,7 @@
  * This file is part of LwMEM - Lightweight dynamic memory manager library.
  *
  * Author:          Tilen MAJERLE <[email protected]>
- * Version:         v1.5.2
+ * Version:         v1.5.3
  */
 #include <limits.h>
 #include <string.h>

diff --git a/lwmem/src/system/lwmem_sys_cmsis_os.c b/lwmem/src/system/lwmem_sys_cmsis_os.c
@@ -29,7 +29,7 @@
  * This file is part of LwMEM - Lightweight dynamic memory manager library.
  *
  * Author:          Tilen MAJERLE <[email protected]>
- * Version:         v1.5.2
+ * Version:         v1.5.3
  */
 #include "system/lwmem_sys.h"
 
@@ -39,8 +39,10 @@
 
 uint8_t
 lwmem_sys_mutex_create(LWMEM_CFG_OS_MUTEX_HANDLE* m) {
-    *m = osMutexNew(NULL);
-    return lwmem_sys_mutex_isvalid(m);
+    const osMutexAttr_t attr = {
+        .name = "lwmem_mutex",
+    };
+    return (*m = osMutexNew(&attr)) != NULL;
 }
 
 uint8_t

diff --git a/lwmem/src/system/lwmem_sys_template.c b/lwmem/src/system/lwmem_sys_template.c
@@ -29,7 +29,7 @@
  * This file is part of LwMEM - Lightweight dynamic memory manager library.
  *
  * Author:          Tilen MAJERLE <[email protected]>
- * Version:         v1.5.2
+ * Version:         v1.5.3
  */
 #include "system/lwmem_sys.h"
 

diff --git a/lwmem/src/system/lwmem_sys_win32.c b/lwmem/src/system/lwmem_sys_win32.c
@@ -29,7 +29,7 @@
  * This file is part of LwMEM - Lightweight dynamic memory manager library.
  *
  * Author:          Tilen MAJERLE <[email protected]>
- * Version:         v1.5.2
+ * Version:         v1.5.3
  */
 #include "system/lwmem_sys.h"