8000 cc3200: Convert os module to use extmod version. · micropython/micropython@49fa3ce · GitHub
[go: up one dir, main page]
Skip to content

Commit 49fa3ce

Browse files
dpgeorgedpgeorge
committed
cc3200: Convert os module to use extmod version.
Changes: - os.uname() is removed to save space; sys.version and sys.implementation can be used instead. - os.sync() now uses the common extmod version and syncs by calling the FAT FS sync function, which eventually calls sflash_disk_flush(). Signed-off-by: Damien George <damien@micropython.org>
1 parent 1c0e464 commit 49fa3ce

File tree

3 files changed

+9
-102
lines changed

3 files changed

+9
-102
lines changed

‎ports/cc3200/application.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ APP_MISC_SRC_C = $(addprefix misc/,\
7777

7878
APP_MODS_SRC_C = $(addprefix mods/,\
7979
modnetwork.c \
80-
modos.c \
8180
modsocket.c \
8281
modssl.c \
8382
modwipy.c \

‎ports/cc3200/mods/modos.c

Lines changed: 5 additions & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* The MIT License (MIT)
55
*
6-
* Copyright (c) 2013, 2014 Damien P. George
6+
* Copyright (c) 2013-2023 Damien P. George
77
* Copyright (c) 2015 Daniel Campora
88
*
99
* Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -25,72 +25,13 @@
2525
* THE SOFTWARE.
2626
*/
2727

28-
#include <stdint.h>
29-
#include <string.h>
28+
// This file is never compiled standalone, it's included directly from
29+
// extmod/modos.c via MICROPY_PY_OS_INCLUDEFILE.
3030

31-
#include "py/objtuple.h"
32-
#include "py/objstr.h"
3331
#include "py/runtime.h"
34-
#include "shared/timeutils/timeutils.h"
35-
#include "lib/oofatfs/ff.h"
36-
#include "lib/oofatfs/diskio.h"
37-
#include "genhdr/mpversion.h"
38-
#include "sflash_diskio.h"
39-
#include "extmod/misc.h"
40-
#include "extmod/vfs.h"
41-
#include "extmod/vfs_fat.h"
4232
#include "random.h"
43-
#include "version.h"
44-
#include "pybsd.h"
45-
#include "pybuart.h"
4633

47-
/// \module os - basic "operating system" services
48-
///
49-
/// The `os` module contains functions for filesystem access and `urandom`.
50-
///
51-
/// The filesystem has `/` as the root directory, and the available physical
52-
/// drives are accessible from here. They are currently:
53-
///
54-
/// /flash -- the serial flash filesystem
55-
///
56-
/// On boot up, the current directory is `/flash`.
57-
58-
/******************************************************************************/
59-
// MicroPython bindings
60-
//
61-
62-
STATIC const qstr os_uname_info_fields[] = {
63-
MP_QSTR_sysname, MP_QSTR_nodename,
64-
MP_QSTR_release, MP_QSTR_version, MP_QSTR_machine
65-
};
66-
STATIC const MP_DEFINE_STR_OBJ(os_uname_info_sysname_obj, MICROPY_PY_SYS_PLATFORM);
67-
STATIC const MP_DEFINE_STR_OBJ(os_uname_info_nodename_obj, MICROPY_PY_SYS_PLATFORM);
68-
STATIC const MP_DEFINE_STR_OBJ(os_uname_info_release_obj, WIPY_SW_VERSION_NUMBER);
69-
STATIC const MP_DEFINE_STR_OBJ(os_uname_info_version_obj, MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE);
70-
STATIC const MP_DEFINE_STR_OBJ(os_uname_info_machine_obj, MICROPY_HW_BOARD_NAME " with " MICROPY_HW_MCU_NAME);
71-
STATIC MP_DEFINE_ATTRTUPLE(
72-
os_uname_info_obj,
73-
os_uname_info_fields,
74-
5,
75-
(mp_obj_t)&os_uname_info_sysname_obj,
76-
(mp_obj_t)&os_uname_info_nodename_obj,
77-
(mp_obj_t)&os_uname_info_release_obj,
78-
(mp_obj_t)&os_uname_info_version_obj,
79-
(mp_obj_t)&os_uname_info_machine_obj
80-
);
81-
82-
STATIC mp_obj_t os_uname(void) {
83-
return (mp_obj_t)&os_uname_info_obj;
84-
}
85-
STATIC MP_DEFINE_CONST_FUN_OBJ_0(os_uname_obj, os_uname);
86-
87-
STATIC mp_obj_t os_sync(void) {
88-
sflash_disk_flush();
89-
return mp_const_none;
90-
}
91-
STATIC MP_DEFINE_CONST_FUN_OBJ_0(os_sync_obj, os_sync);
92-
93-
STATIC mp_obj_t os_urandom(mp_obj_t num) {
34+
STATIC mp_obj_t mp_os_urandom(mp_obj_t num) {
9435
mp_int_t n = mp_obj_get_int(num);
9536
vstr_t vstr;
9637
vstr_init_len(&vstr, n);
@@ -99,41 +40,4 @@ STATIC mp_obj_t os_urandom(mp_obj_t num) {
9940
}
10041
return mp_obj_new_bytes_from_vstr(&vstr);
10142
}
102-
STATIC MP_DEFINE_CONST_FUN_OBJ_1(os_urandom_obj, os_urandom);
103-
104-
STATIC const mp_rom_map_elem_t os_module_globals_table[] = {
105-
{ MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_os) },
106-
107-
{ MP_ROM_QSTR(MP_QSTR_uname), MP_ROM_PTR(&os_uname_obj) },
108-
109-
{ MP_ROM_QSTR(MP_QSTR_chdir), MP_ROM_PTR(&mp_vfs_chdir_obj) },
110-
{ MP_ROM_QSTR(MP_QSTR_getcwd), MP_ROM_PTR(&mp_vfs_getcwd_obj) },
111-
{ MP_ROM_QSTR(MP_QSTR_ilistdir), MP_ROM_PTR(&mp_vfs_ilistdir_obj) },
112-
{ MP_ROM_QSTR(MP_QSTR_listdir), MP_ROM_PTR(&mp_vfs_listdir_obj) },
113-
{ MP_ROM_QSTR(MP_QSTR_mkdir), MP_ROM_PTR(&mp_vfs_mkdir_obj) },
114-
{ MP_ROM_QSTR(MP_QSTR_rename), MP_ROM_PTR(&mp_vfs_rename_obj) },
115-
{ MP_ROM_QSTR(MP_QSTR_remove), MP_ROM_PTR(&mp_vfs_remove_obj) },
116-
{ MP_ROM_QSTR(MP_QSTR_rmdir), MP_ROM_PTR(&mp_vfs_rmdir_obj) },
117-
{ MP_ROM_QSTR(MP_QSTR_stat), MP_ROM_PTR(&mp_vfs_stat_obj) },
118-
{ MP_ROM_QSTR(MP_QSTR_unlink), MP_ROM_PTR(&mp_vfs_remove_obj) }, // unlink aliases to remove
119-
120-
{ MP_ROM_QSTR(MP_QSTR_sync), MP_ROM_PTR(&os_sync_obj) },
121-
{ MP_ROM_QSTR(MP_QSTR_urandom), MP_ROM_PTR(&os_urandom_obj) },
122-
123-
// MicroPython additions
124-
// removed: mkfs
125-
// renamed: unmount -> umount
126-
{ MP_ROM_QSTR(MP_QSTR_mount), MP_ROM_PTR(&mp_vfs_mount_obj) },
127-
{ MP_ROM_QSTR(MP_QSTR_umount), MP_ROM_PTR(&mp_vfs_umount_obj) },
128-
{ MP_ROM_QSTR(MP_QSTR_VfsFat), MP_ROM_PTR(&mp_fat_vfs_type) },
129-
{ MP_ROM_QSTR(MP_QSTR_dupterm), MP_ROM_PTR(&mp_os_dupterm_obj) },
130-
};
131-
132-
STATIC MP_DEFINE_CONST_DICT(os_module_globals, os_module_globals_table);
133-
134-
const mp_obj_module_t mp_module_os = {
135-
.base = { &mp_type_module },
136-
.globals = (mp_obj_dict_t*)&os_module_globals,
137-
};
138-
139-
MP_REGISTER_EXTENSIBLE_MODULE(MP_QSTR_os, mp_module_os);
43+
STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_os_urandom_obj, mp_os_urandom);

‎ports/cc3200/mpconfigport.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,11 @@
115115
#define MICROPY_PY_RE (1)
116116
#define MICROPY_PY_HEAPQ (0)
117117
#define MICROPY_PY_HASHLIB (0)
118+
#define MICROPY_PY_OS (1)
119+
#define MICROPY_PY_OS_INCLUDEFILE "ports/cc3200/mods/modos.c"
118120
#define MICROPY_PY_OS_DUPTERM (1)
121+
#define MICROPY_PY_OS_SYNC (1)
122+
#define MICROPY_PY_OS_URANDOM (1)
119123
#define MICROPY_PY_SELECT (1)
120124
#define MICROPY_PY_TIME (1)
121125
#define MICROPY_PY_TIME_GMTIME_LOCALTIME_MKTIME (1)

0 commit comments

Comments
 (0)
0