kopia lustrzana https://github.com/espressif/esp-idf
Merge branch 'bugfix/freertos_task_delete' into 'master'
freertos: Expose TCB & Stack memory capabilities as macro, fix task delete test See merge request idf/esp-idf!3040pull/2261/merge
commit
8846b5fb64
|
@ -258,8 +258,11 @@ static inline unsigned portENTER_CRITICAL_NESTED() {
|
||||||
|
|
||||||
//Because the ROM routines don't necessarily handle a stack in external RAM correctly, we force
|
//Because the ROM routines don't necessarily handle a stack in external RAM correctly, we force
|
||||||
//the stack memory to always be internal.
|
//the stack memory to always be internal.
|
||||||
#define pvPortMallocTcbMem(size) heap_caps_malloc(size, MALLOC_CAP_INTERNAL|MALLOC_CAP_8BIT)
|
#define portTcbMemoryCaps (MALLOC_CAP_INTERNAL|MALLOC_CAP_8BIT)
|
||||||
#define pvPortMallocStackMem(size) heap_caps_malloc(size, MALLOC_CAP_INTERNAL|MALLOC_CAP_8BIT)
|
#define portStackMemoryCaps (MALLOC_CAP_INTERNAL|MALLOC_CAP_8BIT)
|
||||||
|
|
||||||
|
#define pvPortMallocTcbMem(size) heap_caps_malloc(size, portTcbMemoryCaps)
|
||||||
|
#define pvPortMallocStackMem(size) heap_caps_malloc(size, portStackMemoryCaps)
|
||||||
|
|
||||||
//xTaskCreateStatic uses these functions to check incoming memory.
|
//xTaskCreateStatic uses these functions to check incoming memory.
|
||||||
#define portVALID_TCB_MEM(ptr) (esp_ptr_internal(ptr) && esp_ptr_byte_accessible(ptr))
|
#define portVALID_TCB_MEM(ptr) (esp_ptr_internal(ptr) && esp_ptr_byte_accessible(ptr))
|
||||||
|
|
|
@ -23,7 +23,8 @@
|
||||||
|
|
||||||
#define NO_OF_TSKS 3
|
#define NO_OF_TSKS 3
|
||||||
#define DELAY_TICKS 2
|
#define DELAY_TICKS 2
|
||||||
#define HEAP_CAPS (MALLOC_CAP_INTERNAL|MALLOC_CAP_DEFAULT)
|
/* Caps of all memory which is allocated from when a task is created */
|
||||||
|
#define HEAP_CAPS (portTcbMemoryCaps | portStackMemoryCaps)
|
||||||
|
|
||||||
#define DELAY_US_ITERATIONS 1000
|
#define DELAY_US_ITERATIONS 1000
|
||||||
|
|
||||||
|
|
Ładowanie…
Reference in New Issue