len0rd/FreeRTOS-Kernel
1
0
Fork 0
mirror of https://github.com/FreeRTOS/FreeRTOS-Kernel.git synced 2025-08-01 08:54:14 -04:00
Code Issues Projects Releases Packages Wiki Activity

Update the ucQueueNumber member of the queue structure (used with FreeRTOS+Trace to be an unsigned portBASE_TYPE instead of an unsigned char.

Browse source
This commit is contained in:
Richard Barry 2013-12-14 13:16:05 +00:00
parent c17c65fc09
commit a320d6dffd
6 changed files with 17 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
FreeRTOS/Source/include/queue.h
View file

@ -1674,8 +1674,8 @@ xQueueSetMemberHandle xQueueSelectFromSetFromISR( xQueueSetHandle xQueueSet ) PR
/* Not public API functions. */
void vQueueWaitForMessageRestricted( xQueueHandle xQueue, portTickType xTicksToWait ) PRIVILEGED_FUNCTION;
portBASE_TYPE xQueueGenericReset( xQueueHandle xQueue, portBASE_TYPE xNewQueue ) PRIVILEGED_FUNCTION;
void vQueueSetQueueNumber( xQueueHandle xQueue, unsigned char ucQueueNumber ) PRIVILEGED_FUNCTION;
unsigned char ucQueueGetQueueNumber( xQueueHandle xQueue ) PRIVILEGED_FUNCTION;
void vQueueSetQueueNumber( xQueueHandle xQueue, unsigned portBASE_TYPE uxQueueNumber ) PRIVILEGED_FUNCTION;
unsigned portBASE_TYPE uxQueueGetQueueNumber( xQueueHandle xQueue ) PRIVILEGED_FUNCTION;
unsigned char ucQueueGetQueueType( xQueueHandle xQueue ) PRIVILEGED_FUNCTION;

2
FreeRTOS/Source/portable/MSVC-MingW/portmacro.h
View file

@ -95,8 +95,10 @@
#define portYIELD() vPortGenerateSimulatedInterrupt( portINTERRUPT_YIELD )
void vPortCloseRunningThread( void *pvTaskToDelete, volatile portBASE_TYPE *pxPendYield );
void vPortDeleteThread( void *pvThreadToDelete );
#define portCLEAN_UP_TCB( pxTCB ) vPortDeleteThread( pxTCB )
#define portPRE_TASK_DELETE_HOOK( pvTaskToDelete, pxPendYield ) vPortCloseRunningThread( ( pvTaskToDelete ), ( pxPendYield ) )
#define portDISABLE_INTERRUPTS()
#define portENABLE_INTERRUPTS()

10
FreeRTOS/Source/queue.c
View file

@ -146,7 +146,7 @@ typedef struct QueueDefinition
volatile signed portBASE_TYPE xTxLock; /*< Stores the number of items transmitted to the queue (added to the queue) while the queue was locked. Set to queueUNLOCKED when the queue is not locked. */
#if ( configUSE_TRACE_FACILITY == 1 )
unsigned char ucQueueNumber;
unsigned portBASE_TYPE uxQueueNumber;
unsigned char ucQueueType;
#endif
@ -1398,9 +1398,9 @@ xQUEUE * const pxQueue = ( xQUEUE * ) xQueue;
#if ( configUSE_TRACE_FACILITY == 1 )
unsigned char ucQueueGetQueueNumber( xQueueHandle xQueue )
unsigned portBASE_TYPE uxQueueGetQueueNumber( xQueueHandle xQueue )
{
return ( ( xQUEUE * ) xQueue )->ucQueueNumber;
return ( ( xQUEUE * ) xQueue )->uxQueueNumber;
}
#endif /* configUSE_TRACE_FACILITY */
@ -1408,9 +1408,9 @@ xQUEUE * const pxQueue = ( xQUEUE * ) xQueue;
#if ( configUSE_TRACE_FACILITY == 1 )
void vQueueSetQueueNumber( xQueueHandle xQueue, unsigned char ucQueueNumber )
void vQueueSetQueueNumber( xQueueHandle xQueue, unsigned portBASE_TYPE uxQueueNumber )
{
( ( xQUEUE * ) xQueue )->ucQueueNumber = ucQueueNumber;
( ( xQUEUE * ) xQueue )->uxQueueNumber = uxQueueNumber;
}
#endif /* configUSE_TRACE_FACILITY */