sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

xtensa/esp32: Fix remaining SEPARATE typo

Browse Source
This commit is contained in:
Alan C. Assis 2020-11-05 17:35:01 -03:00 committed by Abdelatif Guettouche
parent 6c37d9ff80
commit d11f02d772
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/xtensa/src/common/xtensa_initialize.c
View File

@ -150,7 +150,7 @@ void up_initialize(void)
/* Initialize the internal heap */ /* Initialize the internal heap */
#ifdef CONFIG_XTENSA_USE_SEPERATE_IMEM #ifdef CONFIG_XTENSA_USE_SEPARATE_IMEM
xtensa_imm_initialize(); xtensa_imm_initialize();
#endif #endif

2
arch/xtensa/src/common/xtensa_mm.h
View File

@ -34,7 +34,7 @@
* Pre-processor Macros * 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_MALLOC(s) xtensa_imm_malloc(s)
# define UMM_MEMALIGN(a,s) xtensa_imm_memalign(a,s) # define UMM_MEMALIGN(a,s) xtensa_imm_memalign(a,s)
# define UMM_FREE(p) xtensa_imm_free(p) # define UMM_FREE(p) xtensa_imm_free(p)

2
arch/xtensa/src/esp32/Make.defs
View File

@ -99,7 +99,7 @@ endif
CHIP_CSRCS += esp32_rtc.c CHIP_CSRCS += esp32_rtc.c
ifeq ($(CONFIG_XTENSA_USE_SEPERATE_IMEM),y) ifeq ($(CONFIG_XTENSA_USE_SEPARATE_IMEM),y)
CHIP_CSRCS += esp32_imm.c CHIP_CSRCS += esp32_imm.c
endif endif

10
arch/xtensa/src/esp32/esp32_spi.c
View File

@ -869,14 +869,14 @@ static void esp32_spi_dma_exchange(FAR struct esp32_spi_priv_s *priv,
uint8_t *rp; uint8_t *rp;
uint32_t n; uint32_t n;
uint32_t regval; uint32_t regval;
#ifdef CONFIG_XTENSA_USE_SEPERATE_IMEM #ifdef CONFIG_XTENSA_USE_SEPARATE_IMEM
uint8_t *alloctp; uint8_t *alloctp;
uint8_t *allocrp; uint8_t *allocrp;
#endif #endif
/* If the buffer comes from PSRAM, allocate a new one from DRAM */ /* 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)) if (esp32_ptr_extram(txbuffer))
{ {
alloctp = xtensa_imm_malloc(total); 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; tp = (uint8_t *)txbuffer;
} }
#ifdef CONFIG_XTENSA_USE_SEPERATE_IMEM #ifdef CONFIG_XTENSA_USE_SEPARATE_IMEM
if (esp32_ptr_extram(rxbuffer)) if (esp32_ptr_extram(rxbuffer))
{ {
allocrp = xtensa_imm_malloc(total); allocrp = xtensa_imm_malloc(total);
@ -962,7 +962,7 @@ static void esp32_spi_dma_exchange(FAR struct esp32_spi_priv_s *priv,
rp += n; rp += n;
} }
#ifdef CONFIG_XTENSA_USE_SEPERATE_IMEM #ifdef CONFIG_XTENSA_USE_SEPARATE_IMEM
if (esp32_ptr_extram(rxbuffer)) if (esp32_ptr_extram(rxbuffer))
{ {
memcpy(rxbuffer, allocrp, total); memcpy(rxbuffer, allocrp, total);
@ -970,7 +970,7 @@ static void esp32_spi_dma_exchange(FAR struct esp32_spi_priv_s *priv,
} }
#endif #endif
#ifdef CONFIG_XTENSA_USE_SEPERATE_IMEM #ifdef CONFIG_XTENSA_USE_SEPARATE_IMEM
if (esp32_ptr_extram(txbuffer)) if (esp32_ptr_extram(txbuffer))
{ {
xtensa_imm_free(alloctp); xtensa_imm_free(alloctp);

8
arch/xtensa/src/esp32/esp32_spiflash.c
View File

@ -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); finfo("esp32_read(%p, 0x%x, %d, %p)\n", dev, offset, nbytes, buffer);
#endif #endif
#ifdef CONFIG_XTENSA_USE_SEPERATE_IMEM #ifdef CONFIG_XTENSA_USE_SEPARATE_IMEM
if (esp32_ptr_extram(buffer)) if (esp32_ptr_extram(buffer))
{ {
tmpbuff = xtensa_imm_malloc(nbytes); tmpbuff = xtensa_imm_malloc(nbytes);
@ -1085,7 +1085,7 @@ static ssize_t esp32_read(FAR struct mtd_dev_s *dev, off_t offset,
#endif #endif
error_with_buffer: error_with_buffer:
#ifdef CONFIG_XTENSA_USE_SEPERATE_IMEM #ifdef CONFIG_XTENSA_USE_SEPARATE_IMEM
if (esp32_ptr_extram(buffer)) if (esp32_ptr_extram(buffer))
{ {
memcpy(buffer, tmpbuff, (ret == OK) ? nbytes : 0); 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; return -EINVAL;
} }
#ifdef CONFIG_XTENSA_USE_SEPERATE_IMEM #ifdef CONFIG_XTENSA_USE_SEPARATE_IMEM
if (esp32_ptr_extram(buffer)) if (esp32_ptr_extram(buffer))
{ {
tmpbuff = xtensa_imm_malloc(nbytes); tmpbuff = xtensa_imm_malloc(nbytes);
@ -1210,7 +1210,7 @@ static ssize_t esp32_write(FAR struct mtd_dev_s *dev, off_t offset,
#endif #endif
error_with_buffer: error_with_buffer:
#ifdef CONFIG_XTENSA_USE_SEPERATE_IMEM #ifdef CONFIG_XTENSA_USE_SEPARATE_IMEM
if (esp32_ptr_extram(buffer)) if (esp32_ptr_extram(buffer))
{ {
xtensa_imm_free(tmpbuff); xtensa_imm_free(tmpbuff);