diff options
| -rw-r--r-- | ports/unix/Makefile | 1 | ||||
| -rw-r--r-- | ports/unix/modutime.c (renamed from ports/unix/modtime.c) | 46 | ||||
| -rw-r--r-- | ports/unix/variants/mpconfigvariant_common.h | 4 | ||||
| -rw-r--r-- | ports/windows/Makefile | 1 | ||||
| -rw-r--r-- | ports/windows/micropython.vcxproj | 1 | ||||
| -rw-r--r-- | ports/windows/mpconfigport.h | 4 |
6 files changed, 14 insertions, 43 deletions
diff --git a/ports/unix/Makefile b/ports/unix/Makefile index 403405dcc..d2af8b087 100644 --- a/ports/unix/Makefile +++ b/ports/unix/Makefile @@ -201,7 +201,6 @@ SRC_C += \ mpthreadport.c \ input.c \ modmachine.c \ - modtime.c \ moduselect.c \ alloc.c \ fatfs_port.c \ diff --git a/ports/unix/modtime.c b/ports/unix/modutime.c index 83cfb2662..dade99295 100644 --- a/ports/unix/modtime.c +++ b/ports/unix/modutime.c @@ -4,7 +4,7 @@ * The MIT License (MIT) * * Copyright (c) 2014-2017 Paul Sokolovsky - * Copyright (c) 2014-2017 Damien P. George + * Copyright (c) 2014-2023 Damien P. George * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -25,9 +25,6 @@ * THE SOFTWARE. */ -#include "py/mpconfig.h" -#if MICROPY_PY_UTIME - #include <unistd.h> #include <errno.h> #include <string.h> @@ -35,10 +32,8 @@ #include <sys/time.h> #include <math.h> -#include "py/runtime.h" -#include "py/smallint.h" #include "py/mphal.h" -#include "extmod/modutime.h" +#include "py/runtime.h" #ifdef _WIN32 static inline int msec_sleep_tv(struct timeval *tv) { @@ -66,7 +61,7 @@ static inline int msec_sleep_tv(struct timeval *tv) { #error Unsupported clock() implementation #endif -STATIC mp_obj_t mod_time_time(void) { +STATIC mp_obj_t mp_utime_time_get(void) { #if MICROPY_PY_BUILTINS_FLOAT && MICROPY_FLOAT_IMPL == MICROPY_FLOAT_IMPL_DOUBLE struct timeval tv; gettimeofday(&tv, NULL); @@ -76,7 +71,6 @@ STATIC mp_obj_t mod_time_time(void) { return mp_obj_new_int((mp_int_t)time(NULL)); #endif } -STATIC MP_DEFINE_CONST_FUN_OBJ_0(mod_time_time_obj, mod_time_time); // Note: this is deprecated since CPy3.3, but pystone still uses it. STATIC mp_obj_t mod_time_clock(void) { @@ -91,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 mod_time_sleep(mp_obj_t arg) { +STATIC mp_obj_t mp_utime_sleep(mp_obj_t arg) { #if MICROPY_PY_BUILTINS_FLOAT struct timeval tv; mp_float_t val = mp_obj_get_float(arg); @@ -130,7 +124,6 @@ STATIC mp_obj_t mod_time_sleep(mp_obj_t arg) { #endif return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_time_sleep_obj, mod_time_sleep); STATIC mp_obj_t mod_time_gm_local_time(size_t n_args, const mp_obj_t *args, struct tm *(*time_func)(const time_t *timep)) { time_t t; @@ -207,31 +200,8 @@ STATIC mp_obj_t mod_time_mktime(mp_obj_t tuple) { } MP_DEFINE_CONST_FUN_OBJ_1(mod_time_mktime_obj, mod_time_mktime); -STATIC const mp_rom_map_elem_t mp_module_time_globals_table[] = { - { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_utime) }, - { MP_ROM_QSTR(MP_QSTR_clock), MP_ROM_PTR(&mod_time_clock_obj) }, - { MP_ROM_QSTR(MP_QSTR_sleep), MP_ROM_PTR(&mod_time_sleep_obj) }, - { MP_ROM_QSTR(MP_QSTR_sleep_ms), MP_ROM_PTR(&mp_utime_sleep_ms_obj) }, - { MP_ROM_QSTR(MP_QSTR_sleep_us), MP_ROM_PTR(&mp_utime_sleep_us_obj) }, - { MP_ROM_QSTR(MP_QSTR_time), MP_ROM_PTR(&mod_time_time_obj) }, - { MP_ROM_QSTR(MP_QSTR_ticks_ms), MP_ROM_PTR(&mp_utime_ticks_ms_obj) }, - { MP_ROM_QSTR(MP_QSTR_ticks_us), MP_ROM_PTR(&mp_utime_ticks_us_obj) }, - { MP_ROM_QSTR(MP_QSTR_ticks_cpu), MP_ROM_PTR(&mp_utime_ticks_cpu_obj) }, - { MP_ROM_QSTR(MP_QSTR_ticks_add), MP_ROM_PTR(&mp_utime_ticks_add_obj) }, - { MP_ROM_QSTR(MP_QSTR_ticks_diff), MP_ROM_PTR(&mp_utime_ticks_diff_obj) }, - { MP_ROM_QSTR(MP_QSTR_time_ns), MP_ROM_PTR(&mp_utime_time_ns_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) }, +#define MICROPY_PY_UTIME_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) }, \ { MP_ROM_QSTR(MP_QSTR_mktime), MP_ROM_PTR(&mod_time_mktime_obj) }, -}; - -STATIC MP_DEFINE_CONST_DICT(mp_module_time_globals, mp_module_time_globals_table); - -const mp_obj_module_t mp_module_time = { - .base = { &mp_type_module }, - .globals = (mp_obj_dict_t *)&mp_module_time_globals, -}; - -MP_REGISTER_MODULE(MP_QSTR_utime, mp_module_time); - -#endif // MICROPY_PY_UTIME diff --git a/ports/unix/variants/mpconfigvariant_common.h b/ports/unix/variants/mpconfigvariant_common.h index 1128f21d2..072c4ca49 100644 --- a/ports/unix/variants/mpconfigvariant_common.h +++ b/ports/unix/variants/mpconfigvariant_common.h @@ -96,7 +96,9 @@ // Enable the unix-specific "time" module. #define MICROPY_PY_UTIME (1) -#define MICROPY_PY_UTIME_MP_HAL (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" // Enable the utimeq module used by the previous (v2) version of uasyncio. #define MICROPY_PY_UTIMEQ (1) diff --git a/ports/windows/Makefile b/ports/windows/Makefile index b366e03bf..489ba15c6 100644 --- a/ports/windows/Makefile +++ b/ports/windows/Makefile @@ -57,7 +57,6 @@ SRC_C = \ ports/unix/main.c \ ports/unix/input.c \ ports/unix/modmachine.c \ - ports/unix/modtime.c \ ports/unix/gccollect.c \ windows_mphal.c \ realpath.c \ diff --git a/ports/windows/micropython.vcxproj b/ports/windows/micropython.vcxproj index 0294b9fa7..de04975cd 100644 --- a/ports/windows/micropython.vcxproj +++ b/ports/windows/micropython.vcxproj @@ -94,7 +94,6 @@ <ClCompile Include="$(PyBaseDir)ports\unix\gccollect.c"/> <ClCompile Include="$(PyBaseDir)ports\unix\input.c"/> <ClCompile Include="$(PyBaseDir)ports\unix\main.c"/> - <ClCompile Include="$(PyBaseDir)ports\unix\modtime.c"/> <ClCompile Include="$(PyBaseDir)ports\unix\modmachine.c" /> <ClCompile Include="$(PyVariantDir)*.c" /> </ItemGroup> diff --git a/ports/windows/mpconfigport.h b/ports/windows/mpconfigport.h index 8967242ae..fd3a76408 100644 --- a/ports/windows/mpconfigport.h +++ b/ports/windows/mpconfigport.h @@ -140,7 +140,9 @@ #define MICROPY_PY_UOS_SYSTEM (1) #define MICROPY_PY_UOS_URANDOM (1) #define MICROPY_PY_UTIME (1) -#define MICROPY_PY_UTIME_MP_HAL (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_UCTYPES (1) #define MICROPY_PY_UZLIB (1) |