🐛 Fix breaks with demo building

libhal · Jul 25, 2024 · 6f1cca2 · 6f1cca2
1 parent 8a1d7c8
commit 6f1cca2
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 26 deletions.
diff --git a/demos/applications/multi_levels.cpp b/demos/applications/multi_levels.cpp
@@ -46,7 +46,7 @@ int funct_group6_0();
 
 using signature = int(void);
 
-std::array<signature*, 9> functions = {
+std::array functions{
   &funct_group0_0, &funct_group1_0, &funct_group2_0, &funct_group3_0,
   &funct_group4_0, &funct_group5_0, &funct_group6_0,
 #if 0

diff --git a/demos/applications/single_level.cpp b/demos/applications/single_level.cpp
@@ -26,38 +26,18 @@ struct error
 std::uint64_t start = 0;
 std::uint64_t end = 0;
 
-std::uint64_t volatile entry_search_start = 0;
-std::uint64_t volatile entry_search_end = 0;
-
 void foo()
 {
   if (value) {
     start = resources->clock->uptime();
     throw error{ .data = value };
   }
 }
-namespace ke {
-struct index_entry_t
-{
-  uint32_t a;
-  uint32_t b;
-};
-extern index_entry_t const& get_index_entry(std::uint32_t p_program_counter);
-}  // namespace ke
-
-ke::index_entry_t const* global_index = nullptr;
-std::uint64_t volatile search_time = 0;
 
 void application(resource_list& p_resources)
 {
   resources = &p_resources;
 
-  entry_search_start = resources->clock->uptime();
-  global_index = &ke::get_index_entry(reinterpret_cast<std::uint32_t>(&foo));
-  entry_search_end = resources->clock->uptime();
-
-  search_time = entry_search_end - entry_search_start;
-
   try {
     foo();
   } catch (error const& p_error) {

diff --git a/demos/platforms/stm32f103r6.cpp b/demos/platforms/stm32f103r6.cpp
@@ -20,11 +20,7 @@
 resource_list initialize_platform()
 {
   using namespace hal::literals;
-  hal::stm32f1::maximum_speed_using_internal_oscillator();
-
-  auto cpu_frequency = hal::stm32f1::frequency(hal::stm32f1::peripheral::cpu);
-  static hal::cortex_m::dwt_counter dwt_steady_clock(cpu_frequency);
-
+  static hal::cortex_m::dwt_counter dwt_steady_clock(10.0_MHz);
   return {
     .clock = &dwt_steady_clock,
   };