esp_system: remove link time dependency on WiFi stack

- esp_restart will not pull in WiFi stack (if it is not used otherwise)
- esp_restore is moved into a separate file to break link time
  dependency
This commit is contained in:
Ivan Grokhotkov 2017-06-15 18:00:49 +08:00
parent 6538ebe8ad
commit 8cb0d52c43
2 changed files with 34 additions and 5 deletions

View File

@ -0,0 +1,24 @@
// Copyright 2013-2017 Espressif Systems (Shanghai) PTE LTD
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#include "esp_system.h"
#include "esp_wifi.h"
/* This function is in a separate file from the reset of system APIs because
* it causes link time dependency on WiFi stack.
*/
void system_restore(void)
{
esp_wifi_restore();
}

View File

@ -228,6 +228,16 @@ esp_err_t esp_read_mac(uint8_t* mac, esp_mac_type_t type)
void esp_restart_noos() __attribute__ ((noreturn)); void esp_restart_noos() __attribute__ ((noreturn));
/* Dummy function to be used instead of esp_wifi_stop if WiFi stack is not
* linked in (even though CONFIG_WIFI_ENABLED is set).
*/
esp_err_t wifi_stop_noop()
{
return ESP_OK;
}
esp_err_t esp_wifi_stop(void) __attribute((weak, alias("wifi_stop_noop")));
void IRAM_ATTR esp_restart(void) void IRAM_ATTR esp_restart(void)
{ {
#ifdef CONFIG_WIFI_ENABLED #ifdef CONFIG_WIFI_ENABLED
@ -320,11 +330,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 xPortGetFreeHeapSize(); return xPortGetFreeHeapSize();