diff options
126 files changed, 563 insertions, 563 deletions
diff --git a/docs/library/random.rst b/docs/library/random.rst index dd8b47c80f..be56eb088e 100644 --- a/docs/library/random.rst +++ b/docs/library/random.rst @@ -24,7 +24,7 @@ This module implements a pseudo-random number generator (PRNG). .. note:: The :func:`randrange`, :func:`randint` and :func:`choice` functions are only - available if the ``MICROPY_PY_URANDOM_EXTRA_FUNCS`` configuration option is + available if the ``MICROPY_PY_RANDOM_EXTRA_FUNCS`` configuration option is enabled. @@ -73,7 +73,7 @@ Other Functions supported by the port) initialise the PRNG with a true random number (usually a hardware generated random number). - The ``None`` case only works if ``MICROPY_PY_URANDOM_SEED_INIT_FUNC`` is + The ``None`` case only works if ``MICROPY_PY_RANDOM_SEED_INIT_FUNC`` is enabled by the port, otherwise it raises ``ValueError``. .. function:: choice(sequence) diff --git a/examples/natmod/uheapq/uheapq.c b/examples/natmod/uheapq/uheapq.c index ff70bef479..e339ccafd7 100644 --- a/examples/natmod/uheapq/uheapq.c +++ b/examples/natmod/uheapq/uheapq.c @@ -1,4 +1,4 @@ -#define MICROPY_PY_UHEAPQ (1) +#define MICROPY_PY_HEAPQ (1) #include "py/dynruntime.h" diff --git a/examples/natmod/urandom/urandom.c b/examples/natmod/urandom/urandom.c index 0c4e88c77e..ed46651b34 100644 --- a/examples/natmod/urandom/urandom.c +++ b/examples/natmod/urandom/urandom.c @@ -1,5 +1,5 @@ -#define MICROPY_PY_URANDOM (1) -#define MICROPY_PY_URANDOM_EXTRA_FUNCS (1) +#define MICROPY_PY_RANDOM (1) +#define MICROPY_PY_RANDOM_EXTRA_FUNCS (1) #include "py/dynruntime.h" @@ -19,7 +19,7 @@ mp_obj_t mpy_init(mp_obj_fun_bc_t *self, size_t n_args, size_t n_kw, mp_obj_t *a mp_store_global(MP_QSTR___name__, MP_OBJ_NEW_QSTR(MP_QSTR_random)); mp_store_global(MP_QSTR_getrandbits, MP_OBJ_FROM_PTR(&mod_random_getrandbits_obj)); mp_store_global(MP_QSTR_seed, MP_OBJ_FROM_PTR(&mod_random_seed_obj)); - #if MICROPY_PY_URANDOM_EXTRA_FUNCS + #if MICROPY_PY_RANDOM_EXTRA_FUNCS mp_store_global(MP_QSTR_randrange, MP_OBJ_FROM_PTR(&mod_random_randrange_obj)); mp_store_global(MP_QSTR_randint, MP_OBJ_FROM_PTR(&mod_random_randint_obj)); mp_store_global(MP_QSTR_choice, MP_OBJ_FROM_PTR(&mod_random_choice_obj)); diff --git a/examples/natmod/ure/ure.c b/examples/natmod/ure/ure.c index c51df2a475..79eca90ab9 100644 --- a/examples/natmod/ure/ure.c +++ b/examples/natmod/ure/ure.c @@ -1,8 +1,8 @@ #define MICROPY_STACK_CHECK (1) -#define MICROPY_PY_URE (1) -#define MICROPY_PY_URE_MATCH_GROUPS (1) -#define MICROPY_PY_URE_MATCH_SPAN_START_END (1) -#define MICROPY_PY_URE_SUB (0) // requires vstr interface +#define MICROPY_PY_RE (1) +#define MICROPY_PY_RE_MATCH_GROUPS (1) +#define MICROPY_PY_RE_MATCH_SPAN_START_END (1) +#define MICROPY_PY_RE_SUB (0) // requires vstr interface #include <alloca.h> #include "py/dynruntime.h" diff --git a/examples/natmod/uzlib/uzlib.c b/examples/natmod/uzlib/uzlib.c index ea21235102..9a3ec0af3c 100644 --- a/examples/natmod/uzlib/uzlib.c +++ b/examples/natmod/uzlib/uzlib.c @@ -1,4 +1,4 @@ -#define MICROPY_PY_UZLIB (1) +#define MICROPY_PY_ZLIB (1) #include "py/dynruntime.h" diff --git a/extmod/extmod.mk b/extmod/extmod.mk index ee9372e18d..2f9bd3b065 100644 --- a/extmod/extmod.mk +++ b/extmod/extmod.mk @@ -108,8 +108,8 @@ endif ################################################################################ # ussl -ifeq ($(MICROPY_PY_USSL),1) -CFLAGS_EXTMOD += -DMICROPY_PY_USSL=1 +ifeq ($(MICROPY_PY_SSL),1) +CFLAGS_EXTMOD += -DMICROPY_PY_SSL=1 ifeq ($(MICROPY_SSL_AXTLS),1) AXTLS_DIR = lib/axtls GIT_SUBMODULES += $(AXTLS_DIR) diff --git a/extmod/modlwip.c b/extmod/modlwip.c index c66a1de196..a902e8fb0f 100644 --- a/extmod/modlwip.c +++ b/extmod/modlwip.c @@ -918,7 +918,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(lwip_socket_bind_obj, lwip_socket_bind); STATIC mp_obj_t lwip_socket_listen(size_t n_args, const mp_obj_t *args) { lwip_socket_obj_t *socket = MP_OBJ_TO_PTR(args[0]); - mp_int_t backlog = MICROPY_PY_USOCKET_LISTEN_BACKLOG_DEFAULT; + mp_int_t backlog = MICROPY_PY_SOCKET_LISTEN_BACKLOG_DEFAULT; if (n_args > 1) { backlog = mp_obj_get_int(args[1]); backlog = (backlog < 0) ? 0 : backlog; diff --git a/extmod/modnetwork.h b/extmod/modnetwork.h index 11691140fd..4786596e9b 100644 --- a/extmod/modnetwork.h +++ b/extmod/modnetwork.h @@ -101,7 +101,7 @@ typedef struct _mod_network_socket_obj_t { int32_t timeout; mp_obj_t callback; int32_t state : 8; - #if MICROPY_PY_USOCKET_EXTENDED_STATE + #if MICROPY_PY_SOCKET_EXTENDED_STATE // Extended socket state for NICs/ports that need it. void *_private; #endif diff --git a/extmod/moduasyncio.c b/extmod/moduasyncio.c index 021e0da1be..c05a8dfc60 100644 --- a/extmod/moduasyncio.c +++ b/extmod/moduasyncio.c @@ -64,14 +64,14 @@ STATIC mp_obj_t task_queue_make_new(const mp_obj_type_t *type, size_t n_args, si // Ticks for task ordering in pairing heap STATIC mp_obj_t ticks(void) { - return MP_OBJ_NEW_SMALL_INT(mp_hal_ticks_ms() & (MICROPY_PY_UTIME_TICKS_PERIOD - 1)); + return MP_OBJ_NEW_SMALL_INT(mp_hal_ticks_ms() & (MICROPY_PY_TIME_TICKS_PERIOD - 1)); } STATIC mp_int_t ticks_diff(mp_obj_t t1_in, mp_obj_t t0_in) { mp_uint_t t0 = MP_OBJ_SMALL_INT_VALUE(t0_in); mp_uint_t t1 = MP_OBJ_SMALL_INT_VALUE(t1_in); - mp_int_t diff = ((t1 - t0 + MICROPY_PY_UTIME_TICKS_PERIOD / 2) & (MICROPY_PY_UTIME_TICKS_PERIOD - 1)) - - MICROPY_PY_UTIME_TICKS_PERIOD / 2; + mp_int_t diff = ((t1 - t0 + MICROPY_PY_TIME_TICKS_PERIOD / 2) & (MICROPY_PY_TIME_TICKS_PERIOD - 1)) + - MICROPY_PY_TIME_TICKS_PERIOD / 2; return diff; } diff --git a/extmod/modubinascii.c b/extmod/modubinascii.c index bfb8195d91..af8eab79f0 100644 --- a/extmod/modubinascii.c +++ b/extmod/modubinascii.c @@ -32,7 +32,7 @@ #include "py/binary.h" #include "py/objstr.h" -#if MICROPY_PY_UBINASCII +#if MICROPY_PY_BINASCII #if MICROPY_PY_BUILTINS_BYTES_HEX STATIC mp_obj_t bytes_hex_as_bytes(size_t n_args, const mp_obj_t *args) { @@ -170,7 +170,7 @@ STATIC mp_obj_t mod_binascii_b2a_base64(size_t n_args, const mp_obj_t *pos_args, } STATIC MP_DEFINE_CONST_FUN_OBJ_KW(mod_binascii_b2a_base64_obj, 1, mod_binascii_b2a_base64); -#if MICROPY_PY_UBINASCII_CRC32 +#if MICROPY_PY_BINASCII_CRC32 #include "lib/uzlib/tinf.h" STATIC mp_obj_t mod_binascii_crc32(size_t n_args, const mp_obj_t *args) { @@ -191,7 +191,7 @@ STATIC const mp_rom_map_elem_t mp_module_binascii_globals_table[] = { #endif { MP_ROM_QSTR(MP_QSTR_a2b_base64), MP_ROM_PTR(&mod_binascii_a2b_base64_obj) }, { MP_ROM_QSTR(MP_QSTR_b2a_base64), MP_ROM_PTR(&mod_binascii_b2a_base64_obj) }, - #if MICROPY_PY_UBINASCII_CRC32 + #if MICROPY_PY_BINASCII_CRC32 { MP_ROM_QSTR(MP_QSTR_crc32), MP_ROM_PTR(&mod_binascii_crc32_obj) }, #endif }; @@ -205,4 +205,4 @@ const mp_obj_module_t mp_module_binascii = { MP_REGISTER_MODULE(MP_QSTR_binascii, mp_module_binascii); -#endif // MICROPY_PY_UBINASCII +#endif // MICROPY_PY_BINASCII diff --git a/extmod/moducryptolib.c b/extmod/moducryptolib.c index 0c9701024e..2299477259 100644 --- a/extmod/moducryptolib.c +++ b/extmod/moducryptolib.c @@ -27,7 +27,7 @@ #include "py/mpconfig.h" -#if MICROPY_PY_UCRYPTOLIB +#if MICROPY_PY_CRYPTOLIB #include <assert.h> #include <string.h> @@ -90,7 +90,7 @@ typedef struct _mp_obj_aes_t { } mp_obj_aes_t; static inline bool is_ctr_mode(int block_mode) { - #if MICROPY_PY_UCRYPTOLIB_CTR + #if MICROPY_PY_CRYPTOLIB_CTR return block_mode == UCRYPTOLIB_MODE_CTR; #else return false; @@ -140,7 +140,7 @@ STATIC void aes_process_cbc_impl(AES_CTX_IMPL *ctx, const uint8_t *in, uint8_t * } } -#if MICROPY_PY_UCRYPTOLIB_CTR +#if MICROPY_PY_CRYPTOLIB_CTR // axTLS doesn't have CTR support out of the box. This implements the counter part using the ECB primitive. STATIC void aes_process_ctr_impl(AES_CTX_IMPL *ctx, const uint8_t *in, uint8_t *out, size_t in_len, struct ctr_params *ctr_params) { size_t n = ctr_params->offset; @@ -203,7 +203,7 @@ STATIC void aes_process_cbc_impl(AES_CTX_IMPL *ctx, const uint8_t *in, uint8_t * mbedtls_aes_crypt_cbc(&ctx->u.mbedtls_ctx, encrypt ? MBEDTLS_AES_ENCRYPT : MBEDTLS_AES_DECRYPT, in_len, ctx->iv, in, out); } -#if MICROPY_PY_UCRYPTOLIB_CTR +#if MICROPY_PY_CRYPTOLIB_CTR STATIC void aes_process_ctr_impl(AES_CTX_IMPL *ctx, const uint8_t *in, uint8_t *out, size_t in_len, struct ctr_params *ctr_params) { mbedtls_aes_crypt_ctr(&ctx->u.mbedtls_ctx, in_len, &ctr_params->offset, ctx->iv, ctr_params->encrypted_counter, in, out); } @@ -219,7 +219,7 @@ STATIC mp_obj_t cryptolib_aes_make_new(const mp_obj_type_t *type, size_t n_args, switch (block_mode) { case UCRYPTOLIB_MODE_ECB: case UCRYPTOLIB_MODE_CBC: - #if MICROPY_PY_UCRYPTOLIB_CTR + #if MICROPY_PY_CRYPTOLIB_CTR case UCRYPTOLIB_MODE_CTR: #endif break; @@ -318,7 +318,7 @@ STATIC mp_obj_t aes_process(size_t n_args, const mp_obj_t *args, bool encrypt) { aes_process_cbc_impl(&self->ctx, in_bufinfo.buf, out_buf_ptr, in_bufinfo.len, encrypt); break; - #if MICROPY_PY_UCRYPTOLIB_CTR + #if MICROPY_PY_CRYPTOLIB_CTR case UCRYPTOLIB_MODE_CTR: aes_process_ctr_impl(&self->ctx, in_bufinfo.buf, out_buf_ptr, in_bufinfo.len, ctr_params_from_aes(self)); @@ -359,10 +359,10 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE( STATIC const mp_rom_map_elem_t mp_module_cryptolib_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_cryptolib) }, { MP_ROM_QSTR(MP_QSTR_aes), MP_ROM_PTR(&cryptolib_aes_type) }, - #if MICROPY_PY_UCRYPTOLIB_CONSTS + #if MICROPY_PY_CRYPTOLIB_CONSTS { MP_ROM_QSTR(MP_QSTR_MODE_ECB), MP_ROM_INT(UCRYPTOLIB_MODE_ECB) }, { MP_ROM_QSTR(MP_QSTR_MODE_CBC), MP_ROM_INT(UCRYPTOLIB_MODE_CBC) }, - #if MICROPY_PY_UCRYPTOLIB_CTR + #if MICROPY_PY_CRYPTOLIB_CTR { MP_ROM_QSTR(MP_QSTR_MODE_CTR), MP_ROM_INT(UCRYPTOLIB_MODE_CTR) }, #endif #endif @@ -377,4 +377,4 @@ const mp_obj_module_t mp_module_cryptolib = { MP_REGISTER_MODULE(MP_QSTR_cryptolib, mp_module_cryptolib); -#endif // MICROPY_PY_UCRYPTOLIB +#endif // MICROPY_PY_CRYPTOLIB diff --git a/extmod/moduhashlib.c b/extmod/moduhashlib.c index 0e01b4f27f..1b94cc01a0 100644 --- a/extmod/moduhashlib.c +++ b/extmod/moduhashlib.c @@ -29,13 +29,13 @@ #include "py/runtime.h" -#if MICROPY_PY_UHASHLIB +#if MICROPY_PY_HASHLIB #if MICROPY_SSL_MBEDTLS #include "mbedtls/version.h" #endif -#if MICROPY_PY_UHASHLIB_SHA256 +#if MICROPY_PY_HASHLIB_SHA256 #if MICROPY_SSL_MBEDTLS #include "mbedtls/sha256.h" @@ -45,7 +45,7 @@ #endif -#if MICROPY_PY_UHASHLIB_SHA1 || MICROPY_PY_UHASHLIB_MD5 +#if MICROPY_PY_HASHLIB_SHA1 || MICROPY_PY_HASHLIB_MD5 #if MICROPY_SSL_AXTLS #include "lib/axtls/crypto/crypto.h" @@ -70,7 +70,7 @@ static void hashlib_ensure_not_final(mp_obj_hash_t *self) { } } -#if MICROPY_PY_UHASHLIB_SHA256 +#if MICROPY_PY_HASHLIB_SHA256 STATIC mp_obj_t hashlib_sha256_update(mp_obj_t self_in, mp_obj_t arg); #if MICROPY_SSL_MBEDTLS @@ -161,12 +161,12 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE( hashlib_sha256_type, MP_QSTR_sha256, MP_TYPE_FLAG_NONE, - make_new, uhashlib_sha256_make_new, + make_new, hashlib_sha256_make_new, locals_dict, &hashlib_sha256_locals_dict ); #endif -#if MICROPY_PY_UHASHLIB_SHA1 +#if MICROPY_PY_HASHLIB_SHA1 STATIC mp_obj_t hashlib_sha1_update(mp_obj_t self_in, mp_obj_t arg); #if MICROPY_SSL_AXTLS @@ -260,7 +260,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE( ); #endif -#if MICROPY_PY_UHASHLIB_MD5 +#if MICROPY_PY_HASHLIB_MD5 STATIC mp_obj_t hashlib_md5_update(mp_obj_t self_in, mp_obj_t arg); #if MICROPY_SSL_AXTLS @@ -352,17 +352,17 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE( make_new, hashlib_md5_make_new, locals_dict, &hashlib_md5_locals_dict ); -#endif // MICROPY_PY_UHASHLIB_MD5 +#endif // MICROPY_PY_HASHLIB_MD5 STATIC const mp_rom_map_elem_t mp_module_hashlib_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_hashlib) }, - #if MICROPY_PY_UHASHLIB_SHA256 + #if MICROPY_PY_HASHLIB_SHA256 { MP_ROM_QSTR(MP_QSTR_sha256), MP_ROM_PTR(&hashlib_sha256_type) }, #endif - #if MICROPY_PY_UHASHLIB_SHA1 + #if MICROPY_PY_HASHLIB_SHA1 { MP_ROM_QSTR(MP_QSTR_sha1), MP_ROM_PTR(&hashlib_sha1_type) }, #endif - #if MICROPY_PY_UHASHLIB_MD5 + #if MICROPY_PY_HASHLIB_MD5 { MP_ROM_QSTR(MP_QSTR_md5), MP_ROM_PTR(&hashlib_md5_type) }, #endif }; @@ -376,4 +376,4 @@ const mp_obj_module_t mp_module_hashlib = { MP_REGISTER_MODULE(MP_QSTR_hashlib, mp_module_hashlib); -#endif // MICROPY_PY_UHASHLIB +#endif // MICROPY_PY_HASHLIB diff --git a/extmod/moduheapq.c b/extmod/moduheapq.c index 59277813e9..79a12c2b9c 100644 --- a/extmod/moduheapq.c +++ b/extmod/moduheapq.c @@ -27,7 +27,7 @@ #include "py/objlist.h" #include "py/runtime.h" -#if MICROPY_PY_UHEAPQ +#if MICROPY_PY_HEAPQ // the algorithm here is modelled on CPython's heapq.py @@ -121,4 +121,4 @@ const mp_obj_module_t mp_module_heapq = { MP_REGISTER_MODULE(MP_QSTR_heapq, mp_module_heapq); #endif -#endif // MICROPY_PY_UHEAPQ +#endif // MICROPY_PY_HEAPQ diff --git a/extmod/modujson.c b/extmod/modujson.c index e67761e1a9..1b475543e1 100644 --- a/extmod/modujson.c +++ b/extmod/modujson.c @@ -32,9 +32,9 @@ #include "py/runtime.h" #include "py/stream.h" -#if MICROPY_PY_UJSON +#if MICROPY_PY_JSON -#if MICROPY_PY_UJSON_SEPARATORS +#if MICROPY_PY_JSON_SEPARATORS enum { DUMP_MODE_TO_STRING = 1, @@ -383,4 +383,4 @@ const mp_obj_module_t mp_module_json = { MP_REGISTER_MODULE(MP_QSTR_json, mp_module_json); -#endif // MICROPY_PY_UJSON +#endif // MICROPY_PY_JSON diff --git a/extmod/moduos.c b/extmod/moduos.c index 8c40f45370..e962a6c171 100644 --- a/extmod/moduos.c +++ b/extmod/moduos.c @@ -27,14 +27,14 @@ #include "py/objstr.h" #include "py/runtime.h" -#if MICROPY_PY_UOS +#if MICROPY_PY_OS #include "extmod/misc.h" #include "extmod/vfs.h" #if MICROPY_VFS_FAT #include "extmod/vfs_fat.h" -#if MICROPY_PY_UOS_SYNC +#if MICROPY_PY_OS_SYNC #include "lib/oofatfs/ff.h" #include "lib/oofatfs/diskio.h" #endif @@ -48,12 +48,12 @@ #include "extmod/vfs_posix.h" #endif -#if MICROPY_PY_UOS_UNAME +#if MICROPY_PY_OS_UNAME #include "genhdr/mpversion.h" #endif -#ifdef MICROPY_PY_UOS_INCLUDEFILE -#include MICROPY_PY_UOS_INCLUDEFILE +#ifdef MICROPY_PY_OS_INCLUDEFILE +#include MICROPY_PY_OS_INCLUDEFILE #endif #ifdef MICROPY_BUILD_TYPE @@ -62,7 +62,7 @@ #define MICROPY_BUILD_TYPE_PAREN #endif -#if MICROPY_PY_UOS_SYNC +#if MICROPY_PY_OS_SYNC // sync() // Sync all filesystems. STATIC mp_obj_t mp_os_sync(void) { @@ -77,9 +77,9 @@ STATIC mp_obj_t mp_os_sync(void) { MP_DEFINE_CONST_FUN_OBJ_0(mp_os_sync_obj, mp_os_sync); #endif -#if MICROPY_PY_UOS_UNAME +#if MICROPY_PY_OS_UNAME -#if MICROPY_PY_UOS_UNAME_RELEASE_DYNAMIC +#if MICROPY_PY_OS_UNAME_RELEASE_DYNAMIC #define CONST_RELEASE #else #define CONST_RELEASE const @@ -110,7 +110,7 @@ STATIC MP_DEFINE_ATTRTUPLE( ); STATIC mp_obj_t mp_os_uname(void) { - #if MICROPY_PY_UOS_UNAME_RELEASE_DYNAMIC + #if MICROPY_PY_OS_UNAME_RELEASE_DYNAMIC const char *release = mp_os_uname_release(); mp_os_uname_info_release_obj.len = strlen(release); mp_os_uname_info_release_obj.data = (const byte *)release; @@ -124,21 +124,21 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_0(mp_os_uname_obj, mp_os_uname); STATIC const mp_rom_map_elem_t os_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_os) }, - #if MICROPY_PY_UOS_GETENV_PUTENV_UNSETENV + #if MICROPY_PY_OS_GETENV_PUTENV_UNSETENV { MP_ROM_QSTR(MP_QSTR_getenv), MP_ROM_PTR(&mp_os_getenv_obj) }, { MP_ROM_QSTR(MP_QSTR_putenv), MP_ROM_PTR(&mp_os_putenv_obj) }, { MP_ROM_QSTR(MP_QSTR_unsetenv), MP_ROM_PTR(&mp_os_unsetenv_obj) }, #endif - #if MICROPY_PY_UOS_SEP + #if MICROPY_PY_OS_SEP { MP_ROM_QSTR(MP_QSTR_sep), MP_ROM_QSTR(MP_QSTR__slash_) }, #endif - #if MICROPY_PY_UOS_SYNC + #if MICROPY_PY_OS_SYNC { MP_ROM_QSTR(MP_QSTR_sync), MP_ROM_PTR(&mp_os_sync_obj) }, #endif - #if MICROPY_PY_UOS_SYSTEM + #if MICROPY_PY_OS_SYSTEM { MP_ROM_QSTR(MP_QSTR_system), MP_ROM_PTR(&mp_os_system_obj) }, #endif - #if MICROPY_PY_UOS_UNAME + #if MICROPY_PY_OS_UNAME { MP_ROM_QSTR(MP_QSTR_uname), MP_ROM_PTR(&mp_os_uname_obj) }, #endif #if MICROPY_PY_OS_URANDOM @@ -163,10 +163,10 @@ STATIC const mp_rom_map_elem_t os_module_globals_table[] = { #if MICROPY_PY_OS_DUPTERM { MP_ROM_QSTR(MP_QSTR_dupterm), MP_ROM_PTR(&mp_os_dupterm_obj) }, #endif - #if MICROPY_PY_UOS_DUPTERM_NOTIFY + #if MICROPY_PY_OS_DUPTERM_NOTIFY { MP_ROM_QSTR(MP_QSTR_dupterm_notify), MP_ROM_PTR(&mp_os_dupterm_notify_obj) }, #endif - #if MICROPY_PY_UOS_ERRNO + #if MICROPY_PY_OS_ERRNO { MP_ROM_QSTR(MP_QSTR_errno), MP_ROM_PTR(&mp_os_errno_obj) }, #endif @@ -197,4 +197,4 @@ const mp_obj_module_t mp_module_os = { MP_REGISTER_MODULE(MP_QSTR_os, mp_module_os); -#endif // MICROPY_PY_UOS +#endif // MICROPY_PY_OS diff --git a/extmod/moduplatform.c b/extmod/moduplatform.c index 791ae8344d..d5f919fc5e 100644 --- a/extmod/moduplatform.c +++ b/extmod/moduplatform.c @@ -32,7 +32,7 @@ #include "extmod/moduplatform.h" #include "genhdr/mpversion.h" -#if MICROPY_PY_UPLATFORM +#if MICROPY_PY_PLATFORM // platform - Access to underlying platform's identifying data @@ -77,4 +77,4 @@ const mp_obj_module_t mp_module_platform = { MP_REGISTER_MODULE(MP_QSTR_platform, mp_module_platform); -#endif // MICROPY_PY_UPLATFORM +#endif // MICROPY_PY_PLATFORM diff --git a/extmod/moduplatform.h b/extmod/moduplatform.h index 3597f7559f..7ca4297788 100644 --- a/extmod/moduplatform.h +++ b/extmod/moduplatform.h @@ -30,7 +30,7 @@ #include "py/mpconfig.h" // Preprocessor directives identifying the platform. -// The (u)platform module itself is guarded by MICROPY_PY_UPLATFORM, see the +// The platform module itself is guarded by MICROPY_PY_PLATFORM, see the // .c file, but these are made available because they're generally usable. // TODO: Add more architectures, compilers and libraries. // See: https://sourceforge.net/p/predef/wiki/Home/ diff --git a/extmod/modurandom.c b/extmod/modurandom.c index f69f7f4193..1c697aec70 100644 --- a/extmod/modurandom.c +++ b/extmod/modurandom.c @@ -29,10 +29,10 @@ #include "py/runtime.h" -#if MICROPY_PY_URANDOM +#if MICROPY_PY_RANDOM // Work out if the seed will be set on import or not. -#if MICROPY_MODULE_BUILTIN_INIT && defined(MICROPY_PY_URANDOM_SEED_INIT_FUNC) +#if MICROPY_MODULE_BUILTIN_INIT && defined(MICROPY_PY_RANDOM_SEED_INIT_FUNC) #define SEED_ON_IMPORT (1) #else #define SEED_ON_IMPORT (0) @@ -67,7 +67,7 @@ STATIC uint32_t yasmarang(void) { // End of Yasmarang -#if MICROPY_PY_URANDOM_EXTRA_FUNCS +#if MICROPY_PY_RANDOM_EXTRA_FUNCS // returns an unsigned integer below the given argument // n must not be zero @@ -103,8 +103,8 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_random_getrandbits_obj, mod_random_getrandb STATIC mp_obj_t mod_random_seed(size_t n_args, const mp_obj_t *args) { mp_uint_t seed; if (n_args == 0 || args[0] == mp_const_none) { - #ifdef MICROPY_PY_URANDOM_SEED_INIT_FUNC - seed = MICROPY_PY_URANDOM_SEED_INIT_FUNC; + #ifdef MICROPY_PY_RANDOM_SEED_INIT_FUNC + seed = MICROPY_PY_RANDOM_SEED_INIT_FUNC; #else mp_raise_ValueError(MP_ERROR_TEXT("no default seed")); #endif @@ -119,7 +119,7 @@ STATIC mp_obj_t mod_random_seed(size_t n_args, const mp_obj_t *args) { } STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_random_seed_obj, 0, 1, mod_random_seed); -#if MICROPY_PY_URANDOM_EXTRA_FUNCS +#if MICROPY_PY_RANDOM_EXTRA_FUNCS STATIC mp_obj_t mod_random_randrange(size_t n_args, const mp_obj_t *args) { mp_int_t start = mp_obj_get_int(args[0]); @@ -213,7 +213,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_random_uniform_obj, mod_random_uniform); #endif -#endif // MICROPY_PY_URANDOM_EXTRA_FUNCS +#endif // MICROPY_PY_RANDOM_EXTRA_FUNCS #if SEED_ON_IMPORT STATIC mp_obj_t mod_random___init__(void) { @@ -237,7 +237,7 @@ STATIC const mp_rom_map_elem_t mp_module_random_globals_table[] = { #endif { MP_ROM_QSTR(MP_QSTR_getrandbits), MP_ROM_PTR(&mod_random_getrandbits_obj) }, { MP_ROM_QSTR(MP_QSTR_seed), MP_ROM_PTR(&mod_random_seed_obj) }, - #if MICROPY_PY_URANDOM_EXTRA_FUNCS + #if MICROPY_PY_RANDOM_EXTRA_FUNCS { MP_ROM_QSTR(MP_QSTR_randrange), MP_ROM_PTR(&mod_random_randrange_obj) }, { MP_ROM_QSTR(MP_QSTR_randint), MP_ROM_PTR(&mod_random_randint_obj) }, { MP_ROM_QSTR(MP_QSTR_choice), MP_ROM_PTR(&mod_random_choice_obj) }, @@ -258,4 +258,4 @@ const mp_obj_module_t mp_module_random = { MP_REGISTER_MODULE(MP_QSTR_random, mp_module_random); #endif -#endif // MICROPY_PY_URANDOM +#endif // MICROPY_PY_RANDOM diff --git a/extmod/modure.c b/extmod/modure.c index a6fad3cf4e..c8a019be89 100644 --- a/extmod/modure.c +++ b/extmod/modure.c @@ -37,7 +37,7 @@ #include "py/unicode.h" #endif -#if MICROPY_PY_URE +#if MICROPY_PY_RE #define re1_5_stack_chk() MP_STACK_CHECK() @@ -85,7 +85,7 @@ STATIC mp_obj_t match_group(mp_obj_t self_in, mp_obj_t no_in) { } MP_DEFINE_CONST_FUN_OBJ_2(match_group_obj, match_group); -#if MICROPY_PY_URE_MATCH_GROUPS +#if MICROPY_PY_RE_MATCH_GROUPS STATIC mp_obj_t match_groups(mp_obj_t self_in) { mp_obj_match_t *self = MP_OBJ_TO_PTR(self_in); @@ -102,7 +102,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(match_groups_obj, match_groups); #endif -#if MICROPY_PY_URE_MATCH_SPAN_START_END +#if MICROPY_PY_RE_MATCH_SPAN_START_END STATIC void match_span_helper(size_t n_args, const mp_obj_t *args, mp_obj_t span[2]) { mp_obj_match_t *self = MP_OBJ_TO_PTR(args[0]); @@ -167,10 +167,10 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(match_end_obj, 1, 2, match_end); #if !MICROPY_ENABLE_DYNRUNTIME STATIC const mp_rom_map_elem_t match_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_group), MP_ROM_PTR(&match_group_obj) }, - #if MICROPY_PY_URE_MATCH_GROUPS + #if MICROPY_PY_RE_MATCH_GROUPS { MP_ROM_QSTR(MP_QSTR_groups), MP_ROM_PTR(&match_groups_obj) }, #endif - #if MICROPY_PY_URE_MATCH_SPAN_START_END + #if MICROPY_PY_RE_MATCH_SPAN_START_END { MP_ROM_QSTR(MP_QSTR_span), MP_ROM_PTR(&match_span_obj) }, { MP_ROM_QSTR(MP_QSTR_start), MP_ROM_PTR(&match_start_obj) }, { MP_ROM_QSTR(MP_QSTR_end), MP_ROM_PTR(&match_end_obj) }, @@ -277,7 +277,7 @@ STATIC mp_obj_t re_split(size_t n_args, const mp_obj_t *args) { } MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(re_split_obj, 2, 3, re_split); -#if MICROPY_PY_URE_SUB +#if MICROPY_PY_RE_SUB STATIC mp_obj_t re_sub_helper(size_t n_args, const mp_obj_t *args) { mp_obj_re_t *self; @@ -405,7 +405,7 @@ STATIC const mp_rom_map_elem_t re_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_match), MP_ROM_PTR(&re_match_obj) }, { MP_ROM_QSTR(MP_QSTR_search), MP_ROM_PTR(&re_search_obj) }, { MP_ROM_QSTR(MP_QSTR_split), MP_ROM_PTR(&re_split_obj) }, - #if MICROPY_PY_URE_SUB + #if MICROPY_PY_RE_SUB { MP_ROM_QSTR(MP_QSTR_sub), MP_ROM_PTR(&re_sub_obj) }, #endif }; @@ -429,7 +429,7 @@ STATIC mp_obj_t mod_re_compile(size_t n_args, const mp_obj_t *args) { goto error; } mp_obj_re_t *o = mp_obj_malloc_var(mp_obj_re_t, char, size, (mp_obj_type_t *)&re_type); - #if MICROPY_PY_URE_DEBUG + #if MICROPY_PY_RE_DEBUG int flags = 0; if (n_args > 1) { flags = mp_obj_get_int(args[1]); @@ -440,7 +440,7 @@ STATIC mp_obj_t mod_re_compile(size_t n_args, const mp_obj_t *args) { error: mp_raise_ValueError(MP_ERROR_TEXT("error in regex")); } - #if MICROPY_PY_URE_DEBUG + #if MICROPY_PY_RE_DEBUG if (flags & FLAG_DEBUG) { re1_5_dumpcode(&o->re); } @@ -455,10 +455,10 @@ STATIC const mp_rom_map_elem_t mp_module_re_globals_table[] = { { MP_ROM_QSTR(MP_QSTR_compile), MP_ROM_PTR(&mod_re_compile_obj) }, { MP_ROM_QSTR(MP_QSTR_match), MP_ROM_PTR(&re_match_obj) }, { MP_ROM_QSTR(MP_QSTR_search), MP_ROM_PTR(&re_search_obj) }, - #if MICROPY_PY_URE_SUB + #if MICROPY_PY_RE_SUB { MP_ROM_QSTR(MP_QSTR_sub), MP_ROM_PTR(&re_sub_obj) }, #endif - #if MICROPY_PY_URE_DEBUG + #if MICROPY_PY_RE_DEBUG { MP_ROM_QSTR(MP_QSTR_DEBUG), MP_ROM_INT(FLAG_DEBUG) }, #endif }; @@ -482,11 +482,11 @@ MP_REGISTER_MODULE(MP_QSTR_re, mp_module_re); #include "lib/re1.5/recursiveloop.c" #include "lib/re1.5/charclass.c" -#if MICROPY_PY_URE_DEBUG +#if MICROPY_PY_RE_DEBUG // Make sure the output print statements go to the same output as other Python output. #define printf(...) mp_printf(&mp_plat_print, __VA_ARGS__) #include "lib/re1.5/dumpcode.c" #undef printf #endif -#endif // MICROPY_PY_URE +#endif // MICROPY_PY_RE diff --git a/extmod/moduselect.c b/extmod/moduselect.c index 5bb5f4f48d..011d5cb832 100644 --- a/extmod/moduselect.c +++ b/extmod/moduselect.c @@ -26,7 +26,7 @@ */ #include "py/mpconfig.h" -#if MICROPY_PY_USELECT +#if MICROPY_PY_SELECT #include <stdio.h> @@ -107,7 +107,7 @@ STATIC mp_uint_t poll_map_poll(mp_map_t *poll_map, size_t *rwx_num) { return n_ready; } -#if MICROPY_PY_USELECT_SELECT +#if MICROPY_PY_SELECT_SELECT // select(rlist, wlist, xlist[, timeout]) STATIC mp_obj_t select_select(size_t n_args, const mp_obj_t *args) { // get array data from tuple/list arguments @@ -174,7 +174,7 @@ STATIC mp_obj_t select_select(size_t n_args, const mp_obj_t *args) { } } MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_select_select_obj, 3, 4, select_select); -#endif // MICROPY_PY_USELECT_SELECT +#endif // MICROPY_PY_SELECT_SELECT typedef struct _mp_obj_poll_t { mp_obj_base_t base; @@ -356,7 +356,7 @@ MP_DEFINE_CONST_FUN_OBJ_0(mp_select_poll_obj, select_poll); STATIC const mp_rom_map_elem_t mp_module_select_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_select) }, - #if MICROPY_PY_USELECT_SELECT + #if MICROPY_PY_SELECT_SELECT { MP_ROM_QSTR(MP_QSTR_select), MP_ROM_PTR(&mp_select_select_obj) }, #endif { MP_ROM_QSTR(MP_QSTR_poll), MP_ROM_PTR(&mp_select_poll_obj) }, @@ -375,4 +375,4 @@ const mp_obj_module_t mp_module_select = { MP_REGISTER_MODULE(MP_QSTR_select, mp_module_select); -#endif // MICROPY_PY_USELECT +#endif // MICROPY_PY_SELECT diff --git a/extmod/modusocket.c b/extmod/modusocket.c index c8695f1044..316a578ac2 100644 --- a/extmod/modusocket.c +++ b/extmod/modusocket.c @@ -33,7 +33,7 @@ #include "py/stream.h" #include "py/mperrno.h" -#if MICROPY_PY_NETWORK && MICROPY_PY_USOCKET && !MICROPY_PY_LWIP +#if MICROPY_PY_NETWORK && MICROPY_PY_SOCKET && !MICROPY_PY_LWIP #include "shared/netutils/netutils.h" #include "modnetwork.h" @@ -75,7 +75,7 @@ STATIC mp_obj_t socket_make_new(const mp_obj_type_t *type, size_t n_args, size_t s->timeout = -1; s->callback = MP_OBJ_NULL; s->state = MOD_NETWORK_SS_NEW; - #if MICROPY_PY_USOCKET_EXTENDED_STATE + #if MICROPY_PY_SOCKET_EXTENDED_STATE s->_private = NULL; #endif @@ -94,7 +94,7 @@ STATIC void socket_select_nic(mod_network_socket_obj_t *self, const byte *ip) { mp_raise_OSError(_errno); } - #if MICROPY_PY_USOCKET_EXTENDED_STATE + #if MICROPY_PY_SOCKET_EXTENDED_STATE // if a timeout was set before binding a NIC, call settimeout to reset it if (self->timeout != -1 && self->nic_protocol->settimeout(self, self->timeout, &_errno) != 0) { mp_raise_OSError(_errno); @@ -134,7 +134,7 @@ STATIC mp_obj_t socket_listen(size_t n_args, const mp_obj_t *args) { mp_raise_OSError(MP_ENOTCONN); } - mp_int_t backlog = MICROPY_PY_USOCKET_LISTEN_BACKLOG_DEFAULT; + mp_int_t backlog = MICROPY_PY_SOCKET_LISTEN_BACKLOG_DEFAULT; if (n_args > 1) { backlog = mp_obj_get_int(args[1]); backlog = (backlog < 0) ? 0 : backlog; @@ -177,7 +177,7 @@ STATIC mp_obj_t socket_accept(mp_obj_t self_in) { socket2->timeout = -1; socket2->callback = MP_OBJ_NULL; socket2->state = MOD_NETWORK_SS_NEW; - #if MICROPY_PY_USOCKET_EXTENDED_STATE + #if MICROPY_PY_SOCKET_EXTENDED_STATE socket2->_private = NULL; #endif @@ -420,7 +420,7 @@ STATIC mp_obj_t socket_settimeout(mp_obj_t self_in, mp_obj_t timeout_in) { #endif } if (self->nic == MP_OBJ_NULL) { - #if MICROPY_PY_USOCKET_EXTENDED_STATE + #if MICROPY_PY_SOCKET_EXTENDED_STATE // store the timeout in the socket state until a NIC is bound self->timeout = timeout; #else @@ -655,4 +655,4 @@ const mp_obj_module_t mp_module_socket = { MP_REGISTER_MODULE(MP_QSTR_socket, mp_module_socket); -#endif // MICROPY_PY_NETWORK && MICROPY_PY_USOCKET && !MICROPY_PY_LWIP +#endif // MICROPY_PY_NETWORK && MICROPY_PY_SOCKET && !MICROPY_PY_LWIP diff --git a/extmod/modussl_axtls.c b/extmod/modussl_axtls.c index c09059cae8..1c9caf76eb 100644 --- a/extmod/modussl_axtls.c +++ b/extmod/modussl_axtls.c @@ -31,7 +31,7 @@ #include "py/stream.h" #include "py/objstr.h" -#if MICROPY_PY_USSL && MICROPY_SSL_AXTLS +#if MICROPY_PY_SSL && MICROPY_SSL_AXTLS #include "ssl.h" @@ -118,7 +118,7 @@ STATIC NORETURN void ssl_raise_error(int err) { STATIC mp_obj_ssl_socket_t *ssl_socket_new(mp_obj_t sock, struct ssl_args *args) { - #if MICROPY_PY_USSL_FINALISER + #if MICROPY_PY_SSL_FINALISER mp_obj_ssl_socket_t *o = m_new_obj_with_finaliser(mp_obj_ssl_socket_t); #else mp_obj_ssl_socket_t *o = m_new_obj(mp_obj_ssl_socket_t); @@ -301,7 +301,7 @@ STATIC const mp_rom_map_elem_t ssl_socket_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_write), MP_ROM_PTR(&mp_stream_write_obj) }, { MP_ROM_QSTR(MP_QSTR_setblocking), MP_ROM_PTR(&ssl_socket_setblocking_obj) }, { MP_ROM_QSTR(MP_QSTR_close), MP_ROM_PTR(&mp_stream_close_obj) }, - #if MICROPY_PY_USSL_FINALISER + #if MICROPY_PY_SSL_FINALISER { MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&mp_stream_close_obj) }, #endif }; @@ -359,4 +359,4 @@ const mp_obj_module_t mp_module_ssl = { MP_REGISTER_MODULE(MP_QSTR_ssl, mp_module_ssl); -#endif // MICROPY_PY_USSL && MICROPY_SSL_AXTLS +#endif // MICROPY_PY_SSL && MICROPY_SSL_AXTLS diff --git a/extmod/modussl_mbedtls.c b/extmod/modussl_mbedtls.c index dbe802f75b..d724e0a08a 100644 --- a/extmod/modussl_mbedtls.c +++ b/extmod/modussl_mbedtls.c @@ -26,7 +26,7 @@ */ #include "py/mpconfig.h" -#if MICROPY_PY_USSL && MICROPY_SSL_MBEDTLS +#if MICROPY_PY_SSL && MICROPY_SSL_MBEDTLS #include <stdio.h> #include <string.h> @@ -163,7 +163,7 @@ STATIC mp_obj_ssl_socket_t *socket_new(mp_obj_t sock, struct ssl_args *args) { // Verify the socket object has the full stream protocol mp_get_stream_raise(sock, MP_STREAM_OP_READ | MP_STREAM_OP_WRITE | MP_STREAM_OP_IOCTL); - #if MICROPY_PY_USSL_FINALISER + #if MICROPY_PY_SSL_FINALISER mp_obj_ssl_socket_t *o = m_new_obj_with_finaliser(mp_obj_ssl_socket_t); #else mp_obj_ssl_socket_t *o = m_new_obj(mp_obj_ssl_socket_t); @@ -442,7 +442,7 @@ STATIC const mp_rom_map_elem_t ssl_socket_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_write), MP_ROM_PTR(&mp_stream_write_obj) }, { MP_ROM_QSTR(MP_QSTR_setblocking), MP_ROM_PTR(&socket_setblocking_obj) }, { MP_ROM_QSTR(MP_QSTR_close), MP_ROM_PTR(&mp_stream_close_obj) }, - #if MICROPY_PY_USSL_FINALISER + #if MICROPY_PY_SSL_FINALISER { MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&mp_stream_close_obj) }, #endif #if MICROPY_UNIX_COVERAGE @@ -509,4 +509,4 @@ const mp_obj_module_t mp_module_ssl = { MP_REGISTER_MODULE(MP_QSTR_ssl, mp_module_ssl); -#endif // MICROPY_PY_USSL && MICROPY_SSL_MBEDTLS +#endif // MICROPY_PY_SSL && MICROPY_SSL_MBEDTLS diff --git a/extmod/modutime.c b/extmod/modutime.c index 9731f5ff0b..1dfd7aa2c0 100644 --- a/extmod/modutime.c +++ b/extmod/modutime.c @@ -30,13 +30,13 @@ #include "py/smallint.h" #include "extmod/modutime.h" -#if MICROPY_PY_UTIME +#if MICROPY_PY_TIME -#ifdef MICROPY_PY_UTIME_INCLUDEFILE -#include MICROPY_PY_UTIME_INCLUDEFILE +#ifdef MICROPY_PY_TIME_INCLUDEFILE +#include MICROPY_PY_TIME_INCLUDEFILE #endif -#if MICROPY_PY_UTIME_GMTIME_LOCALTIME_MKTIME +#if MICROPY_PY_TIME_GMTIME_LOCALTIME_MKTIME #include "shared/timeutils/timeutils.h" @@ -96,9 +96,9 @@ STATIC mp_obj_t time_mktime(mp_obj_t tuple) { } MP_DEFINE_CONST_FUN_OBJ_1(mp_time_mktime_obj, time_mktime); -#endif // MICROPY_PY_UTIME_GMTIME_LOCALTIME_MKTIME +#endif // MICROPY_PY_TIME_GMTIME_LOCALTIME_MKTIME -#if MICROPY_PY_UTIME_TIME_TIME_NS +#if MICROPY_PY_TIME_TIME_TIME_NS // time() // Return the number of seconds since the Epoch. @@ -114,10 +114,10 @@ STATIC mp_obj_t time_time_ns(void) { } MP_DEFINE_CONST_FUN_OBJ_0(mp_time_time_ns_obj, time_time_ns); -#endif // MICROPY_PY_UTIME_TIME_TIME_NS +#endif // MICROPY_PY_TIME_TIME_TIME_NS STATIC mp_obj_t time_sleep(mp_obj_t seconds_o) { - #ifdef MICROPY_PY_UTIME_CUSTOM_SLEEP + #ifdef MICROPY_PY_TIME_CUSTOM_SLEEP mp_time_sleep(seconds_o); #else #if MICROPY_PY_BUILTINS_FLOAT @@ -149,17 +149,17 @@ STATIC mp_obj_t time_sleep_us(mp_obj_t arg) { MP_DEFINE_CONST_FUN_OBJ_1(mp_time_sleep_us_obj, time_sleep_us); STATIC mp_obj_t time_ticks_ms(void) { - return MP_OBJ_NEW_SMALL_INT(mp_hal_ticks_ms() & (MICROPY_PY_UTIME_TICKS_PERIOD - 1)); + return MP_OBJ_NEW_SMALL_INT(mp_hal_ticks_ms() & (MICROPY_PY_TIME_TICKS_PERIOD - 1)); } MP_DEFINE_CONST_FUN_OBJ_0(mp_time_ticks_ms_obj, time_ticks_ms); STATIC mp_obj_t time_ticks_us(void) { - return MP_OBJ_NEW_SMALL_INT(mp_hal_ticks_us() & (MICROPY_PY_UTIME_TICKS_PERIOD - 1)); + return MP_OBJ_NEW_SMALL_INT(mp_hal_ticks_us() & (MICROPY_PY_TIME_TICKS_PERIOD - 1)); } MP_DEFINE_CONST_FUN_OBJ_0(mp_time_ticks_us_obj, time_ticks_us); STATIC mp_obj_t time_ticks_cpu(void) { - return MP_OBJ_NEW_SMALL_INT(mp_hal_ticks_cpu() & (MICROPY_PY_UTIME_TICKS_PERIOD - 1)); + return MP_OBJ_NEW_SMALL_INT(mp_hal_ticks_cpu() & (MICROPY_PY_TIME_TICKS_PERIOD - 1)); } MP_DEFINE_CONST_FUN_OBJ_0(mp_time_ticks_cpu_obj, time_ticks_cpu); @@ -169,8 +169,8 @@ STATIC mp_obj_t time_ticks_diff(mp_obj_t end_in, mp_obj_t start_in) { mp_uint_t end = MP_OBJ_SMALL_INT_VALUE(end_in); // Optimized formula avoiding if conditions. We adjust difference "forward", // wrap it around and adjust back. - mp_int_t diff = ((end - start + MICROPY_PY_UTIME_TICKS_PERIOD / 2) & (MICROPY_PY_UTIME_TICKS_PERIOD - 1)) - - MICROPY_PY_UTIME_TICKS_PERIOD / 2; + mp_int_t diff = ((end - start + MICROPY_PY_TIME_TICKS_PERIOD / 2) & (MICROPY_PY_TIME_TICKS_PERIOD - 1)) + - MICROPY_PY_TIME_TICKS_PERIOD / 2; return MP_OBJ_NEW_SMALL_INT(diff); } MP_DEFINE_CONST_FUN_OBJ_2(mp_time_ticks_diff_obj, time_ticks_diff); @@ -188,24 +188,24 @@ STATIC mp_obj_t time_ticks_add(mp_obj_t ticks_in, mp_obj_t delta_in) { // // This unsigned comparison is equivalent to a signed comparison of: // delta <= -TICKS_PERIOD/2 || delta >= TICKS_PERIOD/2 - if (delta + MICROPY_PY_UTIME_TICKS_PERIOD / 2 - 1 >= MICROPY_PY_UTIME_TICKS_PERIOD - 1) { + if (delta + MICROPY_PY_TIME_TICKS_PERIOD / 2 - 1 >= MICROPY_PY_TIME_TICKS_PERIOD - 1) { mp_raise_msg(&mp_type_OverflowError, MP_ERROR_TEXT("ticks interval overflow")); } - return MP_OBJ_NEW_SMALL_INT((ticks + delta) & (MICROPY_PY_UTIME_TICKS_PERIOD - 1)); + return MP_OBJ_NEW_SMALL_INT((ticks + delta) & (MICROPY_PY_TIME_TICKS_PERIOD - 1)); } MP_DEFINE_CONST_FUN_OBJ_2(mp_time_ticks_add_obj, time_ticks_add); STATIC const mp_rom_map_elem_t mp_module_time_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_time) }, - #if MICROPY_PY_UTIME_GMTIME_LOCALTIME_MKTIME + #if MICROPY_PY_TIME_GMTIME_LOCALTIME_MKTIME { MP_ROM_QSTR(MP_QSTR_gmtime), MP_ROM_PTR(&mp_time_localtime_obj) }, { MP_ROM_QSTR(MP_QSTR_localtime), MP_ROM_PTR(&mp_time_localtime_obj) }, { MP_ROM_QSTR(MP_QSTR_mktime), MP_ROM_PTR(&mp_time_mktime_obj) }, #endif - #if MICROPY_PY_UTIME_TIME_TIME_NS + #if MICROPY_PY_TIME_TIME_TIME_NS { MP_ROM_QSTR(MP_QSTR_time), MP_ROM_PTR(&mp_time_time_obj) }, { MP_ROM_QSTR(MP_QSTR_time_ns), MP_ROM_PTR(&mp_time_time_ns_obj) }, #endif @@ -220,8 +220,8 @@ STATIC const mp_rom_map_elem_t mp_module_time_globals_table[] = { { MP_ROM_QSTR(MP_QSTR_ticks_add), MP_ROM_PTR(&mp_time_ticks_add_obj) }, { MP_ROM_QSTR(MP_QSTR_ticks_diff), MP_ROM_PTR(&mp_time_ticks_diff_obj) }, - #ifdef MICROPY_PY_UTIME_EXTRA_GLOBALS - MICROPY_PY_UTIME_EXTRA_GLOBALS + #ifdef MICROPY_PY_TIME_EXTRA_GLOBALS + MICROPY_PY_TIME_EXTRA_GLOBALS #endif }; STATIC MP_DEFINE_CONST_DICT(mp_module_time_globals, mp_module_time_globals_table); @@ -233,4 +233,4 @@ const mp_obj_module_t mp_module_time = { MP_REGISTER_MODULE(MP_QSTR_time, mp_module_time); -#endif // MICROPY_PY_UTIME +#endif // MICROPY_PY_TIME diff --git a/extmod/modutimeq.c b/extmod/modutimeq.c index 643aef5d6d..7c037ea0a9 100644 --- a/extmod/modutimeq.c +++ b/extmod/modutimeq.c @@ -31,9 +31,9 @@ #include "py/runtime.h" #include "py/smallint.h" -#if MICROPY_PY_UTIMEQ +#if MICROPY_PY_TIMEQ -#define MODULO MICROPY_PY_UTIME_TICKS_PERIOD +#define MODULO MICROPY_PY_TIME_TICKS_PERIOD #define DEBUG 0 @@ -232,4 +232,4 @@ const mp_obj_module_t mp_module_timeq = { MP_REGISTER_MODULE(MP_QSTR_timeq, mp_module_timeq); -#endif // MICROPY_PY_UTIMEQ +#endif // MICROPY_PY_TIMEQ diff --git a/extmod/moduwebsocket.c b/extmod/moduwebsocket.c index 76330f3125..ac90dea8b3 100644 --- a/extmod/moduwebsocket.c +++ b/extmod/moduwebsocket.c @@ -32,7 +32,7 @@ #include "py/stream.h" #include "extmod/moduwebsocket.h" -#if MICROPY_PY_UWEBSOCKET +#if MICROPY_PY_WEBSOCKET enum { FRAME_HEADER, FRAME_OPT, PAYLOAD, CONTROL }; @@ -313,4 +313,4 @@ const mp_obj_module_t mp_module_websocket = { MP_REGISTER_MODULE(MP_QSTR_websocket, mp_module_websocket); -#endif // MICROPY_PY_UWEBSOCKET +#endif // MICROPY_PY_WEBSOCKET diff --git a/extmod/moduzlib.c b/extmod/moduzlib.c index e840bdcbfd..a912f113ce 100644 --- a/extmod/moduzlib.c +++ b/extmod/moduzlib.c @@ -31,7 +31,7 @@ #include "py/stream.h" #include "py/mperrno.h" -#if MICROPY_PY_UZLIB +#if MICROPY_PY_ZLIB #include "lib/uzlib/tinf.h" @@ -236,4 +236,4 @@ MP_REGISTER_MODULE(MP_QSTR_zlib, mp_module_zlib); #include "lib/uzlib/adler32.c" #include "lib/uzlib/crc32.c" -#endif // MICROPY_PY_UZLIB +#endif // MICROPY_PY_ZLIB diff --git a/extmod/uos_dupterm.c b/extmod/uos_dupterm.c index c72b365bea..cfd1c62616 100644 --- a/extmod/uos_dupterm.c +++ b/extmod/uos_dupterm.c @@ -66,7 +66,7 @@ uintptr_t mp_os_dupterm_poll(uintptr_t poll_flags) { int errcode = 0; mp_uint_t ret = 0; const mp_stream_p_t *stream_p = mp_get_stream(s); - #if MICROPY_PY_UOS_DUPTERM_BUILTIN_STREAM + #if MICROPY_PY_OS_DUPTERM_BUILTIN_STREAM if (mp_os_dupterm_is_builtin_stream(s)) { ret = stream_p->ioctl(s, MP_STREAM_POLL, poll_flags, &errcode); } else @@ -99,7 +99,7 @@ int mp_os_dupterm_rx_chr(void) { continue; } - #if MICROPY_PY_UOS_DUPTERM_BUILTIN_STREAM + #if MICROPY_PY_OS_DUPTERM_BUILTIN_STREAM if (mp_os_dupterm_is_builtin_stream(MP_STATE_VM(dupterm_objs[idx]))) { byte buf[1]; int errcode = 0; @@ -154,7 +154,7 @@ void mp_os_dupterm_tx_strn(const char *str, size_t len) { continue; } - #if MICROPY_PY_UOS_DUPTERM_BUILTIN_STREAM + #if MICROPY_PY_OS_DUPTERM_BUILTIN_STREAM if (mp_os_dupterm_is_builtin_stream(MP_STATE_VM(dupterm_objs[idx]))) { int errcode = 0; const mp_stream_p_t *stream_p = mp_get_stream(MP_STATE_VM(dupterm_objs[idx])); @@ -194,7 +194,7 @@ STATIC mp_obj_t mp_os_dupterm(size_t n_args, const mp_obj_t *args) { MP_STATE_VM(dupterm_objs[idx]) = args[0]; } - #if MICROPY_PY_UOS_DUPTERM_STREAM_DETACHED_ATTACHED + #if MICROPY_PY_OS_DUPTERM_STREAM_DETACHED_ATTACHED mp_os_dupterm_stream_detached_attached(previous_obj, args[0]); #endif diff --git a/extmod/vfs_posix.c b/extmod/vfs_posix.c index 9b856e1f01..d63bb5be7b 100644 --- a/extmod/vfs_posix.c +++ b/extmod/vfs_posix.c @@ -332,7 +332,7 @@ STATIC mp_obj_t vfs_posix_stat(mp_obj_t self_in, mp_obj_t path_in) { } STATIC MP_DEFINE_CONST_FUN_OBJ_2(vfs_posix_stat_obj, vfs_posix_stat); -#if MICROPY_PY_UOS_STATVFS +#if MICROPY_PY_OS_STATVFS #ifdef __ANDROID__ #define USE_STATFS 1 @@ -390,7 +390,7 @@ STATIC const mp_rom_map_elem_t vfs_posix_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_rename), MP_ROM_PTR(&vfs_posix_rename_obj) }, { MP_ROM_QSTR(MP_QSTR_rmdir), MP_ROM_PTR(&vfs_posix_rmdir_obj) }, { MP_ROM_QSTR(MP_QSTR_stat), MP_ROM_PTR(&vfs_posix_stat_obj) }, - #if MICROPY_PY_UOS_STATVFS + #if MICROPY_PY_OS_STATVFS { MP_ROM_QSTR(MP_QSTR_statvfs), MP_ROM_PTR(&vfs_posix_statvfs_obj) }, #endif }; diff --git a/extmod/vfs_posix_file.c b/extmod/vfs_posix_file.c index ea19de7fd0..1d89e3ca09 100644 --- a/extmod/vfs_posix_file.c +++ b/extmod/vfs_posix_file.c @@ -194,7 +194,7 @@ STATIC mp_uint_t vfs_posix_file_ioctl(mp_obj_t o_in, mp_uint_t request, uintptr_ return 0; case MP_STREAM_GET_FILENO: return o->fd; - #if MICROPY_PY_USELECT + #if MICROPY_PY_SELECT case MP_STREAM_POLL: { #ifdef _WIN32 mp_raise_NotImplementedError(MP_ERROR_TEXT("poll on file not available on win32")); diff --git a/ports/cc3200/mods/modusocket.c b/ports/cc3200/mods/modusocket.c index da756296fc..9b614c6d34 100644 --- a/ports/cc3200/mods/modusocket.c +++ b/ports/cc3200/mods/modusocket.c @@ -489,7 +489,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_bind_obj, socket_bind); STATIC mp_obj_t socket_listen(size_t n_args, const mp_obj_t *args) { mod_network_socket_obj_t *self = args[0]; - int32_t backlog = MICROPY_PY_USOCKET_LISTEN_BACKLOG_DEFAULT; + int32_t backlog = MICROPY_PY_SOCKET_LISTEN_BACKLOG_DEFAULT; if (n_args > 1) { backlog = mp_obj_get_int(args[1]); backlog = (backlog < 0) ? 0 : backlog; diff --git a/ports/cc3200/mpconfigport.h b/ports/cc3200/mpconfigport.h index 8026f7b757..af10c63531 100644 --- a/ports/cc3200/mpconfigport.h +++ b/ports/cc3200/mpconfigport.h @@ -104,29 +104,29 @@ #define MICROPY_PY_SYS_STDFILES (1) #define MICROPY_PY_CMATH (0) #define MICROPY_PY_IO (1) -#define MICROPY_PY_UERRNO (1) -#define MICROPY_PY_UERRNO_ERRORCODE (0) +#define MICROPY_PY_ERRNO (1) +#define MICROPY_PY_ERRNO_ERRORCODE (0) #define MICROPY_PY_THREAD (1) #define MICROPY_PY_THREAD_GIL (1) -#define MICROPY_PY_UBINASCII (1) +#define MICROPY_PY_BINASCII (1) #define MICROPY_PY_UCTYPES (0) -#define MICROPY_PY_UZLIB (0) -#define MICROPY_PY_UJSON (1) -#define MICROPY_PY_URE (1) -#define MICROPY_PY_UHEAPQ (0) -#define MICROPY_PY_UHASHLIB (0) -#define MICROPY_PY_USELECT (1) -#define MICROPY_PY_UTIME (1) -#define MICROPY_PY_UTIME_GMTIME_LOCALTIME_MKTIME (1) -#define MICROPY_PY_UTIME_TIME_TIME_NS (1) -#define MICROPY_PY_UTIME_INCLUDEFILE "ports/cc3200/mods/modutime.c" +#define MICROPY_PY_ZLIB (0) +#define MICROPY_PY_JSON (1) +#define MICROPY_PY_RE (1) +#define MICROPY_PY_HEAPQ (0) +#define MICROPY_PY_HASHLIB (0) +#define MICROPY_PY_SELECT (1) +#define MICROPY_PY_TIME (1) +#define MICROPY_PY_TIME_GMTIME_LOCALTIME_MKTIME (1) +#define MICROPY_PY_TIME_TIME_TIME_NS (1) +#define MICROPY_PY_TIME_INCLUDEFILE "ports/cc3200/mods/modtime.c" #define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF (1) #define MICROPY_EMERGENCY_EXCEPTION_BUF_SIZE (0) #define MICROPY_KBD_EXCEPTION (1) // We define our own list of errno constants to include in errno module -#define MICROPY_PY_UERRNO_LIST \ +#define MICROPY_PY_ERRNO_LIST \ X(EPERM) \ X(EIO) \ X(ENODEV) \ diff --git a/ports/esp32/main.c b/ports/esp32/main.c index b3d467a80e..3e7c9ee162 100644 --- a/ports/esp32/main.c +++ b/ports/esp32/main.c @@ -224,7 +224,7 @@ soft_reset_exit: // TODO: machine_rmt_deinit_all(); machine_pins_deinit(); machine_deinit(); - #if MICROPY_PY_USOCKET_EVENTS + #if MICROPY_PY_SOCKET_EVENTS socket_events_deinit(); #endif diff --git a/ports/esp32/modsocket.c b/ports/esp32/modsocket.c index 114629a9d7..0b2d40e333 100644 --- a/ports/esp32/modsocket.c +++ b/ports/esp32/modsocket.c @@ -73,7 +73,7 @@ typedef struct _socket_obj_t { uint8_t proto; uint8_t state; unsigned int retries; - #if MICROPY_PY_USOCKET_EVENTS + #if MICROPY_PY_SOCKET_EVENTS mp_obj_t events_callback; struct _socket_obj_t *events_next; #endif @@ -81,7 +81,7 @@ typedef struct _socket_obj_t { void _socket_settimeout(socket_obj_t *sock, uint64_t timeout_ms); -#if MICROPY_PY_USOCKET_EVENTS +#if MICROPY_PY_SOCKET_EVENTS // Support for callbacks on asynchronous socket events (when socket becomes readable) // This divisor is used to reduce the load on the system, so it doesn't poll sockets too often @@ -144,7 +144,7 @@ void socket_events_handler(void) { } } -#endif // MICROPY_PY_USOCKET_EVENTS +#endif // MICROPY_PY_SOCKET_EVENTS static inline void check_for_exceptions(void) { mp_handle_pending(true); @@ -299,7 +299,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_bind_obj, socket_bind); STATIC mp_obj_t socket_listen(size_t n_args, const mp_obj_t *args) { socket_obj_t *self = MP_OBJ_TO_PTR(args[0]); - int backlog = MICROPY_PY_USOCKET_LISTEN_BACKLOG_DEFAULT; + int backlog = MICROPY_PY_SOCKET_LISTEN_BACKLOG_DEFAULT; if (n_args > 1) { backlog = mp_obj_get_int(args[1]); backlog = (backlog < 0) ? 0 : backlog; @@ -396,7 +396,7 @@ STATIC mp_obj_t socket_setsockopt(size_t n_args, const mp_obj_t *args) { break; } - #if MICROPY_PY_USOCKET_EVENTS + #if MICROPY_PY_SOCKET_EVENTS // level: SOL_SOCKET // special "register callback" option case 20: { @@ -734,7 +734,7 @@ STATIC mp_uint_t socket_stream_ioctl(mp_obj_t self_in, mp_uint_t request, uintpt return ret; } else if (request == MP_STREAM_CLOSE) { if (socket->fd >= 0) { - #if MICROPY_PY_USOCKET_EVENTS + #if MICROPY_PY_SOCKET_EVENTS if (socket->events_callback != MP_OBJ_NULL) { socket_events_remove(socket); socket->events_callback = MP_OBJ_NULL; @@ -869,7 +869,7 @@ const mp_obj_module_t mp_module_socket = { .globals = (mp_obj_dict_t *)&mp_module_socket_globals, }; -// Note: This port doesn't define MICROPY_PY_USOCKET or MICROPY_PY_LWIP so +// Note: This port doesn't define MICROPY_PY_SOCKET or MICROPY_PY_LWIP so // this will not conflict with the common implementation provided by // extmod/mod{lwip,socket}.c. MP_REGISTER_MODULE(MP_QSTR_socket, mp_module_socket); diff --git a/ports/esp32/moduos.c b/ports/esp32/moduos.c index 6a5a26c256..287f1d9900 100644 --- a/ports/esp32/moduos.c +++ b/ports/esp32/moduos.c @@ -49,7 +49,7 @@ STATIC mp_obj_t mp_os_urandom(mp_obj_t num) { } STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_os_urandom_obj, mp_os_urandom); -#if MICROPY_PY_UOS_DUPTERM_NOTIFY +#if MICROPY_PY_OS_DUPTERM_NOTIFY STATIC mp_obj_t mp_os_dupterm_notify(mp_obj_t obj_in) { (void)obj_in; for (;;) { diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h index d6aaa98787..d25a5c2734 100644 --- a/ports/esp32/mpconfigport.h +++ b/ports/esp32/mpconfigport.h @@ -62,9 +62,9 @@ #define MICROPY_PY_ALL_INPLACE_SPECIAL_METHODS (1) #define MICROPY_PY_BUILTINS_HELP_TEXT esp32_help_text #define MICROPY_PY_IO_BUFFEREDWRITER (1) -#define MICROPY_PY_UTIME_GMTIME_LOCALTIME_MKTIME (1) -#define MICROPY_PY_UTIME_TIME_TIME_NS (1) -#define MICROPY_PY_UTIME_INCLUDEFILE "ports/esp32/modutime.c" +#define MICROPY_PY_TIME_GMTIME_LOCALTIME_MKTIME (1) +#define MICROPY_PY_TIME_TIME_TIME_NS (1) +#define MICROPY_PY_TIME_INCLUDEFILE "ports/esp32/modtime.c" #define MICROPY_PY_THREAD (1) #define MICROPY_PY_THREAD_GIL (1) #define MICROPY_PY_THREAD_GIL_VM_DIVISOR (32) @@ -83,17 +83,17 @@ #define MICROPY_BLUETOOTH_NIMBLE (1) #define MICROPY_BLUETOOTH_NIMBLE_BINDINGS_ONLY (1) #endif -#define MICROPY_PY_UTIMEQ (1) -#define MICROPY_PY_UHASHLIB_SHA1 (1) -#define MICROPY_PY_UHASHLIB_SHA256 (1) -#define MICROPY_PY_UCRYPTOLIB (1) -#define MICROPY_PY_URANDOM_SEED_INIT_FUNC (esp_random()) -#define MICROPY_PY_UOS_INCLUDEFILE "ports/esp32/moduos.c" +#define MICROPY_PY_TIMEQ (1) +#define MICROPY_PY_HASHLIB_SHA1 (1) +#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_DUPTERM (1) -#define MICROPY_PY_UOS_DUPTERM_NOTIFY (1) -#define MICROPY_PY_UOS_SYNC (1) -#define MICROPY_PY_UOS_UNAME (1) -#define MICROPY_PY_UOS_URANDOM (1) +#define MICROPY_PY_OS_DUPTERM_NOTIFY (1) +#define MICROPY_PY_OS_SYNC (1) +#define MICROPY_PY_OS_UNAME (1) +#define MICROPY_PY_OS_URANDOM (1) #define MICROPY_PY_MACHINE (1) #define MICROPY_PY_MACHINE_PIN_MAKE_NEW mp_pin_make_new #define MICROPY_PY_MACHINE_BITSTREAM (1) @@ -136,14 +136,14 @@ #endif #define MICROPY_HW_SOFTSPI_MIN_DELAY (0) #define MICROPY_HW_SOFTSPI_MAX_BAUDRATE (ets_get_cpu_frequency() * 1000000 / 200) // roughly -#define MICROPY_PY_USSL (1) +#define MICROPY_PY_SSL (1) #define MICROPY_SSL_MBEDTLS (1) -#define MICROPY_PY_USSL_FINALISER (1) -#define MICROPY_PY_UWEBSOCKET (1) +#define MICROPY_PY_SSL_FINALISER (1) +#define MICROPY_PY_WEBSOCKET (1) #define MICROPY_PY_WEBREPL (1) #define MICROPY_PY_ONEWIRE (1) -#define MICROPY_PY_UPLATFORM (1) -#define MICROPY_PY_USOCKET_EVENTS (MICROPY_PY_WEBREPL) +#define MICROPY_PY_PLATFORM (1) +#define MICROPY_PY_SOCKET_EVENTS (MICROPY_PY_WEBREPL) #define MICROPY_PY_BLUETOOTH_RANDOM_ADDR (1) #define MICROPY_PY_BLUETOOTH_DEFAULT_GAP_NAME ("ESP32") @@ -169,10 +169,10 @@ void *esp_native_code_commit(void *, size_t, void *); #define MICROPY_BEGIN_ATOMIC_SECTION() portENTER_CRITICAL_NESTED() #define MICROPY_END_ATOMIC_SECTION(state) portEXIT_CRITICAL_NESTED(state) -#if MICROPY_PY_USOCKET_EVENTS -#define MICROPY_PY_USOCKET_EVENTS_HANDLER extern void socket_events_handler(void); socket_events_handler(); +#if MICROPY_PY_SOCKET_EVENTS +#define MICROPY_PY_SOCKET_EVENTS_HANDLER extern void socket_events_handler(void); socket_events_handler(); #else -#define MICROPY_PY_USOCKET_EVENTS_HANDLER +#define MICROPY_PY_SOCKET_EVENTS_HANDLER #endif #if MICROPY_PY_THREAD @@ -180,7 +180,7 @@ void *esp_native_code_commit(void *, size_t, void *); do { \ extern void mp_handle_pending(bool); \ mp_handle_pending(true); \ - MICROPY_PY_USOCKET_EVENTS_HANDLER \ + MICROPY_PY_SOCKET_EVENTS_HANDLER \ MP_THREAD_GIL_EXIT(); \ ulTaskNotifyTake(pdFALSE, 1); \ MP_THREAD_GIL_ENTER(); \ @@ -190,7 +190,7 @@ void *esp_native_code_commit(void *, size_t, void *); do { \ extern void mp_handle_pending(bool); \ mp_handle_pending(true); \ - MICROPY_PY_USOCKET_EVENTS_HANDLER \ + MICROPY_PY_SOCKET_EVENTS_HANDLER \ asm ("waiti 0"); \ } while (0); #endif diff --git a/ports/esp32/mphalport.c b/ports/esp32/mphalport.c index 61e9fd563e..4c8fa012f4 100644 --- a/ports/esp32/mphalport.c +++ b/ports/esp32/mphalport.c @@ -138,7 +138,7 @@ void mp_hal_delay_ms(uint32_t ms) { uint64_t t0 = esp_timer_get_time(); for (;;) { mp_handle_pending(true); - MICROPY_PY_USOCKET_EVENTS_HANDLER + MICROPY_PY_SOCKET_EVENTS_HANDLER MP_THREAD_GIL_EXIT(); uint64_t t1 = esp_timer_get_time(); dt = t1 - t0; diff --git a/ports/esp8266/Makefile b/ports/esp8266/Makefile index e3727dfeda..e4db811f24 100644 --- a/ports/esp8266/Makefile +++ b/ports/esp8266/Makefile @@ -27,7 +27,7 @@ QSTR_GLOBAL_DEPENDENCIES = $(BOARD_DIR)/mpconfigboard.h # MicroPython feature configurations MICROPY_ROM_TEXT_COMPRESSION ?= 1 -MICROPY_PY_USSL = 1 +MICROPY_PY_SSL = 1 MICROPY_SSL_AXTLS = 1 AXTLS_DEFS_EXTRA = -Dabort=abort_ -DRT_MAX_PLAIN_LENGTH=1024 -DRT_EXTRA=4096 BTREE_DEFS_EXTRA = -DDEFPSIZE=1024 -DMINCACHE=3 diff --git a/ports/esp8266/boards/GENERIC/mpconfigboard.h b/ports/esp8266/boards/GENERIC/mpconfigboard.h index 1d9b8e6f70..52c93f83a3 100644 --- a/ports/esp8266/boards/GENERIC/mpconfigboard.h +++ b/ports/esp8266/boards/GENERIC/mpconfigboard.h @@ -11,4 +11,4 @@ #define MICROPY_READER_VFS (MICROPY_VFS) #define MICROPY_VFS (1) -#define MICROPY_PY_UCRYPTOLIB (1) +#define MICROPY_PY_CRYPTOLIB (1) diff --git a/ports/esp8266/boards/GENERIC_1M/mpconfigboard.h b/ports/esp8266/boards/GENERIC_1M/mpconfigboard.h index cf5127686c..f811f70592 100644 --- a/ports/esp8266/boards/GENERIC_1M/mpconfigboard.h +++ b/ports/esp8266/boards/GENERIC_1M/mpconfigboard.h @@ -14,4 +14,4 @@ #define MICROPY_PY_FSTRINGS (0) #define MICROPY_PY_REVERSE_SPECIAL_METHODS (0) #define MICROPY_PY_UASYNCIO (0) -#define MICROPY_PY_UCRYPTOLIB (1) +#define MICROPY_PY_CRYPTOLIB (1) diff --git a/ports/esp8266/boards/GENERIC_512K/mpconfigboard.h b/ports/esp8266/boards/GENERIC_512K/mpconfigboard.h index b0adb7081c..fc933cd3eb 100644 --- a/ports/esp8266/boards/GENERIC_512K/mpconfigboard.h +++ b/ports/esp8266/boards/GENERIC_512K/mpconfigboard.h @@ -9,5 +9,5 @@ #define MICROPY_PY_REVERSE_SPECIAL_METHODS (0) #define MICROPY_PY_SYS_STDIO_BUFFER (0) #define MICROPY_PY_UASYNCIO (0) -#define MICROPY_PY_URE_SUB (0) +#define MICROPY_PY_RE_SUB (0) #define MICROPY_PY_FRAMEBUF (0) diff --git a/ports/esp8266/mpconfigport.h b/ports/esp8266/mpconfigport.h index 0cfb83f73e..9985d59dd3 100644 --- a/ports/esp8266/mpconfigport.h +++ b/ports/esp8266/mpconfigport.h @@ -36,8 +36,8 @@ #define MICROPY_PY_MATH_FACTORIAL (0) #define MICROPY_PY_MATH_ISCLOSE (0) #define MICROPY_PY_SYS_PS1_PS2 (0) -#define MICROPY_PY_UBINASCII_CRC32 (0) -#define MICROPY_PY_URANDOM_EXTRA_FUNCS (0) +#define MICROPY_PY_BINASCII_CRC32 (0) +#define MICROPY_PY_RANDOM_EXTRA_FUNCS (0) // Configure other options. #define MICROPY_OBJ_REPR (MICROPY_OBJ_REPR_C) @@ -54,11 +54,11 @@ #define MICROPY_REPL_EVENT_DRIVEN (0) #define MICROPY_USE_INTERNAL_ERRNO (1) #define MICROPY_PY_BUILTINS_HELP_TEXT esp_help_text -#define MICROPY_PY_UHASHLIB_SHA1 (MICROPY_PY_USSL && MICROPY_SSL_AXTLS) -#define MICROPY_PY_URANDOM_SEED_INIT_FUNC (*WDEV_HWRNG) -#define MICROPY_PY_UTIME_GMTIME_LOCALTIME_MKTIME (1) -#define MICROPY_PY_UTIME_TIME_TIME_NS (1) -#define MICROPY_PY_UTIME_INCLUDEFILE "ports/esp8266/modutime.c" +#define MICROPY_PY_HASHLIB_SHA1 (MICROPY_PY_SSL && MICROPY_SSL_AXTLS) +#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_LWIP (1) #define MICROPY_PY_LWIP_SOCK_RAW (1) #define MICROPY_PY_MACHINE (1) @@ -78,19 +78,19 @@ #endif #define MICROPY_PY_NETWORK_INCLUDEFILE "ports/esp8266/modnetwork.h" #define MICROPY_PY_NETWORK_MODULE_GLOBALS_INCLUDEFILE "ports/esp8266/modnetwork_globals.h" -#define MICROPY_PY_UWEBSOCKET (1) +#define MICROPY_PY_WEBSOCKET (1) #define MICROPY_PY_ONEWIRE (1) #define MICROPY_PY_WEBREPL (1) #define MICROPY_PY_WEBREPL_DELAY (20) #define MICROPY_PY_WEBREPL_STATIC_FILEBUF (1) -#define MICROPY_PY_UOS_INCLUDEFILE "ports/esp8266/moduos.c" +#define MICROPY_PY_OS_INCLUDEFILE "ports/esp8266/modos.c" #define MICROPY_PY_OS_DUPTERM (2) -#define MICROPY_PY_UOS_DUPTERM_NOTIFY (1) -#define MICROPY_PY_UOS_DUPTERM_STREAM_DETACHED_ATTACHED (1) -#define MICROPY_PY_UOS_SYNC (1) -#define MICROPY_PY_UOS_UNAME (1) -#define MICROPY_PY_UOS_UNAME_RELEASE_DYNAMIC (1) -#define MICROPY_PY_UOS_URANDOM (1) +#define MICROPY_PY_OS_DUPTERM_NOTIFY (1) +#define MICROPY_PY_OS_DUPTERM_STREAM_DETACHED_ATTACHED (1) +#define MICROPY_PY_OS_SYNC (1) +#define MICROPY_PY_OS_UNAME (1) +#define MICROPY_PY_OS_UNAME_RELEASE_DYNAMIC (1) +#define MICROPY_PY_OS_URANDOM (1) #define MICROPY_LONGINT_IMPL (MICROPY_LONGINT_IMPL_MPZ) #define MICROPY_FLOAT_IMPL (MICROPY_FLOAT_IMPL_FLOAT) #define MICROPY_WARNINGS (1) diff --git a/ports/mimxrt/boards/ADAFRUIT_METRO_M7/mpconfigboard.mk b/ports/mimxrt/boards/ADAFRUIT_METRO_M7/mpconfigboard.mk index 8617261d54..236db27c87 100644 --- a/ports/mimxrt/boards/ADAFRUIT_METRO_M7/mpconfigboard.mk +++ b/ports/mimxrt/boards/ADAFRUIT_METRO_M7/mpconfigboard.mk @@ -7,5 +7,5 @@ MICROPY_HW_FLASH_TYPE ?= qspi_nor_flash MICROPY_HW_FLASH_SIZE ?= 0x800000 # 8MB MICROPY_PY_NETWORK_NINAW10 ?= 1 -MICROPY_PY_USSL ?= 1 +MICROPY_PY_SSL ?= 1 MICROPY_SSL_MBEDTLS ?= 1 diff --git a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk index 85bc1f71b6..547b88d57d 100644 --- a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk +++ b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk @@ -10,7 +10,7 @@ MICROPY_HW_SDRAM_AVAIL = 1 MICROPY_HW_SDRAM_SIZE = 0x2000000 # 32MB MICROPY_PY_LWIP = 1 -MICROPY_PY_USSL = 1 +MICROPY_PY_SSL = 1 MICROPY_SSL_MBEDTLS = 1 FROZEN_MANIFEST ?= $(BOARD_DIR)/manifest.py diff --git a/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.mk index 8e4213569a..0cf2a34804 100644 --- a/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.mk +++ b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.mk @@ -10,7 +10,7 @@ MICROPY_HW_SDRAM_AVAIL = 1 MICROPY_HW_SDRAM_SIZE = 0x2000000 # 32MB MICROPY_PY_LWIP = 1 -MICROPY_PY_USSL = 1 +MICROPY_PY_SSL = 1 MICROPY_SSL_MBEDTLS = 1 FROZEN_MANIFEST ?= $(BOARD_DIR)/manifest.py diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk index 22cd5356d9..c2556a2724 100644 --- a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk +++ b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk @@ -10,7 +10,7 @@ MICROPY_HW_SDRAM_AVAIL = 1 MICROPY_HW_SDRAM_SIZE = 0x2000000 # 32MB MICROPY_PY_LWIP = 1 -MICROPY_PY_USSL = 1 +MICROPY_PY_SSL = 1 MICROPY_SSL_MBEDTLS = 1 FROZEN_MANIFEST ?= $(BOARD_DIR)/manifest.py diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.mk index b0bd7ec6ac..d3ba752419 100644 --- a/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.mk +++ b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.mk @@ -10,7 +10,7 @@ MICROPY_HW_SDRAM_AVAIL = 1 MICROPY_HW_SDRAM_SIZE = 0x2000000 # 32MB MICROPY_PY_LWIP = 1 -MICROPY_PY_USSL = 1 +MICROPY_PY_SSL = 1 MICROPY_SSL_MBEDTLS = 1 FROZEN_MANIFEST ?= $(BOARD_DIR)/manifest.py diff --git a/ports/mimxrt/boards/MIMXRT1170_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1170_EVK/mpconfigboard.mk index dc44b93bd0..25747a52c6 100644 --- a/ports/mimxrt/boards/MIMXRT1170_EVK/mpconfigboard.mk +++ b/ports/mimxrt/boards/MIMXRT1170_EVK/mpconfigboard.mk @@ -12,7 +12,7 @@ MICROPY_HW_SDRAM_AVAIL = 1 MICROPY_HW_SDRAM_SIZE = 0x4000000 # 64MB MICROPY_PY_LWIP = 1 -MICROPY_PY_USSL = 1 +MICROPY_PY_SSL = 1 MICROPY_SSL_MBEDTLS = 1 FROZEN_MANIFEST ?= $(BOARD_DIR)/manifest.py diff --git a/ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.h b/ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.h index d63c0dc403..3d080ff25f 100644 --- a/ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.h +++ b/ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.h @@ -3,7 +3,7 @@ #define MICROPY_HW_USB_MANUFACTURER_STRING "Olimex Ltd." #define MICROPY_HW_USB_VID 0x15ba #define MICROPY_HW_USB_PID 0x0046 -#define MICROPY_PY_UOS_DUPTERM_BUILTIN_STREAM (0) +#define MICROPY_PY_OS_DUPTERM_BUILTIN_STREAM (0) // Olimex RT1010-Py has 1 board LED #define MICROPY_HW_LED1_PIN (pin_GPIO_11) diff --git a/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.mk b/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.mk index 8e530ac558..ca27dff55f 100644 --- a/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.mk +++ b/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.mk @@ -10,7 +10,7 @@ MICROPY_HW_SDRAM_AVAIL = 1 MICROPY_HW_SDRAM_SIZE = 0x2000000 # 32MB MICROPY_PY_LWIP = 1 -MICROPY_PY_USSL = 1 +MICROPY_PY_SSL = 1 MICROPY_SSL_MBEDTLS = 1 FROZEN_MANIFEST ?= $(BOARD_DIR)/manifest.py diff --git a/ports/mimxrt/boards/TEENSY41/mpconfigboard.mk b/ports/mimxrt/boards/TEENSY41/mpconfigboard.mk index ca7e10b5e4..cf07144668 100755 --- a/ports/mimxrt/boards/TEENSY41/mpconfigboard.mk +++ b/ports/mimxrt/boards/TEENSY41/mpconfigboard.mk @@ -8,7 +8,7 @@ MICROPY_HW_FLASH_SIZE = 0x800000 # 8MB MICROPY_HW_FLASH_RESERVED ?= 0x1000 # 4KB MICROPY_PY_LWIP = 1 -MICROPY_PY_USSL = 1 +MICROPY_PY_SSL = 1 MICROPY_SSL_MBEDTLS = 1 FROZEN_MANIFEST ?= $(BOARD_DIR)/manifest.py diff --git a/ports/mimxrt/moduos.c b/ports/mimxrt/moduos.c index 8ae8019aae..ecfc3712d7 100644 --- a/ports/mimxrt/moduos.c +++ b/ports/mimxrt/moduos.c @@ -95,7 +95,7 @@ uint32_t trng_random_u32(void) { return rngval; } -#if MICROPY_PY_UOS_URANDOM +#if MICROPY_PY_OS_URANDOM STATIC mp_obj_t mp_os_urandom(mp_obj_t num) { mp_int_t n = mp_obj_get_int(num); vstr_t vstr; @@ -109,7 +109,7 @@ STATIC mp_obj_t mp_os_urandom(mp_obj_t num) { STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_os_urandom_obj, mp_os_urandom); #endif -#if MICROPY_PY_UOS_DUPTERM_NOTIFY +#if MICROPY_PY_OS_DUPTERM_NOTIFY STATIC mp_obj_t mp_os_dupterm_notify(mp_obj_t obj_in) { (void)obj_in; for (;;) { diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h index 52301cf94b..be086cb552 100644 --- a/ports/mimxrt/mpconfigport.h +++ b/ports/mimxrt/mpconfigport.h @@ -69,17 +69,17 @@ uint32_t trng_random_u32(void); // Extended modules #define MICROPY_EPOCH_IS_1970 (1) -#define MICROPY_PY_USSL_FINALISER (MICROPY_PY_USSL) -#define MICROPY_PY_UTIME_GMTIME_LOCALTIME_MKTIME (1) -#define MICROPY_PY_UTIME_TIME_TIME_NS (1) -#define MICROPY_PY_UTIME_INCLUDEFILE "ports/mimxrt/modutime.c" -#define MICROPY_PY_UOS_INCLUDEFILE "ports/mimxrt/moduos.c" +#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_OS_DUPTERM (3) -#define MICROPY_PY_UOS_DUPTERM_NOTIFY (1) -#define MICROPY_PY_UOS_SYNC (1) -#define MICROPY_PY_UOS_UNAME (1) -#define MICROPY_PY_UOS_URANDOM (1) -#define MICROPY_PY_URANDOM_SEED_INIT_FUNC (trng_random_u32()) +#define MICROPY_PY_OS_DUPTERM_NOTIFY (1) +#define MICROPY_PY_OS_SYNC (1) +#define MICROPY_PY_OS_UNAME (1) +#define MICROPY_PY_OS_URANDOM (1) +#define MICROPY_PY_RANDOM_SEED_INIT_FUNC (trng_random_u32()) #define MICROPY_PY_MACHINE (1) #define MICROPY_PY_MACHINE_PIN_MAKE_NEW mp_pin_make_new #define MICROPY_PY_MACHINE_BITSTREAM (1) @@ -96,7 +96,7 @@ uint32_t trng_random_u32(void); #define MICROPY_PY_MACHINE_TIMER (1) #define MICROPY_SOFT_TIMER_TICKS_MS systick_ms #define MICROPY_PY_ONEWIRE (1) -#define MICROPY_PY_UPLATFORM (1) +#define MICROPY_PY_PLATFORM (1) // fatfs configuration used in ffconf.h #define MICROPY_FATFS_ENABLE_LFN (1) @@ -107,16 +107,16 @@ uint32_t trng_random_u32(void); #ifndef MICROPY_PY_NETWORK #define MICROPY_PY_NETWORK (1) #endif -#ifndef MICROPY_PY_USOCKET -#define MICROPY_PY_USOCKET (1) +#ifndef MICROPY_PY_SOCKET +#define MICROPY_PY_SOCKET (1) #endif -#define MICROPY_PY_UWEBSOCKET (MICROPY_PY_LWIP) +#define MICROPY_PY_WEBSOCKET (MICROPY_PY_LWIP) #define MICROPY_PY_WEBREPL (MICROPY_PY_LWIP) #define MICROPY_PY_LWIP_SOCK_RAW (MICROPY_PY_LWIP) -#define MICROPY_PY_USSL_FINALISER (MICROPY_PY_USSL) -// #define MICROPY_PY_UHASHLIB_MD5 (MICROPY_PY_USSL) -#define MICROPY_PY_UHASHLIB_SHA1 (MICROPY_PY_USSL) -// #define MICROPY_PY_UCRYPTOLIB (MICROPY_PY_USSL) +#define MICROPY_PY_SSL_FINALISER (MICROPY_PY_SSL) +// #define MICROPY_PY_HASHLIB_MD5 (MICROPY_PY_SSL) +#define MICROPY_PY_HASHLIB_SHA1 (MICROPY_PY_SSL) +// #define MICROPY_PY_CRYPTOLIB (MICROPY_PY_SSL) // Prevent the "LWIP task" from running. #define MICROPY_PY_LWIP_ENTER MICROPY_PY_PENDSV_ENTER diff --git a/ports/nrf/boards/evk_nina_b3/mpconfigboard.h b/ports/nrf/boards/evk_nina_b3/mpconfigboard.h index eab232848b..d4ce93a0ac 100644 --- a/ports/nrf/boards/evk_nina_b3/mpconfigboard.h +++ b/ports/nrf/boards/evk_nina_b3/mpconfigboard.h @@ -41,8 +41,8 @@ #define MICROPY_EMIT_INLINE_THUMB (1) // Enable optional modules -#define MICROPY_PY_UERRNO (1) -#define MICROPY_PY_UHASHLIB (1) +#define MICROPY_PY_ERRNO (1) +#define MICROPY_PY_HASHLIB (1) // Peripherals Config #define MICROPY_PY_MACHINE_UART (1) diff --git a/ports/nrf/mpconfigport.h b/ports/nrf/mpconfigport.h index 0799000b90..3a311fe5d9 100644 --- a/ports/nrf/mpconfigport.h +++ b/ports/nrf/mpconfigport.h @@ -80,8 +80,8 @@ #define MICROPY_PY_SYS_STDFILES (CORE_FEAT) #endif -#ifndef MICROPY_PY_UBINASCII -#define MICROPY_PY_UBINASCII (CORE_FEAT) +#ifndef MICROPY_PY_BINASCII +#define MICROPY_PY_BINASCII (CORE_FEAT) #endif #ifndef MICROPY_PY_NRF @@ -134,7 +134,7 @@ #endif // Use port specific os module rather than extmod variant. -#define MICROPY_PY_UOS (0) +#define MICROPY_PY_OS (0) #define MICROPY_STREAMS_NON_BLOCK (1) #define MICROPY_CAN_OVERRIDE_BUILTINS (1) @@ -155,9 +155,9 @@ #define MICROPY_MODULE_BUILTIN_INIT (1) #define MICROPY_PY_MICROPYTHON_MEM_INFO (1) #define MICROPY_PY_SYS_MAXSIZE (1) -#define MICROPY_PY_URANDOM (1) -#define MICROPY_PY_URANDOM_EXTRA_FUNCS (1) -#define MICROPY_PY_UTIME (1) +#define MICROPY_PY_RANDOM (1) +#define MICROPY_PY_RANDOM_EXTRA_FUNCS (1) +#define MICROPY_PY_TIME (1) #define MICROPY_PY_MACHINE (1) #define MICROPY_PY_MACHINE_PULSE (0) #define MICROPY_PY_MACHINE_SOFTI2C (MICROPY_PY_MACHINE_I2C) @@ -286,7 +286,7 @@ typedef unsigned int mp_uint_t; // must be pointer size typedef long mp_off_t; #if MICROPY_HW_ENABLE_RNG -#define MICROPY_PY_URANDOM_SEED_INIT_FUNC (rng_generate_random_word()) +#define MICROPY_PY_RANDOM_SEED_INIT_FUNC (rng_generate_random_word()) long unsigned int rng_generate_random_word(void); #endif diff --git a/ports/qemu-arm/mpconfigport.h b/ports/qemu-arm/mpconfigport.h index 972dce61b4..0eada5a529 100644 --- a/ports/qemu-arm/mpconfigport.h +++ b/ports/qemu-arm/mpconfigport.h @@ -36,16 +36,16 @@ #define MICROPY_PY_SYS_EXIT (1) #define MICROPY_PY_SYS_MAXSIZE (1) #define MICROPY_PY_SYS_PLATFORM "qemu-arm" -#define MICROPY_PY_UERRNO (1) -#define MICROPY_PY_UBINASCII (1) -#define MICROPY_PY_URANDOM (1) +#define MICROPY_PY_ERRNO (1) +#define MICROPY_PY_BINASCII (1) +#define MICROPY_PY_RANDOM (1) #define MICROPY_PY_UCTYPES (1) -#define MICROPY_PY_UZLIB (1) -#define MICROPY_PY_UJSON (1) -#define MICROPY_PY_UOS (1) -#define MICROPY_PY_URE (1) -#define MICROPY_PY_UHEAPQ (1) -#define MICROPY_PY_UHASHLIB (1) +#define MICROPY_PY_ZLIB (1) +#define MICROPY_PY_JSON (1) +#define MICROPY_PY_OS (1) +#define MICROPY_PY_RE (1) +#define MICROPY_PY_HEAPQ (1) +#define MICROPY_PY_HASHLIB (1) #define MICROPY_PY_MACHINE (1) #define MICROPY_PY_MICROPYTHON_MEM_INFO (1) #define MICROPY_USE_INTERNAL_PRINTF (1) diff --git a/ports/renesas-ra/boards/EK_RA4M1/mpconfigboard.h b/ports/renesas-ra/boards/EK_RA4M1/mpconfigboard.h index cd699e51bd..4845c0c09e 100644 --- a/ports/renesas-ra/boards/EK_RA4M1/mpconfigboard.h +++ b/ports/renesas-ra/boards/EK_RA4M1/mpconfigboard.h @@ -10,8 +10,8 @@ #define MICROPY_PY_BUILTINS_COMPLEX (0) #define MICROPY_PY_GENERATOR_PEND_THROW (0) #define MICROPY_PY_MATH (0) -#define MICROPY_PY_UHEAPQ (0) -#define MICROPY_PY_UTIMEQ (0) +#define MICROPY_PY_HEAPQ (0) +#define MICROPY_PY_TIMEQ (0) #define MICROPY_PY_THREAD (0) // peripheral config diff --git a/ports/renesas-ra/boards/EK_RA4W1/mpconfigboard.h b/ports/renesas-ra/boards/EK_RA4W1/mpconfigboard.h index 5fd2d1c6a3..d8d22ad72f 100644 --- a/ports/renesas-ra/boards/EK_RA4W1/mpconfigboard.h +++ b/ports/renesas-ra/boards/EK_RA4W1/mpconfigboard.h @@ -10,8 +10,8 @@ #define MICROPY_PY_BUILTINS_COMPLEX (1) #define MICROPY_PY_GENERATOR_PEND_THROW (1) #define MICROPY_PY_MATH (1) -#define MICROPY_PY_UHEAPQ (1) -#define MICROPY_PY_UTIMEQ (1) +#define MICROPY_PY_HEAPQ (1) +#define MICROPY_PY_TIMEQ (1) #define MICROPY_PY_THREAD (0) // disable ARM_THUMB_FP using vldr due to RA has single float only // peripheral config diff --git a/ports/renesas-ra/boards/EK_RA6M1/mpconfigboard.h b/ports/renesas-ra/boards/EK_RA6M1/mpconfigboard.h index b6f76a062e..d746dbdfc2 100644 --- a/ports/renesas-ra/boards/EK_RA6M1/mpconfigboard.h +++ b/ports/renesas-ra/boards/EK_RA6M1/mpconfigboard.h @@ -10,8 +10,8 @@ #define MICROPY_PY_BUILTINS_COMPLEX (1) #define MICROPY_PY_GENERATOR_PEND_THROW (1) #define MICROPY_PY_MATH (1) -#define MICROPY_PY_UHEAPQ (1) -#define MICROPY_PY_UTIMEQ (1) +#define MICROPY_PY_HEAPQ (1) +#define MICROPY_PY_TIMEQ (1) #define MICROPY_PY_THREAD (0) // disable ARM_THUMB_FP using vldr due to RA has single float only // peripheral config diff --git a/ports/renesas-ra/boards/EK_RA6M2/mpconfigboard.h b/ports/renesas-ra/boards/EK_RA6M2/mpconfigboard.h index 9e3c462eec..b6ecfe6d49 100644 --- a/ports/renesas-ra/boards/EK_RA6M2/mpconfigboard.h +++ b/ports/renesas-ra/boards/EK_RA6M2/mpconfigboard.h @@ -10,8 +10,8 @@ #define MICROPY_PY_BUILTINS_COMPLEX (1) #define MICROPY_PY_GENERATOR_PEND_THROW (1) #define MICROPY_PY_MATH (1) -#define MICROPY_PY_UHEAPQ (1) -#define MICROPY_PY_UTIMEQ (1) +#define MICROPY_PY_HEAPQ (1) +#define MICROPY_PY_TIMEQ (1) #define MICROPY_PY_THREAD (0) // disable ARM_THUMB_FP using vldr due to RA has single float only // peripheral config diff --git a/ports/renesas-ra/boards/RA4M1_CLICKER/mpconfigboard.h b/ports/renesas-ra/boards/RA4M1_CLICKER/mpconfigboard.h index 7b8ccb1445..3934dd264b 100644 --- a/ports/renesas-ra/boards/RA4M1_CLICKER/mpconfigboard.h +++ b/ports/renesas-ra/boards/RA4M1_CLICKER/mpconfigboard.h @@ -10,8 +10,8 @@ #define MICROPY_PY_BUILTINS_COMPLEX (0) #define MICROPY_PY_GENERATOR_PEND_THROW (0) #define MICROPY_PY_MATH (0) -#define MICROPY_PY_UHEAPQ (0) -#define MICROPY_PY_UTIMEQ (0) +#define MICROPY_PY_HEAPQ (0) +#define MICROPY_PY_TIMEQ (0) #define MICROPY_PY_THREAD (0) // peripheral config diff --git a/ports/renesas-ra/mpconfigport.h b/ports/renesas-ra/mpconfigport.h index 42834c1fbc..1886d31541 100644 --- a/ports/renesas-ra/mpconfigport.h +++ b/ports/renesas-ra/mpconfigport.h @@ -91,19 +91,19 @@ #endif // extended modules -#define MICROPY_PY_UOS_INCLUDEFILE "ports/renesas-ra/moduos.c" +#define MICROPY_PY_OS_INCLUDEFILE "ports/renesas-ra/moduos.c" #define MICROPY_PY_OS_DUPTERM (3) -#define MICROPY_PY_UOS_DUPTERM_BUILTIN_STREAM (1) -#define MICROPY_PY_UOS_DUPTERM_STREAM_DETACHED_ATTACHED (1) -#define MICROPY_PY_UOS_SEP (1) -#define MICROPY_PY_UOS_SYNC (1) -#define MICROPY_PY_UOS_UNAME (1) -#define MICROPY_PY_UOS_URANDOM (MICROPY_HW_ENABLE_RNG) -#define MICROPY_PY_UTIME_GMTIME_LOCALTIME_MKTIME (1) -#define MICROPY_PY_UTIME_TIME_TIME_NS (1) -#define MICROPY_PY_UTIME_INCLUDEFILE "ports/renesas-ra/modutime.c" -#ifndef MICROPY_PY_UTIMEQ -#define MICROPY_PY_UTIMEQ (1) +#define MICROPY_PY_OS_DUPTERM_BUILTIN_STREAM (1) +#define MICROPY_PY_OS_DUPTERM_STREAM_DETACHED_ATTACHED (1) +#define MICROPY_PY_OS_SEP (1) +#define MICROPY_PY_OS_SYNC (1) +#define MICROPY_PY_OS_UNAME (1) +#define MICROPY_PY_OS_URANDOM (MICROPY_HW_ENABLE_RNG) +#define MICROPY_PY_TIME_GMTIME_LOCALTIME_MKTIME (1) +#define MICROPY_PY_TIME_TIME_TIME_NS (1) +#define MICROPY_PY_TIME_INCLUDEFILE "ports/renesas-ra/modtime.c" +#ifndef MICROPY_PY_TIMEQ +#define MICROPY_PY_TIMEQ (1) #endif #ifndef MICROPY_PY_MACHINE #define MICROPY_PY_MACHINE (1) @@ -126,8 +126,8 @@ #ifndef MICROPY_PY_ONEWIRE #define MICROPY_PY_ONEWIRE (1) #endif -#ifndef MICROPY_PY_UPLATFORM -#define MICROPY_PY_UPLATFORM (1) +#ifndef MICROPY_PY_PLATFORM +#define MICROPY_PY_PLATFORM (1) #endif // fatfs configuration used in ffconf.h diff --git a/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h b/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h index a4fb8b7c8c..98b9c0f6fa 100644 --- a/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h +++ b/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h @@ -8,7 +8,7 @@ #define MICROPY_PY_NETWORK (1) // Enable MD5 hash. -#define MICROPY_PY_UHASHLIB_MD5 (1) +#define MICROPY_PY_HASHLIB_MD5 (1) // Disable internal error numbers. #define MICROPY_USE_INTERNAL_ERRNO (0) diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h index 720e858f19..de05a281bd 100644 --- a/ports/rp2/mpconfigport.h +++ b/ports/rp2/mpconfigport.h @@ -95,21 +95,21 @@ // Extended modules #define MICROPY_EPOCH_IS_1970 (1) -#define MICROPY_PY_UOS_INCLUDEFILE "ports/rp2/moduos.c" +#define MICROPY_PY_OS_INCLUDEFILE "ports/rp2/moduos.c" #ifndef MICROPY_PY_OS_DUPTERM #define MICROPY_PY_OS_DUPTERM (1) #endif -#define MICROPY_PY_UOS_SYNC (1) -#define MICROPY_PY_UOS_UNAME (1) -#define MICROPY_PY_UOS_URANDOM (1) -#define MICROPY_PY_URE_MATCH_GROUPS (1) -#define MICROPY_PY_URE_MATCH_SPAN_START_END (1) -#define MICROPY_PY_UHASHLIB_SHA1 (1) -#define MICROPY_PY_UCRYPTOLIB (1) -#define MICROPY_PY_UTIME_GMTIME_LOCALTIME_MKTIME (1) -#define MICROPY_PY_UTIME_TIME_TIME_NS (1) -#define MICROPY_PY_UTIME_INCLUDEFILE "ports/rp2/modutime.c" -#define MICROPY_PY_URANDOM_SEED_INIT_FUNC (rosc_random_u32()) +#define MICROPY_PY_OS_SYNC (1) +#define MICROPY_PY_OS_UNAME (1) +#define MICROPY_PY_OS_URANDOM (1) +#define MICROPY_PY_RE_MATCH_GROUPS (1) +#define MICROPY_PY_RE_MATCH_SPAN_START_END (1) +#define MICROPY_PY_HASHLIB_SHA1 (1) +#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_RANDOM_SEED_INIT_FUNC (rosc_random_u32()) #define MICROPY_PY_MACHINE (1) #define MICROPY_PY_MACHINE_PIN_MAKE_NEW mp_pin_make_new #define MICROPY_PY_MACHINE_BITSTREAM (1) @@ -151,14 +151,14 @@ #define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT "mpy-rp2" #endif -#ifndef MICROPY_PY_USOCKET -#define MICROPY_PY_USOCKET (1) +#ifndef MICROPY_PY_SOCKET +#define MICROPY_PY_SOCKET (1) #endif -#ifndef MICROPY_PY_USSL -#define MICROPY_PY_USSL (1) +#ifndef MICROPY_PY_SSL +#define MICROPY_PY_SSL (1) #endif -#ifndef MICROPY_PY_UWEBSOCKET -#define MICROPY_PY_UWEBSOCKET (1) +#ifndef MICROPY_PY_WEBSOCKET +#define MICROPY_PY_WEBSOCKET (1) #endif #ifndef MICROPY_PY_WEBREPL #define MICROPY_PY_WEBREPL (1) @@ -181,8 +181,8 @@ extern const struct _mp_obj_type_t mp_network_cyw43_type; #if MICROPY_PY_NETWORK_NINAW10 // This Network interface requires the extended socket state. -#ifndef MICROPY_PY_USOCKET_EXTENDED_STATE -#define MICROPY_PY_USOCKET_EXTENDED_STATE (1) +#ifndef MICROPY_PY_SOCKET_EXTENDED_STATE +#define MICROPY_PY_SOCKET_EXTENDED_STATE (1) #endif extern const struct _mp_obj_type_t mod_network_nic_type_nina; #define MICROPY_HW_NIC_NINAW10 { MP_ROM_QSTR(MP_QSTR_WLAN), MP_ROM_PTR(&mod_network_nic_type_nina) }, diff --git a/ports/samd/mcu/samd21/mpconfigmcu.h b/ports/samd/mcu/samd21/mpconfigmcu.h index df94b9682d..f70981acd5 100644 --- a/ports/samd/mcu/samd21/mpconfigmcu.h +++ b/ports/samd/mcu/samd21/mpconfigmcu.h @@ -14,8 +14,8 @@ #define MICROPY_PY_BUILTINS_COMPLEX (0) #endif -#ifndef MICROPY_PY_UTIME -#define MICROPY_PY_UTIME (1) +#ifndef MICROPY_PY_TIME +#define MICROPY_PY_TIME (1) #endif #ifndef MICROPY_PY_MATH @@ -26,7 +26,7 @@ #define MICROPY_PY_CMATH (0) #endif -#define MICROPY_PY_URANDOM_SEED_INIT_FUNC (trng_random_u32(300)) +#define MICROPY_PY_RANDOM_SEED_INIT_FUNC (trng_random_u32(300)) unsigned long trng_random_u32(int delay); #define VFS_BLOCK_SIZE_BYTES (1536) // 24x 64B flash pages; @@ -35,7 +35,7 @@ unsigned long trng_random_u32(int delay); #define MICROPY_HW_UART_TXBUF (1) #endif -#define MICROPY_PY_UOS_URANDOM (1) +#define MICROPY_PY_OS_URANDOM (1) #ifndef MICROPY_PY_MACHINE_PIN_BOARD_CPU #define MICROPY_PY_MACHINE_PIN_BOARD_CPU (1) diff --git a/ports/samd/mcu/samd51/mpconfigmcu.h b/ports/samd/mcu/samd51/mpconfigmcu.h index 0c2d2370ff..1569e5624d 100644 --- a/ports/samd/mcu/samd51/mpconfigmcu.h +++ b/ports/samd/mcu/samd51/mpconfigmcu.h @@ -27,9 +27,9 @@ #define MICROPY_PY_MACHINE_DHT_READINTO (1) #define MICROPY_PY_ONEWIRE (1) -#define MICROPY_PY_UOS_SYNC (1) -#define MICROPY_PY_UOS_URANDOM (1) -#define MICROPY_PY_URANDOM_SEED_INIT_FUNC (trng_random_u32()) +#define MICROPY_PY_OS_SYNC (1) +#define MICROPY_PY_OS_URANDOM (1) +#define MICROPY_PY_RANDOM_SEED_INIT_FUNC (trng_random_u32()) unsigned long trng_random_u32(void); #ifndef MICROPY_PY_MACHINE_PIN_BOARD_CPU diff --git a/ports/samd/moduos.c b/ports/samd/moduos.c index 4438bf3c7b..f9df0cd996 100644 --- a/ports/samd/moduos.c +++ b/ports/samd/moduos.c @@ -69,7 +69,7 @@ uint32_t trng_random_u32(int delay) { #define TRNG_RANDOM_U32 trng_random_u32(10) #endif -#if MICROPY_PY_UOS_URANDOM +#if MICROPY_PY_OS_URANDOM STATIC mp_obj_t mp_os_urandom(mp_obj_t num) { mp_int_t n = mp_obj_get_int(num); vstr_t vstr; @@ -88,16 +88,16 @@ STATIC mp_obj_t mp_os_urandom(mp_obj_t num) { } STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_os_urandom_obj, mp_os_urandom); -#endif // MICROPY_PY_UOS_URANDOM +#endif // MICROPY_PY_OS_URANDOM -#if MICROPY_PY_UOS_DUPTERM_BUILTIN_STREAM +#if MICROPY_PY_OS_DUPTERM_BUILTIN_STREAM bool mp_os_dupterm_is_builtin_stream(mp_const_obj_t stream) { const mp_obj_type_t *type = mp_obj_get_type(stream); return type == &machine_uart_type; } #endif -#if MICROPY_PY_UOS_DUPTERM_NOTIFY +#if MICROPY_PY_OS_DUPTERM_NOTIFY STATIC mp_obj_t mp_os_dupterm_notify(mp_obj_t obj_in) { (void)obj_in; for (;;) { diff --git a/ports/samd/mpconfigport.h b/ports/samd/mpconfigport.h index a0a58a2fd7..8a9947468e 100644 --- a/ports/samd/mpconfigport.h +++ b/ports/samd/mpconfigport.h @@ -77,21 +77,21 @@ #define MICROPY_PY_IO_IOBASE (1) // Extended modules -#define MICROPY_PY_UTIME_GMTIME_LOCALTIME_MKTIME (1) -#define MICROPY_PY_UTIME_TIME_TIME_NS (1) -#define MICROPY_PY_UTIME_INCLUDEFILE "ports/samd/modutime.c" +#define MICROPY_PY_TIME_GMTIME_LOCALTIME_MKTIME (1) +#define MICROPY_PY_TIME_TIME_TIME_NS (1) +#define MICROPY_PY_TIME_INCLUDEFILE "ports/samd/modtime.c" #define MICROPY_PY_MACHINE (1) -#define MICROPY_PY_UOS (1) -#define MICROPY_PY_UOS_INCLUDEFILE "ports/samd/moduos.c" +#define MICROPY_PY_OS (1) +#define MICROPY_PY_OS_INCLUDEFILE "ports/samd/modos.c" #define MICROPY_READER_VFS (1) #define MICROPY_VFS (1) -#define MICROPY_PY_UJSON (1) -#define MICROPY_PY_URE (1) -#define MICROPY_PY_UBINASCII (1) +#define MICROPY_PY_JSON (1) +#define MICROPY_PY_RE (1) +#define MICROPY_PY_BINASCII (1) #define MICROPY_PY_UCTYPES (1) -#define MICROPY_PY_UHEAPQ (1) -#define MICROPY_PY_URANDOM (1) -#define MICROPY_PY_UZLIB (1) +#define MICROPY_PY_HEAPQ (1) +#define MICROPY_PY_RANDOM (1) +#define MICROPY_PY_ZLIB (1) #define MICROPY_PY_UASYNCIO (1) #define MICROPY_PY_MACHINE_RTC (1) #ifndef MICROPY_PY_MACHINE_ADC diff --git a/ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.mk b/ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.mk index 135b12b8c8..b927388c55 100644 --- a/ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.mk +++ b/ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.mk @@ -21,7 +21,7 @@ MICROPY_BLUETOOTH_NIMBLE = 1 MICROPY_BLUETOOTH_BTSTACK = 0 MICROPY_PY_LWIP = 1 MICROPY_PY_NETWORK_CYW43 = 1 -MICROPY_PY_USSL = 1 +MICROPY_PY_SSL = 1 MICROPY_SSL_MBEDTLS = 1 FROZEN_MANIFEST = $(BOARD_DIR)/manifest.py diff --git a/ports/stm32/boards/ARDUINO_NICLA_VISION/mpconfigboard.mk b/ports/stm32/boards/ARDUINO_NICLA_VISION/mpconfigboard.mk index ebe9775e80..2c48c17f38 100644 --- a/ports/stm32/boards/ARDUINO_NICLA_VISION/mpconfigboard.mk +++ b/ports/stm32/boards/ARDUINO_NICLA_VISION/mpconfigboard.mk @@ -21,7 +21,7 @@ MICROPY_BLUETOOTH_NIMBLE = 1 MICROPY_BLUETOOTH_BTSTACK = 0 MICROPY_PY_LWIP = 1 MICROPY_PY_NETWORK_CYW43 = 1 -MICROPY_PY_USSL = 1 +MICROPY_PY_SSL = 1 MICROPY_SSL_MBEDTLS = 1 FROZEN_MANIFEST = $(BOARD_DIR)/manifest.py diff --git a/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.mk b/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.mk index 3bfd40dc92..cf4d40e5fe 100644 --- a/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.mk +++ b/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.mk @@ -21,7 +21,7 @@ MICROPY_BLUETOOTH_NIMBLE = 1 MICROPY_BLUETOOTH_BTSTACK = 0 MICROPY_PY_LWIP = 1 MICROPY_PY_NETWORK_CYW43 = 1 -MICROPY_PY_USSL = 1 +MICROPY_PY_SSL = 1 MICROPY_SSL_MBEDTLS = 1 FROZEN_MANIFEST = $(BOARD_DIR)/manifest.py diff --git a/ports/stm32/boards/B_L072Z_LRWAN1/mpconfigboard.h b/ports/stm32/boards/B_L072Z_LRWAN1/mpconfigboard.h index dfcca72afb..165284f31a 100644 --- a/ports/stm32/boards/B_L072Z_LRWAN1/mpconfigboard.h +++ b/ports/stm32/boards/B_L072Z_LRWAN1/mpconfigboard.h @@ -12,13 +12,13 @@ #define MICROPY_PY_GENERATOR_PEND_THROW (0) #define MICROPY_PY_MATH (0) #define MICROPY_PY_FRAMEBUF (0) -#define MICROPY_PY_USOCKET (0) +#define MICROPY_PY_SOCKET (0) #define MICROPY_PY_NETWORK (0) #define MICROPY_PY_ONEWIRE (0) #define MICROPY_PY_STM (0) #define MICROPY_PY_PYB_LEGACY (0) -#define MICROPY_PY_UHEAPQ (0) -#define MICROPY_PY_UTIMEQ (0) +#define MICROPY_PY_HEAPQ (0) +#define MICROPY_PY_TIMEQ (0) #define MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE (0) #define MICROPY_HW_ENABLE_RTC (1) diff --git a/ports/stm32/boards/ESPRUINO_PICO/mpconfigboard.h b/ports/stm32/boards/ESPRUINO_PICO/mpconfigboard.h index ed8178d7d4..cfc46491e0 100644 --- a/ports/stm32/boards/ESPRUINO_PICO/mpconfigboard.h +++ b/ports/stm32/boards/ESPRUINO_PICO/mpconfigboard.h @@ -4,7 +4,7 @@ #define MICROPY_EMIT_THUMB (0) #define MICROPY_EMIT_INLINE_THUMB (0) #define MICROPY_PY_BUILTINS_COMPLEX (0) -#define MICROPY_PY_USOCKET (0) +#define MICROPY_PY_SOCKET (0) #define MICROPY_PY_NETWORK (0) #define MICROPY_HW_HAS_SWITCH (1) diff --git a/ports/stm32/boards/NUCLEO_F091RC/mpconfigboard.h b/ports/stm32/boards/NUCLEO_F091RC/mpconfigboard.h index d44bfb0bb6..39d0082d7b 100644 --- a/ports/stm32/boards/NUCLEO_F091RC/mpconfigboard.h +++ b/ports/stm32/boards/NUCLEO_F091RC/mpconfigboard.h @@ -5,12 +5,12 @@ #define MICROPY_EMIT_INLINE_THUMB (0) #define MICROPY_OPT_COMPUTED_GOTO (0) #define MICROPY_PY_BUILTINS_COMPLEX (0) -#define MICROPY_PY_USOCKET (0) +#define MICROPY_PY_SOCKET (0) #define MICROPY_PY_NETWORK (0) #define MICROPY_PY_STM (0) #define MICROPY_PY_PYB_LEGACY (0) -#define MICROPY_PY_UHEAPQ (0) -#define MICROPY_PY_UTIMEQ (0) +#define MICROPY_PY_HEAPQ (0) +#define MICROPY_PY_TIMEQ (0) #define MICROPY_PY_FRAMEBUF (0) #define MICROPY_HW_ENABLE_RTC (1) diff --git a/ports/stm32/boards/NUCLEO_F429ZI/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_F429ZI/mpconfigboard.mk index 9e82be1dc7..e5fc89ab47 100644 --- a/ports/stm32/boards/NUCLEO_F429ZI/mpconfigboard.mk +++ b/ports/stm32/boards/NUCLEO_F429ZI/mpconfigboard.mk @@ -7,7 +7,7 @@ TEXT1_ADDR = 0x08020000 # MicroPython settings MICROPY_PY_LWIP = 1 -MICROPY_PY_USSL = 1 +MICROPY_PY_SSL = 1 MICROPY_SSL_MBEDTLS = 1 FROZEN_MANIFEST = $(BOARD_DIR)/manifest.py diff --git a/ports/stm32/boards/NUCLEO_F439ZI/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_F439ZI/mpconfigboard.mk index 69b0f80a2d..b8666755b0 100644 --- a/ports/stm32/boards/NUCLEO_F439ZI/mpconfigboard.mk +++ b/ports/stm32/boards/NUCLEO_F439ZI/mpconfigboard.mk @@ -7,7 +7,7 @@ TEXT1_ADDR = 0x08020000 # MicroPython settings MICROPY_PY_LWIP = 1 -MICROPY_PY_USSL = 1 +MICROPY_PY_SSL = 1 MICROPY_SSL_MBEDTLS = 1 FROZEN_MANIFEST = $(BOARD_DIR)/manifest.py diff --git a/ports/stm32/boards/NUCLEO_F746ZG/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_F746ZG/mpconfigboard.mk index 9506b67595..20acc63f16 100644 --- a/ports/stm32/boards/NUCLEO_F746ZG/mpconfigboard.mk +++ b/ports/stm32/boards/NUCLEO_F746ZG/mpconfigboard.mk @@ -7,7 +7,7 @@ TEXT1_ADDR = 0x08020000 # MicroPython settings MICROPY_PY_LWIP = 1 -MICROPY_PY_USSL = 1 +MICROPY_PY_SSL = 1 MICROPY_SSL_MBEDTLS = 1 FROZEN_MANIFEST = $(BOARD_DIR)/manifest.py diff --git a/ports/stm32/boards/NUCLEO_F756ZG/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_F756ZG/mpconfigboard.mk index 90fc242f9a..ab3eada5b0 100644 --- a/ports/stm32/boards/NUCLEO_F756ZG/mpconfigboard.mk +++ b/ports/stm32/boards/NUCLEO_F756ZG/mpconfigboard.mk @@ -7,7 +7,7 @@ TEXT1_ADDR = 0x08020000 # MicroPython settings MICROPY_PY_LWIP = 1 -MICROPY_PY_USSL = 1 +MICROPY_PY_SSL = 1 MICROPY_SSL_MBEDTLS = 1 FROZEN_MANIFEST = $(BOARD_DIR)/manifest.py diff --git a/ports/stm32/boards/NUCLEO_F767ZI/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_F767ZI/mpconfigboard.mk index 6ef9d42f9d..22c4098159 100644 --- a/ports/stm32/boards/NUCLEO_F767ZI/mpconfigboard.mk +++ b/ports/stm32/boards/NUCLEO_F767ZI/mpconfigboard.mk @@ -8,7 +8,7 @@ TEXT1_ADDR = 0x08020000 # MicroPython settings MICROPY_PY_LWIP = 1 -MICROPY_PY_USSL = 1 +MICROPY_PY_SSL = 1 MICROPY_SSL_MBEDTLS = 1 FROZEN_MANIFEST = $(BOARD_DIR)/manifest.py diff --git a/ports/stm32/boards/NUCLEO_G474RE/mpconfigboard.h b/ports/stm32/boards/NUCLEO_G474RE/mpconfigboard.h index 31157dd2c4..336d95c42c 100644 --- a/ports/stm32/boards/NUCLEO_G474RE/mpconfigboard.h +++ b/ports/stm32/boards/NUCLEO_G474RE/mpconfigboard.h @@ -10,13 +10,13 @@ #define MICROPY_HW_HAS_FLASH (0) // QSPI extflash not mounted #define MICROPY_PY_UASYNCIO (0) -#define MICROPY_PY_UZLIB (0) -#define MICROPY_PY_UBINASCII (0) -#define MICROPY_PY_UHASHLIB (0) -#define MICROPY_PY_UJSON (0) -#define MICROPY_PY_URE (0) +#define MICROPY_PY_ZLIB (0) +#define MICROPY_PY_BINASCII (0) +#define MICROPY_PY_HASHLIB (0) +#define MICROPY_PY_JSON (0) +#define MICROPY_PY_RE (0) #define MICROPY_PY_FRAMEBUF (0) -#define MICROPY_PY_USOCKET (0) +#define MICROPY_PY_SOCKET (0) #define MICROPY_PY_NETWORK (0) // The board has an 24MHz HSE, the following gives 170MHz CPU speed diff --git a/ports/stm32/boards/NUCLEO_H723ZG/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_H723ZG/mpconfigboard.mk index 287b51f6d8..6d512ec0ed 100644 --- a/ports/stm32/boards/NUCLEO_H723ZG/mpconfigboard.mk +++ b/ports/stm32/boards/NUCLEO_H723ZG/mpconfigboard.mk @@ -18,7 +18,7 @@ endif # MicroPython settings MICROPY_PY_LWIP = 1 -MICROPY_PY_USSL = 1 +MICROPY_PY_SSL = 1 MICROPY_SSL_MBEDTLS = 1 MICROPY_VFS_LFS2 = 1 diff --git a/ports/stm32/boards/NUCLEO_H743ZI/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_H743ZI/mpconfigboard.mk index ea95fd0074..cbdf48c52a 100644 --- a/ports/stm32/boards/NUCLEO_H743ZI/mpconfigboard.mk +++ b/ports/stm32/boards/NUCLEO_H743ZI/mpconfigboard.mk @@ -18,7 +18,7 @@ endif # MicroPython settings MICROPY_PY_LWIP = 1 -MICROPY_PY_USSL = 1 +MICROPY_PY_SSL = 1 MICROPY_SSL_MBEDTLS = 1 MICROPY_VFS_LFS2 = 1 diff --git a/ports/stm32/boards/NUCLEO_L073RZ/mpconfigboard.h b/ports/stm32/boards/NUCLEO_L073RZ/mpconfigboard.h index c8c809eb48..1d6b303260 100644 --- a/ports/stm32/boards/NUCLEO_L073RZ/mpconfigboard.h +++ b/ports/stm32/boards/NUCLEO_L073RZ/mpconfigboard.h @@ -12,13 +12,13 @@ #define MICROPY_PY_GENERATOR_PEND_THROW (0) #define MICROPY_PY_MATH (0) #define MICROPY_PY_FRAMEBUF (0) -#define MICROPY_PY_USOCKET (0) +#define MICROPY_PY_SOCKET (0) #define MICROPY_PY_NETWORK (0) #define MICROPY_PY_ONEWIRE (0) #define MICROPY_PY_STM (0) #define MICROPY_PY_PYB_LEGACY (0) -#define MICROPY_PY_UHEAPQ (0) -#define MICROPY_PY_UTIMEQ (0) +#define MICROPY_PY_HEAPQ (0) +#define MICROPY_PY_TIMEQ (0) #define MICROPY_PY_MACHINE_BITSTREAM (0) diff --git a/ports/stm32/boards/NUCLEO_L432KC/mpconfigboard.h b/ports/stm32/boards/NUCLEO_L432KC/mpconfigboard.h index 5e05053cdd..ba843c8a61 100644 --- a/ports/stm32/boards/NUCLEO_L432KC/mpconfigboard.h +++ b/ports/stm32/boards/NUCLEO_L432KC/mpconfigboard.h @@ -6,13 +6,13 @@ #define MICROPY_OPT_COMPUTED_GOTO (0) #define MICROPY_PY_BUILTINS_COMPLEX (0) #define MICROPY_PY_GENERATOR_PEND_THROW (0) -#define MICROPY_PY_USOCKET (0) +#define MICROPY_PY_SOCKET (0) #define MICROPY_PY_NETWORK (0) #define MICROPY_PY_ONEWIRE (0) #define MICROPY_PY_STM (0) #define MICROPY_PY_PYB_LEGACY (0) -#define MICROPY_PY_UHEAPQ (0) -#define MICROPY_PY_UTIMEQ (0) +#define MICROPY_PY_HEAPQ (0) +#define MICROPY_PY_TIMEQ (0) #define MICROPY_HW_ENABLE_RTC (1) #define MICROPY_HW_ENABLE_ADC (1) diff --git a/ports/stm32/boards/NUCLEO_L452RE/mpconfigboard.h b/ports/stm32/boards/NUCLEO_L452RE/mpconfigboard.h index 1b5827d5ae..b0fab45956 100644 --- a/ports/stm32/boards/NUCLEO_L452RE/mpconfigboard.h +++ b/ports/stm32/boards/NUCLEO_L452RE/mpconfigboard.h @@ -1,7 +1,7 @@ #define MICROPY_HW_BOARD_NAME "NUCLEO-L452RE" #define MICROPY_HW_MCU_NAME "STM32L452RE" -#define MICROPY_PY_USOCKET (0) +#define MICROPY_PY_SOCKET (0) #define MICROPY_PY_NETWORK (0) #define MICROPY_HW_ENABLE_RTC (1) diff --git a/ports/stm32/boards/NUCLEO_WL55/mpconfigboard.h b/ports/stm32/boards/NUCLEO_WL55/mpconfigboard.h index baf1f023be..2bb368adcc 100644 --- a/ports/stm32/boards/NUCLEO_WL55/mpconfigboard.h +++ b/ports/stm32/boards/NUCLEO_WL55/mpconfigboard.h @@ -11,13 +11,13 @@ #define MICROPY_PY_GENERATOR_PEND_THROW (0) #define MICROPY_PY_MATH (0) #define MICROPY_PY_FRAMEBUF (0) -#define MICROPY_PY_USOCKET (0) +#define MICROPY_PY_SOCKET (0) #define MICROPY_PY_NETWORK (0) #define MICROPY_PY_ONEWIRE (0) #define MICROPY_PY_STM (0) #define MICROPY_PY_PYB_LEGACY (0) -#define MICROPY_PY_UHEAPQ (0) -#define MICROPY_PY_UTIMEQ (0) +#define MICROPY_PY_HEAPQ (0) +#define MICROPY_PY_TIMEQ (0) #define MICROPY_HW_HAS_FLASH (1) #define MICROPY_HW_ENABLE_RTC (1) diff --git a/ports/stm32/boards/OLIMEX_E407/mpconfigboard.mk b/ports/stm32/boards/OLIMEX_E407/mpconfigboard.mk index 0d3eee83be..aa11fd5492 100644 --- a/ports/stm32/boards/OLIMEX_E407/mpconfigboard.mk +++ b/ports/stm32/boards/OLIMEX_E407/mpconfigboard.mk @@ -7,5 +7,5 @@ TEXT1_ADDR = 0x08020000 # MicroPython settings MICROPY_PY_LWIP = 1 -MICROPY_PY_USSL = 1 +MICROPY_PY_SSL = 1 MICROPY_SSL_MBEDTLS = 1 diff --git a/ports/stm32/boards/PYBD_SF2/mpconfigboard.mk b/ports/stm32/boards/PYBD_SF2/mpconfigboard.mk index 6615a44a53..ee481e344f 100644 --- a/ports/stm32/boards/PYBD_SF2/mpconfigboard.mk +++ b/ports/stm32/boards/PYBD_SF2/mpconfigboard.mk @@ -15,7 +15,7 @@ MICROPY_BLUETOOTH_NIMBLE ?= 1 MICROPY_BLUETOOTH_BTSTACK ?= 0 MICROPY_PY_LWIP = 1 MICROPY_PY_NETWORK_CYW43 = 1 -MICROPY_PY_USSL = 1 +MICROPY_PY_SSL = 1 MICROPY_SSL_MBEDTLS = 1 MICROPY_VFS_LFS2 = 1 diff --git a/ports/stm32/boards/PYBD_SF3/mpconfigboard.mk b/ports/stm32/boards/PYBD_SF3/mpconfigboard.mk index 550094b743..cb8c44361c 100644 --- a/ports/stm32/boards/PYBD_SF3/mpconfigboard.mk +++ b/ports/stm32/boards/PYBD_SF3/mpconfigboard.mk @@ -15,7 +15,7 @@ MICROPY_BLUETOOTH_NIMBLE ?= 1 MICROPY_BLUETOOTH_BTSTACK ?= 0 MICROPY_PY_LWIP = 1 MICROPY_PY_NETWORK_CYW43 = 1 -MICROPY_PY_USSL = 1 +MICROPY_PY_SSL = 1 MICROPY_SSL_MBEDTLS = 1 MICROPY_VFS_LFS2 = 1 diff --git a/ports/stm32/boards/PYBD_SF6/mpconfigboard.mk b/ports/stm32/boards/PYBD_SF6/mpconfigboard.mk index 9db2210559..943ddf60d3 100644 --- a/ports/stm32/boards/PYBD_SF6/mpconfigboard.mk +++ b/ports/stm32/boards/PYBD_SF6/mpconfigboard.mk @@ -12,7 +12,7 @@ MICROPY_BLUETOOTH_NIMBLE ?= 1 MICROPY_BLUETOOTH_BTSTACK ?= 0 MICROPY_PY_LWIP = 1 MICROPY_PY_NETWORK_CYW43 = 1 -MICROPY_PY_USSL = 1 +MICROPY_PY_SSL = 1 MICROPY_SSL_MBEDTLS = 1 MICROPY_VFS_LFS2 = 1 diff --git a/ports/stm32/boards/STM32F769DISC/mpconfigboard.mk b/ports/stm32/boards/STM32F769DISC/mpconfigboard.mk index 6457fc6046..712906747c 100644 --- a/ports/stm32/boards/STM32F769DISC/mpconfigboard.mk +++ b/ports/stm32/boards/STM32F769DISC/mpconfigboard.mk @@ -42,7 +42,7 @@ endif # MicroPython settings MICROPY_PY_LWIP = 1 -MICROPY_PY_USSL = 1 +MICROPY_PY_SSL = 1 MICROPY_SSL_MBEDTLS = 1 FROZEN_MANIFEST = $(BOARD_DIR)/manifest.py diff --git a/ports/stm32/boards/STM32F7DISC/mpconfigboard.mk b/ports/stm32/boards/STM32F7DISC/mpconfigboard.mk index 9506b67595..20acc63f16 100644 --- a/ports/stm32/boards/STM32F7DISC/mpconfigboard.mk +++ b/ports/stm32/boards/STM32F7DISC/mpconfigboard.mk @@ -7,7 +7,7 @@ TEXT1_ADDR = 0x08020000 # MicroPython settings MICROPY_PY_LWIP = 1 -MICROPY_PY_USSL = 1 +MICROPY_PY_SSL = 1 MICROPY_SSL_MBEDTLS = 1 FROZEN_MANIFEST = $(BOARD_DIR)/manifest.py diff --git a/ports/stm32/boards/VCC_GND_F407ZG/mpconfigboard.mk b/ports/stm32/boards/VCC_GND_F407ZG/mpconfigboard.mk index a30a6137d3..2d3e4cec4f 100644 --- a/ports/stm32/boards/VCC_GND_F407ZG/mpconfigboard.mk +++ b/ports/stm32/boards/VCC_GND_F407ZG/mpconfigboard.mk @@ -6,7 +6,7 @@ TEXT0_ADDR = 0x08000000 TEXT1_ADDR = 0x08020000 MICROPY_PY_LWIP = 1 -MICROPY_PY_USSL = 1 +MICROPY_PY_SSL = 1 MICROPY_SSL_MBEDTLS = 1 FROZEN_MANIFEST = $(BOARD_DIR)/manifest.py diff --git a/ports/stm32/moduos.c b/ports/stm32/moduos.c index bfbb868e2f..43543aa55e 100644 --- a/ports/stm32/moduos.c +++ b/ports/stm32/moduos.c @@ -29,7 +29,7 @@ #include "usb.h" #include "uart.h" -#if MICROPY_PY_UOS_URANDOM +#if MICROPY_PY_OS_URANDOM // urandom(n) // Return a bytes object with n random bytes, generated by the hardware // random number generator. diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h index 62784dccf1..49a8a03405 100644 --- a/ports/stm32/mpconfigport.h +++ b/ports/stm32/mpconfigport.h @@ -92,24 +92,24 @@ #endif // extended modules -#define MICROPY_PY_USSL_FINALISER (MICROPY_PY_USSL) -#define MICROPY_PY_UHASHLIB_MD5 (MICROPY_PY_USSL) -#define MICROPY_PY_UHASHLIB_SHA1 (MICROPY_PY_USSL) -#define MICROPY_PY_UCRYPTOLIB (MICROPY_PY_USSL) -#define MICROPY_PY_UOS_INCLUDEFILE "ports/stm32/moduos.c" +#define MICROPY_PY_SSL_FINALISER (MICROPY_PY_SSL) +#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_DUPTERM (3) -#define MICROPY_PY_UOS_DUPTERM_BUILTIN_STREAM (1) -#define MICROPY_PY_UOS_DUPTERM_STREAM_DETACHED_ATTACHED (1) -#define MICROPY_PY_UOS_SEP (1) -#define MICROPY_PY_UOS_SYNC (1) -#define MICROPY_PY_UOS_UNAME (1) -#define MICROPY_PY_UOS_URANDOM (MICROPY_HW_ENABLE_RNG) -#define MICROPY_PY_URANDOM_SEED_INIT_FUNC (rng_get()) -#define MICROPY_PY_UTIME_GMTIME_LOCALTIME_MKTIME (1) -#define MICROPY_PY_UTIME_TIME_TIME_NS (1) -#define MICROPY_PY_UTIME_INCLUDEFILE "ports/stm32/modutime.c" -#ifndef MICROPY_PY_UTIMEQ -#define MICROPY_PY_UTIMEQ (1) +#define MICROPY_PY_OS_DUPTERM_BUILTIN_STREAM (1) +#define MICROPY_PY_OS_DUPTERM_STREAM_DETACHED_ATTACHED (1) +#define MICROPY_PY_OS_SEP (1) +#define MICROPY_PY_OS_SYNC (1) +#define MICROPY_PY_OS_UNAME (1) +#define MICROPY_PY_OS_URANDOM (MICROPY_HW_ENABLE_RNG) +#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" +#ifndef MICROPY_PY_TIMEQ +#define MICROPY_PY_TIMEQ (1) #endif #define MICROPY_PY_LWIP_SOCK_RAW (MICROPY_PY_LWIP) #ifndef MICROPY_PY_MACHINE @@ -130,10 +130,10 @@ #endif #define MICROPY_HW_SOFTSPI_MIN_DELAY (0) #define MICROPY_HW_SOFTSPI_MAX_BAUDRATE (HAL_RCC_GetSysClockFreq() / 48) -#define MICROPY_PY_UWEBSOCKET (MICROPY_PY_LWIP) +#define MICROPY_PY_WEBSOCKET (MICROPY_PY_LWIP) #define MICROPY_PY_WEBREPL (MICROPY_PY_LWIP) -#ifndef MICROPY_PY_USOCKET -#define MICROPY_PY_USOCKET (1) +#ifndef MICROPY_PY_SOCKET +#define MICROPY_PY_SOCKET (1) #endif #ifndef MICROPY_PY_NETWORK #define MICROPY_PY_NETWORK (1) @@ -141,8 +141,8 @@ #ifndef MICROPY_PY_ONEWIRE #define MICROPY_PY_ONEWIRE (1) #endif -#ifndef MICROPY_PY_UPLATFORM -#define MICROPY_PY_UPLATFORM (1) +#ifndef MICROPY_PY_PLATFORM +#define MICROPY_PY_PLATFORM (1) #endif // fatfs configuration used in ffconf.h @@ -324,5 +324,5 @@ static inline mp_uint_t disable_irq(void) { // We need to provide a declaration/definition of alloca() #include <alloca.h> -// Needed for MICROPY_PY_URANDOM_SEED_INIT_FUNC. +// Needed for MICROPY_PY_RANDOM_SEED_INIT_FUNC. uint32_t rng_get(void); diff --git a/ports/unix/Makefile b/ports/unix/Makefile index 0ff2e4b6e8..9ff19aab98 100644 --- a/ports/unix/Makefile +++ b/ports/unix/Makefile @@ -138,7 +138,7 @@ CFLAGS += -DMICROPY_PY_THREAD=1 -DMICROPY_PY_THREAD_GIL=0 LDFLAGS += $(LIBPTHREAD) endif -ifeq ($(MICROPY_PY_USSL),1) +ifeq ($(MICROPY_PY_SSL),1) ifeq ($(MICROPY_SSL_AXTLS),1) endif diff --git a/ports/unix/README.md b/ports/unix/README.md index a3a0dba75a..a3159a3262 100644 --- a/ports/unix/README.md +++ b/ports/unix/README.md @@ -70,5 +70,5 @@ or not). If you intend to build MicroPython with additional options (like cross-compiling), the same set of options should be passed to `make deplibs`. To actually enable/disable use of dependencies, edit the `ports/unix/mpconfigport.mk` file, which has inline descriptions of the -options. For example, to build the SSL module, `MICROPY_PY_USSL` should be +options. For example, to build the SSL module, `MICROPY_PY_SSL` should be set to 1. diff --git a/ports/unix/mbedtls/mbedtls_config.h b/ports/unix/mbedtls/mbedtls_config.h index c8ffab0832..629064abcf 100644 --- a/ports/unix/mbedtls/mbedtls_config.h +++ b/ports/unix/mbedtls/mbedtls_config.h @@ -27,7 +27,7 @@ #define MICROPY_INCLUDED_MBEDTLS_CONFIG_H // Set mbedtls configuration -#define MBEDTLS_CIPHER_MODE_CTR // needed for MICROPY_PY_UCRYPTOLIB_CTR +#define MBEDTLS_CIPHER_MODE_CTR // needed for MICROPY_PY_CRYPTOLIB_CTR // Enable mbedtls modules #define MBEDTLS_HAVEGE_C diff --git a/ports/unix/moduselect.c b/ports/unix/moduselect.c index 9f7f452a12..97c3602e4b 100644 --- a/ports/unix/moduselect.c +++ b/ports/unix/moduselect.c @@ -27,10 +27,10 @@ #include "py/mpconfig.h" -#if MICROPY_PY_USELECT_POSIX +#if MICROPY_PY_SELECT_POSIX -#if MICROPY_PY_USELECT -#error "Can't have both MICROPY_PY_USELECT and MICROPY_PY_USELECT_POSIX." +#if MICROPY_PY_SELECT +#error "Can't have both MICROPY_PY_SELECT and MICROPY_PY_SELECT_POSIX." #endif #include <stdio.h> @@ -353,4 +353,4 @@ const mp_obj_module_t mp_module_select = { MP_REGISTER_MODULE(MP_QSTR_select, mp_module_select); -#endif // MICROPY_PY_USELECT_POSIX +#endif // MICROPY_PY_SELECT_POSIX diff --git a/ports/unix/modusocket.c b/ports/unix/modusocket.c index d8a615b469..9854f3cbce 100644 --- a/ports/unix/modusocket.c +++ b/ports/unix/modusocket.c @@ -146,7 +146,7 @@ STATIC mp_uint_t socket_ioctl(mp_obj_t o_in, mp_uint_t request, uintptr_t arg, i case MP_STREAM_GET_FILENO: return self->fd; - #if MICROPY_PY_USELECT + #if MICROPY_PY_SELECT case MP_STREAM_POLL: { mp_uint_t ret = 0; uint8_t pollevents = 0; @@ -227,7 +227,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_bind_obj, socket_bind); STATIC mp_obj_t socket_listen(size_t n_args, const mp_obj_t *args) { mp_obj_socket_t *self = MP_OBJ_TO_PTR(args[0]); - int backlog = MICROPY_PY_USOCKET_LISTEN_BACKLOG_DEFAULT; + int backlog = MICROPY_PY_SOCKET_LISTEN_BACKLOG_DEFAULT; if (n_args > 1) { backlog = (int)mp_obj_get_int(args[1]); backlog = (backlog < 0) ? 0 : backlog; diff --git a/ports/unix/modutime.c b/ports/unix/modutime.c index 26c2fbdb90..b6fbae0d1c 100644 --- a/ports/unix/modutime.c +++ b/ports/unix/modutime.c @@ -200,7 +200,7 @@ STATIC mp_obj_t mod_time_mktime(mp_obj_t tuple) { } MP_DEFINE_CONST_FUN_OBJ_1(mod_time_mktime_obj, mod_time_mktime); -#define MICROPY_PY_UTIME_EXTRA_GLOBALS \ +#define MICROPY_PY_TIME_EXTRA_GLOBALS \ { MP_ROM_QSTR(MP_QSTR_clock), MP_ROM_PTR(&mod_time_clock_obj) }, \ { MP_ROM_QSTR(MP_QSTR_gmtime), MP_ROM_PTR(&mod_time_gmtime_obj) }, \ { MP_ROM_QSTR(MP_QSTR_localtime), MP_ROM_PTR(&mod_time_localtime_obj) }, \ diff --git a/ports/unix/mpconfigport.h b/ports/unix/mpconfigport.h index 0588e100d6..58aba9700b 100644 --- a/ports/unix/mpconfigport.h +++ b/ports/unix/mpconfigport.h @@ -160,7 +160,7 @@ typedef long mp_off_t; // Enable sys.executable. #define MICROPY_PY_SYS_EXECUTABLE (1) -#define MICROPY_PY_USOCKET_LISTEN_BACKLOG_DEFAULT (SOMAXCONN < 128 ? SOMAXCONN : 128) +#define MICROPY_PY_SOCKET_LISTEN_BACKLOG_DEFAULT (SOMAXCONN < 128 ? SOMAXCONN : 128) // Bare-metal ports don't have stderr. Printing debug to stderr may give tests // which check stdout a chance to pass, etc. @@ -181,7 +181,7 @@ void mp_unix_mark_exec(void); #endif // If enabled, configure how to seed random on init. -#ifdef MICROPY_PY_URANDOM_SEED_INIT_FUNC +#ifdef MICROPY_PY_RANDOM_SEED_INIT_FUNC #include <stddef.h> void mp_hal_get_random(size_t n, void *buf); static inline unsigned long mp_random_seed_init(void) { diff --git a/ports/unix/mpconfigport.mk b/ports/unix/mpconfigport.mk index ce6183c133..c8ade0b7e2 100644 --- a/ports/unix/mpconfigport.mk +++ b/ports/unix/mpconfigport.mk @@ -23,8 +23,8 @@ MICROPY_PY_SOCKET = 1 # ffi module requires libffi (libffi-dev Debian package) MICROPY_PY_FFI = 1 -# ussl module requires one of the TLS libraries below -MICROPY_PY_USSL = 1 +# ssl module requires one of the TLS libraries below +MICROPY_PY_SSL = 1 # axTLS has minimal size but implements only a subset of modern TLS # functionality, so may have problems with some servers. MICROPY_SSL_AXTLS = 0 diff --git a/ports/unix/variants/coverage/mpconfigvariant.h b/ports/unix/variants/coverage/mpconfigvariant.h index 2a48e57e7f..e24e0f1b14 100644 --- a/ports/unix/variants/coverage/mpconfigvariant.h +++ b/ports/unix/variants/coverage/mpconfigvariant.h @@ -41,4 +41,4 @@ #define MICROPY_DEBUG_PARSE_RULE_NAME (1) #define MICROPY_TRACKED_ALLOC (1) #define MICROPY_WARNINGS_CATEGORY (1) -#define MICROPY_PY_UCRYPTOLIB_CTR (1) +#define MICROPY_PY_CRYPTOLIB_CTR (1) diff --git a/ports/unix/variants/minimal/mpconfigvariant.h b/ports/unix/variants/minimal/mpconfigvariant.h index 6b107e7790..0dbfbb3d1c 100644 --- a/ports/unix/variants/minimal/mpconfigvariant.h +++ b/ports/unix/variants/minimal/mpconfigvariant.h @@ -63,7 +63,7 @@ // Enable just the sys and os built-in modules. #define MICROPY_PY_SYS (1) -#define MICROPY_PY_UOS (1) +#define MICROPY_PY_OS (1) // The minimum sets this to 1 to save flash. #define MICROPY_QSTR_BYTES_IN_HASH (2) diff --git a/ports/unix/variants/minimal/mpconfigvariant.mk b/ports/unix/variants/minimal/mpconfigvariant.mk index d5c2a52e9a..19b3460ed5 100644 --- a/ports/unix/variants/minimal/mpconfigvariant.mk +++ b/ports/unix/variants/minimal/mpconfigvariant.mk @@ -7,7 +7,7 @@ MICROPY_PY_FFI = 0 MICROPY_PY_SOCKET = 0 MICROPY_PY_THREAD = 0 MICROPY_PY_TERMIOS = 0 -MICROPY_PY_USSL = 0 +MICROPY_PY_SSL = 0 MICROPY_USE_READLINE = 0 MICROPY_VFS_FAT = 0 diff --git a/ports/unix/variants/mpconfigvariant_common.h b/ports/unix/variants/mpconfigvariant_common.h index 9a8a524a22..cc50d426ce 100644 --- a/ports/unix/variants/mpconfigvariant_common.h +++ b/ports/unix/variants/mpconfigvariant_common.h @@ -58,7 +58,7 @@ #endif // Seed random on import. -#define MICROPY_PY_URANDOM_SEED_INIT_FUNC (mp_random_seed_init()) +#define MICROPY_PY_RANDOM_SEED_INIT_FUNC (mp_random_seed_init()) // Allow exception details in low-memory conditions. #define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF (1) @@ -87,39 +87,39 @@ #define MICROPY_PY_SYS_EXC_INFO (1) // Configure the "os" module with extra unix features. -#define MICROPY_PY_UOS_INCLUDEFILE "ports/unix/moduos.c" -#define MICROPY_PY_UOS_ERRNO (1) -#define MICROPY_PY_UOS_GETENV_PUTENV_UNSETENV (1) -#define MICROPY_PY_UOS_SEP (1) -#define MICROPY_PY_UOS_SYSTEM (1) -#define MICROPY_PY_UOS_URANDOM (1) +#define MICROPY_PY_OS_INCLUDEFILE "ports/unix/moduos.c" +#define MICROPY_PY_OS_ERRNO (1) +#define MICROPY_PY_OS_GETENV_PUTENV_UNSETENV (1) +#define MICROPY_PY_OS_SEP (1) +#define MICROPY_PY_OS_SYSTEM (1) +#define MICROPY_PY_OS_URANDOM (1) // Enable the unix-specific "time" module. -#define MICROPY_PY_UTIME (1) -#define MICROPY_PY_UTIME_TIME_TIME_NS (1) -#define MICROPY_PY_UTIME_CUSTOM_SLEEP (1) -#define MICROPY_PY_UTIME_INCLUDEFILE "ports/unix/modutime.c" +#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" // Enable the utimeq module used by the previous (v2) version of uasyncio. -#define MICROPY_PY_UTIMEQ (1) +#define MICROPY_PY_TIMEQ (1) -#if MICROPY_PY_USSL -#define MICROPY_PY_UHASHLIB_MD5 (1) -#define MICROPY_PY_UHASHLIB_SHA1 (1) -#define MICROPY_PY_UCRYPTOLIB (1) +#if MICROPY_PY_SSL +#define MICROPY_PY_HASHLIB_MD5 (1) +#define MICROPY_PY_HASHLIB_SHA1 (1) +#define MICROPY_PY_CRYPTOLIB (1) #endif // Use the posix implementation of the "select" module (unless the variant // specifically asks for the MicroPython version). -#ifndef MICROPY_PY_USELECT -#define MICROPY_PY_USELECT (0) +#ifndef MICROPY_PY_SELECT +#define MICROPY_PY_SELECT (0) #endif -#ifndef MICROPY_PY_USELECT_POSIX -#define MICROPY_PY_USELECT_POSIX (!MICROPY_PY_USELECT) +#ifndef MICROPY_PY_SELECT_POSIX +#define MICROPY_PY_SELECT_POSIX (!MICROPY_PY_SELECT) #endif // Enable the "websocket" module. -#define MICROPY_PY_UWEBSOCKET (1) +#define MICROPY_PY_WEBSOCKET (1) // Enable the "machine" module, mostly for machine.mem*. #define MICROPY_PY_MACHINE (1) diff --git a/ports/windows/mpconfigport.h b/ports/windows/mpconfigport.h index 5e56923d93..87e12562b1 100644 --- a/ports/windows/mpconfigport.h +++ b/ports/windows/mpconfigport.h @@ -130,29 +130,29 @@ #define MICROPY_STACKLESS_STRICT (0) #endif -#define MICROPY_PY_UOS (1) -#define MICROPY_PY_UOS_INCLUDEFILE "ports/unix/moduos.c" -#define MICROPY_PY_UOS_ERRNO (1) -#define MICROPY_PY_UOS_GETENV_PUTENV_UNSETENV (1) -#define MICROPY_PY_UOS_SEP (1) -#define MICROPY_PY_UOS_STATVFS (0) -#define MICROPY_PY_UOS_SYSTEM (1) -#define MICROPY_PY_UOS_URANDOM (1) -#define MICROPY_PY_UTIME (1) -#define MICROPY_PY_UTIME_TIME_TIME_NS (1) -#define MICROPY_PY_UTIME_CUSTOM_SLEEP (1) -#define MICROPY_PY_UTIME_INCLUDEFILE "ports/unix/modutime.c" -#define MICROPY_PY_UERRNO (1) +#define MICROPY_PY_OS (1) +#define MICROPY_PY_OS_INCLUDEFILE "ports/unix/moduos.c" +#define MICROPY_PY_OS_ERRNO (1) +#define MICROPY_PY_OS_GETENV_PUTENV_UNSETENV (1) +#define MICROPY_PY_OS_SEP (1) +#define MICROPY_PY_OS_STATVFS (0) +#define MICROPY_PY_OS_SYSTEM (1) +#define MICROPY_PY_OS_URANDOM (1) +#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_ERRNO (1) #define MICROPY_PY_UCTYPES (1) -#define MICROPY_PY_UZLIB (1) -#define MICROPY_PY_UJSON (1) -#define MICROPY_PY_URE (1) -#define MICROPY_PY_UHEAPQ (1) -#define MICROPY_PY_UTIMEQ (1) -#define MICROPY_PY_UHASHLIB (1) -#define MICROPY_PY_UBINASCII (1) -#define MICROPY_PY_UBINASCII_CRC32 (1) -#define MICROPY_PY_URANDOM (1) +#define MICROPY_PY_ZLIB (1) +#define MICROPY_PY_JSON (1) +#define MICROPY_PY_RE (1) +#define MICROPY_PY_HEAPQ (1) +#define MICROPY_PY_TIMEQ (1) +#define MICROPY_PY_HASHLIB (1) +#define MICROPY_PY_BINASCII (1) +#define MICROPY_PY_BINASCII_CRC32 (1) +#define MICROPY_PY_RANDOM (1) #define MICROPY_PY_MACHINE (1) #define MICROPY_PY_MACHINE_PULSE (1) #define MICROPY_MACHINE_MEM_GET_READ_ADDR mod_machine_mem_get_addr diff --git a/ports/windows/variants/dev/mpconfigvariant.h b/ports/windows/variants/dev/mpconfigvariant.h index abf43a0da9..d6ce7bf36f 100644 --- a/ports/windows/variants/dev/mpconfigvariant.h +++ b/ports/windows/variants/dev/mpconfigvariant.h @@ -34,9 +34,9 @@ #define MICROPY_PY_SYS_SETTRACE (1) #define MICROPY_PERSISTENT_CODE_SAVE (1) #define MICROPY_COMP_CONST (0) -#define MICROPY_PY_URANDOM_EXTRA_FUNCS (1) +#define MICROPY_PY_RANDOM_EXTRA_FUNCS (1) #define MICROPY_PY_BUILTINS_SLICE_INDICES (1) -#define MICROPY_PY_USELECT (1) +#define MICROPY_PY_SELECT (1) #ifndef MICROPY_PY_UASYNCIO #define MICROPY_PY_UASYNCIO (1) diff --git a/ports/zephyr/modusocket.c b/ports/zephyr/modusocket.c index c3356189ab..8d4197410c 100644 --- a/ports/zephyr/modusocket.c +++ b/ports/zephyr/modusocket.c @@ -25,7 +25,7 @@ */ #include "py/mpconfig.h" -#ifdef MICROPY_PY_USOCKET +#ifdef MICROPY_PY_SOCKET #include "py/runtime.h" #include "py/stream.h" @@ -190,7 +190,7 @@ STATIC mp_obj_t socket_listen(size_t n_args, const mp_obj_t *args) { socket_obj_t *socket = args[0]; socket_check_closed(socket); - mp_int_t backlog = MICROPY_PY_USOCKET_LISTEN_BACKLOG_DEFAULT; + mp_int_t backlog = MICROPY_PY_SOCKET_LISTEN_BACKLOG_DEFAULT; if (n_args > 1) { backlog = mp_obj_get_int(args[1]); backlog = (backlog < 0) ? 0 : backlog; @@ -475,4 +475,4 @@ const mp_obj_module_t mp_module_socket = { MP_REGISTER_MODULE(MP_QSTR_socket, mp_module_socket); -#endif // MICROPY_PY_USOCKET +#endif // MICROPY_PY_SOCKET diff --git a/ports/zephyr/modzsensor.c b/ports/zephyr/modzsensor.c index e35a1716f4..5b55f0ebba 100644 --- a/ports/zephyr/modzsensor.c +++ b/ports/zephyr/modzsensor.c @@ -145,4 +145,4 @@ const mp_obj_module_t mp_module_zsensor = { MP_REGISTER_MODULE(MP_QSTR_zsensor, mp_module_zsensor); -#endif // MICROPY_PY_UHASHLIB +#endif // MICROPY_PY_HASHLIB diff --git a/ports/zephyr/mpconfigport.h b/ports/zephyr/mpconfigport.h index 30ccccb627..ec759bda77 100644 --- a/ports/zephyr/mpconfigport.h +++ b/ports/zephyr/mpconfigport.h @@ -72,8 +72,8 @@ #define MICROPY_PY_STRUCT (0) #ifdef CONFIG_NETWORKING // If we have networking, we likely want errno comfort -#define MICROPY_PY_UERRNO (1) -#define MICROPY_PY_USOCKET (1) +#define MICROPY_PY_ERRNO (1) +#define MICROPY_PY_SOCKET (1) #endif #ifdef CONFIG_BT #define MICROPY_PY_BLUETOOTH (1) @@ -82,12 +82,12 @@ #endif #define MICROPY_PY_BLUETOOTH_ENABLE_GATT_CLIENT (0) #endif -#define MICROPY_PY_UBINASCII (1) -#define MICROPY_PY_UHASHLIB (1) -#define MICROPY_PY_UOS (1) -#define MICROPY_PY_UTIME (1) -#define MICROPY_PY_UTIME_TIME_TIME_NS (1) -#define MICROPY_PY_UTIME_INCLUDEFILE "ports/zephyr/modutime.c" +#define MICROPY_PY_BINASCII (1) +#define MICROPY_PY_HASHLIB (1) +#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_ZEPHYR (1) #define MICROPY_PY_ZSENSOR (1) #define MICROPY_PY_SYS_MODULES (0) diff --git a/ports/zephyr/prj.conf b/ports/zephyr/prj.conf index 90211e3657..6046690197 100644 --- a/ports/zephyr/prj.conf +++ b/ports/zephyr/prj.conf @@ -57,7 +57,7 @@ CONFIG_THREAD_ANALYZER=y CONFIG_THREAD_ANALYZER_USE_PRINTK=y CONFIG_THREAD_NAME=y -# Required for usocket.pkt_get_info() +# Required for socket.pkt_get_info() CONFIG_NET_BUF_POOL_USAGE=y # Required for zephyr.shell_exec() diff --git a/py/moduerrno.c b/py/moduerrno.c index ed172ae4d6..99ca101bd6 100644 --- a/py/moduerrno.c +++ b/py/moduerrno.c @@ -30,12 +30,12 @@ #include "py/obj.h" #include "py/mperrno.h" -#if MICROPY_PY_UERRNO +#if MICROPY_PY_ERRNO // This list can be defined per port in mpconfigport.h to tailor it to a // specific port's needs. If it's not defined then we provide a default. -#ifndef MICROPY_PY_UERRNO_LIST -#define MICROPY_PY_UERRNO_LIST \ +#ifndef MICROPY_PY_ERRNO_LIST +#define MICROPY_PY_ERRNO_LIST \ X(EPERM) \ X(ENOENT) \ X(EIO) \ @@ -61,10 +61,10 @@ #endif -#if MICROPY_PY_UERRNO_ERRORCODE +#if MICROPY_PY_ERRNO_ERRORCODE STATIC const mp_rom_map_elem_t errorcode_table[] = { #define X(e) { MP_ROM_INT(MP_##e), MP_ROM_QSTR(MP_QSTR_##e) }, - MICROPY_PY_UERRNO_LIST + MICROPY_PY_ERRNO_LIST #undef X }; @@ -83,12 +83,12 @@ STATIC const mp_obj_dict_t errorcode_dict = { STATIC const mp_rom_map_elem_t mp_module_errno_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_errno) }, - #if MICROPY_PY_UERRNO_ERRORCODE + #if MICROPY_PY_ERRNO_ERRORCODE { MP_ROM_QSTR(MP_QSTR_errorcode), MP_ROM_PTR(&errorcode_dict) }, #endif #define X(e) { MP_ROM_QSTR(MP_QSTR_##e), MP_ROM_INT(MP_##e) }, - MICROPY_PY_UERRNO_LIST + MICROPY_PY_ERRNO_LIST #undef X }; @@ -102,7 +102,7 @@ const mp_obj_module_t mp_module_errno = { MP_REGISTER_MODULE(MP_QSTR_errno, mp_module_errno); qstr mp_errno_to_str(mp_obj_t errno_val) { - #if MICROPY_PY_UERRNO_ERRORCODE + #if MICROPY_PY_ERRNO_ERRORCODE // We have the errorcode dict so can do a lookup using the hash map mp_map_elem_t *elem = mp_map_lookup((mp_map_t *)&errorcode_dict.map, errno_val, MP_MAP_LOOKUP); if (elem == NULL) { @@ -121,4 +121,4 @@ qstr mp_errno_to_str(mp_obj_t errno_val) { #endif } -#endif // MICROPY_PY_UERRNO +#endif // MICROPY_PY_ERRNO diff --git a/py/mpconfig.h b/py/mpconfig.h index fbe8ba54e2..a004f548ad 100644 --- a/py/mpconfig.h +++ b/py/mpconfig.h @@ -1459,40 +1459,40 @@ typedef double mp_float_t; #endif // Whether to provide "errno" module -#ifndef MICROPY_PY_UERRNO -#define MICROPY_PY_UERRNO (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES) +#ifndef MICROPY_PY_ERRNO +#define MICROPY_PY_ERRNO (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES) #endif // Whether to provide the errno.errorcode dict -#ifndef MICROPY_PY_UERRNO_ERRORCODE -#define MICROPY_PY_UERRNO_ERRORCODE (1) +#ifndef MICROPY_PY_ERRNO_ERRORCODE +#define MICROPY_PY_ERRNO_ERRORCODE (1) #endif // Whether to provide "select" module (baremetal implementation) -#ifndef MICROPY_PY_USELECT -#define MICROPY_PY_USELECT (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES) +#ifndef MICROPY_PY_SELECT +#define MICROPY_PY_SELECT (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES) #endif // Whether to enable the select() function in the "select" module (baremetal // implementation). This is present for compatibility but can be disabled to // save space. -#ifndef MICROPY_PY_USELECT_SELECT -#define MICROPY_PY_USELECT_SELECT (1) +#ifndef MICROPY_PY_SELECT_SELECT +#define MICROPY_PY_SELECT_SELECT (1) #endif // Whether to provide the "time" module -#ifndef MICROPY_PY_UTIME -#define MICROPY_PY_UTIME (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_BASIC_FEATURES) +#ifndef MICROPY_PY_TIME +#define MICROPY_PY_TIME (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_BASIC_FEATURES) #endif // Whether to provide time.gmtime/localtime/mktime functions -#ifndef MICROPY_PY_UTIME_GMTIME_LOCALTIME_MKTIME -#define MICROPY_PY_UTIME_GMTIME_LOCALTIME_MKTIME (0) +#ifndef MICROPY_PY_TIME_GMTIME_LOCALTIME_MKTIME +#define MICROPY_PY_TIME_GMTIME_LOCALTIME_MKTIME (0) #endif // Whether to provide time.time/time_ns functions -#ifndef MICROPY_PY_UTIME_TIME_TIME_NS -#define MICROPY_PY_UTIME_TIME_TIME_NS (0) +#ifndef MICROPY_PY_TIME_TIME_TIME_NS +#define MICROPY_PY_TIME_TIME_TIME_NS (0) #endif // Period of values returned by time.ticks_ms(), ticks_us(), ticks_cpu() @@ -1501,8 +1501,8 @@ typedef double mp_float_t; // minimum of them should be used. The value below is the maximum value // this parameter can take (corresponding to 30 bit tick values on 32-bit // system). -#ifndef MICROPY_PY_UTIME_TICKS_PERIOD -#define MICROPY_PY_UTIME_TICKS_PERIOD (MP_SMALL_INT_POSITIVE_MASK + 1) +#ifndef MICROPY_PY_TIME_TICKS_PERIOD +#define MICROPY_PY_TIME_TICKS_PERIOD (MP_SMALL_INT_POSITIVE_MASK + 1) #endif // Whether to provide "_thread" module @@ -1538,101 +1538,101 @@ typedef double mp_float_t; #define MICROPY_PY_UCTYPES_NATIVE_C_TYPES (1) #endif -#ifndef MICROPY_PY_UZLIB -#define MICROPY_PY_UZLIB (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES) +#ifndef MICROPY_PY_ZLIB +#define MICROPY_PY_ZLIB (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES) #endif -#ifndef MICROPY_PY_UJSON -#define MICROPY_PY_UJSON (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES) +#ifndef MICROPY_PY_JSON +#define MICROPY_PY_JSON (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES) #endif // Whether to support the "separators" argument to dump, dumps -#ifndef MICROPY_PY_UJSON_SEPARATORS -#define MICROPY_PY_UJSON_SEPARATORS (1) +#ifndef MICROPY_PY_JSON_SEPARATORS +#define MICROPY_PY_JSON_SEPARATORS (1) #endif -#ifndef MICROPY_PY_UOS -#define MICROPY_PY_UOS (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES) +#ifndef MICROPY_PY_OS +#define MICROPY_PY_OS (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES) #endif -#ifndef MICROPY_PY_UOS_STATVFS -#define MICROPY_PY_UOS_STATVFS (MICROPY_PY_UOS) +#ifndef MICROPY_PY_OS_STATVFS +#define MICROPY_PY_OS_STATVFS (MICROPY_PY_OS) #endif -#ifndef MICROPY_PY_URE -#define MICROPY_PY_URE (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES) +#ifndef MICROPY_PY_RE +#define MICROPY_PY_RE (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES) #endif -#ifndef MICROPY_PY_URE_DEBUG -#define MICROPY_PY_URE_DEBUG (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EVERYTHING) +#ifndef MICROPY_PY_RE_DEBUG +#define MICROPY_PY_RE_DEBUG (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EVERYTHING) #endif -#ifndef MICROPY_PY_URE_MATCH_GROUPS -#define MICROPY_PY_URE_MATCH_GROUPS (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EVERYTHING) +#ifndef MICROPY_PY_RE_MATCH_GROUPS +#define MICROPY_PY_RE_MATCH_GROUPS (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EVERYTHING) #endif -#ifndef MICROPY_PY_URE_MATCH_SPAN_START_END -#define MICROPY_PY_URE_MATCH_SPAN_START_END (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EVERYTHING) +#ifndef MICROPY_PY_RE_MATCH_SPAN_START_END +#define MICROPY_PY_RE_MATCH_SPAN_START_END (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EVERYTHING) #endif -#ifndef MICROPY_PY_URE_SUB -#define MICROPY_PY_URE_SUB (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES) +#ifndef MICROPY_PY_RE_SUB +#define MICROPY_PY_RE_SUB (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES) #endif -#ifndef MICROPY_PY_UHEAPQ -#define MICROPY_PY_UHEAPQ (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES) +#ifndef MICROPY_PY_HEAPQ +#define MICROPY_PY_HEAPQ (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES) #endif // Optimized heap queue for relative timestamps (only used by uasyncio v2) -#ifndef MICROPY_PY_UTIMEQ -#define MICROPY_PY_UTIMEQ (0) +#ifndef MICROPY_PY_TIMEQ +#define MICROPY_PY_TIMEQ (0) #endif -#ifndef MICROPY_PY_UHASHLIB -#define MICROPY_PY_UHASHLIB (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES) +#ifndef MICROPY_PY_HASHLIB +#define MICROPY_PY_HASHLIB (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES) #endif -#ifndef MICROPY_PY_UHASHLIB_MD5 -#define MICROPY_PY_UHASHLIB_MD5 (0) +#ifndef MICROPY_PY_HASHLIB_MD5 +#define MICROPY_PY_HASHLIB_MD5 (0) #endif -#ifndef MICROPY_PY_UHASHLIB_SHA1 -#define MICROPY_PY_UHASHLIB_SHA1 (0) +#ifndef MICROPY_PY_HASHLIB_SHA1 +#define MICROPY_PY_HASHLIB_SHA1 (0) #endif -#ifndef MICROPY_PY_UHASHLIB_SHA256 -#define MICROPY_PY_UHASHLIB_SHA256 (1) +#ifndef MICROPY_PY_HASHLIB_SHA256 +#define MICROPY_PY_HASHLIB_SHA256 (1) #endif -#ifndef MICROPY_PY_UCRYPTOLIB -#define MICROPY_PY_UCRYPTOLIB (0) +#ifndef MICROPY_PY_CRYPTOLIB +#define MICROPY_PY_CRYPTOLIB (0) #endif -// Depends on MICROPY_PY_UCRYPTOLIB -#ifndef MICROPY_PY_UCRYPTOLIB_CTR -#define MICROPY_PY_UCRYPTOLIB_CTR (0) +// Depends on MICROPY_PY_CRYPTOLIB +#ifndef MICROPY_PY_CRYPTOLIB_CTR +#define MICROPY_PY_CRYPTOLIB_CTR (0) #endif -#ifndef MICROPY_PY_UCRYPTOLIB_CONSTS -#define MICROPY_PY_UCRYPTOLIB_CONSTS (0) +#ifndef MICROPY_PY_CRYPTOLIB_CONSTS +#define MICROPY_PY_CRYPTOLIB_CONSTS (0) #endif -#ifndef MICROPY_PY_UBINASCII -#define MICROPY_PY_UBINASCII (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES) +#ifndef MICROPY_PY_BINASCII +#define MICROPY_PY_BINASCII (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES) #endif -// Depends on MICROPY_PY_UZLIB -#ifndef MICROPY_PY_UBINASCII_CRC32 -#define MICROPY_PY_UBINASCII_CRC32 (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES) +// Depends on MICROPY_PY_ZLIB +#ifndef MICROPY_PY_BINASCII_CRC32 +#define MICROPY_PY_BINASCII_CRC32 (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES) #endif -#ifndef MICROPY_PY_URANDOM -#define MICROPY_PY_URANDOM (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES) +#ifndef MICROPY_PY_RANDOM +#define MICROPY_PY_RANDOM (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES) #endif // Whether to include: randrange, randint, choice, random, uniform -#ifndef MICROPY_PY_URANDOM_EXTRA_FUNCS -#define MICROPY_PY_URANDOM_EXTRA_FUNCS (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES) +#ifndef MICROPY_PY_RANDOM_EXTRA_FUNCS +#define MICROPY_PY_RANDOM_EXTRA_FUNCS (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES) #endif #ifndef MICROPY_PY_MACHINE @@ -1678,21 +1678,21 @@ typedef double mp_float_t; #endif // The default backlog value for socket.listen(backlog) -#ifndef MICROPY_PY_USOCKET_LISTEN_BACKLOG_DEFAULT -#define MICROPY_PY_USOCKET_LISTEN_BACKLOG_DEFAULT (2) +#ifndef MICROPY_PY_SOCKET_LISTEN_BACKLOG_DEFAULT +#define MICROPY_PY_SOCKET_LISTEN_BACKLOG_DEFAULT (2) #endif -#ifndef MICROPY_PY_USSL -#define MICROPY_PY_USSL (0) +#ifndef MICROPY_PY_SSL +#define MICROPY_PY_SSL (0) #endif // Whether to add finaliser code to ssl objects -#ifndef MICROPY_PY_USSL_FINALISER -#define MICROPY_PY_USSL_FINALISER (0) +#ifndef MICROPY_PY_SSL_FINALISER +#define MICROPY_PY_SSL_FINALISER (0) #endif -#ifndef MICROPY_PY_UWEBSOCKET -#define MICROPY_PY_UWEBSOCKET (0) +#ifndef MICROPY_PY_WEBSOCKET +#define MICROPY_PY_WEBSOCKET (0) #endif #ifndef MICROPY_PY_FRAMEBUF diff --git a/py/mperrno.h b/py/mperrno.h index 6f6d816b8f..be2a65a088 100644 --- a/py/mperrno.h +++ b/py/mperrno.h @@ -141,7 +141,7 @@ #endif -#if MICROPY_PY_UERRNO +#if MICROPY_PY_ERRNO #include "py/obj.h" diff --git a/py/objbool.c b/py/objbool.c index 3267ff98bb..96f0e60dd1 100644 --- a/py/objbool.c +++ b/py/objbool.c @@ -45,7 +45,7 @@ typedef struct _mp_obj_bool_t { STATIC void bool_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) { bool value = BOOL_VALUE(self_in); - if (MICROPY_PY_UJSON && kind == PRINT_JSON) { + if (MICROPY_PY_JSON && kind == PRINT_JSON) { if (value) { mp_print_str(print, "true"); } else { diff --git a/py/objdict.c b/py/objdict.c index a621c4feaf..8aafe607d6 100644 --- a/py/objdict.c +++ b/py/objdict.c @@ -75,10 +75,10 @@ STATIC void dict_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_ bool first = true; const char *item_separator = ", "; const char *key_separator = ": "; - if (!(MICROPY_PY_UJSON && kind == PRINT_JSON)) { + if (!(MICROPY_PY_JSON && kind == PRINT_JSON)) { kind = PRINT_REPR; } else { - #if MICROPY_PY_UJSON_SEPARATORS + #if MICROPY_PY_JSON_SEPARATORS item_separator = MP_PRINT_GET_EXT(print)->item_separator; key_separator = MP_PRINT_GET_EXT(print)->key_separator; #endif @@ -94,7 +94,7 @@ STATIC void dict_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_ mp_print_str(print, item_separator); } first = false; - bool add_quote = MICROPY_PY_UJSON && kind == PRINT_JSON && !mp_obj_is_str_or_bytes(next->key); + bool add_quote = MICROPY_PY_JSON && kind == PRINT_JSON && !mp_obj_is_str_or_bytes(next->key); if (add_quote) { mp_print_str(print, "\""); } diff --git a/py/objexcept.c b/py/objexcept.c index cc0ddd9dc5..a90405c525 100644 --- a/py/objexcept.c +++ b/py/objexcept.c @@ -178,7 +178,7 @@ void mp_obj_exception_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kin return; } - #if MICROPY_PY_UERRNO + #if MICROPY_PY_ERRNO // try to provide a nice OSError error message if (o->base.type == &mp_type_OSError && o->args->len > 0 && o->args->len < 3 && mp_obj_is_small_int(o->args->items[0])) { qstr qst = mp_errno_to_str(o->args->items[0]); diff --git a/py/objlist.c b/py/objlist.c index 18da91ba3a..1423cb1dee 100644 --- a/py/objlist.c +++ b/py/objlist.c @@ -45,10 +45,10 @@ STATIC mp_obj_t list_pop(size_t n_args, const mp_obj_t *args); STATIC void list_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t kind) { mp_obj_list_t *o = MP_OBJ_TO_PTR(o_in); const char *item_separator = ", "; - if (!(MICROPY_PY_UJSON && kind == PRINT_JSON)) { + if (!(MICROPY_PY_JSON && kind == PRINT_JSON)) { kind = PRINT_REPR; } else { - #if MICROPY_PY_UJSON_SEPARATORS + #if MICROPY_PY_JSON_SEPARATORS item_separator = MP_PRINT_GET_EXT(print)->item_separator; #endif } diff --git a/py/objnone.c b/py/objnone.c index 4b0696d3a1..5b25cd38c4 100644 --- a/py/objnone.c +++ b/py/objnone.c @@ -36,7 +36,7 @@ typedef struct _mp_obj_none_t { STATIC void none_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) { (void)self_in; - if (MICROPY_PY_UJSON && kind == PRINT_JSON) { + if (MICROPY_PY_JSON && kind == PRINT_JSON) { mp_print_str(print, "null"); } else { mp_print_str(print, "None"); diff --git a/py/objstr.c b/py/objstr.c index e6c5ee71cf..b966a70169 100644 --- a/py/objstr.c +++ b/py/objstr.c @@ -109,7 +109,7 @@ void mp_str_print_quoted(const mp_print_t *print, const byte *str_data, size_t s mp_printf(print, "%c", quote_char); } -#if MICROPY_PY_UJSON +#if MICROPY_PY_JSON void mp_str_print_json(const mp_print_t *print, const byte *str_data, size_t str_len) { // for JSON spec, see http://www.ietf.org/rfc/rfc4627.txt // if we are given a valid utf8-encoded string, we will print it in a JSON-conforming way @@ -137,7 +137,7 @@ void mp_str_print_json(const mp_print_t *print, const byte *str_data, size_t str STATIC void str_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) { GET_STR_DATA_LEN(self_in, str_data, str_len); - #if MICROPY_PY_UJSON + #if MICROPY_PY_JSON if (kind == PRINT_JSON) { mp_str_print_json(print, str_data, str_len); return; diff --git a/py/objstrunicode.c b/py/objstrunicode.c index 93383b3c19..cbc797de29 100644 --- a/py/objstrunicode.c +++ b/py/objstrunicode.c @@ -85,7 +85,7 @@ STATIC void uni_print_quoted(const mp_print_t *print, const byte *str_data, uint STATIC void uni_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) { GET_STR_DATA_LEN(self_in, str_data, str_len); - #if MICROPY_PY_UJSON + #if MICROPY_PY_JSON if (kind == PRINT_JSON) { mp_str_print_json(print, str_data, str_len); return; diff --git a/py/objtuple.c b/py/objtuple.c index 9d6797b4ff..0318a35db6 100644 --- a/py/objtuple.c +++ b/py/objtuple.c @@ -40,9 +40,9 @@ void mp_obj_tuple_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t kind) { mp_obj_tuple_t *o = MP_OBJ_TO_PTR(o_in); const char *item_separator = ", "; - if (MICROPY_PY_UJSON && kind == PRINT_JSON) { + if (MICROPY_PY_JSON && kind == PRINT_JSON) { mp_print_str(print, "["); - #if MICROPY_PY_UJSON_SEPARATORS + #if MICROPY_PY_JSON_SEPARATORS item_separator = MP_PRINT_GET_EXT(print)->item_separator; #endif } else { @@ -55,7 +55,7 @@ void mp_obj_tuple_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t } mp_obj_print_helper(print, o->items[i], kind); } - if (MICROPY_PY_UJSON && kind == PRINT_JSON) { + if (MICROPY_PY_JSON && kind == PRINT_JSON) { mp_print_str(print, "]"); } else { if (o->len == 1) { diff --git a/py/parse.c b/py/parse.c index a271aa0ea3..0dd56e4554 100644 --- a/py/parse.c +++ b/py/parse.c @@ -636,7 +636,7 @@ STATIC void push_result_token(parser_t *parser, uint8_t rule_id) { #if MICROPY_COMP_MODULE_CONST STATIC const mp_rom_map_elem_t mp_constants_table[] = { - #if MICROPY_PY_UERRNO + #if MICROPY_PY_ERRNO { MP_ROM_QSTR(MP_QSTR_errno), MP_ROM_PTR(&mp_module_errno) }, #endif #if MICROPY_PY_UCTYPES diff --git a/tools/ci.sh b/tools/ci.sh index e8c4021f37..8d361e2b39 100755 --- a/tools/ci.sh +++ b/tools/ci.sh @@ -395,14 +395,14 @@ function ci_teensy_build { CI_UNIX_OPTS_SYS_SETTRACE=( MICROPY_PY_BTREE=0 MICROPY_PY_FFI=0 - MICROPY_PY_USSL=0 + MICROPY_PY_SSL=0 CFLAGS_EXTRA="-DMICROPY_PY_SYS_SETTRACE=1" ) CI_UNIX_OPTS_SYS_SETTRACE_STACKLESS=( MICROPY_PY_BTREE=0 MICROPY_PY_FFI=0 - MICROPY_PY_USSL=0 + MICROPY_PY_SSL=0 CFLAGS_EXTRA="-DMICROPY_STACKLESS=1 -DMICROPY_STACKLESS_STRICT=1 -DMICROPY_PY_SYS_SETTRACE=1" ) |