Perform more syntax improvements

Author: ckormanyos

ref_app/src/mcal/am6254_soc/mcal_cpu.h

@@ -39,8 +39,11 @@
 
       inline auto nop() noexcept -> void { asm volatile("nop"); }
 
-      inline auto acquire_spin_lock(volatile std::uint32_t* p_sync) noexcept -> void { mcal_cpu_secure_acquire_spin_lock(p_sync); }
-      inline auto release_spin_lock(volatile std::uint32_t* p_sync) noexcept -> void { mcal_cpu_secure_release_spin_lock(p_sync); }
+      struct secure
+      {
+        static auto acquire_spin_lock(volatile std::uint32_t* p_sync) noexcept -> void { mcal_cpu_secure_acquire_spin_lock(p_sync); }
+        static auto release_spin_lock(volatile std::uint32_t* p_sync) noexcept -> void { mcal_cpu_secure_release_spin_lock(p_sync); }
+      };
     }
   }
   #endif

ref_app/src/mcal/am6254_soc/mcal_port.cpp

@@ -9,12 +9,17 @@
 
 void mcal::port::init(const config_type*)
 {
-  // The pad configuration of gpio0.37 is on pad37 (empirical observation).
-  // So we must initialize pad37 since we will use gpio0.36 as the
-  // benchmark toggle-pin.
+  // Initialize the benchmark toggle pin explicitly, even though
+  // this is also done in the application benchmark when one
+  // of the benchmarks is active.
+
   mcal::port::port_pin<mcal::reg::gpio0, 36U>::set_pin_low();
   mcal::port::port_pin<mcal::reg::gpio0, 36U>::set_direction_output();
 
+  // Empirical observation seemingly reveals that the pad configuration
+  // of gpio0.36 is mistakenly on pad37. So we must initialize pad37
+  // as well since we will use gpio0.36 as the benchmark toggle-pin.
+
   mcal::port::port_pin<mcal::reg::gpio0, 37U>::set_pin_low();
   mcal::port::port_pin<mcal::reg::gpio0, 37U>::set_direction_output();
 }

ref_app/src/mcal/am6254_soc/mcal_port.h

@@ -5,8 +5,8 @@
 //  or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#ifndef MCAL_PORT_2014_01_10_H_
-  #define MCAL_PORT_2014_01_10_H_
+#ifndef MCAL_PORT_2014_01_10_H
+  #define MCAL_PORT_2014_01_10_H
 
   #include <mcal_cpu.h>
   #include <mcal_reg.h>
@@ -33,9 +33,9 @@
       public:
         static auto set_direction_output() noexcept -> void
         {
-          mcal::cpu::acquire_spin_lock(&sync_object);
+          mcal::cpu::secure::acquire_spin_lock(&sync_object);
           GPIO_CONFIG_AS_OUTPUT();
-          mcal::cpu::release_spin_lock(&sync_object);
+          mcal::cpu::secure::release_spin_lock(&sync_object);
         }
 
         static auto set_direction_input() noexcept -> void
@@ -45,18 +45,18 @@
 
         static auto set_pin_high() noexcept -> void
         {
-          mcal::cpu::acquire_spin_lock(&sync_object);
+          mcal::cpu::secure::acquire_spin_lock(&sync_object);
           OUTPUT_HIGH();
           output_is_high = true;
-          mcal::cpu::release_spin_lock(&sync_object);
+          mcal::cpu::secure::release_spin_lock(&sync_object);
         }
 
         static auto set_pin_low() noexcept -> void
         {
-          mcal::cpu::acquire_spin_lock(&sync_object);
+          mcal::cpu::secure::acquire_spin_lock(&sync_object);
           OUTPUT_LOW();
           output_is_high = false;
-          mcal::cpu::release_spin_lock(&sync_object);
+          mcal::cpu::secure::release_spin_lock(&sync_object);
         }
 
         static auto read_input_value() noexcept -> bool
@@ -67,10 +67,10 @@
 
         static auto toggle_pin() noexcept -> void
         {
-          mcal::cpu::acquire_spin_lock(&sync_object);
+          mcal::cpu::secure::acquire_spin_lock(&sync_object);
           (output_is_high ? OUTPUT_LOW() : OUTPUT_HIGH());
           output_is_high = (!output_is_high);
-          mcal::cpu::release_spin_lock(&sync_object);
+          mcal::cpu::secure::release_spin_lock(&sync_object);
         }
 
       private:

ref_app/target/micros/am6254_soc/make/am6254_soc_flags.gmk

@@ -18,7 +18,7 @@ TGT_SUFFIX    = elf
 
 TGT_ALLFLAGS  = -O2                                                               \
                 -finline-functions                                                \
-                -finline-limit=32                                                 \
+                -finline-limit=128                                                \
                 -mcpu=cortex-a53                                                  \
                 -march=armv8-a                                                    \
                 -mabi=lp64
@@ -31,15 +31,8 @@ TGT_CFLAGS    = -std=c11
 TGT_CXXFLAGS  = -std=c++20                                                        \
                 $(TGT_ALLFLAGS)
 
-TGT_INCLUDES  = -I$(PATH_TGT)/Code                                                \
-                -I$(PATH_TGT)/Code/Appli/                                         \
-                -I$(PATH_TGT)/Code/Appli/Core/$(CORE_FAMILY)                      \
-                -I$(PATH_TGT)/Code/Mcal                                           \
-                -I$(PATH_TGT)/Code/Mcal/SysTickTimer                              \
-                -I$(PATH_TGT)/Code/Startup                                        \
-                -I$(PATH_TGT)/Code/Startup/Core/$(CORE_FAMILY)                    \
-                -I$(PATH_APP)/mcal/$(TGT)                                         \
-                -I$(PATH_APP)
+TGT_INCLUDES  = -I$(PATH_TGT)/Code/Appli/Core/$(CORE_FAMILY)                      \
+                -I$(PATH_TGT)/Code/Startup/Core/$(CORE_FAMILY)
 
 TGT_AFLAGS    =
 
@@ -57,4 +50,7 @@ ifeq ($(TYP_OS),WIN)
 OBJCOPY      := $(subst /,\,$(PATH_TOOLS_CC)/$(GCC_PREFIX)-objcopy.exe)
 endif
 
-RULE_SPECIAL_MAKE_IMAGE_FILE := $(ECHO) "+++ creating special image file $(PATH_BIN)/$(CORE_FAMILY)_baremetal_am6254_nosdk.bin" && $(OBJCOPY) $(APP).$(TGT_SUFFIX) -O binary $(PATH_BIN)/$(CORE_FAMILY)_baremetal_am6254_nosdk.bin
+NAME_IMAGE_FILE := $(PATH_BIN)/$(CORE_FAMILY)_baremetal_am6254_nosdk
+
+RULE_SPECIAL_MAKE_IMAGE_FILE :=    $(ECHO) "+++ creating special image file $(NAME_IMAGE_FILE).bin" \
+                                && $(OBJCOPY) $(APP).$(TGT_SUFFIX) -O binary $(NAME_IMAGE_FILE).bin