Fixed templates, naming unification

Author: msemegen

lib/soc/Systick.cpp

@@ -8,13 +8,13 @@
 // this
 #include <soc/Systick.hpp>
 
+// soc
+#include <soc/Interrupt_guard.hpp>
+
 // cml
 #include <cml/bit_flag.hpp>
 #include <cml/debug/assertion.hpp>
 
-// soc
-#include <soc/Interrupt_guard.hpp>
-
 namespace {
 
 using namespace soc;

lib/soc/m4/nvic.hpp

@@ -58,7 +58,7 @@ class nvic
 
     static void set_mode(Mode a_mode)
     {
-        static uint32_t primask = 0;
+        static uint32_t primask = __get_PRIMASK();
 
         switch (a_mode)
         {
@@ -75,6 +75,11 @@ class nvic
         }
     }
 
+    static void system_reset()
+    {
+        NVIC_SystemReset();
+    }
+
     static Config get_config()
     {
         return { static_cast<Config::Grouping>(NVIC_GetPriorityGrouping()), __get_BASEPRI() };