nrf: Remove the old time hal and replace with nRFx

arturo182 · arturo182 · commit 116346263585 · 2018-07-10T14:59:10.000+02:00
diff --git 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
@@ -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
@@ -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
diff --git a/ports/nrf/hal/hal_time.h b/ports/nrf/hal/hal_time.h
diff --git 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
@@ -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
@@ -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
 

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,6 @@ LIBS += -L $(dir $(LIBC_FILE_NAME)) -lc`
`90`	`90`	`LIBS += -L $(dir $(LIBGCC_FILE_NAME)) -lgcc`
`91`	`91`
`92`	`92`	`SRC_HAL = $(addprefix hal/,\`
`93`		`- hal_time.c \`
`94`	`93`	`hal_rng.c \`
`95`	`94`	`)`
`96`	`95`
Original file line number	Diff line number	Diff line change
`@@ -26,15 +26,12 @@`
`26`	`26`
`27`	`27`	`#include "py/mphal.h"`
`28`	`28`
`29`		`-#include "shared-bindings/time/__init__.h"`
`30`	`29`	`#include "tick.h"`
`31`	`30`
`32`		`-#include "nrfx_glue.h"`
`33`		`-`
`34`		`-inline uint64_t common_hal_time_monotonic(void) {`
	`31`	`+uint64_t common_hal_time_monotonic(void) {`
`35`	`32`	`return ticks_ms;`
`36`	`33`	`}`
`37`	`34`
`38`	`35`	`void common_hal_time_delay_ms(uint32_t delay) {`
`39`		`- NRFX_DELAY_US(delay);`
	`36`	`+ mp_hal_delay_ms(delay);`
`40`	`37`	`}`