From 45ac651d1a2801bccbdc32fddaa9b029ed4ce879 Mon Sep 17 00:00:00 2001 From: Jim Mussared Date: Thu, 18 Aug 2022 16:24:27 +1000 Subject: [PATCH] all: Rename *umodule*.c to remove the "u" prefix. Updates any includes, and references from Makefiles/CMake. This essentially reverts what was done long ago in commit 136b5cbd7669e8318f8455fc2706da97a5b7994c This work was funded through GitHub Sponsors. Signed-off-by: Jim Mussared --- .../embedding/Makefile.upylib | 0 examples/natmod/uheapq/uheapq.c | 2 +- examples/natmod/urandom/urandom.c | 2 +- examples/natmod/ure/ure.c | 2 +- examples/natmod/uzlib/uzlib.c | 2 +- extmod/extmod.cmake | 36 +++++++++---------- extmod/extmod.mk | 36 +++++++++---------- extmod/{modubinascii.c => modbinascii.c} | 0 extmod/{moducryptolib.c => modcryptolib.c} | 0 extmod/{moduhashlib.c => modhashlib.c} | 0 extmod/{moduheapq.c => modheapq.c} | 0 extmod/{modujson.c => modjson.c} | 0 extmod/modlwip.c | 2 +- extmod/{moduos.c => modos.c} | 0 extmod/{moduplatform.c => modplatform.c} | 0 extmod/{modurandom.c => modrandom.c} | 0 extmod/{modure.c => modre.c} | 0 extmod/{moduselect.c => modselect.c} | 0 extmod/{modusocket.c => modsocket.c} | 0 extmod/{modussl_axtls.c => modssl_axtls.c} | 0 .../{modussl_mbedtls.c => modssl_mbedtls.c} | 0 extmod/{modutime.c => modtime.c} | 0 extmod/{modutimeq.c => modtimeq.c} | 0 extmod/{moduwebsocket.c => modwebsocket.c} | 0 extmod/{moduzlib.c => modzlib.c} | 0 extmod/{uos_dupterm.c => os_dupterm.c} | 0 ports/cc3200/application.mk | 6 ++-- .../mods/{moduhashlib.c => modhashlib.c} | 0 ports/cc3200/mods/{moduos.c => modos.c} | 0 .../cc3200/mods/{modusocket.c => modsocket.c} | 0 ports/cc3200/mods/{modussl.c => modssl.c} | 0 ports/cc3200/mods/{modutime.c => modtime.c} | 0 ports/embed/embed.mk | 2 +- ports/esp32/{moduos.c => modos.c} | 0 ports/esp32/{modutime.c => modtime.c} | 0 ports/esp32/mpconfigport.h | 2 +- ports/esp8266/boards/esp8266_common.ld | 2 +- ports/esp8266/{moduos.c => modos.c} | 0 ports/esp8266/{modutime.c => modtime.c} | 0 ports/esp8266/mpconfigport.h | 2 +- ports/mimxrt/{moduos.c => modos.c} | 0 ports/mimxrt/{modutime.c => modtime.c} | 0 ports/mimxrt/mpconfigport.h | 4 +-- ports/nrf/Makefile | 4 +-- ports/nrf/modules/{uos => os}/microbitfs.c | 0 ports/nrf/modules/{uos => os}/microbitfs.h | 0 .../nrf/modules/{uos/moduos.c => os/modos.c} | 0 ports/renesas-ra/{moduos.c => modos.c} | 0 ports/renesas-ra/{modutime.c => modtime.c} | 0 ports/renesas-ra/mpconfigport.h | 2 +- ports/rp2/CMakeLists.txt | 2 +- ports/rp2/{moduos.c => modos.c} | 0 ports/rp2/{modutime.c => modtime.c} | 0 ports/rp2/mpconfigport.h | 4 +-- ports/samd/{moduos.c => modos.c} | 0 ports/samd/{modutime.c => modtime.c} | 0 ports/stm32/{moduos.c => modos.c} | 0 ports/stm32/{modutime.c => modtime.c} | 0 ports/stm32/mpconfigport.h | 4 +-- ports/unix/Makefile | 4 +-- ports/unix/{moduos.c => modos.c} | 0 ports/unix/{moduselect.c => modselect.c} | 0 ports/unix/{modusocket.c => modsocket.c} | 0 ports/unix/{modutime.c => modtime.c} | 0 ports/unix/variants/mpconfigvariant_common.h | 4 +-- ports/windows/mpconfigport.h | 4 +-- ports/windows/msvc/sources.props | 22 ++++++------ ports/zephyr/CMakeLists.txt | 2 +- ports/zephyr/{modusocket.c => modsocket.c} | 0 ports/zephyr/{modutime.c => modtime.c} | 0 ports/zephyr/mpconfigport.h | 2 +- py/{moduerrno.c => moderrno.c} | 0 py/py.cmake | 2 +- py/py.mk | 2 +- tools/codeformat.py | 4 +-- 75 files changed, 81 insertions(+), 81 deletions(-) rename extmod/utime_mphal.c => examples/embedding/Makefile.upylib (100%) rename extmod/{modubinascii.c => modbinascii.c} (100%) rename extmod/{moducryptolib.c => modcryptolib.c} (100%) rename extmod/{moduhashlib.c => modhashlib.c} (100%) rename extmod/{moduheapq.c => modheapq.c} (100%) rename extmod/{modujson.c => modjson.c} (100%) rename extmod/{moduos.c => modos.c} (100%) rename extmod/{moduplatform.c => modplatform.c} (100%) rename extmod/{modurandom.c => modrandom.c} (100%) rename extmod/{modure.c => modre.c} (100%) rename extmod/{moduselect.c => modselect.c} (100%) rename extmod/{modusocket.c => modsocket.c} (100%) rename extmod/{modussl_axtls.c => modssl_axtls.c} (100%) rename extmod/{modussl_mbedtls.c => modssl_mbedtls.c} (100%) rename extmod/{modutime.c => modtime.c} (100%) rename extmod/{modutimeq.c => modtimeq.c} (100%) rename extmod/{moduwebsocket.c => modwebsocket.c} (100%) rename extmod/{moduzlib.c => modzlib.c} (100%) rename extmod/{uos_dupterm.c => os_dupterm.c} (100%) rename ports/cc3200/mods/{moduhashlib.c => modhashlib.c} (100%) rename ports/cc3200/mods/{moduos.c => modos.c} (100%) rename ports/cc3200/mods/{modusocket.c => modsocket.c} (100%) rename ports/cc3200/mods/{modussl.c => modssl.c} (100%) rename ports/cc3200/mods/{modutime.c => modtime.c} (100%) rename ports/esp32/{moduos.c => modos.c} (100%) rename ports/esp32/{modutime.c => modtime.c} (100%) rename ports/esp8266/{moduos.c => modos.c} (100%) rename ports/esp8266/{modutime.c => modtime.c} (100%) rename ports/mimxrt/{moduos.c => modos.c} (100%) rename ports/mimxrt/{modutime.c => modtime.c} (100%) rename ports/nrf/modules/{uos => os}/microbitfs.c (100%) rename ports/nrf/modules/{uos => os}/microbitfs.h (100%) rename ports/nrf/modules/{uos/moduos.c => os/modos.c} (100%) rename ports/renesas-ra/{moduos.c => modos.c} (100%) rename ports/renesas-ra/{modutime.c => modtime.c} (100%) rename ports/rp2/{moduos.c => modos.c} (100%) rename ports/rp2/{modutime.c => modtime.c} (100%) rename ports/samd/{moduos.c => modos.c} (100%) rename ports/samd/{modutime.c => modtime.c} (100%) rename ports/stm32/{moduos.c => modos.c} (100%) rename ports/stm32/{modutime.c => modtime.c} (100%) rename ports/unix/{moduos.c => modos.c} (100%) rename ports/unix/{moduselect.c => modselect.c} (100%) rename ports/unix/{modusocket.c => modsocket.c} (100%) rename ports/unix/{modutime.c => modtime.c} (100%) rename ports/zephyr/{modusocket.c => modsocket.c} (100%) rename ports/zephyr/{modutime.c => modtime.c} (100%) rename py/{moduerrno.c => moderrno.c} (100%) diff --git a/extmod/utime_mphal.c b/examples/embedding/Makefile.upylib similarity index 100% rename from extmod/utime_mphal.c rename to examples/embedding/Makefile.upylib diff --git a/examples/natmod/uheapq/uheapq.c b/examples/natmod/uheapq/uheapq.c index e339ccafd..ed19652a6 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 ed46651b3..92257b8bc 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 79eca90ab..df89ea835 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 9a3ec0af3..2b0dbd5ca 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 675a4c6ec..2bb89423c 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 2f9bd3b06..a573da4c6 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 similarity index 100% rename from extmod/modubinascii.c rename to extmod/modbinascii.c diff --git a/extmod/moducryptolib.c b/extmod/modcryptolib.c similarity index 100% rename from extmod/moducryptolib.c rename to extmod/modcryptolib.c diff --git a/extmod/moduhashlib.c b/extmod/modhashlib.c similarity index 100% rename from extmod/moduhashlib.c rename to extmod/modhashlib.c diff --git a/extmod/moduheapq.c b/extmod/modheapq.c similarity index 100% rename from extmod/moduheapq.c rename to extmod/modheapq.c diff --git a/extmod/modujson.c b/extmod/modjson.c similarity index 100% rename from extmod/modujson.c rename to extmod/modjson.c diff --git a/extmod/modlwip.c b/extmod/modlwip.c index a902e8fb0..24047b0a9 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 similarity index 100% rename from extmod/moduos.c rename to extmod/modos.c diff --git a/extmod/moduplatform.c b/extmod/modplatform.c similarity index 100% rename from extmod/moduplatform.c rename to extmod/modplatform.c diff --git a/extmod/modurandom.c b/extmod/modrandom.c similarity index 100% rename from extmod/modurandom.c rename to extmod/modrandom.c diff --git a/extmod/modure.c b/extmod/modre.c similarity index 100% rename from extmod/modure.c rename to extmod/modre.c diff --git a/extmod/moduselect.c b/extmod/modselect.c similarity index 100% rename from extmod/moduselect.c rename to extmod/modselect.c diff --git a/extmod/modusocket.c b/extmod/modsocket.c similarity index 100% rename from extmod/modusocket.c rename to extmod/modsocket.c diff --git a/extmod/modussl_axtls.c b/extmod/modssl_axtls.c similarity index 100% rename from extmod/modussl_axtls.c rename to extmod/modssl_axtls.c diff --git a/extmod/modussl_mbedtls.c b/extmod/modssl_mbedtls.c similarity index 100% rename from extmod/modussl_mbedtls.c rename to extmod/modssl_mbedtls.c diff --git a/extmod/modutime.c b/extmod/modtime.c similarity index 100% rename from extmod/modutime.c rename to extmod/modtime.c diff --git a/extmod/modutimeq.c b/extmod/modtimeq.c similarity index 100% rename from extmod/modutimeq.c rename to extmod/modtimeq.c diff --git a/extmod/moduwebsocket.c b/extmod/modwebsocket.c similarity index 100% rename from extmod/moduwebsocket.c rename to extmod/modwebsocket.c diff --git a/extmod/moduzlib.c b/extmod/modzlib.c similarity index 100% rename from extmod/moduzlib.c rename to extmod/modzlib.c diff --git a/extmod/uos_dupterm.c b/extmod/os_dupterm.c similarity index 100% rename from extmod/uos_dupterm.c rename to extmod/os_dupterm.c diff --git a/ports/cc3200/application.mk b/ports/cc3200/application.mk index 78c2b8044..5021e4ff3 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 similarity index 100% rename from ports/cc3200/mods/moduhashlib.c rename to ports/cc3200/mods/modhashlib.c diff --git a/ports/cc3200/mods/moduos.c b/ports/cc3200/mods/modos.c similarity index 100% rename from ports/cc3200/mods/moduos.c rename to ports/cc3200/mods/modos.c diff --git a/ports/cc3200/mods/modusocket.c b/ports/cc3200/mods/modsocket.c similarity index 100% rename from ports/cc3200/mods/modusocket.c rename to ports/cc3200/mods/modsocket.c diff --git a/ports/cc3200/mods/modussl.c b/ports/cc3200/mods/modssl.c similarity index 100% rename from ports/cc3200/mods/modussl.c rename to ports/cc3200/mods/modssl.c diff --git a/ports/cc3200/mods/modutime.c b/ports/cc3200/mods/modtime.c similarity index 100% rename from ports/cc3200/mods/modutime.c rename to ports/cc3200/mods/modtime.c diff --git a/ports/embed/embed.mk b/ports/embed/embed.mk index 7fb344d70..84d45accd 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 similarity index 100% rename from ports/esp32/moduos.c rename to ports/esp32/modos.c diff --git a/ports/esp32/modutime.c b/ports/esp32/modtime.c similarity index 100% rename from ports/esp32/modutime.c rename to ports/esp32/modtime.c diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h index d25a5c273..217a9ec29 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 7e230fd42..083e84d9a 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 similarity index 100% rename from ports/esp8266/moduos.c rename to ports/esp8266/modos.c diff --git a/ports/esp8266/modutime.c b/ports/esp8266/modtime.c similarity index 100% rename from ports/esp8266/modutime.c rename to ports/esp8266/modtime.c diff --git a/ports/esp8266/mpconfigport.h b/ports/esp8266/mpconfigport.h index 9985d59dd..37a794f44 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 similarity index 100% rename from ports/mimxrt/moduos.c rename to ports/mimxrt/modos.c diff --git a/ports/mimxrt/modutime.c b/ports/mimxrt/modtime.c similarity index 100% rename from ports/mimxrt/modutime.c rename to ports/mimxrt/modtime.c diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h index be086cb55..b1cd84f26 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 54701adac..89bb03dfa 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 similarity index 100% rename from ports/nrf/modules/uos/microbitfs.c rename to ports/nrf/modules/os/microbitfs.c diff --git a/ports/nrf/modules/uos/microbitfs.h b/ports/nrf/modules/os/microbitfs.h similarity index 100% rename from ports/nrf/modules/uos/microbitfs.h rename to ports/nrf/modules/os/microbitfs.h diff --git a/ports/nrf/modules/uos/moduos.c b/ports/nrf/modules/os/modos.c similarity index 100% rename from ports/nrf/modules/uos/moduos.c rename to ports/nrf/modules/os/modos.c diff --git a/ports/renesas-ra/moduos.c b/ports/renesas-ra/modos.c similarity index 100% rename from ports/renesas-ra/moduos.c rename to ports/renesas-ra/modos.c diff --git a/ports/renesas-ra/modutime.c b/ports/renesas-ra/modtime.c similarity index 100% rename from ports/renesas-ra/modutime.c rename to ports/renesas-ra/modtime.c diff --git a/ports/renesas-ra/mpconfigport.h b/ports/renesas-ra/mpconfigport.h index 1886d3154..42ce0b682 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 3dff0d54c..55c542173 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 similarity index 100% rename from ports/rp2/moduos.c rename to ports/rp2/modos.c diff --git a/ports/rp2/modutime.c b/ports/rp2/modtime.c similarity index 100% rename from ports/rp2/modutime.c rename to ports/rp2/modtime.c diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h index de05a281b..28b06fa3a 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 similarity index 100% rename from ports/samd/moduos.c rename to ports/samd/modos.c diff --git a/ports/samd/modutime.c b/ports/samd/modtime.c similarity index 100% rename from ports/samd/modutime.c rename to ports/samd/modtime.c diff --git a/ports/stm32/moduos.c b/ports/stm32/modos.c similarity index 100% rename from ports/stm32/moduos.c rename to ports/stm32/modos.c diff --git a/ports/stm32/modutime.c b/ports/stm32/modtime.c similarity index 100% rename from ports/stm32/modutime.c rename to ports/stm32/modtime.c diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h index 49a8a0340..c0a95cf5d 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 9ff19aab9..a8981e8f5 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 similarity index 100% rename from ports/unix/moduos.c rename to ports/unix/modos.c diff --git a/ports/unix/moduselect.c b/ports/unix/modselect.c similarity index 100% rename from ports/unix/moduselect.c rename to ports/unix/modselect.c diff --git a/ports/unix/modusocket.c b/ports/unix/modsocket.c similarity index 100% rename from ports/unix/modusocket.c rename to ports/unix/modsocket.c diff --git a/ports/unix/modutime.c b/ports/unix/modtime.c similarity index 100% rename from ports/unix/modutime.c rename to ports/unix/modtime.c diff --git a/ports/unix/variants/mpconfigvariant_common.h b/ports/unix/variants/mpconfigvariant_common.h index cc50d426c..afdd31313 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 87e12562b..239dcfec9 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 de950c3ac..24cdcd82d 100644 --- a/ports/windows/msvc/sources.props +++ b/ports/windows/msvc/sources.props @@ -8,18 +8,18 @@ - + - - - - - - - - - - + + + + + + + + + + diff --git a/ports/zephyr/CMakeLists.txt b/ports/zephyr/CMakeLists.txt index 39942bdc8..ddc613a2c 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 similarity index 100% rename from ports/zephyr/modusocket.c rename to ports/zephyr/modsocket.c diff --git a/ports/zephyr/modutime.c b/ports/zephyr/modtime.c similarity index 100% rename from ports/zephyr/modutime.c rename to ports/zephyr/modtime.c diff --git a/ports/zephyr/mpconfigport.h b/ports/zephyr/mpconfigport.h index ec759bda7..df24e5200 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 similarity index 100% rename from py/moduerrno.c rename to py/moderrno.c diff --git a/py/py.cmake b/py/py.cmake index 07d1fe05f..95a841b5f 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 1dc0c8641..ffb853c65 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 4a2cfb336..517aced37 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]",