From f6b1a12ecf14e4c703b18f3d13537e878215e91a Mon Sep 17 00:00:00 2001
From: Fabien Poussin <fabien.poussin@gmail.com>
Date: Wed, 30 Oct 2019 13:19:08 +0100
Subject: Fixed DMA2D example

---
 .../halconf_community.h                            | 14 ++++++++++++
 demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/main.c    |  3 +--
 .../mcuconf_community.h                            | 26 ++++++++++++----------
 os/hal/include/hal_sdram.h                         |  2 +-
 os/hal/ports/STM32/LLD/FSMCv1/hal_sdram_lld.h      |  2 +-
 .../STM32/STM32F4xx/FSMC_SDRAM/halconf_community.h |  1 +
 6 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/halconf_community.h b/demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/halconf_community.h
index c28b90b..8082fce 100644
--- a/demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/halconf_community.h
+++ b/demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/halconf_community.h
@@ -31,6 +31,20 @@
 #define HAL_USE_FSMC                TRUE
 #endif
 
+/**
+ * @brief   Enables the SDRAM subsystem.
+ */
+#if !defined(HAL_USE_SDRAM) || defined(__DOXYGEN__)
+#define HAL_USE_SDRAM               TRUE
+#endif
+
+/**
+ * @brief   Enables the SRAM subsystem.
+ */
+#if !defined(HAL_USE_SRAM) || defined(__DOXYGEN__)
+#define HAL_USE_SRAM                FALSE
+#endif
+
 /**
  * @brief   Enables the NAND subsystem.
  */
diff --git a/demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/main.c b/demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/main.c
index 55a66a5..ce99e3b 100644
--- a/demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/main.c
+++ b/demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/main.c
@@ -23,7 +23,6 @@
 #include "usbcfg.h"
 #endif
 
-#include "hal_fsmc_sdram.h"
 #include "ili9341.h"
 #include "hal_stm32_ltdc.h"
 #include "hal_stm32_dma2d.h"
@@ -557,7 +556,7 @@ int main(void) {
    * Initialise FSMC for SDRAM.
    */
   sdramInit();
-  sdramStart(&SDRAMD, &sdram_cfg);
+  sdramStart(&SDRAMD1, &sdram_cfg);
   sdram_bulk_erase();
 
   /*
diff --git a/demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/mcuconf_community.h b/demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/mcuconf_community.h
index 6ecfe91..2528ef4 100644
--- a/demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/mcuconf_community.h
+++ b/demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/mcuconf_community.h
@@ -19,29 +19,31 @@
  */
 #define STM32_FSMC_USE_FSMC1                TRUE
 #define STM32_FSMC_FSMC1_IRQ_PRIORITY       10
+#define STM32_FSMC_DMA_CHN                  0x03010201
 
 /*
  * FSMC NAND driver system settings.
  */
-#define STM32_NAND_USE_NAND1           FALSE
-#define STM32_NAND_USE_NAND2           FALSE
+#define STM32_NAND_USE_NAND1                FALSE
+#define STM32_NAND_USE_NAND2                FALSE
 #define STM32_NAND_USE_EXT_INT              FALSE
+#define STM32_NAND_DMA_STREAM               STM32_DMA_STREAM_ID(2, 7)
+#define STM32_NAND_DMA_PRIORITY             0
+#define STM32_NAND_DMA_ERROR_HOOK(nandp)    osalSysHalt("DMA failure")
 
 /*
- * FSMC SDRAM driver system settings.
+ * FSMC SRAM driver system settings.
  */
-#define STM32_USE_FSMC_SDRAM                TRUE
-#define STM32_SDRAM_USE_FSMC_SDRAM1         FALSE
-#define STM32_SDRAM_USE_FSMC_SDRAM2         TRUE
+#define STM32_SRAM_USE_SRAM1                FALSE
+#define STM32_SRAM_USE_SRAM2                FALSE
+#define STM32_SRAM_USE_SRAM3                FALSE
+#define STM32_SRAM_USE_SRAM4                FALSE
 
 /*
- * FSMC SRAM driver system settings.
+ * FSMC SDRAM driver system settings.
  */
-#define STM32_USE_FSMC_SRAM                 FALSE
-#define STM32_SRAM_USE_FSMC_SRAM1           FALSE
-#define STM32_SRAM_USE_FSMC_SRAM2           FALSE
-#define STM32_SRAM_USE_FSMC_SRAM3           FALSE
-#define STM32_SRAM_USE_FSMC_SRAM4           FALSE
+#define STM32_SDRAM_USE_SDRAM1              FALSE
+#define STM32_SDRAM_USE_SDRAM2              TRUE
 
 /*
  * LTDC driver system settings.
diff --git a/os/hal/include/hal_sdram.h b/os/hal/include/hal_sdram.h
index af4a1ad..eaca0fb 100644
--- a/os/hal/include/hal_sdram.h
+++ b/os/hal/include/hal_sdram.h
@@ -18,7 +18,7 @@
  */
 
 /**
- * @file    hal_fsmc_sdram.h
+ * @file    hal_sdram.h
  * @brief   SDRAM Driver subsystem low level driver header.
  *
  * @addtogroup SDRAM
diff --git a/os/hal/ports/STM32/LLD/FSMCv1/hal_sdram_lld.h b/os/hal/ports/STM32/LLD/FSMCv1/hal_sdram_lld.h
index 3991695..665c570 100644
--- a/os/hal/ports/STM32/LLD/FSMCv1/hal_sdram_lld.h
+++ b/os/hal/ports/STM32/LLD/FSMCv1/hal_sdram_lld.h
@@ -18,7 +18,7 @@
  */
 
 /**
- * @file    hal_fsmc_sdram.h
+ * @file    hal_sdram.h
  * @brief   SDRAM Driver subsystem low level driver header.
  *
  * @addtogroup SDRAM
diff --git a/testhal/STM32/STM32F4xx/FSMC_SDRAM/halconf_community.h b/testhal/STM32/STM32F4xx/FSMC_SDRAM/halconf_community.h
index 91ad637..51524e1 100644
--- a/testhal/STM32/STM32F4xx/FSMC_SDRAM/halconf_community.h
+++ b/testhal/STM32/STM32F4xx/FSMC_SDRAM/halconf_community.h
@@ -51,6 +51,7 @@
 #if !defined(HAL_USE_NAND) || defined(__DOXYGEN__)
 #define HAL_USE_NAND                FALSE
 #endif
+
 /**
  * @brief   Enables the 1-wire subsystem.
  */
-- 
cgit v1.2.3