6565#if MICROPY_PY_UOS_SYNC
6666// sync()
6767// Sync all filesystems.
68- STATIC mp_obj_t mp_uos_sync (void ) {
68+ STATIC mp_obj_t mp_os_sync (void ) {
6969 #if MICROPY_VFS_FAT
7070 for (mp_vfs_mount_t * vfs = MP_STATE_VM (vfs_mount_table ); vfs != NULL ; vfs = vfs -> next ) {
7171 // this assumes that vfs->obj is fs_user_mount_t with block device functions
@@ -74,7 +74,7 @@ STATIC mp_obj_t mp_uos_sync(void) {
7474 #endif
7575 return mp_const_none ;
7676}
77- MP_DEFINE_CONST_FUN_OBJ_0 (mp_uos_sync_obj , mp_uos_sync );
77+ MP_DEFINE_CONST_FUN_OBJ_0 (mp_os_sync_obj , mp_os_sync );
7878#endif
7979
8080#if MICROPY_PY_UOS_UNAME
@@ -85,64 +85,64 @@ MP_DEFINE_CONST_FUN_OBJ_0(mp_uos_sync_obj, mp_uos_sync);
8585#define CONST_RELEASE const
8686#endif
8787
88- STATIC const qstr mp_uos_uname_info_fields [] = {
88+ STATIC const qstr mp_os_uname_info_fields [] = {
8989 MP_QSTR_sysname ,
9090 MP_QSTR_nodename ,
9191 MP_QSTR_release ,
9292 MP_QSTR_version ,
9393 MP_QSTR_machine
9494};
95- STATIC const MP_DEFINE_STR_OBJ (mp_uos_uname_info_sysname_obj , MICROPY_PY_SYS_PLATFORM );
96- STATIC const MP_DEFINE_STR_OBJ (mp_uos_uname_info_nodename_obj , MICROPY_PY_SYS_PLATFORM );
97- STATIC CONST_RELEASE MP_DEFINE_STR_OBJ (mp_uos_uname_info_release_obj , MICROPY_VERSION_STRING );
98- STATIC const MP_DEFINE_STR_OBJ (mp_uos_uname_info_version_obj , MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE MICROPY_BUILD_TYPE_PAREN );
99- STATIC const MP_DEFINE_STR_OBJ (mp_uos_uname_info_machine_obj , MICROPY_HW_BOARD_NAME " with " MICROPY_HW_MCU_NAME );
95+ STATIC const MP_DEFINE_STR_OBJ (mp_os_uname_info_sysname_obj , MICROPY_PY_SYS_PLATFORM );
96+ STATIC const MP_DEFINE_STR_OBJ (mp_os_uname_info_nodename_obj , MICROPY_PY_SYS_PLATFORM );
97+ STATIC CONST_RELEASE MP_DEFINE_STR_OBJ (mp_os_uname_info_release_obj , MICROPY_VERSION_STRING );
98+ STATIC const MP_DEFINE_STR_OBJ (mp_os_uname_info_version_obj , MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE MICROPY_BUILD_TYPE_PAREN );
99+ STATIC const MP_DEFINE_STR_OBJ (mp_os_uname_info_machine_obj , MICROPY_HW_BOARD_NAME " with " MICROPY_HW_MCU_NAME );
100100
101101STATIC MP_DEFINE_ATTRTUPLE (
102- mp_uos_uname_info_obj ,
103- mp_uos_uname_info_fields ,
102+ mp_os_uname_info_obj ,
103+ mp_os_uname_info_fields ,
104104 5 ,
105- MP_ROM_PTR (& mp_uos_uname_info_sysname_obj ),
106- MP_ROM_PTR (& mp_uos_uname_info_nodename_obj ),
107- MP_ROM_PTR (& mp_uos_uname_info_release_obj ),
108- MP_ROM_PTR (& mp_uos_uname_info_version_obj ),
109- MP_ROM_PTR (& mp_uos_uname_info_machine_obj )
105+ MP_ROM_PTR (& mp_os_uname_info_sysname_obj ),
106+ MP_ROM_PTR (& mp_os_uname_info_nodename_obj ),
107+ MP_ROM_PTR (& mp_os_uname_info_release_obj ),
108+ MP_ROM_PTR (& mp_os_uname_info_version_obj ),
109+ MP_ROM_PTR (& mp_os_uname_info_machine_obj )
110110 );
111111
112- STATIC mp_obj_t mp_uos_uname (void ) {
112+ STATIC mp_obj_t mp_os_uname (void ) {
113113 #if MICROPY_PY_UOS_UNAME_RELEASE_DYNAMIC
114- const char * release = mp_uos_uname_release ();
115- mp_uos_uname_info_release_obj .len = strlen (release );
116- mp_uos_uname_info_release_obj .data = (const byte * )release ;
114+ const char * release = mp_os_uname_release ();
115+ mp_os_uname_info_release_obj .len = strlen (release );
116+ mp_os_uname_info_release_obj .data = (const byte * )release ;
117117 #endif
118- return MP_OBJ_FROM_PTR (& mp_uos_uname_info_obj );
118+ return MP_OBJ_FROM_PTR (& mp_os_uname_info_obj );
119119}
120- STATIC MP_DEFINE_CONST_FUN_OBJ_0 (mp_uos_uname_obj , mp_uos_uname );
120+ STATIC MP_DEFINE_CONST_FUN_OBJ_0 (mp_os_uname_obj , mp_os_uname );
121121
122122#endif
123123
124124STATIC const mp_rom_map_elem_t os_module_globals_table [] = {
125125 { MP_ROM_QSTR (MP_QSTR___name__ ), MP_ROM_QSTR (MP_QSTR_os ) },
126126
127127 #if MICROPY_PY_UOS_GETENV_PUTENV_UNSETENV
128- { MP_ROM_QSTR (MP_QSTR_getenv ), MP_ROM_PTR (& mp_uos_getenv_obj ) },
129- { MP_ROM_QSTR (MP_QSTR_putenv ), MP_ROM_PTR (& mp_uos_putenv_obj ) },
130- { MP_ROM_QSTR (MP_QSTR_unsetenv ), MP_ROM_PTR (& mp_uos_unsetenv_obj ) },
128+ { MP_ROM_QSTR (MP_QSTR_getenv ), MP_ROM_PTR (& mp_os_getenv_obj ) },
129+ { MP_ROM_QSTR (MP_QSTR_putenv ), MP_ROM_PTR (& mp_os_putenv_obj ) },
130+ { MP_ROM_QSTR (MP_QSTR_unsetenv ), MP_ROM_PTR (& mp_os_unsetenv_obj ) },
131131 #endif
132132 #if MICROPY_PY_UOS_SEP
133133 { MP_ROM_QSTR (MP_QSTR_sep ), MP_ROM_QSTR (MP_QSTR__slash_ ) },
134134 #endif
135135 #if MICROPY_PY_UOS_SYNC
136- { MP_ROM_QSTR (MP_QSTR_sync ), MP_ROM_PTR (& mp_uos_sync_obj ) },
136+ { MP_ROM_QSTR (MP_QSTR_sync ), MP_ROM_PTR (& mp_os_sync_obj ) },
137137 #endif
138138 #if MICROPY_PY_UOS_SYSTEM
139- { MP_ROM_QSTR (MP_QSTR_system ), MP_ROM_PTR (& mp_uos_system_obj ) },
139+ { MP_ROM_QSTR (MP_QSTR_system ), MP_ROM_PTR (& mp_os_system_obj ) },
140140 #endif
141141 #if MICROPY_PY_UOS_UNAME
142- { MP_ROM_QSTR (MP_QSTR_uname ), MP_ROM_PTR (& mp_uos_uname_obj ) },
142+ { MP_ROM_QSTR (MP_QSTR_uname ), MP_ROM_PTR (& mp_os_uname_obj ) },
143143 #endif
144144 #if MICROPY_PY_OS_URANDOM
145- { MP_ROM_QSTR (MP_QSTR_urandom ), MP_ROM_PTR (& mp_uos_urandom_obj ) },
145+ { MP_ROM_QSTR (MP_QSTR_urandom ), MP_ROM_PTR (& mp_os_urandom_obj ) },
146146 #endif
147147
148148 #if MICROPY_VFS
@@ -161,13 +161,13 @@ STATIC const mp_rom_map_elem_t os_module_globals_table[] = {
161161 // The following are MicroPython extensions.
162162
163163 #if MICROPY_PY_OS_DUPTERM
164- { MP_ROM_QSTR (MP_QSTR_dupterm ), MP_ROM_PTR (& mp_uos_dupterm_obj ) },
164+ { MP_ROM_QSTR (MP_QSTR_dupterm ), MP_ROM_PTR (& mp_os_dupterm_obj ) },
165165 #endif
166166 #if MICROPY_PY_UOS_DUPTERM_NOTIFY
167- { MP_ROM_QSTR (MP_QSTR_dupterm_notify ), MP_ROM_PTR (& mp_uos_dupterm_notify_obj ) },
167+ { MP_ROM_QSTR (MP_QSTR_dupterm_notify ), MP_ROM_PTR (& mp_os_dupterm_notify_obj ) },
168168 #endif
169169 #if MICROPY_PY_UOS_ERRNO
170- { MP_ROM_QSTR (MP_QSTR_errno ), MP_ROM_PTR (& mp_uos_errno_obj ) },
170+ { MP_ROM_QSTR (MP_QSTR_errno ), MP_ROM_PTR (& mp_os_errno_obj ) },
171171 #endif
172172
173173 #if MICROPY_VFS
@@ -190,11 +190,11 @@ STATIC const mp_rom_map_elem_t os_module_globals_table[] = {
190190};
191191STATIC MP_DEFINE_CONST_DICT (os_module_globals , os_module_globals_table );
192192
193- const mp_obj_module_t mp_module_uos = {
193+ const mp_obj_module_t mp_module_os = {
194194 .base = { & mp_type_module },
195195 .globals = (mp_obj_dict_t * )& os_module_globals ,
196196};
197197
198- MP_REGISTER_MODULE (MP_QSTR_os , mp_module_uos );
198+ MP_REGISTER_MODULE (MP_QSTR_os , mp_module_os );
199199
200200#endif // MICROPY_PY_UOS
0 commit comments