kopia lustrzana https://github.com/micropython/micropython
samd/moduos: Convert module to use extmod version.
Signed-off-by: Damien George <damien@micropython.org>pull/8388/head
Damien George
rodzic
818be10bb5
commit
94077c6402
|
|
@ -75,7 +75,6 @@ endif
|
|||
SRC_C = \
|
||||
main.c \
|
||||
help.c \
|
||||
moduos.c \
|
||||
modutime.c \
|
||||
modmachine.c \
|
||||
$(BOARD_DIR)/pins.c \
|
||||
|
|
@ -120,7 +119,7 @@ SRC_S = shared/runtime/gchelper_m3.s
|
|||
endif
|
||||
|
||||
# List of sources for qstr extraction
|
||||
SRC_QSTR += moduos.c \
|
||||
SRC_QSTR += \
|
||||
modutime.c \
|
||||
modmachine.c \
|
||||
machine_pin.c \
|
||||
|
|
|
|||
|
|
@ -1,75 +0,0 @@
|
|||
/*
|
||||
* This file is part of the MicroPython project, http://micropython.org/
|
||||
*
|
||||
* The MIT License (MIT)
|
||||
*
|
||||
* Copyright (c) 2016 Damien P. George
|
||||
*
|
||||
* 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 "py/runtime.h"
|
||||
#include "extmod/vfs.h"
|
||||
#include "extmod/vfs_fat.h"
|
||||
#include "extmod/vfs_lfs.h"
|
||||
|
||||
STATIC const mp_rom_map_elem_t os_module_globals_table[] = {
|
||||
{ MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_uos) },
|
||||
|
||||
#if MICROPY_VFS
|
||||
{ MP_ROM_QSTR(MP_QSTR_chdir), MP_ROM_PTR(&mp_vfs_chdir_obj) },
|
||||
{ MP_ROM_QSTR(MP_QSTR_getcwd), MP_ROM_PTR(&mp_vfs_getcwd_obj) },
|
||||
{ MP_ROM_QSTR(MP_QSTR_listdir), MP_ROM_PTR(&mp_vfs_listdir_obj) },
|
||||
{ MP_ROM_QSTR(MP_QSTR_mkdir), MP_ROM_PTR(&mp_vfs_mkdir_obj) },
|
||||
{ MP_ROM_QSTR(MP_QSTR_remove), MP_ROM_PTR(&mp_vfs_remove_obj) },
|
||||
{ MP_ROM_QSTR(MP_QSTR_rename), MP_ROM_PTR(&mp_vfs_rename_obj) },
|
||||
{ MP_ROM_QSTR(MP_QSTR_rmdir), MP_ROM_PTR(&mp_vfs_rmdir_obj) },
|
||||
{ MP_ROM_QSTR(MP_QSTR_stat), MP_ROM_PTR(&mp_vfs_stat_obj) },
|
||||
{ MP_ROM_QSTR(MP_QSTR_statvfs), MP_ROM_PTR(&mp_vfs_statvfs_obj) },
|
||||
#endif
|
||||
|
||||
// The following are MicroPython extensions.
|
||||
|
||||
#if MICROPY_PY_OS_DUPTERM
|
||||
{ MP_ROM_QSTR(MP_QSTR_dupterm), MP_ROM_PTR(&mp_uos_dupterm_obj) },
|
||||
#endif
|
||||
|
||||
#if MICROPY_VFS
|
||||
{ MP_ROM_QSTR(MP_QSTR_ilistdir), MP_ROM_PTR(&mp_vfs_ilistdir_obj) },
|
||||
{ MP_ROM_QSTR(MP_QSTR_mount), MP_ROM_PTR(&mp_vfs_mount_obj) },
|
||||
{ MP_ROM_QSTR(MP_QSTR_umount), MP_ROM_PTR(&mp_vfs_umount_obj) },
|
||||
#if MICROPY_VFS_FAT
|
||||
{ MP_ROM_QSTR(MP_QSTR_VfsFat), MP_ROM_PTR(&mp_fat_vfs_type) },
|
||||
#endif
|
||||
#if MICROPY_VFS_LFS1
|
||||
{ MP_ROM_QSTR(MP_QSTR_VfsLfs1), MP_ROM_PTR(&mp_type_vfs_lfs1) },
|
||||
#endif
|
||||
#if MICROPY_VFS_LFS2
|
||||
{ MP_ROM_QSTR(MP_QSTR_VfsLfs2), MP_ROM_PTR(&mp_type_vfs_lfs2) },
|
||||
#endif
|
||||
#endif
|
||||
};
|
||||
STATIC MP_DEFINE_CONST_DICT(os_module_globals, os_module_globals_table);
|
||||
|
||||
const mp_obj_module_t mp_module_uos = {
|
||||
.base = { &mp_type_module },
|
||||
.globals = (mp_obj_dict_t *)&os_module_globals,
|
||||
};
|
||||
|
||||
MP_REGISTER_MODULE(MP_QSTR_uos, mp_module_uos, MICROPY_PY_UOS);
|
||||
|
|
@ -95,8 +95,9 @@
|
|||
#define MICROPY_PY_UHASHLIB_MD5 (MICROPY_PY_USSL)
|
||||
#define MICROPY_PY_UHASHLIB_SHA1 (MICROPY_PY_USSL)
|
||||
#define MICROPY_PY_UCRYPTOLIB (MICROPY_PY_USSL)
|
||||
#ifndef MICROPY_PY_UOS
|
||||
#define MICROPY_PY_UOS (1)
|
||||
#define MICROPY_PY_UOS (0)
|
||||
#ifndef MICROPY_PY_UOS_STM32
|
||||
#define MICROPY_PY_UOS_STM32 (1)
|
||||
#endif
|
||||
#define MICROPY_PY_OS_DUPTERM (3)
|
||||
#define MICROPY_PY_UOS_DUPTERM_BUILTIN_STREAM (1)
|
||||
|
|
@ -203,7 +204,7 @@ extern const struct _mp_obj_module_t mp_module_onewire;
|
|||
#define MACHINE_BUILTIN_MODULE_CONSTANTS
|
||||
#endif
|
||||
|
||||
#if MICROPY_PY_UOS
|
||||
#if MICROPY_PY_UOS_STM32
|
||||
#define UOS_BUILTIN_MODULE { MP_ROM_QSTR(MP_QSTR_uos), MP_ROM_PTR(&mp_module_uos) },
|
||||
#else
|
||||
#define UOS_BUILTIN_MODULE
|
||||
|
|
|
|||
1
py/py.mk
1
py/py.mk
|
|
@ -176,6 +176,7 @@ PY_EXTMOD_O_BASENAME = \
|
|||
extmod/moduasyncio.o \
|
||||
extmod/moductypes.o \
|
||||
extmod/modujson.o \
|
||||
extmod/moduos.o \
|
||||
extmod/modure.o \
|
||||
extmod/moduzlib.o \
|
||||
extmod/moduheapq.o \
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue