esp32: Enable VfsMap.

dpgeorge · dpgeorge · commit 19b74d4e3774 · 2022-03-04T13:52:36.000+11:00
diff --git a/ports/esp32/esp32_partition.c b/ports/esp32/esp32_partition.c
@@ -270,6 +270,7 @@ STATIC mp_obj_t esp32_partition_mmap(mp_obj_t self_in) {
     esp32_partition_obj_t *self = MP_OBJ_TO_PTR(self_in);
     const void *ptr;
     spi_flash_mmap_handle_t handle;
+    // TODO need to spi_flash_unmmap(handle) on soft reset
     check_esp_err(esp_partition_mmap(self->part, 0, self->part->size, SPI_FLASH_MMAP_DATA, &ptr, &handle));
     return mp_obj_new_memoryview('B', self->part->size, (void *)ptr);
 }
diff --git a/ports/esp32/modules/_boot.py b/ports/esp32/modules/_boot.py
@@ -1,7 +1,12 @@
 import gc
 import uos
+from esp32 import Partition
 from flashbdev import bdev
 
+if mapfs := Partition.find(Partition.TYPE_DATA, label="mapfs"):
+    uos.mount(uos.VfsMap(mapfs[0].mmap(), mapfs[0]), "/mapfs")
+del mapfs
+
 try:
     if bdev:
         uos.mount(bdev, "/")
diff --git a/ports/esp32/moduos.c b/ports/esp32/moduos.c
@@ -39,6 +39,7 @@
 #include "extmod/vfs.h"
 #include "extmod/vfs_fat.h"
 #include "extmod/vfs_lfs.h"
+#include "extmod/vfs_map.h"
 #include "genhdr/mpversion.h"
 
 extern const mp_obj_type_t mp_fat_vfs_type;
@@ -130,6 +131,9 @@ STATIC const mp_rom_map_elem_t os_module_globals_table[] = {
     #if MICROPY_VFS_LFS2
     { MP_ROM_QSTR(MP_QSTR_VfsLfs2), MP_ROM_PTR(&mp_type_vfs_lfs2) },
     #endif
+    #if MICROPY_VFS_MAP
+    { MP_ROM_QSTR(MP_QSTR_VfsMap), MP_ROM_PTR(&mp_type_vfs_map) },
+    #endif
     #endif
 };
 
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
@@ -49,6 +49,7 @@
 #define MICROPY_USE_INTERNAL_PRINTF         (0) // ESP32 SDK requires its own printf
 #define MICROPY_SCHEDULER_DEPTH             (8)
 #define MICROPY_VFS                         (1)
+#define MICROPY_VFS_MAP                     (1)
 
 // control over Python builtins
 #define MICROPY_PY_STR_BYTES_CMP_WARN       (1)

Original file line number	Diff line number	Diff line change
`@@ -270,6 +270,7 @@ STATIC mp_obj_t esp32_partition_mmap(mp_obj_t self_in) {`
`270`	`270`	`esp32_partition_obj_t *self = MP_OBJ_TO_PTR(self_in);`
`271`	`271`	`const void *ptr;`
`272`	`272`	`spi_flash_mmap_handle_t handle;`
	`273`	`+ // TODO need to spi_flash_unmmap(handle) on soft reset`
`273`	`274`	`check_esp_err(esp_partition_mmap(self->part, 0, self->part->size, SPI_FLASH_MMAP_DATA, &ptr, &handle));`
`274`	`275`	`return mp_obj_new_memoryview('B', self->part->size, (void *)ptr);`
`275`	`276`	`}`