From 2a15eda8bc0b170269563e11f9552627b07a41cc Mon Sep 17 00:00:00 2001 From: liuzhifu Date: Thu, 1 Sep 2016 14:37:19 +0800 Subject: [PATCH] components: esp32 Remove priority/stack definition of task that is freertos/lwip/app --- components/esp32/include/esp_task.h | 46 +++++++++++------------------ 1 file changed, 18 insertions(+), 28 deletions(-) diff --git a/components/esp32/include/esp_task.h b/components/esp32/include/esp_task.h index df6a1ed2d..f70af2aee 100644 --- a/components/esp32/include/esp_task.h +++ b/components/esp32/include/esp_task.h @@ -1,10 +1,25 @@ -#ifndef __ESP_TASK_H -#define __ESP_TASK_H +#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"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at + +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// 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, - * otherwise use ESP_TASK_PRIO_MAX + X style + * otherwise use ESP_TASK_PRIO_MIN - X style * 3. If this is a daemon task, the macro prifix is ESP_TASKD_, otherwise * it's ESP_TASK_ * 4. If the configMAX_PRIORITIES is modified, please make all prority are @@ -12,7 +27,6 @@ * 5. Make sure esp_task.h is consistent between wifi lib and idf */ -#define ESP_TASK_PRIO_MAX (configMAX_PRIORITIES) #define ESP_TASK_PRIO_MIN (0) /* Wifi library task */ @@ -32,29 +46,5 @@ #define ESP_TASKD_EVENT_STACK 2048 #define ESP_TASK_WIFI_STARTUP_PRIO (ESP_TASK_PRIO_MAX - 7) #define ESP_TASK_WIFI_STARTUP_STACK 4096 -#define ESP_TASKD_LWIP_PRIO (ESP_TASK_PRIO_MAX - 7) -#define ESP_TASKD_LWIP_STACK 2048 -#define ESP_TASKD_IDLE_PRIO 0 -#define ESP_TASKD_IDLE_STACK configMINIMAL_STACK_SIZE -#define ESP_TASKD_TIMER_PRIO configTIMER_TASK_PRIORITY -#define ESP_TASKD_TIMER_STACK configTIMER_TASK_STACK_DEPTH -#define ESP_TASK_NVS_PRIO "TODO" -#define ESP_TASK_NVS_STACK "TODO" - -/* SSC tasks */ -#define ESP_TASKD_SSC_PRIO (ESP_TASK_PRIO_MAX - 5) -#define ESP_TASKD_SSC_STACK 2048 -#define ESP_TASKD_SSC_APP_PRIO (ESP_TASK_PRIO_MAX - 5) -#define ESP_TASKD_SSC_APP_STACK 8196 -#define ESP_TASK_SSC_SOCKET_PRIO (ESP_TASK_PRIO_MAX - 6) -#define ESP_TASK_SSC_SOCKET_STACK 2048 -#define ESP_TASK_SSC_SSL_PRIO (ESP_TASK_PRIO_MAX - 6) -#define ESP_TASK_SSC_SSL_STACK 2048 - -/* smart config */ -#define ESP_TASK_KISS_PRIO "TODO" -#define ESP_TASK_KISS_STACK "TODO" -#define ESP_TASK_TOUCH_PRIO "TODO" -#define ESP_TASK_TOUCH_STACK "TODO" #endif