cc3200/mods/modutime: Use extmod version of time module.

API change: time.time_ns() is added, but it just returns 0.

No API or functional change to existing time functions.

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

4 files changed, 25 insertions, 111 deletions

diff --git a/ports/cc3200/application.mk b/ports/cc3200/application.mk
index 97e113b04..78c2b8044 100644
--- a/ports/cc3200/application.mk
+++ b/ports/cc3200/application.mk
@@ -81,7 +81,6 @@ APP_MODS_SRC_C = $(addprefix mods/,\
 	moduos.c \
 	modusocket.c \
 	modussl.c \
-	modutime.c \
 	modwipy.c \
 	modwlan.c \
 	pybadc.c \
diff --git a/ports/cc3200/hal/cc3200_hal.h b/ports/cc3200/hal/cc3200_hal.h
index 3d0d632d5..9e57d39e2 100644
--- a/ports/cc3200/hal/cc3200_hal.h
+++ b/ports/cc3200/hal/cc3200_hal.h
@@ -67,3 +67,4 @@ extern void mp_hal_set_interrupt_char (int c);
 #define mp_hal_stdio_poll(poll_flags) (0) // not implemented
 #define mp_hal_delay_us(usec) UtilsDelay(UTILS_DELAY_US_TO_COUNT(usec))
 #define mp_hal_ticks_cpu() (SysTickPeriodGet() - SysTickValueGet())
+#define mp_hal_time_ns() (0) // not implemented
diff --git a/ports/cc3200/mods/modutime.c b/ports/cc3200/mods/modutime.c
index 4d9f3a879..52eb1a602 100644
--- a/ports/cc3200/mods/modutime.c
+++ b/ports/cc3200/mods/modutime.c
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2013, 2014 Damien P. George
+ * Copyright (c) 2013-2023 Damien P. George
  * Copyright (c) 2015 Daniel Campora
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -25,119 +25,30 @@
  * THE SOFTWARE.
  */
 
-#include <stdio.h>
-#include <string.h>
-
-#include "py/mpconfig.h"
-#include "py/runtime.h"
 #include "py/obj.h"
-#include "py/smallint.h"
-#include "py/mphal.h"
 #include "shared/timeutils/timeutils.h"
-#include "extmod/modutime.h"
-#include "inc/hw_types.h"
-#include "inc/hw_ints.h"
-#include "inc/hw_memmap.h"
-#include "rom_map.h"
-#include "prcm.h"
-#include "systick.h"
 #include "pybrtc.h"
-#include "utils.h"
-
-/// \module time - time related functions
-///
-/// The `time` module provides functions for getting the current time and date,
-/// and for sleeping.
-
-/******************************************************************************/
-// MicroPython bindings
 
-/// \function localtime([secs])
-/// Convert a time expressed in seconds since Jan 1, 2000 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.
-/// year includes the century (for example 2015)
-/// month   is 1-12
-/// mday    is 1-31
-/// hour    is 0-23
-/// minute  is 0-59
-/// second  is 0-59
-/// weekday is 0-6 for Mon-Sun.
-/// yearday is 1-366
-STATIC mp_obj_t time_localtime(size_t n_args, const mp_obj_t *args) {
-    if (n_args == 0 || args[0] == mp_const_none) {
-        timeutils_struct_time_t tm;
-
-        // get the seconds from the RTC
-        timeutils_seconds_since_2000_to_struct_time(pyb_rtc_get_seconds(), &tm);
-        mp_obj_t tuple[8] = {
-                mp_obj_new_int(tm.tm_year),
-                mp_obj_new_int(tm.tm_mon),
-                mp_obj_new_int(tm.tm_mday),
-                mp_obj_new_int(tm.tm_hour),
-                mp_obj_new_int(tm.tm_min),
-                mp_obj_new_int(tm.tm_sec),
-                mp_obj_new_int(tm.tm_wday),
-                mp_obj_new_int(tm.tm_yday)
-        };
-        return mp_obj_new_tuple(8, tuple);
-    } else {
-        mp_int_t seconds = mp_obj_get_int(args[0]);
-        timeutils_struct_time_t tm;
-        timeutils_seconds_since_2000_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) {
+    timeutils_struct_time_t tm;
+
+    // get the seconds from the RTC
+    timeutils_seconds_since_2000_to_struct_time(pyb_rtc_get_seconds(), &tm);
+    mp_obj_t tuple[8] = {
+            mp_obj_new_int(tm.tm_year),
+            mp_obj_new_int(tm.tm_mon),
+            mp_obj_new_int(tm.tm_mday),
+            mp_obj_new_int(tm.tm_hour),
+            mp_obj_new_int(tm.tm_min),
+            mp_obj_new_int(tm.tm_sec),
+            mp_obj_new_int(tm.tm_wday),
+            mp_obj_new_int(tm.tm_yday)
+    };
+    return mp_obj_new_tuple(8, tuple);
 }
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(time_localtime_obj, 0, 1, time_localtime);
 
-STATIC mp_obj_t time_time(void) {
+// Returns the number of seconds, as an integer, since the Epoch.
+STATIC mp_obj_t mp_utime_time_get(void) {
     return mp_obj_new_int(pyb_rtc_get_seconds());
 }
-MP_DEFINE_CONST_FUN_OBJ_0(time_time_obj, time_time);
-
-STATIC mp_obj_t time_sleep(mp_obj_t seconds_o) {
-    int32_t sleep_s = mp_obj_get_int(seconds_o);
-    if (sleep_s > 0) {
-        mp_hal_delay_ms(sleep_s * 1000);
-    }
-    return mp_const_none;
-}
-MP_DEFINE_CONST_FUN_OBJ_1(time_sleep_obj, time_sleep);
-
-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_sleep),           MP_ROM_PTR(&time_sleep_obj) },
-
-    // MicroPython additions
-    { 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/cc3200/mpconfigport.h b/ports/cc3200/mpconfigport.h
index 93fc291c1..cb71a28f3 100644
--- a/ports/cc3200/mpconfigport.h
+++ b/ports/cc3200/mpconfigport.h
@@ -117,7 +117,10 @@
 #define MICROPY_PY_UHEAPQ                           (0)
 #define MICROPY_PY_UHASHLIB                         (0)
 #define MICROPY_PY_USELECT                          (1)
-#define MICROPY_PY_UTIME_MP_HAL                     (1)
+#define MICROPY_PY_UTIME                            (1)
+#define MICROPY_PY_UTIME_GMTIME_LOCALTIME_MKTIME    (1)
+#define MICROPY_PY_UTIME_TIME_TIME_NS               (1)
+#define MICROPY_PY_UTIME_INCLUDEFILE                "ports/cc3200/mods/modutime.c"
 
 #define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF      (1)
 #define MICROPY_EMERGENCY_EXCEPTION_BUF_SIZE        (0)