/* Variables which are incremented each time an item is removed from a queue, and\r
found to be the expected value.\r
These are used to check that the tasks are still running. */\r
-static volatile short sBlockingConsumerCount[ blckqNUM_TASK_SETS ] = { ( unsigned short ) 0, ( unsigned short ) 0, ( unsigned short ) 0 };\r
+static volatile short sBlockingConsumerCount[ blckqNUM_TASK_SETS ] = { ( uint16_t ) 0, ( uint16_t ) 0, ( uint16_t ) 0 };\r
\r
/* Variable which are incremented each time an item is posted on a queue. These\r
are used to check that the tasks are still running. */\r
-static volatile short sBlockingProducerCount[ blckqNUM_TASK_SETS ] = { ( unsigned short ) 0, ( unsigned short ) 0, ( unsigned short ) 0 };\r
+static volatile short sBlockingProducerCount[ blckqNUM_TASK_SETS ] = { ( uint16_t ) 0, ( uint16_t ) 0, ( uint16_t ) 0 };\r
\r
/*-----------------------------------------------------------*/\r
\r
-void vStartAltBlockingQueueTasks( unsigned portBASE_TYPE uxPriority )\r
+void vStartAltBlockingQueueTasks( UBaseType_t uxPriority )\r
{\r
xBlockingQueueParameters *pxQueueParameters1, *pxQueueParameters2;\r
xBlockingQueueParameters *pxQueueParameters3, *pxQueueParameters4;\r
xBlockingQueueParameters *pxQueueParameters5, *pxQueueParameters6;\r
-const unsigned portBASE_TYPE uxQueueSize1 = 1, uxQueueSize5 = 5;\r
+const UBaseType_t uxQueueSize1 = 1, uxQueueSize5 = 5;\r
const TickType_t xBlockTime = ( TickType_t ) 1000 / portTICK_PERIOD_MS;\r
const TickType_t xDontBlock = ( TickType_t ) 0;\r
\r
\r
/* Create the queue used by the first two tasks to pass the incrementing number.\r
Pass a pointer to the queue in the parameter structure. */\r
- pxQueueParameters1->xQueue = xQueueCreate( uxQueueSize1, ( unsigned portBASE_TYPE ) sizeof( unsigned short ) );\r
+ pxQueueParameters1->xQueue = xQueueCreate( uxQueueSize1, ( UBaseType_t ) sizeof( uint16_t ) );\r
\r
/* The consumer is created first so gets a block time as described above. */\r
pxQueueParameters1->xBlockTime = xBlockTime;\r
the same mechanism but reverses the task priorities. */\r
\r
pxQueueParameters3 = ( xBlockingQueueParameters * ) pvPortMalloc( sizeof( xBlockingQueueParameters ) );\r
- pxQueueParameters3->xQueue = xQueueCreate( uxQueueSize1, ( unsigned portBASE_TYPE ) sizeof( unsigned short ) );\r
+ pxQueueParameters3->xQueue = xQueueCreate( uxQueueSize1, ( UBaseType_t ) sizeof( uint16_t ) );\r
pxQueueParameters3->xBlockTime = xDontBlock;\r
pxQueueParameters3->psCheckVariable = &( sBlockingProducerCount[ 1 ] );\r
\r
/* Create the last two tasks as described above. The mechanism is again just\r
the same. This time both parameter structures are given a block time. */\r
pxQueueParameters5 = ( xBlockingQueueParameters * ) pvPortMalloc( sizeof( xBlockingQueueParameters ) );\r
- pxQueueParameters5->xQueue = xQueueCreate( uxQueueSize5, ( unsigned portBASE_TYPE ) sizeof( unsigned short ) );\r
+ pxQueueParameters5->xQueue = xQueueCreate( uxQueueSize5, ( UBaseType_t ) sizeof( uint16_t ) );\r
pxQueueParameters5->xBlockTime = xBlockTime;\r
pxQueueParameters5->psCheckVariable = &( sBlockingProducerCount[ 2 ] );\r
\r
\r
static portTASK_FUNCTION( vBlockingQueueProducer, pvParameters )\r
{\r
-unsigned short usValue = 0;\r
+uint16_t usValue = 0;\r
xBlockingQueueParameters *pxQueueParameters;\r
short sErrorEverOccurred = pdFALSE;\r
\r
\r
static portTASK_FUNCTION( vBlockingQueueConsumer, pvParameters )\r
{\r
-unsigned short usData, usExpectedValue = 0;\r
+uint16_t usData, usExpectedValue = 0;\r
xBlockingQueueParameters *pxQueueParameters;\r
short sErrorEverOccurred = pdFALSE;\r
\r
/*-----------------------------------------------------------*/\r
\r
/* This is called to check that all the created tasks are still running. */\r
-portBASE_TYPE xAreAltBlockingQueuesStillRunning( void )\r
+BaseType_t xAreAltBlockingQueuesStillRunning( void )\r
{\r
-static short sLastBlockingConsumerCount[ blckqNUM_TASK_SETS ] = { ( unsigned short ) 0, ( unsigned short ) 0, ( unsigned short ) 0 };\r
-static short sLastBlockingProducerCount[ blckqNUM_TASK_SETS ] = { ( unsigned short ) 0, ( unsigned short ) 0, ( unsigned short ) 0 };\r
-portBASE_TYPE xReturn = pdPASS, xTasks;\r
+static short sLastBlockingConsumerCount[ blckqNUM_TASK_SETS ] = { ( uint16_t ) 0, ( uint16_t ) 0, ( uint16_t ) 0 };\r
+static short sLastBlockingProducerCount[ blckqNUM_TASK_SETS ] = { ( uint16_t ) 0, ( uint16_t ) 0, ( uint16_t ) 0 };\r
+BaseType_t xReturn = pdPASS, xTasks;\r
\r
/* Not too worried about mutual exclusion on these variables as they are 16\r
bits and we are only reading them. We also only care to see if they have\r