You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by ag...@apache.org on 2020/11/06 15:20:00 UTC
[incubator-nuttx] 02/03: xtensa/esp32: Fix remaining SEPARATE typo
This is an automated email from the ASF dual-hosted git repository.
aguettouche pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit d11f02d772e6270fbc8a9d6ac671da88f3aec931
Author: Alan C. Assis <ac...@gmail.com>
AuthorDate: Thu Nov 5 17:35:01 2020 -0300
xtensa/esp32: Fix remaining SEPARATE typo
---
arch/xtensa/src/common/xtensa_initialize.c | 2 +-
arch/xtensa/src/common/xtensa_mm.h | 2 +-
arch/xtensa/src/esp32/Make.defs | 2 +-
arch/xtensa/src/esp32/esp32_spi.c | 10 +++++-----
arch/xtensa/src/esp32/esp32_spiflash.c | 8 ++++----
5 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/arch/xtensa/src/common/xtensa_initialize.c b/arch/xtensa/src/common/xtensa_initialize.c
index 9a5b8c6..5bf57ad 100644
--- a/arch/xtensa/src/common/xtensa_initialize.c
+++ b/arch/xtensa/src/common/xtensa_initialize.c
@@ -150,7 +150,7 @@ void up_initialize(void)
/* Initialize the internal heap */
-#ifdef CONFIG_XTENSA_USE_SEPERATE_IMEM
+#ifdef CONFIG_XTENSA_USE_SEPARATE_IMEM
xtensa_imm_initialize();
#endif
diff --git a/arch/xtensa/src/common/xtensa_mm.h b/arch/xtensa/src/common/xtensa_mm.h
index 81a60cb..bfb75b5 100644
--- a/arch/xtensa/src/common/xtensa_mm.h
+++ b/arch/xtensa/src/common/xtensa_mm.h
@@ -34,7 +34,7 @@
* Pre-processor Macros
****************************************************************************/
-#ifdef CONFIG_XTENSA_USE_SEPERATE_IMEM
+#ifdef CONFIG_XTENSA_USE_SEPARATE_IMEM
# define UMM_MALLOC(s) xtensa_imm_malloc(s)
# define UMM_MEMALIGN(a,s) xtensa_imm_memalign(a,s)
# define UMM_FREE(p) xtensa_imm_free(p)
diff --git a/arch/xtensa/src/esp32/Make.defs b/arch/xtensa/src/esp32/Make.defs
index f214634..fd34a7c 100644
--- a/arch/xtensa/src/esp32/Make.defs
+++ b/arch/xtensa/src/esp32/Make.defs
@@ -99,7 +99,7 @@ endif
CHIP_CSRCS += esp32_rtc.c
-ifeq ($(CONFIG_XTENSA_USE_SEPERATE_IMEM),y)
+ifeq ($(CONFIG_XTENSA_USE_SEPARATE_IMEM),y)
CHIP_CSRCS += esp32_imm.c
endif
diff --git a/arch/xtensa/src/esp32/esp32_spi.c b/arch/xtensa/src/esp32/esp32_spi.c
index fa38e99..494f1d1 100644
--- a/arch/xtensa/src/esp32/esp32_spi.c
+++ b/arch/xtensa/src/esp32/esp32_spi.c
@@ -869,14 +869,14 @@ static void esp32_spi_dma_exchange(FAR struct esp32_spi_priv_s *priv,
uint8_t *rp;
uint32_t n;
uint32_t regval;
-#ifdef CONFIG_XTENSA_USE_SEPERATE_IMEM
+#ifdef CONFIG_XTENSA_USE_SEPARATE_IMEM
uint8_t *alloctp;
uint8_t *allocrp;
#endif
/* If the buffer comes from PSRAM, allocate a new one from DRAM */
-#ifdef CONFIG_XTENSA_USE_SEPERATE_IMEM
+#ifdef CONFIG_XTENSA_USE_SEPARATE_IMEM
if (esp32_ptr_extram(txbuffer))
{
alloctp = xtensa_imm_malloc(total);
@@ -890,7 +890,7 @@ static void esp32_spi_dma_exchange(FAR struct esp32_spi_priv_s *priv,
tp = (uint8_t *)txbuffer;
}
-#ifdef CONFIG_XTENSA_USE_SEPERATE_IMEM
+#ifdef CONFIG_XTENSA_USE_SEPARATE_IMEM
if (esp32_ptr_extram(rxbuffer))
{
allocrp = xtensa_imm_malloc(total);
@@ -962,7 +962,7 @@ static void esp32_spi_dma_exchange(FAR struct esp32_spi_priv_s *priv,
rp += n;
}
-#ifdef CONFIG_XTENSA_USE_SEPERATE_IMEM
+#ifdef CONFIG_XTENSA_USE_SEPARATE_IMEM
if (esp32_ptr_extram(rxbuffer))
{
memcpy(rxbuffer, allocrp, total);
@@ -970,7 +970,7 @@ static void esp32_spi_dma_exchange(FAR struct esp32_spi_priv_s *priv,
}
#endif
-#ifdef CONFIG_XTENSA_USE_SEPERATE_IMEM
+#ifdef CONFIG_XTENSA_USE_SEPARATE_IMEM
if (esp32_ptr_extram(txbuffer))
{
xtensa_imm_free(alloctp);
diff --git a/arch/xtensa/src/esp32/esp32_spiflash.c b/arch/xtensa/src/esp32/esp32_spiflash.c
index cd95afc..eb077c7 100644
--- a/arch/xtensa/src/esp32/esp32_spiflash.c
+++ b/arch/xtensa/src/esp32/esp32_spiflash.c
@@ -1051,7 +1051,7 @@ static ssize_t esp32_read(FAR struct mtd_dev_s *dev, off_t offset,
finfo("esp32_read(%p, 0x%x, %d, %p)\n", dev, offset, nbytes, buffer);
#endif
-#ifdef CONFIG_XTENSA_USE_SEPERATE_IMEM
+#ifdef CONFIG_XTENSA_USE_SEPARATE_IMEM
if (esp32_ptr_extram(buffer))
{
tmpbuff = xtensa_imm_malloc(nbytes);
@@ -1085,7 +1085,7 @@ static ssize_t esp32_read(FAR struct mtd_dev_s *dev, off_t offset,
#endif
error_with_buffer:
-#ifdef CONFIG_XTENSA_USE_SEPERATE_IMEM
+#ifdef CONFIG_XTENSA_USE_SEPARATE_IMEM
if (esp32_ptr_extram(buffer))
{
memcpy(buffer, tmpbuff, (ret == OK) ? nbytes : 0);
@@ -1170,7 +1170,7 @@ static ssize_t esp32_write(FAR struct mtd_dev_s *dev, off_t offset,
return -EINVAL;
}
-#ifdef CONFIG_XTENSA_USE_SEPERATE_IMEM
+#ifdef CONFIG_XTENSA_USE_SEPARATE_IMEM
if (esp32_ptr_extram(buffer))
{
tmpbuff = xtensa_imm_malloc(nbytes);
@@ -1210,7 +1210,7 @@ static ssize_t esp32_write(FAR struct mtd_dev_s *dev, off_t offset,
#endif
error_with_buffer:
-#ifdef CONFIG_XTENSA_USE_SEPERATE_IMEM
+#ifdef CONFIG_XTENSA_USE_SEPARATE_IMEM
if (esp32_ptr_extram(buffer))
{
xtensa_imm_free(tmpbuff);