TonBERRY/micropython
3
0
Fork 0
Code Pull Requests Activity

all: Rename mp_umodule*, mp_module_umodule* to remove the "u" prefix.

Browse Source 
This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
This commit is contained in:
Jim Mussared
2022-08-18 14:47:56 +10:00
parent dfe232d000
commit 1bf2dcb15e
67 changed files with 280 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ports/unix/main.c
View File

@@ -73,7 +73,7 @@ STATIC void stderr_print_strn(void *env, const char *str, size_t len) {
(void)env;
ssize_t ret;
MP_HAL_RETRY_SYSCALL(ret, write(STDERR_FILENO, str, len), {});
mp_uos_dupterm_tx_strn(str, len);
mp_os_dupterm_tx_strn(str, len);
}
const mp_print_t mp_stderr_print = {NULL, stderr_print_strn};

24
ports/unix/moduos.c
View File

@@ -32,7 +32,7 @@
#include "py/runtime.h"
#include "py/mphal.h"
STATIC mp_obj_t mp_uos_getenv(size_t n_args, const mp_obj_t *args) {
STATIC mp_obj_t mp_os_getenv(size_t n_args, const mp_obj_t *args) {
const char *s = getenv(mp_obj_str_get_str(args[0]));
if (s == NULL) {
if (n_args == 2) {
@@ -42,9 +42,9 @@ STATIC mp_obj_t mp_uos_getenv(size_t n_args, const mp_obj_t *args) {
}
return mp_obj_new_str(s, strlen(s));
}
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_uos_getenv_obj, 1, 2, mp_uos_getenv);
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_os_getenv_obj, 1, 2, mp_os_getenv);
STATIC mp_obj_t mp_uos_putenv(mp_obj_t key_in, mp_obj_t value_in) {
STATIC mp_obj_t mp_os_putenv(mp_obj_t key_in, mp_obj_t value_in) {
const char *key = mp_obj_str_get_str(key_in);
const char *value = mp_obj_str_get_str(value_in);
int ret;
@@ -60,9 +60,9 @@ STATIC mp_obj_t mp_uos_putenv(mp_obj_t key_in, mp_obj_t value_in) {
}
return mp_const_none;
}
STATIC MP_DEFINE_CONST_FUN_OBJ_2(mp_uos_putenv_obj, mp_uos_putenv);
STATIC MP_DEFINE_CONST_FUN_OBJ_2(mp_os_putenv_obj, mp_os_putenv);
STATIC mp_obj_t mp_uos_unsetenv(mp_obj_t key_in) {
STATIC mp_obj_t mp_os_unsetenv(mp_obj_t key_in) {
const char *key = mp_obj_str_get_str(key_in);
int ret;
@@ -77,9 +77,9 @@ STATIC mp_obj_t mp_uos_unsetenv(mp_obj_t key_in) {
}
return mp_const_none;
}
STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_uos_unsetenv_obj, mp_uos_unsetenv);
STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_os_unsetenv_obj, mp_os_unsetenv);
STATIC mp_obj_t mp_uos_system(mp_obj_t cmd_in) {
STATIC mp_obj_t mp_os_system(mp_obj_t cmd_in) {
const char *cmd = mp_obj_str_get_str(cmd_in);
MP_THREAD_GIL_EXIT();
@@ -90,18 +90,18 @@ STATIC mp_obj_t mp_uos_system(mp_obj_t cmd_in) {
return MP_OBJ_NEW_SMALL_INT(r);
}
STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_uos_system_obj, mp_uos_system);
STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_os_system_obj, mp_os_system);
STATIC mp_obj_t mp_uos_urandom(mp_obj_t num) {
STATIC mp_obj_t mp_os_urandom(mp_obj_t num) {
mp_int_t n = mp_obj_get_int(num);
vstr_t vstr;
vstr_init_len(&vstr, n);
mp_hal_get_random(n, vstr.buf);
return mp_obj_new_bytes_from_vstr(&vstr);
}
STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_uos_urandom_obj, mp_uos_urandom);
STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_os_urandom_obj, mp_os_urandom);
STATIC mp_obj_t mp_uos_errno(size_t n_args, const mp_obj_t *args) {
STATIC mp_obj_t mp_os_errno(size_t n_args, const mp_obj_t *args) {
if (n_args == 0) {
return MP_OBJ_NEW_SMALL_INT(errno);
}
@@ -109,4 +109,4 @@ STATIC mp_obj_t mp_uos_errno(size_t n_args, const mp_obj_t *args) {
errno = mp_obj_get_int(args[0]);
return mp_const_none;
}
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_uos_errno_obj, 0, 1, mp_uos_errno);
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_os_errno_obj, 0, 1, mp_os_errno);

4
ports/unix/moduselect.c
View File

@@ -346,11 +346,11 @@ STATIC const mp_rom_map_elem_t mp_module_select_globals_table[] = {
STATIC MP_DEFINE_CONST_DICT(mp_module_select_globals, mp_module_select_globals_table);
const mp_obj_module_t mp_module_uselect = {
const mp_obj_module_t mp_module_select = {
.base = { &mp_type_module },
.globals = (mp_obj_dict_t *)&mp_module_select_globals,
};
MP_REGISTER_MODULE(MP_QSTR_select, mp_module_uselect);
MP_REGISTER_MODULE(MP_QSTR_select, mp_module_select);
#endif // MICROPY_PY_USELECT_POSIX

4
ports/unix/modutime.c
View File

@@ -61,7 +61,7 @@ static inline int msec_sleep_tv(struct timeval *tv) {
#error Unsupported clock() implementation
#endif
STATIC mp_obj_t mp_utime_time_get(void) {
STATIC mp_obj_t mp_time_time_get(void) {
#if MICROPY_PY_BUILTINS_FLOAT && MICROPY_FLOAT_IMPL == MICROPY_FLOAT_IMPL_DOUBLE
struct timeval tv;
gettimeofday(&tv, NULL);
@@ -85,7 +85,7 @@ STATIC mp_obj_t mod_time_clock(void) {
}
STATIC MP_DEFINE_CONST_FUN_OBJ_0(mod_time_clock_obj, mod_time_clock);
STATIC mp_obj_t mp_utime_sleep(mp_obj_t arg) {
STATIC mp_obj_t mp_time_sleep(mp_obj_t arg) {
#if MICROPY_PY_BUILTINS_FLOAT
struct timeval tv;
mp_float_t val = mp_obj_get_float(arg);

2
ports/unix/mpconfigport.h
View File

@@ -184,7 +184,7 @@ void mp_unix_mark_exec(void);
#ifdef MICROPY_PY_URANDOM_SEED_INIT_FUNC
#include <stddef.h>
void mp_hal_get_random(size_t n, void *buf);
static inline unsigned long mp_urandom_seed_init(void) {
static inline unsigned long mp_random_seed_init(void) {
unsigned long r;
mp_hal_get_random(sizeof(r), &r);
return r;

2
ports/unix/unix_mphal.c
View File

@@ -187,7 +187,7 @@ main_term:;
void mp_hal_stdout_tx_strn(const char *str, size_t len) {
ssize_t ret;
MP_HAL_RETRY_SYSCALL(ret, write(STDOUT_FILENO, str, len), {});
mp_uos_dupterm_tx_strn(str, len);
mp_os_dupterm_tx_strn(str, len);
}
// cooked is same as uncooked because the terminal does some postprocessing

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

@@ -58,7 +58,7 @@
#endif
// Seed random on import.
#define MICROPY_PY_URANDOM_SEED_INIT_FUNC (mp_urandom_seed_init())
#define MICROPY_PY_URANDOM_SEED_INIT_FUNC (mp_random_seed_init())
// Allow exception details in low-memory conditions.
#define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF (1)