wifi event_default_handlers/tcpip_adapter: Support disabling WiFi, keeping Ethernet

diff --git a/components/esp32/event_default_handlers.c b/components/esp32/event_default_handlers.c
index c09775ab9d0f071425d3896652b606ab39fc7be5..0c7ec2ac510f584df761617b8f37d54fbfd41240 100644 (file)
--- a/components/esp32/event_default_handlers.c
+++ b/components/esp32/event_default_handlers.c
@@ -45,14 +45,9 @@ do{\
     }\
 } while(0)
 
-typedef esp_err_t (*system_event_handle_fn_t)(system_event_t *e);
-
-typedef struct {
-    system_event_id_t event_id;
-    system_event_handle_fn_t event_handle;
-} system_event_handle_t;
-
+typedef esp_err_t (*system_event_handler_t)(system_event_t *e);
 
+#ifdef CONFIG_WIFI_ENABLED
 static esp_err_t system_event_ap_start_handle_default(system_event_t *event);
 static esp_err_t system_event_ap_stop_handle_default(system_event_t *event);
 static esp_err_t system_event_sta_start_handle_default(system_event_t *event);
@@ -60,39 +55,50 @@ static esp_err_t system_event_sta_stop_handle_default(system_event_t *event);
 static esp_err_t system_event_sta_connected_handle_default(system_event_t *event);
 static esp_err_t system_event_sta_disconnected_handle_default(system_event_t *event);
 static esp_err_t system_event_sta_got_ip_default(system_event_t *event);
+#endif
 
+#ifdef CONFIG_ETHERNET
 static esp_err_t system_event_eth_start_handle_default(system_event_t *event);
 static esp_err_t system_event_eth_stop_handle_default(system_event_t *event);
 static esp_err_t system_event_eth_connected_handle_default(system_event_t *event);
 static esp_err_t system_event_eth_disconnected_handle_default(system_event_t *event);
-
-static system_event_handle_t g_system_event_handle_table[] = {
-    {SYSTEM_EVENT_WIFI_READY,          NULL},
-    {SYSTEM_EVENT_SCAN_DONE,           NULL},
-    {SYSTEM_EVENT_STA_START,           system_event_sta_start_handle_default},
-    {SYSTEM_EVENT_STA_STOP,            system_event_sta_stop_handle_default},
-    {SYSTEM_EVENT_STA_CONNECTED,       system_event_sta_connected_handle_default},
-    {SYSTEM_EVENT_STA_DISCONNECTED,    system_event_sta_disconnected_handle_default},
-    {SYSTEM_EVENT_STA_AUTHMODE_CHANGE, NULL},
-    {SYSTEM_EVENT_STA_GOT_IP,          system_event_sta_got_ip_default},
-    {SYSTEM_EVENT_STA_WPS_ER_SUCCESS,  NULL},
-    {SYSTEM_EVENT_STA_WPS_ER_FAILED,   NULL},
-    {SYSTEM_EVENT_STA_WPS_ER_TIMEOUT,  NULL},
-    {SYSTEM_EVENT_STA_WPS_ER_PIN,      NULL},
-    {SYSTEM_EVENT_AP_START,            system_event_ap_start_handle_default},
-    {SYSTEM_EVENT_AP_STOP,             system_event_ap_stop_handle_default},
-    {SYSTEM_EVENT_AP_STACONNECTED,     NULL},
-    {SYSTEM_EVENT_AP_STADISCONNECTED,  NULL},
-    {SYSTEM_EVENT_AP_PROBEREQRECVED,   NULL},
-    {SYSTEM_EVENT_AP_STA_GOT_IP6,      NULL},
-    {SYSTEM_EVENT_ETH_START,           system_event_eth_start_handle_default},
-    {SYSTEM_EVENT_ETH_STOP,            system_event_eth_stop_handle_default},
-    {SYSTEM_EVENT_ETH_CONNECTED,       system_event_eth_connected_handle_default},
-    {SYSTEM_EVENT_ETH_DISCONNECTED,    system_event_eth_disconnected_handle_default},
-    {SYSTEM_EVENT_ETH_GOT_IP,          NULL},
-    {SYSTEM_EVENT_MAX,                 NULL},
+#endif
+
+/* Default event handler functions
+
+   Any entry in this table which is disabled by config will have a NULL handler.
+*/
+static const system_event_handler_t default_event_handlers[SYSTEM_EVENT_MAX] = {
+#ifdef CONFIG_WIFI_ENABLED
+    [SYSTEM_EVENT_WIFI_READY]          = NULL,
+    [SYSTEM_EVENT_SCAN_DONE]           = NULL,
+    [SYSTEM_EVENT_STA_START]           = system_event_sta_start_handle_default,
+    [SYSTEM_EVENT_STA_STOP]            = system_event_sta_stop_handle_default,
+    [SYSTEM_EVENT_STA_CONNECTED]       = system_event_sta_connected_handle_default,
+    [SYSTEM_EVENT_STA_DISCONNECTED]    = system_event_sta_disconnected_handle_default,
+    [SYSTEM_EVENT_STA_AUTHMODE_CHANGE] = NULL,
+    [SYSTEM_EVENT_STA_GOT_IP]          = system_event_sta_got_ip_default,
+    [SYSTEM_EVENT_STA_WPS_ER_SUCCESS]  = NULL,
+    [SYSTEM_EVENT_STA_WPS_ER_FAILED]   = NULL,
+    [SYSTEM_EVENT_STA_WPS_ER_TIMEOUT]  = NULL,
+    [SYSTEM_EVENT_STA_WPS_ER_PIN]      = NULL,
+    [SYSTEM_EVENT_AP_START]            = system_event_ap_start_handle_default,
+    [SYSTEM_EVENT_AP_STOP]             = system_event_ap_stop_handle_default,
+    [SYSTEM_EVENT_AP_STACONNECTED]     = NULL,
+    [SYSTEM_EVENT_AP_STADISCONNECTED]  = NULL,
+    [SYSTEM_EVENT_AP_PROBEREQRECVED]   = NULL,
+    [SYSTEM_EVENT_AP_STA_GOT_IP6]      = NULL,
+#endif
+#ifdef CONFIG_ETHERNET
+    [SYSTEM_EVENT_ETH_START]           = system_event_eth_start_handle_default,
+    [SYSTEM_EVENT_ETH_STOP]            = system_event_eth_stop_handle_default,
+    [SYSTEM_EVENT_ETH_CONNECTED]       = system_event_eth_connected_handle_default,
+    [SYSTEM_EVENT_ETH_DISCONNECTED]    = system_event_eth_disconnected_handle_default,
+    [SYSTEM_EVENT_ETH_GOT_IP]          = NULL,
+#endif
 };
 
+#ifdef CONFIG_ETHERNET
 esp_err_t system_event_eth_start_handle_default(system_event_t *event)
 {
     tcpip_adapter_ip_info_t eth_ip;
@@ -121,7 +127,6 @@ esp_err_t system_event_eth_connected_handle_default(system_event_t *event)
     tcpip_adapter_dhcpc_get_status(TCPIP_ADAPTER_IF_ETH, &status);
 
     if (status == TCPIP_ADAPTER_DHCP_INIT) {
-          
         tcpip_adapter_dhcpc_start(TCPIP_ADAPTER_IF_ETH);
     } else if (status == TCPIP_ADAPTER_DHCP_STOPPED) {
         tcpip_adapter_ip_info_t eth_ip;
@@ -149,9 +154,9 @@ esp_err_t system_event_eth_disconnected_handle_default(system_event_t *event)
     tcpip_adapter_down(TCPIP_ADAPTER_IF_ETH);
     return ESP_OK;
 }
+#endif
 
-
-
+#ifdef CONFIG_WIFI_ENABLED
 static esp_err_t system_event_sta_got_ip_default(system_event_t *event)
 {
     WIFI_API_CALL_CHECK("esp_wifi_internal_set_sta_ip", esp_wifi_internal_set_sta_ip(), ESP_OK);
@@ -245,6 +250,7 @@ esp_err_t system_event_sta_disconnected_handle_default(system_event_t *event)
     WIFI_API_CALL_CHECK("esp_wifi_internal_reg_rxcb", esp_wifi_internal_reg_rxcb(ESP_IF_WIFI_STA, NULL), ESP_OK);
     return ESP_OK;
 }
+#endif
 
 static esp_err_t esp_system_event_debug(system_event_t *event)
 {
@@ -377,10 +383,10 @@ esp_err_t esp_event_process_default(system_event_t *event)
     }
 
     esp_system_event_debug(event);
-    if ((event->event_id < SYSTEM_EVENT_MAX) && (event->event_id == g_system_event_handle_table[event->event_id].event_id)) {
-        if (g_system_event_handle_table[event->event_id].event_handle) {
+    if ((event->event_id < SYSTEM_EVENT_MAX)) {
+        if (default_event_handlers[event->event_id] != NULL) {
             ESP_LOGV(TAG, "enter default callback");
-            g_system_event_handle_table[event->event_id].event_handle(event);
+            default_event_handlers[event->event_id](event);
             ESP_LOGV(TAG, "exit default callback");
         }
     } else {

diff --git a/components/tcpip_adapter/tcpip_adapter_lwip.c b/components/tcpip_adapter/tcpip_adapter_lwip.c
index 40f235d545c77402ce1220c22f785017b5724eb3..80a0ba13248ce3d4596875d57a9628cc025b0dfb 100644 (file)
--- a/components/tcpip_adapter/tcpip_adapter_lwip.c
+++ b/components/tcpip_adapter/tcpip_adapter_lwip.c
@@ -60,8 +60,27 @@ void tcpip_adapter_init(void)
     }
 }
 
+static netif_init_fn tcpip_if_to_netif_init_fn(tcpip_adapter_if_t tcpip_if)
+{
+    switch(tcpip_if) {
+#ifdef CONFIG_WIFI_ENABLED
+    case TCPIP_ADAPTER_IF_AP:
+    case TCPIP_ADAPTER_IF_STA:
+        return wlanif_init;
+#endif
+#ifdef CONFIG_ETHERNET
+        case TCPIP_ADAPTER_IF_ETH:
+            return ethernetif_init;
+#endif
+        default:
+            return NULL;
+    }
+}
+
 esp_err_t tcpip_adapter_start(tcpip_adapter_if_t tcpip_if, uint8_t *mac, tcpip_adapter_ip_info_t *ip_info)
 {
+    netif_init_fn netif_init;
+
     if (tcpip_if >= TCPIP_ADAPTER_IF_MAX || mac == NULL || ip_info == NULL) {
         return ESP_ERR_TCPIP_ADAPTER_INVALID_PARAMS;
     }
@@ -72,11 +91,10 @@ esp_err_t tcpip_adapter_start(tcpip_adapter_if_t tcpip_if, uint8_t *mac, tcpip_a
             return ESP_ERR_NO_MEM;
         }
         memcpy(esp_netif[tcpip_if]->hwaddr, mac, NETIF_MAX_HWADDR_LEN);
-        if (tcpip_if == TCPIP_ADAPTER_IF_AP || tcpip_if == TCPIP_ADAPTER_IF_STA) {
-            netif_add(esp_netif[tcpip_if], &ip_info->ip, &ip_info->netmask, &ip_info->gw, NULL, wlanif_init, tcpip_input);
-        } else if (tcpip_if == TCPIP_ADAPTER_IF_ETH) {
-            netif_add(esp_netif[tcpip_if], &ip_info->ip, &ip_info->netmask, &ip_info->gw, NULL, ethernetif_init, tcpip_input);
-        }
+
+        netif_init = tcpip_if_to_netif_init_fn(tcpip_if);
+        assert(netif_init != NULL);
+        netif_add(esp_netif[tcpip_if], &ip_info->ip, &ip_info->netmask, &ip_info->gw, NULL, netif_init, tcpip_input);
     }
 
     if (tcpip_if == TCPIP_ADAPTER_IF_AP) {
@@ -757,4 +775,4 @@ esp_err_t tcpip_adapter_get_hostname(tcpip_adapter_if_t tcpip_if, const char **h
 #endif
 }
 
-#endif
+#endif /* CONFIG_TCPIP_LWIP */