Skip to content

Commit f5f9edf

Browse files
jimmojimmo
committed
all: Rename UMODULE to MODULE in preprocessor/Makefile vars.
This work was funded through GitHub Sponsors. Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
1 parent 7f5d5c7 commit f5f9edf

126 files changed

Lines changed: 563 additions & 563 deletions

File tree

Some content is hidden

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

‎docs/library/random.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ This module implements a pseudo-random number generator (PRNG).
2424
.. note::
2525

2626
The :func:`randrange`, :func:`randint` and :func:`choice` functions are only
27-
available if the ``MICROPY_PY_URANDOM_EXTRA_FUNCS`` configuration option is
27+
available if the ``MICROPY_PY_RANDOM_EXTRA_FUNCS`` configuration option is
2828
enabled.
2929

3030

@@ -73,7 +73,7 @@ Other Functions
7373
supported by the port) initialise the PRNG with a true random number
7474
(usually a hardware generated random number).
7575

76-
The ``None`` case only works if ``MICROPY_PY_URANDOM_SEED_INIT_FUNC`` is
76+
The ``None`` case only works if ``MICROPY_PY_RANDOM_SEED_INIT_FUNC`` is
7777
enabled by the port, otherwise it raises ``ValueError``.
7878

7979
.. function:: choice(sequence)

‎examples/natmod/uheapq/uheapq.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#define MICROPY_PY_UHEAPQ (1)
1+
#define MICROPY_PY_HEAPQ (1)
22

33
#include "py/dynruntime.h"
44

‎examples/natmod/urandom/urandom.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#define MICROPY_PY_URANDOM (1)
2-
#define MICROPY_PY_URANDOM_EXTRA_FUNCS (1)
1+
#define MICROPY_PY_RANDOM (1)
2+
#define MICROPY_PY_RANDOM_EXTRA_FUNCS (1)
33

44
#include "py/dynruntime.h"
55

@@ -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
1919
mp_store_global(MP_QSTR___name__, MP_OBJ_NEW_QSTR(MP_QSTR_random));
2020
mp_store_global(MP_QSTR_getrandbits, MP_OBJ_FROM_PTR(&mod_random_getrandbits_obj));
2121
mp_store_global(MP_QSTR_seed, MP_OBJ_FROM_PTR(&mod_random_seed_obj));
22-
#if MICROPY_PY_URANDOM_EXTRA_FUNCS
22+
#if MICROPY_PY_RANDOM_EXTRA_FUNCS
2323
mp_store_global(MP_QSTR_randrange, MP_OBJ_FROM_PTR(&mod_random_randrange_obj));
2424
mp_store_global(MP_QSTR_randint, MP_OBJ_FROM_PTR(&mod_random_randint_obj));
2525
mp_store_global(MP_QSTR_choice, MP_OBJ_FROM_PTR(&mod_random_choice_obj));

‎examples/natmod/ure/ure.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#define MICROPY_STACK_CHECK (1)
2-
#define MICROPY_PY_URE (1)
3-
#define MICROPY_PY_URE_MATCH_GROUPS (1)
4-
#define MICROPY_PY_URE_MATCH_SPAN_START_END (1)
5-
#define MICROPY_PY_URE_SUB (0) // requires vstr interface
2+
#define MICROPY_PY_RE (1)
3+
#define MICROPY_PY_RE_MATCH_GROUPS (1)
4+
#define MICROPY_PY_RE_MATCH_SPAN_START_END (1)
5+
#define MICROPY_PY_RE_SUB (0) // requires vstr interface
66

77
#include <alloca.h>
88
#include "py/dynruntime.h"

‎examples/natmod/uzlib/uzlib.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#define MICROPY_PY_UZLIB (1)
1+
#define MICROPY_PY_ZLIB (1)
22

33
#include "py/dynruntime.h"
44

‎extmod/extmod.mk‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,8 @@ endif
108108
################################################################################
109109
# ussl
110110

111-
ifeq ($(MICROPY_PY_USSL),1)
112-
CFLAGS_EXTMOD += -DMICROPY_PY_USSL=1
111+
ifeq ($(MICROPY_PY_SSL),1)
112+
CFLAGS_EXTMOD += -DMICROPY_PY_SSL=1
113113
ifeq ($(MICROPY_SSL_AXTLS),1)
114114
AXTLS_DIR = lib/axtls
115115
GIT_SUBMODULES += $(AXTLS_DIR)

‎extmod/modlwip.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -918,7 +918,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(lwip_socket_bind_obj, lwip_socket_bind);
918918
STATIC mp_obj_t lwip_socket_listen(size_t n_args, const mp_obj_t *args) {
919919
lwip_socket_obj_t *socket = MP_OBJ_TO_PTR(args[0]);
920920

921-
mp_int_t backlog = MICROPY_PY_USOCKET_LISTEN_BACKLOG_DEFAULT;
921+
mp_int_t backlog = MICROPY_PY_SOCKET_LISTEN_BACKLOG_DEFAULT;
922922
if (n_args > 1) {
923923
backlog = mp_obj_get_int(args[1]);
924924
backlog = (backlog < 0) ? 0 : backlog;

‎extmod/modnetwork.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ typedef struct _mod_network_socket_obj_t {
101101
int32_t timeout;
102102
mp_obj_t callback;
103103
int32_t state : 8;
104-
#if MICROPY_PY_USOCKET_EXTENDED_STATE
104+
#if MICROPY_PY_SOCKET_EXTENDED_STATE
105105
// Extended socket state for NICs/ports that need it.
106106
void *_private;
107107
#endif

‎extmod/moduasyncio.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,14 @@ STATIC mp_obj_t task_queue_make_new(const mp_obj_type_t *type, size_t n_args, si
6464
// Ticks for task ordering in pairing heap
6565

6666
STATIC mp_obj_t ticks(void) {
67-
return MP_OBJ_NEW_SMALL_INT(mp_hal_ticks_ms() & (MICROPY_PY_UTIME_TICKS_PERIOD - 1));
67+
return MP_OBJ_NEW_SMALL_INT(mp_hal_ticks_ms() & (MICROPY_PY_TIME_TICKS_PERIOD - 1));
6868
}
6969

7070
STATIC mp_int_t ticks_diff(mp_obj_t t1_in, mp_obj_t t0_in) {
7171
mp_uint_t t0 = MP_OBJ_SMALL_INT_VALUE(t0_in);
7272
mp_uint_t t1 = MP_OBJ_SMALL_INT_VALUE(t1_in);
73-
mp_int_t diff = ((t1 - t0 + MICROPY_PY_UTIME_TICKS_PERIOD / 2) & (MICROPY_PY_UTIME_TICKS_PERIOD - 1))
74-
- MICROPY_PY_UTIME_TICKS_PERIOD / 2;
73+
mp_int_t diff = ((t1 - t0 + MICROPY_PY_TIME_TICKS_PERIOD / 2) & (MICROPY_PY_TIME_TICKS_PERIOD - 1))
74+
- MICROPY_PY_TIME_TICKS_PERIOD / 2;
7575
return diff;
7676
}
7777

‎extmod/modubinascii.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#include "py/binary.h"
3333
#include "py/objstr.h"
3434

35-
#if MICROPY_PY_UBINASCII
35+
#if MICROPY_PY_BINASCII
3636

3737
#if MICROPY_PY_BUILTINS_BYTES_HEX
3838
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,
170170
}
171171
STATIC MP_DEFINE_CONST_FUN_OBJ_KW(mod_binascii_b2a_base64_obj, 1, mod_binascii_b2a_base64);
172172

173-
#if MICROPY_PY_UBINASCII_CRC32
173+
#if MICROPY_PY_BINASCII_CRC32
174174
#include "lib/uzlib/tinf.h"
175175

176176
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[] = {
191191
#endif
192192
{ MP_ROM_QSTR(MP_QSTR_a2b_base64), MP_ROM_PTR(&mod_binascii_a2b_base64_obj) },
193193
{ MP_ROM_QSTR(MP_QSTR_b2a_base64), MP_ROM_PTR(&mod_binascii_b2a_base64_obj) },
194-
#if MICROPY_PY_UBINASCII_CRC32
194+
#if MICROPY_PY_BINASCII_CRC32
195195
{ MP_ROM_QSTR(MP_QSTR_crc32), MP_ROM_PTR(&mod_binascii_crc32_obj) },
196196
#endif
197197
};
@@ -205,4 +205,4 @@ const mp_obj_module_t mp_module_binascii = {
205205

206206
MP_REGISTER_MODULE(MP_QSTR_binascii, mp_module_binascii);
207207

208-
#endif // MICROPY_PY_UBINASCII
208+
#endif // MICROPY_PY_BINASCII

0 commit comments

Comments
 (0)