This MR removes the common dependency from every IDF components to the SOC component. Currently, in the ``idf_functions.cmake`` script, we include the header path of SOC component by default for all components. But for better code organization (or maybe also benifits to the compiling speed), we may remove the dependency to SOC components for most components except the driver and kernel related components. In CMAKE, we have two kinds of header visibilities (set by include path visibility): (Assume component A --(depends on)--> B, B is the current component) 1. public (``COMPONENT_ADD_INCLUDEDIRS``): means this path is visible to other depending components (A) (visible to A and B) 2. private (``COMPONENT_PRIV_INCLUDEDIRS``): means this path is only visible to source files inside the component (visible to B only) and we have two kinds of depending ways: (Assume component A --(depends on)--> B --(depends on)--> C, B is the current component) 1. public (```COMPONENT_REQUIRES```): means B can access to public include path of C. All other components rely on you (A) will also be available for the public headers. (visible to A, B) 2. private (``COMPONENT_PRIV_REQUIRES``): means B can access to public include path of C, but don't propagate this relation to other components (A). (visible to B) 1. remove the common requirement in ``idf_functions.cmake``, this makes the SOC components invisible to all other components by default. 2. if a component (for example, DRIVER) really needs the dependency to SOC, add a private dependency to SOC for it. 3. some other components that don't really depends on the SOC may still meet some errors saying "can't find header soc/...", this is because it's depended component (DRIVER) incorrectly include the header of SOC in its public headers. Moving all this kind of #include into source files, or private headers 4. Fix the include requirements for some file which miss sufficient #include directives. (Previously they include some headers by the long long long header include link) This is a breaking change. Previous code may depends on the long include chain. You may need to include the following headers for some files after this commit: - soc/soc.h - soc/soc_memory_layout.h - driver/gpio.h - esp_sleep.h The major broken include chain includes: 1. esp_system.h no longer includes esp_sleep.h. The latter includes driver/gpio.h and driver/touch_pad.h. 2. ets_sys.h no longer includes soc/soc.h 3. freertos/portmacro.h no longer includes soc/soc_memory_layout.h some peripheral headers no longer includes their hw related headers, e.g. rom/gpio.h no longer includes soc/gpio_pins.h and soc/gpio_reg.h BREAKING CHANGE
112 lines
4.6 KiB
C
112 lines
4.6 KiB
C
/*
|
|
Copyright (C) 2016-2017 Espressif Shanghai PTE LTD
|
|
Copyright (C) 2015 Real Time Engineers Ltd.
|
|
|
|
All rights reserved
|
|
|
|
FreeRTOS is free software; you can redistribute it and/or modify it under
|
|
the terms of the GNU General Public License (version 2) as published by the
|
|
Free Software Foundation >>!AND MODIFIED BY!<< the FreeRTOS exception.
|
|
|
|
***************************************************************************
|
|
>>! NOTE: The modification to the GPL is included to allow you to !<<
|
|
>>! distribute a combined work that includes FreeRTOS without being !<<
|
|
>>! obliged to provide the source code for proprietary components !<<
|
|
>>! outside of the FreeRTOS kernel. !<<
|
|
***************************************************************************
|
|
|
|
FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY
|
|
WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
|
FOR A PARTICULAR PURPOSE. Full license text is available on the following
|
|
link: http://www.freertos.org/a00114.html
|
|
*/
|
|
|
|
/* This header exists for performance reasons, in order to inline the
|
|
implementation of vPortCPUAcquireMutexIntsDisabled and
|
|
vPortCPUReleaseMutexIntsDisabled into the
|
|
vTaskEnterCritical/vTaskExitCritical functions in task.c as well as the
|
|
vPortCPUAcquireMutex/vPortCPUReleaseMutex implementations.
|
|
|
|
Normally this kind of performance hack is over the top, but
|
|
vTaskEnterCritical/vTaskExitCritical is called a great
|
|
deal by FreeRTOS internals.
|
|
|
|
It should be #included by freertos port.c or tasks.c, in esp-idf.
|
|
|
|
The way it works is that it essentially uses portmux_impl.inc.h as a
|
|
generator template of sorts. When no external memory is used, this
|
|
template is only used to generate the vPortCPUAcquireMutexIntsDisabledInternal
|
|
and vPortCPUReleaseMutexIntsDisabledInternal functions, which use S32C1 to
|
|
do an atomic compare & swap. When external memory is used the functions
|
|
vPortCPUAcquireMutexIntsDisabledExtram and vPortCPUReleaseMutexIntsDisabledExtram
|
|
are also generated, which use uxPortCompareSetExtram to fake the S32C1 instruction.
|
|
The wrapper functions vPortCPUAcquireMutexIntsDisabled and
|
|
vPortCPUReleaseMutexIntsDisabled will then use the appropriate function to do the
|
|
actual lock/unlock.
|
|
*/
|
|
#include "soc/cpu.h"
|
|
#include "portable.h"
|
|
#include "soc/soc_memory_layout.h"
|
|
|
|
/* XOR one core ID with this value to get the other core ID */
|
|
#define CORE_ID_XOR_SWAP (CORE_ID_PRO ^ CORE_ID_APP)
|
|
|
|
|
|
|
|
|
|
//Define the mux routines for use with muxes in internal RAM
|
|
#define PORTMUX_AQUIRE_MUX_FN_NAME vPortCPUAcquireMutexIntsDisabledInternal
|
|
#define PORTMUX_RELEASE_MUX_FN_NAME vPortCPUReleaseMutexIntsDisabledInternal
|
|
#define PORTMUX_COMPARE_SET_FN_NAME uxPortCompareSet
|
|
#include "portmux_impl.inc.h"
|
|
#undef PORTMUX_AQUIRE_MUX_FN_NAME
|
|
#undef PORTMUX_RELEASE_MUX_FN_NAME
|
|
#undef PORTMUX_COMPARE_SET_FN_NAME
|
|
|
|
|
|
#if defined(CONFIG_SPIRAM_SUPPORT)
|
|
|
|
#define PORTMUX_AQUIRE_MUX_FN_NAME vPortCPUAcquireMutexIntsDisabledExtram
|
|
#define PORTMUX_RELEASE_MUX_FN_NAME vPortCPUReleaseMutexIntsDisabledExtram
|
|
#define PORTMUX_COMPARE_SET_FN_NAME uxPortCompareSetExtram
|
|
#include "portmux_impl.inc.h"
|
|
#undef PORTMUX_AQUIRE_MUX_FN_NAME
|
|
#undef PORTMUX_RELEASE_MUX_FN_NAME
|
|
#undef PORTMUX_COMPARE_SET_FN_NAME
|
|
|
|
#endif
|
|
|
|
|
|
#ifdef CONFIG_FREERTOS_PORTMUX_DEBUG
|
|
#define PORTMUX_AQUIRE_MUX_FN_ARGS portMUX_TYPE *mux, int timeout_cycles, const char *fnName, int line
|
|
#define PORTMUX_RELEASE_MUX_FN_ARGS portMUX_TYPE *mux, const char *fnName, int line
|
|
#define PORTMUX_AQUIRE_MUX_FN_CALL_ARGS(x) x, timeout_cycles, fnName, line
|
|
#define PORTMUX_RELEASE_MUX_FN_CALL_ARGS(x) x, fnName, line
|
|
#else
|
|
#define PORTMUX_AQUIRE_MUX_FN_ARGS portMUX_TYPE *mux, int timeout_cycles
|
|
#define PORTMUX_RELEASE_MUX_FN_ARGS portMUX_TYPE *mux
|
|
#define PORTMUX_AQUIRE_MUX_FN_CALL_ARGS(x) x, timeout_cycles
|
|
#define PORTMUX_RELEASE_MUX_FN_CALL_ARGS(x) x
|
|
#endif
|
|
|
|
|
|
static inline bool __attribute__((always_inline)) vPortCPUAcquireMutexIntsDisabled(PORTMUX_AQUIRE_MUX_FN_ARGS) {
|
|
#if defined(CONFIG_SPIRAM_SUPPORT)
|
|
if (esp_ptr_external_ram(mux)) {
|
|
return vPortCPUAcquireMutexIntsDisabledExtram(PORTMUX_AQUIRE_MUX_FN_CALL_ARGS(mux));
|
|
}
|
|
#endif
|
|
return vPortCPUAcquireMutexIntsDisabledInternal(PORTMUX_AQUIRE_MUX_FN_CALL_ARGS(mux));
|
|
}
|
|
|
|
|
|
static inline void vPortCPUReleaseMutexIntsDisabled(PORTMUX_RELEASE_MUX_FN_ARGS) {
|
|
#if defined(CONFIG_SPIRAM_SUPPORT)
|
|
if (esp_ptr_external_ram(mux)) {
|
|
vPortCPUReleaseMutexIntsDisabledExtram(PORTMUX_RELEASE_MUX_FN_CALL_ARGS(mux));
|
|
return;
|
|
}
|
|
#endif
|
|
vPortCPUReleaseMutexIntsDisabledInternal(PORTMUX_RELEASE_MUX_FN_CALL_ARGS(mux));
|
|
}
|
|
|