renamed to FMCf4xx

Author: oc6723

CMakeLists.txt

@@ -24,9 +24,7 @@ project(EVT
     LANGUAGES CXX C ASM
 )
 
-add_library(${PROJECT_NAME} STATIC
-        include/core/io/FMC.hpp
-        src/core/io/FMC.cpp)
+add_library(${PROJECT_NAME} STATIC)
 
 # Add sources
 target_sources(${PROJECT_NAME} PRIVATE

include/core/io/SPI.hpp

@@ -1,4 +1,4 @@
-    #ifndef _EVT_SPI_
+#ifndef _EVT_SPI_
 #define _EVT_SPI_
 
 #include <cstdint>

include/core/io/FMC.hpp include/core/io/platform/f4xx/FMCf4xx.hppinclude/core/io/FMC.hpp renamed to include/core/io/platform/f4xx/FMCf4xx.hpp

@@ -1,16 +1,9 @@
 #ifndef EVT_FMC_HPP
 #define EVT_FMC_HPP
 
-#ifdef STM32F4xx
-    #include "HALf4/stm32f4xx_hal.h"
-    #include "HALf4/stm32f4xx_ll_fmc.h"
-    #include "HALf4/stm32f4xx_hal_sdram.h"
-#else
-    #include "HALf3/stm32f3xx_hal.h"
-    #include "HALf3/stm32f3xx_ll_fmc.h"
-    #include "HALf3/stm32f3xx_hal_sdram.h"
-#endif
-
+#include "HALf4/stm32f4xx_hal.h"
+#include "HALf4/stm32f4xx_ll_fmc.h"
+#include "HALf4/stm32f4xx_hal_sdram.h"
 
 #define SDRAM_TIMEOUT (0x0000FFFFUL)
 
@@ -113,7 +106,7 @@ typedef FMC_GPIO 	FMC_CMD;
 
 namespace core::io {
 
-class FMC {
+class FMCf4xx {
 public:
     /**
      * Structure to simplify SDRAM initialization, pre-filled with default values
@@ -207,7 +200,7 @@ class FMC {
      * @param[in] sdramInitConfig a struct containing all FMC SDRAM configuration
      * @param[in] sdramTimingConfig a struct containing all FMC SDRAM timing configuration variables
      */
-    FMC(FMCPinConfig pin_config, SdramInitConfig sdramInitConfig, SdramTimingConfig sdramTimingConfig);
+    FMCf4xx(FMCPinConfig pin_config, SdramInitConfig sdramInitConfig, SdramTimingConfig sdramTimingConfig);
 
     /**
      * Write a value to SDRAM at the specified byte offset.

libs/HALf4/include/HALf4/stm32f4xx_hal_sdram.h

@@ -212,7 +212,7 @@ uint32_t          HAL_SDRAM_GetModeStatus(SDRAM_HandleTypeDef *hsdram);
   * @{
   */
 /* SDRAM State functions ********************************************************/
-HAL_SDRAM_StateTypeDef  HAL_SDRAM_GetState(const SDRAM_HandleTypeDef *hsdram);
+HAL_SDRAM_StateTypeDef  HAL_SDRAM_GetState(SDRAM_HandleTypeDef *hsdram);
 /**
   * @}
   */

src/core/io/FMC.cpp src/core/io/platform/f4xx/FMCf4xx.cppsrc/core/io/FMC.cpp renamed to src/core/io/platform/f4xx/FMCf4xx.cpp

@@ -1,8 +1,8 @@
-#include <core/io/FMC.hpp>
+#include <core/io/platform/f4xx/FMCf4xx.hpp>
 
 namespace core::io {
 
-FMC::FMC(const FMCPinConfig pinConfig, const SdramInitConfig sdramInitConfig, const SdramTimingConfig sdramTimingConfig) :
+FMCf4xx::FMCf4xx(const FMCPinConfig pinConfig, const SdramInitConfig sdramInitConfig, const SdramTimingConfig sdramTimingConfig) :
 sdramInitConfig(sdramInitConfig),
 sdramTimingConfig(sdramTimingConfig),
 fmcPinConfig(pinConfig),
@@ -37,23 +37,23 @@ sdramTiming({0}) {
         sdramMemoryAddress = 0xD0000000;
 }
 
-void FMC::write32(uint32_t offset, uint32_t value) const
+void FMCf4xx::write32(uint32_t offset, uint32_t value) const
 {
     volatile auto* ptr =
         reinterpret_cast<volatile uint32_t*>(sdramMemoryAddress + offset);
 
     *ptr = value;
 }
 
-uint32_t FMC::read32(uint32_t offset) const
+uint32_t FMCf4xx::read32(uint32_t offset) const
 {
     volatile auto* ptr =
         reinterpret_cast<volatile uint32_t*>(sdramMemoryAddress + offset);
 
     return *ptr;
 }
 
-void FMC::InitHardware(const FMCPinConfig& pinConfig) {
+void FMCf4xx::InitHardware(const FMCPinConfig& pinConfig) {
     __HAL_RCC_FMC_CLK_ENABLE();
 
     InitPinGroup(pinConfig.address.pins, pinConfig.address.count);
@@ -63,7 +63,7 @@ void FMC::InitHardware(const FMCPinConfig& pinConfig) {
     InitPinGroup(pinConfig.command.pins, pinConfig.command.count);
 }
 
-void FMC::InitPinGroup(const FMC_GPIO* pins, uint8_t count) {
+void FMCf4xx::InitPinGroup(const FMC_GPIO* pins, uint8_t count) {
     GPIO_InitTypeDef gpio {};
 
     gpio.Mode = GPIO_MODE_AF_PP;