From 9487a1f58c40b5cc3bc98c0eb14dfd1a0c18b8c2 Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@110e8d01-0319-4d1e-a829-52ad28d1bb01>
Date: Sun, 28 Oct 2018 15:32:45 +0000
Subject: OCTOSPI driver and demo, to be tested.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12395 110e8d01-0319-4d1e-a829-52ad28d1bb01
---
 testhal/STM32/multi/WSPI-MFS/.cproject | 37 ++++++++++++++++++++++++++++++++++
 testhal/STM32/multi/WSPI-MFS/Makefile  |  5 +++++
 testhal/STM32/multi/WSPI-MFS/main.c    | 13 +++++++++++-
 3 files changed, 54 insertions(+), 1 deletion(-)

(limited to 'testhal/STM32')

diff --git a/testhal/STM32/multi/WSPI-MFS/.cproject b/testhal/STM32/multi/WSPI-MFS/.cproject
index 5052dd0dd..23334856f 100644
--- a/testhal/STM32/multi/WSPI-MFS/.cproject
+++ b/testhal/STM32/multi/WSPI-MFS/.cproject
@@ -69,6 +69,40 @@
 			</storageModule>
 			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
 		</cconfiguration>
+		<cconfiguration id="0.365230168.523175374.1317499780">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="0.365230168.523175374.1317499780" moduleId="org.eclipse.cdt.core.settings" name="Build for STM32L4R9I-Discovery">
+				<externalSettings/>
+				<extensions>
+					<extension id="org.eclipse.cdt.core.VCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration artifactName="${ProjName}" buildProperties="" description="" id="0.365230168.523175374.1317499780" name="Build for STM32L4R9I-Discovery" parent="org.eclipse.cdt.build.core.prefbase.cfg">
+					<folderInfo id="0.365230168.523175374.1317499780." name="/" resourcePath="">
+						<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.422616424" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">
+							<targetPlatform id="org.eclipse.cdt.build.core.prefbase.toolchain.422616424.831498612" name=""/>
+							<builder arguments="-f ./make/stm32l4r9_discovery.make" autoBuildTarget="all" cleanBuildTarget="clean" command="make" enableAutoBuild="false" enableCleanBuild="true" enabledIncrementalBuild="true" id="org.eclipse.cdt.build.core.settings.default.builder.909647824" incrementalBuildTarget="all" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
+							<tool id="org.eclipse.cdt.build.core.settings.holder.libs.1213130413" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>
+							<tool id="org.eclipse.cdt.build.core.settings.holder.1946493293" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">
+								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1093589864" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
+							</tool>
+							<tool id="org.eclipse.cdt.build.core.settings.holder.1471618601" name="GNU C++" superClass="org.eclipse.cdt.build.core.settings.holder">
+								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.324762531" languageId="org.eclipse.cdt.core.g++" languageName="GNU C++" sourceContentType="org.eclipse.cdt.core.cxxSource,org.eclipse.cdt.core.cxxHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
+							</tool>
+							<tool id="org.eclipse.cdt.build.core.settings.holder.289663315" name="GNU C" superClass="org.eclipse.cdt.build.core.settings.holder">
+								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1897662839" languageId="org.eclipse.cdt.core.gcc" languageName="GNU C" sourceContentType="org.eclipse.cdt.core.cSource,org.eclipse.cdt.core.cHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
+							</tool>
+						</toolChain>
+					</folderInfo>
+				</configuration>
+			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+		</cconfiguration>
 	</storageModule>
 	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
 		<project id="STM32-WSPI-MFS.null.1829068891" name="STM32-WSPI-MFS"/>
@@ -78,6 +112,9 @@
 		<configuration configurationName="Default">
 			<resource resourceType="PROJECT" workspacePath="/STM32-WSPI-MFS"/>
 		</configuration>
+		<configuration configurationName="Build for STM32L4R9I-Discovery">
+			<resource resourceType="PROJECT" workspacePath="/STM32-WSPI-MFS"/>
+		</configuration>
 		<configuration configurationName="Build for STM32L476-Discovery"/>
 	</storageModule>
 	<storageModule moduleId="scannerConfiguration">
diff --git a/testhal/STM32/multi/WSPI-MFS/Makefile b/testhal/STM32/multi/WSPI-MFS/Makefile
index 8fed918b3..0171204af 100644
--- a/testhal/STM32/multi/WSPI-MFS/Makefile
+++ b/testhal/STM32/multi/WSPI-MFS/Makefile
@@ -6,6 +6,9 @@ all:
 	@echo
 	@echo === Building for STM32L476-Discovery ===============================
 	+@make --no-print-directory -f ./make/stm32l476_discovery.make all
+	@echo
+	@echo === Building for STM32L4R9-Discovery ===============================
+	+@make --no-print-directory -f ./make/stm32l4r9_discovery.make all
 	@echo ====================================================================
 	@echo
 
@@ -13,6 +16,8 @@ clean:
 	@echo
 	+@make --no-print-directory -f ./make/stm32l476_discovery.make clean
 	@echo
+	+@make --no-print-directory -f ./make/stm32l4r9_discovery.make clean
+	@echo
 
 #
 ##############################################################################
diff --git a/testhal/STM32/multi/WSPI-MFS/main.c b/testhal/STM32/multi/WSPI-MFS/main.c
index 826daab70..0bce0c7f3 100644
--- a/testhal/STM32/multi/WSPI-MFS/main.c
+++ b/testhal/STM32/multi/WSPI-MFS/main.c
@@ -26,11 +26,22 @@
 
 #include "portab.h"
 
+#if defined(STM32_WSPI_USE_OCTOSPI1)
 /* 16MB device, 2 cycles delay after NCS.*/
 const WSPIConfig WSPIcfg1 = {
   .end_cb           = NULL,
-  .dcr              = STM32_DCR_FSIZE(24) | STM32_DCR_CSHT(1)
+  .dcr1             = STM32_DCR1_DEVSIZE(24U) | STM32_DCR1_CSHT(1U),
+  .dcr2             = 0U,
+  .dcr3             = 0U,
+  .dcr4             = 0U
 };
+#else /* It is a quad SPI.*/
+/* 16MB device, 2 cycles delay after NCS.*/
+const WSPIConfig WSPIcfg1 = {
+  .end_cb           = NULL,
+  .dcr              = STM32_DCR_FSIZE(24U) | STM32_DCR_CSHT(1U)
+};
+#endif
 
 const SNORConfig snorcfg1 = {
   .busp             = &WSPID1,
-- 
cgit v1.2.3