Further cleanup and C++-ification

Author: ckormanyos

…bl602_sifive_e24_riscv/Code/Mcal/BL602.h …/src/mcal/bl602_sifive_e24_riscv/BL602.href_app/target/micros/bl602_sifive_e24_riscv/Code/Mcal/BL602.h renamed to ref_app/src/mcal/bl602_sifive_e24_riscv/BL602.h ref_app/target/micros/bl602_sifive_e24_riscv/Code/Mcal/BL602.h renamed to ref_app/src/mcal/bl602_sifive_e24_riscv/BL602.h

@@ -6,11 +6,10 @@
 //
 
 #include <mcal_gpt.h>
+#include <mcal_reg.h>
 
 #include <util/utility/util_noncopyable.h>
 
-#include "BL602.h"
-
 namespace
 {
   struct mcal_gpt_system_tick final : private util::noncopyable
@@ -20,12 +19,12 @@ namespace
 
     ~mcal_gpt_system_tick() = delete;
 
-    static void init()
+    static auto init() -> void
     {
       initial_count = get_consistent_microsecond_tick();
     }
 
-    static std::uint64_t get_tick()
+    static auto get_tick() -> std::uint64_t
     {
       const std::uint64_t elapsed = get_consistent_microsecond_tick() - initial_count;
 
@@ -35,7 +34,12 @@ namespace
   private:
     static std::uint64_t initial_count;
 
-    static std::uint64_t get_consistent_microsecond_tick()
+    static auto read_clic_timer64() -> std::uint64_t
+    {
+      return mcal::reg::reg_access_static<std::uintptr_t, std::uint64_t, mcal::reg::clic_mtime>::reg_get();
+    }
+
+    static auto get_consistent_microsecond_tick() -> std::uint64_t
     {
       // Return the (elapsed) system tick using a multiple read
       // to ensure data consistency. The system tick representing
@@ -47,8 +51,8 @@ namespace
 
       // Return the system tick using a multiple read to ensure data consistency.
 
-      const volatile std::uint64_t time_first  { CLIC_MTIME };
-      const volatile std::uint64_t time_second { CLIC_MTIME };
+      const volatile std::uint64_t time_first  { read_clic_timer64() };
+      const volatile std::uint64_t time_second { read_clic_timer64() };
 
       const bool
         is_steady
@@ -61,7 +65,7 @@ namespace
         {
           static_cast<std::uint64_t>
           (
-            is_steady ? time_first : CLIC_MTIME
+            is_steady ? time_first : read_clic_timer64()
           )
         };
 
@@ -76,9 +80,9 @@ namespace
 
   std::uint64_t mcal_gpt_system_tick::initial_count;
 
-  bool& gpt_is_initialized() __attribute__((used, noinline));
+  auto gpt_is_initialized() -> bool& __attribute__((used, noinline));
 
-  bool& gpt_is_initialized()
+  auto gpt_is_initialized() -> bool&
   {
     static bool is_init = bool();
 

ref_app/src/mcal/bl602_sifive_e24_riscv/mcal_gpt.cpp

@@ -14,10 +14,12 @@
   {
     namespace reg
     {
-      // Port (gpio) registers.
-      constexpr std::uintptr_t gpio0       { UINT32_C(0x00600010) };
-      constexpr std::uintptr_t gpio1       { UINT32_C(0x00601010) };
-      constexpr std::uintptr_t mcu_gpio0   { UINT32_C(0x04201010) };
+      // CLIC (timer) registers.
+      constexpr std::uintptr_t clic_ctrl_addr { UINT32_C(0x02000000) };
+      constexpr std::uintptr_t clic_msip      { clic_ctrl_addr + UINT32_C(0x00000000) };
+      constexpr std::uintptr_t clic_mtimecmp  { clic_ctrl_addr + UINT32_C(0x00004000) };
+      constexpr std::uintptr_t clic_mtime     { clic_ctrl_addr + UINT32_C(0x0000BFF8) };
+      constexpr std::uintptr_t clic_clk_gate  { clic_ctrl_addr + UINT32_C(0x007FF000) };
     }
   }
 

ref_app/src/mcal/bl602_sifive_e24_riscv/mcal_reg.h

@@ -1232,8 +1232,6 @@
   <ItemGroup>
     <ClInclude Include="target\micros\am6254_soc\Code\Startup\Core\a53\core_macros.h" />
     <ClInclude Include="target\micros\am6254_soc\Code\Startup\Core\a53\gic-500.h" />
-    <ClInclude Include="target\micros\bl602_sifive_e24_riscv\Code\Mcal\BL602.h" />
-    <ClInclude Include="target\micros\bl602_sifive_e24_riscv\Code\Mcal\riscv-csr.h" />
     <ClInclude Include="target\micros\xtensa_esp32_s3\startup\Std\core-isa.h" />
   </ItemGroup>
   <ItemGroup>

ref_app/target.vcxproj

@@ -331,12 +331,6 @@
     <Filter Include="micros\bl602_sifive_e24_riscv\startup">
       <UniqueIdentifier>{d9d707dc-1ba0-4d0c-be67-fbb095f42986}</UniqueIdentifier>
     </Filter>
-    <Filter Include="micros\bl602_sifive_e24_riscv\Code">
-      <UniqueIdentifier>{8c965230-fbcc-427e-8292-9231493dc299}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="micros\bl602_sifive_e24_riscv\Code\Mcal">
-      <UniqueIdentifier>{75fda3d9-17eb-48a8-92e8-9c440411a545}</UniqueIdentifier>
-    </Filter>
   </ItemGroup>
   <ItemGroup>
     <None Include="target\app\make\app_files.gmk">
@@ -1122,12 +1116,6 @@
     <ClInclude Include="target\micros\am6254_soc\Code\Startup\Core\a53\gic-500.h">
       <Filter>micros\am6254_soc\Code\Startup\Core\a53</Filter>
     </ClInclude>
-    <ClInclude Include="target\micros\bl602_sifive_e24_riscv\Code\Mcal\BL602.h">
-      <Filter>micros\bl602_sifive_e24_riscv\Code\Mcal</Filter>
-    </ClInclude>
-    <ClInclude Include="target\micros\bl602_sifive_e24_riscv\Code\Mcal\riscv-csr.h">
-      <Filter>micros\bl602_sifive_e24_riscv\Code\Mcal</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Library Include="target\micros\xtensa_esp32_s3\startup\Std\lib_call0_abi\libc_call0_abi.a">