From ceaec9bcfb812f6424f11f9d26190632ad017501 Mon Sep 17 00:00:00 2001
From: Rahix <rahix@rahix.de>
Date: Fri, 16 Oct 2020 22:29:24 +0200
Subject: [PATCH] feat(l0dables): Return to menu when main() exits
After main() returns, don't enter a busy loop but call epic_exit() to
signal to epicardium that the l0dable has finished. The exit code will
be the return value from main().
Signed-off-by: Rahix <rahix@rahix.de>
---
l0dables/blinky/main.c | 3 +++
l0dables/lib/crt.s | 9 +++------
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/l0dables/blinky/main.c b/l0dables/blinky/main.c
index 0e3d1ff2b..8bd05a89f 100644
--- a/l0dables/blinky/main.c
+++ b/l0dables/blinky/main.c
@@ -24,6 +24,9 @@ void fade()
/*
* main() is called when l0dable is loaded and executed.
+ *
+ * When main() returns, card10 goes back to the menu. A non-zero return value
+ * can be used to signal some kind of failure during l0dable execution.
*/
int main(void)
{
diff --git a/l0dables/lib/crt.s b/l0dables/lib/crt.s
index 79e326515..9e36e579e 100644
--- a/l0dables/lib/crt.s
+++ b/l0dables/lib/crt.s
@@ -157,12 +157,9 @@ Reset_Handler:
ldr r0, =main
blx r0
- /*
- * C code done, spin forever.
- * TODO(q3k): let epicardium know we're done.
- */
-.spin:
- bl .spin
+ /* C code done, return to menu. Return code is what main() returned. */
+ ldr r4, =epic_exit
+ blx r4
/*
* Used by __libc_init_array.
--
GitLab