alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'bugfix/fix_some_wifi_bugs_0703_v4.0' into 'release/v4.0'

Browse Source 
fix some wifi bugs 0703 (v4.0)

See merge request espressif/esp-idf!9532
This commit is contained in:
Jiang Jiang Jian 2020-07-12 20:30:52 +08:00
commit 0b3954c0c3
5 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/esp32/esp_adapter.c
View File

@ -555,7 +555,7 @@ wifi_osi_funcs_t g_wifi_osi_funcs = {
._malloc = malloc,
._free = free,
._event_post = esp_event_post_wrapper,
._get_free_heap_size = esp_get_free_heap_size,
._get_free_heap_size = esp_get_free_internal_heap_size,
._rand = esp_random,
._dport_access_stall_other_cpu_start_wrap = esp_dport_access_stall_other_cpu_start_wrap,
._dport_access_stall_other_cpu_end_wrap = esp_dport_access_stall_other_cpu_end_wrap,

5
components/esp32/system_api.c
View File

@ -340,6 +340,11 @@ uint32_t esp_get_free_heap_size( void )
return heap_caps_get_free_size( MALLOC_CAP_DEFAULT );
}
uint32_t esp_get_free_internal_heap_size( void )
{
return heap_caps_get_free_size( MALLOC_CAP_8BIT | MALLOC_CAP_DMA | MALLOC_CAP_INTERNAL );
}
uint32_t esp_get_minimum_free_heap_size( void )
{
return heap_caps_get_minimum_free_size( MALLOC_CAP_DEFAULT );

10
components/esp_common/include/esp_system.h
View File

@ -113,6 +113,16 @@ esp_reset_reason_t esp_reset_reason(void);
*/
uint32_t esp_get_free_heap_size(void);
/**
* @brief Get the size of available internal heap.
*
* Note that the returned value may be larger than the maximum contiguous block
* which can be allocated.
*
* @return Available internal heap size, in bytes.
*/
uint32_t esp_get_free_internal_heap_size(void);
/**
* @brief Get the minimum heap that has ever been available
*

1
components/esp_wifi/include/esp_wifi_types.h
View File

@ -94,6 +94,7 @@ typedef enum {
WIFI_REASON_ASSOC_FAIL = 203,
WIFI_REASON_HANDSHAKE_TIMEOUT = 204,
WIFI_REASON_CONNECTION_FAIL = 205,
WIFI_REASON_AP_TSF_RESET = 206,
} wifi_err_reason_t;
typedef enum {

2
components/esp_wifi/lib_esp32

@ -1 +1 @@
Subproject commit 6f8c549517a5a0c7c9202e1fe06cff2f85a2bc6e
Subproject commit fb16d9213d97aa4b6478f76d105ed46b7f1dbe80