From 4ffa6d466a231b761b325e70f9ec8b5a22f81c38 Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Sat, 26 Jan 2019 11:07:40 +0000 Subject: Fixed small problems in NASA OSAL and demos. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_19.1.x@12589 110e8d01-0319-4d1e-a829-52ad28d1bb01 --- demos/STM32/NASA-OSAL-STM32F407-DISCOVERY/cfg/chconf.h | 4 +++- demos/STM32/NASA-OSAL-STM32F746G-DISCOVERY/cfg/chconf.h | 4 +++- os/common/abstractions/nasa_cfe/osal/src/osapi.c | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/demos/STM32/NASA-OSAL-STM32F407-DISCOVERY/cfg/chconf.h b/demos/STM32/NASA-OSAL-STM32F407-DISCOVERY/cfg/chconf.h index b9085ba8c..da25f2fe6 100644 --- a/demos/STM32/NASA-OSAL-STM32F407-DISCOVERY/cfg/chconf.h +++ b/demos/STM32/NASA-OSAL-STM32F407-DISCOVERY/cfg/chconf.h @@ -605,7 +605,9 @@ * @details User fields added to the end of the @p thread_t structure. */ #define CH_CFG_THREAD_EXTRA_FIELDS \ - /* Add threads custom fields here.*/ + /* Add threads custom fields here.*/ \ + void *osal_delete_handler; + /** * @brief Threads initialization hook. diff --git a/demos/STM32/NASA-OSAL-STM32F746G-DISCOVERY/cfg/chconf.h b/demos/STM32/NASA-OSAL-STM32F746G-DISCOVERY/cfg/chconf.h index c2c86d91a..acdf61069 100644 --- a/demos/STM32/NASA-OSAL-STM32F746G-DISCOVERY/cfg/chconf.h +++ b/demos/STM32/NASA-OSAL-STM32F746G-DISCOVERY/cfg/chconf.h @@ -605,7 +605,9 @@ * @details User fields added to the end of the @p thread_t structure. */ #define CH_CFG_THREAD_EXTRA_FIELDS \ - /* Add threads custom fields here.*/ + /* Add threads custom fields here.*/ \ + void *osal_delete_handler; + /** * @brief Threads initialization hook. diff --git a/os/common/abstractions/nasa_cfe/osal/src/osapi.c b/os/common/abstractions/nasa_cfe/osal/src/osapi.c index b4c21bdfe..c3c5110e3 100644 --- a/os/common/abstractions/nasa_cfe/osal/src/osapi.c +++ b/os/common/abstractions/nasa_cfe/osal/src/osapi.c @@ -1835,7 +1835,7 @@ int32 OS_TaskCreate(uint32 *task_id, (stkalign_t *)stack_pointer, (stkalign_t *)((uint8_t *)stack_pointer + stack_size), rt_prio, - (tfunc_t)function_pointer, + (tfunc_t)(void *)function_pointer, NULL }; -- cgit v1.2.3