From 314dbc0b61ce2bbc511a7a5dd1fc3ab92bfef62c Mon Sep 17 00:00:00 2001 From: Angus Gratton Date: Fri, 2 Sep 2016 11:33:53 +1000 Subject: [PATCH] Minor comment cleanup Remove old commented code, etc. --- components/esp32/cpu_start.c | 2 -- components/esp32/include/esp_event.h | 2 +- components/lwip/include/lwip/lwip/debug.h | 1 - components/lwip/port/freertos/sys_arch.c | 7 ------- 4 files changed, 1 insertion(+), 11 deletions(-) diff --git a/components/esp32/cpu_start.c b/components/esp32/cpu_start.c index d9076fb163..85d3009ef3 100644 --- a/components/esp32/cpu_start.c +++ b/components/esp32/cpu_start.c @@ -217,9 +217,7 @@ void user_start_cpu0(void) { esp_event_init(NULL); - // TODO: consider ethernet interface tcpip_adapter_init(); - #endif #if CONFIG_WIFI_ENABLED && CONFIG_WIFI_AUTO_STARTUP diff --git a/components/esp32/include/esp_event.h b/components/esp32/include/esp_event.h index 51e27630b2..0e3e3ba1b6 100755 --- a/components/esp32/include/esp_event.h +++ b/components/esp32/include/esp_event.h @@ -32,7 +32,7 @@ typedef enum { SYSTEM_EVENT_STA_CONNECTED, /**< ESP32 station connected to AP */ SYSTEM_EVENT_STA_DISCONNECTED, /**< ESP32 station disconnected to AP */ SYSTEM_EVENT_STA_AUTHMODE_CHANGE, /**< the auth mode of AP connected by ESP32 station changed */ - SYSTEM_EVENT_STA_GOTIP, + SYSTEM_EVENT_STA_GOTIP, /**< ESP32 station received IP address */ SYSTEM_EVENT_AP_START, /**< ESP32 softap start */ SYSTEM_EVENT_AP_STOP, /**< ESP32 softap start */ SYSTEM_EVENT_AP_STACONNECTED, /**< a station connected to ESP32 soft-AP */ diff --git a/components/lwip/include/lwip/lwip/debug.h b/components/lwip/include/lwip/lwip/debug.h index 342a55aad1..973a633d9d 100755 --- a/components/lwip/include/lwip/lwip/debug.h +++ b/components/lwip/include/lwip/lwip/debug.h @@ -97,7 +97,6 @@ /** print debug message only if debug message type is enabled... * AND is of correct type AND is at least LWIP_DBG_LEVEL */ -//#define LWIP_DEBUGF(debug, message) do { #define LWIP_DEBUGF(debug, message) do { \ if ( \ ((debug) & LWIP_DBG_ON) && \ diff --git a/components/lwip/port/freertos/sys_arch.c b/components/lwip/port/freertos/sys_arch.c index 86d937e7f2..ad433549a0 100755 --- a/components/lwip/port/freertos/sys_arch.c +++ b/components/lwip/port/freertos/sys_arch.c @@ -296,7 +296,6 @@ sys_arch_mbox_fetch(sys_mbox_t *mbox, void **msg, u32_t timeout) while (1){ LWIP_DEBUGF(THREAD_SAFE_DEBUG, ("sys_arch_mbox_fetch: fetch mbox=%p os_mbox=%p lock=%p\n", mbox, (*mbox)->os_mbox, (*mbox)->lock)); if (pdTRUE == xQueueReceive((*mbox)->os_mbox, &(*msg), portMAX_DELAY)){ - //if (pdTRUE == xQueueReceive((*mbox)->os_mbox, &(*msg), 3000/portTICK_RATE_MS)){ //ESP32_WORKAROUND LWIP_DEBUGF(THREAD_SAFE_DEBUG, ("sys_arch_mbox_fetch:mbox rx msg=%p\n", (*msg))); break; } @@ -451,10 +450,7 @@ static portMUX_TYPE g_lwip_mux = portMUX_INITIALIZER_UNLOCKED; sys_prot_t sys_arch_protect(void) { -#if 1//ESP32_WORKAROUND - //vTaskEnterCritical(); portENTER_CRITICAL(&g_lwip_mux); -#endif return (sys_prot_t) 1; } @@ -469,10 +465,7 @@ void sys_arch_unprotect(sys_prot_t pval) { (void) pval; -#if 1 //ESP32_WORKAROUND - //vTaskExitCritical(); portEXIT_CRITICAL(&g_lwip_mux); -#endif } /*-----------------------------------------------------------------------------------*/ -- 2.40.0