Changes made on PR

Signed-off-by: Cervenka Dusan <[email protected]>

Author: Hadatko

event_groups.c

@@ -49,17 +49,17 @@
 /* The following bit fields convey control information in a task's event list
  * item value.  It is important they don't clash with the
  * taskEVENT_LIST_ITEM_VALUE_IN_USE definition. */
-#if ( configTICK_BIT_WIDTH == TICK_BIT_WIDTH_16 )
+#if ( configTICK_TYPE_WIDTH_IN_BITS == TICK_TYPE_WIDTH_16_BITS )
     #define eventCLEAR_EVENTS_ON_EXIT_BIT    0x0100U
     #define eventUNBLOCKED_DUE_TO_BIT_SET    0x0200U
     #define eventWAIT_FOR_ALL_BITS           0x0400U
     #define eventEVENT_BITS_CONTROL_BYTES    0xff00U
-#elif ( configTICK_BIT_WIDTH == TICK_BIT_WIDTH_32 )
+#elif ( configTICK_TYPE_WIDTH_IN_BITS == TICK_TYPE_WIDTH_32_BITS )
     #define eventCLEAR_EVENTS_ON_EXIT_BIT    0x01000000UL
     #define eventUNBLOCKED_DUE_TO_BIT_SET    0x02000000UL
     #define eventWAIT_FOR_ALL_BITS           0x04000000UL
     #define eventEVENT_BITS_CONTROL_BYTES    0xff000000UL
-#elif ( configTICK_BIT_WIDTH == TICK_BIT_WIDTH_64 )
+#elif ( configTICK_TYPE_WIDTH_IN_BITS == TICK_TYPE_WIDTH_64_BITS )
     #define eventCLEAR_EVENTS_ON_EXIT_BIT    0x0100000000000000ULL
     #define eventUNBLOCKED_DUE_TO_BIT_SET    0x0200000000000000ULL
     #define eventWAIT_FOR_ALL_BITS           0x0400000000000000ULL

include/FreeRTOS.h

@@ -55,6 +55,11 @@
 #endif
 /* *INDENT-ON* */
 
+/* Acceptable values for configTICK_TYPE_WIDTH_IN_BITS. */
+#define TICK_TYPE_WIDTH_16_BITS   0
+#define TICK_TYPE_WIDTH_32_BITS   1
+#define TICK_TYPE_WIDTH_64_BITS   2
+
 /* Application specific configuration options. */
 #include "FreeRTOSConfig.h"
 
@@ -155,41 +160,28 @@
     #error Missing definition:  configUSE_TICK_HOOK must be defined in FreeRTOSConfig.h as either 1 or 0.  See the Configuration section of the FreeRTOS API documentation for details.
 #endif
 
-#ifdef configUSE_16_BIT_TICKS
-    #error configUSE_16_BIT_TICKS is deprecated and replaced with configTICK_BIT_WIDTH.  See the Configuration section of the FreeRTOS API documentation for details.
+#if !defined( configUSE_16_BIT_TICKS ) && !defined( configTICK_TYPE_WIDTH_IN_BITS )
+    #error Missing definition:  One of configUSE_16_BIT_TICKS and configTICK_TYPE_WIDTH_IN_BITS must be defined in FreeRTOSConfig.h.  See the Configuration section of the FreeRTOS API documentation for details.
 #endif
 
-#ifndef TICK_BIT_WIDTH_16
-    #define TICK_BIT_WIDTH_16 0
-#else
-    #if TICK_BIT_WIDTH_16 != 0
-        #error TICK_BIT_WIDTH_16 has expected value 0!
-    #endif
+#if defined( configUSE_16_BIT_TICKS ) && defined( configTICK_TYPE_WIDTH_IN_BITS )
+    #error Only one of configUSE_16_BIT_TICKS and configTICK_TYPE_WIDTH_IN_BITS must be defined in FreeRTOSConfig.h.  See the Configuration section of the FreeRTOS API documentation for details.
 #endif
 
-#ifndef TICK_BIT_WIDTH_32
-    #define TICK_BIT_WIDTH_32 1
-#else
-    #if TICK_BIT_WIDTH_32 != 1
-        #error TICK_BIT_WIDTH_32 has expected value 1!
+/* Define configTICK_TYPE_WIDTH_IN_BITS according to the
+ * value of configUSE_16_BIT_TICKS for backward compatibility. */
+#ifndef configTICK_TYPE_WIDTH_IN_BITS
+    #if( configUSE_16_BIT_TICKS == 1 )
+        #define configTICK_TYPE_WIDTH_IN_BITS    TICK_TYPE_WIDTH_16_BITS
+    #else
+        #define configTICK_TYPE_WIDTH_IN_BITS    TICK_TYPE_WIDTH_32_BITS
     #endif
 #endif
 
-#ifndef TICK_BIT_WIDTH_64
-    #define TICK_BIT_WIDTH_64 2
-#else
-    #if TICK_BIT_WIDTH_64 != 2
-        #error TICK_BIT_WIDTH_64 has expected value 2!
-    #endif
-#endif
-
-#ifndef configTICK_BIT_WIDTH
-    #error Missing definition:  configTICK_BIT_WIDTH must be defined in FreeRTOSConfig.h as either 0 (16 bit), 1 (32 bit) or 2 (64 bit).  See the Configuration section of the FreeRTOS API documentation for details.
-#elif configTICK_BIT_WIDTH == TICK_BIT_WIDTH_16
-#elif configTICK_BIT_WIDTH == TICK_BIT_WIDTH_32
-#elif configTICK_BIT_WIDTH == TICK_BIT_WIDTH_64
-#else
-    #error Macro configTICK_BIT_WIDTH contains wrong value.  See the Configuration section of the FreeRTOS API documentation for details.
+#if ( ( configTICK_TYPE_WIDTH_IN_BITS != TICK_TYPE_WIDTH_16_BITS ) &&
+      ( configTICK_TYPE_WIDTH_IN_BITS != TICK_TYPE_WIDTH_32_BITS ) &&
+      ( configTICK_TYPE_WIDTH_IN_BITS != TICK_TYPE_WIDTH_64_BITS ) )
+    #error Macro configTICK_TYPE_WIDTH_IN_BITS is defined to incorrect value.  See the Configuration section of the FreeRTOS API documentation for details.
 #endif
 
 #ifndef INCLUDE_vTaskPrioritySet

include/event_groups.h

@@ -84,7 +84,7 @@ typedef struct EventGroupDef_t   * EventGroupHandle_t;
 
 /*
  * The type that holds event bits always matches TickType_t - therefore the
- * number of bits it holds is set by configTICK_BIT_WIDTH (16 bits if set to 0,
+ * number of bits it holds is set by configTICK_TYPE_WIDTH_IN_BITS (16 bits if set to 0,
  * 32 bits if set to 1, 64 bits if set to 2.
  *
  * \defgroup EventBits_t EventBits_t
@@ -112,10 +112,10 @@ typedef TickType_t               EventBits_t;
  *
  * Although event groups are not related to ticks, for internal implementation
  * reasons the number of bits available for use in an event group is dependent
- * on the configTICK_BIT_WIDTH setting in FreeRTOSConfig.h.  If
- * configTICK_BIT_WIDTH is 0 then each event group contains 8 usable bits (bit
- * 0 to bit 7).  If configTICK_BIT_WIDTH is set to 1 then each event group has
- * 24 usable bits (bit 0 to bit 23).  If configTICK_BIT_WIDTH is set to 2 then
+ * on the configTICK_TYPE_WIDTH_IN_BITS setting in FreeRTOSConfig.h.  If
+ * configTICK_TYPE_WIDTH_IN_BITS is 0 then each event group contains 8 usable bits (bit
+ * 0 to bit 7).  If configTICK_TYPE_WIDTH_IN_BITS is set to 1 then each event group has
+ * 24 usable bits (bit 0 to bit 23).  If configTICK_TYPE_WIDTH_IN_BITS is set to 2 then
  * each event group has 56 usable bits (bit 0 to bit 53). The EventBits_t type
  * is used to store event bits within an event group.
  *
@@ -169,10 +169,10 @@ typedef TickType_t               EventBits_t;
  *
  * Although event groups are not related to ticks, for internal implementation
  * reasons the number of bits available for use in an event group is dependent
- * on the configTICK_BIT_WIDTH setting in FreeRTOSConfig.h.  If
- * configTICK_BIT_WIDTH is 0 then each event group contains 8 usable bits (bit
- * 0 to bit 7).  If configTICK_BIT_WIDTH is set to 1 then each event group has
- * 24 usable bits (bit 0 to bit 23).  If configTICK_BIT_WIDTH is set to 2 then
+ * on the configTICK_TYPE_WIDTH_IN_BITS setting in FreeRTOSConfig.h.  If
+ * configTICK_TYPE_WIDTH_IN_BITS is 0 then each event group contains 8 usable bits (bit
+ * 0 to bit 7).  If configTICK_TYPE_WIDTH_IN_BITS is set to 1 then each event group has
+ * 24 usable bits (bit 0 to bit 23).  If configTICK_TYPE_WIDTH_IN_BITS is set to 2 then
  * each event group has 56 usable bits (bit 0 to bit 53).  The EventBits_t type
  * is used to store event bits within an event group.
  *

include/projdefs.h

@@ -60,12 +60,14 @@ typedef void (* TaskFunction_t)( void * );
     #define configUSE_LIST_DATA_INTEGRITY_CHECK_BYTES    0
 #endif
 
-#if ( configTICK_BIT_WIDTH == TICK_BIT_WIDTH_16 )
+#if ( configTICK_TYPE_WIDTH_IN_BITS == TICK_TYPE_WIDTH_16_BITS )
     #define pdINTEGRITY_CHECK_VALUE    0x5a5a
-#elif ( configTICK_BIT_WIDTH == TICK_BIT_WIDTH_32 )
+#elif ( configTICK_TYPE_WIDTH_IN_BITS == TICK_TYPE_WIDTH_32_BITS )
     #define pdINTEGRITY_CHECK_VALUE    0x5a5a5a5aUL
-#elif ( configTICK_BIT_WIDTH == TICK_BIT_WIDTH_64 )
+#elif ( configTICK_TYPE_WIDTH_IN_BITS == TICK_TYPE_WIDTH_64_BITS )
     #define pdINTEGRITY_CHECK_VALUE    0x5a5a5a5a5a5a5a5aULL
+#else
+    #error configTICK_TYPE_WIDTH_IN_BITS set to unsupported tick type width.
 #endif
 
 /* The following errno values are used by FreeRTOS+ components, not FreeRTOS

portable/ARMv8M/non_secure/portmacrocommon.h

@@ -72,16 +72,18 @@
     typedef long             BaseType_t;
     typedef unsigned long    UBaseType_t;
 
-    #if ( configTICK_BIT_WIDTH == TICK_BIT_WIDTH_16 )
+    #if ( configTICK_TYPE_WIDTH_IN_BITS == TICK_TYPE_WIDTH_16_BITS )
         typedef uint16_t     TickType_t;
         #define portMAX_DELAY              ( TickType_t ) 0xffff
-    #elif ( configTICK_BIT_WIDTH == TICK_BIT_WIDTH_32 )
+    #elif ( configTICK_TYPE_WIDTH_IN_BITS == TICK_TYPE_WIDTH_32_BITS )
         typedef uint32_t     TickType_t;
         #define portMAX_DELAY              ( TickType_t ) 0xffffffffUL
 
 /* 32-bit tick type on a 32-bit architecture, so reads of the tick count do
  * not need to be guarded with a critical section. */
         #define portTICK_TYPE_IS_ATOMIC    1
+    #else
+        #error configTICK_TYPE_WIDTH_IN_BITS set to unsupported tick type width.
     #endif
 /*-----------------------------------------------------------*/
 

portable/BCC/16BitDOS/Flsh186/prtmacro.h

@@ -52,12 +52,14 @@ typedef portSTACK_TYPE StackType_t;
 typedef short BaseType_t;
 typedef unsigned short UBaseType_t;
 
-#if( configTICK_BIT_WIDTH == TICK_BIT_WIDTH_16 )
+#if( configTICK_TYPE_WIDTH_IN_BITS == TICK_TYPE_WIDTH_16_BITS )
     typedef uint16_t TickType_t;
     #define portMAX_DELAY ( TickType_t ) 0xffff
-#elif ( configTICK_BIT_WIDTH == TICK_BIT_WIDTH_32 )
+#elif ( configTICK_TYPE_WIDTH_IN_BITS == TICK_TYPE_WIDTH_32_BITS )
     typedef uint32_t TickType_t;
     #define portMAX_DELAY ( TickType_t ) 0xffffffffUL
+#else
+    #error configTICK_TYPE_WIDTH_IN_BITS set to unsupported tick type width.
 #endif
 /*-----------------------------------------------------------*/
 

portable/BCC/16BitDOS/PC/prtmacro.h

@@ -52,12 +52,14 @@ typedef portSTACK_TYPE StackType_t;
 typedef short BaseType_t;
 typedef unsigned short UBaseType_t;
 
-#if( configTICK_BIT_WIDTH == TICK_BIT_WIDTH_16 )
+#if( configTICK_TYPE_WIDTH_IN_BITS == TICK_TYPE_WIDTH_16_BITS )
     typedef uint16_t TickType_t;
     #define portMAX_DELAY ( TickType_t ) 0xffff
-#elif ( configTICK_BIT_WIDTH == TICK_BIT_WIDTH_32 )
+#elif ( configTICK_TYPE_WIDTH_IN_BITS == TICK_TYPE_WIDTH_32_BITS )
     typedef uint32_t TickType_t;
     #define portMAX_DELAY ( TickType_t ) 0xffffffffUL
+#else
+    #error configTICK_TYPE_WIDTH_IN_BITS set to unsupported tick type width.
 #endif
 /*-----------------------------------------------------------*/
 

portable/CCS/ARM_CM3/portmacro.h

@@ -57,16 +57,18 @@
     typedef long             BaseType_t;
     typedef unsigned long    UBaseType_t;
 
-    #if ( configTICK_BIT_WIDTH == TICK_BIT_WIDTH_16 )
+    #if ( configTICK_TYPE_WIDTH_IN_BITS == TICK_TYPE_WIDTH_16_BITS )
         typedef uint16_t     TickType_t;
         #define portMAX_DELAY              ( TickType_t ) 0xffff
-    #elif ( configTICK_BIT_WIDTH == TICK_BIT_WIDTH_32 )
+    #elif ( configTICK_TYPE_WIDTH_IN_BITS == TICK_TYPE_WIDTH_32_BITS )
         typedef uint32_t     TickType_t;
         #define portMAX_DELAY              ( TickType_t ) 0xffffffffUL
 
 /* 32-bit tick type on a 32-bit architecture, so reads of the tick count do
  * not need to be guarded with a critical section. */
         #define portTICK_TYPE_IS_ATOMIC    1
+    #else
+        #error configTICK_TYPE_WIDTH_IN_BITS set to unsupported tick type width.
     #endif
 /*-----------------------------------------------------------*/
 

portable/CCS/ARM_CM4F/portmacro.h

@@ -57,16 +57,18 @@
     typedef long             BaseType_t;
     typedef unsigned long    UBaseType_t;
 
-    #if ( configTICK_BIT_WIDTH == TICK_BIT_WIDTH_16 )
+    #if ( configTICK_TYPE_WIDTH_IN_BITS == TICK_TYPE_WIDTH_16_BITS )
         typedef uint16_t     TickType_t;
         #define portMAX_DELAY              ( TickType_t ) 0xffff
-    #elif ( configTICK_BIT_WIDTH == TICK_BIT_WIDTH_32 )
+    #elif ( configTICK_TYPE_WIDTH_IN_BITS == TICK_TYPE_WIDTH_32_BITS )
         typedef uint32_t     TickType_t;
         #define portMAX_DELAY              ( TickType_t ) 0xffffffffUL
 
 /* 32-bit tick type on a 32-bit architecture, so reads of the tick count do
  * not need to be guarded with a critical section. */
         #define portTICK_TYPE_IS_ATOMIC    1
+    #else
+        #error configTICK_TYPE_WIDTH_IN_BITS set to unsupported tick type width.
     #endif
 /*-----------------------------------------------------------*/
 

portable/CCS/ARM_Cortex-R4/portmacro.h

@@ -52,16 +52,18 @@ typedef portSTACK_TYPE StackType_t;
 typedef long BaseType_t;
 typedef unsigned long UBaseType_t;
 
-#if (configTICK_BIT_WIDTH == TICK_BIT_WIDTH_16)
+#if (configTICK_TYPE_WIDTH_IN_BITS == TICK_TYPE_WIDTH_16_BITS)
     typedef uint16_t TickType_t;
     #define portMAX_DELAY (TickType_t) 0xFFFF
-#elif ( configTICK_BIT_WIDTH == TICK_BIT_WIDTH_32 )
+#elif ( configTICK_TYPE_WIDTH_IN_BITS == TICK_TYPE_WIDTH_32_BITS )
     typedef uint32_t TickType_t;
     #define portMAX_DELAY (TickType_t) 0xFFFFFFFFF
 
     /* 32-bit tick type on a 32-bit architecture, so reads of the tick count do
     not need to be guarded with a critical section. */
     #define portTICK_TYPE_IS_ATOMIC 1
+#else
+    #error configTICK_TYPE_WIDTH_IN_BITS set to unsupported tick type width.
 #endif