From c1a874fb9e7a7b51f6be0fd91a8dcabe00e9fc7d Mon Sep 17 00:00:00 2001
From: Wu Jian Gang <wujiangang@espressif.com>
Date: Wed, 14 Sep 2016 12:55:41 +0800
Subject: [PATCH] esp32: fix kconfig

---
 components/esp32/Kconfig            | 12 ++++++------
 components/esp32/event.c            |  2 +-
 components/esp32/include/esp_task.h | 11 ++++++-----
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/components/esp32/Kconfig b/components/esp32/Kconfig
index 154ee4150..5e4cd26c2 100644
--- a/components/esp32/Kconfig
+++ b/components/esp32/Kconfig
@@ -24,19 +24,19 @@ config WIFI_AUTO_CONNECT
         If station is enabled, and station config is set, this will enable WiFi
         station auto connect when WiFi startup.
 
-config WIFI_ENENT_QUEUE_SIZE
-    int "WiFi event queue size"
+config SYSTEM_ENENT_QUEUE_SIZE
+    int "system event queue size"
     default 32
     depends on WIFI_ENABLED
     help
-        Config WiFi event queue size in different application.
+        Config system event queue size in different application.
 
-config WIFI_EVENT_TASK_STACK_SIZE
-    int "WiFi event task stack size"
+config SYSTEM_EVENT_TASK_STACK_SIZE
+    int "system event task stack size"
     default 2048
     depends on WIFI_ENABLED
     help
-        Config WiFi event task stack size in different application.
+        Config system event task stack size in different application.
 
 
 config NEWLIB_STDOUT_ADDCR
diff --git a/components/esp32/event.c b/components/esp32/event.c
index 213d7f361..2be1e08fb 100644
--- a/components/esp32/event.c
+++ b/components/esp32/event.c
@@ -358,7 +358,7 @@ esp_err_t esp_event_init(system_event_cb_t cb, void *ctx)
     g_event_handler_cb = cb;
     g_event_ctx = ctx;
 
-    g_event_handler = xQueueCreate(CONFIG_WIFI_ENENT_QUEUE_SIZE, sizeof(system_event_t));
+    g_event_handler = xQueueCreate(CONFIG_SYSTEM_ENENT_QUEUE_SIZE, sizeof(system_event_t));
 
     xTaskCreatePinnedToCore(esp_system_event_task, "eventTask", ESP_TASKD_EVENT_STACK, NULL, ESP_TASKD_EVENT_PRIO, NULL, 0);
     return ESP_OK;
diff --git a/components/esp32/include/esp_task.h b/components/esp32/include/esp_task.h
index 944bc6f6b..6d98bf198 100644
--- a/components/esp32/include/esp_task.h
+++ b/components/esp32/include/esp_task.h
@@ -1,6 +1,3 @@
-#ifndef _ESP_TASK_H_
-#define _ESP_TASK_H_
-
 // Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-
 /* Notes:
  * 1. Put all task priority and stack size definition in this file
  * 2. If the task priority is less than 10, use ESP_TASK_PRIO_MIN + X style,
@@ -27,6 +23,11 @@
  * 5. Make sure esp_task.h is consistent between wifi lib and idf
  */
 
+#ifndef _ESP_TASK_H_
+#define _ESP_TASK_H_
+
+#include "sdkconfig.h"
+
 #define ESP_TASK_PRIO_MAX (configMAX_PRIORITIES)
 #define ESP_TASK_PRIO_MIN (0)
 
@@ -44,7 +45,7 @@
 
 /* idf task */
 #define ESP_TASKD_EVENT_PRIO          (ESP_TASK_PRIO_MAX - 5)
-#define ESP_TASKD_EVENT_STACK         2048
+#define ESP_TASKD_EVENT_STACK         CONFIG_SYSTEM_EVENT_TASK_STACK_SIZE
 #define ESP_TASK_WIFI_STARTUP_PRIO    (ESP_TASK_PRIO_MAX - 7)
 #define ESP_TASK_WIFI_STARTUP_STACK   4096
 #define ESP_TASK_TCPIP_PRIO           (ESP_TASK_PRIO_MAX - 7)