diff options
| author | Paul Sokolovsky <pfalcon@users.sourceforge.net> | 2016-10-29 04:58:06 +0300 |
|---|---|---|
| committer | Paul Sokolovsky <pfalcon@users.sourceforge.net> | 2016-10-29 04:58:06 +0300 |
| commit | e381efed4a49c206fe413758749ee30b3b46cebe (patch) | |
| tree | 6a473b8f77b3479eeecc874dece663e01ce4996d | |
| parent | aee64835367e75c624b321cb1ab3e811d3104ccf (diff) | |
| download | micropython-e381efed4a49c206fe413758749ee30b3b46cebe.tar.gz micropython-e381efed4a49c206fe413758749ee30b3b46cebe.zip | |
unix/modtime: Use ticks_diff() implementation from extmod/utime_mphal.c.
| -rw-r--r-- | unix/modtime.c | 10 | ||||
| -rw-r--r-- | unix/mpconfigport.h | 1 |
2 files changed, 3 insertions, 8 deletions
diff --git a/unix/modtime.c b/unix/modtime.c index 8d6d9f4d7e..2b6372d3a0 100644 --- a/unix/modtime.c +++ b/unix/modtime.c @@ -37,6 +37,7 @@ #include "py/runtime.h" #include "py/smallint.h" #include "py/mphal.h" +#include "extmod/utime_mphal.h" #ifdef _WIN32 static inline int msec_sleep_tv(struct timeval *tv) { @@ -92,13 +93,6 @@ STATIC mp_obj_t mod_time_ticks_ms(void) { } STATIC MP_DEFINE_CONST_FUN_OBJ_0(mod_time_ticks_ms_obj, mod_time_ticks_ms); -STATIC mp_obj_t mod_time_ticks_diff(mp_obj_t oldval, mp_obj_t newval) { - mp_uint_t old = MP_OBJ_SMALL_INT_VALUE(oldval); - mp_uint_t new = MP_OBJ_SMALL_INT_VALUE(newval); - return MP_OBJ_NEW_SMALL_INT((new - old) & MP_SMALL_INT_POSITIVE_MASK); -} -STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_time_ticks_diff_obj, mod_time_ticks_diff); - // Note: this is deprecated since CPy3.3, but pystone still uses it. STATIC mp_obj_t mod_time_clock(void) { #if MICROPY_PY_BUILTINS_FLOAT @@ -190,7 +184,7 @@ STATIC const mp_rom_map_elem_t mp_module_time_globals_table[] = { { MP_ROM_QSTR(MP_QSTR_time), MP_ROM_PTR(&mod_time_time_obj) }, { MP_ROM_QSTR(MP_QSTR_ticks_ms), MP_ROM_PTR(&mod_time_ticks_ms_obj) }, { MP_ROM_QSTR(MP_QSTR_ticks_us), MP_ROM_PTR(&mod_time_ticks_us_obj) }, - { MP_ROM_QSTR(MP_QSTR_ticks_diff), MP_ROM_PTR(&mod_time_ticks_diff_obj) }, + { MP_ROM_QSTR(MP_QSTR_ticks_diff), MP_ROM_PTR(&mp_utime_ticks_diff_obj) }, { MP_ROM_QSTR(MP_QSTR_strftime), MP_ROM_PTR(&mod_time_strftime_obj) }, }; diff --git a/unix/mpconfigport.h b/unix/mpconfigport.h index 56cfaa2ac1..f4f8d2d208 100644 --- a/unix/mpconfigport.h +++ b/unix/mpconfigport.h @@ -106,6 +106,7 @@ #define MICROPY_PY_OS_STATVFS (1) #define MICROPY_PY_UTIME (1) +#define MICROPY_PY_UTIME_MP_HAL (1) #define MICROPY_PY_UERRNO (1) #define MICROPY_PY_UCTYPES (1) #define MICROPY_PY_UZLIB (1) |