djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

all: Rename *umodule*.c to remove the "u" prefix.

Browse Source 
Updates any includes, and references from Makefiles/CMake.

This essentially reverts what was done long ago in commit
136b5cbd76

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
This commit is contained in:
Jim Mussared 2022-08-18 16:24:27 +10:00
parent 0ceccd4cf8
commit 45ac651d1a
75 changed files with 81 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
extmod/utime_mphal.c → examples/embedding/Makefile.upylib
View File

2
examples/natmod/uheapq/uheapq.c
View File

@ -2,7 +2,7 @@
#include "py/dynruntime.h" #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_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 MP_DYNRUNTIME_INIT_ENTRY

2
examples/natmod/urandom/urandom.c
View File

@ -7,7 +7,7 @@
uint32_t yasmarang_pad, yasmarang_n, yasmarang_d; uint32_t yasmarang_pad, yasmarang_n, yasmarang_d;
uint8_t yasmarang_dat; 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_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 MP_DYNRUNTIME_INIT_ENTRY

2
examples/natmod/ure/ure.c
View File

@ -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 match_type;
mp_obj_full_type_t re_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]; mp_map_elem_t match_locals_dict_table[5];
STATIC MP_DEFINE_CONST_DICT(match_locals_dict, match_locals_dict_table); STATIC MP_DEFINE_CONST_DICT(match_locals_dict, match_locals_dict_table);

2
examples/natmod/uzlib/uzlib.c
View File

@ -10,7 +10,7 @@ void *memset(void *s, int c, size_t n) {
mp_obj_full_type_t decompio_type; mp_obj_full_type_t decompio_type;
#include "extmod/moduzlib.c" #include "extmod/modzlib.c"
mp_map_elem_t decompio_locals_dict_table[3]; mp_map_elem_t decompio_locals_dict_table[3];
STATIC MP_DEFINE_CONST_DICT(decompio_locals_dict, decompio_locals_dict_table); STATIC MP_DEFINE_CONST_DICT(decompio_locals_dict, decompio_locals_dict_table);

36
extmod/extmod.cmake
View File

@ -19,30 +19,30 @@ set(MICROPY_SOURCE_EXTMOD
${MICROPY_EXTMOD_DIR}/modnetwork.c ${MICROPY_EXTMOD_DIR}/modnetwork.c
${MICROPY_EXTMOD_DIR}/modonewire.c ${MICROPY_EXTMOD_DIR}/modonewire.c
${MICROPY_EXTMOD_DIR}/moduasyncio.c ${MICROPY_EXTMOD_DIR}/moduasyncio.c
${MICROPY_EXTMOD_DIR}/modubinascii.c ${MICROPY_EXTMOD_DIR}/modbinascii.c
${MICROPY_EXTMOD_DIR}/moducryptolib.c ${MICROPY_EXTMOD_DIR}/modcryptolib.c
${MICROPY_EXTMOD_DIR}/moductypes.c ${MICROPY_EXTMOD_DIR}/moductypes.c
${MICROPY_EXTMOD_DIR}/moduhashlib.c ${MICROPY_EXTMOD_DIR}/modhashlib.c
${MICROPY_EXTMOD_DIR}/moduheapq.c ${MICROPY_EXTMOD_DIR}/modheapq.c
${MICROPY_EXTMOD_DIR}/modujson.c ${MICROPY_EXTMOD_DIR}/modjson.c
${MICROPY_EXTMOD_DIR}/moduos.c ${MICROPY_EXTMOD_DIR}/modos.c
${MICROPY_EXTMOD_DIR}/moduplatform.c ${MICROPY_EXTMOD_DIR}/modplatform.c
${MICROPY_EXTMOD_DIR}/modurandom.c ${MICROPY_EXTMOD_DIR}/modrandom.c
${MICROPY_EXTMOD_DIR}/modure.c ${MICROPY_EXTMOD_DIR}/modre.c
${MICROPY_EXTMOD_DIR}/moduselect.c ${MICROPY_EXTMOD_DIR}/modselect.c
${MICROPY_EXTMOD_DIR}/modusocket.c ${MICROPY_EXTMOD_DIR}/modsocket.c
${MICROPY_EXTMOD_DIR}/modussl_axtls.c ${MICROPY_EXTMOD_DIR}/modssl_axtls.c
${MICROPY_EXTMOD_DIR}/modussl_mbedtls.c ${MICROPY_EXTMOD_DIR}/modssl_mbedtls.c
${MICROPY_EXTMOD_DIR}/modutime.c ${MICROPY_EXTMOD_DIR}/modtime.c
${MICROPY_EXTMOD_DIR}/modutimeq.c ${MICROPY_EXTMOD_DIR}/modtimeq.c
${MICROPY_EXTMOD_DIR}/moduwebsocket.c ${MICROPY_EXTMOD_DIR}/modwebsocket.c
${MICROPY_EXTMOD_DIR}/moduzlib.c ${MICROPY_EXTMOD_DIR}/modzlib.c
${MICROPY_EXTMOD_DIR}/modwebrepl.c ${MICROPY_EXTMOD_DIR}/modwebrepl.c
${MICROPY_EXTMOD_DIR}/network_cyw43.c ${MICROPY_EXTMOD_DIR}/network_cyw43.c
${MICROPY_EXTMOD_DIR}/network_lwip.c ${MICROPY_EXTMOD_DIR}/network_lwip.c
${MICROPY_EXTMOD_DIR}/network_ninaw10.c ${MICROPY_EXTMOD_DIR}/network_ninaw10.c
${MICROPY_EXTMOD_DIR}/network_wiznet5k.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.c
${MICROPY_EXTMOD_DIR}/vfs_blockdev.c ${MICROPY_EXTMOD_DIR}/vfs_blockdev.c
${MICROPY_EXTMOD_DIR}/vfs_fat.c ${MICROPY_EXTMOD_DIR}/vfs_fat.c

36
extmod/extmod.mk
View File

@ -11,37 +11,37 @@ SRC_EXTMOD_C += \
extmod/machine_signal.c \ extmod/machine_signal.c \
extmod/machine_spi.c \ extmod/machine_spi.c \
extmod/machine_timer.c \ extmod/machine_timer.c \
extmod/modbinascii.c \
extmod/modbluetooth.c \ extmod/modbluetooth.c \
extmod/modbtree.c \ extmod/modbtree.c \
extmod/modcryptolib.c \
extmod/modframebuf.c \ extmod/modframebuf.c \
extmod/modhashlib.c \
extmod/modheapq.c \
extmod/modjson.c \
extmod/modlwip.c \ extmod/modlwip.c \
extmod/modnetwork.c \ extmod/modnetwork.c \
extmod/modonewire.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/moduasyncio.c \
extmod/modubinascii.c \
extmod/moducryptolib.c \
extmod/moductypes.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/modwebrepl.c \
extmod/modwebsocket.c \
extmod/modzlib.c \
extmod/network_cyw43.c \ extmod/network_cyw43.c \
extmod/network_lwip.c \ extmod/network_lwip.c \
extmod/network_ninaw10.c \ extmod/network_ninaw10.c \
extmod/network_wiznet5k.c \ extmod/network_wiznet5k.c \
extmod/uos_dupterm.c \ extmod/os_dupterm.c \
extmod/vfs.c \ extmod/vfs.c \
extmod/vfs_blockdev.c \ extmod/vfs_blockdev.c \
extmod/vfs_fat.c \ extmod/vfs_fat.c \

0
extmod/modubinascii.c → extmod/modbinascii.c
View File

0
extmod/moducryptolib.c → extmod/modcryptolib.c
View File

0
extmod/moduhashlib.c → extmod/modhashlib.c
View File

0
extmod/moduheapq.c → extmod/modheapq.c
View File

0
extmod/modujson.c → extmod/modjson.c
View File

2
extmod/modlwip.c
View File

@ -1801,7 +1801,7 @@ const mp_obj_module_t mp_module_lwip = {
MP_REGISTER_MODULE(MP_QSTR_lwip, 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_MODULE(MP_QSTR_socket, mp_module_lwip);
MP_REGISTER_ROOT_POINTER(mp_obj_t lwip_slip_stream); MP_REGISTER_ROOT_POINTER(mp_obj_t lwip_slip_stream);

0
extmod/moduos.c → extmod/modos.c
View File

0
extmod/moduplatform.c → extmod/modplatform.c
View File

0
extmod/modurandom.c → extmod/modrandom.c
View File

0
extmod/modure.c → extmod/modre.c
View File

0
extmod/moduselect.c → extmod/modselect.c
View File

0
extmod/modusocket.c → extmod/modsocket.c
View File

0
extmod/modussl_axtls.c → extmod/modssl_axtls.c
View File

0
extmod/modussl_mbedtls.c → extmod/modssl_mbedtls.c
View File

0
extmod/modutime.c → extmod/modtime.c
View File

0
extmod/modutimeq.c → extmod/modtimeq.c
View File

0
extmod/moduwebsocket.c → extmod/modwebsocket.c
View File

0
extmod/moduzlib.c → extmod/modzlib.c
View File

0
extmod/uos_dupterm.c → extmod/os_dupterm.c
View File

6
ports/cc3200/application.mk
View File

@ -78,9 +78,9 @@ APP_MISC_SRC_C = $(addprefix misc/,\
APP_MODS_SRC_C = $(addprefix mods/,\ APP_MODS_SRC_C = $(addprefix mods/,\
modmachine.c \ modmachine.c \
modnetwork.c \ modnetwork.c \
moduos.c \ modos.c \
modusocket.c \ modsocket.c \
modussl.c \ modssl.c \
modwipy.c \ modwipy.c \
modwlan.c \ modwlan.c \
pybadc.c \ pybadc.c \

0
ports/cc3200/mods/moduhashlib.c → ports/cc3200/mods/modhashlib.c
View File

0
ports/cc3200/mods/moduos.c → ports/cc3200/mods/modos.c
View File

0
ports/cc3200/mods/modusocket.c → ports/cc3200/mods/modsocket.c
View File

0
ports/cc3200/mods/modussl.c → ports/cc3200/mods/modssl.c
View File

0
ports/cc3200/mods/modutime.c → ports/cc3200/mods/modtime.c
View File

2
ports/embed/embed.mk
View File

@ -52,7 +52,7 @@ micropython-embed-package: $(GENHDR_OUTPUT)
$(ECHO) "- py" $(ECHO) "- py"
$(Q)$(CP) $(TOP)/py/*.[ch] $(PACKAGE_DIR)/py $(Q)$(CP) $(TOP)/py/*.[ch] $(PACKAGE_DIR)/py
$(ECHO) "- extmod" $(ECHO) "- extmod"
$(Q)$(CP) $(TOP)/extmod/moduplatform.h $(PACKAGE_DIR)/extmod $(Q)$(CP) $(TOP)/extmod/modplatform.h $(PACKAGE_DIR)/extmod
$(ECHO) "- shared" $(ECHO) "- shared"
$(Q)$(CP) $(TOP)/shared/runtime/gchelper.h $(PACKAGE_DIR)/shared/runtime $(Q)$(CP) $(TOP)/shared/runtime/gchelper.h $(PACKAGE_DIR)/shared/runtime
$(Q)$(CP) $(TOP)/shared/runtime/gchelper_generic.c $(PACKAGE_DIR)/shared/runtime $(Q)$(CP) $(TOP)/shared/runtime/gchelper_generic.c $(PACKAGE_DIR)/shared/runtime

0
ports/esp32/moduos.c → ports/esp32/modos.c
View File

0
ports/esp32/modutime.c → ports/esp32/modtime.c
View File

2
ports/esp32/mpconfigport.h
View File

@ -88,7 +88,7 @@
#define MICROPY_PY_HASHLIB_SHA256 (1) #define MICROPY_PY_HASHLIB_SHA256 (1)
#define MICROPY_PY_CRYPTOLIB (1) #define MICROPY_PY_CRYPTOLIB (1)
#define MICROPY_PY_RANDOM_SEED_INIT_FUNC (esp_random()) #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 (1)
#define MICROPY_PY_OS_DUPTERM_NOTIFY (1) #define MICROPY_PY_OS_DUPTERM_NOTIFY (1)
#define MICROPY_PY_OS_SYNC (1) #define MICROPY_PY_OS_SYNC (1)

2
ports/esp8266/boards/esp8266_common.ld
View File

@ -164,7 +164,7 @@ SECTIONS
*machine_hspi.o(.literal*, .text*) *machine_hspi.o(.literal*, .text*)
*hspi.o(.literal*, .text*) *hspi.o(.literal*, .text*)
*modesp.o(.literal* .text*) *modesp.o(.literal* .text*)
*moduos.o(.literal* .text*) *modos.o(.literal* .text*)
*modlwip.o(.literal* .text*) *modlwip.o(.literal* .text*)
*modsocket.o(.literal* .text*) *modsocket.o(.literal* .text*)
*modonewire.o(.literal* .text*) *modonewire.o(.literal* .text*)

0
ports/esp8266/moduos.c → ports/esp8266/modos.c
View File

0
ports/esp8266/modutime.c → ports/esp8266/modtime.c
View File

2
ports/esp8266/mpconfigport.h
View File

@ -58,7 +58,7 @@
#define MICROPY_PY_RANDOM_SEED_INIT_FUNC (*WDEV_HWRNG) #define MICROPY_PY_RANDOM_SEED_INIT_FUNC (*WDEV_HWRNG)
#define MICROPY_PY_TIME_GMTIME_LOCALTIME_MKTIME (1) #define MICROPY_PY_TIME_GMTIME_LOCALTIME_MKTIME (1)
#define MICROPY_PY_TIME_TIME_TIME_NS (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 (1)
#define MICROPY_PY_LWIP_SOCK_RAW (1) #define MICROPY_PY_LWIP_SOCK_RAW (1)
#define MICROPY_PY_MACHINE (1) #define MICROPY_PY_MACHINE (1)

0
ports/mimxrt/moduos.c → ports/mimxrt/modos.c
View File

0
ports/mimxrt/modutime.c → ports/mimxrt/modtime.c
View File

4
ports/mimxrt/mpconfigport.h
View File

@ -72,8 +72,8 @@ uint32_t trng_random_u32(void);
#define MICROPY_PY_SSL_FINALISER (MICROPY_PY_SSL) #define MICROPY_PY_SSL_FINALISER (MICROPY_PY_SSL)
#define MICROPY_PY_TIME_GMTIME_LOCALTIME_MKTIME (1) #define MICROPY_PY_TIME_GMTIME_LOCALTIME_MKTIME (1)
#define MICROPY_PY_TIME_TIME_TIME_NS (1) #define MICROPY_PY_TIME_TIME_TIME_NS (1)
#define MICROPY_PY_TIME_INCLUDEFILE "ports/mimxrt/modutime.c" #define MICROPY_PY_TIME_INCLUDEFILE "ports/mimxrt/modtime.c"
#define MICROPY_PY_OS_INCLUDEFILE "ports/mimxrt/moduos.c" #define MICROPY_PY_OS_INCLUDEFILE "ports/mimxrt/modos.c"
#define MICROPY_PY_OS_DUPTERM (3) #define MICROPY_PY_OS_DUPTERM (3)
#define MICROPY_PY_OS_DUPTERM_NOTIFY (1) #define MICROPY_PY_OS_DUPTERM_NOTIFY (1)
#define MICROPY_PY_OS_SYNC (1) #define MICROPY_PY_OS_SYNC (1)

4
ports/nrf/Makefile
View File

@ -329,8 +329,8 @@ DRIVERS_SRC_C += $(addprefix modules/,\
machine/timer.c \ machine/timer.c \
machine/rtcounter.c \ machine/rtcounter.c \
machine/temp.c \ machine/temp.c \
uos/moduos.c \ os/modos.c \
uos/microbitfs.c \ os/microbitfs.c \
board/modboard.c \ board/modboard.c \
board/led.c \ board/led.c \
ubluepy/modubluepy.c \ ubluepy/modubluepy.c \

0
ports/nrf/modules/uos/microbitfs.c → ports/nrf/modules/os/microbitfs.c
View File

0
ports/nrf/modules/uos/microbitfs.h → ports/nrf/modules/os/microbitfs.h
View File

0
ports/nrf/modules/uos/moduos.c → ports/nrf/modules/os/modos.c
View File

0
ports/renesas-ra/moduos.c → ports/renesas-ra/modos.c
View File

0
ports/renesas-ra/modutime.c → ports/renesas-ra/modtime.c
View File

2
ports/renesas-ra/mpconfigport.h
View File

@ -91,7 +91,7 @@
#endif #endif
// extended modules // 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 (3)
#define MICROPY_PY_OS_DUPTERM_BUILTIN_STREAM (1) #define MICROPY_PY_OS_DUPTERM_BUILTIN_STREAM (1)
#define MICROPY_PY_OS_DUPTERM_STREAM_DETACHED_ATTACHED (1) #define MICROPY_PY_OS_DUPTERM_STREAM_DETACHED_ATTACHED (1)

2
ports/rp2/CMakeLists.txt
View File

@ -157,7 +157,7 @@ set(MICROPY_SOURCE_QSTR
${PROJECT_SOURCE_DIR}/machine_wdt.c ${PROJECT_SOURCE_DIR}/machine_wdt.c
${PROJECT_SOURCE_DIR}/modmachine.c ${PROJECT_SOURCE_DIR}/modmachine.c
${PROJECT_SOURCE_DIR}/modrp2.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_flash.c
${PROJECT_SOURCE_DIR}/rp2_pio.c ${PROJECT_SOURCE_DIR}/rp2_pio.c
${CMAKE_BINARY_DIR}/pins_${MICROPY_BOARD}.c ${CMAKE_BINARY_DIR}/pins_${MICROPY_BOARD}.c

0
ports/rp2/moduos.c → ports/rp2/modos.c
View File

0
ports/rp2/modutime.c → ports/rp2/modtime.c
View File

4
ports/rp2/mpconfigport.h
View File

@ -95,7 +95,7 @@
// Extended modules // Extended modules
#define MICROPY_EPOCH_IS_1970 (1) #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 #ifndef MICROPY_PY_OS_DUPTERM
#define MICROPY_PY_OS_DUPTERM (1) #define MICROPY_PY_OS_DUPTERM (1)
#endif #endif
@ -108,7 +108,7 @@
#define MICROPY_PY_CRYPTOLIB (1) #define MICROPY_PY_CRYPTOLIB (1)
#define MICROPY_PY_TIME_GMTIME_LOCALTIME_MKTIME (1) #define MICROPY_PY_TIME_GMTIME_LOCALTIME_MKTIME (1)
#define MICROPY_PY_TIME_TIME_TIME_NS (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_RANDOM_SEED_INIT_FUNC (rosc_random_u32())
#define MICROPY_PY_MACHINE (1) #define MICROPY_PY_MACHINE (1)
#define MICROPY_PY_MACHINE_PIN_MAKE_NEW mp_pin_make_new #define MICROPY_PY_MACHINE_PIN_MAKE_NEW mp_pin_make_new

0
ports/samd/moduos.c → ports/samd/modos.c
View File

0
ports/samd/modutime.c → ports/samd/modtime.c
View File

0
ports/stm32/moduos.c → ports/stm32/modos.c
View File

0
ports/stm32/modutime.c → ports/stm32/modtime.c
View File

4
ports/stm32/mpconfigport.h
View File

@ -96,7 +96,7 @@
#define MICROPY_PY_HASHLIB_MD5 (MICROPY_PY_SSL) #define MICROPY_PY_HASHLIB_MD5 (MICROPY_PY_SSL)
#define MICROPY_PY_HASHLIB_SHA1 (MICROPY_PY_SSL) #define MICROPY_PY_HASHLIB_SHA1 (MICROPY_PY_SSL)
#define MICROPY_PY_CRYPTOLIB (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 (3)
#define MICROPY_PY_OS_DUPTERM_BUILTIN_STREAM (1) #define MICROPY_PY_OS_DUPTERM_BUILTIN_STREAM (1)
#define MICROPY_PY_OS_DUPTERM_STREAM_DETACHED_ATTACHED (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_RANDOM_SEED_INIT_FUNC (rng_get())
#define MICROPY_PY_TIME_GMTIME_LOCALTIME_MKTIME (1) #define MICROPY_PY_TIME_GMTIME_LOCALTIME_MKTIME (1)
#define MICROPY_PY_TIME_TIME_TIME_NS (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 #ifndef MICROPY_PY_TIMEQ
#define MICROPY_PY_TIMEQ (1) #define MICROPY_PY_TIMEQ (1)
#endif #endif

4
ports/unix/Makefile
View File

@ -201,7 +201,7 @@ SRC_C += \
mpthreadport.c \ mpthreadport.c \
input.c \ input.c \
modmachine.c \ modmachine.c \
moduselect.c \ modselect.c \
alloc.c \ alloc.c \
fatfs_port.c \ fatfs_port.c \
mpbthciport.c \ mpbthciport.c \
@ -210,7 +210,7 @@ SRC_C += \
mpbtstackport_usb.c \ mpbtstackport_usb.c \
mpnimbleport.c \ mpnimbleport.c \
modtermios.c \ modtermios.c \
modusocket.c \ modsocket.c \
modffi.c \ modffi.c \
modjni.c \ modjni.c \
$(wildcard $(VARIANT_DIR)/*.c) $(wildcard $(VARIANT_DIR)/*.c)

0
ports/unix/moduos.c → ports/unix/modos.c
View File

0
ports/unix/moduselect.c → ports/unix/modselect.c
View File

0
ports/unix/modusocket.c → ports/unix/modsocket.c
View File

0
ports/unix/modutime.c → ports/unix/modtime.c
View File

4
ports/unix/variants/mpconfigvariant_common.h
View File

@ -87,7 +87,7 @@
#define MICROPY_PY_SYS_EXC_INFO (1) #define MICROPY_PY_SYS_EXC_INFO (1)
// Configure the "os" module with extra unix features. // 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_ERRNO (1)
#define MICROPY_PY_OS_GETENV_PUTENV_UNSETENV (1) #define MICROPY_PY_OS_GETENV_PUTENV_UNSETENV (1)
#define MICROPY_PY_OS_SEP (1) #define MICROPY_PY_OS_SEP (1)
@ -98,7 +98,7 @@
#define MICROPY_PY_TIME (1) #define MICROPY_PY_TIME (1)
#define MICROPY_PY_TIME_TIME_TIME_NS (1) #define MICROPY_PY_TIME_TIME_TIME_NS (1)
#define MICROPY_PY_TIME_CUSTOM_SLEEP (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. // Enable the utimeq module used by the previous (v2) version of uasyncio.
#define MICROPY_PY_TIMEQ (1) #define MICROPY_PY_TIMEQ (1)

4
ports/windows/mpconfigport.h
View File

@ -131,7 +131,7 @@
#endif #endif
#define MICROPY_PY_OS (1) #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_ERRNO (1)
#define MICROPY_PY_OS_GETENV_PUTENV_UNSETENV (1) #define MICROPY_PY_OS_GETENV_PUTENV_UNSETENV (1)
#define MICROPY_PY_OS_SEP (1) #define MICROPY_PY_OS_SEP (1)
@ -141,7 +141,7 @@
#define MICROPY_PY_TIME (1) #define MICROPY_PY_TIME (1)
#define MICROPY_PY_TIME_TIME_TIME_NS (1) #define MICROPY_PY_TIME_TIME_TIME_NS (1)
#define MICROPY_PY_TIME_CUSTOM_SLEEP (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_ERRNO (1)
#define MICROPY_PY_UCTYPES (1) #define MICROPY_PY_UCTYPES (1)
#define MICROPY_PY_ZLIB (1) #define MICROPY_PY_ZLIB (1)

22
ports/windows/msvc/sources.props
View File

@ -8,18 +8,18 @@
<PyExtModSource Include="$(PyBaseDir)extmod\machine_pulse.c" /> <PyExtModSource Include="$(PyBaseDir)extmod\machine_pulse.c" />
<PyExtModSource Include="$(PyBaseDir)extmod\machine_signal.c" /> <PyExtModSource Include="$(PyBaseDir)extmod\machine_signal.c" />
<PyExtModSource Include="$(PyBaseDir)extmod\moduasyncio.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\moductypes.c" />
<PyExtModSource Include="$(PyBaseDir)extmod\moduhashlib.c" /> <PyExtModSource Include="$(PyBaseDir)extmod\modhashlib.c" />
<PyExtModSource Include="$(PyBaseDir)extmod\moduheapq.c" /> <PyExtModSource Include="$(PyBaseDir)extmod\modheapq.c" />
<PyExtModSource Include="$(PyBaseDir)extmod\modujson.c" /> <PyExtModSource Include="$(PyBaseDir)extmod\modjson.c" />
<PyExtModSource Include="$(PyBaseDir)extmod\moduos.c" /> <PyExtModSource Include="$(PyBaseDir)extmod\modos.c" />
<PyExtModSource Include="$(PyBaseDir)extmod\modurandom.c" /> <PyExtModSource Include="$(PyBaseDir)extmod\modrandom.c" />
<PyExtModSource Include="$(PyBaseDir)extmod\modure.c" /> <PyExtModSource Include="$(PyBaseDir)extmod\modre.c" />
<PyExtModSource Include="$(PyBaseDir)extmod\moduselect.c" /> <PyExtModSource Include="$(PyBaseDir)extmod\modselect.c" />
<PyExtModSource Include="$(PyBaseDir)extmod\modutime.c" /> <PyExtModSource Include="$(PyBaseDir)extmod\modtime.c" />
<PyExtModSource Include="$(PyBaseDir)extmod\modutimeq.c" /> <PyExtModSource Include="$(PyBaseDir)extmod\modtimeq.c" />
<PyExtModSource Include="$(PyBaseDir)extmod\moduzlib.c" /> <PyExtModSource Include="$(PyBaseDir)extmod\modzlib.c" />
<PyExtModSource Include="$(PyBaseDir)extmod\virtpin.c" /> <PyExtModSource Include="$(PyBaseDir)extmod\virtpin.c" />
<PyExtModSource Include="$(PyBaseDir)extmod\vfs.c" /> <PyExtModSource Include="$(PyBaseDir)extmod\vfs.c" />
<PyExtModSource Include="$(PyBaseDir)extmod\vfs_posix.c" /> <PyExtModSource Include="$(PyBaseDir)extmod\vfs_posix.c" />

2
ports/zephyr/CMakeLists.txt
View File

@ -43,7 +43,7 @@ set(MICROPY_SOURCE_PORT
machine_uart.c machine_uart.c
modbluetooth_zephyr.c modbluetooth_zephyr.c
modmachine.c modmachine.c
modusocket.c modsocket.c
modzephyr.c modzephyr.c
modzsensor.c modzsensor.c
mphalport.c mphalport.c

0
ports/zephyr/modusocket.c → ports/zephyr/modsocket.c
View File

0
ports/zephyr/modutime.c → ports/zephyr/modtime.c
View File

2
ports/zephyr/mpconfigport.h
View File

@ -87,7 +87,7 @@
#define MICROPY_PY_OS (1) #define MICROPY_PY_OS (1)
#define MICROPY_PY_TIME (1) #define MICROPY_PY_TIME (1)
#define MICROPY_PY_TIME_TIME_TIME_NS (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_ZEPHYR (1)
#define MICROPY_PY_ZSENSOR (1) #define MICROPY_PY_ZSENSOR (1)
#define MICROPY_PY_SYS_MODULES (0) #define MICROPY_PY_SYS_MODULES (0)

0
py/moduerrno.c → py/moderrno.c
View File

2
py/py.cmake
View File

@ -47,7 +47,7 @@ set(MICROPY_SOURCE_PY
${MICROPY_PY_DIR}/modstruct.c ${MICROPY_PY_DIR}/modstruct.c
${MICROPY_PY_DIR}/modsys.c ${MICROPY_PY_DIR}/modsys.c
${MICROPY_PY_DIR}/modthread.c ${MICROPY_PY_DIR}/modthread.c
${MICROPY_PY_DIR}/moduerrno.c ${MICROPY_PY_DIR}/moderrno.c
${MICROPY_PY_DIR}/mpprint.c ${MICROPY_PY_DIR}/mpprint.c
${MICROPY_PY_DIR}/mpstate.c ${MICROPY_PY_DIR}/mpstate.c
${MICROPY_PY_DIR}/mpz.c ${MICROPY_PY_DIR}/mpz.c

2
py/py.mk
View File

@ -185,7 +185,7 @@ PY_CORE_O_BASENAME = $(addprefix py/,\
modmicropython.o \ modmicropython.o \
modstruct.o \ modstruct.o \
modsys.o \ modsys.o \
moduerrno.o \ moderrno.o \
modthread.o \ modthread.o \
vm.o \ vm.o \
bc.o \ bc.o \

4
tools/codeformat.py
View File

@ -69,8 +69,8 @@ EXCLUSIONS = [
"ports/nrf/modules/machine/*.[ch]", "ports/nrf/modules/machine/*.[ch]",
"ports/nrf/modules/music/*.[ch]", "ports/nrf/modules/music/*.[ch]",
"ports/nrf/modules/ubluepy/*.[ch]", "ports/nrf/modules/ubluepy/*.[ch]",
"ports/nrf/modules/uos/*.[ch]", "ports/nrf/modules/os/*.[ch]",
"ports/nrf/modules/utime/*.[ch]", "ports/nrf/modules/time/*.[ch]",
# STM32 USB dev/host code is mostly 3rd party. # STM32 USB dev/host code is mostly 3rd party.
"ports/stm32/usbdev/**/*.[ch]", "ports/stm32/usbdev/**/*.[ch]",
"ports/stm32/usbhost/**/*.[ch]", "ports/stm32/usbhost/**/*.[ch]",