summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Schodet2013-03-13 22:33:40 +0100
committerNicolas Schodet2013-03-14 23:53:36 +0100
commitb99da12d6a5b79320e1c7db49b09e020c1cba6cc (patch)
tree304e7ccaeaf2cbc3c95c734d52c0f5e8ac5c6217
parente7de60edc3d2ce77e3d0d203f0db6ba450f8acfc (diff)
digital/ucoolib/ucoolib/arch: add arch_reset
-rw-r--r--digital/ucoolib/ucoolib/arch/arch.hh4
-rw-r--r--digital/ucoolib/ucoolib/arch/arch.host.cc7
-rw-r--r--digital/ucoolib/ucoolib/arch/arch.stm32.cc7
3 files changed, 18 insertions, 0 deletions
diff --git a/digital/ucoolib/ucoolib/arch/arch.hh b/digital/ucoolib/ucoolib/arch/arch.hh
index 92aa115f..ecf123fb 100644
--- a/digital/ucoolib/ucoolib/arch/arch.hh
+++ b/digital/ucoolib/ucoolib/arch/arch.hh
@@ -30,6 +30,10 @@ namespace ucoo {
void
arch_init (int argc, const char **argv);
+/// Reset.
+void
+arch_reset ();
+
#ifdef TARGET_host
/// Retrieve program arguments.
diff --git a/digital/ucoolib/ucoolib/arch/arch.host.cc b/digital/ucoolib/ucoolib/arch/arch.host.cc
index ed8c503e..06bb2bdb 100644
--- a/digital/ucoolib/ucoolib/arch/arch.host.cc
+++ b/digital/ucoolib/ucoolib/arch/arch.host.cc
@@ -42,6 +42,13 @@ arch_init (int argc, const char **argv)
}
void
+arch_reset ()
+{
+ // Not supported.
+ halt ();
+}
+
+void
arch_get_args (int &argc, const char **&argv)
{
argc = arch_stored_argc;
diff --git a/digital/ucoolib/ucoolib/arch/arch.stm32.cc b/digital/ucoolib/ucoolib/arch/arch.stm32.cc
index 23c772ab..869b1d90 100644
--- a/digital/ucoolib/ucoolib/arch/arch.stm32.cc
+++ b/digital/ucoolib/ucoolib/arch/arch.stm32.cc
@@ -25,6 +25,7 @@
#include "ucoolib/common.hh"
#include <libopencm3/stm32/f4/rcc.h>
+#include <libopencm3/stm32/f4/scb.h>
namespace ucoo {
@@ -35,6 +36,12 @@ arch_init (int argc, const char **argv)
}
void
+arch_reset ()
+{
+ SCB_AIRCR = SCB_AIRCR_VECTKEY | SCB_AIRCR_SYSRESETREQ;
+}
+
+void
halt ()
{
while (1)