alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2025-09-23 09:13:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/nvs_typedef_naming_pr3239' into 'master'

Browse Source 
nvs: Append _t to nvs_handle & nvs_open_mode types

Closes IDFGH-891

See merge request idf/esp-idf!4783
This commit is contained in:
Angus Gratton
2019-05-29 08:14:00 +08:00
parent 80fb837b29 b2e54a9cc6
commit 154fc74f76
16 changed files with 161 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/lwip/port/esp32/netif/dhcp_state.c
View File

@@ -33,7 +33,7 @@ _Static_assert(sizeof(interface_key) / sizeof(char*) == TCPIP_ADAPTER_IF_MAX,
bool dhcp_ip_addr_restore(void *netif)
{
nvs_handle nvs;
nvs_handle_t nvs;
bool err = false;
struct netif *net = (struct netif *)netif;
struct dhcp *dhcp = netif_dhcp_data(net);
@@ -54,7 +54,7 @@ bool dhcp_ip_addr_restore(void *netif)
void dhcp_ip_addr_store(void *netif)
{
nvs_handle nvs;
nvs_handle_t nvs;
struct netif *net = (struct netif *)netif;
struct dhcp *dhcp = netif_dhcp_data(net);
uint32_t ip_addr = dhcp->offered_ip_addr.addr;
@@ -73,7 +73,7 @@ void dhcp_ip_addr_store(void *netif)
void dhcp_ip_addr_erase(void *netif)
{
nvs_handle nvs;
nvs_handle_t nvs;
struct netif *net = (struct netif *)netif;
esp_interface_t netif_id = tcpip_adapter_get_esp_if(net);