Skip to content

Commit 45ac651

Browse files
jimmojimmo
committed
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 136b5cb This work was funded through GitHub Sponsors. Signed-off-by: Jim Mussared <[email protected]>
1 parent 0ceccd4 commit 45ac651

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+81
-81
lines changed

‎extmod/utime_mphal.c ‎examples/embedding/Makefile.upylib

File renamed without changes.

‎examples/natmod/uheapq/uheapq.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#include "py/dynruntime.h"
44

5-
#include "extmod/moduheapq.c"
5+
#include "extmod/modheapq.c"
66

77
mp_obj_t mpy_init(mp_obj_fun_bc_t *self, size_t n_args, size_t n_kw, mp_obj_t *args) {
88
MP_DYNRUNTIME_INIT_ENTRY

‎examples/natmod/urandom/urandom.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
uint32_t yasmarang_pad, yasmarang_n, yasmarang_d;
88
uint8_t yasmarang_dat;
99

10-
#include "extmod/modurandom.c"
10+
#include "extmod/modrandom.c"
1111

1212
mp_obj_t mpy_init(mp_obj_fun_bc_t *self, size_t n_args, size_t n_kw, mp_obj_t *args) {
1313
MP_DYNRUNTIME_INIT_ENTRY

‎examples/natmod/ure/ure.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ void *memmove(void *dest, const void *src, size_t n) {
3535
mp_obj_full_type_t match_type;
3636
mp_obj_full_type_t re_type;
3737

38-
#include "extmod/modure.c"
38+
#include "extmod/modre.c"
3939

4040
mp_map_elem_t match_locals_dict_table[5];
4141
STATIC MP_DEFINE_CONST_DICT(match_locals_dict, match_locals_dict_table);

‎examples/natmod/uzlib/uzlib.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ void *memset(void *s, int c, size_t n) {
1010

1111
mp_obj_full_type_t decompio_type;
1212

13-
#include "extmod/moduzlib.c"
13+
#include "extmod/modzlib.c"
1414

1515
mp_map_elem_t decompio_locals_dict_table[3];
1616
STATIC MP_DEFINE_CONST_DICT(decompio_locals_dict, decompio_locals_dict_table);

‎extmod/extmod.cmake

+18-18
Original file line numberDiff line numberDiff line change
@@ -19,30 +19,30 @@ set(MICROPY_SOURCE_EXTMOD
1919
${MICROPY_EXTMOD_DIR}/modnetwork.c
2020
${MICROPY_EXTMOD_DIR}/modonewire.c
2121
${MICROPY_EXTMOD_DIR}/moduasyncio.c
22-
${MICROPY_EXTMOD_DIR}/modubinascii.c
23-
${MICROPY_EXTMOD_DIR}/moducryptolib.c
22+
${MICROPY_EXTMOD_DIR}/modbinascii.c
23+
${MICROPY_EXTMOD_DIR}/modcryptolib.c
2424
${MICROPY_EXTMOD_DIR}/moductypes.c
25-
${MICROPY_EXTMOD_DIR}/moduhashlib.c
26-
${MICROPY_EXTMOD_DIR}/moduheapq.c
27-
${MICROPY_EXTMOD_DIR}/modujson.c
28-
${MICROPY_EXTMOD_DIR}/moduos.c
29-
${MICROPY_EXTMOD_DIR}/moduplatform.c
30-
${MICROPY_EXTMOD_DIR}/modurandom.c
31-
${MICROPY_EXTMOD_DIR}/modure.c
32-
${MICROPY_EXTMOD_DIR}/moduselect.c
33-
${MICROPY_EXTMOD_DIR}/modusocket.c
34-
${MICROPY_EXTMOD_DIR}/modussl_axtls.c
35-
${MICROPY_EXTMOD_DIR}/modussl_mbedtls.c
36-
${MICROPY_EXTMOD_DIR}/modutime.c
37-
${MICROPY_EXTMOD_DIR}/modutimeq.c
38-
${MICROPY_EXTMOD_DIR}/moduwebsocket.c
39-
${MICROPY_EXTMOD_DIR}/moduzlib.c
25+
${MICROPY_EXTMOD_DIR}/modhashlib.c
26+
${MICROPY_EXTMOD_DIR}/modheapq.c
27+
${MICROPY_EXTMOD_DIR}/modjson.c
28+
${MICROPY_EXTMOD_DIR}/modos.c
29+
${MICROPY_EXTMOD_DIR}/modplatform.c
30+
${MICROPY_EXTMOD_DIR}/modrandom.c
31+
${MICROPY_EXTMOD_DIR}/modre.c
32+
${MICROPY_EXTMOD_DIR}/modselect.c
33+
${MICROPY_EXTMOD_DIR}/modsocket.c
34+
${MICROPY_EXTMOD_DIR}/modssl_axtls.c
35+
${MICROPY_EXTMOD_DIR}/modssl_mbedtls.c
36+
${MICROPY_EXTMOD_DIR}/modtime.c
37+
${MICROPY_EXTMOD_DIR}/modtimeq.c
38+
${MICROPY_EXTMOD_DIR}/modwebsocket.c
39+
${MICROPY_EXTMOD_DIR}/modzlib.c
4040
${MICROPY_EXTMOD_DIR}/modwebrepl.c
4141
${MICROPY_EXTMOD_DIR}/network_cyw43.c
4242
${MICROPY_EXTMOD_DIR}/network_lwip.c
4343
${MICROPY_EXTMOD_DIR}/network_ninaw10.c
4444
${MICROPY_EXTMOD_DIR}/network_wiznet5k.c
45-
${MICROPY_EXTMOD_DIR}/uos_dupterm.c
45+
${MICROPY_EXTMOD_DIR}/os_dupterm.c
4646
${MICROPY_EXTMOD_DIR}/vfs.c
4747
${MICROPY_EXTMOD_DIR}/vfs_blockdev.c
4848
${MICROPY_EXTMOD_DIR}/vfs_fat.c

‎extmod/extmod.mk

+18-18
Original file line numberDiff line numberDiff line change
@@ -11,37 +11,37 @@ SRC_EXTMOD_C += \
1111
extmod/machine_signal.c \
1212
extmod/machine_spi.c \
1313
extmod/machine_timer.c \
14+
extmod/modbinascii.c \
1415
extmod/modbluetooth.c \
1516
extmod/modbtree.c \
17+
extmod/modcryptolib.c \
1618
extmod/modframebuf.c \
19+
extmod/modhashlib.c \
20+
extmod/modheapq.c \
21+
extmod/modjson.c \
1722
extmod/modlwip.c \
1823
extmod/modnetwork.c \
1924
extmod/modonewire.c \
25+
extmod/modos.c \
26+
extmod/modplatform.c\
27+
extmod/modrandom.c \
28+
extmod/modre.c \
29+
extmod/modselect.c \
30+
extmod/modsocket.c \
31+
extmod/modssl_axtls.c \
32+
extmod/modssl_mbedtls.c \
33+
extmod/modtime.c \
34+
extmod/modtimeq.c \
2035
extmod/moduasyncio.c \
21-
extmod/modubinascii.c \
22-
extmod/moducryptolib.c \
2336
extmod/moductypes.c \
24-
extmod/moduhashlib.c \
25-
extmod/moduheapq.c \
26-
extmod/modujson.c \
27-
extmod/moduos.c \
28-
extmod/moduplatform.c\
29-
extmod/modurandom.c \
30-
extmod/modure.c \
31-
extmod/moduselect.c \
32-
extmod/modusocket.c \
33-
extmod/modussl_axtls.c \
34-
extmod/modussl_mbedtls.c \
35-
extmod/modutime.c \
36-
extmod/modutimeq.c \
37-
extmod/moduwebsocket.c \
38-
extmod/moduzlib.c \
3937
extmod/modwebrepl.c \
38+
extmod/modwebsocket.c \
39+
extmod/modzlib.c \
4040
extmod/network_cyw43.c \
4141
extmod/network_lwip.c \
4242
extmod/network_ninaw10.c \
4343
extmod/network_wiznet5k.c \
44-
extmod/uos_dupterm.c \
44+
extmod/os_dupterm.c \
4545
extmod/vfs.c \
4646
extmod/vfs_blockdev.c \
4747
extmod/vfs_fat.c \

‎extmod/modubinascii.c ‎extmod/modbinascii.c

File renamed without changes.

‎extmod/moducryptolib.c ‎extmod/modcryptolib.c

File renamed without changes.

‎extmod/moduhashlib.c ‎extmod/modhashlib.c

File renamed without changes.

‎extmod/moduheapq.c ‎extmod/modheapq.c

File renamed without changes.

‎extmod/modujson.c ‎extmod/modjson.c

File renamed without changes.

‎extmod/modlwip.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1801,7 +1801,7 @@ const mp_obj_module_t mp_module_lwip = {
18011801

18021802
MP_REGISTER_MODULE(MP_QSTR_lwip, mp_module_lwip);
18031803

1804-
// On LWIP-ports, this is the socket module (replaces extmod/modusocket.c).
1804+
// On LWIP-ports, this is the socket module (replaces extmod/modsocket.c).
18051805
MP_REGISTER_MODULE(MP_QSTR_socket, mp_module_lwip);
18061806

18071807
MP_REGISTER_ROOT_POINTER(mp_obj_t lwip_slip_stream);

‎extmod/moduos.c ‎extmod/modos.c

File renamed without changes.

‎extmod/moduplatform.c ‎extmod/modplatform.c

File renamed without changes.

‎extmod/modurandom.c ‎extmod/modrandom.c

File renamed without changes.

‎extmod/modure.c ‎extmod/modre.c

File renamed without changes.

‎extmod/moduselect.c ‎extmod/modselect.c

File renamed without changes.

‎extmod/modusocket.c ‎extmod/modsocket.c

File renamed without changes.

‎extmod/modussl_axtls.c ‎extmod/modssl_axtls.c

File renamed without changes.

‎extmod/modussl_mbedtls.c ‎extmod/modssl_mbedtls.c

File renamed without changes.

‎extmod/modutime.c ‎extmod/modtime.c

File renamed without changes.

‎extmod/modutimeq.c ‎extmod/modtimeq.c

File renamed without changes.

‎extmod/moduwebsocket.c ‎extmod/modwebsocket.c

File renamed without changes.

‎extmod/moduzlib.c ‎extmod/modzlib.c

File renamed without changes.

‎extmod/uos_dupterm.c ‎extmod/os_dupterm.c

File renamed without changes.

‎ports/cc3200/application.mk

+3-3
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,9 @@ APP_MISC_SRC_C = $(addprefix misc/,\
7878
APP_MODS_SRC_C = $(addprefix mods/,\
7979
modmachine.c \
8080
modnetwork.c \
81-
moduos.c \
82-
modusocket.c \
83-
modussl.c \
81+
modos.c \
82+
modsocket.c \
83+
modssl.c \
8484
modwipy.c \
8585
modwlan.c \
8686
pybadc.c \

‎ports/cc3200/mods/moduhashlib.c ‎ports/cc3200/mods/modhashlib.c

File renamed without changes.

‎ports/cc3200/mods/moduos.c ‎ports/cc3200/mods/modos.c

File renamed without changes.

‎ports/cc3200/mods/modusocket.c ‎ports/cc3200/mods/modsocket.c

File renamed without changes.

‎ports/cc3200/mods/modussl.c ‎ports/cc3200/mods/modssl.c

File renamed without changes.

‎ports/cc3200/mods/modutime.c ‎ports/cc3200/mods/modtime.c

File renamed without changes.

‎ports/embed/embed.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ micropython-embed-package: $(GENHDR_OUTPUT)
5252
$(ECHO) "- py"
5353
$(Q)$(CP) $(TOP)/py/*.[ch] $(PACKAGE_DIR)/py
5454
$(ECHO) "- extmod"
55-
$(Q)$(CP) $(TOP)/extmod/moduplatform.h $(PACKAGE_DIR)/extmod
55+
$(Q)$(CP) $(TOP)/extmod/modplatform.h $(PACKAGE_DIR)/extmod
5656
$(ECHO) "- shared"
5757
$(Q)$(CP) $(TOP)/shared/runtime/gchelper.h $(PACKAGE_DIR)/shared/runtime
5858
$(Q)$(CP) $(TOP)/shared/runtime/gchelper_generic.c $(PACKAGE_DIR)/shared/runtime

‎ports/esp32/moduos.c ‎ports/esp32/modos.c

File renamed without changes.

‎ports/esp32/modutime.c ‎ports/esp32/modtime.c

File renamed without changes.

‎ports/esp32/mpconfigport.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
#define MICROPY_PY_HASHLIB_SHA256 (1)
8989
#define MICROPY_PY_CRYPTOLIB (1)
9090
#define MICROPY_PY_RANDOM_SEED_INIT_FUNC (esp_random())
91-
#define MICROPY_PY_OS_INCLUDEFILE "ports/esp32/moduos.c"
91+
#define MICROPY_PY_OS_INCLUDEFILE "ports/esp32/modos.c"
9292
#define MICROPY_PY_OS_DUPTERM (1)
9393
#define MICROPY_PY_OS_DUPTERM_NOTIFY (1)
9494
#define MICROPY_PY_OS_SYNC (1)

‎ports/esp8266/boards/esp8266_common.ld

+1-1
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ SECTIONS
164164
*machine_hspi.o(.literal*, .text*)
165165
*hspi.o(.literal*, .text*)
166166
*modesp.o(.literal* .text*)
167-
*moduos.o(.literal* .text*)
167+
*modos.o(.literal* .text*)
168168
*modlwip.o(.literal* .text*)
169169
*modsocket.o(.literal* .text*)
170170
*modonewire.o(.literal* .text*)

‎ports/esp8266/moduos.c ‎ports/esp8266/modos.c

File renamed without changes.

‎ports/esp8266/modutime.c ‎ports/esp8266/modtime.c

File renamed without changes.

‎ports/esp8266/mpconfigport.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
#define MICROPY_PY_RANDOM_SEED_INIT_FUNC (*WDEV_HWRNG)
5959
#define MICROPY_PY_TIME_GMTIME_LOCALTIME_MKTIME (1)
6060
#define MICROPY_PY_TIME_TIME_TIME_NS (1)
61-
#define MICROPY_PY_TIME_INCLUDEFILE "ports/esp8266/modutime.c"
61+
#define MICROPY_PY_TIME_INCLUDEFILE "ports/esp8266/modtime.c"
6262
#define MICROPY_PY_LWIP (1)
6363
#define MICROPY_PY_LWIP_SOCK_RAW (1)
6464
#define MICROPY_PY_MACHINE (1)

‎ports/mimxrt/moduos.c ‎ports/mimxrt/modos.c

File renamed without changes.

‎ports/mimxrt/modutime.c ‎ports/mimxrt/modtime.c

File renamed without changes.

‎ports/mimxrt/mpconfigport.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ uint32_t trng_random_u32(void);
7272
#define MICROPY_PY_SSL_FINALISER (MICROPY_PY_SSL)
7373
#define MICROPY_PY_TIME_GMTIME_LOCALTIME_MKTIME (1)
7474
#define MICROPY_PY_TIME_TIME_TIME_NS (1)
75-
#define MICROPY_PY_TIME_INCLUDEFILE "ports/mimxrt/modutime.c"
76-
#define MICROPY_PY_OS_INCLUDEFILE "ports/mimxrt/moduos.c"
75+
#define MICROPY_PY_TIME_INCLUDEFILE "ports/mimxrt/modtime.c"
76+
#define MICROPY_PY_OS_INCLUDEFILE "ports/mimxrt/modos.c"
7777
#define MICROPY_PY_OS_DUPTERM (3)
7878
#define MICROPY_PY_OS_DUPTERM_NOTIFY (1)
7979
#define MICROPY_PY_OS_SYNC (1)

‎ports/nrf/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -329,8 +329,8 @@ DRIVERS_SRC_C += $(addprefix modules/,\
329329
machine/timer.c \
330330
machine/rtcounter.c \
331331
machine/temp.c \
332-
uos/moduos.c \
333-
uos/microbitfs.c \
332+
os/modos.c \
333+
os/microbitfs.c \
334334
board/modboard.c \
335335
board/led.c \
336336
ubluepy/modubluepy.c \

‎ports/nrf/modules/uos/microbitfs.c ‎ports/nrf/modules/os/microbitfs.c

File renamed without changes.

‎ports/nrf/modules/uos/microbitfs.h ‎ports/nrf/modules/os/microbitfs.h

File renamed without changes.

‎ports/nrf/modules/uos/moduos.c ‎ports/nrf/modules/os/modos.c

File renamed without changes.

‎ports/renesas-ra/moduos.c ‎ports/renesas-ra/modos.c

File renamed without changes.

‎ports/renesas-ra/modutime.c ‎ports/renesas-ra/modtime.c

File renamed without changes.

‎ports/renesas-ra/mpconfigport.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
#endif
9292

9393
// extended modules
94-
#define MICROPY_PY_OS_INCLUDEFILE "ports/renesas-ra/moduos.c"
94+
#define MICROPY_PY_OS_INCLUDEFILE "ports/renesas-ra/modos.c"
9595
#define MICROPY_PY_OS_DUPTERM (3)
9696
#define MICROPY_PY_OS_DUPTERM_BUILTIN_STREAM (1)
9797
#define MICROPY_PY_OS_DUPTERM_STREAM_DETACHED_ATTACHED (1)

‎ports/rp2/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ set(MICROPY_SOURCE_QSTR
157157
${PROJECT_SOURCE_DIR}/machine_wdt.c
158158
${PROJECT_SOURCE_DIR}/modmachine.c
159159
${PROJECT_SOURCE_DIR}/modrp2.c
160-
${PROJECT_SOURCE_DIR}/moduos.c
160+
${PROJECT_SOURCE_DIR}/modos.c
161161
${PROJECT_SOURCE_DIR}/rp2_flash.c
162162
${PROJECT_SOURCE_DIR}/rp2_pio.c
163163
${CMAKE_BINARY_DIR}/pins_${MICROPY_BOARD}.c

‎ports/rp2/moduos.c ‎ports/rp2/modos.c

File renamed without changes.

‎ports/rp2/modutime.c ‎ports/rp2/modtime.c

File renamed without changes.

‎ports/rp2/mpconfigport.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595

9696
// Extended modules
9797
#define MICROPY_EPOCH_IS_1970 (1)
98-
#define MICROPY_PY_OS_INCLUDEFILE "ports/rp2/moduos.c"
98+
#define MICROPY_PY_OS_INCLUDEFILE "ports/rp2/modos.c"
9999
#ifndef MICROPY_PY_OS_DUPTERM
100100
#define MICROPY_PY_OS_DUPTERM (1)
101101
#endif
@@ -108,7 +108,7 @@
108108
#define MICROPY_PY_CRYPTOLIB (1)
109109
#define MICROPY_PY_TIME_GMTIME_LOCALTIME_MKTIME (1)
110110
#define MICROPY_PY_TIME_TIME_TIME_NS (1)
111-
#define MICROPY_PY_TIME_INCLUDEFILE "ports/rp2/modutime.c"
111+
#define MICROPY_PY_TIME_INCLUDEFILE "ports/rp2/modtime.c"
112112
#define MICROPY_PY_RANDOM_SEED_INIT_FUNC (rosc_random_u32())
113113
#define MICROPY_PY_MACHINE (1)
114114
#define MICROPY_PY_MACHINE_PIN_MAKE_NEW mp_pin_make_new

‎ports/samd/moduos.c ‎ports/samd/modos.c

File renamed without changes.

‎ports/samd/modutime.c ‎ports/samd/modtime.c

File renamed without changes.

‎ports/stm32/moduos.c ‎ports/stm32/modos.c

File renamed without changes.

‎ports/stm32/modutime.c ‎ports/stm32/modtime.c

File renamed without changes.

‎ports/stm32/mpconfigport.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
#define MICROPY_PY_HASHLIB_MD5 (MICROPY_PY_SSL)
9797
#define MICROPY_PY_HASHLIB_SHA1 (MICROPY_PY_SSL)
9898
#define MICROPY_PY_CRYPTOLIB (MICROPY_PY_SSL)
99-
#define MICROPY_PY_OS_INCLUDEFILE "ports/stm32/moduos.c"
99+
#define MICROPY_PY_OS_INCLUDEFILE "ports/stm32/modos.c"
100100
#define MICROPY_PY_OS_DUPTERM (3)
101101
#define MICROPY_PY_OS_DUPTERM_BUILTIN_STREAM (1)
102102
#define MICROPY_PY_OS_DUPTERM_STREAM_DETACHED_ATTACHED (1)
@@ -107,7 +107,7 @@
107107
#define MICROPY_PY_RANDOM_SEED_INIT_FUNC (rng_get())
108108
#define MICROPY_PY_TIME_GMTIME_LOCALTIME_MKTIME (1)
109109
#define MICROPY_PY_TIME_TIME_TIME_NS (1)
110-
#define MICROPY_PY_TIME_INCLUDEFILE "ports/stm32/modutime.c"
110+
#define MICROPY_PY_TIME_INCLUDEFILE "ports/stm32/modtime.c"
111111
#ifndef MICROPY_PY_TIMEQ
112112
#define MICROPY_PY_TIMEQ (1)
113113
#endif

‎ports/unix/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ SRC_C += \
201201
mpthreadport.c \
202202
input.c \
203203
modmachine.c \
204-
moduselect.c \
204+
modselect.c \
205205
alloc.c \
206206
fatfs_port.c \
207207
mpbthciport.c \
@@ -210,7 +210,7 @@ SRC_C += \
210210
mpbtstackport_usb.c \
211211
mpnimbleport.c \
212212
modtermios.c \
213-
modusocket.c \
213+
modsocket.c \
214214
modffi.c \
215215
modjni.c \
216216
$(wildcard $(VARIANT_DIR)/*.c)

‎ports/unix/moduos.c ‎ports/unix/modos.c

File renamed without changes.

‎ports/unix/moduselect.c ‎ports/unix/modselect.c

File renamed without changes.

‎ports/unix/modusocket.c ‎ports/unix/modsocket.c

File renamed without changes.

‎ports/unix/modutime.c ‎ports/unix/modtime.c

File renamed without changes.

‎ports/unix/variants/mpconfigvariant_common.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
#define MICROPY_PY_SYS_EXC_INFO (1)
8888

8989
// Configure the "os" module with extra unix features.
90-
#define MICROPY_PY_OS_INCLUDEFILE "ports/unix/moduos.c"
90+
#define MICROPY_PY_OS_INCLUDEFILE "ports/unix/modos.c"
9191
#define MICROPY_PY_OS_ERRNO (1)
9292
#define MICROPY_PY_OS_GETENV_PUTENV_UNSETENV (1)
9393
#define MICROPY_PY_OS_SEP (1)
@@ -98,7 +98,7 @@
9898
#define MICROPY_PY_TIME (1)
9999
#define MICROPY_PY_TIME_TIME_TIME_NS (1)
100100
#define MICROPY_PY_TIME_CUSTOM_SLEEP (1)
101-
#define MICROPY_PY_TIME_INCLUDEFILE "ports/unix/modutime.c"
101+
#define MICROPY_PY_TIME_INCLUDEFILE "ports/unix/modtime.c"
102102

103103
// Enable the utimeq module used by the previous (v2) version of uasyncio.
104104
#define MICROPY_PY_TIMEQ (1)

‎ports/windows/mpconfigport.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@
131131
#endif
132132

133133
#define MICROPY_PY_OS (1)
134-
#define MICROPY_PY_OS_INCLUDEFILE "ports/unix/moduos.c"
134+
#define MICROPY_PY_OS_INCLUDEFILE "ports/unix/modos.c"
135135
#define MICROPY_PY_OS_ERRNO (1)
136136
#define MICROPY_PY_OS_GETENV_PUTENV_UNSETENV (1)
137137
#define MICROPY_PY_OS_SEP (1)
@@ -141,7 +141,7 @@
141141
#define MICROPY_PY_TIME (1)
142142
#define MICROPY_PY_TIME_TIME_TIME_NS (1)
143143
#define MICROPY_PY_TIME_CUSTOM_SLEEP (1)
144-
#define MICROPY_PY_TIME_INCLUDEFILE "ports/unix/modutime.c"
144+
#define MICROPY_PY_TIME_INCLUDEFILE "ports/unix/modtime.c"
145145
#define MICROPY_PY_ERRNO (1)
146146
#define MICROPY_PY_UCTYPES (1)
147147
#define MICROPY_PY_ZLIB (1)

‎ports/windows/msvc/sources.props

+11-11
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,18 @@
88
<PyExtModSource Include="$(PyBaseDir)extmod\machine_pulse.c" />
99
<PyExtModSource Include="$(PyBaseDir)extmod\machine_signal.c" />
1010
<PyExtModSource Include="$(PyBaseDir)extmod\moduasyncio.c" />
11-
<PyExtModSource Include="$(PyBaseDir)extmod\modubinascii.c" />
11+
<PyExtModSource Include="$(PyBaseDir)extmod\modbinascii.c" />
1212
<PyExtModSource Include="$(PyBaseDir)extmod\moductypes.c" />
13-
<PyExtModSource Include="$(PyBaseDir)extmod\moduhashlib.c" />
14-
<PyExtModSource Include="$(PyBaseDir)extmod\moduheapq.c" />
15-
<PyExtModSource Include="$(PyBaseDir)extmod\modujson.c" />
16-
<PyExtModSource Include="$(PyBaseDir)extmod\moduos.c" />
17-
<PyExtModSource Include="$(PyBaseDir)extmod\modurandom.c" />
18-
<PyExtModSource Include="$(PyBaseDir)extmod\modure.c" />
19-
<PyExtModSource Include="$(PyBaseDir)extmod\moduselect.c" />
20-
<PyExtModSource Include="$(PyBaseDir)extmod\modutime.c" />
21-
<PyExtModSource Include="$(PyBaseDir)extmod\modutimeq.c" />
22-
<PyExtModSource Include="$(PyBaseDir)extmod\moduzlib.c" />
13+
<PyExtModSource Include="$(PyBaseDir)extmod\modhashlib.c" />
14+
<PyExtModSource Include="$(PyBaseDir)extmod\modheapq.c" />
15+
<PyExtModSource Include="$(PyBaseDir)extmod\modjson.c" />
16+
<PyExtModSource Include="$(PyBaseDir)extmod\modos.c" />
17+
<PyExtModSource Include="$(PyBaseDir)extmod\modrandom.c" />
18+
<PyExtModSource Include="$(PyBaseDir)extmod\modre.c" />
19+
<PyExtModSource Include="$(PyBaseDir)extmod\modselect.c" />
20+
<PyExtModSource Include="$(PyBaseDir)extmod\modtime.c" />
21+
<PyExtModSource Include="$(PyBaseDir)extmod\modtimeq.c" />
22+
<PyExtModSource Include="$(PyBaseDir)extmod\modzlib.c" />
2323
<PyExtModSource Include="$(PyBaseDir)extmod\virtpin.c" />
2424
<PyExtModSource Include="$(PyBaseDir)extmod\vfs.c" />
2525
<PyExtModSource Include="$(PyBaseDir)extmod\vfs_posix.c" />

‎ports/zephyr/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ set(MICROPY_SOURCE_PORT
4343
machine_uart.c
4444
modbluetooth_zephyr.c
4545
modmachine.c
46-
modusocket.c
46+
modsocket.c
4747
modzephyr.c
4848
modzsensor.c
4949
mphalport.c

‎ports/zephyr/modusocket.c ‎ports/zephyr/modsocket.c

File renamed without changes.

‎ports/zephyr/modutime.c ‎ports/zephyr/modtime.c

File renamed without changes.

‎ports/zephyr/mpconfigport.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
#define MICROPY_PY_OS (1)
8888
#define MICROPY_PY_TIME (1)
8989
#define MICROPY_PY_TIME_TIME_TIME_NS (1)
90-
#define MICROPY_PY_TIME_INCLUDEFILE "ports/zephyr/modutime.c"
90+
#define MICROPY_PY_TIME_INCLUDEFILE "ports/zephyr/modtime.c"
9191
#define MICROPY_PY_ZEPHYR (1)
9292
#define MICROPY_PY_ZSENSOR (1)
9393
#define MICROPY_PY_SYS_MODULES (0)

‎py/moduerrno.c ‎py/moderrno.c

File renamed without changes.

‎py/py.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ set(MICROPY_SOURCE_PY
4747
${MICROPY_PY_DIR}/modstruct.c
4848
${MICROPY_PY_DIR}/modsys.c
4949
${MICROPY_PY_DIR}/modthread.c
50-
${MICROPY_PY_DIR}/moduerrno.c
50+
${MICROPY_PY_DIR}/moderrno.c
5151
${MICROPY_PY_DIR}/mpprint.c
5252
${MICROPY_PY_DIR}/mpstate.c
5353
${MICROPY_PY_DIR}/mpz.c

‎py/py.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ PY_CORE_O_BASENAME = $(addprefix py/,\
185185
modmicropython.o \
186186
modstruct.o \
187187
modsys.o \
188-
moduerrno.o \
188+
moderrno.o \
189189
modthread.o \
190190
vm.o \
191191
bc.o \

0 commit comments

Comments
 (0)