renesas-ra/softtimer: Switch to use softtimer code from shared/runtime.

IhorNehrutsa · Jul 19, 2022 · 678cb5a · 678cb5a
1 parent c781899
commit 678cb5a
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 219 deletions.
diff --git a/ports/renesas-ra/Makefile b/ports/renesas-ra/Makefile
@@ -179,6 +179,7 @@ SHARED_SRC_C += $(addprefix shared/,\
 	runtime/interrupt_char.c \
 	runtime/mpirq.c \
 	runtime/pyexec.c \
+	runtime/softtimer.c \
 	runtime/stdout_helpers.c \
 	runtime/sys_stdio_mphal.c \
 	timeutils/timeutils.c \
@@ -297,7 +298,6 @@ SRC_C += \
 	irq.c \
 	pendsv.c \
 	systick.c  \
-	softtimer.c  \
 	powerctrl.c \
 	powerctrlboot.c \
 	pybthread.c \

diff --git a/ports/renesas-ra/gccollect.c b/ports/renesas-ra/gccollect.c
@@ -31,8 +31,8 @@
 #include "py/gc.h"
 #include "py/mpthread.h"
 #include "shared/runtime/gchelper.h"
+#include "shared/runtime/softtimer.h"
 #include "gccollect.h"
-#include "softtimer.h"
 #include "systick.h"
 
 void gc_collect(void) {

diff --git a/ports/renesas-ra/machine_timer.c b/ports/renesas-ra/machine_timer.c
@@ -26,7 +26,7 @@
 
 #include "py/runtime.h"
 #include "py/mphal.h"
-#include "softtimer.h"
+#include "shared/runtime/softtimer.h"
 
 typedef soft_timer_entry_t machine_timer_obj_t;
 

diff --git a/ports/renesas-ra/main.c b/ports/renesas-ra/main.c
@@ -35,6 +35,7 @@
 #include "py/mphal.h"
 #include "shared/readline/readline.h"
 #include "shared/runtime/pyexec.h"
+#include "shared/runtime/softtimer.h"
 #include "lib/oofatfs/ff.h"
 #include "lib/littlefs/lfs1.h"
 #include "lib/littlefs/lfs1_util.h"
@@ -52,7 +53,6 @@
 #include "gccollect.h"
 #include "factoryreset.h"
 #include "modmachine.h"
-#include "softtimer.h"
 #include "spi.h"
 #include "uart.h"
 #include "timer.h"

diff --git a/ports/renesas-ra/softtimer.c b/ports/renesas-ra/softtimer.c
diff --git a/ports/renesas-ra/softtimer.h b/ports/renesas-ra/softtimer.h
diff --git a/ports/renesas-ra/systick.c b/ports/renesas-ra/systick.c
@@ -27,10 +27,10 @@
 
 #include "py/runtime.h"
 #include "py/mphal.h"
+#include "shared/runtime/softtimer.h"
 #include "irq.h"
 #include "pendsv.h"
 #include "systick.h"
-#include "softtimer.h"
 #include "pybthread.h"
 #include "hal_data.h"