fix: try to fix tests part 6

Author: victor-Lopez25

CMakeLists.txt

@@ -274,8 +274,10 @@ target_compile_options(${STLIB_LIBRARY} PRIVATE
 
 target_include_directories(${STLIB_LIBRARY} PUBLIC
   # CMSIS + HAL
-  $<$<BOOL:${CMAKE_CROSSCOMPILING}>:${STM32CUBEH7}/Drivers/CMSIS/Device/ST/STM32H7xx/Include>
-  $<$<BOOL:${CMAKE_CROSSCOMPILING}>:${STM32CUBEH7}/Drivers/CMSIS/Include>
+  #$<$<BOOL:${CMAKE_CROSSCOMPILING}>:${STM32CUBEH7}/Drivers/CMSIS/Device/ST/STM32H7xx/Include>
+  #$<$<BOOL:${CMAKE_CROSSCOMPILING}>:${STM32CUBEH7}/Drivers/CMSIS/Include>
+  ${STM32CUBEH7}/Drivers/CMSIS/Device/ST/STM32H7xx/Include
+  ${STM32CUBEH7}/Drivers/CMSIS/Include
   $<$<BOOL:${CMAKE_CROSSCOMPILING}>:${STM32CUBEH7}/Drivers/CMSIS/Core_A/Include>
   $<$<BOOL:${CMAKE_CROSSCOMPILING}>:${STM32CUBEH7}/Drivers/STM32H7xx_HAL_Driver/Inc>
   $<$<BOOL:${CMAKE_CROSSCOMPILING}>:${STM32CUBEH7}/Drivers/STM32H7xx_HAL_Driver/Inc/Legacy>

Inc/MockedDrivers/NVIC.hpp

@@ -6,6 +6,14 @@
  * ARM GCC intrinsics that don't work on x86_64 / host platforms.
  */
 
+//////////////////////////////////////////////////////////////////
+
+#ifdef __COMPILER_BARRIER
+#undef __COMPILER_BARRIER
+#endif
+
+//////////////////////////////////////////////////////////////////
+
 static inline uint32_t __RBIT(uint32_t val) {
     // 1. Hardware Byte Swap (Optimization: handles the large movements)
     // MSVC uses _byteswap_ulong, GCC/Clang uses __builtin_bswap32

Inc/MockedDrivers/compiler_specific.hpp

@@ -20,6 +20,7 @@
 #ifndef __STM32H7xx_LL_TIM_H
 #define __STM32H7xx_LL_TIM_H
 
+#include "stm32h723xx_wrapper.h"
 #include "mocked_ll_tim.hpp"
 
 #ifdef __cplusplus
@@ -28,7 +29,7 @@ extern "C" {
 
 #include <stdint.h>
 
-#define TIM1
+//#define TIM1
 
 /** @addtogroup STM32H7xx_LL_Driver
   * @{

Inc/MockedDrivers/ll_tim_interface.h

@@ -1,5 +1,6 @@
 #pragma once
 #include <cstdint>
+#include "MockedDrivers/stm32h723xx_wrapper.h"
 #include "MockedDrivers/common.hpp"
 #include "MockedDrivers/NVIC.hpp"
 #include "MockedDrivers/tim_register_definitions.hpp"
@@ -129,5 +130,7 @@ struct RegisterTraits<TimReg,TimReg::Reg_CNT> {
     TIM_TypeDef __htim##TIM_IDX{TIM_IDX##_IRQHandler,TIM_IDX##_IRQn}; \
     TIM_TypeDef*  TIM_IDX##_BASE = &__htim##TIM_IDX;
 
+#undef TIM1_BASE
 DECLARE_TIMER(TIM1)
+#undef TIM2_BASE
 DECLARE_TIMER(TIM2)

Inc/MockedDrivers/mocked_ll_tim.hpp

@@ -1,8 +1,29 @@
 #ifndef STM32H723xx_WRAPPER_H
 #define STM32H723xx_WRAPPER_H
 
+#include <stdint.h>
+#ifdef __cplusplus
+  #define   __I     volatile             /*!< Defines 'read only' permissions */
+#else
+  #define   __I     volatile const       /*!< Defines 'read only' permissions */
+#endif
+#define __IO volatile
+
+// necessary remove of some warnings due to cmsis made for 32 bit arch and not 64 bit arch
+#define __RBIT __RBIT__CMSIS
+#define TIM_TypeDef TIM_TypeDef__CMSIS
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wint-to-pointer-cast"
+
+// don't do anything in "core_cm7.h"
+#define __CORE_CM7_H_GENERIC
+#define __CORE_CM7_H_DEPENDANT
 #include "stm32h723xx.h"
 
+#pragma GCC diagnostic pop
+#undef __RBIT
+#undef TIM_TypeDef
+
 #undef RCC
 
 extern RCC_TypeDef *RCC;

Inc/MockedDrivers/stm32h723xx_wrapper.h

@@ -1,4 +1,4 @@
-#include "stm32h7xx_wrapper.h"
+#include "MockedDrivers/stm32h723xx_wrapper.h"
 
 static RCC_TypeDef RCC_struct;
 RCC_TypeDef *RCC = &RCC_struct;

Src/MockedDrivers/stm32h723xx_wrapper.c

@@ -2,8 +2,6 @@
 #include <thread>
 #include<chrono>
 
-#include "Inc/MockedDrivers/stm32h723xx_wrapper.h"
-
 #include "HALAL/Services/Time/Scheduler.hpp"
 
 int count = 0;