merged with github

Author: oc6723

include/core/io/FMC.hpp

@@ -109,7 +109,8 @@ class FMC {
     /**
      * Initializes an FMC device
      */
-    FMC(void* sdramMemoryAddress, FMCPinConfig pinConfig, SdramInitConfig sdramInitConfig, SdramTimingConfig sdramTimingConfig);
+    FMC(void* sdramMemoryAddress, FMCPinConfig pinConfig, SdramInitConfig sdramInitConfig,
+        SdramTimingConfig sdramTimingConfig);
 
     void* sdramMemoryAddress;
 

include/core/io/platform/f4xx/FMCf4xx.hpp

@@ -56,8 +56,7 @@ namespace core::io {
 #define EXIT_SELF_REFRESH_DELAY      (NS_TO_SDRAM_CLK_CYCLES(tXSR))
 #define LOAD_MODE_REGISTER_TO_ACTIVE (NS_TO_SDRAM_CLK_CYCLES(tMRD))
 
-
-#define	RAM_SIZE	      (0x4000000) // 64 megabits
+#define RAM_SIZE          (0x4000000) // 64 megabits
 #define STARTING_ADDR     ((uint32_t*) 0xC000000)
 #define ALT_STARTING_ADDR ((uint32_t*) 0xD000000)
 
@@ -82,7 +81,8 @@ class FMCf4xx : public FMC {
      * - Configures SDRAM controller
      * - Calls HAL_SDRAM_Init()
      */
-    FMCf4xx(FMC_SDRAM_TypeDef* sdramDevice, FMCPinConfig pinConfig, SdramInitConfig sdramInitConfig, SdramTimingConfig sdramTimingConfig);
+    FMCf4xx(FMC_SDRAM_TypeDef* sdramDevice, FMCPinConfig pinConfig, SdramInitConfig sdramInitConfig,
+            SdramTimingConfig sdramTimingConfig);
 
     /**
      * Returns a SdramInitConfig struct pre-filled with default values.

src/core/io/FMC.cpp

@@ -2,10 +2,9 @@
 
 namespace core::io {
 
-FMC::FMC(void* sdramMemoryAddress, FMCPinConfig pinConfig, SdramInitConfig sdramInitConfig, SdramTimingConfig sdramTimingConfig) :
-    sdramMemoryAddress(sdramMemoryAddress),
-    fmcPinConfig(pinConfig),
-    sdramInitConfig(sdramInitConfig),
-    sdramTimingConfig(sdramTimingConfig) {}
+FMC::FMC(void* sdramMemoryAddress, FMCPinConfig pinConfig, SdramInitConfig sdramInitConfig,
+         SdramTimingConfig sdramTimingConfig)
+    : sdramMemoryAddress(sdramMemoryAddress), fmcPinConfig(pinConfig), sdramInitConfig(sdramInitConfig),
+      sdramTimingConfig(sdramTimingConfig) {}
 
 } // namespace core::io

src/core/io/platform/f4xx/FMCf4xx.cpp

@@ -3,11 +3,11 @@
 
 namespace core::io {
 
-FMCf4xx::FMCf4xx(FMC_SDRAM_TypeDef* sdramDevice, FMCPinConfig pinConfig, SdramInitConfig sdramInitConfig, SdramTimingConfig sdramTimingConfig) :
-FMC(sdramInitConfig.sdBank == FMC_SDRAM_BANK1 ? STARTING_ADDR : ALT_STARTING_ADDR, pinConfig, sdramInitConfig, sdramTimingConfig), // if statement to determine base address
-sdramDevice(sdramDevice),
-sdram({nullptr}),
-sdramTiming({0}) {
+FMCf4xx::FMCf4xx(FMC_SDRAM_TypeDef* sdramDevice, FMCPinConfig pinConfig, SdramInitConfig sdramInitConfig,
+                 SdramTimingConfig sdramTimingConfig)
+    : FMC(sdramInitConfig.sdBank == FMC_SDRAM_BANK1 ? STARTING_ADDR : ALT_STARTING_ADDR, pinConfig, sdramInitConfig, // if statement to determine base address
+          sdramTimingConfig),
+      sdramDevice(sdramDevice), sdram({nullptr}), sdramTiming({0}) {
     InitHardware(pinConfig);
 
     // map the class init structs to the hal structs