mimxrt/modutime: Use extmod version of time module.

No API or functional change.

Signed-off-by: Damien George <damien@micropython.org>

3 files changed, 22 insertions, 75 deletions

diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index 4e4fd1752..d9ab4c859 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -202,7 +202,6 @@ SRC_C += \
 	mimxrt_sdram.c \
 	modmachine.c \
 	modmimxrt.c \
-	modutime.c \
 	mphalport.c \
 	mpnetworkport.c \
 	network_lan.c \
diff --git a/ports/mimxrt/modutime.c b/ports/mimxrt/modutime.c
index 8897d3878..5872e9d8d 100644
--- a/ports/mimxrt/modutime.c
+++ b/ports/mimxrt/modutime.c
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2019 Damien P. George
+ * Copyright (c) 2019-2023 Damien P. George
  * Copyright (c) 2020 Jim Mussared
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -25,54 +25,30 @@
  * THE SOFTWARE.
  */
 
-#include "py/runtime.h"
+#include "py/obj.h"
 #include "shared/timeutils/timeutils.h"
-#include "extmod/modutime.h"
 #include "fsl_snvs_lp.h"
 
-// localtime([secs])
-// Convert a time expressed in seconds since the Epoch into an 8-tuple which
-// contains: (year, month, mday, hour, minute, second, weekday, yearday)
-// If secs is not provided or None, then the current time from the RTC is used.
-STATIC mp_obj_t time_localtime(size_t n_args, const mp_obj_t *args) {
-    if (n_args == 0 || args[0] == mp_const_none) {
-        // Get current date and time.
-        snvs_lp_srtc_datetime_t t;
-        SNVS_LP_SRTC_GetDatetime(SNVS, &t);
-        mp_obj_t tuple[8] = {
-            mp_obj_new_int(t.year),
-            mp_obj_new_int(t.month),
-            mp_obj_new_int(t.day),
-            mp_obj_new_int(t.hour),
-            mp_obj_new_int(t.minute),
-            mp_obj_new_int(t.second),
-            mp_obj_new_int(timeutils_calc_weekday(t.year, t.month, t.day)),
-            mp_obj_new_int(timeutils_year_day(t.year, t.month, t.day)),
-        };
-        return mp_obj_new_tuple(8, tuple);
-    } else {
-        // Convert given seconds to tuple.
-        mp_int_t seconds = mp_obj_get_int(args[0]);
-        timeutils_struct_time_t tm;
-        timeutils_seconds_since_epoch_to_struct_time(seconds, &tm);
-        mp_obj_t tuple[8] = {
-            tuple[0] = mp_obj_new_int(tm.tm_year),
-            tuple[1] = mp_obj_new_int(tm.tm_mon),
-            tuple[2] = mp_obj_new_int(tm.tm_mday),
-            tuple[3] = mp_obj_new_int(tm.tm_hour),
-            tuple[4] = mp_obj_new_int(tm.tm_min),
-            tuple[5] = mp_obj_new_int(tm.tm_sec),
-            tuple[6] = mp_obj_new_int(tm.tm_wday),
-            tuple[7] = mp_obj_new_int(tm.tm_yday),
-        };
-        return mp_obj_new_tuple(8, tuple);
-    }
+// Return the localtime as an 8-tuple.
+STATIC mp_obj_t mp_utime_localtime_get(void) {
+    // Get current date and time.
+    snvs_lp_srtc_datetime_t t;
+    SNVS_LP_SRTC_GetDatetime(SNVS, &t);
+    mp_obj_t tuple[8] = {
+        mp_obj_new_int(t.year),
+        mp_obj_new_int(t.month),
+        mp_obj_new_int(t.day),
+        mp_obj_new_int(t.hour),
+        mp_obj_new_int(t.minute),
+        mp_obj_new_int(t.second),
+        mp_obj_new_int(timeutils_calc_weekday(t.year, t.month, t.day)),
+        mp_obj_new_int(timeutils_year_day(t.year, t.month, t.day)),
+    };
+    return mp_obj_new_tuple(8, tuple);
 }
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(time_localtime_obj, 0, 1, time_localtime);
 
-// time()
 // Return the number of seconds since the Epoch.
-STATIC mp_obj_t time_time(void) {
+STATIC mp_obj_t mp_utime_time_get(void) {
     snvs_lp_srtc_datetime_t t;
     SNVS_LP_SRTC_GetDatetime(SNVS, &t);
     // EPOCH is 1970 for this port, which leads to the following trouble:
@@ -86,33 +62,3 @@ STATIC mp_obj_t time_time(void) {
         & (t.year < 2000 ? 0xffffffff : 0xffffffffffff)
         );
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(time_time_obj, time_time);
-
-STATIC const mp_rom_map_elem_t time_module_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_utime) },
-
-    { MP_ROM_QSTR(MP_QSTR_gmtime), MP_ROM_PTR(&time_localtime_obj) },
-    { MP_ROM_QSTR(MP_QSTR_localtime), MP_ROM_PTR(&time_localtime_obj) },
-    { MP_ROM_QSTR(MP_QSTR_mktime), MP_ROM_PTR(&mp_utime_mktime_obj) },
-
-    { MP_ROM_QSTR(MP_QSTR_time), MP_ROM_PTR(&time_time_obj) },
-    { MP_ROM_QSTR(MP_QSTR_time_ns), MP_ROM_PTR(&mp_utime_time_ns_obj) },
-
-    { MP_ROM_QSTR(MP_QSTR_sleep), MP_ROM_PTR(&mp_utime_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_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) },
-};
-
-STATIC MP_DEFINE_CONST_DICT(time_module_globals, time_module_globals_table);
-
-const mp_obj_module_t mp_module_utime = {
-    .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t *)&time_module_globals,
-};
-
-MP_REGISTER_MODULE(MP_QSTR_utime, mp_module_utime);
diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index 13b456932..b1fdf14f2 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -70,7 +70,9 @@ 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_MP_HAL             (1)
+#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_OS_DUPTERM               (3)
 #define MICROPY_PY_UOS_DUPTERM_NOTIFY       (1)