Release v10.2.1_20200117

STMicroelectronics · Jul 14, 2020 · c239f63 · c239f63
1 parent 6ec3955
commit c239f63
Show file tree

Hide file tree

Showing 153 changed files with 21,013 additions and 2,127 deletions.
diff --git a/License/license.txt b/License/license.txt
@@ -17,7 +17,7 @@ source file.
 License text:
 -------------
 
-Copyright (C) 2017 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
+Copyright (C) 2019 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in
 the Software without restriction, including without limitation the rights to

diff --git a/README.md b/README.md
@@ -40,6 +40,7 @@ In the case of the FreeRTOS, this correspondence is particular to the CMSIS-RTOS
 FreeRTOS | CMSIS Core |
 -------- | ---------- |
 Tag v10.0.1 | Tag v5.4.0
+Tag v10.2.1 | Tag v5.4.0
 
 ## Troubleshooting
 

diff --git a/Source/CMSIS_RTOS/cmsis_os.c b/Source/CMSIS_RTOS/cmsis_os.c
@@ -364,29 +364,29 @@ osTimerId osTimerCreate (const osTimerDef_t *timer_def, os_timer_type type, void
                       1, // period should be filled when starting the Timer using osTimerStart
                       (type == osTimerPeriodic) ? pdTRUE : pdFALSE,
                       (void *) argument,
-                      (TaskFunction_t)timer_def->ptimer,
+                      (TimerCallbackFunction_t)timer_def->ptimer,
                       (StaticTimer_t *)timer_def->controlblock);
   }
   else {
     return xTimerCreate((const char *)"",
                       1, // period should be filled when starting the Timer using osTimerStart
                       (type == osTimerPeriodic) ? pdTRUE : pdFALSE,
                       (void *) argument,
-                      (TaskFunction_t)timer_def->ptimer);
+                      (TimerCallbackFunction_t)timer_def->ptimer);
  }
 #elif( configSUPPORT_STATIC_ALLOCATION == 1 )
   return xTimerCreateStatic((const char *)"",
                       1, // period should be filled when starting the Timer using osTimerStart
                       (type == osTimerPeriodic) ? pdTRUE : pdFALSE,
                       (void *) argument,
-                      (TaskFunction_t)timer_def->ptimer,
+                      (TimerCallbackFunction_t)timer_def->ptimer,
                       (StaticTimer_t *)timer_def->controlblock);  
 #else
   return xTimerCreate((const char *)"",
                       1, // period should be filled when starting the Timer using osTimerStart
                       (type == osTimerPeriodic) ? pdTRUE : pdFALSE,
                       (void *) argument,
-                      (TaskFunction_t)timer_def->ptimer);
+                      (TimerCallbackFunction_t)timer_def->ptimer);
 #endif
 
 #else