mirror of
https://github.com/micropython/micropython.git
synced 2026-01-04 11:10:14 +01:00
Existing C code in `main.c` only mounts a flash filesystem if one exists, and doesn't do anything if the 'storage' partition is not formatted. This commit moves the mounting logic from `main.c` to frozen code using `modules/_boot.py` and adds the formatting of a previously unformatted partition if the mount fails. Every available disk (in the newly added `DiskAccess.disks` tuple) will be mounted on separate mount points (if they're formatted), and the 'storage' flash partition (if any) will be mounted on /flash (and will be formatted as LFS2 if necessary). Also, `sys.path` will be updated with appropriate 'lib' subdirectories for each mounted filesystem. The current working directory will be changed to the last `DiskAccess.disk` mounted, or to /flash if no disks were mounted. Then `boot.py` and `main.py` will be executed from the current working directory if they exist. Thanks to @VynDragon for the logic in `zephyr/zephyr_storage.c`. Signed-off-by: Ned Konz <ned@metamagix.tech>
220 lines
5.9 KiB
C
220 lines
5.9 KiB
C
/*
|
|
* This file is part of the MicroPython project, http://micropython.org/
|
|
*
|
|
* The MIT License (MIT)
|
|
*
|
|
* Copyright (c) 2013, 2014 Damien P. George
|
|
* Copyright (c) 2016-2017 Linaro Limited
|
|
* Copyright (c) 2020 NXP
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
* in the Software without restriction, including without limitation the rights
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
* furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
* THE SOFTWARE.
|
|
*/
|
|
#include <stdint.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
|
|
#include <zephyr/kernel.h>
|
|
#include <zephyr/version.h>
|
|
#ifdef CONFIG_NETWORKING
|
|
#include <zephyr/net/net_context.h>
|
|
#endif
|
|
|
|
#ifdef CONFIG_USB_DEVICE_STACK
|
|
#include <zephyr/usb/usb_device.h>
|
|
#endif
|
|
|
|
#include <zephyr/storage/flash_map.h>
|
|
|
|
#include "py/mperrno.h"
|
|
#include "py/builtin.h"
|
|
#include "py/compile.h"
|
|
#include "py/runtime.h"
|
|
#include "py/repl.h"
|
|
#include "py/gc.h"
|
|
#include "py/mphal.h"
|
|
#include "shared/runtime/gchelper.h"
|
|
#include "shared/runtime/pyexec.h"
|
|
#include "shared/readline/readline.h"
|
|
#include "extmod/modbluetooth.h"
|
|
#include "extmod/modmachine.h"
|
|
|
|
#if MICROPY_VFS
|
|
#include "extmod/vfs.h"
|
|
#endif
|
|
|
|
#include "modmachine.h"
|
|
#include "modzephyr.h"
|
|
|
|
static char heap[MICROPY_HEAP_SIZE];
|
|
|
|
#if defined(CONFIG_USB_DEVICE_STACK_NEXT)
|
|
extern int mp_usbd_init(void);
|
|
#endif // defined(CONFIG_USB_DEVICE_STACK_NEXT)
|
|
|
|
void init_zephyr(void) {
|
|
// We now rely on CONFIG_NET_APP_SETTINGS to set up bootstrap
|
|
// network addresses.
|
|
#if 0
|
|
#ifdef CONFIG_NETWORKING
|
|
if (net_if_get_default() == NULL) {
|
|
// If there's no default networking interface,
|
|
// there's nothing to configure.
|
|
return;
|
|
}
|
|
#endif
|
|
#ifdef CONFIG_NET_IPV4
|
|
static struct in_addr in4addr_my = {{{192, 0, 2, 1}}};
|
|
net_if_ipv4_addr_add(net_if_get_default(), &in4addr_my, NET_ADDR_MANUAL, 0);
|
|
static struct in_addr in4netmask_my = {{{255, 255, 255, 0}}};
|
|
net_if_ipv4_set_netmask(net_if_get_default(), &in4netmask_my);
|
|
static struct in_addr in4gw_my = {{{192, 0, 2, 2}}};
|
|
net_if_ipv4_set_gw(net_if_get_default(), &in4gw_my);
|
|
#endif
|
|
#ifdef CONFIG_NET_IPV6
|
|
// 2001:db8::1
|
|
static struct in6_addr in6addr_my = {{{0x20, 0x01, 0x0d, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}}};
|
|
net_if_ipv6_addr_add(net_if_get_default(), &in6addr_my, NET_ADDR_MANUAL, 0);
|
|
#endif
|
|
#endif
|
|
}
|
|
|
|
int real_main(void) {
|
|
#if MICROPY_PY_THREAD
|
|
struct k_thread *z_thread = (struct k_thread *)k_current_get();
|
|
mp_thread_init((void *)z_thread->stack_info.start, z_thread->stack_info.size / sizeof(uintptr_t));
|
|
#endif
|
|
|
|
init_zephyr();
|
|
mp_hal_init();
|
|
|
|
soft_reset:
|
|
mp_cstack_init_with_sp_here(CONFIG_MAIN_STACK_SIZE);
|
|
#if MICROPY_ENABLE_GC
|
|
gc_init(heap, heap + sizeof(heap));
|
|
#endif
|
|
mp_init();
|
|
|
|
#ifdef CONFIG_USB_DEVICE_STACK
|
|
usb_enable(NULL);
|
|
#endif
|
|
|
|
#ifdef CONFIG_USB_DEVICE_STACK_NEXT
|
|
mp_usbd_init();
|
|
#endif
|
|
|
|
#if MICROPY_VFS && MICROPY_MODULE_FROZEN_MPY
|
|
// Mount and/or create the filesystem
|
|
pyexec_frozen_module("_boot.py", false);
|
|
#endif
|
|
|
|
|
|
#if MICROPY_MODULE_FROZEN || MICROPY_VFS
|
|
// Execute user scripts.
|
|
int ret = pyexec_file_if_exists("boot.py");
|
|
if (ret & PYEXEC_FORCED_EXIT) {
|
|
goto soft_reset_exit;
|
|
}
|
|
if (pyexec_mode_kind == PYEXEC_MODE_FRIENDLY_REPL && ret != 0) {
|
|
ret = pyexec_file_if_exists("main.py");
|
|
if (ret & PYEXEC_FORCED_EXIT) {
|
|
goto soft_reset_exit;
|
|
}
|
|
}
|
|
#endif
|
|
|
|
for (;;) {
|
|
if (pyexec_mode_kind == PYEXEC_MODE_RAW_REPL) {
|
|
if (pyexec_raw_repl() != 0) {
|
|
break;
|
|
}
|
|
} else {
|
|
if (pyexec_friendly_repl() != 0) {
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
#if MICROPY_MODULE_FROZEN_MPY || MICROPY_VFS
|
|
soft_reset_exit:
|
|
#endif
|
|
|
|
mp_printf(MP_PYTHON_PRINTER, "MPY: soft reboot\n");
|
|
|
|
#if MICROPY_PY_BLUETOOTH
|
|
mp_bluetooth_deinit();
|
|
#endif
|
|
#if MICROPY_PY_MACHINE
|
|
machine_pin_deinit();
|
|
#endif
|
|
#if MICROPY_PY_MACHINE_I2C_TARGET
|
|
mp_machine_i2c_target_deinit_all();
|
|
#endif
|
|
|
|
#if MICROPY_PY_THREAD
|
|
mp_thread_deinit();
|
|
gc_collect();
|
|
#endif
|
|
|
|
gc_sweep_all();
|
|
mp_deinit();
|
|
|
|
goto soft_reset;
|
|
|
|
return 0;
|
|
}
|
|
|
|
void gc_collect(void) {
|
|
gc_collect_start();
|
|
gc_helper_collect_regs_and_stack();
|
|
#if MICROPY_PY_THREAD
|
|
mp_thread_gc_others();
|
|
#endif
|
|
gc_collect_end();
|
|
}
|
|
|
|
#if !MICROPY_READER_VFS
|
|
mp_lexer_t *mp_lexer_new_from_file(qstr filename) {
|
|
mp_raise_OSError(ENOENT);
|
|
}
|
|
#endif
|
|
|
|
#if !MICROPY_VFS
|
|
mp_import_stat_t mp_import_stat(const char *path) {
|
|
return MP_IMPORT_STAT_NO_EXIST;
|
|
}
|
|
|
|
mp_obj_t mp_builtin_open(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
|
|
return mp_const_none;
|
|
}
|
|
MP_DEFINE_CONST_FUN_OBJ_KW(mp_builtin_open_obj, 1, mp_builtin_open);
|
|
#endif
|
|
|
|
MP_NORETURN void nlr_jump_fail(void *val) {
|
|
while (1) {
|
|
;
|
|
}
|
|
}
|
|
|
|
#ifndef NDEBUG
|
|
void MP_WEAK __assert_func(const char *file, int line, const char *func, const char *expr) {
|
|
printf("Assertion '%s' failed, at file %s:%d\n", expr, file, line);
|
|
__fatal_error("Assertion failed");
|
|
}
|
|
#endif
|