j3d1/esp-open-rtos
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

FreeRTOS v10 fixes.

Browse source 
svn r2522:
FreeRTOS kernel: Fix extern "C" { in stream_buffer.h.
FreeRTOS kernel: Correct tskKERNEL_VERSION_NUMBER and tskKERNEL_VERSION_MAJOR constants for V10.
Ensure the currently executing task is printed correctly in vTaskList().
This commit is contained in:
Our Air Quality 2017-12-13 21:15:41 +11:00
parent 89c6c410ff
commit 36322def89
3 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
FreeRTOS/Source/include/stream_buffer.h
View file

@ -52,6 +52,10 @@
#ifndef STREAM_BUFFER_H #ifndef STREAM_BUFFER_H
#define STREAM_BUFFER_H #define STREAM_BUFFER_H
#if defined( __cplusplus )
extern "C" {
#endif
/** /**
* Type by which stream buffers are referenced. For example, a call to * Type by which stream buffers are referenced. For example, a call to
* xStreamBufferCreate() returns an StreamBufferHandle_t variable that can * xStreamBufferCreate() returns an StreamBufferHandle_t variable that can
@ -843,7 +847,7 @@ StreamBufferHandle_t xStreamBufferGenericCreateStatic( size_t xBufferSizeBytes,
#endif #endif
#if defined( __cplusplus ) #if defined( __cplusplus )
extern "C" { }
#endif #endif
#endif /* !defined( STREAM_BUFFER_H ) */ #endif /* !defined( STREAM_BUFFER_H ) */

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

@ -44,8 +44,8 @@ extern "C" {
* MACROS AND DEFINITIONS * MACROS AND DEFINITIONS
*----------------------------------------------------------*/ *----------------------------------------------------------*/
#define tskKERNEL_VERSION_NUMBER "V9.0.0" #define tskKERNEL_VERSION_NUMBER "V10.0.0"
#define tskKERNEL_VERSION_MAJOR 9 #define tskKERNEL_VERSION_MAJOR 10
#define tskKERNEL_VERSION_MINOR 0 #define tskKERNEL_VERSION_MINOR 0
#define tskKERNEL_VERSION_BUILD 0 #define tskKERNEL_VERSION_BUILD 0

4
FreeRTOS/Source/tasks.c
View file

@ -110,6 +110,7 @@ set then don't fill the stack so there is no unnecessary dependency on memset. *
/* /*
* Macros used by vListTask to indicate which state a task is in. * Macros used by vListTask to indicate which state a task is in.
*/ */
#define tskRUNNING_CHAR ( 'X' )
#define tskBLOCKED_CHAR ( 'B' ) #define tskBLOCKED_CHAR ( 'B' )
#define tskREADY_CHAR ( 'R' ) #define tskREADY_CHAR ( 'R' )
#define tskDELETED_CHAR ( 'D' ) #define tskDELETED_CHAR ( 'D' )
@ -4209,6 +4210,9 @@ TCB_t *pxTCB;
{ {
switch( pxTaskStatusArray[ x ].eCurrentState ) switch( pxTaskStatusArray[ x ].eCurrentState )
{ {
case eRunning: cStatus = tskRUNNING_CHAR;
break;
case eReady: cStatus = tskREADY_CHAR; case eReady: cStatus = tskREADY_CHAR;
break; break;