nrf: Remove the old time hal and replace with nRFx

8 files changed, 13 insertions, 158 deletions

diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile
index 1a827ce13..ca2315c1d 100644
--- a/ports/nrf/Makefile
+++ b/ports/nrf/Makefile
@@ -90,7 +90,6 @@ LIBS += -L $(dir $(LIBC_FILE_NAME)) -lc
 LIBS += -L $(dir $(LIBGCC_FILE_NAME)) -lgcc
 
 SRC_HAL = $(addprefix hal/,\
-	hal_time.c \
 	hal_rng.c \
 	)
 
diff --git a/ports/nrf/common-hal/time/__init__.c b/ports/nrf/common-hal/time/__init__.c
index 5e5e9fdf1..e3cb481ef 100644
--- a/ports/nrf/common-hal/time/__init__.c
+++ b/ports/nrf/common-hal/time/__init__.c
@@ -26,15 +26,12 @@
 
 #include "py/mphal.h"
 
-#include "shared-bindings/time/__init__.h"
 #include "tick.h"
 
-#include "nrfx_glue.h"
-
-inline uint64_t common_hal_time_monotonic(void) {
+uint64_t common_hal_time_monotonic(void) {
     return ticks_ms;
 }
 
 void common_hal_time_delay_ms(uint32_t delay) {
-    NRFX_DELAY_US(delay);
+    mp_hal_delay_ms(delay);
 }
diff --git a/ports/nrf/drivers/bluetooth/ble_uart.c b/ports/nrf/drivers/bluetooth/ble_uart.c
index 069d71589..5f303a0af 100644
--- a/ports/nrf/drivers/bluetooth/ble_uart.c
+++ b/ports/nrf/drivers/bluetooth/ble_uart.c
@@ -29,7 +29,6 @@
 #include <string.h>
 #include "ble_uart.h"
 #include "ringbuffer.h"
-#include "hal/hal_time.h"
 #include "lib/utils/interrupt_char.h"
 
 #if MICROPY_PY_BLE_NUS
diff --git a/ports/nrf/hal/hal_time.c b/ports/nrf/hal/hal_time.c
deleted file mode 100644
index 706bd3a17..000000000
--- a/ports/nrf/hal/hal_time.c
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2016 Glenn Ruben Bakke
- *
- * 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 "mphalport.h"
-#include "hal_time.h"
-
-#ifdef HAL_TIME_MODULE_ENABLED
-
-void mp_hal_delay_us(mp_uint_t us)
-{
-    register uint32_t delay __ASM ("r0") = us;
-    __ASM volatile (
-#ifdef NRF51
-            ".syntax unified\n"
-#endif
-        "1:\n"
-        " SUBS %0, %0, #1\n"
-        " NOP\n"
-        " NOP\n"
-        " NOP\n"
-        " NOP\n"
-        " NOP\n"
-        " NOP\n"
-        " NOP\n"
-        " NOP\n"
-        " NOP\n"
-        " NOP\n"
-        " NOP\n"
-        " NOP\n"
-#ifdef NRF52
-        " NOP\n"
-        " NOP\n"
-        " NOP\n"
-        " NOP\n"
-        " NOP\n"
-        " NOP\n"
-        " NOP\n"
-        " NOP\n"
-        " NOP\n"
-        " NOP\n"
-        " NOP\n"
-        " NOP\n"
-        " NOP\n"
-        " NOP\n"
-        " NOP\n"
-        " NOP\n"
-        " NOP\n"
-        " NOP\n"
-        " NOP\n"
-        " NOP\n"
-        " NOP\n"
-        " NOP\n"
-        " NOP\n"
-        " NOP\n"
-        " NOP\n"
-        " NOP\n"
-        " NOP\n"
-        " NOP\n"
-        " NOP\n"
-        " NOP\n"
-        " NOP\n"
-        " NOP\n"
-        " NOP\n"
-        " NOP\n"
-        " NOP\n"
-        " NOP\n"
-        " NOP\n"
-        " NOP\n"
-        " NOP\n"
-        " NOP\n"
-        " NOP\n"
-        " NOP\n"
-        " NOP\n"
-        " NOP\n"
-        " NOP\n"
-        " NOP\n"
-#endif
-        " BNE 1b\n"
-#ifdef NRF51
-        ".syntax divided\n"
-#endif
-        : "+r" (delay));
-}
-
-void mp_hal_delay_ms(mp_uint_t ms)
-{
-    for (mp_uint_t i = 0; i < ms; i++)
-    {
-        mp_hal_delay_us(999);
-    }
-}
-
-#endif // HAL_TIME_MODULE_ENABLED
diff --git a/ports/nrf/hal/hal_time.h b/ports/nrf/hal/hal_time.h
deleted file mode 100644
index 20393f918..000000000
--- a/ports/nrf/hal/hal_time.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2016 Glenn Ruben Bakke
- *
- * 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.
- */
-
-#ifndef HAL_TIME_H__
-#define HAL_TIME_H__
-
-void mp_hal_delay_ms(mp_uint_t ms);
-
-void mp_hal_delay_us(mp_uint_t us);
-
-#endif // HAL_TIME_H__
diff --git a/ports/nrf/modules/ubluepy/ubluepy_scanner.c b/ports/nrf/modules/ubluepy/ubluepy_scanner.c
index b9c442ac5..c92b7fd87 100644
--- a/ports/nrf/modules/ubluepy/ubluepy_scanner.c
+++ b/ports/nrf/modules/ubluepy/ubluepy_scanner.c
@@ -29,11 +29,11 @@
 #include "py/runtime.h"
 #include "py/objstr.h"
 #include "py/objlist.h"
+#include "py/mphal.h"
 
 #if MICROPY_PY_UBLUEPY_CENTRAL
 
 #include "ble_drv.h"
-#include "hal_time.h"
 
 STATIC void adv_event_handler(mp_obj_t self_in, uint16_t event_id, ble_drv_adv_data_t * data) {
     ubluepy_scanner_obj_t *self = MP_OBJ_TO_PTR(self_in);
diff --git a/ports/nrf/mphalport.c b/ports/nrf/mphalport.c
index 99c0c7443..9aeea7fd3 100644
--- a/ports/nrf/mphalport.c
+++ b/ports/nrf/mphalport.c
@@ -72,3 +72,11 @@ void mp_hal_stdout_tx_strn_cooked(const char *str, mp_uint_t len) {
 void mp_hal_stdout_tx_str(const char *str) {
     mp_hal_stdout_tx_strn(str, strlen(str));
 }
+
+void mp_hal_delay_ms(mp_uint_t ms) {
+    NRFX_DELAY_US(ms * 1000);
+}
+
+void mp_hal_delay_us(mp_uint_t us) {
+    NRFX_DELAY_US(us);
+}
diff --git a/ports/nrf/mphalport.h b/ports/nrf/mphalport.h
index 1b3d17ccc..26bc523b8 100644
--- a/ports/nrf/mphalport.h
+++ b/ports/nrf/mphalport.h
@@ -48,6 +48,8 @@ static inline mp_uint_t mp_hal_ticks_ms(void) {
 int mp_hal_stdin_rx_chr(void);
 void mp_hal_stdout_tx_str(const char *str);
 bool mp_hal_stdin_any(void);
+void mp_hal_delay_ms(mp_uint_t ms);
+void mp_hal_delay_us(mp_uint_t us);
 
 #endif