diff --git a/ports/webassembly/Makefile b/ports/webassembly/Makefile index db42d00966..450ef87680 100644 --- a/ports/webassembly/Makefile +++ b/ports/webassembly/Makefile @@ -28,7 +28,6 @@ SRC_SHARED = $(addprefix shared/,\ SRC_C = \ main.c \ mphalport.c \ - modutime.c \ SRC_QSTR += $(SRC_C) $(SRC_SHARED) diff --git a/ports/webassembly/modutime.c b/ports/webassembly/modutime.c deleted file mode 100644 index 9042077561..0000000000 --- a/ports/webassembly/modutime.c +++ /dev/null @@ -1,58 +0,0 @@ -/* - * This file is part of the MicroPython project, http://micropython.org/ - * - * The MIT License (MIT) - * - * Copyright (c) 2013, 2014 Damien P. George and 2017, 2018 Rami Ali - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -#include -#include - -#include "mphalport.h" -#include "py/nlr.h" -#include "py/smallint.h" -#include "py/obj.h" -#include "py/runtime.h" -#include "shared/timeutils/timeutils.h" -#include "extmod/modutime.h" - -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_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/webassembly/mpconfigport.h b/ports/webassembly/mpconfigport.h index 46335607e5..e0d1af0cce 100644 --- a/ports/webassembly/mpconfigport.h +++ b/ports/webassembly/mpconfigport.h @@ -53,7 +53,6 @@ #define MICROPY_VFS (1) #endif #define MICROPY_VFS_POSIX (MICROPY_VFS) -#define MICROPY_PY_UTIME_MP_HAL (1) #define MICROPY_PY_SYS_PLATFORM "webassembly" #define MICROPY_PY_SYS_STDFILES (0)