From b7a9312be61b982951c2ed516f071ddcdee8a2da Mon Sep 17 00:00:00 2001 From: armink Date: Sat, 13 Jun 2020 12:07:20 +0800 Subject: [PATCH] [SFUD] Update rt_sfud_flash_probe_ex API --- components/drivers/spi/spi_flash_sfud.c | 6 +++--- components/drivers/spi/spi_flash_sfud.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/components/drivers/spi/spi_flash_sfud.c b/components/drivers/spi/spi_flash_sfud.c index 97b5960b7d..9c0b65e55c 100644 --- a/components/drivers/spi/spi_flash_sfud.c +++ b/components/drivers/spi/spi_flash_sfud.c @@ -295,7 +295,7 @@ const static struct rt_device_ops flash_device_ops = * * @return probed SPI flash device, probe failed will return RT_NULL */ -rt_spi_flash_device_t rt_sfud_flash_probe_ext(const char *spi_flash_dev_name, const char *spi_dev_name, +rt_spi_flash_device_t rt_sfud_flash_probe_ex(const char *spi_flash_dev_name, const char *spi_dev_name, struct rt_spi_configuration *spi_cfg, struct rt_qspi_configuration *qspi_cfg) { rt_spi_flash_device_t rtt_dev = RT_NULL; @@ -427,11 +427,11 @@ rt_spi_flash_device_t rt_sfud_flash_probe(const char *spi_flash_dev_name, const { struct rt_spi_configuration cfg = RT_SFUD_DEFAULT_SPI_CFG; #ifndef SFUD_USING_QSPI - return rt_sfud_flash_probe_ext(spi_flash_dev_name, spi_dev_name, &cfg, RT_NULL); + return rt_sfud_flash_probe_ex(spi_flash_dev_name, spi_dev_name, &cfg, RT_NULL); #else struct rt_qspi_configuration qspi_cfg = RT_SFUD_DEFAULT_QSPI_CFG; - return rt_sfud_flash_probe_ext(spi_flash_dev_name, spi_dev_name, &cfg, &qspi_cfg); + return rt_sfud_flash_probe_ex(spi_flash_dev_name, spi_dev_name, &cfg, &qspi_cfg); #endif } diff --git a/components/drivers/spi/spi_flash_sfud.h b/components/drivers/spi/spi_flash_sfud.h index 4804fc0b56..932b7f879c 100644 --- a/components/drivers/spi/spi_flash_sfud.h +++ b/components/drivers/spi/spi_flash_sfud.h @@ -36,7 +36,7 @@ rt_spi_flash_device_t rt_sfud_flash_probe(const char *spi_flash_dev_name, const * * @return probed SPI flash device, probe failed will return RT_NULL */ -rt_spi_flash_device_t rt_sfud_flash_probe_ext(const char *spi_flash_dev_name, const char *spi_dev_name, +rt_spi_flash_device_t rt_sfud_flash_probe_ex(const char *spi_flash_dev_name, const char *spi_dev_name, struct rt_spi_configuration *spi_cfg, struct rt_qspi_configuration *qspi_cfg); /**