Remove unnecessary use of portLONG, portCHAR and portSHORT.

[freertos] / Source / include / queue.h

diff --git a/Source/include/queue.h b/Source/include/queue.h
index 8c176547b5a736f8f0c2f26f001199e9991601fb..e42f8a58de0ecd51614697ebfbdb4b18bf1ba9f1 100644 (file)
--- a/Source/include/queue.h
+++ b/Source/include/queue.h
@@ -98,8 +98,8 @@ typedef void * xQueueHandle;
    <pre>\r
  struct AMessage\r
  {\r
-       portCHAR ucMessageID;\r
-       portCHAR ucData[ 20 ];\r
+       char ucMessageID;\r
+       char ucData[ 20 ];\r
  };\r
 \r
  void vATask( void *pvParameters )\r
@@ -107,7 +107,7 @@ typedef void * xQueueHandle;
  xQueueHandle xQueue1, xQueue2;\r
 \r
        // Create a queue capable of containing 10 unsigned long values.\r
-       xQueue1 = xQueueCreate( 10, sizeof( unsigned portLONG ) );\r
+       xQueue1 = xQueueCreate( 10, sizeof( unsigned long ) );\r
        if( xQueue1 == 0 )\r
        {\r
                // Queue was not created and must not be used.\r
@@ -165,11 +165,11 @@ xQueueHandle xQueueCreate( unsigned portBASE_TYPE uxQueueLength, unsigned portBA
    <pre>\r
  struct AMessage\r
  {\r
-       portCHAR ucMessageID;\r
-       portCHAR ucData[ 20 ];\r
+       char ucMessageID;\r
+       char ucData[ 20 ];\r
  } xMessage;\r
 \r
- unsigned portLONG ulVar = 10UL;\r
+ unsigned long ulVar = 10UL;\r
 \r
  void vATask( void *pvParameters )\r
  {\r
@@ -177,7 +177,7 @@ xQueueHandle xQueueCreate( unsigned portBASE_TYPE uxQueueLength, unsigned portBA
  struct AMessage *pxMessage;\r
 \r
        // Create a queue capable of containing 10 unsigned long values.\r
-       xQueue1 = xQueueCreate( 10, sizeof( unsigned portLONG ) );\r
+       xQueue1 = xQueueCreate( 10, sizeof( unsigned long ) );\r
 \r
        // Create a queue capable of containing 10 pointers to AMessage structures.\r
        // These should be passed by pointer as they contain a lot of data.\r
@@ -247,11 +247,11 @@ xQueueHandle xQueueCreate( unsigned portBASE_TYPE uxQueueLength, unsigned portBA
    <pre>\r
  struct AMessage\r
  {\r
-       portCHAR ucMessageID;\r
-       portCHAR ucData[ 20 ];\r
+       char ucMessageID;\r
+       char ucData[ 20 ];\r
  } xMessage;\r
 \r
- unsigned portLONG ulVar = 10UL;\r
+ unsigned long ulVar = 10UL;\r
 \r
  void vATask( void *pvParameters )\r
  {\r
@@ -259,7 +259,7 @@ xQueueHandle xQueueCreate( unsigned portBASE_TYPE uxQueueLength, unsigned portBA
  struct AMessage *pxMessage;\r
 \r
        // Create a queue capable of containing 10 unsigned long values.\r
-       xQueue1 = xQueueCreate( 10, sizeof( unsigned portLONG ) );\r
+       xQueue1 = xQueueCreate( 10, sizeof( unsigned long ) );\r
 \r
        // Create a queue capable of containing 10 pointers to AMessage structures.\r
        // These should be passed by pointer as they contain a lot of data.\r
@@ -331,11 +331,11 @@ xQueueHandle xQueueCreate( unsigned portBASE_TYPE uxQueueLength, unsigned portBA
    <pre>\r
  struct AMessage\r
  {\r
-       portCHAR ucMessageID;\r
-       portCHAR ucData[ 20 ];\r
+       char ucMessageID;\r
+       char ucData[ 20 ];\r
  } xMessage;\r
 \r
- unsigned portLONG ulVar = 10UL;\r
+ unsigned long ulVar = 10UL;\r
 \r
  void vATask( void *pvParameters )\r
  {\r
@@ -343,7 +343,7 @@ xQueueHandle xQueueCreate( unsigned portBASE_TYPE uxQueueLength, unsigned portBA
  struct AMessage *pxMessage;\r
 \r
        // Create a queue capable of containing 10 unsigned long values.\r
-       xQueue1 = xQueueCreate( 10, sizeof( unsigned portLONG ) );\r
+       xQueue1 = xQueueCreate( 10, sizeof( unsigned long ) );\r
 \r
        // Create a queue capable of containing 10 pointers to AMessage structures.\r
        // These should be passed by pointer as they contain a lot of data.\r
@@ -419,11 +419,11 @@ xQueueHandle xQueueCreate( unsigned portBASE_TYPE uxQueueLength, unsigned portBA
    <pre>\r
  struct AMessage\r
  {\r
-       portCHAR ucMessageID;\r
-       portCHAR ucData[ 20 ];\r
+       char ucMessageID;\r
+       char ucData[ 20 ];\r
  } xMessage;\r
 \r
- unsigned portLONG ulVar = 10UL;\r
+ unsigned long ulVar = 10UL;\r
 \r
  void vATask( void *pvParameters )\r
  {\r
@@ -431,7 +431,7 @@ xQueueHandle xQueueCreate( unsigned portBASE_TYPE uxQueueLength, unsigned portBA
  struct AMessage *pxMessage;\r
 \r
        // Create a queue capable of containing 10 unsigned long values.\r
-       xQueue1 = xQueueCreate( 10, sizeof( unsigned portLONG ) );\r
+       xQueue1 = xQueueCreate( 10, sizeof( unsigned long ) );\r
 \r
        // Create a queue capable of containing 10 pointers to AMessage structures.\r
        // These should be passed by pointer as they contain a lot of data.\r
@@ -506,8 +506,8 @@ signed portBASE_TYPE xQueueGenericSend( xQueueHandle xQueue, const void * const
    <pre>\r
  struct AMessage\r
  {\r
-       portCHAR ucMessageID;\r
-       portCHAR ucData[ 20 ];\r
+       char ucMessageID;\r
+       char ucData[ 20 ];\r
  } xMessage;\r
 \r
  xQueueHandle xQueue;\r
@@ -599,8 +599,8 @@ signed portBASE_TYPE xQueueGenericSend( xQueueHandle xQueue, const void * const
    <pre>\r
  struct AMessage\r
  {\r
-       portCHAR ucMessageID;\r
-       portCHAR ucData[ 20 ];\r
+       char ucMessageID;\r
+       char ucData[ 20 ];\r
  } xMessage;\r
 \r
  xQueueHandle xQueue;\r
@@ -698,8 +698,8 @@ signed portBASE_TYPE xQueueGenericSend( xQueueHandle xQueue, const void * const
    <pre>\r
  struct AMessage\r
  {\r
-       portCHAR ucMessageID;\r
-       portCHAR ucData[ 20 ];\r
+       char ucMessageID;\r
+       char ucData[ 20 ];\r
  } xMessage;\r
 \r
  xQueueHandle xQueue;\r
@@ -820,7 +820,7 @@ void vQueueDelete( xQueueHandle xQueue );
    <pre>\r
  void vBufferISR( void )\r
  {\r
- portCHAR cIn;\r
+ char cIn;\r
  portBASE_TYPE xHigherPrioritTaskWoken;\r
 \r
        // We have not woken a task at the start of the ISR.\r
@@ -891,7 +891,7 @@ void vQueueDelete( xQueueHandle xQueue );
    <pre>\r
  void vBufferISR( void )\r
  {\r
- portCHAR cIn;\r
+ char cIn;\r
  portBASE_TYPE xHigherPriorityTaskWoken;\r
 \r
        // We have not woken a task at the start of the ISR.\r
@@ -964,7 +964,7 @@ void vQueueDelete( xQueueHandle xQueue );
    <pre>\r
  void vBufferISR( void )\r
  {\r
- portCHAR cIn;\r
+ char cIn;\r
  portBASE_TYPE xHigherPriorityTaskWoken;\r
 \r
        // We have not woken a task at the start of the ISR.\r
@@ -1042,7 +1042,7 @@ void vQueueDelete( xQueueHandle xQueue );
    <pre>\r
  void vBufferISR( void )\r
  {\r
- portCHAR cIn;\r
+ char cIn;\r
  portBASE_TYPE xHigherPriorityTaskWokenByPost;\r
 \r
        // We have not woken a task at the start of the ISR.\r
@@ -1108,11 +1108,11 @@ signed portBASE_TYPE xQueueGenericSendFromISR( xQueueHandle pxQueue, const void
  // Function to create a queue and post some values.\r
  void vAFunction( void *pvParameters )\r
  {\r
- portCHAR cValueToPost;\r
+ char cValueToPost;\r
  const portTickType xBlockTime = ( portTickType )0xff;\r
 \r
        // Create a queue capable of containing 10 characters.\r
-       xQueue = xQueueCreate( 10, sizeof( portCHAR ) );\r
+       xQueue = xQueueCreate( 10, sizeof( char ) );\r
        if( xQueue == 0 )\r
        {\r
                // Failed to create the queue.\r
@@ -1138,7 +1138,7 @@ signed portBASE_TYPE xQueueGenericSendFromISR( xQueueHandle pxQueue, const void
  void vISR_Routine( void )\r
  {\r
  portBASE_TYPE xTaskWokenByReceive = pdFALSE;\r
- portCHAR cRxedChar;\r
+ char cRxedChar;\r
 \r
        while( xQueueReceiveFromISR( xQueue, ( void * ) &cRxedChar, &xTaskWokenByReceive) )\r
        {\r
@@ -1151,7 +1151,7 @@ signed portBASE_TYPE xQueueGenericSendFromISR( xQueueHandle pxQueue, const void
                // task will be woken.\r
        }\r
 \r
-       if( cTaskWokenByPost != ( portCHAR ) pdFALSE;\r
+       if( cTaskWokenByPost != ( char ) pdFALSE;\r
        {\r
                taskYIELD ();\r
        }\r
@@ -1241,7 +1241,7 @@ portBASE_TYPE xQueueGiveMutexRecursive( xQueueHandle xMutex );
  * name that the kernel aware debugger will display.\r
  */\r
 #if configQUEUE_REGISTRY_SIZE > 0\r
-       void vQueueAddToRegistry( xQueueHandle xQueue, signed portCHAR *pcName );\r
+       void vQueueAddToRegistry( xQueueHandle xQueue, signed char *pcName );\r
 #endif\r
 \r
 \r