espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-03 20:54:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/system_restore_duplicate' into 'master'

Browse Source 
esp32: remove duplicate definition of system_restore

See merge request idf/esp-idf!1864
This commit is contained in:
Angus Gratton
2018-01-29 14:02:02 +08:00
parent daa8cfa800 1979235df2
commit 1249659931
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
components/esp32/system_api.c
View File

@@ -355,11 +355,6 @@ void IRAM_ATTR esp_restart_noos()
void system_restart(void) __attribute__((alias("esp_restart"))); void system_restart(void) __attribute__((alias("esp_restart")));
void system_restore(void)
{
esp_wifi_restore();
}
uint32_t esp_get_free_heap_size( void ) uint32_t esp_get_free_heap_size( void )
{ {
return heap_caps_get_free_size( MALLOC_CAP_DEFAULT ); return heap_caps_get_free_size( MALLOC_CAP_DEFAULT );