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

Merge branch 'bugfix/netif_cpp_issues' into 'master'

Browse Source 
esp_netif c++ fixes

See merge request espressif/esp-idf!7045
This commit is contained in:
Angus Gratton
2020-01-07 14:34:57 +08:00
parent 8bfb32735f b2c8ce8e2b
commit 3b9c8a6677
3 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
components/esp_netif/include/esp_netif_defaults.h
View File

@@ -29,8 +29,8 @@ extern "C" {
#define ESP_NETIF_DEFAULT_ETH() \ #define ESP_NETIF_DEFAULT_ETH() \
{ \ { \
.base = ESP_NETIF_BASE_DEFAULT_ETH, \ .base = ESP_NETIF_BASE_DEFAULT_ETH, \
.driver = NULL, \
.stack = ESP_NETIF_NETSTACK_DEFAULT_ETH, \ .stack = ESP_NETIF_NETSTACK_DEFAULT_ETH, \
.driver = NULL, \
} }
/** /**
@@ -39,8 +39,8 @@ extern "C" {
#define ESP_NETIF_DEFAULT_WIFI_AP() \ #define ESP_NETIF_DEFAULT_WIFI_AP() \
{ \ { \
.base = ESP_NETIF_BASE_DEFAULT_WIFI_AP, \ .base = ESP_NETIF_BASE_DEFAULT_WIFI_AP, \
.driver = NULL, \
.stack = ESP_NETIF_NETSTACK_DEFAULT_WIFI_AP, \ .stack = ESP_NETIF_NETSTACK_DEFAULT_WIFI_AP, \
.driver = NULL, \
} }
/** /**
@@ -49,8 +49,8 @@ extern "C" {
#define ESP_NETIF_DEFAULT_WIFI_STA() \ #define ESP_NETIF_DEFAULT_WIFI_STA() \
{ \ { \
.base = ESP_NETIF_BASE_DEFAULT_WIFI_STA, \ .base = ESP_NETIF_BASE_DEFAULT_WIFI_STA, \
.driver = NULL, \
.stack = ESP_NETIF_NETSTACK_DEFAULT_WIFI_STA, \ .stack = ESP_NETIF_NETSTACK_DEFAULT_WIFI_STA, \
.driver = NULL, \
} }
/** /**
@@ -59,8 +59,8 @@ extern "C" {
#define ESP_NETIF_DEFAULT_PPP() \ #define ESP_NETIF_DEFAULT_PPP() \
{ \ { \
.base = ESP_NETIF_BASE_DEFAULT_PPP, \ .base = ESP_NETIF_BASE_DEFAULT_PPP, \
.driver = NULL, \
.stack = ESP_NETIF_NETSTACK_DEFAULT_PPP, \ .stack = ESP_NETIF_NETSTACK_DEFAULT_PPP, \
.driver = NULL, \
} }
/** /**
* @brief Default base config (esp-netif inherent) of WIFI STA * @brief Default base config (esp-netif inherent) of WIFI STA

8
components/esp_wifi/include/esp_wifi_default.h
View File

@@ -15,6 +15,10 @@
#ifndef _ESP_WIFI_DEFAULT_H #ifndef _ESP_WIFI_DEFAULT_H
#define _ESP_WIFI_DEFAULT_H #define _ESP_WIFI_DEFAULT_H
#ifdef __cplusplus
extern "C" {
#endif
/** /**
* @brief Attaches wifi station interface to supplied netif * @brief Attaches wifi station interface to supplied netif
* *
@@ -95,4 +99,8 @@ esp_netif_t* esp_netif_create_default_wifi_sta(void);
*/ */
esp_err_t esp_netif_create_default_wifi_mesh_netifs(esp_netif_t **p_netif_sta, esp_netif_t **p_netif_ap); esp_err_t esp_netif_create_default_wifi_mesh_netifs(esp_netif_t **p_netif_sta, esp_netif_t **p_netif_ap);
#ifdef __cplusplus
}
#endif
#endif //_ESP_WIFI_DEFAULT_H #endif //_ESP_WIFI_DEFAULT_H

7
components/esp_wifi/include/esp_wifi_netif.h
View File

@@ -15,6 +15,10 @@
#ifndef _ESP_WIFI_NETIF_H #ifndef _ESP_WIFI_NETIF_H
#define _ESP_WIFI_NETIF_H #define _ESP_WIFI_NETIF_H
#ifdef __cplusplus
extern "C" {
#endif
/** /**
* @brief Number of WiFi interfaces used by wifi-netif abstraction * @brief Number of WiFi interfaces used by wifi-netif abstraction
*/ */
@@ -80,5 +84,8 @@ bool esp_wifi_is_if_ready_when_started(wifi_netif_driver_t ifx);
*/ */
esp_err_t esp_wifi_register_if_rxcb(wifi_netif_driver_t ifx, esp_netif_receive_t fn, void * arg); esp_err_t esp_wifi_register_if_rxcb(wifi_netif_driver_t ifx, esp_netif_receive_t fn, void * arg);
#ifdef __cplusplus
}
#endif
#endif //_ESP_WIFI_NETIF_H #endif //_ESP_WIFI_NETIF_H