summaryrefslogtreecommitdiff
path: root/ports/esp32/modules/flashbdev.py
diff options
context:
space:
mode:
authorDamien George <damien.p.george@gmail.com>2019-08-20 16:52:36 +1000
committerDamien George <damien.p.george@gmail.com>2019-09-10 15:14:13 +1000
commit31de44775c0ed2fa451e578dd0594d13f11459e9 (patch)
treeaaac4aa1c2df9678db7b01be0947924bc5f36aa0 /ports/esp32/modules/flashbdev.py
parentf9d142523c48af1cb9c83d1dfbc320cb9c2000c6 (diff)
esp32: Add VFS FAT partition to partitions.csv and mount it as the FS.
This patch uses the newly-added esp32.Partition class to replace the existing FlashBdev class. Partition objects implement the block protocol so can be directly mounted via uos.mount(). This has the following benefits: - allows the filesystem partition location and size to be specified in partitions.csv, and overridden by a particular board - very easily allows to have multiple filesystems by simply adding extra entries to partitions.csv - improves efficiency/speed of filesystem operations because the block device is implemented fully in C - opens the possibility to have encrypted flash storage (since Partitions can be encrypted) Note that this patch is fully backwards compatible: existing filesystems remain untouched and work with this new code.
Diffstat (limited to 'ports/esp32/modules/flashbdev.py')
-rw-r--r--ports/esp32/modules/flashbdev.py36
1 files changed, 3 insertions, 33 deletions
diff --git a/ports/esp32/modules/flashbdev.py b/ports/esp32/modules/flashbdev.py
index 935f5342f..45b8686c5 100644
--- a/ports/esp32/modules/flashbdev.py
+++ b/ports/esp32/modules/flashbdev.py
@@ -1,34 +1,4 @@
-import esp
+from esp32 import Partition
-class FlashBdev:
-
- SEC_SIZE = 4096
- START_SEC = esp.flash_user_start() // SEC_SIZE
-
- def __init__(self, blocks):
- self.blocks = blocks
-
- def readblocks(self, n, buf):
- #print("readblocks(%s, %x(%d))" % (n, id(buf), len(buf)))
- esp.flash_read((n + self.START_SEC) * self.SEC_SIZE, buf)
-
- def writeblocks(self, n, buf):
- #print("writeblocks(%s, %x(%d))" % (n, id(buf), len(buf)))
- #assert len(buf) <= self.SEC_SIZE, len(buf)
- esp.flash_erase(n + self.START_SEC)
- esp.flash_write((n + self.START_SEC) * self.SEC_SIZE, buf)
-
- def ioctl(self, op, arg):
- #print("ioctl(%d, %r)" % (op, arg))
- if op == 4: # BP_IOCTL_SEC_COUNT
- return self.blocks
- if op == 5: # BP_IOCTL_SEC_SIZE
- return self.SEC_SIZE
-
-size = esp.flash_size()
-if size < 1024*1024:
- # flash too small for a filesystem
- bdev = None
-else:
- # for now we use a fixed size for the filesystem
- bdev = FlashBdev(2048 * 1024 // FlashBdev.SEC_SIZE)
+bdev = Partition.find(Partition.TYPE_DATA, label='vfs')
+bdev = bdev[0] if bdev else None