From 6620e65927443454f881d706a69ea8c9af71e296 Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Fri, 2 Nov 2018 21:14:35 +0000 Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12403 110e8d01-0319-4d1e-a829-52ad28d1bb01 --- testhal/STM32/multi/WSPI-MFS/cfg/stm32l476_discovery/portab.c | 6 ++++++ testhal/STM32/multi/WSPI-MFS/cfg/stm32l476_discovery/portab.h | 3 +++ testhal/STM32/multi/WSPI-MFS/cfg/stm32l4r9_discovery/mcuconf.h | 2 +- testhal/STM32/multi/WSPI-MFS/cfg/stm32l4r9_discovery/portab.c | 10 ++++++++++ testhal/STM32/multi/WSPI-MFS/cfg/stm32l4r9_discovery/portab.h | 3 +++ 5 files changed, 23 insertions(+), 1 deletion(-) (limited to 'testhal/STM32/multi/WSPI-MFS/cfg') diff --git a/testhal/STM32/multi/WSPI-MFS/cfg/stm32l476_discovery/portab.c b/testhal/STM32/multi/WSPI-MFS/cfg/stm32l476_discovery/portab.c index 878e69c05..893711661 100644 --- a/testhal/STM32/multi/WSPI-MFS/cfg/stm32l476_discovery/portab.c +++ b/testhal/STM32/multi/WSPI-MFS/cfg/stm32l476_discovery/portab.c @@ -34,6 +34,12 @@ /* Module exported variables. */ /*===========================================================================*/ +const WSPIConfig WSPIcfg1 = { + .end_cb = NULL, + .dcr = STM32_DCR_FSIZE(24U) | /* 16MB device. */ + STM32_DCR_CSHT(1U) /* NCS 2 cycles delay. */ +}; + /*===========================================================================*/ /* Module local types. */ /*===========================================================================*/ diff --git a/testhal/STM32/multi/WSPI-MFS/cfg/stm32l476_discovery/portab.h b/testhal/STM32/multi/WSPI-MFS/cfg/stm32l476_discovery/portab.h index 25f3c4d4c..6985d659d 100644 --- a/testhal/STM32/multi/WSPI-MFS/cfg/stm32l476_discovery/portab.h +++ b/testhal/STM32/multi/WSPI-MFS/cfg/stm32l476_discovery/portab.h @@ -38,6 +38,7 @@ #define PORTAB_BUTTON_PRESSED PAL_HIGH #define PORTAB_SD1 SD2 +#define PORTAB_WSPI1 WSPID1 /*===========================================================================*/ /* Module pre-compile time settings. */ @@ -59,6 +60,8 @@ /* External declarations. */ /*===========================================================================*/ +extern const WSPIConfig WSPIcfg1; + #ifdef __cplusplus extern "C" { #endif diff --git a/testhal/STM32/multi/WSPI-MFS/cfg/stm32l4r9_discovery/mcuconf.h b/testhal/STM32/multi/WSPI-MFS/cfg/stm32l4r9_discovery/mcuconf.h index 99336e8ac..99136239d 100644 --- a/testhal/STM32/multi/WSPI-MFS/cfg/stm32l4r9_discovery/mcuconf.h +++ b/testhal/STM32/multi/WSPI-MFS/cfg/stm32l4r9_discovery/mcuconf.h @@ -323,7 +323,7 @@ /* * WSPI driver system settings. */ -#define STM32_WSPI_USE_OCTOSPI1 TRUE +#define STM32_WSPI_USE_OCTOSPI1 FALSE #define STM32_WSPI_USE_OCTOSPI2 TRUE #define STM32_WSPI_OCTOSPI1_PRESCALER_VALUE 1 #define STM32_WSPI_OCTOSPI2_PRESCALER_VALUE 1 diff --git a/testhal/STM32/multi/WSPI-MFS/cfg/stm32l4r9_discovery/portab.c b/testhal/STM32/multi/WSPI-MFS/cfg/stm32l4r9_discovery/portab.c index 652d32898..bf15f000d 100644 --- a/testhal/STM32/multi/WSPI-MFS/cfg/stm32l4r9_discovery/portab.c +++ b/testhal/STM32/multi/WSPI-MFS/cfg/stm32l4r9_discovery/portab.c @@ -34,6 +34,16 @@ /* Module exported variables. */ /*===========================================================================*/ +const WSPIConfig WSPIcfg1 = { + .end_cb = NULL, + .dcr1 = STM32_DCR1_MTYP(1U) | /* Macronix mode. */ + STM32_DCR1_DEVSIZE(26U) | /* 64MB device. */ + STM32_DCR1_CSHT(1U), /* NCS 2 cycles delay. */ + .dcr2 = STM32_DCR2_PRESCALER(1U), /* Clock is AHB / 2. */ + .dcr3 = 0U, + .dcr4 = 0U +}; + /*===========================================================================*/ /* Module local types. */ /*===========================================================================*/ diff --git a/testhal/STM32/multi/WSPI-MFS/cfg/stm32l4r9_discovery/portab.h b/testhal/STM32/multi/WSPI-MFS/cfg/stm32l4r9_discovery/portab.h index aed8b57b0..fc27619ce 100644 --- a/testhal/STM32/multi/WSPI-MFS/cfg/stm32l4r9_discovery/portab.h +++ b/testhal/STM32/multi/WSPI-MFS/cfg/stm32l4r9_discovery/portab.h @@ -38,6 +38,7 @@ #define PORTAB_BUTTON_PRESSED PAL_HIGH #define PORTAB_SD1 SD2 +#define PORTAB_WSPI1 WSPID2 /*===========================================================================*/ /* Module pre-compile time settings. */ @@ -59,6 +60,8 @@ /* External declarations. */ /*===========================================================================*/ +extern const WSPIConfig WSPIcfg1; + #ifdef __cplusplus extern "C" { #endif -- cgit v1.2.3