You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2020/11/22 15:43:14 UTC

[incubator-nuttx] 01/02: esp32_himem: Fix issue that was preventing to map all free memory

This is an automated email from the ASF dual-hosted git repository.

xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git

commit 3352d3863cc208101983002561e1f90035bebcdf
Author: Alan C. Assis <ac...@gmail.com>
AuthorDate: Fri Nov 20 20:06:02 2020 -0300

    esp32_himem: Fix issue that was preventing to map all free memory
---
 arch/xtensa/src/esp32/esp32_himem.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/xtensa/src/esp32/esp32_himem.c b/arch/xtensa/src/esp32/esp32_himem.c
index 8b2f655..c3480f7 100644
--- a/arch/xtensa/src/esp32/esp32_himem.c
+++ b/arch/xtensa/src/esp32/esp32_himem.c
@@ -267,8 +267,8 @@ int esp_himem_init(void)
 
   /* Allocate data structures */
 
-  g_ram_descriptor = kmm_malloc(sizeof(ramblock_t) * g_ramblockcnt);
-  g_range_descriptor = kmm_malloc(sizeof(rangeblock_t) * \
+  g_ram_descriptor = kmm_zalloc(sizeof(ramblock_t) * g_ramblockcnt);
+  g_range_descriptor = kmm_zalloc(sizeof(rangeblock_t) * \
                               SPIRAM_BANKSWITCH_RESERVE);
 
   if (g_ram_descriptor == NULL || g_range_descriptor == NULL)
@@ -320,7 +320,7 @@ static bool allocate_blocks(int count, uint16_t *blocks_out)
       for (i = 0; i < count; i++)
         {
           g_ram_descriptor[blocks_out[i]].is_alloced = true;
-          g_ram_descriptor[blocks_out[i]].is_mapped  = false;
+          assert(g_ram_descriptor[blocks_out[i]].is_mapped  == false);
         }
 
       return true;