From ba4dfbed7460a0027405b9e5685b20a3223c9921 Mon Sep 17 00:00:00 2001 From: Wu Jian Gang Date: Fri, 18 May 2018 15:39:01 +0800 Subject: [PATCH 1/2] feat(freertos): Restructure freertos folder to support different platform --- components/freertos/CMakeLists.txt | 6 +++--- components/freertos/component.mk | 4 ++-- components/freertos/port/{ => esp8266}/heap_5.c | 0 .../port => port/esp8266/include}/freertos/FreeRTOSConfig.h | 0 .../port => port/esp8266/include}/freertos/portmacro.h | 0 .../port => port/esp8266/include}/freertos/xtensa_context.h | 0 .../port => port/esp8266/include}/freertos/xtensa_rtos.h | 0 .../port => port/esp8266/include}/freertos/xtensa_timer.h | 0 components/freertos/port/{ => esp8266}/port.c | 0 9 files changed, 5 insertions(+), 5 deletions(-) rename components/freertos/port/{ => esp8266}/heap_5.c (100%) rename components/freertos/{include/port => port/esp8266/include}/freertos/FreeRTOSConfig.h (100%) rename components/freertos/{include/port => port/esp8266/include}/freertos/portmacro.h (100%) rename components/freertos/{include/port => port/esp8266/include}/freertos/xtensa_context.h (100%) rename components/freertos/{include/port => port/esp8266/include}/freertos/xtensa_rtos.h (100%) rename components/freertos/{include/port => port/esp8266/include}/freertos/xtensa_timer.h (100%) rename components/freertos/port/{ => esp8266}/port.c (100%) diff --git a/components/freertos/CMakeLists.txt b/components/freertos/CMakeLists.txt index a1c5cf56..d6a70068 100644 --- a/components/freertos/CMakeLists.txt +++ b/components/freertos/CMakeLists.txt @@ -1,9 +1,9 @@ set(COMPONENT_ADD_INCLUDEDIRS include include/freertos include/freertos/private - include/port - include/port/freertos) -set(COMPONENT_SRCDIRS freertos port) + port/esp8266/include + port/esp8266/include/freertos) +set(COMPONENT_SRCDIRS freertos port/esp8266) set(COMPONENT_REQUIRES esp8266) register_component() diff --git a/components/freertos/component.mk b/components/freertos/component.mk index 7d7f6945..03fb5ebf 100644 --- a/components/freertos/component.mk +++ b/components/freertos/component.mk @@ -1,6 +1,6 @@ # Component Makefile # -COMPONENT_ADD_INCLUDEDIRS += include include/freertos include/freertos/private include/port include/port/freertos +COMPONENT_ADD_INCLUDEDIRS += include include/freertos include/freertos/private port/esp8266/include port/esp8266/include/freertos -COMPONENT_SRCDIRS := freertos port +COMPONENT_SRCDIRS := freertos port/esp8266 diff --git a/components/freertos/port/heap_5.c b/components/freertos/port/esp8266/heap_5.c similarity index 100% rename from components/freertos/port/heap_5.c rename to components/freertos/port/esp8266/heap_5.c diff --git a/components/freertos/include/port/freertos/FreeRTOSConfig.h b/components/freertos/port/esp8266/include/freertos/FreeRTOSConfig.h similarity index 100% rename from components/freertos/include/port/freertos/FreeRTOSConfig.h rename to components/freertos/port/esp8266/include/freertos/FreeRTOSConfig.h diff --git a/components/freertos/include/port/freertos/portmacro.h b/components/freertos/port/esp8266/include/freertos/portmacro.h similarity index 100% rename from components/freertos/include/port/freertos/portmacro.h rename to components/freertos/port/esp8266/include/freertos/portmacro.h diff --git a/components/freertos/include/port/freertos/xtensa_context.h b/components/freertos/port/esp8266/include/freertos/xtensa_context.h similarity index 100% rename from components/freertos/include/port/freertos/xtensa_context.h rename to components/freertos/port/esp8266/include/freertos/xtensa_context.h diff --git a/components/freertos/include/port/freertos/xtensa_rtos.h b/components/freertos/port/esp8266/include/freertos/xtensa_rtos.h similarity index 100% rename from components/freertos/include/port/freertos/xtensa_rtos.h rename to components/freertos/port/esp8266/include/freertos/xtensa_rtos.h diff --git a/components/freertos/include/port/freertos/xtensa_timer.h b/components/freertos/port/esp8266/include/freertos/xtensa_timer.h similarity index 100% rename from components/freertos/include/port/freertos/xtensa_timer.h rename to components/freertos/port/esp8266/include/freertos/xtensa_timer.h diff --git a/components/freertos/port/port.c b/components/freertos/port/esp8266/port.c similarity index 100% rename from components/freertos/port/port.c rename to components/freertos/port/esp8266/port.c From 97bcae380118781fba11f837de6b09f7e02c2797 Mon Sep 17 00:00:00 2001 From: Wu Jian Gang Date: Sat, 19 May 2018 21:38:33 +0800 Subject: [PATCH 2/2] feat(freertos): Move freertos related files from esp8266 to freertos --- components/freertos/port/{ => esp8266}/impure.c | 0 components/{esp8266/source => freertos/port/esp8266}/os_cpu_a.S | 0 components/{esp8266/source => freertos/port/esp8266}/panic.c | 0 .../{esp8266/source => freertos/port/esp8266}/xtensa_context.S | 0 .../{esp8266/source => freertos/port/esp8266}/xtensa_init.c | 0 .../{esp8266/source => freertos/port/esp8266}/xtensa_vectors.S | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename components/freertos/port/{ => esp8266}/impure.c (100%) rename components/{esp8266/source => freertos/port/esp8266}/os_cpu_a.S (100%) rename components/{esp8266/source => freertos/port/esp8266}/panic.c (100%) rename components/{esp8266/source => freertos/port/esp8266}/xtensa_context.S (100%) rename components/{esp8266/source => freertos/port/esp8266}/xtensa_init.c (100%) rename components/{esp8266/source => freertos/port/esp8266}/xtensa_vectors.S (100%) diff --git a/components/freertos/port/impure.c b/components/freertos/port/esp8266/impure.c similarity index 100% rename from components/freertos/port/impure.c rename to components/freertos/port/esp8266/impure.c diff --git a/components/esp8266/source/os_cpu_a.S b/components/freertos/port/esp8266/os_cpu_a.S similarity index 100% rename from components/esp8266/source/os_cpu_a.S rename to components/freertos/port/esp8266/os_cpu_a.S diff --git a/components/esp8266/source/panic.c b/components/freertos/port/esp8266/panic.c similarity index 100% rename from components/esp8266/source/panic.c rename to components/freertos/port/esp8266/panic.c diff --git a/components/esp8266/source/xtensa_context.S b/components/freertos/port/esp8266/xtensa_context.S similarity index 100% rename from components/esp8266/source/xtensa_context.S rename to components/freertos/port/esp8266/xtensa_context.S diff --git a/components/esp8266/source/xtensa_init.c b/components/freertos/port/esp8266/xtensa_init.c similarity index 100% rename from components/esp8266/source/xtensa_init.c rename to components/freertos/port/esp8266/xtensa_init.c diff --git a/components/esp8266/source/xtensa_vectors.S b/components/freertos/port/esp8266/xtensa_vectors.S similarity index 100% rename from components/esp8266/source/xtensa_vectors.S rename to components/freertos/port/esp8266/xtensa_vectors.S