refactor(esp_psram): reformat code with astyle_py

This commit is contained in:
Armando
2023-09-28 15:25:42 +08:00
parent b774bd1457
commit 2144eedb66
3 changed files with 6 additions and 17 deletions

View File

@@ -4,7 +4,6 @@
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
/*---------------------------------------------------------------------------------------------------- /*----------------------------------------------------------------------------------------------------
* Abstraction layer for PSRAM. PSRAM device related registers and MMU/Cache related code shouls be * Abstraction layer for PSRAM. PSRAM device related registers and MMU/Cache related code shouls be
* abstracted to lower layers. * abstracted to lower layers.
@@ -35,7 +34,6 @@
#include "esp_private/esp_cache_esp32_private.h" #include "esp_private/esp_cache_esp32_private.h"
#endif #endif
/** /**
* Two types of PSRAM memory regions for now: * Two types of PSRAM memory regions for now:
* - 8bit aligned * - 8bit aligned
@@ -84,12 +82,12 @@ typedef struct {
static psram_ctx_t s_psram_ctx; static psram_ctx_t s_psram_ctx;
static const char* TAG = "esp_psram"; static const char* TAG = "esp_psram";
#if CONFIG_IDF_TARGET_ESP32 #if CONFIG_IDF_TARGET_ESP32
//If no function in esp_himem.c is used, this function will be linked into the //If no function in esp_himem.c is used, this function will be linked into the
//binary instead of the one in esp_himem.c, automatically making sure no memory //binary instead of the one in esp_himem.c, automatically making sure no memory
//is reserved if no himem function is used. //is reserved if no himem function is used.
size_t __attribute__((weak)) esp_himem_reserved_area_size(void) { size_t __attribute__((weak)) esp_himem_reserved_area_size(void)
{
return 0; return 0;
} }
@@ -105,7 +103,6 @@ static void IRAM_ATTR s_mapping(int v_start, int size)
} }
#endif //CONFIG_IDF_TARGET_ESP32 #endif //CONFIG_IDF_TARGET_ESP32
esp_err_t esp_psram_init(void) esp_err_t esp_psram_init(void)
{ {
if (s_psram_ctx.is_initialised) { if (s_psram_ctx.is_initialised) {
@@ -301,7 +298,6 @@ esp_err_t esp_psram_init(void)
return ESP_OK; return ESP_OK;
} }
esp_err_t esp_psram_extram_add_to_heap_allocator(void) esp_err_t esp_psram_extram_add_to_heap_allocator(void)
{ {
esp_err_t ret = ESP_FAIL; esp_err_t ret = ESP_FAIL;
@@ -331,7 +327,6 @@ esp_err_t esp_psram_extram_add_to_heap_allocator(void)
return ESP_OK; return ESP_OK;
} }
bool IRAM_ATTR esp_psram_check_ptr_addr(const void *p) bool IRAM_ATTR esp_psram_check_ptr_addr(const void *p)
{ {
if (!s_psram_ctx.is_initialised) { if (!s_psram_ctx.is_initialised) {
@@ -342,7 +337,6 @@ bool IRAM_ATTR esp_psram_check_ptr_addr(const void *p)
((intptr_t)p >= s_psram_ctx.mapped_regions[PSRAM_MEM_32BIT_ALIGNED].vaddr_start && (intptr_t)p < s_psram_ctx.mapped_regions[PSRAM_MEM_32BIT_ALIGNED].vaddr_end); ((intptr_t)p >= s_psram_ctx.mapped_regions[PSRAM_MEM_32BIT_ALIGNED].vaddr_start && (intptr_t)p < s_psram_ctx.mapped_regions[PSRAM_MEM_32BIT_ALIGNED].vaddr_end);
} }
esp_err_t esp_psram_extram_reserve_dma_pool(size_t size) esp_err_t esp_psram_extram_reserve_dma_pool(size_t size)
{ {
if (size == 0) { if (size == 0) {

View File

@@ -43,7 +43,6 @@ static uint32_t page0_mapped = 0;
static uint32_t page0_page = INVALID_PHY_PAGE; static uint32_t page0_page = INVALID_PHY_PAGE;
#endif //#if CONFIG_SPIRAM_FETCH_INSTRUCTIONS || CONFIG_SPIRAM_RODATA #endif //#if CONFIG_SPIRAM_FETCH_INSTRUCTIONS || CONFIG_SPIRAM_RODATA
#if CONFIG_SPIRAM_FETCH_INSTRUCTIONS #if CONFIG_SPIRAM_FETCH_INSTRUCTIONS
esp_err_t mmu_config_psram_text_segment(uint32_t start_page, uint32_t psram_size, uint32_t *out_page) esp_err_t mmu_config_psram_text_segment(uint32_t start_page, uint32_t psram_size, uint32_t *out_page)
{ {
@@ -87,7 +86,6 @@ esp_err_t mmu_config_psram_text_segment(uint32_t start_page, uint32_t psram_size
} }
#endif //#if CONFIG_SPIRAM_FETCH_INSTRUCTIONS #endif //#if CONFIG_SPIRAM_FETCH_INSTRUCTIONS
#if CONFIG_SPIRAM_RODATA #if CONFIG_SPIRAM_RODATA
esp_err_t mmu_config_psram_rodata_segment(uint32_t start_page, uint32_t psram_size, uint32_t *out_page) esp_err_t mmu_config_psram_rodata_segment(uint32_t start_page, uint32_t psram_size, uint32_t *out_page)
{ {
@@ -135,7 +133,6 @@ esp_err_t mmu_config_psram_rodata_segment(uint32_t start_page, uint32_t psram_si
} }
#endif //#if CONFIG_SPIRAM_RODATA #endif //#if CONFIG_SPIRAM_RODATA
/*---------------------------------------------------------------------------- /*----------------------------------------------------------------------------
Part 2 APIs (See @Backgrounds on top of this file) Part 2 APIs (See @Backgrounds on top of this file)
-------------------------------------------------------------------------------*/ -------------------------------------------------------------------------------*/
@@ -196,7 +193,6 @@ uint32_t instruction_flash_end_page_get(void)
} }
#endif //CONFIG_SPIRAM_FETCH_INSTRUCTIONS #endif //CONFIG_SPIRAM_FETCH_INSTRUCTIONS
#if CONFIG_SPIRAM_RODATA #if CONFIG_SPIRAM_RODATA
//------------------------------------Copy Flash .rodata to PSRAM-------------------------------------// //------------------------------------Copy Flash .rodata to PSRAM-------------------------------------//
static uint32_t rodata_in_spiram; static uint32_t rodata_in_spiram;

View File

@@ -71,7 +71,6 @@ components_not_formatted_temporary:
- "/components/esp_partition/" - "/components/esp_partition/"
- "/components/esp_phy/" - "/components/esp_phy/"
- "/components/esp_pm/" - "/components/esp_pm/"
- "/components/esp_psram/"
- "/components/esp_ringbuf/" - "/components/esp_ringbuf/"
- "/components/esp_rom/" - "/components/esp_rom/"
- "/components/esp_system/" - "/components/esp_system/"