From 7d28789544e4e35d8c931b41765dd64a53c506f1 Mon Sep 17 00:00:00 2001 From: Damien George Date: Wed, 22 Nov 2023 16:24:10 +1100 Subject: [PATCH] ports: Use vfs module instead of os. Signed-off-by: Damien George --- ports/esp32/modules/_boot.py | 6 +++--- ports/esp32/modules/inisetup.py | 14 +++++++------- ports/esp8266/boards/ESP8266_GENERIC/board.md | 2 +- ports/esp8266/modules/_boot.py | 4 ++-- ports/esp8266/modules/inisetup.py | 10 +++++----- ports/mimxrt/boards/TEENSY40/format.py | 8 ++++---- ports/mimxrt/modules/_boot.py | 13 +++++++------ ports/nrf/examples/mountsd.py | 4 ++-- ports/nrf/examples/seeed_tft.py | 4 ++-- ports/nrf/modules/scripts/_mkfs.py | 14 +++++++------- ports/rp2/modules/_boot.py | 12 ++++++------ ports/rp2/modules/_boot_fat.py | 13 ++++++------- ports/samd/modules/_boot.py | 12 ++++++------ 13 files changed, 58 insertions(+), 58 deletions(-) diff --git a/ports/esp32/modules/_boot.py b/ports/esp32/modules/_boot.py index 651fc7b10..96af581f3 100644 --- a/ports/esp32/modules/_boot.py +++ b/ports/esp32/modules/_boot.py @@ -1,13 +1,13 @@ import gc -import os +import vfs from flashbdev import bdev try: if bdev: - os.mount(bdev, "/") + vfs.mount(bdev, "/") except OSError: import inisetup - vfs = inisetup.setup() + inisetup.setup() gc.collect() diff --git a/ports/esp32/modules/inisetup.py b/ports/esp32/modules/inisetup.py index 2003864e9..4e9b462fb 100644 --- a/ports/esp32/modules/inisetup.py +++ b/ports/esp32/modules/inisetup.py @@ -1,4 +1,4 @@ -import os +import vfs from flashbdev import bdev @@ -38,12 +38,12 @@ def setup(): check_bootsec() print("Performing initial setup") if bdev.info()[4] == "vfs": - os.VfsLfs2.mkfs(bdev) - vfs = os.VfsLfs2(bdev) + vfs.VfsLfs2.mkfs(bdev) + fs = vfs.VfsLfs2(bdev) elif bdev.info()[4] == "ffat": - os.VfsFat.mkfs(bdev) - vfs = os.VfsFat(bdev) - os.mount(vfs, "/") + vfs.VfsFat.mkfs(bdev) + fs = vfs.VfsFat(bdev) + vfs.mount(fs, "/") with open("boot.py", "w") as f: f.write( """\ @@ -54,4 +54,4 @@ def setup(): #webrepl.start() """ ) - return vfs + return fs diff --git a/ports/esp8266/boards/ESP8266_GENERIC/board.md b/ports/esp8266/boards/ESP8266_GENERIC/board.md index 96fbab617..e8d63fcea 100644 --- a/ports/esp8266/boards/ESP8266_GENERIC/board.md +++ b/ports/esp8266/boards/ESP8266_GENERIC/board.md @@ -13,7 +13,7 @@ Note: v1.12-334 and newer (including v1.13) require an ESP8266 module with 2MiB of flash or more, and use littlefs as the filesystem by default. When upgrading from older firmware please backup your files first, and either erase all flash before upgrading, or after upgrading execute -`os.VfsLfs2.mkfs(bdev)`. +`vfs.VfsLfs2.mkfs(bdev)`. ### OTA builds Over-The-Air (OTA) builds of the ESP8266 firmware are also provided. diff --git a/ports/esp8266/modules/_boot.py b/ports/esp8266/modules/_boot.py index 06b372990..00a0d6550 100644 --- a/ports/esp8266/modules/_boot.py +++ b/ports/esp8266/modules/_boot.py @@ -1,12 +1,12 @@ import gc gc.threshold((gc.mem_free() + gc.mem_alloc()) // 4) -import os +import vfs from flashbdev import bdev if bdev: try: - os.mount(bdev, "/") + vfs.mount(bdev, "/") except: import inisetup diff --git a/ports/esp8266/modules/inisetup.py b/ports/esp8266/modules/inisetup.py index 3f3edcf6d..20bb28e80 100644 --- a/ports/esp8266/modules/inisetup.py +++ b/ports/esp8266/modules/inisetup.py @@ -1,4 +1,4 @@ -import os +import vfs import network from flashbdev import bdev @@ -36,7 +36,7 @@ def fs_corrupted(): """\ The filesystem starting at sector %d with size %d sectors looks corrupt. You may want to make a flash snapshot and try to recover it. Otherwise, -format it with os.VfsLfs2.mkfs(bdev), or completely erase the flash and +format it with vfs.VfsLfs2.mkfs(bdev), or completely erase the flash and reprogram MicroPython. """ % (bdev.start_sec, bdev.blocks) @@ -48,9 +48,9 @@ def setup(): check_bootsec() print("Performing initial setup") wifi() - os.VfsLfs2.mkfs(bdev) - vfs = os.VfsLfs2(bdev) - os.mount(vfs, "/") + vfs.VfsLfs2.mkfs(bdev) + fs = vfs.VfsLfs2(bdev) + vfs.mount(fs, "/") with open("boot.py", "w") as f: f.write( """\ diff --git a/ports/mimxrt/boards/TEENSY40/format.py b/ports/mimxrt/boards/TEENSY40/format.py index 75e5aa95c..1204ac240 100644 --- a/ports/mimxrt/boards/TEENSY40/format.py +++ b/ports/mimxrt/boards/TEENSY40/format.py @@ -1,11 +1,11 @@ # format.py # Re-create the file system -import os +import vfs import mimxrt bdev = mimxrt.Flash() -os.VfsLfs2.mkfs(bdev, progsize=256) -vfs = os.VfsLfs2(bdev, progsize=256) -os.mount(vfs, "/") +vfs.VfsLfs2.mkfs(bdev, progsize=256) +fs = vfs.VfsLfs2(bdev, progsize=256) +vfs.mount(fs, "/") diff --git a/ports/mimxrt/modules/_boot.py b/ports/mimxrt/modules/_boot.py index 56f12a4ce..fa3b78043 100644 --- a/ports/mimxrt/modules/_boot.py +++ b/ports/mimxrt/modules/_boot.py @@ -3,17 +3,18 @@ # Note: the flash requires the programming size to be aligned to 256 bytes. import os +import vfs import sys import mimxrt from machine import Pin bdev = mimxrt.Flash() try: - vfs = os.VfsLfs2(bdev, progsize=256) + fs = vfs.VfsLfs2(bdev, progsize=256) except: - os.VfsLfs2.mkfs(bdev, progsize=256) - vfs = os.VfsLfs2(bdev, progsize=256) -os.mount(vfs, "/flash") + vfs.VfsLfs2.mkfs(bdev, progsize=256) + fs = vfs.VfsLfs2(bdev, progsize=256) +vfs.mount(fs, "/flash") os.chdir("/flash") sys.path.append("/flash") sys.path.append("/flash/lib") @@ -27,8 +28,8 @@ except: sdcard = SDCard(1) - fat = os.VfsFat(sdcard) - os.mount(fat, "/sdcard") + fat = vfs.VfsFat(sdcard) + vfs.mount(fat, "/sdcard") os.chdir("/sdcard") sys.path.append("/sdcard") except: diff --git a/ports/nrf/examples/mountsd.py b/ports/nrf/examples/mountsd.py index 315205c69..375225961 100644 --- a/ports/nrf/examples/mountsd.py +++ b/ports/nrf/examples/mountsd.py @@ -20,7 +20,7 @@ Direct wiring on SD card (SPI): --------------------------------- """ -import os +import os, vfs from machine import SPI, Pin from sdcard import SDCard @@ -28,7 +28,7 @@ from sdcard import SDCard def mnt(): cs = Pin("P22", mode=Pin.OUT) sd = SDCard(SPI(0), cs) - os.mount(sd, "/") + vfs.mount(sd, "/") def list(): diff --git a/ports/nrf/examples/seeed_tft.py b/ports/nrf/examples/seeed_tft.py index fc0617f20..f53b56022 100644 --- a/ports/nrf/examples/seeed_tft.py +++ b/ports/nrf/examples/seeed_tft.py @@ -44,7 +44,7 @@ Example usage of SD card reader: tf = mount_tf() os.listdir() """ -import os +import vfs import time import framebuf @@ -54,7 +54,7 @@ from sdcard import SDCard def mount_tf(self, mount_point="/"): sd = SDCard(SPI(0), Pin("P15", mode=Pin.OUT)) - os.mount(sd, mount_point) + vfs.mount(sd, mount_point) class ILI9341: diff --git a/ports/nrf/modules/scripts/_mkfs.py b/ports/nrf/modules/scripts/_mkfs.py index 02e8dabce..601f9558e 100644 --- a/ports/nrf/modules/scripts/_mkfs.py +++ b/ports/nrf/modules/scripts/_mkfs.py @@ -1,19 +1,19 @@ -import os, nrf +import vfs, nrf try: - from os import VfsLfs1 + from vfs import VfsLfs1 - os.VfsLfs1.mkfs(nrf.Flash()) + vfs.VfsLfs1.mkfs(nrf.Flash()) except ImportError: try: - from os import VfsLfs2 + from vfs import VfsLfs2 - os.VfsLfs2.mkfs(nrf.Flash()) + vfs.VfsLfs2.mkfs(nrf.Flash()) except ImportError: try: - from os import VfsFat + from vfs import VfsFat - os.VfsFat.mkfs(nrf.Flash()) + vfs.VfsFat.mkfs(nrf.Flash()) except ImportError: pass except OSError as e: diff --git a/ports/rp2/modules/_boot.py b/ports/rp2/modules/_boot.py index 099e5aba0..71cb28d68 100644 --- a/ports/rp2/modules/_boot.py +++ b/ports/rp2/modules/_boot.py @@ -1,4 +1,4 @@ -import os +import vfs import machine, rp2 @@ -6,10 +6,10 @@ import machine, rp2 # Note: the flash requires the programming size to be aligned to 256 bytes. bdev = rp2.Flash() try: - vfs = os.VfsLfs2(bdev, progsize=256) + fs = vfs.VfsLfs2(bdev, progsize=256) except: - os.VfsLfs2.mkfs(bdev, progsize=256) - vfs = os.VfsLfs2(bdev, progsize=256) -os.mount(vfs, "/") + vfs.VfsLfs2.mkfs(bdev, progsize=256) + fs = vfs.VfsLfs2(bdev, progsize=256) +vfs.mount(fs, "/") -del os, bdev, vfs +del vfs, bdev, fs diff --git a/ports/rp2/modules/_boot_fat.py b/ports/rp2/modules/_boot_fat.py index 02a2df9ba..522058445 100644 --- a/ports/rp2/modules/_boot_fat.py +++ b/ports/rp2/modules/_boot_fat.py @@ -1,15 +1,14 @@ -import os +import vfs import machine, rp2 # Try to mount the filesystem, and format the flash if it doesn't exist. bdev = rp2.Flash() try: - vfs = os.VfsFat(bdev) - os.mount(vfs, "/") + fs = vfs.VfsFat(bdev) except: - os.VfsFat.mkfs(bdev) - vfs = os.VfsFat(bdev) -os.mount(vfs, "/") + vfs.VfsFat.mkfs(bdev) + fs = vfs.VfsFat(bdev) +vfs.mount(fs, "/") -del os, bdev, vfs +del vfs, bdev, fs diff --git a/ports/samd/modules/_boot.py b/ports/samd/modules/_boot.py index 93522e2ea..f4053e2cd 100644 --- a/ports/samd/modules/_boot.py +++ b/ports/samd/modules/_boot.py @@ -1,21 +1,21 @@ import gc -import os +import vfs import samd import sys bdev = samd.Flash() # Try to mount the filesystem, and format the flash if it doesn't exist. -fs_type = os.VfsLfs2 if hasattr(os, "VfsLfs2") else os.VfsLfs1 +fs_type = vfs.VfsLfs2 if hasattr(vfs, "VfsLfs2") else vfs.VfsLfs1 try: - vfs = fs_type(bdev, progsize=256) + fs = fs_type(bdev, progsize=256) except: fs_type.mkfs(bdev, progsize=256) - vfs = fs_type(bdev, progsize=256) -os.mount(vfs, "/") + fs = fs_type(bdev, progsize=256) +vfs.mount(fs, "/") sys.path.append("/lib") -del vfs, fs_type, bdev, os, samd, sys +del fs, fs_type, bdev, vfs, samd, sys gc.collect() del gc