alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-09-20 10:46:02 -04:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

spi_flash: rename spi_flash_os_func_app: spi_start, spi_end

Browse Source 
spi_start -> s_acquire_spi_bus_lock
spi_end -> s_release_spi_bus_lock
This commit is contained in:
Armando 2023-06-26 19:37:06 +08:00
parent f142415475
commit a7f00f503a
8 changed files with 61 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
components/spi_flash/spi_flash_os_func_app.c
View File

@ -71,7 +71,7 @@ IRAM_ATTR static void cache_disable(void* arg)
}
#endif //#if !SPI_FLASH_CACHE_NO_DISABLE
static IRAM_ATTR esp_err_t spi_start(void *arg)
static IRAM_ATTR esp_err_t acquire_spi_bus_lock(void *arg)
{
spi_bus_lock_dev_handle_t dev_lock = ((app_func_arg_t *)arg)->dev_lock;
@ -84,19 +84,19 @@ static IRAM_ATTR esp_err_t spi_start(void *arg)
return ESP_OK;
}
static IRAM_ATTR esp_err_t spi_end(void *arg)
static IRAM_ATTR esp_err_t release_spi_bus_lock(void *arg)
{
return spi_bus_lock_acquire_end(((app_func_arg_t *)arg)->dev_lock);
}
static IRAM_ATTR esp_err_t spi23_start(void *arg){
esp_err_t ret = spi_start(arg);
esp_err_t ret = acquire_spi_bus_lock(arg);
on_spi_acquired((app_func_arg_t*)arg);
return ret;
}
static IRAM_ATTR esp_err_t spi23_end(void *arg){
esp_err_t ret = spi_end(arg);
esp_err_t ret = release_spi_bus_lock(arg);
on_spi_released((app_func_arg_t*)arg);
return ret;
}
@ -114,7 +114,7 @@ static IRAM_ATTR esp_err_t spi1_start(void *arg)
*/
#if CONFIG_SPI_FLASH_SHARE_SPI1_BUS
//use the lock to disable the cache and interrupts before using the SPI bus
ret = spi_start(arg);
ret = acquire_spi_bus_lock(arg);
#elif SPI_FLASH_CACHE_NO_DISABLE
_lock_acquire(&s_spi1_flash_mutex);
#else
@ -133,7 +133,7 @@ static IRAM_ATTR esp_err_t spi1_end(void *arg)
* There are three ways for ESP Flash API lock, see `spi1_start`
*/
#if CONFIG_SPI_FLASH_SHARE_SPI1_BUS
ret = spi_end(arg);
ret = release_spi_bus_lock(arg);
#elif SPI_FLASH_CACHE_NO_DISABLE
_lock_release(&s_spi1_flash_mutex);
#else

5
components/spi_flash/test_apps/components/test_flash_utils/CMakeLists.txt Normal file
View File

@ -0,0 +1,5 @@
set(srcs "test_flash_utils.c")
idf_component_register(SRCS ${srcs}
INCLUDE_DIRS include
REQUIRES esp_partition)

27
components/spi_flash/test_apps/components/test_flash_utils/include/test_flash_utils.h Normal file
View File

@ -0,0 +1,27 @@
/*
* SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
#pragma once
#include <esp_types.h>
#include "esp_partition.h"
#ifdef __cplusplus
extern "C" {
#endif
/**
* Return the 'flash_test' custom data partition
* defined in the custom partition table.
*
* @return partition handle
*/
const esp_partition_t *get_test_flash_partition(void);
#ifdef __cplusplus
}
#endif

17
components/spi_flash/test_apps/components/test_flash_utils/test_flash_utils.c Normal file
View File

@ -0,0 +1,17 @@
/*
* SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
#include <string.h>
#include "test_flash_utils.h"
const esp_partition_t *get_test_flash_partition(void)
{
/* This finds "flash_test" partition defined in custom partitions.csv */
const esp_partition_t *result = esp_partition_find_first(ESP_PARTITION_TYPE_DATA,
ESP_PARTITION_SUBTYPE_ANY, "flash_test");
assert(result != NULL); /* means partition table set wrong */
return result;
}

2
components/spi_flash/test_apps/esp_flash_stress/CMakeLists.txt
View File

@ -1,7 +1,7 @@
# This is the project CMakeLists.txt file for the test subproject
cmake_minimum_required(VERSION 3.16)
set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/unit-test-app/components")
set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/components/spi_flash/test_apps/components")
include($ENV{IDF_PATH}/tools/cmake/project.cmake)

1
components/spi_flash/test_apps/esp_flash_stress/main/CMakeLists.txt
View File

@ -4,4 +4,5 @@ set(srcs "test_app_main.c"
# In order for the cases defined by `TEST_CASE` to be linked into the final elf,
# the component can be registered as WHOLE_ARCHIVE
idf_component_register(SRCS ${srcs}
PRIV_REQUIRES test_flash_utils spi_flash unity
WHOLE_ARCHIVE)

2
components/spi_flash/test_apps/esp_flash_stress/main/test_app_main.c
View File

@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2015-2023 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/

17
components/spi_flash/test_apps/esp_flash_stress/main/test_esp_flash_stress.c
View File

@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2021-2023 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
@ -15,9 +15,9 @@
#include "esp_check.h"
#include "esp_attr.h"
#include "esp_flash.h"
#include "esp_partition.h"
#include "test_flash_utils.h"
portMUX_TYPE s_test_spinlock = portMUX_INITIALIZER_UNLOCKED;
portMUX_TYPE static s_test_spinlock = portMUX_INITIALIZER_UNLOCKED;
/*---------------------------------------------------------------
ESP Flash API Concurrency Pressure Test
@ -33,17 +33,6 @@ typedef struct {
const esp_partition_t *part;
} test_concurrency_ctx_t;
static const esp_partition_t *get_test_flash_partition(void)
{
/* This finds "flash_test" partition defined in partition_table_unit_test_app.csv */
const esp_partition_t *result = esp_partition_find_first(ESP_PARTITION_TYPE_DATA,
ESP_PARTITION_SUBTYPE_ANY, "flash_test");
assert(result != NULL); /* means partition table set wrong */
return result;
}
static void s_test_flash_ops_task(void *arg)
{
test_concurrency_ctx_t *test_ctx = (test_concurrency_ctx_t *)arg;