espressif/ESP8266_RTOS_SDK
1
0
Fork 0
mirror of https://github.com/espressif/ESP8266_RTOS_SDK.git synced 2025-06-17 20:05:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(freertos): Make components compiling OK

Browse Source
This commit is contained in:
Dong Heng
2018-04-27 16:47:36 +08:00
committed by Wu Jian Gang
parent e10c902c3e
commit 8418cb26d2
6 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/freertos/component.mk
View File

@ -1,6 +1,6 @@
# Component Makefile # Component Makefile
# #
COMPONENT_ADD_INCLUDEDIRS += include include/freertos include/port include/port/freertos COMPONENT_ADD_INCLUDEDIRS += include include/freertos include/freertos/private include/port include/port/freertos
COMPONENT_SRCDIRS := freertos port COMPONENT_SRCDIRS := freertos port

4
components/freertos/freertos/tasks.c
View File

@ -524,7 +524,7 @@ static void prvAddCurrentTaskToDelayedList( TickType_t xTicksToWait, const BaseT
*/ */
#if ( configUSE_TICKLESS_IDLE != 0 ) #if ( configUSE_TICKLESS_IDLE != 0 )
static TickType_t prvGetExpectedIdleTime( void ) PRIVILEGED_FUNCTION; TickType_t prvGetExpectedIdleTime( void ) PRIVILEGED_FUNCTION;
#endif #endif
@ -2041,7 +2041,7 @@ void vTaskSuspendAll( void )
#if ( configUSE_TICKLESS_IDLE != 0 ) #if ( configUSE_TICKLESS_IDLE != 0 )
static TickType_t prvGetExpectedIdleTime( void ) TickType_t prvGetExpectedIdleTime( void )
{ {
TickType_t xReturn; TickType_t xReturn;
UBaseType_t uxHigherPriorityReadyTasks = pdFALSE; UBaseType_t uxHigherPriorityReadyTasks = pdFALSE;

4
components/freertos/include/freertos/private/portable.h
View File

@ -126,8 +126,8 @@ void vPortDefineHeapRegions( const HeapRegion_t * const pxHeapRegions ) PRIVILEG
/* /*
* Map to the memory management routines required for the port. * Map to the memory management routines required for the port.
*/ */
void *pvPortMalloc( size_t xSize ) PRIVILEGED_FUNCTION; //void *pvPortMalloc( size_t xSize ) PRIVILEGED_FUNCTION;
void vPortFree( void *pv ) PRIVILEGED_FUNCTION; //void vPortFree( void *pv ) PRIVILEGED_FUNCTION;
void vPortInitialiseBlocks( void ) PRIVILEGED_FUNCTION; void vPortInitialiseBlocks( void ) PRIVILEGED_FUNCTION;
size_t xPortGetFreeHeapSize( void ) PRIVILEGED_FUNCTION; size_t xPortGetFreeHeapSize( void ) PRIVILEGED_FUNCTION;
size_t xPortGetMinimumEverFreeHeapSize( void ) PRIVILEGED_FUNCTION; size_t xPortGetMinimumEverFreeHeapSize( void ) PRIVILEGED_FUNCTION;

2
components/freertos/include/port/freertos/FreeRTOSConfig.h
View File

@ -83,7 +83,7 @@
#define configUSE_TICKLESS_IDLE 1 #define configUSE_TICKLESS_IDLE 1
#define configCPU_CLOCK_HZ ( ( unsigned long ) 80000000 ) #define configCPU_CLOCK_HZ ( ( unsigned long ) 80000000 )
#define configTICK_RATE_HZ ( ( portTickType ) 100 ) #define configTICK_RATE_HZ ( ( portTickType ) 100 )
#define configMAX_PRIORITIES ( ( unsigned portBASE_TYPE ) 15 ) #define configMAX_PRIORITIES 15
#define configMINIMAL_STACK_SIZE ( ( unsigned short )176 ) #define configMINIMAL_STACK_SIZE ( ( unsigned short )176 )
//#define configTOTAL_HEAP_SIZE ( ( size_t ) ( 17 * 1024 ) ) //#define configTOTAL_HEAP_SIZE ( ( size_t ) ( 17 * 1024 ) )
#define configMAX_TASK_NAME_LEN ( 16 ) #define configMAX_TASK_NAME_LEN ( 16 )

7
components/freertos/include/port/freertos/portmacro.h
View File

@ -96,6 +96,11 @@ extern "C" {
#define portSTACK_TYPE unsigned portLONG #define portSTACK_TYPE unsigned portLONG
#define portBASE_TYPE long #define portBASE_TYPE long
#define BaseType_t portBASE_TYPE
#define TickType_t unsigned portLONG
#define UBaseType_t unsigned portBASE_TYPE
#define StackType_t portSTACK_TYPE
typedef unsigned portLONG portTickType; typedef unsigned portLONG portTickType;
typedef unsigned int INT32U; typedef unsigned int INT32U;
#define portMAX_DELAY ( portTickType ) 0xffffffff #define portMAX_DELAY ( portTickType ) 0xffffffff
@ -103,7 +108,7 @@ typedef unsigned int INT32U;
/* Architecture specifics. */ /* Architecture specifics. */
#define portSTACK_GROWTH ( -1 ) #define portSTACK_GROWTH ( -1 )
#define portTICK_RATE_MS ( ( portTickType ) 1000 / configTICK_RATE_HZ ) #define portTICK_PERIOD_MS ( ( portTickType ) 1000 / configTICK_RATE_HZ )
#define portBYTE_ALIGNMENT 8 #define portBYTE_ALIGNMENT 8
/*-----------------------------------------------------------*/ /*-----------------------------------------------------------*/

8
components/freertos/port/heap_5.c
View File

@ -147,14 +147,6 @@ typedef struct A_BLOCK_LINK
#endif #endif
} BlockLink_t; } BlockLink_t;
/* Used by heap_5.c. */
typedef struct HeapRegion
{
uint8_t *pucStartAddress;
size_t xSizeInBytes;
} HeapRegion_t;
/*-----------------------------------------------------------*/ /*-----------------------------------------------------------*/
/* /*