diff options
| author | Damien George <damien.p.george@gmail.com> | 2016-10-18 14:30:00 +1100 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2016-10-18 14:34:08 +1100 |
| commit | cd9b14bb11c35e013e47db46bcc73734f0d6cd55 (patch) | |
| tree | 265cf0a142d3b2a2cbd7c7d2a55d64fd3f0db57c /stmhal/modutime.c | |
| parent | 5c93d0b91655dcd32e633d720b5b790b10be989c (diff) | |
| download | micropython-cd9b14bb11c35e013e47db46bcc73734f0d6cd55.tar.gz micropython-cd9b14bb11c35e013e47db46bcc73734f0d6cd55.zip | |
stmhal/modutime: Refactor to use extmod's version of ticks_cpu.
Diffstat (limited to 'stmhal/modutime.c')
| -rw-r--r-- | stmhal/modutime.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/stmhal/modutime.c b/stmhal/modutime.c index 63597edde8..fae360bb02 100644 --- a/stmhal/modutime.c +++ b/stmhal/modutime.c @@ -130,18 +130,6 @@ STATIC mp_obj_t time_time(void) { } MP_DEFINE_CONST_FUN_OBJ_0(time_time_obj, time_time); -STATIC mp_obj_t time_ticks_cpu(void) { - static bool enabled = false; - if (!enabled) { - CoreDebug->DEMCR |= CoreDebug_DEMCR_TRCENA_Msk; - DWT->CYCCNT = 0; - DWT->CTRL |= DWT_CTRL_CYCCNTENA_Msk; - enabled = true; - } - return MP_OBJ_NEW_SMALL_INT(DWT->CYCCNT & MP_SMALL_INT_POSITIVE_MASK); -} -STATIC MP_DEFINE_CONST_FUN_OBJ_0(time_ticks_cpu_obj, time_ticks_cpu); - STATIC const mp_map_elem_t time_module_globals_table[] = { { MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_utime) }, @@ -153,7 +141,7 @@ STATIC const mp_map_elem_t time_module_globals_table[] = { { MP_OBJ_NEW_QSTR(MP_QSTR_sleep_us), (mp_obj_t)&mp_utime_sleep_us_obj }, { MP_OBJ_NEW_QSTR(MP_QSTR_ticks_ms), (mp_obj_t)&mp_utime_ticks_ms_obj }, { MP_OBJ_NEW_QSTR(MP_QSTR_ticks_us), (mp_obj_t)&mp_utime_ticks_us_obj }, - { MP_OBJ_NEW_QSTR(MP_QSTR_ticks_cpu), (mp_obj_t)&time_ticks_cpu_obj }, + { MP_OBJ_NEW_QSTR(MP_QSTR_ticks_cpu), (mp_obj_t)&mp_utime_ticks_cpu_obj }, { MP_OBJ_NEW_QSTR(MP_QSTR_ticks_diff), (mp_obj_t)&mp_utime_ticks_diff_obj }, }; |