summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--examples/embedding/Makefile.upylib (renamed from extmod/utime_mphal.c)0
-rw-r--r--examples/natmod/uheapq/uheapq.c2
-rw-r--r--examples/natmod/urandom/urandom.c2
-rw-r--r--examples/natmod/ure/ure.c2
-rw-r--r--examples/natmod/uzlib/uzlib.c2
-rw-r--r--extmod/extmod.cmake36
-rw-r--r--extmod/extmod.mk36
-rw-r--r--extmod/modbinascii.c (renamed from extmod/modubinascii.c)0
-rw-r--r--extmod/modcryptolib.c (renamed from extmod/moducryptolib.c)0
-rw-r--r--extmod/modhashlib.c (renamed from extmod/moduhashlib.c)0
-rw-r--r--extmod/modheapq.c (renamed from extmod/moduheapq.c)0
-rw-r--r--extmod/modjson.c (renamed from extmod/modujson.c)0
-rw-r--r--extmod/modlwip.c2
-rw-r--r--extmod/modos.c (renamed from extmod/moduos.c)0
-rw-r--r--extmod/modplatform.c (renamed from extmod/moduplatform.c)0
-rw-r--r--extmod/modrandom.c (renamed from extmod/modurandom.c)0
-rw-r--r--extmod/modre.c (renamed from extmod/modure.c)0
-rw-r--r--extmod/modselect.c (renamed from extmod/moduselect.c)0
-rw-r--r--extmod/modsocket.c (renamed from extmod/modusocket.c)0
-rw-r--r--extmod/modssl_axtls.c (renamed from extmod/modussl_axtls.c)0
-rw-r--r--extmod/modssl_mbedtls.c (renamed from extmod/modussl_mbedtls.c)0
-rw-r--r--extmod/modtime.c (renamed from extmod/modutime.c)0
-rw-r--r--extmod/modtimeq.c (renamed from extmod/modutimeq.c)0
-rw-r--r--extmod/modwebsocket.c (renamed from extmod/moduwebsocket.c)0
-rw-r--r--extmod/modzlib.c (renamed from extmod/moduzlib.c)0
-rw-r--r--extmod/os_dupterm.c (renamed from extmod/uos_dupterm.c)0
-rw-r--r--ports/cc3200/application.mk6
-rw-r--r--ports/cc3200/mods/modhashlib.c (renamed from ports/cc3200/mods/moduhashlib.c)0
-rw-r--r--ports/cc3200/mods/modos.c (renamed from ports/cc3200/mods/moduos.c)0
-rw-r--r--ports/cc3200/mods/modsocket.c (renamed from ports/cc3200/mods/modusocket.c)0
-rw-r--r--ports/cc3200/mods/modssl.c (renamed from ports/cc3200/mods/modussl.c)0
-rw-r--r--ports/cc3200/mods/modtime.c (renamed from ports/cc3200/mods/modutime.c)0
-rw-r--r--ports/embed/embed.mk2
-rw-r--r--ports/esp32/modos.c (renamed from ports/esp32/moduos.c)0
-rw-r--r--ports/esp32/modtime.c (renamed from ports/esp32/modutime.c)0
-rw-r--r--ports/esp32/mpconfigport.h2
-rw-r--r--ports/esp8266/boards/esp8266_common.ld2
-rw-r--r--ports/esp8266/modos.c (renamed from ports/esp8266/moduos.c)0
-rw-r--r--ports/esp8266/modtime.c (renamed from ports/esp8266/modutime.c)0
-rw-r--r--ports/esp8266/mpconfigport.h2
-rw-r--r--ports/mimxrt/modos.c (renamed from ports/mimxrt/moduos.c)0
-rw-r--r--ports/mimxrt/modtime.c (renamed from ports/mimxrt/modutime.c)0
-rw-r--r--ports/mimxrt/mpconfigport.h4
-rw-r--r--ports/nrf/Makefile4
-rw-r--r--ports/nrf/modules/os/microbitfs.c (renamed from ports/nrf/modules/uos/microbitfs.c)0
-rw-r--r--ports/nrf/modules/os/microbitfs.h (renamed from ports/nrf/modules/uos/microbitfs.h)0
-rw-r--r--ports/nrf/modules/os/modos.c (renamed from ports/nrf/modules/uos/moduos.c)0
-rw-r--r--ports/renesas-ra/modos.c (renamed from ports/renesas-ra/moduos.c)0
-rw-r--r--ports/renesas-ra/modtime.c (renamed from ports/renesas-ra/modutime.c)0
-rw-r--r--ports/renesas-ra/mpconfigport.h2
-rw-r--r--ports/rp2/CMakeLists.txt2
-rw-r--r--ports/rp2/modos.c (renamed from ports/rp2/moduos.c)0
-rw-r--r--ports/rp2/modtime.c (renamed from ports/rp2/modutime.c)0
-rw-r--r--ports/rp2/mpconfigport.h4
-rw-r--r--ports/samd/modos.c (renamed from ports/samd/moduos.c)0
-rw-r--r--ports/samd/modtime.c (renamed from ports/samd/modutime.c)0
-rw-r--r--ports/stm32/modos.c (renamed from ports/stm32/moduos.c)0
-rw-r--r--ports/stm32/modtime.c (renamed from ports/stm32/modutime.c)0
-rw-r--r--ports/stm32/mpconfigport.h4
-rw-r--r--ports/unix/Makefile4
-rw-r--r--ports/unix/modos.c (renamed from ports/unix/moduos.c)0
-rw-r--r--ports/unix/modselect.c (renamed from ports/unix/moduselect.c)0
-rw-r--r--ports/unix/modsocket.c (renamed from ports/unix/modusocket.c)0
-rw-r--r--ports/unix/modtime.c (renamed from ports/unix/modutime.c)0
-rw-r--r--ports/unix/variants/mpconfigvariant_common.h4
-rw-r--r--ports/windows/mpconfigport.h4
-rw-r--r--ports/windows/msvc/sources.props22
-rw-r--r--ports/zephyr/CMakeLists.txt2
-rw-r--r--ports/zephyr/modsocket.c (renamed from ports/zephyr/modusocket.c)0
-rw-r--r--ports/zephyr/modtime.c (renamed from ports/zephyr/modutime.c)0
-rw-r--r--ports/zephyr/mpconfigport.h2
-rw-r--r--py/moderrno.c (renamed from py/moduerrno.c)0
-rw-r--r--py/py.cmake2
-rw-r--r--py/py.mk2
-rwxr-xr-xtools/codeformat.py4
75 files changed, 81 insertions, 81 deletions
diff --git a/extmod/utime_mphal.c b/examples/embedding/Makefile.upylib
index e69de29bb2..e69de29bb2 100644
--- a/extmod/utime_mphal.c
+++ b/examples/embedding/Makefile.upylib
diff --git a/examples/natmod/uheapq/uheapq.c b/examples/natmod/uheapq/uheapq.c
index e339ccafd7..ed19652a66 100644
--- a/examples/natmod/uheapq/uheapq.c
+++ b/examples/natmod/uheapq/uheapq.c
@@ -2,7 +2,7 @@
#include "py/dynruntime.h"
-#include "extmod/moduheapq.c"
+#include "extmod/modheapq.c"
mp_obj_t mpy_init(mp_obj_fun_bc_t *self, size_t n_args, size_t n_kw, mp_obj_t *args) {
MP_DYNRUNTIME_INIT_ENTRY
diff --git a/examples/natmod/urandom/urandom.c b/examples/natmod/urandom/urandom.c
index ed46651b34..92257b8bc6 100644
--- a/examples/natmod/urandom/urandom.c
+++ b/examples/natmod/urandom/urandom.c
@@ -7,7 +7,7 @@
uint32_t yasmarang_pad, yasmarang_n, yasmarang_d;
uint8_t yasmarang_dat;
-#include "extmod/modurandom.c"
+#include "extmod/modrandom.c"
mp_obj_t mpy_init(mp_obj_fun_bc_t *self, size_t n_args, size_t n_kw, mp_obj_t *args) {
MP_DYNRUNTIME_INIT_ENTRY
diff --git a/examples/natmod/ure/ure.c b/examples/natmod/ure/ure.c
index 79eca90ab9..df89ea8353 100644
--- a/examples/natmod/ure/ure.c
+++ b/examples/natmod/ure/ure.c
@@ -35,7 +35,7 @@ void *memmove(void *dest, const void *src, size_t n) {
mp_obj_full_type_t match_type;
mp_obj_full_type_t re_type;
-#include "extmod/modure.c"
+#include "extmod/modre.c"
mp_map_elem_t match_locals_dict_table[5];
STATIC MP_DEFINE_CONST_DICT(match_locals_dict, match_locals_dict_table);
diff --git a/examples/natmod/uzlib/uzlib.c b/examples/natmod/uzlib/uzlib.c
index 9a3ec0af3c..2b0dbd5ca0 100644
--- a/examples/natmod/uzlib/uzlib.c
+++ b/examples/natmod/uzlib/uzlib.c
@@ -10,7 +10,7 @@ void *memset(void *s, int c, size_t n) {
mp_obj_full_type_t decompio_type;
-#include "extmod/moduzlib.c"
+#include "extmod/modzlib.c"
mp_map_elem_t decompio_locals_dict_table[3];
STATIC MP_DEFINE_CONST_DICT(decompio_locals_dict, decompio_locals_dict_table);
diff --git a/extmod/extmod.cmake b/extmod/extmod.cmake
index 675a4c6ecc..2bb89423c9 100644
--- a/extmod/extmod.cmake
+++ b/extmod/extmod.cmake
@@ -19,30 +19,30 @@ set(MICROPY_SOURCE_EXTMOD
${MICROPY_EXTMOD_DIR}/modnetwork.c
${MICROPY_EXTMOD_DIR}/modonewire.c
${MICROPY_EXTMOD_DIR}/moduasyncio.c
- ${MICROPY_EXTMOD_DIR}/modubinascii.c
- ${MICROPY_EXTMOD_DIR}/moducryptolib.c
+ ${MICROPY_EXTMOD_DIR}/modbinascii.c
+ ${MICROPY_EXTMOD_DIR}/modcryptolib.c
${MICROPY_EXTMOD_DIR}/moductypes.c
- ${MICROPY_EXTMOD_DIR}/moduhashlib.c
- ${MICROPY_EXTMOD_DIR}/moduheapq.c
- ${MICROPY_EXTMOD_DIR}/modujson.c
- ${MICROPY_EXTMOD_DIR}/moduos.c
- ${MICROPY_EXTMOD_DIR}/moduplatform.c
- ${MICROPY_EXTMOD_DIR}/modurandom.c
- ${MICROPY_EXTMOD_DIR}/modure.c
- ${MICROPY_EXTMOD_DIR}/moduselect.c
- ${MICROPY_EXTMOD_DIR}/modusocket.c
- ${MICROPY_EXTMOD_DIR}/modussl_axtls.c
- ${MICROPY_EXTMOD_DIR}/modussl_mbedtls.c
- ${MICROPY_EXTMOD_DIR}/modutime.c
- ${MICROPY_EXTMOD_DIR}/modutimeq.c
- ${MICROPY_EXTMOD_DIR}/moduwebsocket.c
- ${MICROPY_EXTMOD_DIR}/moduzlib.c
+ ${MICROPY_EXTMOD_DIR}/modhashlib.c
+ ${MICROPY_EXTMOD_DIR}/modheapq.c
+ ${MICROPY_EXTMOD_DIR}/modjson.c
+ ${MICROPY_EXTMOD_DIR}/modos.c
+ ${MICROPY_EXTMOD_DIR}/modplatform.c
+ ${MICROPY_EXTMOD_DIR}/modrandom.c
+ ${MICROPY_EXTMOD_DIR}/modre.c
+ ${MICROPY_EXTMOD_DIR}/modselect.c
+ ${MICROPY_EXTMOD_DIR}/modsocket.c
+ ${MICROPY_EXTMOD_DIR}/modssl_axtls.c
+ ${MICROPY_EXTMOD_DIR}/modssl_mbedtls.c
+ ${MICROPY_EXTMOD_DIR}/modtime.c
+ ${MICROPY_EXTMOD_DIR}/modtimeq.c
+ ${MICROPY_EXTMOD_DIR}/modwebsocket.c
+ ${MICROPY_EXTMOD_DIR}/modzlib.c
${MICROPY_EXTMOD_DIR}/modwebrepl.c
${MICROPY_EXTMOD_DIR}/network_cyw43.c
${MICROPY_EXTMOD_DIR}/network_lwip.c
${MICROPY_EXTMOD_DIR}/network_ninaw10.c
${MICROPY_EXTMOD_DIR}/network_wiznet5k.c
- ${MICROPY_EXTMOD_DIR}/uos_dupterm.c
+ ${MICROPY_EXTMOD_DIR}/os_dupterm.c
${MICROPY_EXTMOD_DIR}/vfs.c
${MICROPY_EXTMOD_DIR}/vfs_blockdev.c
${MICROPY_EXTMOD_DIR}/vfs_fat.c
diff --git a/extmod/extmod.mk b/extmod/extmod.mk
index 2f9bd3b065..a573da4c60 100644
--- a/extmod/extmod.mk
+++ b/extmod/extmod.mk
@@ -11,37 +11,37 @@ SRC_EXTMOD_C += \
extmod/machine_signal.c \
extmod/machine_spi.c \
extmod/machine_timer.c \
+ extmod/modbinascii.c \
extmod/modbluetooth.c \
extmod/modbtree.c \
+ extmod/modcryptolib.c \
extmod/modframebuf.c \
+ extmod/modhashlib.c \
+ extmod/modheapq.c \
+ extmod/modjson.c \
extmod/modlwip.c \
extmod/modnetwork.c \
extmod/modonewire.c \
+ extmod/modos.c \
+ extmod/modplatform.c\
+ extmod/modrandom.c \
+ extmod/modre.c \
+ extmod/modselect.c \
+ extmod/modsocket.c \
+ extmod/modssl_axtls.c \
+ extmod/modssl_mbedtls.c \
+ extmod/modtime.c \
+ extmod/modtimeq.c \
extmod/moduasyncio.c \
- extmod/modubinascii.c \
- extmod/moducryptolib.c \
extmod/moductypes.c \
- extmod/moduhashlib.c \
- extmod/moduheapq.c \
- extmod/modujson.c \
- extmod/moduos.c \
- extmod/moduplatform.c\
- extmod/modurandom.c \
- extmod/modure.c \
- extmod/moduselect.c \
- extmod/modusocket.c \
- extmod/modussl_axtls.c \
- extmod/modussl_mbedtls.c \
- extmod/modutime.c \
- extmod/modutimeq.c \
- extmod/moduwebsocket.c \
- extmod/moduzlib.c \
extmod/modwebrepl.c \
+ extmod/modwebsocket.c \
+ extmod/modzlib.c \
extmod/network_cyw43.c \
extmod/network_lwip.c \
extmod/network_ninaw10.c \
extmod/network_wiznet5k.c \
- extmod/uos_dupterm.c \
+ extmod/os_dupterm.c \
extmod/vfs.c \
extmod/vfs_blockdev.c \
extmod/vfs_fat.c \
diff --git a/extmod/modubinascii.c b/extmod/modbinascii.c
index af8eab79f0..af8eab79f0 100644
--- a/extmod/modubinascii.c
+++ b/extmod/modbinascii.c
diff --git a/extmod/moducryptolib.c b/extmod/modcryptolib.c
index 2299477259..2299477259 100644
--- a/extmod/moducryptolib.c
+++ b/extmod/modcryptolib.c
diff --git a/extmod/moduhashlib.c b/extmod/modhashlib.c
index 1b94cc01a0..1b94cc01a0 100644
--- a/extmod/moduhashlib.c
+++ b/extmod/modhashlib.c
diff --git a/extmod/moduheapq.c b/extmod/modheapq.c
index 79a12c2b9c..79a12c2b9c 100644
--- a/extmod/moduheapq.c
+++ b/extmod/modheapq.c
diff --git a/extmod/modujson.c b/extmod/modjson.c
index 1b475543e1..1b475543e1 100644
--- a/extmod/modujson.c
+++ b/extmod/modjson.c
diff --git a/extmod/modlwip.c b/extmod/modlwip.c
index a902e8fb0f..24047b0a98 100644
--- a/extmod/modlwip.c
+++ b/extmod/modlwip.c
@@ -1801,7 +1801,7 @@ const mp_obj_module_t mp_module_lwip = {
MP_REGISTER_MODULE(MP_QSTR_lwip, mp_module_lwip);
-// On LWIP-ports, this is the socket module (replaces extmod/modusocket.c).
+// On LWIP-ports, this is the socket module (replaces extmod/modsocket.c).
MP_REGISTER_MODULE(MP_QSTR_socket, mp_module_lwip);
MP_REGISTER_ROOT_POINTER(mp_obj_t lwip_slip_stream);
diff --git a/extmod/moduos.c b/extmod/modos.c
index e962a6c171..e962a6c171 100644
--- a/extmod/moduos.c
+++ b/extmod/modos.c
diff --git a/extmod/moduplatform.c b/extmod/modplatform.c
index 4d10bdb4df..4d10bdb4df 100644
--- a/extmod/moduplatform.c
+++ b/extmod/modplatform.c
diff --git a/extmod/modurandom.c b/extmod/modrandom.c
index 1c697aec70..1c697aec70 100644
--- a/extmod/modurandom.c
+++ b/extmod/modrandom.c
diff --git a/extmod/modure.c b/extmod/modre.c
index c8a019be89..c8a019be89 100644
--- a/extmod/modure.c
+++ b/extmod/modre.c
diff --git a/extmod/moduselect.c b/extmod/modselect.c
index 011d5cb832..011d5cb832 100644
--- a/extmod/moduselect.c
+++ b/extmod/modselect.c
diff --git a/extmod/modusocket.c b/extmod/modsocket.c
index 316a578ac2..316a578ac2 100644
--- a/extmod/modusocket.c
+++ b/extmod/modsocket.c
diff --git a/extmod/modussl_axtls.c b/extmod/modssl_axtls.c
index 1c9caf76eb..1c9caf76eb 100644
--- a/extmod/modussl_axtls.c
+++ b/extmod/modssl_axtls.c
diff --git a/extmod/modussl_mbedtls.c b/extmod/modssl_mbedtls.c
index d724e0a08a..d724e0a08a 100644
--- a/extmod/modussl_mbedtls.c
+++ b/extmod/modssl_mbedtls.c
diff --git a/extmod/modutime.c b/extmod/modtime.c
index 163b874d5e..163b874d5e 100644
--- a/extmod/modutime.c
+++ b/extmod/modtime.c
diff --git a/extmod/modutimeq.c b/extmod/modtimeq.c
index 7c037ea0a9..7c037ea0a9 100644
--- a/extmod/modutimeq.c
+++ b/extmod/modtimeq.c
diff --git a/extmod/moduwebsocket.c b/extmod/modwebsocket.c
index 3bf50cc58c..3bf50cc58c 100644
--- a/extmod/moduwebsocket.c
+++ b/extmod/modwebsocket.c
diff --git a/extmod/moduzlib.c b/extmod/modzlib.c
index a912f113ce..a912f113ce 100644
--- a/extmod/moduzlib.c
+++ b/extmod/modzlib.c
diff --git a/extmod/uos_dupterm.c b/extmod/os_dupterm.c
index cfd1c62616..cfd1c62616 100644
--- a/extmod/uos_dupterm.c
+++ b/extmod/os_dupterm.c
diff --git a/ports/cc3200/application.mk b/ports/cc3200/application.mk
index 78c2b8044a..5021e4ff3c 100644
--- a/ports/cc3200/application.mk
+++ b/ports/cc3200/application.mk
@@ -78,9 +78,9 @@ APP_MISC_SRC_C = $(addprefix misc/,\
APP_MODS_SRC_C = $(addprefix mods/,\
modmachine.c \
modnetwork.c \
- moduos.c \
- modusocket.c \
- modussl.c \
+ modos.c \
+ modsocket.c \
+ modssl.c \
modwipy.c \
modwlan.c \
pybadc.c \
diff --git a/ports/cc3200/mods/moduhashlib.c b/ports/cc3200/mods/modhashlib.c
index de56e114af..de56e114af 100644
--- a/ports/cc3200/mods/moduhashlib.c
+++ b/ports/cc3200/mods/modhashlib.c
diff --git a/ports/cc3200/mods/moduos.c b/ports/cc3200/mods/modos.c
index 7b1e8d79fd..7b1e8d79fd 100644
--- a/ports/cc3200/mods/moduos.c
+++ b/ports/cc3200/mods/modos.c
diff --git a/ports/cc3200/mods/modusocket.c b/ports/cc3200/mods/modsocket.c
index fd09cd6a41..fd09cd6a41 100644
--- a/ports/cc3200/mods/modusocket.c
+++ b/ports/cc3200/mods/modsocket.c
diff --git a/ports/cc3200/mods/modussl.c b/ports/cc3200/mods/modssl.c
index eb3aea1f85..eb3aea1f85 100644
--- a/ports/cc3200/mods/modussl.c
+++ b/ports/cc3200/mods/modssl.c
diff --git a/ports/cc3200/mods/modutime.c b/ports/cc3200/mods/modtime.c
index 6fa98296d2..6fa98296d2 100644
--- a/ports/cc3200/mods/modutime.c
+++ b/ports/cc3200/mods/modtime.c
diff --git a/ports/embed/embed.mk b/ports/embed/embed.mk
index 7fb344d704..84d45accd2 100644
--- a/ports/embed/embed.mk
+++ b/ports/embed/embed.mk
@@ -52,7 +52,7 @@ micropython-embed-package: $(GENHDR_OUTPUT)
$(ECHO) "- py"
$(Q)$(CP) $(TOP)/py/*.[ch] $(PACKAGE_DIR)/py
$(ECHO) "- extmod"
- $(Q)$(CP) $(TOP)/extmod/moduplatform.h $(PACKAGE_DIR)/extmod
+ $(Q)$(CP) $(TOP)/extmod/modplatform.h $(PACKAGE_DIR)/extmod
$(ECHO) "- shared"
$(Q)$(CP) $(TOP)/shared/runtime/gchelper.h $(PACKAGE_DIR)/shared/runtime
$(Q)$(CP) $(TOP)/shared/runtime/gchelper_generic.c $(PACKAGE_DIR)/shared/runtime
diff --git a/ports/esp32/moduos.c b/ports/esp32/modos.c
index 287f1d9900..287f1d9900 100644
--- a/ports/esp32/moduos.c
+++ b/ports/esp32/modos.c
diff --git a/ports/esp32/modutime.c b/ports/esp32/modtime.c
index 7a2b215086..7a2b215086 100644
--- a/ports/esp32/modutime.c
+++ b/ports/esp32/modtime.c
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index d25a5c2734..217a9ec297 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -88,7 +88,7 @@
#define MICROPY_PY_HASHLIB_SHA256 (1)
#define MICROPY_PY_CRYPTOLIB (1)
#define MICROPY_PY_RANDOM_SEED_INIT_FUNC (esp_random())
-#define MICROPY_PY_OS_INCLUDEFILE "ports/esp32/moduos.c"
+#define MICROPY_PY_OS_INCLUDEFILE "ports/esp32/modos.c"
#define MICROPY_PY_OS_DUPTERM (1)
#define MICROPY_PY_OS_DUPTERM_NOTIFY (1)
#define MICROPY_PY_OS_SYNC (1)
diff --git a/ports/esp8266/boards/esp8266_common.ld b/ports/esp8266/boards/esp8266_common.ld
index 7e230fd42a..083e84d9af 100644
--- a/ports/esp8266/boards/esp8266_common.ld
+++ b/ports/esp8266/boards/esp8266_common.ld
@@ -164,7 +164,7 @@ SECTIONS
*machine_hspi.o(.literal*, .text*)
*hspi.o(.literal*, .text*)
*modesp.o(.literal* .text*)
- *moduos.o(.literal* .text*)
+ *modos.o(.literal* .text*)
*modlwip.o(.literal* .text*)
*modsocket.o(.literal* .text*)
*modonewire.o(.literal* .text*)
diff --git a/ports/esp8266/moduos.c b/ports/esp8266/modos.c
index 78072d4f44..78072d4f44 100644
--- a/ports/esp8266/moduos.c
+++ b/ports/esp8266/modos.c
diff --git a/ports/esp8266/modutime.c b/ports/esp8266/modtime.c
index 21dd3cbcd9..21dd3cbcd9 100644
--- a/ports/esp8266/modutime.c
+++ b/ports/esp8266/modtime.c
diff --git a/ports/esp8266/mpconfigport.h b/ports/esp8266/mpconfigport.h
index 9985d59dd3..37a794f44b 100644
--- a/ports/esp8266/mpconfigport.h
+++ b/ports/esp8266/mpconfigport.h
@@ -58,7 +58,7 @@
#define MICROPY_PY_RANDOM_SEED_INIT_FUNC (*WDEV_HWRNG)
#define MICROPY_PY_TIME_GMTIME_LOCALTIME_MKTIME (1)
#define MICROPY_PY_TIME_TIME_TIME_NS (1)
-#define MICROPY_PY_TIME_INCLUDEFILE "ports/esp8266/modutime.c"
+#define MICROPY_PY_TIME_INCLUDEFILE "ports/esp8266/modtime.c"
#define MICROPY_PY_LWIP (1)
#define MICROPY_PY_LWIP_SOCK_RAW (1)
#define MICROPY_PY_MACHINE (1)
diff --git a/ports/mimxrt/moduos.c b/ports/mimxrt/modos.c
index ecfc3712d7..ecfc3712d7 100644
--- a/ports/mimxrt/moduos.c
+++ b/ports/mimxrt/modos.c
diff --git a/ports/mimxrt/modutime.c b/ports/mimxrt/modtime.c
index b0c927899f..b0c927899f 100644
--- a/ports/mimxrt/modutime.c
+++ b/ports/mimxrt/modtime.c
diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index be086cb552..b1cd84f265 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -72,8 +72,8 @@ uint32_t trng_random_u32(void);
#define MICROPY_PY_SSL_FINALISER (MICROPY_PY_SSL)
#define MICROPY_PY_TIME_GMTIME_LOCALTIME_MKTIME (1)
#define MICROPY_PY_TIME_TIME_TIME_NS (1)
-#define MICROPY_PY_TIME_INCLUDEFILE "ports/mimxrt/modutime.c"
-#define MICROPY_PY_OS_INCLUDEFILE "ports/mimxrt/moduos.c"
+#define MICROPY_PY_TIME_INCLUDEFILE "ports/mimxrt/modtime.c"
+#define MICROPY_PY_OS_INCLUDEFILE "ports/mimxrt/modos.c"
#define MICROPY_PY_OS_DUPTERM (3)
#define MICROPY_PY_OS_DUPTERM_NOTIFY (1)
#define MICROPY_PY_OS_SYNC (1)
diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile
index 54701adacb..89bb03dfae 100644
--- a/ports/nrf/Makefile
+++ b/ports/nrf/Makefile
@@ -329,8 +329,8 @@ DRIVERS_SRC_C += $(addprefix modules/,\
machine/timer.c \
machine/rtcounter.c \
machine/temp.c \
- uos/moduos.c \
- uos/microbitfs.c \
+ os/modos.c \
+ os/microbitfs.c \
board/modboard.c \
board/led.c \
ubluepy/modubluepy.c \
diff --git a/ports/nrf/modules/uos/microbitfs.c b/ports/nrf/modules/os/microbitfs.c
index 5ffe837efe..5ffe837efe 100644
--- a/ports/nrf/modules/uos/microbitfs.c
+++ b/ports/nrf/modules/os/microbitfs.c
diff --git a/ports/nrf/modules/uos/microbitfs.h b/ports/nrf/modules/os/microbitfs.h
index 56d111383e..56d111383e 100644
--- a/ports/nrf/modules/uos/microbitfs.h
+++ b/ports/nrf/modules/os/microbitfs.h
diff --git a/ports/nrf/modules/uos/moduos.c b/ports/nrf/modules/os/modos.c
index 7c54f28ab4..7c54f28ab4 100644
--- a/ports/nrf/modules/uos/moduos.c
+++ b/ports/nrf/modules/os/modos.c
diff --git a/ports/renesas-ra/moduos.c b/ports/renesas-ra/modos.c
index e6aadd9ebc..e6aadd9ebc 100644
--- a/ports/renesas-ra/moduos.c
+++ b/ports/renesas-ra/modos.c
diff --git a/ports/renesas-ra/modutime.c b/ports/renesas-ra/modtime.c
index 1ab51e336d..1ab51e336d 100644
--- a/ports/renesas-ra/modutime.c
+++ b/ports/renesas-ra/modtime.c
diff --git a/ports/renesas-ra/mpconfigport.h b/ports/renesas-ra/mpconfigport.h
index 1886d31541..42ce0b6827 100644
--- a/ports/renesas-ra/mpconfigport.h
+++ b/ports/renesas-ra/mpconfigport.h
@@ -91,7 +91,7 @@
#endif
// extended modules
-#define MICROPY_PY_OS_INCLUDEFILE "ports/renesas-ra/moduos.c"
+#define MICROPY_PY_OS_INCLUDEFILE "ports/renesas-ra/modos.c"
#define MICROPY_PY_OS_DUPTERM (3)
#define MICROPY_PY_OS_DUPTERM_BUILTIN_STREAM (1)
#define MICROPY_PY_OS_DUPTERM_STREAM_DETACHED_ATTACHED (1)
diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index 3dff0d54c6..55c542173a 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -157,7 +157,7 @@ set(MICROPY_SOURCE_QSTR
${PROJECT_SOURCE_DIR}/machine_wdt.c
${PROJECT_SOURCE_DIR}/modmachine.c
${PROJECT_SOURCE_DIR}/modrp2.c
- ${PROJECT_SOURCE_DIR}/moduos.c
+ ${PROJECT_SOURCE_DIR}/modos.c
${PROJECT_SOURCE_DIR}/rp2_flash.c
${PROJECT_SOURCE_DIR}/rp2_pio.c
${CMAKE_BINARY_DIR}/pins_${MICROPY_BOARD}.c
diff --git a/ports/rp2/moduos.c b/ports/rp2/modos.c
index 77f980a731..77f980a731 100644
--- a/ports/rp2/moduos.c
+++ b/ports/rp2/modos.c
diff --git a/ports/rp2/modutime.c b/ports/rp2/modtime.c
index b4120be7c3..b4120be7c3 100644
--- a/ports/rp2/modutime.c
+++ b/ports/rp2/modtime.c
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index de05a281bd..28b06fa3a8 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -95,7 +95,7 @@
// Extended modules
#define MICROPY_EPOCH_IS_1970 (1)
-#define MICROPY_PY_OS_INCLUDEFILE "ports/rp2/moduos.c"
+#define MICROPY_PY_OS_INCLUDEFILE "ports/rp2/modos.c"
#ifndef MICROPY_PY_OS_DUPTERM
#define MICROPY_PY_OS_DUPTERM (1)
#endif
@@ -108,7 +108,7 @@
#define MICROPY_PY_CRYPTOLIB (1)
#define MICROPY_PY_TIME_GMTIME_LOCALTIME_MKTIME (1)
#define MICROPY_PY_TIME_TIME_TIME_NS (1)
-#define MICROPY_PY_TIME_INCLUDEFILE "ports/rp2/modutime.c"
+#define MICROPY_PY_TIME_INCLUDEFILE "ports/rp2/modtime.c"
#define MICROPY_PY_RANDOM_SEED_INIT_FUNC (rosc_random_u32())
#define MICROPY_PY_MACHINE (1)
#define MICROPY_PY_MACHINE_PIN_MAKE_NEW mp_pin_make_new
diff --git a/ports/samd/moduos.c b/ports/samd/modos.c
index f9df0cd996..f9df0cd996 100644
--- a/ports/samd/moduos.c
+++ b/ports/samd/modos.c
diff --git a/ports/samd/modutime.c b/ports/samd/modtime.c
index aa5bd33609..aa5bd33609 100644
--- a/ports/samd/modutime.c
+++ b/ports/samd/modtime.c
diff --git a/ports/stm32/moduos.c b/ports/stm32/modos.c
index 43543aa55e..43543aa55e 100644
--- a/ports/stm32/moduos.c
+++ b/ports/stm32/modos.c
diff --git a/ports/stm32/modutime.c b/ports/stm32/modtime.c
index e7160cd5b2..e7160cd5b2 100644
--- a/ports/stm32/modutime.c
+++ b/ports/stm32/modtime.c
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index 49a8a03405..c0a95cf5d5 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -96,7 +96,7 @@
#define MICROPY_PY_HASHLIB_MD5 (MICROPY_PY_SSL)
#define MICROPY_PY_HASHLIB_SHA1 (MICROPY_PY_SSL)
#define MICROPY_PY_CRYPTOLIB (MICROPY_PY_SSL)
-#define MICROPY_PY_OS_INCLUDEFILE "ports/stm32/moduos.c"
+#define MICROPY_PY_OS_INCLUDEFILE "ports/stm32/modos.c"
#define MICROPY_PY_OS_DUPTERM (3)
#define MICROPY_PY_OS_DUPTERM_BUILTIN_STREAM (1)
#define MICROPY_PY_OS_DUPTERM_STREAM_DETACHED_ATTACHED (1)
@@ -107,7 +107,7 @@
#define MICROPY_PY_RANDOM_SEED_INIT_FUNC (rng_get())
#define MICROPY_PY_TIME_GMTIME_LOCALTIME_MKTIME (1)
#define MICROPY_PY_TIME_TIME_TIME_NS (1)
-#define MICROPY_PY_TIME_INCLUDEFILE "ports/stm32/modutime.c"
+#define MICROPY_PY_TIME_INCLUDEFILE "ports/stm32/modtime.c"
#ifndef MICROPY_PY_TIMEQ
#define MICROPY_PY_TIMEQ (1)
#endif
diff --git a/ports/unix/Makefile b/ports/unix/Makefile
index 9ff19aab98..a8981e8f5c 100644
--- a/ports/unix/Makefile
+++ b/ports/unix/Makefile
@@ -201,7 +201,7 @@ SRC_C += \
mpthreadport.c \
input.c \
modmachine.c \
- moduselect.c \
+ modselect.c \
alloc.c \
fatfs_port.c \
mpbthciport.c \
@@ -210,7 +210,7 @@ SRC_C += \
mpbtstackport_usb.c \
mpnimbleport.c \
modtermios.c \
- modusocket.c \
+ modsocket.c \
modffi.c \
modjni.c \
$(wildcard $(VARIANT_DIR)/*.c)
diff --git a/ports/unix/moduos.c b/ports/unix/modos.c
index 1d5e2afef4..1d5e2afef4 100644
--- a/ports/unix/moduos.c
+++ b/ports/unix/modos.c
diff --git a/ports/unix/moduselect.c b/ports/unix/modselect.c
index 97c3602e4b..97c3602e4b 100644
--- a/ports/unix/moduselect.c
+++ b/ports/unix/modselect.c
diff --git a/ports/unix/modusocket.c b/ports/unix/modsocket.c
index 9854f3cbce..9854f3cbce 100644
--- a/ports/unix/modusocket.c
+++ b/ports/unix/modsocket.c
diff --git a/ports/unix/modutime.c b/ports/unix/modtime.c
index b6fbae0d1c..b6fbae0d1c 100644
--- a/ports/unix/modutime.c
+++ b/ports/unix/modtime.c
diff --git a/ports/unix/variants/mpconfigvariant_common.h b/ports/unix/variants/mpconfigvariant_common.h
index cc50d426ce..afdd313134 100644
--- a/ports/unix/variants/mpconfigvariant_common.h
+++ b/ports/unix/variants/mpconfigvariant_common.h
@@ -87,7 +87,7 @@
#define MICROPY_PY_SYS_EXC_INFO (1)
// Configure the "os" module with extra unix features.
-#define MICROPY_PY_OS_INCLUDEFILE "ports/unix/moduos.c"
+#define MICROPY_PY_OS_INCLUDEFILE "ports/unix/modos.c"
#define MICROPY_PY_OS_ERRNO (1)
#define MICROPY_PY_OS_GETENV_PUTENV_UNSETENV (1)
#define MICROPY_PY_OS_SEP (1)
@@ -98,7 +98,7 @@
#define MICROPY_PY_TIME (1)
#define MICROPY_PY_TIME_TIME_TIME_NS (1)
#define MICROPY_PY_TIME_CUSTOM_SLEEP (1)
-#define MICROPY_PY_TIME_INCLUDEFILE "ports/unix/modutime.c"
+#define MICROPY_PY_TIME_INCLUDEFILE "ports/unix/modtime.c"
// Enable the utimeq module used by the previous (v2) version of uasyncio.
#define MICROPY_PY_TIMEQ (1)
diff --git a/ports/windows/mpconfigport.h b/ports/windows/mpconfigport.h
index 87e12562b1..239dcfec91 100644
--- a/ports/windows/mpconfigport.h
+++ b/ports/windows/mpconfigport.h
@@ -131,7 +131,7 @@
#endif
#define MICROPY_PY_OS (1)
-#define MICROPY_PY_OS_INCLUDEFILE "ports/unix/moduos.c"
+#define MICROPY_PY_OS_INCLUDEFILE "ports/unix/modos.c"
#define MICROPY_PY_OS_ERRNO (1)
#define MICROPY_PY_OS_GETENV_PUTENV_UNSETENV (1)
#define MICROPY_PY_OS_SEP (1)
@@ -141,7 +141,7 @@
#define MICROPY_PY_TIME (1)
#define MICROPY_PY_TIME_TIME_TIME_NS (1)
#define MICROPY_PY_TIME_CUSTOM_SLEEP (1)
-#define MICROPY_PY_TIME_INCLUDEFILE "ports/unix/modutime.c"
+#define MICROPY_PY_TIME_INCLUDEFILE "ports/unix/modtime.c"
#define MICROPY_PY_ERRNO (1)
#define MICROPY_PY_UCTYPES (1)
#define MICROPY_PY_ZLIB (1)
diff --git a/ports/windows/msvc/sources.props b/ports/windows/msvc/sources.props
index de950c3ac9..24cdcd82da 100644
--- a/ports/windows/msvc/sources.props
+++ b/ports/windows/msvc/sources.props
@@ -8,18 +8,18 @@
<PyExtModSource Include="$(PyBaseDir)extmod\machine_pulse.c" />
<PyExtModSource Include="$(PyBaseDir)extmod\machine_signal.c" />
<PyExtModSource Include="$(PyBaseDir)extmod\moduasyncio.c" />
- <PyExtModSource Include="$(PyBaseDir)extmod\modubinascii.c" />
+ <PyExtModSource Include="$(PyBaseDir)extmod\modbinascii.c" />
<PyExtModSource Include="$(PyBaseDir)extmod\moductypes.c" />
- <PyExtModSource Include="$(PyBaseDir)extmod\moduhashlib.c" />
- <PyExtModSource Include="$(PyBaseDir)extmod\moduheapq.c" />
- <PyExtModSource Include="$(PyBaseDir)extmod\modujson.c" />
- <PyExtModSource Include="$(PyBaseDir)extmod\moduos.c" />
- <PyExtModSource Include="$(PyBaseDir)extmod\modurandom.c" />
- <PyExtModSource Include="$(PyBaseDir)extmod\modure.c" />
- <PyExtModSource Include="$(PyBaseDir)extmod\moduselect.c" />
- <PyExtModSource Include="$(PyBaseDir)extmod\modutime.c" />
- <PyExtModSource Include="$(PyBaseDir)extmod\modutimeq.c" />
- <PyExtModSource Include="$(PyBaseDir)extmod\moduzlib.c" />
+ <PyExtModSource Include="$(PyBaseDir)extmod\modhashlib.c" />
+ <PyExtModSource Include="$(PyBaseDir)extmod\modheapq.c" />
+ <PyExtModSource Include="$(PyBaseDir)extmod\modjson.c" />
+ <PyExtModSource Include="$(PyBaseDir)extmod\modos.c" />
+ <PyExtModSource Include="$(PyBaseDir)extmod\modrandom.c" />
+ <PyExtModSource Include="$(PyBaseDir)extmod\modre.c" />
+ <PyExtModSource Include="$(PyBaseDir)extmod\modselect.c" />
+ <PyExtModSource Include="$(PyBaseDir)extmod\modtime.c" />
+ <PyExtModSource Include="$(PyBaseDir)extmod\modtimeq.c" />
+ <PyExtModSource Include="$(PyBaseDir)extmod\modzlib.c" />
<PyExtModSource Include="$(PyBaseDir)extmod\virtpin.c" />
<PyExtModSource Include="$(PyBaseDir)extmod\vfs.c" />
<PyExtModSource Include="$(PyBaseDir)extmod\vfs_posix.c" />
diff --git a/ports/zephyr/CMakeLists.txt b/ports/zephyr/CMakeLists.txt
index 39942bdc84..ddc613a2c0 100644
--- a/ports/zephyr/CMakeLists.txt
+++ b/ports/zephyr/CMakeLists.txt
@@ -43,7 +43,7 @@ set(MICROPY_SOURCE_PORT
machine_uart.c
modbluetooth_zephyr.c
modmachine.c
- modusocket.c
+ modsocket.c
modzephyr.c
modzsensor.c
mphalport.c
diff --git a/ports/zephyr/modusocket.c b/ports/zephyr/modsocket.c
index 8d4197410c..8d4197410c 100644
--- a/ports/zephyr/modusocket.c
+++ b/ports/zephyr/modsocket.c
diff --git a/ports/zephyr/modutime.c b/ports/zephyr/modtime.c
index 65ba1e6e69..65ba1e6e69 100644
--- a/ports/zephyr/modutime.c
+++ b/ports/zephyr/modtime.c
diff --git a/ports/zephyr/mpconfigport.h b/ports/zephyr/mpconfigport.h
index ec759bda77..df24e52002 100644
--- a/ports/zephyr/mpconfigport.h
+++ b/ports/zephyr/mpconfigport.h
@@ -87,7 +87,7 @@
#define MICROPY_PY_OS (1)
#define MICROPY_PY_TIME (1)
#define MICROPY_PY_TIME_TIME_TIME_NS (1)
-#define MICROPY_PY_TIME_INCLUDEFILE "ports/zephyr/modutime.c"
+#define MICROPY_PY_TIME_INCLUDEFILE "ports/zephyr/modtime.c"
#define MICROPY_PY_ZEPHYR (1)
#define MICROPY_PY_ZSENSOR (1)
#define MICROPY_PY_SYS_MODULES (0)
diff --git a/py/moduerrno.c b/py/moderrno.c
index 99ca101bd6..99ca101bd6 100644
--- a/py/moduerrno.c
+++ b/py/moderrno.c
diff --git a/py/py.cmake b/py/py.cmake
index 07d1fe05ff..95a841b5f4 100644
--- a/py/py.cmake
+++ b/py/py.cmake
@@ -47,7 +47,7 @@ set(MICROPY_SOURCE_PY
${MICROPY_PY_DIR}/modstruct.c
${MICROPY_PY_DIR}/modsys.c
${MICROPY_PY_DIR}/modthread.c
- ${MICROPY_PY_DIR}/moduerrno.c
+ ${MICROPY_PY_DIR}/moderrno.c
${MICROPY_PY_DIR}/mpprint.c
${MICROPY_PY_DIR}/mpstate.c
${MICROPY_PY_DIR}/mpz.c
diff --git a/py/py.mk b/py/py.mk
index 1dc0c8641f..ffb853c652 100644
--- a/py/py.mk
+++ b/py/py.mk
@@ -185,7 +185,7 @@ PY_CORE_O_BASENAME = $(addprefix py/,\
modmicropython.o \
modstruct.o \
modsys.o \
- moduerrno.o \
+ moderrno.o \
modthread.o \
vm.o \
bc.o \
diff --git a/tools/codeformat.py b/tools/codeformat.py
index 4a2cfb3367..517aced37a 100755
--- a/tools/codeformat.py
+++ b/tools/codeformat.py
@@ -69,8 +69,8 @@ EXCLUSIONS = [
"ports/nrf/modules/machine/*.[ch]",
"ports/nrf/modules/music/*.[ch]",
"ports/nrf/modules/ubluepy/*.[ch]",
- "ports/nrf/modules/uos/*.[ch]",
- "ports/nrf/modules/utime/*.[ch]",
+ "ports/nrf/modules/os/*.[ch]",
+ "ports/nrf/modules/time/*.[ch]",
# STM32 USB dev/host code is mostly 3rd party.
"ports/stm32/usbdev/**/*.[ch]",
"ports/stm32/usbhost/**/*.[ch]",
generated by cgit v1.2.3 (git 2.39.1) at 2025-05-02 09:09:45 +0000