From 3387da80304b7b73ad29d957264242e55181dc88 Mon Sep 17 00:00:00 2001 From: Samuel Sadok Date: Mon, 26 Mar 2018 15:35:37 -0700 Subject: [PATCH] add patch for FreeRTOS const fixes --- .../v3/0002-FreeRTOS-constness-fixes.patch | 64 +++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 Firmware/Board/v3/0002-FreeRTOS-constness-fixes.patch diff --git a/Firmware/Board/v3/0002-FreeRTOS-constness-fixes.patch b/Firmware/Board/v3/0002-FreeRTOS-constness-fixes.patch new file mode 100644 index 00000000..afe0326e --- /dev/null +++ b/Firmware/Board/v3/0002-FreeRTOS-constness-fixes.patch @@ -0,0 +1,64 @@ +From 510ead2b159e1d8116e5241066c54a7bf8b7bfbe Mon Sep 17 00:00:00 2001 +From: Samuel Sadok +Date: Mon, 26 Mar 2018 15:29:44 -0700 +Subject: [PATCH] FreeRTOS constness fixes + + - make thread names const char * + - make thread argument non-const void* +--- + .../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS/cmsis_os.h | 6 +++--- + Firmware/Board/v3/Src/freertos.c | 4 ++-- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/Firmware/Board/v3/Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS/cmsis_os.h b/Firmware/Board/v3/Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS/cmsis_os.h +index 09cdf27..754be24 100644 +--- a/Firmware/Board/v3/Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS/cmsis_os.h ++++ b/Firmware/Board/v3/Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS/cmsis_os.h +@@ -270,11 +270,11 @@ typedef enum { + + /// Entry point of a thread. + /// \note MUST REMAIN UNCHANGED: \b os_pthread shall be consistent in every CMSIS-RTOS. +-typedef void (*os_pthread) (void const *argument); ++typedef void (*os_pthread) (void *argument); + + /// Entry point of a timer call back function. + /// \note MUST REMAIN UNCHANGED: \b os_ptimer shall be consistent in every CMSIS-RTOS. +-typedef void (*os_ptimer) (void const *argument); ++typedef void (*os_ptimer) (void *argument); + + // >>> the following data type definitions may shall adapted towards a specific RTOS + +@@ -323,7 +323,7 @@ typedef StaticQueue_t osStaticMessageQDef_t; + /// Thread Definition structure contains startup information of a thread. + /// \note CAN BE CHANGED: \b os_thread_def is implementation specific in every CMSIS-RTOS. + typedef struct os_thread_def { +- char *name; ///< Thread name ++ const char *name; ///< Thread name + os_pthread pthread; ///< start address of thread function + osPriority tpriority; ///< initial thread priority + uint32_t instances; ///< maximum number of instances of that thread function +diff --git a/Firmware/Board/v3/Src/freertos.c b/Firmware/Board/v3/Src/freertos.c +index 6eaea82..b247994 100644 +--- a/Firmware/Board/v3/Src/freertos.c ++++ b/Firmware/Board/v3/Src/freertos.c +@@ -75,7 +75,7 @@ uint8_t ucHeap[configTOTAL_HEAP_SIZE]; + /* USER CODE END Variables */ + + /* Function prototypes -------------------------------------------------------*/ +-void StartDefaultTask(void const * argument); ++void StartDefaultTask(void * argument); + + extern void MX_USB_DEVICE_Init(void); + void MX_FREERTOS_Init(void); /* (MISRA C 2004 rule 8.1) */ +@@ -147,7 +147,7 @@ void MX_FREERTOS_Init(void) { + } + + /* StartDefaultTask function */ +-void StartDefaultTask(void const * argument) ++void StartDefaultTask(void * argument) + { + /* init code for USB_DEVICE */ + MX_USB_DEVICE_Init(); +-- +2.16.2 +