Merge branch 'MassiveDebug'

Downstream/.cproject

@@ -79,6 +79,7 @@
 							</tool>
 							<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.linker.975001742" name="Cross ARM C++ Linker" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.linker">
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.linker.gcsections.2071573630" name="Remove unused sections (-Xlinker --gc-sections)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.linker.gcsections" value="true" valueType="boolean"/>
+								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.linker.usenewlibnano.533761955" name="Use newlib-nano (--specs=nano.specs)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.linker.usenewlibnano" value="true" valueType="boolean"/>
 							</tool>
 							<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.archiver.2092748559" name="Cross ARM GNU Archiver" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.archiver"/>
 							<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.createflash.2147256520" name="Cross ARM GNU Create Flash Image" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.createflash"/>
@@ -91,7 +92,7 @@
 							</tool>
 							<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.printsize.2134899522" name="Cross ARM GNU Print Size" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.printsize">
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.printsize.format.596374317" name="Size format" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.printsize.format"/>
-								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.printsize.totals.878347212" name="Show totals" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.printsize.totals" value="true" valueType="boolean"/>
+								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.printsize.totals.878347212" name="Show totals" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.printsize.totals" value="false" valueType="boolean"/>
 							</tool>
 						</toolChain>
 					</folderInfo>
@@ -131,7 +132,7 @@
 				<configuration artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" cleanCommand="${cross_rm} -rf" description="" id="ilg.gnuarmeclipse.managedbuild.cross.config.elf.release.1300395207" name="Release" parent="ilg.gnuarmeclipse.managedbuild.cross.config.elf.release">
 					<folderInfo id="ilg.gnuarmeclipse.managedbuild.cross.config.elf.release.1300395207." name="/" resourcePath="">
 						<toolChain id="ilg.gnuarmeclipse.managedbuild.cross.toolchain.elf.release.14803562" name="Cross ARM GCC" nonInternalBuilderId="ilg.gnuarmeclipse.managedbuild.cross.builder" superClass="ilg.gnuarmeclipse.managedbuild.cross.toolchain.elf.release">
-							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.level.900298893" name="Optimization Level" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.level" value="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.level.size" valueType="enumerated"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.level.900298893" name="Optimization Level" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.level" value="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.level.most" valueType="enumerated"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.messagelength.1083811839" name="Message length (-fmessage-length=0)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.messagelength" value="true" valueType="boolean"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.signedchar.1983172660" name="'char' is signed (-fsigned-char)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.signedchar" value="true" valueType="boolean"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.functionsections.413875025" name="Function sections (-ffunction-sections)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.functionsections" value="true" valueType="boolean"/>
@@ -140,7 +141,7 @@
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.debugging.format.753446064" name="Debug format" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.debugging.format"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.toolchain.name.871783047" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.toolchain.name" value="GNU Tools for ARM Embedded Processors" valueType="string"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.architecture.980964112" name="Architecture" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.architecture" value="ilg.gnuarmeclipse.managedbuild.cross.option.architecture.arm" valueType="enumerated"/>
-							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.family.1722001019" name="ARM family" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.family" value="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.mcpu.cortex-m3" valueType="enumerated"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.family.1722001019" name="ARM family" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.family" value="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.mcpu.cortex-m4" valueType="enumerated"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.instructionset.311057983" name="Instruction set" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.instructionset" value="ilg.gnuarmeclipse.managedbuild.cross.option.arm.target.instructionset.thumb" valueType="enumerated"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.command.prefix.985310446" name="Prefix" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.command.prefix" value="arm-none-eabi-" valueType="string"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.command.c.2064369703" name="C compiler" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.command.c" value="gcc" valueType="string"/>
@@ -153,6 +154,12 @@
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.command.rm.969460679" name="Remove command" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.command.rm" value="rm" valueType="string"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.addtools.createflash.345738649" name="Create flash image" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.addtools.createflash" value="true" valueType="boolean"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.addtools.printsize.2110677739" name="Print size" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.addtools.printsize" value="true" valueType="boolean"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.unused.507402152" name="Warn on various unused elements (-Wunused)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.unused" value="true" valueType="boolean"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.uninitialized.711919668" name="Warn on uninitialized variables (-Wuninitialised)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.uninitialized" value="true" valueType="boolean"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.allwarn.144133984" name="Enable all common warnings (-Wall)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.allwarn" value="true" valueType="boolean"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.extrawarn.1473585294" name="Enable extra warnings (-Wextra)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.extrawarn" value="true" valueType="boolean"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.pointerarith.1192110404" name="Warn if pointer arithmetic (-Wpointer-arith)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.pointerarith" value="true" valueType="boolean"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.logicalop.322411367" name="Warn if suspicious logical ops (-Wlogical-op)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.logicalop" value="true" valueType="boolean"/>
 							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform.777514892" isAbstract="false" osList="all" superClass="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform"/>
 							<builder autoBuildTarget="all" buildPath="${workspace_loc:/Downstream}/Release" cleanBuildTarget="clean" command="${cross_make}" id="org.eclipse.cdt.build.core.internal.builder.1921336679" incrementalBuildTarget="all" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="CDT Internal Builder" superClass="org.eclipse.cdt.build.core.internal.builder"/>
 							<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler.314526004" name="Cross ARM GNU Assembler" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler">
@@ -176,6 +183,11 @@
 							<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.compiler.118177754" name="Cross ARM C++ Compiler" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.compiler"/>
 							<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.c.linker.517364889" name="Cross ARM C Linker" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.c.linker">
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.gcsections.961434630" name="Remove unused sections (-Xlinker --gc-sections)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.gcsections" value="true" valueType="boolean"/>
+								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.nostart.655825353" name="Do not use standard start files (-nostartfiles)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.nostart" value="true" valueType="boolean"/>
+								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.scriptfile.773899963" name="Script files (-T)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.scriptfile" valueType="stringList">
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/gcc_arm_stm32f407.ld}&quot;"/>
+								</option>
+								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.usenewlibnano.1318058184" name="Use newlib-nano (--specs=nano.specs)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.linker.usenewlibnano" value="true" valueType="boolean"/>
 								<inputType id="ilg.gnuarmeclipse.managedbuild.cross.tool.c.linker.input.447256356" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.c.linker.input">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
 									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
@@ -183,6 +195,7 @@
 							</tool>
 							<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.linker.426760484" name="Cross ARM C++ Linker" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.linker">
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.linker.gcsections.880923175" name="Remove unused sections (-Xlinker --gc-sections)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.linker.gcsections" value="true" valueType="boolean"/>
+								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.linker.usenewlibnano.464992520" name="Use newlib-nano (--specs=nano.specs)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.linker.usenewlibnano" value="true" valueType="boolean"/>
 							</tool>
 							<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.archiver.1866465855" name="Cross ARM GNU Archiver" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.archiver"/>
 							<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.createflash.1030031530" name="Cross ARM GNU Create Flash Image" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.createflash"/>

Downstream/.settings/language.settings.xml

@@ -16,7 +16,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="1723646041989140533" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings Cross ARM" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="1669980423485916277" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings Cross ARM" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>

Downstream/.settings/org.eclipse.cdt.managedbuilder.core.prefs

@@ -5,7 +5,17 @@ environment/buildEnvironmentInclude/ilg.gnuarmeclipse.managedbuild.cross.config.
 environment/buildEnvironmentInclude/ilg.gnuarmeclipse.managedbuild.cross.config.elf.debug.110983800/C_INCLUDE_PATH/operation=remove
 environment/buildEnvironmentInclude/ilg.gnuarmeclipse.managedbuild.cross.config.elf.debug.110983800/append=true
 environment/buildEnvironmentInclude/ilg.gnuarmeclipse.managedbuild.cross.config.elf.debug.110983800/appendContributed=true
+environment/buildEnvironmentInclude/ilg.gnuarmeclipse.managedbuild.cross.config.elf.release.1300395207/CPATH/delimiter=\:
+environment/buildEnvironmentInclude/ilg.gnuarmeclipse.managedbuild.cross.config.elf.release.1300395207/CPATH/operation=remove
+environment/buildEnvironmentInclude/ilg.gnuarmeclipse.managedbuild.cross.config.elf.release.1300395207/C_INCLUDE_PATH/delimiter=\:
+environment/buildEnvironmentInclude/ilg.gnuarmeclipse.managedbuild.cross.config.elf.release.1300395207/C_INCLUDE_PATH/operation=remove
+environment/buildEnvironmentInclude/ilg.gnuarmeclipse.managedbuild.cross.config.elf.release.1300395207/append=true
+environment/buildEnvironmentInclude/ilg.gnuarmeclipse.managedbuild.cross.config.elf.release.1300395207/appendContributed=true
 environment/buildEnvironmentLibrary/ilg.gnuarmeclipse.managedbuild.cross.config.elf.debug.110983800/LIBRARY_PATH/delimiter=\:
 environment/buildEnvironmentLibrary/ilg.gnuarmeclipse.managedbuild.cross.config.elf.debug.110983800/LIBRARY_PATH/operation=remove
 environment/buildEnvironmentLibrary/ilg.gnuarmeclipse.managedbuild.cross.config.elf.debug.110983800/append=true
 environment/buildEnvironmentLibrary/ilg.gnuarmeclipse.managedbuild.cross.config.elf.debug.110983800/appendContributed=true
+environment/buildEnvironmentLibrary/ilg.gnuarmeclipse.managedbuild.cross.config.elf.release.1300395207/LIBRARY_PATH/delimiter=\:
+environment/buildEnvironmentLibrary/ilg.gnuarmeclipse.managedbuild.cross.config.elf.release.1300395207/LIBRARY_PATH/operation=remove
+environment/buildEnvironmentLibrary/ilg.gnuarmeclipse.managedbuild.cross.config.elf.release.1300395207/append=true
+environment/buildEnvironmentLibrary/ilg.gnuarmeclipse.managedbuild.cross.config.elf.release.1300395207/appendContributed=true

Downstream/Downstream Debug.launch

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="ilg.gnuarmeclipse.debug.gdbjtag.openocd.launchConfigurationType">
-<stringAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.PERIPHERALS" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;peripherals/&gt;&#10;"/>
+<stringAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.PERIPHERALS" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;peripherals&gt;&#10;&lt;peripheral name=&quot;OTG_FS_GLOBAL&quot;/&gt;&#10;&lt;peripheral name=&quot;OTG_FS_HOST&quot;/&gt;&#10;&lt;/peripherals&gt;&#10;"/>
 <booleanAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.openocd.doContinue" value="true"/>
 <booleanAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.openocd.doDebugInRam" value="false"/>
 <booleanAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.openocd.doFirstReset" value="true"/>
@@ -61,6 +61,6 @@
 <listAttribute key="org.eclipse.debug.ui.favoriteGroups">
 <listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
 </listAttribute>
-<stringAttribute key="org.eclipse.dsf.launch.MEMORY_BLOCKS" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;memoryBlockExpressionList context=&quot;Context string&quot;&gt;&#10;&lt;memoryBlockExpression address=&quot;536874100&quot; label=&quot;0x20000c74&quot;/&gt;&#10;&lt;memoryBlockExpression address=&quot;536874078&quot; label=&quot;0x20000c5e&quot;/&gt;&#10;&lt;/memoryBlockExpressionList&gt;&#10;"/>
+<stringAttribute key="org.eclipse.dsf.launch.MEMORY_BLOCKS" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;memoryBlockExpressionList context=&quot;Context string&quot;/&gt;&#10;"/>
 <stringAttribute key="process_factory_id" value="org.eclipse.cdt.dsf.gdb.GdbProcessFactory"/>
 </launchConfiguration>

Downstream/Downstream Release.launch

@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="ilg.gnuarmeclipse.debug.gdbjtag.openocd.launchConfigurationType">
+<stringAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.PERIPHERALS" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;peripherals/&gt;&#10;"/>
+<booleanAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.openocd.doContinue" value="true"/>
+<booleanAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.openocd.doDebugInRam" value="false"/>
+<booleanAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.openocd.doFirstReset" value="true"/>
+<booleanAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.openocd.doGdbServerAllocateConsole" value="true"/>
+<booleanAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.openocd.doGdbServerAllocateTelnetConsole" value="false"/>
+<booleanAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.openocd.doSecondReset" value="true"/>
+<booleanAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.openocd.doStartGdbServer" value="true"/>
+<booleanAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.openocd.enableSemihosting" value="true"/>
+<stringAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.openocd.firstResetType" value="init"/>
+<stringAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.openocd.gdbClientOtherCommands" value="set mem inaccessible-by-default off"/>
+<stringAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.openocd.gdbClientOtherOptions" value=""/>
+<stringAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.openocd.gdbServerConnectionAddress" value=""/>
+<stringAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.openocd.gdbServerExecutable" value="${openocd_path}/${openocd_executable}"/>
+<intAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.openocd.gdbServerGdbPortNumber" value="3333"/>
+<stringAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.openocd.gdbServerLog" value=""/>
+<stringAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.openocd.gdbServerOther" value="-f interface/ftdi/olimex-arm-usb-tiny-h.cfg -f board/olimex_stm32_h407.cfg"/>
+<intAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.openocd.gdbServerTelnetPortNumber" value="4444"/>
+<stringAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.openocd.otherInitCommands" value=""/>
+<stringAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.openocd.otherRunCommands" value=""/>
+<stringAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.openocd.secondResetType" value="halt"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.imageFileName" value=""/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.imageOffset" value=""/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.ipAddress" value="localhost"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.jtagDevice" value="GNU ARM OpenOCD"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.loadImage" value="true"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.loadSymbols" value="true"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.pcRegister" value=""/>
+<intAttribute key="org.eclipse.cdt.debug.gdbjtag.core.portNumber" value="3333"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.setPcRegister" value="false"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.setResume" value="false"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.setStopAt" value="true"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.stopAt" value="main"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.symbolsFileName" value=""/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.symbolsOffset" value=""/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.useFileForImage" value="false"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.useFileForSymbols" value="false"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.useProjBinaryForImage" value="true"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.useProjBinaryForSymbols" value="true"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.useRemoteTarget" value="true"/>
+<stringAttribute key="org.eclipse.cdt.debug.mi.core.commandFactory" value="Standard (Linux)"/>
+<stringAttribute key="org.eclipse.cdt.debug.mi.core.protocol" value="mi"/>
+<booleanAttribute key="org.eclipse.cdt.debug.mi.core.verboseMode" value="false"/>
+<stringAttribute key="org.eclipse.cdt.dsf.gdb.DEBUG_NAME" value="${cross_prefix}gdb${cross_suffix}"/>
+<booleanAttribute key="org.eclipse.cdt.dsf.gdb.UPDATE_THREADLIST_ON_SUSPEND" value="false"/>
+<intAttribute key="org.eclipse.cdt.launch.ATTR_BUILD_BEFORE_LAUNCH_ATTR" value="2"/>
+<stringAttribute key="org.eclipse.cdt.launch.COREFILE_PATH" value=""/>
+<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_REGISTER_GROUPS" value=""/>
+<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="Release/Downstream.elf"/>
+<stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="Downstream"/>
+<booleanAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_AUTO_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_ID_ATTR" value="ilg.gnuarmeclipse.managedbuild.cross.config.elf.debug.110983800"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/Downstream"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="4"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.dsf.launch.MEMORY_BLOCKS" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;memoryBlockExpressionList context=&quot;Context string&quot;&gt;&#10;&lt;memoryBlockExpression address=&quot;536874100&quot; label=&quot;0x20000c74&quot;/&gt;&#10;&lt;memoryBlockExpression address=&quot;536874078&quot; label=&quot;0x20000c5e&quot;/&gt;&#10;&lt;/memoryBlockExpressionList&gt;&#10;"/>
+<stringAttribute key="process_factory_id" value="org.eclipse.cdt.dsf.gdb.GdbProcessFactory"/>
+</launchConfiguration>

Downstream/Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_hcd.c

@@ -451,7 +451,7 @@ void HAL_HCD_IRQHandler(HCD_HandleTypeDef *hhcd)
   USB_OTG_GlobalTypeDef *USBx = hhcd->Instance;
   uint32_t i = 0 , interrupt = 0;
   
-  /* Ensure that we are in device mode */
+  /* Ensure that we are in host mode */
   if (USB_GetMode(hhcd->Instance) == USB_OTG_MODE_HOST)
   {
     /* Avoid spurious interrupt */
@@ -821,7 +821,6 @@ static void HCD_HC_IN_IRQHandler(HCD_HandleTypeDef *hhcd, uint8_t chnum)
   
   else if ((USBx_HC(chnum)->HCINT) &  USB_OTG_HCINT_XFRC)
   {
-    
     if (hhcd->Init.dma_enable)
     {
       hhcd->hc[chnum].xfer_count = hhcd->hc[chnum].xfer_len - \
@@ -865,7 +864,8 @@ static void HCD_HC_IN_IRQHandler(HCD_HandleTypeDef *hhcd, uint8_t chnum)
     }
     
     else if((hhcd->hc[chnum].state == HC_XACTERR) ||
-            (hhcd->hc[chnum].state == HC_DATATGLERR))
+            (hhcd->hc[chnum].state == HC_DATATGLERR) ||
+			(hhcd->hc[chnum].state == HC_NAK))
     {
       if(hhcd->hc[chnum].ErrCnt++ > 3)
       {      
@@ -897,20 +897,21 @@ static void HCD_HC_IN_IRQHandler(HCD_HandleTypeDef *hhcd, uint8_t chnum)
   }
   else if ((USBx_HC(chnum)->HCINT) &  USB_OTG_HCINT_NAK)
   {  
-    if(hhcd->hc[chnum].ep_type == EP_TYPE_INTR)
+	  hhcd->hc[chnum].ErrCnt = 0;
-    {
+//    if(hhcd->hc[chnum].ep_type == EP_TYPE_INTR)
+//    {
       __HAL_HCD_UNMASK_HALT_HC_INT(chnum); 
       USB_HC_Halt(hhcd->Instance, chnum);  
-    }
+//    }
-    else if  ((hhcd->hc[chnum].ep_type == EP_TYPE_CTRL)||
+//    else if  ((hhcd->hc[chnum].ep_type == EP_TYPE_CTRL)||
-              (hhcd->hc[chnum].ep_type == EP_TYPE_BULK))
+//              (hhcd->hc[chnum].ep_type == EP_TYPE_BULK))
-    {
+//    {
-      /* re-activate the channel */
+//      /* re-activate the channel */
-      tmpreg = USBx_HC(chnum)->HCCHAR;
+//      tmpreg = USBx_HC(chnum)->HCCHAR;
-      tmpreg &= ~USB_OTG_HCCHAR_CHDIS;
+//      tmpreg &= ~USB_OTG_HCCHAR_CHDIS;
-      tmpreg |= USB_OTG_HCCHAR_CHENA;
+//      tmpreg |= USB_OTG_HCCHAR_CHENA;
-      USBx_HC(chnum)->HCCHAR = tmpreg;
+//      USBx_HC(chnum)->HCCHAR = tmpreg;
-    }
+//    }
     hhcd->hc[chnum].state = HC_NAK;
     __HAL_HCD_CLEAR_HC_INT(chnum, USB_OTG_HCINT_NAK);
   }

Downstream/Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_spi.c

@@ -102,7 +102,7 @@
 
 /* Private typedef -----------------------------------------------------------*/
 /* Private define ------------------------------------------------------------*/
-#define SPI_TIMEOUT_VALUE  10
+#define SPI_TIMEOUT_VALUE  2
 /* Private macro -------------------------------------------------------------*/
 /* Private variables ---------------------------------------------------------*/
 /* Private function prototypes -----------------------------------------------*/
@@ -1933,6 +1933,8 @@ static void SPI_RxISR(SPI_HandleTypeDef *hspi)
   */
 static void SPI_DMATransmitCplt(DMA_HandleTypeDef *hdma)
 {
+  __IO uint16_t tmpreg;
+
   SPI_HandleTypeDef* hspi = ( SPI_HandleTypeDef* )((DMA_HandleTypeDef* )hdma)->Parent;
 
   /* DMA Normal Mode */
@@ -1963,7 +1965,7 @@ static void SPI_DMATransmitCplt(DMA_HandleTypeDef *hdma)
    __HAL_SPI_CLEAR_OVRFLAG(hspi);
   }
 
-  /* Check if Errors has been detected during transfer */
+   /* Check if Errors has been detected during transfer */
   if(hspi->ErrorCode != HAL_SPI_ERROR_NONE)
   {
     HAL_SPI_ErrorCallback(hspi);
@@ -2066,14 +2068,14 @@ static void SPI_DMAEndTransmitReceive(SPI_HandleTypeDef *hspi)
   if(hspi->Init.CRCCalculation == SPI_CRCCALCULATION_ENABLE)
   {
     /* Check if CRC is done on going (RXNE flag set) */
-    if(SPI_WaitOnFlagUntilTimeout(hspi, SPI_FLAG_RXNE, SET, SPI_TIMEOUT_VALUE) == HAL_OK)
+//    if(SPI_WaitOnFlagUntilTimeout(hspi, SPI_FLAG_RXNE, SET, SPI_TIMEOUT_VALUE) == HAL_OK)
-    {
+//    {
       /* Wait until RXNE flag is set to send data */
       if(SPI_WaitOnFlagUntilTimeout(hspi, SPI_FLAG_RXNE, RESET, SPI_TIMEOUT_VALUE) != HAL_OK)
       {
         hspi->ErrorCode |= HAL_SPI_ERROR_FLAG;
       }
-    }
+//    }
     /* Read CRC */
     tmpreg = hspi->Instance->DR;
     UNUSED(tmpreg);
@@ -2097,7 +2099,10 @@ static void SPI_DMAEndTransmitReceive(SPI_HandleTypeDef *hspi)
   /* Wait until Busy flag is reset before disabling SPI */
   if(SPI_WaitOnFlagUntilTimeout(hspi, SPI_FLAG_BSY, SET, SPI_TIMEOUT_VALUE) != HAL_OK)
   {
-    hspi->ErrorCode |= HAL_SPI_ERROR_FLAG;
+	//The Busy flag occasionally fails to reset within timeout. No idea why.
+	//But in this case WaitOnFlagUntilTimeout disables the SPI for us,
+	//so we can ignore the error and carry on.
+    //hspi->ErrorCode |= HAL_SPI_ERROR_FLAG;
   }
   
   /* Disable Rx DMA Request */

Downstream/Inc/board_config.h

@@ -40,10 +40,10 @@
 #define FAULT_LED_OFF			STAT_LED_OFF
 
 
-//#define SPI_DMA_ACTIVE_PIN		GPIO_PIN_5		/////////Temporary indicator of SPI & DMA activity
+#define SPI_INT_ACTIVE_PIN		GPIO_PIN_2		/////////Temporary indicator of SPI activity
-//#define SPI_DMA_ACTIVE_PORT		GPIOB
+#define SPI_INT_ACTIVE_PORT		GPIOA
-//#define SPI_DMA_ACTIVE_ON		SPI_DMA_ACTIVE_PORT->BSRR = (SPI_DMA_ACTIVE_PIN << BSRR_SHIFT_LOW)
+#define SPI_INT_ACTIVE_ON		SPI_INT_ACTIVE_PORT->BSRR = (SPI_INT_ACTIVE_PIN << BSRR_SHIFT_HIGH)
-//#define SPI_DMA_ACTIVE_OFF		SPI_DMA_ACTIVE_PORT->BSRR = (SPI_DMA_ACTIVE_PIN << BSRR_SHIFT_HIGH)
+#define SPI_INT_ACTIVE_OFF		SPI_INT_ACTIVE_PORT->BSRR = (SPI_INT_ACTIVE_PIN << BSRR_SHIFT_LOW)
 
 //#define SPI1_NSS_PIN			GPIO_PIN_4
 //#define SPI1_NSS_PORT			GPIOA

Downstream/Inc/downstream_interface_def.h

@@ -43,8 +43,8 @@ typedef enum
 {
 	COMMAND_MSC_TEST_UNIT_READY,	//Returns HAL_StatusTypeDef result
 	COMMAND_MSC_GET_CAPACITY,		//Returns uint32_t blk_nbr, uint32_t blk_size
-	COMMAND_MSC_BEGIN_READ,			//Returns HAL_StatusTypeDef result, then data stream
+	COMMAND_MSC_READ,				//Returns HAL_StatusTypeDef result, then data stream
-	COMMAND_MSC_BEGIN_WRITE,		//Returns HAL_OK, HAL_ERROR if medium not present, HAL_BUSY if write-protected result, then waits for data stream
+	COMMAND_MSC_WRITE,				//Returns HAL_OK, HAL_ERROR if medium not present, HAL_BUSY if write-protected result, then waits for data stream
 }
 InterfaceCommandMscTypeDef;
 

Downstream/Inc/downstream_msc.h

@@ -17,13 +17,13 @@
 
 
 typedef void (*DownstreamMSCCallbackPacketTypeDef)(DownstreamPacketTypeDef* receivedPacket,
-												   uint16_t dataLength);
+												   uint16_t dataLength8);
 
 
 HAL_StatusTypeDef Downstream_MSC_ApproveConnectedDevice(void);
 void Downstream_MSC_PacketProcessor(DownstreamPacketTypeDef* receivedPacket);
 HAL_StatusTypeDef Downstream_MSC_PutStreamDataPacket(DownstreamPacketTypeDef* packetToSend,
-													 uint32_t dataLength);
+													 uint32_t dataLength8);
 HAL_StatusTypeDef Downstream_MSC_GetStreamDataPacket(DownstreamMSCCallbackPacketTypeDef callback);
 
 

Downstream/Inc/downstream_spi.h

@@ -12,16 +12,19 @@
 #include "usbh_config.h"
 
 
-#define DOWNSTREAM_PACKET_HEADER_LEN	(2)			//Min length = CommandClass & Command bytes
+#define DOWNSTREAM_PACKET_HEADER_LEN		(2)			//Min length = CommandClass & Command bytes
-#define DOWNSTREAM_PACKET_LEN			(DOWNSTREAM_PACKET_HEADER_LEN + USBH_MAX_DATA_BUFFER)
+#define DOWNSTREAM_PACKET_LEN				(DOWNSTREAM_PACKET_HEADER_LEN + USBH_MAX_DATA_BUFFER)
-#define DOWNSTREAM_PACKET_LEN_MIN		(DOWNSTREAM_PACKET_HEADER_LEN)
+#define DOWNSTREAM_PACKET_LEN_MIN			(DOWNSTREAM_PACKET_HEADER_LEN)
 
+#define DOWNSTREAM_PACKET_HEADER_LEN_16		(DOWNSTREAM_PACKET_HEADER_LEN / 2)
+#define DOWNSTREAM_PACKET_LEN_16			(DOWNSTREAM_PACKET_LEN / 2)
+#define DOWNSTREAM_PACKET_LEN_MIN_16		(DOWNSTREAM_PACKET_LEN_MIN / 2)
 
 #define DOWNSTREAM_SPI_FREAKOUT									\
 	do {														\
 		LED_Fault_SetBlinkRate(LED_FAST_BLINK_RATE);			\
-		Downstream_PacketProcessor_SetErrorState();				\
+		/*Downstream_PacketProcessor_SetErrorState();*/				\
-		DownstreamInterfaceState = DOWNSTREAM_INTERFACE_ERROR;	\
+		/*DownstreamInterfaceState = DOWNSTREAM_INTERFACE_ERROR;*/	\
 		while (1);												\
 	} while (0);
 
@@ -50,11 +53,10 @@ PacketBusyTypeDef;
 typedef struct
 {
 	PacketBusyTypeDef	Busy;						//Everything after Busy should be word-aligned
-	uint16_t			Length __ALIGN_END;			//Packet length includes CommandClass, Command, and Data
+	uint16_t			Length16 __ALIGN_END;		//Packet length includes CommandClass, Command, and Data
 	uint8_t				CommandClass;
 	uint8_t				Command;
 	uint8_t				Data[USBH_MAX_DATA_BUFFER];	//Should (must?) be word-aligned, for USB copy routine
-	uint8_t				RxCrc;
 }
 DownstreamPacketTypeDef;
 
@@ -70,10 +72,9 @@ DownstreamPacketTypeDef* Downstream_GetFreePacketImmediately(void);
 void Downstream_ReleasePacket(DownstreamPacketTypeDef* packetToRelease);
 HAL_StatusTypeDef Downstream_ReceivePacket(SpiPacketReceivedCallbackTypeDef callback);
 HAL_StatusTypeDef Downstream_TransmitPacket(DownstreamPacketTypeDef* packetToWrite);
+void Downstream_SPIProcess(void);
 
-void HAL_SPI_RxCpltCallback(SPI_HandleTypeDef *hspi);
 void HAL_SPI_TxRxCpltCallback(SPI_HandleTypeDef *hspi);
-void HAL_SPI_TxCpltCallback(SPI_HandleTypeDef *hspi);
 void HAL_SPI_ErrorCallback(SPI_HandleTypeDef *hspi);
 
 

Downstream/Inc/interrupts.h

@@ -44,8 +44,9 @@
 /* Exported constants --------------------------------------------------------*/
 
 #define INT_PRIORITY_SYSTICK	2
-#define INT_PRIORITY_SPI_DMA	10			//SPI interacts heavily with USB_OTG,
+//#define INT_PRIORITY_SPI_DMA	10
-#define INT_PRIORITY_OTG_FS		10			//so set them at the same priority.
+#define INT_PRIORITY_SPI		8			//Interrupt-based SPI must be highest priority!
+#define INT_PRIORITY_OTG_FS		10
 
 
  /* Exported macro ------------------------------------------------------------*/

Downstream/Middlewares/ST/STM32_USB_Host_Library/Class/MSC/Inc/usbh_msc_bot.h

@@ -90,8 +90,10 @@ typedef enum {
   BOT_SEND_CBW  = 1,
   BOT_SEND_CBW_WAIT,         
   BOT_DATA_IN,
+  BOT_DATA_IN_WAIT_FREE_PACKET,
   BOT_DATA_IN_WAIT,    
   BOT_DATA_OUT, 
+  BOT_DATA_OUT_WAIT_RECEIVE_PACKET,
   BOT_DATA_OUT_WAIT,     
   BOT_RECEIVE_CSW,
   BOT_RECEIVE_CSW_WAIT,       

Downstream/Middlewares/ST/STM32_USB_Host_Library/Class/MSC/Src/usbh_msc.c

@@ -477,19 +477,13 @@ static USBH_StatusTypeDef USBH_MSC_Process(USBH_HandleTypeDef *phost)
       default:
         break;
       }
-      
-#if (USBH_USE_OS == 1)
-    osMessagePut ( phost->os_event, USBH_CLASS_EVENT, 0);
-#endif       
     }
     else
     {
-      MSC_Handle->current_lun = 0;
+    	MSC_Handle->current_lun = 0;
-    MSC_Handle->state = MSC_IDLE;
+    	MSC_Handle->state = MSC_IDLE;
-#if (USBH_USE_OS == 1)
+
-    osMessagePut ( phost->os_event, USBH_CLASS_EVENT, 0);
+		phost->pUser(phost, HOST_USER_CLASS_ACTIVE);
-#endif 
-    phost->pUser(phost, HOST_USER_CLASS_ACTIVE);     
     }
     break;
 
@@ -499,10 +493,6 @@ static USBH_StatusTypeDef USBH_MSC_Process(USBH_HandleTypeDef *phost)
 
   case MSC_READ:
   case MSC_WRITE:
-	//USBH_MSC_RdWrProcess interacts heavily with downstream SPI code.
-	//So to protect against preemption we elevate our priority here.
-	__set_BASEPRI(INT_PRIORITY_OTG_FS);
-
 	error = USBH_MSC_RdWrProcess(phost, MSC_Handle->rw_lun);
 	if(((int32_t)(phost->Timer - MSC_Handle->timeout) > 0) || (phost->device.is_connected == 0))
 	{
@@ -518,8 +508,6 @@ static USBH_StatusTypeDef USBH_MSC_Process(USBH_HandleTypeDef *phost)
 			MSC_Handle->RdWrCompleteCallback = NULL;
 		}
 	}
-
-	__set_BASEPRI(0);
 	break;
 
   default:

Downstream/Middlewares/ST/STM32_USB_Host_Library/Class/MSC/Src/usbh_msc_bot.c

@@ -177,10 +177,10 @@ USBH_StatusTypeDef USBH_MSC_BOT_Process (USBH_HandleTypeDef *phost, uint8_t lun)
     break;
     
   case BOT_DATA_IN:
-	MSC_Handle->hbot.state = BOT_DATA_IN_WAIT;
 	if (MSC_Handle->hbot.pbuf != NULL)
 	{
 		//Simple single-buffer operation
+		MSC_Handle->hbot.state = BOT_DATA_IN_WAIT;
 		MSC_Handle->hbot.this_URB_size = MIN(MSC_Handle->hbot.cbw.field.DataTransferLength,
 											 MSC_Handle->InEpSize);
 		USBH_BulkReceiveData (phost,
@@ -191,6 +191,7 @@ USBH_StatusTypeDef USBH_MSC_BOT_Process (USBH_HandleTypeDef *phost, uint8_t lun)
 	else
 	{
 		//Asynchronous multi-packet operation: get first packet
+		MSC_Handle->hbot.state = BOT_DATA_IN_WAIT_FREE_PACKET;
 		Callback_MSC_phost = phost;
 		if (Downstream_GetFreePacket(USBH_MSC_BOT_Read_Multipacket_FreePacketCallback) != HAL_OK)
 		{
@@ -199,11 +200,19 @@ USBH_StatusTypeDef USBH_MSC_BOT_Process (USBH_HandleTypeDef *phost, uint8_t lun)
 	}
 	break;
     
+  case BOT_DATA_IN_WAIT_FREE_PACKET:
+	  break;
+
   case BOT_DATA_IN_WAIT:  
     URB_Status = USBH_LL_GetURBState(phost, MSC_Handle->InPipe); 
 
     if (URB_Status == USBH_URB_DONE)
     {
+    	if (USBH_LL_GetLastXferSize(phost, MSC_Handle->InPipe) != MSC_Handle->hbot.this_URB_size)
+    	{
+    		while(1);
+    	}
+
     	MSC_Handle->hbot.cbw.field.DataTransferLength -= MSC_Handle->hbot.this_URB_size;
 
     	if (MSC_Handle->hbot.pbuf != NULL)
@@ -236,6 +245,7 @@ USBH_StatusTypeDef USBH_MSC_BOT_Process (USBH_HandleTypeDef *phost, uint8_t lun)
 						MSC_Handle->hbot.state  = BOT_ERROR_IN;
 						break;
 					}
+					MSC_Handle->hbot.state = BOT_DATA_IN_WAIT_FREE_PACKET;
 					if (Downstream_GetFreePacket(USBH_MSC_BOT_Read_Multipacket_FreePacketCallback) != HAL_OK)
 					{
 						MSC_Handle->hbot.state  = BOT_ERROR_IN;
@@ -251,7 +261,7 @@ USBH_StatusTypeDef USBH_MSC_BOT_Process (USBH_HandleTypeDef *phost, uint8_t lun)
     	}
     }
 
-    else if(URB_Status == USBH_URB_STALL)
+    else if (URB_Status == USBH_URB_STALL)
     {
       /* This is Data IN Stage STALL Condition */
       MSC_Handle->hbot.state  = BOT_ERROR_IN;
@@ -266,10 +276,10 @@ USBH_StatusTypeDef USBH_MSC_BOT_Process (USBH_HandleTypeDef *phost, uint8_t lun)
     break;  
     
   case BOT_DATA_OUT:
-	MSC_Handle->hbot.state = BOT_DATA_OUT_WAIT;
 	if (MSC_Handle->hbot.pbuf != NULL)
 	{
 		//Simple single-buffer operation
+		MSC_Handle->hbot.state = BOT_DATA_OUT_WAIT;
 		MSC_Handle->hbot.this_URB_size = MIN(MSC_Handle->hbot.cbw.field.DataTransferLength,
 											 MSC_Handle->OutEpSize);
 		USBH_BulkSendData (phost,
@@ -281,6 +291,7 @@ USBH_StatusTypeDef USBH_MSC_BOT_Process (USBH_HandleTypeDef *phost, uint8_t lun)
 	else
 	{
 		//Asynchronous multi-packet operation: get first packet
+		MSC_Handle->hbot.state = BOT_DATA_OUT_WAIT_RECEIVE_PACKET;
 		Callback_MSC_phost = phost;
 		if (Downstream_MSC_GetStreamDataPacket(USBH_MSC_BOT_Write_Multipacket_ReceivePacketCallback) != HAL_OK)
 		{
@@ -289,6 +300,9 @@ USBH_StatusTypeDef USBH_MSC_BOT_Process (USBH_HandleTypeDef *phost, uint8_t lun)
 	}
 	break;
 
+  case BOT_DATA_OUT_WAIT_RECEIVE_PACKET:
+	  break;
+    
   case BOT_DATA_OUT_WAIT:
     URB_Status = USBH_LL_GetURBState(phost, MSC_Handle->OutPipe);     
     
@@ -309,6 +323,7 @@ USBH_StatusTypeDef USBH_MSC_BOT_Process (USBH_HandleTypeDef *phost, uint8_t lun)
 			if (MSC_Handle->hbot.cbw.field.DataTransferLength == 0)
 			{
 				//End of transmission
+				Downstream_ReleasePacket(MSC_Handle->hbot.bot_packet);
 				MSC_Handle->hbot.state = BOT_RECEIVE_CSW;
 			}
 			else
@@ -317,9 +332,11 @@ USBH_StatusTypeDef USBH_MSC_BOT_Process (USBH_HandleTypeDef *phost, uint8_t lun)
 				if (MSC_Handle->hbot.bot_packet_bytes_remaining == 0)
 				{
 					//Get next bot_packet
+					Downstream_ReleasePacket(MSC_Handle->hbot.bot_packet);
+					MSC_Handle->hbot.state = BOT_DATA_OUT_WAIT_RECEIVE_PACKET;
 					if (Downstream_MSC_GetStreamDataPacket(USBH_MSC_BOT_Write_Multipacket_ReceivePacketCallback) != HAL_OK)
 					{
-						MSC_Handle->hbot.state  = BOT_ERROR_OUT;
+						MSC_Handle->hbot.state = BOT_ERROR_OUT;
 					}
 				}
 				else
@@ -334,12 +351,19 @@ USBH_StatusTypeDef USBH_MSC_BOT_Process (USBH_HandleTypeDef *phost, uint8_t lun)
     else if(URB_Status == USBH_URB_NOTREADY)
     {
       /* Resend same data */
-      MSC_Handle->hbot.state  = BOT_DATA_OUT;
+		if (MSC_Handle->hbot.pbuf != NULL)
+		{
+			MSC_Handle->hbot.state = BOT_DATA_OUT;
+		}
+		else
+		{
+			USBH_MSC_BOT_Write_Multipacket_PrepareURB(phost);
+		}
     }
     
     else if(URB_Status == USBH_URB_STALL)
     {
-      MSC_Handle->hbot.state  = BOT_ERROR_OUT;
+      MSC_Handle->hbot.state = BOT_ERROR_OUT;
       
       /* Refer to USB Mass-Storage Class : BOT (www.usb.org) 
       6.7.3 Ho - Host expects to send data to the device
@@ -437,12 +461,13 @@ void USBH_MSC_BOT_Read_Multipacket_FreePacketCallback(DownstreamPacketTypeDef* f
 {
 	MSC_HandleTypeDef *MSC_Handle =  (MSC_HandleTypeDef *) Callback_MSC_phost->pActiveClass->pData;
 
-	if (MSC_Handle->hbot.state != BOT_DATA_IN_WAIT)
+	if (MSC_Handle->hbot.state != BOT_DATA_IN_WAIT_FREE_PACKET)
 	{
 		Downstream_PacketProcessor_FreakOut();
 		return;
 	}
 
+	MSC_Handle->hbot.state = BOT_DATA_IN_WAIT;
 	MSC_Handle->hbot.bot_packet = freePacket;
 	MSC_Handle->hbot.bot_packet_pbuf = freePacket->Data;
 	MSC_Handle->hbot.bot_packet_bytes_remaining = BOT_PAGE_LENGTH;
@@ -452,17 +477,19 @@ void USBH_MSC_BOT_Read_Multipacket_FreePacketCallback(DownstreamPacketTypeDef* f
 
 void USBH_MSC_BOT_Read_Multipacket_PrepareURB(USBH_HandleTypeDef *phost)
 {
+	uint32_t temp_URB_size;
 	MSC_HandleTypeDef *MSC_Handle =  (MSC_HandleTypeDef *) phost->pActiveClass->pData;
 
-	MSC_Handle->hbot.this_URB_size = MSC_Handle->hbot.cbw.field.DataTransferLength;
+	temp_URB_size = MSC_Handle->hbot.cbw.field.DataTransferLength;
-	if (MSC_Handle->hbot.this_URB_size > MSC_Handle->hbot.bot_packet_bytes_remaining)
+	if (temp_URB_size > MSC_Handle->hbot.bot_packet_bytes_remaining)
 	{
-		MSC_Handle->hbot.this_URB_size = MSC_Handle->hbot.bot_packet_bytes_remaining;
+		temp_URB_size = MSC_Handle->hbot.bot_packet_bytes_remaining;
 	}
-	if (MSC_Handle->hbot.this_URB_size > MSC_Handle->InEpSize)
+	if (temp_URB_size > MSC_Handle->InEpSize)
 	{
-		MSC_Handle->hbot.this_URB_size = MSC_Handle->InEpSize;
+		temp_URB_size = MSC_Handle->InEpSize;
 	}
+	MSC_Handle->hbot.this_URB_size = (uint16_t)temp_URB_size;
 
 	USBH_BulkReceiveData(phost,
 						 MSC_Handle->hbot.bot_packet_pbuf,
@@ -476,12 +503,13 @@ void USBH_MSC_BOT_Write_Multipacket_ReceivePacketCallback(DownstreamPacketTypeDe
 {
 	MSC_HandleTypeDef *MSC_Handle =  (MSC_HandleTypeDef *) Callback_MSC_phost->pActiveClass->pData;
 
-	if (MSC_Handle->hbot.state != BOT_DATA_OUT_WAIT)
+	if (MSC_Handle->hbot.state != BOT_DATA_OUT_WAIT_RECEIVE_PACKET)
 	{
 		Downstream_PacketProcessor_FreakOut();
 		return;
 	}
 
+	MSC_Handle->hbot.state = BOT_DATA_OUT_WAIT;
 	MSC_Handle->hbot.bot_packet = receivedPacket;
 	MSC_Handle->hbot.bot_packet_pbuf = receivedPacket->Data;
 	MSC_Handle->hbot.bot_packet_bytes_remaining = dataLength;
@@ -491,17 +519,20 @@ void USBH_MSC_BOT_Write_Multipacket_ReceivePacketCallback(DownstreamPacketTypeDe
 
 void USBH_MSC_BOT_Write_Multipacket_PrepareURB(USBH_HandleTypeDef *phost)
 {
+	uint32_t temp_URB_size;
 	MSC_HandleTypeDef *MSC_Handle =  (MSC_HandleTypeDef *) phost->pActiveClass->pData;
 
-	MSC_Handle->hbot.this_URB_size = MSC_Handle->hbot.cbw.field.DataTransferLength;
+	temp_URB_size = MSC_Handle->hbot.cbw.field.DataTransferLength;
-	if (MSC_Handle->hbot.this_URB_size > MSC_Handle->hbot.bot_packet_bytes_remaining)
+	if (temp_URB_size > MSC_Handle->hbot.bot_packet_bytes_remaining)
 	{
-		MSC_Handle->hbot.this_URB_size = MSC_Handle->hbot.bot_packet_bytes_remaining;
+		temp_URB_size = MSC_Handle->hbot.bot_packet_bytes_remaining;
 	}
-	if (MSC_Handle->hbot.this_URB_size > MSC_Handle->OutEpSize)
+	if (temp_URB_size > MSC_Handle->OutEpSize)
 	{
-		MSC_Handle->hbot.this_URB_size = MSC_Handle->OutEpSize;
+		temp_URB_size = MSC_Handle->OutEpSize;
 	}
+	MSC_Handle->hbot.this_URB_size = (uint16_t)temp_URB_size;
+
 	USBH_BulkSendData (phost,
 					   MSC_Handle->hbot.bot_packet_pbuf,
 					   MSC_Handle->hbot.this_URB_size,

Downstream/Middlewares/ST/STM32_USB_Host_Library/Class/MSC/Src/usbh_msc_scsi.c

@@ -388,8 +388,7 @@ USBH_StatusTypeDef USBH_MSC_SCSI_Read(USBH_HandleTypeDef *phost,
   switch(MSC_Handle->hbot.cmd_state)
   {
   case BOT_CMD_SEND:
-    
+    /*Prepare the CBW and relevant fields*/
-    /*Prepare the CBW and relevent field*/
     MSC_Handle->hbot.cbw.field.DataTransferLength = length * MSC_Handle->unit[lun].capacity.block_size;;
     MSC_Handle->hbot.cbw.field.Flags = USB_EP_DIR_IN;
     MSC_Handle->hbot.cbw.field.CBLength = CBW_LENGTH;

Downstream/Src/downstream_msc.c

@@ -28,7 +28,7 @@ void Downstream_MSC_PacketProcessor_GetCapacity(DownstreamPacketTypeDef* receive
 void Downstream_MSC_PacketProcessor_BeginRead(DownstreamPacketTypeDef* receivedPacket);
 void Downstream_MSC_PacketProcessor_BeginWrite(DownstreamPacketTypeDef* receivedPacket);
 void Downstream_MSC_PacketProcessor_RdWrCompleteCallback(USBH_StatusTypeDef result);
-void Downstream_MSC_GetStreamDataPacketCallback(DownstreamPacketTypeDef* replyPacket);
+void Downstream_MSC_GetStreamDataPacketCallback(DownstreamPacketTypeDef* receivedPacket);
 
 
 //High-level checks on the connected device. We don't want some weirdly
@@ -69,11 +69,11 @@ void Downstream_MSC_PacketProcessor(DownstreamPacketTypeDef* receivedPacket)
 		Downstream_MSC_PacketProcessor_GetCapacity(receivedPacket);
 		break;
 
-	case COMMAND_MSC_BEGIN_READ:
+	case COMMAND_MSC_READ:
 		Downstream_MSC_PacketProcessor_BeginRead(receivedPacket);
 		break;
 
-	case COMMAND_MSC_BEGIN_WRITE:
+	case COMMAND_MSC_WRITE:
 		Downstream_MSC_PacketProcessor_BeginWrite(receivedPacket);
 		break;
 
@@ -94,7 +94,7 @@ void Downstream_MSC_PacketProcessor_TestUnitReady(DownstreamPacketTypeDef* recei
 	{
 		receivedPacket->Data[0] = HAL_ERROR;
 	}
-	receivedPacket->Length = DOWNSTREAM_PACKET_HEADER_LEN + 1;
+	receivedPacket->Length16 = DOWNSTREAM_PACKET_HEADER_LEN_16 + 1;
 	Downstream_PacketProcessor_ClassReply(receivedPacket);
 }
 
@@ -103,7 +103,7 @@ void Downstream_MSC_PacketProcessor_GetCapacity(DownstreamPacketTypeDef* receive
 {
 	MSC_HandleTypeDef* MSC_Handle =  (MSC_HandleTypeDef*)hUsbHostFS.pActiveClass->pData;
 
-	receivedPacket->Length = DOWNSTREAM_PACKET_HEADER_LEN + 8;
+	receivedPacket->Length16 = DOWNSTREAM_PACKET_HEADER_LEN_16 + (8 / 2);
 	*(uint32_t*)&(receivedPacket->Data[0]) = MSC_Handle->unit[MSC_FIXED_LUN].capacity.block_nbr;
 	*(uint32_t*)&(receivedPacket->Data[4]) = (uint32_t)MSC_Handle->unit[MSC_FIXED_LUN].capacity.block_size;
 	Downstream_PacketProcessor_ClassReply(receivedPacket);
@@ -118,7 +118,7 @@ void Downstream_MSC_PacketProcessor_BeginRead(DownstreamPacketTypeDef* receivedP
 	uint64_t readByteCount;
 	MSC_HandleTypeDef* MSC_Handle =  (MSC_HandleTypeDef*)hUsbHostFS.pActiveClass->pData;
 
-	if (receivedPacket->Length != (DOWNSTREAM_PACKET_HEADER_LEN + (4 * 3)))
+	if (receivedPacket->Length16 != (DOWNSTREAM_PACKET_HEADER_LEN_16 + ((4 * 3) / 2)))
 	{
 		Downstream_PacketProcessor_FreakOut();
 		return;
@@ -136,7 +136,7 @@ void Downstream_MSC_PacketProcessor_BeginRead(DownstreamPacketTypeDef* receivedP
 	}
 
 	receivedPacket->Data[0] = HAL_ERROR;
-	receivedPacket->Length = DOWNSTREAM_PACKET_HEADER_LEN + 1;
+	receivedPacket->Length16 = DOWNSTREAM_PACKET_HEADER_LEN_16 + 1;
 	if (USBH_MSC_UnitIsReady(&hUsbHostFS, MSC_FIXED_LUN))
 	{
 		if (USBH_MSC_Read(&hUsbHostFS,
@@ -171,7 +171,7 @@ void Downstream_MSC_PacketProcessor_BeginWrite(DownstreamPacketTypeDef* received
 	uint64_t writeByteCount;
 	MSC_HandleTypeDef* MSC_Handle =  (MSC_HandleTypeDef*)hUsbHostFS.pActiveClass->pData;
 
-	if (receivedPacket->Length != (DOWNSTREAM_PACKET_HEADER_LEN + (4 * 3)))
+	if (receivedPacket->Length16 != (DOWNSTREAM_PACKET_HEADER_LEN_16 + ((4 * 3) / 2)))
 	{
 		Downstream_PacketProcessor_FreakOut();
 		return;
@@ -193,7 +193,7 @@ void Downstream_MSC_PacketProcessor_BeginWrite(DownstreamPacketTypeDef* received
 	ByteCount = (uint32_t)writeByteCount;
 
 	receivedPacket->Data[0] = HAL_ERROR;
-	receivedPacket->Length = DOWNSTREAM_PACKET_HEADER_LEN + 1;
+	receivedPacket->Length16 = DOWNSTREAM_PACKET_HEADER_LEN_16 + 1;
 
 	//Our host stack has no way to detect if write-protection is enabled.
 	//So currently we can't return HAL_BUSY to Upstream in this situation.
@@ -214,11 +214,16 @@ void Downstream_MSC_PacketProcessor_BeginWrite(DownstreamPacketTypeDef* received
 
 //Used by USB MSC host driver
 HAL_StatusTypeDef Downstream_MSC_PutStreamDataPacket(DownstreamPacketTypeDef* packetToSend,
-													 uint32_t dataLength)
+													 uint32_t dataLength8)
 {
-	packetToSend->Length = dataLength + DOWNSTREAM_PACKET_HEADER_LEN;
+	if ((dataLength8 % 2) != 0)
+	{
+		return HAL_ERROR;
+	}
+
+	packetToSend->Length16 = (dataLength8 / 2) + DOWNSTREAM_PACKET_HEADER_LEN_16;
 	packetToSend->CommandClass = COMMAND_CLASS_MASS_STORAGE | COMMAND_CLASS_DATA_FLAG;
-	packetToSend->Command = COMMAND_MSC_BEGIN_WRITE;
+	packetToSend->Command = COMMAND_MSC_READ;
 	return Downstream_TransmitPacket(packetToSend);
 }
 
@@ -244,28 +249,30 @@ HAL_StatusTypeDef Downstream_MSC_GetStreamDataPacket(DownstreamMSCCallbackPacket
 }
 
 
-void Downstream_MSC_GetStreamDataPacketCallback(DownstreamPacketTypeDef* replyPacket)
+void Downstream_MSC_GetStreamDataPacketCallback(DownstreamPacketTypeDef* receivedPacket)
 {
-	uint16_t dataLength;
+	uint16_t dataLength8;
 
 	ReadStreamBusy = 0;
 	if (GetStreamDataCallback == NULL)
 	{
-		ReadStreamPacket = replyPacket;		//We used up our callback already, so save this one for later.
+		ReadStreamPacket = receivedPacket;		//We used up our callback already, so save this one for later.
 		return;
 	}
 
-	if (((replyPacket->CommandClass & COMMAND_CLASS_DATA_FLAG) == 0) ||		//Any incoming 'command' (as opposed to incoming 'data') is an automatic fail here
+	dataLength8 = (receivedPacket->Length16 - DOWNSTREAM_PACKET_HEADER_LEN_16) * 2;
-		 (replyPacket->Length <= DOWNSTREAM_PACKET_HEADER_LEN) ||			//Should be at least one data byte in the packet.
+
-		 (replyPacket->Length > ByteCount))
+	if ((receivedPacket->CommandClass != (COMMAND_CLASS_MASS_STORAGE | COMMAND_CLASS_DATA_FLAG)) ||	//Must be MSC command with data flag set
+		(receivedPacket->Command != COMMAND_MSC_WRITE) ||						//Must be write command
+		(receivedPacket->Length16 <= DOWNSTREAM_PACKET_HEADER_LEN_16) ||		//Should be at least one data byte in the packet.
+		(dataLength8 > ByteCount))
 	{
 		Downstream_PacketProcessor_FreakOut();
 		return;
 	}
 
-	dataLength = replyPacket->Length - DOWNSTREAM_PACKET_HEADER_LEN;
+	ByteCount -= dataLength8;
-	ByteCount -= dataLength;
+	GetStreamDataCallback(receivedPacket, dataLength8);	//usb_msc_scsi will use this packet, so don't release now
-	GetStreamDataCallback(replyPacket, dataLength);	//usb_msc_scsi will use this packet, so don't release now
 	if (ByteCount > 0)
 	{
 		Downstream_MSC_GetStreamDataPacket(NULL);	//Try to get the next packet now, before USB asks for it
@@ -273,3 +280,4 @@ void Downstream_MSC_GetStreamDataPacketCallback(DownstreamPacketTypeDef* replyPa
 
 }
 
+

Downstream/Src/downstream_spi.c

@@ -23,6 +23,8 @@ InterfaceStateTypeDef				DownstreamInterfaceState	= DOWNSTREAM_INTERFACE_IDLE;
 FreePacketCallbackTypeDef			PendingFreePacketCallback	= NULL;	//Indicates someone is waiting for a packet buffer to become available
 SpiPacketReceivedCallbackTypeDef	ReceivePacketCallback		= NULL;	//Indicates someone is waiting for a received packet
 
+uint32_t					TemporaryIncomingPacketLength = 0;
+uint8_t						SpiInterruptCompleted = 0;
 
 
 HAL_StatusTypeDef Downstream_CheckPreparePacketReception(void);
@@ -38,7 +40,7 @@ void Downstream_InitSPI(void)
 	Hspi1.Instance = SPI1;
 	Hspi1.Init.Mode = SPI_MODE_SLAVE;
 	Hspi1.Init.Direction = SPI_DIRECTION_2LINES;
-	Hspi1.Init.DataSize = SPI_DATASIZE_8BIT;
+	Hspi1.Init.DataSize = SPI_DATASIZE_16BIT;
 	Hspi1.Init.CLKPolarity = SPI_POLARITY_LOW;
 	Hspi1.Init.CLKPhase = SPI_PHASE_1EDGE;
 	Hspi1.Init.NSS = SPI_NSS_HARD_INPUT;
@@ -116,7 +118,6 @@ void Downstream_ReleasePacket(DownstreamPacketTypeDef* packetToRelease)
 }
 
 
-
 //Used by Downstream state machine and USB classes.
 //Ok to call when idle or transmitting.
 //Not OK to call when receiving or awaiting reception.
@@ -171,11 +172,11 @@ void Downstream_PrepareReceivePacketSize(DownstreamPacketTypeDef* freePacket)
 		return;
 	}
 	CurrentWorkingPacket = freePacket;
-	//CurrentWorkingPacket->Length = 0;
+	CurrentWorkingPacket->Length16 = 0;
-	//if (HAL_SPI_TransmitReceive_DMA(... ????
+	if (HAL_SPI_TransmitReceive_IT(&Hspi1,
-	if (HAL_SPI_Receive_DMA(&Hspi1,
+								   (uint8_t*)&CurrentWorkingPacket->Length16,
-							(uint8_t*)&CurrentWorkingPacket->Length,
+								   (uint8_t*)&CurrentWorkingPacket->Length16,
-							(2 + 1)) != HAL_OK)		//"When the CRC feature is enabled the pData Length must be Size + 1"
+								   2) != HAL_OK)		//We only need to read one word, but the peripheral library freaks out...
 	{
 		DOWNSTREAM_SPI_FREAKOUT;
 		return;
@@ -185,63 +186,8 @@ void Downstream_PrepareReceivePacketSize(DownstreamPacketTypeDef* freePacket)
 }
 
 
-//Called at the end of the SPI RX DMA transfer,
-//at DMA2 interrupt priority. Assume *hspi points to our hspi1.
-void HAL_SPI_RxCpltCallback(SPI_HandleTypeDef *hspi)
-{
-	SpiPacketReceivedCallbackTypeDef tempPacketCallback;
-
-	UPSTREAM_TX_REQUEST_DEASSERT;
-
-	if (DownstreamInterfaceState >= DOWNSTREAM_INTERFACE_ERROR)
-	{
-		return;
-	}
-
-	if (DownstreamInterfaceState == DOWNSTREAM_INTERFACE_RX_SIZE_WAIT)
-	{
-		if ((CurrentWorkingPacket->Length < DOWNSTREAM_PACKET_LEN_MIN) ||
-			(CurrentWorkingPacket->Length > DOWNSTREAM_PACKET_LEN))
-		{
-			DOWNSTREAM_SPI_FREAKOUT;
-			return;
-		}
-		DownstreamInterfaceState = DOWNSTREAM_INTERFACE_RX_PACKET_WAIT;
-		if ((HAL_SPI_Receive_DMA(&Hspi1,
-								 &CurrentWorkingPacket->CommandClass,
-								 CurrentWorkingPacket->Length + 1)) != HAL_OK)	//"When the CRC feature is enabled the pData Length must be Size + 1"
-		{
-			DOWNSTREAM_SPI_FREAKOUT;
-			return;
-		}
-		UPSTREAM_TX_REQUEST_ASSERT;
-		return;
-	}
 
-	if (DownstreamInterfaceState == DOWNSTREAM_INTERFACE_RX_PACKET_WAIT)
+//Used by Downstream state machine and USB classes.
-	{
-		DownstreamInterfaceState = DOWNSTREAM_INTERFACE_IDLE;
-		if (ReceivePacketCallback == NULL)
-		{
-			DOWNSTREAM_SPI_FREAKOUT;
-			return;
-		}
-		//Packet processor may want to receive another packet immediately,
-		//so clear ReceivePacketCallback before the call.
-		//It is the callback's responsibility to release the packet buffer we are passing to it!
-		tempPacketCallback = ReceivePacketCallback;
-		ReceivePacketCallback = NULL;
-		tempPacketCallback(CurrentWorkingPacket);
-		return;
-	}
-
-	//case default:
-	DOWNSTREAM_SPI_FREAKOUT;
-}
-
-
-
-//Used by Downstream state machine (and USB classes?).
 //Call when idle or transmitting.
 //It doesn't make sense to call when receiving or awaiting reception.
 HAL_StatusTypeDef Downstream_TransmitPacket(DownstreamPacketTypeDef* packetToWrite)
@@ -259,8 +205,8 @@ HAL_StatusTypeDef Downstream_TransmitPacket(DownstreamPacketTypeDef* packetToWri
 		return HAL_ERROR;
 	}
 	if ((packetToWrite->Busy != BUSY) ||
-		(packetToWrite->Length < DOWNSTREAM_PACKET_LEN_MIN) ||
+		(packetToWrite->Length16 < DOWNSTREAM_PACKET_LEN_MIN_16) ||
-		(packetToWrite->Length > DOWNSTREAM_PACKET_LEN))
+		(packetToWrite->Length16 > DOWNSTREAM_PACKET_LEN_16))
 	{
 		DOWNSTREAM_SPI_FREAKOUT;
 		return HAL_ERROR;
@@ -281,10 +227,11 @@ HAL_StatusTypeDef Downstream_TransmitPacket(DownstreamPacketTypeDef* packetToWri
 	case DOWNSTREAM_INTERFACE_IDLE:
 		DownstreamInterfaceState = DOWNSTREAM_INTERFACE_TX_SIZE_WAIT;
 		CurrentWorkingPacket = packetToWrite;
-		if (HAL_SPI_TransmitReceive_DMA(&Hspi1,
+
-										(uint8_t*)&CurrentWorkingPacket->Length,
+		if (HAL_SPI_TransmitReceive_IT(&Hspi1,
-										(uint8_t*)&CurrentWorkingPacket->Length,
+									   (uint8_t*)&CurrentWorkingPacket->Length16,
-										2 + 1) != HAL_OK)		//"When the CRC feature is enabled the pRxData Length must be Size + 1"
+									   (uint8_t*)&TemporaryIncomingPacketLength,
+									   2) != HAL_OK)		//We only need to write one word, but the peripheral library freaks out...
 		{
 			DOWNSTREAM_SPI_FREAKOUT;
 			return HAL_ERROR;
@@ -301,74 +248,94 @@ HAL_StatusTypeDef Downstream_TransmitPacket(DownstreamPacketTypeDef* packetToWri
 }
 
 
-//Called at the end of the SPI TxRx DMA transfer,
+
-//at DMA2 interrupt priority. Assume *hspi points to our hspi1.
+//Do stuff at main loop priority after SPI transaction is complete
-//We use TxRx to send our reply packet to check if Upstream was trying
+void Downstream_SPIProcess(void)
-//to send us a packet at the same time.
-void HAL_SPI_TxRxCpltCallback(SPI_HandleTypeDef *hspi)
 {
-	UPSTREAM_TX_REQUEST_DEASSERT;
+	SpiPacketReceivedCallbackTypeDef tempPacketCallback;
 
-	if (DownstreamInterfaceState >= DOWNSTREAM_INTERFACE_ERROR)
+	if (SpiInterruptCompleted == 0)
 	{
 		return;
 	}
 
-	if (DownstreamInterfaceState != DOWNSTREAM_INTERFACE_TX_SIZE_WAIT)
+	SpiInterruptCompleted = 0;
-	{
+	UPSTREAM_TX_REQUEST_DEASSERT;
-		DOWNSTREAM_SPI_FREAKOUT;
-		return;
-	}
 
-	if (CurrentWorkingPacket->Length != 0)
+	if (DownstreamInterfaceState >= DOWNSTREAM_INTERFACE_ERROR)
 	{
-		//Currently we just freak out if Upstream sends us an unexpected command.
-		//Theoretically we could reset our downstream state machine and accept the new command...
-		DOWNSTREAM_SPI_FREAKOUT;
 		return;
 	}
 
-	DownstreamInterfaceState = DOWNSTREAM_INTERFACE_TX_PACKET_WAIT;
+	//Finished transmitting packet size
-	if ((HAL_SPI_Transmit_DMA(&Hspi1,
+	if (DownstreamInterfaceState == DOWNSTREAM_INTERFACE_TX_SIZE_WAIT)
-							  &CurrentWorkingPacket->CommandClass,
-							  CurrentWorkingPacket->Length)) != HAL_OK)
 	{
-		DOWNSTREAM_SPI_FREAKOUT;
+		if (TemporaryIncomingPacketLength != 0)
-		return;
+		{
-	}
+			//Currently we just freak out if Upstream sends us an unexpected command.
-	UPSTREAM_TX_REQUEST_ASSERT;
+			//Theoretically we could reset our downstream state machine and accept the new command...
-}
+			DOWNSTREAM_SPI_FREAKOUT;
-
+			return;
-
+		}
-//Called at the end of the SPI TX DMA transfer,
-//at DMA2 interrupt priority. Assume *hspi points to our hspi1.
-void HAL_SPI_TxCpltCallback(SPI_HandleTypeDef *hspi)
-{
-	UPSTREAM_TX_REQUEST_DEASSERT;
 
-	if (DownstreamInterfaceState >= DOWNSTREAM_INTERFACE_ERROR)
+		DownstreamInterfaceState = DOWNSTREAM_INTERFACE_TX_PACKET_WAIT;
-	{
+		if (HAL_SPI_TransmitReceive_IT(&Hspi1,
+									   &CurrentWorkingPacket->CommandClass,
+									   &CurrentWorkingPacket->CommandClass,
+									   ((CurrentWorkingPacket->Length16 < 2) ? 2 : CurrentWorkingPacket->Length16)) != HAL_OK)
+		{
+			DOWNSTREAM_SPI_FREAKOUT;
+			return;
+		}
+		UPSTREAM_TX_REQUEST_ASSERT;
 		return;
 	}
 
-	if (DownstreamInterfaceState != DOWNSTREAM_INTERFACE_TX_PACKET_WAIT)
+	//Finished transmitting packet body
+	if (DownstreamInterfaceState == DOWNSTREAM_INTERFACE_TX_PACKET_WAIT)
 	{
-		DOWNSTREAM_SPI_FREAKOUT;
+		Downstream_ReleasePacket(CurrentWorkingPacket);
+		if (NextTxPacket != NULL)
+		{
+			//NextTxPacket has already passed the checks in Downstream_TransmitPacket.
+			//So we just need to pass it to HAL_SPI_Transmit_DMA.
+			DownstreamInterfaceState = DOWNSTREAM_INTERFACE_TX_SIZE_WAIT;
+			CurrentWorkingPacket = NextTxPacket;
+			NextTxPacket = NULL;
+			if (HAL_SPI_TransmitReceive_IT(&Hspi1,
+										   (uint8_t*)&CurrentWorkingPacket->Length16,
+										   (uint8_t*)&TemporaryIncomingPacketLength,
+										   2) != HAL_OK)		//We only need to write one word, but the peripheral library freaks out...
+			{
+				DOWNSTREAM_SPI_FREAKOUT;
+				return;
+			}
+			UPSTREAM_TX_REQUEST_ASSERT;
+			return;
+		}
+
+		DownstreamInterfaceState = DOWNSTREAM_INTERFACE_IDLE;
+		if (ReceivePacketCallback != NULL)
+		{
+			Downstream_CheckPreparePacketReception();
+		}
 		return;
 	}
 
-	Downstream_ReleasePacket(CurrentWorkingPacket);
+
-	if (NextTxPacket != NULL)
+	if (DownstreamInterfaceState == DOWNSTREAM_INTERFACE_RX_SIZE_WAIT)
 	{
-		//NextTxPacket has already passed the checks in Downstream_TransmitPacket.
+		if ((CurrentWorkingPacket->Length16 < DOWNSTREAM_PACKET_LEN_MIN_16) ||
-		//So we just need to pass it to HAL_SPI_Transmit_DMA.
+			(CurrentWorkingPacket->Length16 > DOWNSTREAM_PACKET_LEN_16))
-		DownstreamInterfaceState = DOWNSTREAM_INTERFACE_TX_SIZE_WAIT;
+		{
-		CurrentWorkingPacket = NextTxPacket;
+			DOWNSTREAM_SPI_FREAKOUT;
-		NextTxPacket = NULL;
+			return;
-		if (HAL_SPI_TransmitReceive_DMA(&Hspi1,
+		}
-										(uint8_t*)&CurrentWorkingPacket->Length,
+		DownstreamInterfaceState = DOWNSTREAM_INTERFACE_RX_PACKET_WAIT;
-										(uint8_t*)&CurrentWorkingPacket->Length,
+		if (HAL_SPI_TransmitReceive_IT(&Hspi1,
-										2 + 1) != HAL_OK)		//"When the CRC feature is enabled the pRxData Length must be Size + 1"
+									   &CurrentWorkingPacket->CommandClass,
+									   &CurrentWorkingPacket->CommandClass,
+									   ((CurrentWorkingPacket->Length16 < 2) ? 2 : CurrentWorkingPacket->Length16)) != HAL_OK)
 		{
 			DOWNSTREAM_SPI_FREAKOUT;
 			return;
@@ -377,11 +344,39 @@ void HAL_SPI_TxCpltCallback(SPI_HandleTypeDef *hspi)
 		return;
 	}
 
-	DownstreamInterfaceState = DOWNSTREAM_INTERFACE_IDLE;
+	if (DownstreamInterfaceState == DOWNSTREAM_INTERFACE_RX_PACKET_WAIT)
-	if (ReceivePacketCallback != NULL)
 	{
-		Downstream_CheckPreparePacketReception();
+		DownstreamInterfaceState = DOWNSTREAM_INTERFACE_IDLE;
+		if (ReceivePacketCallback == NULL)
+		{
+			DOWNSTREAM_SPI_FREAKOUT;
+			return;
+		}
+		//Packet processor may want to receive another packet immediately,
+		//so clear ReceivePacketCallback before the call.
+		//It is the callback's responsibility to release the packet buffer we are passing to it!
+		tempPacketCallback = ReceivePacketCallback;
+		ReceivePacketCallback = NULL;
+		tempPacketCallback(CurrentWorkingPacket);
+		return;
 	}
+
+
+	//case default:
+	DOWNSTREAM_SPI_FREAKOUT;
+}
+
+
+
+//Called at the end of the SPI TxRx DMA transfer,
+//at DMA2 interrupt priority. Assume *hspi points to our hspi1.
+//We use TxRx to send our reply packet to check if Upstream was trying
+//to send us a packet at the same time.
+//We also TxRx our packet body because the SPI silicon is buggy at the end of
+//a transmit-only DMA transfer with CRC! (it does not clear RXNE flag on request)
+void HAL_SPI_TxRxCpltCallback(SPI_HandleTypeDef *hspi)
+{
+	SpiInterruptCompleted = 1;
 }
 
 

Downstream/Src/downstream_statemachine.c

@@ -13,7 +13,6 @@
 #include "usbh_core.h"
 #include "usbh_msc.h"
 #include "led.h"
-#include "interrupts.h"
 
 
 
@@ -58,7 +57,7 @@ void Downstream_PacketProcessor(DownstreamPacketTypeDef* receivedPacket)
 	//we need to tell Upstream of the fact (and not freak out).
 	if (DownstreamState == STATE_DEVICE_NOT_READY)
 	{
-		receivedPacket->Length = DOWNSTREAM_PACKET_HEADER_LEN;
+		receivedPacket->Length16 = DOWNSTREAM_PACKET_HEADER_LEN_16;
 		receivedPacket->CommandClass = COMMAND_CLASS_ERROR;
 		receivedPacket->Command = COMMAND_ERROR_DEVICE_DISCONNECTED;
 		Downstream_PacketProcessor_ClassReply(receivedPacket);
@@ -135,7 +134,7 @@ void Downstream_PacketProcessor_Interface(DownstreamPacketTypeDef* receivedPacke
 
 void Downstream_PacketProcessor_Interface_ReplyNotifyDevice(DownstreamPacketTypeDef* replyPacket)
 {
-	replyPacket->Length = DOWNSTREAM_PACKET_HEADER_LEN + 1;
+	replyPacket->Length16 = DOWNSTREAM_PACKET_HEADER_LEN_16 + 1;
 	replyPacket->CommandClass = COMMAND_CLASS_INTERFACE;
 	replyPacket->Command = COMMAND_INTERFACE_NOTIFY_DEVICE;
 	replyPacket->Data[0] = ConfiguredDeviceClass;
@@ -150,7 +149,7 @@ void Downstream_PacketProcessor_Interface_ReplyNotifyDevice(DownstreamPacketType
 
 void Downstream_PacketProcessor_GenericErrorReply(DownstreamPacketTypeDef* replyPacket)
 {
-	replyPacket->Length = DOWNSTREAM_PACKET_HEADER_LEN;
+	replyPacket->Length16 = DOWNSTREAM_PACKET_HEADER_LEN_16;
 	replyPacket->CommandClass = COMMAND_CLASS_ERROR;
 	replyPacket->Command = COMMAND_ERROR_GENERIC;
 
@@ -168,7 +167,6 @@ void Downstream_PacketProcessor_ClassReply(DownstreamPacketTypeDef* replyPacket)
 
 //This callback receives various event ids from the host stack,
 //either at INT_PRIORITY_OTG_FS or from main().
-//We should therefore elevate our execution priority to INT_PRIORITY_OTG_FS where necessary.
 void Downstream_HostUserCallback(USBH_HandleTypeDef *phost, uint8_t id)
 {
 	InterfaceCommandClassTypeDef newActiveClass = COMMAND_CLASS_INTERFACE;
@@ -178,20 +176,18 @@ void Downstream_HostUserCallback(USBH_HandleTypeDef *phost, uint8_t id)
 		return;
 	}
 
-	//Called from USB interrupt
+	//Called from USB interrupt.
+	//Simple function shouldn't need to worry about preempting anything important.
 	if (id == HOST_USER_DISCONNECTION)
 	{
 		DownstreamState = STATE_DEVICE_NOT_READY;
 		return;
 	}
 
-	__set_BASEPRI(INT_PRIORITY_OTG_FS);		//Elevate our priority level so we aren't interrupted
-
 	//Called from main()
 	if (id == HOST_USER_UNRECOVERED_ERROR)
 	{
 		DOWNSTREAM_STATEMACHINE_FREAKOUT;
-		__set_BASEPRI(0);
 		return;
 	}
 
@@ -214,7 +210,6 @@ void Downstream_HostUserCallback(USBH_HandleTypeDef *phost, uint8_t id)
 		default:
 			LED_Fault_SetBlinkRate(LED_SLOW_BLINK_RATE);
 			DownstreamState = STATE_ERROR;
-			__set_BASEPRI(0);
 			return;
 		}
 
@@ -223,7 +218,6 @@ void Downstream_HostUserCallback(USBH_HandleTypeDef *phost, uint8_t id)
 		if (newActiveClass == COMMAND_CLASS_INTERFACE)
 		{
 			DOWNSTREAM_STATEMACHINE_FREAKOUT;
-			__set_BASEPRI(0);
 			return;
 		}
 
@@ -233,7 +227,6 @@ void Downstream_HostUserCallback(USBH_HandleTypeDef *phost, uint8_t id)
 			(ConfiguredDeviceClass != newActiveClass))
 		{
 			DOWNSTREAM_STATEMACHINE_FREAKOUT;
-			__set_BASEPRI(0);
 			return;
 		}
 		ConfiguredDeviceClass = newActiveClass;
@@ -241,19 +234,16 @@ void Downstream_HostUserCallback(USBH_HandleTypeDef *phost, uint8_t id)
 		if (DownstreamState == STATE_WAIT_DEVICE_READY)
 		{
 			Downstream_GetFreePacket(Downstream_PacketProcessor_Interface_ReplyNotifyDevice);
-			__set_BASEPRI(0);
 			return;
 		}
 
 		if (DownstreamState == STATE_DEVICE_NOT_READY)
 		{
 			DownstreamState = STATE_DEVICE_READY;
-			__set_BASEPRI(0);
 			return;
 		}
 
 		DOWNSTREAM_STATEMACHINE_FREAKOUT;
-		__set_BASEPRI(0);
 		return;
 	}
 }

Downstream/Src/hal_msp.c

@@ -56,7 +56,7 @@ void HAL_SPI_MspInit(SPI_HandleTypeDef* hspi)
   if(hspi->Instance==SPI1)
   {
     __SPI1_CLK_ENABLE();
-    __DMA2_CLK_ENABLE();
+//    __DMA2_CLK_ENABLE();
   
     /**SPI1 GPIO Configuration
     PA4     ------> SPI_NSS
@@ -64,50 +64,59 @@ void HAL_SPI_MspInit(SPI_HandleTypeDef* hspi)
     PA6     ------> SPI1_MISO
     PA7     ------> SPI1_MOSI 
     */
-    GPIO_InitStruct.Pin = GPIO_PIN_4|GPIO_PIN_5|GPIO_PIN_6|GPIO_PIN_7;
+    GPIO_InitStruct.Pin = GPIO_PIN_4;			//NSS is active low so pull up
     GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
-    GPIO_InitStruct.Pull = GPIO_NOPULL;
+    GPIO_InitStruct.Pull = GPIO_PULLUP;
     GPIO_InitStruct.Speed = GPIO_SPEED_MEDIUM;
     GPIO_InitStruct.Alternate = GPIO_AF5_SPI1;
     HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
 
+    GPIO_InitStruct.Pin = GPIO_PIN_5|GPIO_PIN_6|GPIO_PIN_7;		//SCK & data are active high so pull down
+    GPIO_InitStruct.Pull = GPIO_PULLDOWN;
+    HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+
     UPSTREAM_TX_REQUEST_DEASSERT;
     GPIO_InitStruct.Pin = UPSTREAM_TX_REQUEST_PIN;
     GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
+    GPIO_InitStruct.Pull = GPIO_NOPULL;
     HAL_GPIO_Init(UPSTREAM_TX_REQUEST_PORT, &GPIO_InitStruct);
 
-    /* Peripheral DMA init*/
+    //Interrupt-based SPI now!
-    hdma_spi1_rx.Instance = DMA2_Stream2;
+    HAL_NVIC_SetPriority(SPI1_IRQn, INT_PRIORITY_SPI, 0);
-    hdma_spi1_rx.Init.Channel = DMA_CHANNEL_3;
+    HAL_NVIC_EnableIRQ(SPI1_IRQn);
-    hdma_spi1_rx.Init.Direction = DMA_PERIPH_TO_MEMORY;
+
-    hdma_spi1_rx.Init.PeriphInc = DMA_PINC_DISABLE;
+//    /* Peripheral DMA init*/
-    hdma_spi1_rx.Init.MemInc = DMA_MINC_ENABLE;
+//    hdma_spi1_rx.Instance = DMA2_Stream2;
-    hdma_spi1_rx.Init.PeriphDataAlignment = DMA_PDATAALIGN_BYTE;
+//    hdma_spi1_rx.Init.Channel = DMA_CHANNEL_3;
-    hdma_spi1_rx.Init.MemDataAlignment = DMA_MDATAALIGN_BYTE;
+//    hdma_spi1_rx.Init.Direction = DMA_PERIPH_TO_MEMORY;
-    hdma_spi1_rx.Init.Mode = DMA_NORMAL;
+//    hdma_spi1_rx.Init.PeriphInc = DMA_PINC_DISABLE;
-    hdma_spi1_rx.Init.Priority = DMA_PRIORITY_MEDIUM;
+//    hdma_spi1_rx.Init.MemInc = DMA_MINC_ENABLE;
-    hdma_spi1_rx.Init.FIFOMode = DMA_FIFOMODE_DISABLE;
+//    hdma_spi1_rx.Init.PeriphDataAlignment = DMA_PDATAALIGN_BYTE;
-    HAL_DMA_Init(&hdma_spi1_rx);
+//    hdma_spi1_rx.Init.MemDataAlignment = DMA_MDATAALIGN_BYTE;
-    __HAL_LINKDMA(hspi,hdmarx,hdma_spi1_rx);
+//    hdma_spi1_rx.Init.Mode = DMA_NORMAL;
-
+//    hdma_spi1_rx.Init.Priority = DMA_PRIORITY_MEDIUM;
-    hdma_spi1_tx.Instance = DMA2_Stream3;
+//    hdma_spi1_rx.Init.FIFOMode = DMA_FIFOMODE_DISABLE;
-    hdma_spi1_tx.Init.Channel = DMA_CHANNEL_3;
+//    HAL_DMA_Init(&hdma_spi1_rx);
-    hdma_spi1_tx.Init.Direction = DMA_MEMORY_TO_PERIPH;
+//    __HAL_LINKDMA(hspi,hdmarx,hdma_spi1_rx);
-    hdma_spi1_tx.Init.PeriphInc = DMA_PINC_DISABLE;
+//
-    hdma_spi1_tx.Init.MemInc = DMA_MINC_ENABLE;
+//    hdma_spi1_tx.Instance = DMA2_Stream3;
-    hdma_spi1_tx.Init.PeriphDataAlignment = DMA_PDATAALIGN_BYTE;
+//    hdma_spi1_tx.Init.Channel = DMA_CHANNEL_3;
-    hdma_spi1_tx.Init.MemDataAlignment = DMA_MDATAALIGN_BYTE;
+//    hdma_spi1_tx.Init.Direction = DMA_MEMORY_TO_PERIPH;
-    hdma_spi1_tx.Init.Mode = DMA_NORMAL;
+//    hdma_spi1_tx.Init.PeriphInc = DMA_PINC_DISABLE;
-    hdma_spi1_tx.Init.Priority = DMA_PRIORITY_MEDIUM;
+//    hdma_spi1_tx.Init.MemInc = DMA_MINC_ENABLE;
-    hdma_spi1_tx.Init.FIFOMode = DMA_FIFOMODE_DISABLE;
+//    hdma_spi1_tx.Init.PeriphDataAlignment = DMA_PDATAALIGN_BYTE;
-    HAL_DMA_Init(&hdma_spi1_tx);
+//    hdma_spi1_tx.Init.MemDataAlignment = DMA_MDATAALIGN_BYTE;
-    __HAL_LINKDMA(hspi,hdmatx,hdma_spi1_tx);
+//    hdma_spi1_tx.Init.Mode = DMA_NORMAL;
-
+//    hdma_spi1_tx.Init.Priority = DMA_PRIORITY_MEDIUM;
-    /* DMA interrupt init */
+//    hdma_spi1_tx.Init.FIFOMode = DMA_FIFOMODE_DISABLE;
-    HAL_NVIC_SetPriority(DMA2_Stream2_IRQn, INT_PRIORITY_SPI_DMA, 0);
+//	HAL_DMA_Init(&hdma_spi1_tx);
-    HAL_NVIC_EnableIRQ(DMA2_Stream2_IRQn);
+//    __HAL_LINKDMA(hspi,hdmatx,hdma_spi1_tx);
-    HAL_NVIC_SetPriority(DMA2_Stream3_IRQn, INT_PRIORITY_SPI_DMA, 0);
+//
-    HAL_NVIC_EnableIRQ(DMA2_Stream3_IRQn);
+//    /* DMA interrupt init */
+//    HAL_NVIC_SetPriority(DMA2_Stream2_IRQn, INT_PRIORITY_SPI_DMA, 0);
+//    HAL_NVIC_EnableIRQ(DMA2_Stream2_IRQn);
+//    HAL_NVIC_SetPriority(DMA2_Stream3_IRQn, INT_PRIORITY_SPI_DMA, 0);
+//    HAL_NVIC_EnableIRQ(DMA2_Stream3_IRQn);
   }
 }
 
@@ -127,8 +136,8 @@ void HAL_SPI_MspDeInit(SPI_HandleTypeDef* hspi)
     HAL_GPIO_DeInit(GPIOA, GPIO_PIN_5|GPIO_PIN_6|GPIO_PIN_7);
 
     /* Peripheral DMA DeInit*/
-    HAL_DMA_DeInit(hspi->hdmarx);
+//    HAL_DMA_DeInit(hspi->hdmarx);
-    HAL_DMA_DeInit(hspi->hdmatx);
+//    HAL_DMA_DeInit(hspi->hdmatx);
   }
 
 }

Downstream/Src/interrupts.c

@@ -35,12 +35,15 @@
 #include "stm32f4xx.h"
 #include "interrupts.h"
 #include "led.h"
+#include "board_config.h"
 
 
 /* External variables --------------------------------------------------------*/
 extern HCD_HandleTypeDef hhcd_USB_OTG_FS;
-extern DMA_HandleTypeDef hdma_spi1_rx;
+extern SPI_HandleTypeDef Hspi1;
-extern DMA_HandleTypeDef hdma_spi1_tx;
+
+//extern DMA_HandleTypeDef hdma_spi1_rx;
+//extern DMA_HandleTypeDef hdma_spi1_tx;
 
 /******************************************************************************/
 /*            Cortex-M4 Processor Interruption and Exception Handlers         */ 
@@ -62,22 +65,31 @@ void SysTick_Handler(void)
 /* please refer to the startup file (startup_stm32f4xx.s).                    */
 /******************************************************************************/
 
-/**
+///**
-* @brief This function handles DMA2 Stream2 global interrupt.
+//* @brief This function handles DMA2 Stream2 global interrupt.
-*/
+//*/
-void DMA2_Stream2_IRQHandler(void)
+//void DMA2_Stream2_IRQHandler(void)
-{
+//{
-  HAL_DMA_IRQHandler(&hdma_spi1_rx);
+//  HAL_DMA_IRQHandler(&hdma_spi1_rx);
-}
+//}
+//
+///**
+//* @brief This function handles DMA2 Stream3 global interrupt.
+//*/
+//void DMA2_Stream3_IRQHandler(void)
+//{
+//  HAL_DMA_IRQHandler(&hdma_spi1_tx);
+//}
 
-/**
+
-* @brief This function handles DMA2 Stream3 global interrupt.
+void SPI1_IRQHandler(void)
-*/
-void DMA2_Stream3_IRQHandler(void)
 {
-  HAL_DMA_IRQHandler(&hdma_spi1_tx);
+	SPI_INT_ACTIVE_ON;
+	HAL_SPI_IRQHandler(&Hspi1);
+	SPI_INT_ACTIVE_OFF;
 }
 
+
 /**
 * @brief This function handles USB On The Go FS global interrupt.
 */

Downstream/Src/main.c

@@ -35,10 +35,10 @@
 #include "usb_host.h"
 #include "board_config.h"
 #include "downstream_statemachine.h"
+#include "downstream_spi.h"
 #include "led.h"
 
 
-
 /* Private function prototypes -----------------------------------------------*/
 void SystemClock_Config(void);
 static void GPIO_Init(void);
@@ -63,7 +63,7 @@ int main(void)
 	while (1)
 	{
 		USB_Host_Process();
-
+		Downstream_SPIProcess();
 	}
 }
 
@@ -158,6 +158,11 @@ void GPIO_Init(void)
 	STAT_LED_OFF;
 	GPIO_InitStruct.Pin = STAT_LED_PIN;
 	HAL_GPIO_Init(STAT_LED_PORT, &GPIO_InitStruct);
+
+	//SPI_INT_ACTIVE indicator
+	GPIO_InitStruct.Pin = SPI_INT_ACTIVE_PIN;
+	HAL_GPIO_Init(SPI_INT_ACTIVE_PORT, &GPIO_InitStruct);
+	SPI_INT_ACTIVE_OFF;
 }
 
 

Downstream/Src/usb_host.c

@@ -42,7 +42,6 @@
 USBH_HandleTypeDef hUsbHostFS;
 
 
-
 /* init function */				        
 void USB_Host_Init(void)
 {
@@ -60,7 +59,8 @@ void USB_Host_Init(void)
 void USB_Host_Process()
 {
   /* USB Host Background task */
-    USBH_Process(&hUsbHostFS); 						
+	USBH_Process(&hUsbHostFS);
+
 }
 
 

Upstream/.cproject

@@ -15,7 +15,7 @@
 				<configuration artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" cleanCommand="${cross_rm} -rf" description="" id="ilg.gnuarmeclipse.managedbuild.cross.config.elf.debug.647490853" name="Debug" parent="ilg.gnuarmeclipse.managedbuild.cross.config.elf.debug">
 					<folderInfo id="ilg.gnuarmeclipse.managedbuild.cross.config.elf.debug.647490853." name="/" resourcePath="">
 						<toolChain id="ilg.gnuarmeclipse.managedbuild.cross.toolchain.elf.debug.294361820" name="Cross ARM GCC" superClass="ilg.gnuarmeclipse.managedbuild.cross.toolchain.elf.debug">
-							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.level.601772204" name="Optimization Level" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.level" value="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.level.debug" valueType="enumerated"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.level.601772204" name="Optimization Level" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.level" value="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.level.none" valueType="enumerated"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.messagelength.142282729" name="Message length (-fmessage-length=0)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.messagelength" value="true" valueType="boolean"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.signedchar.1146859292" name="'char' is signed (-fsigned-char)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.signedchar" value="true" valueType="boolean"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.functionsections.1151432798" name="Function sections (-ffunction-sections)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.functionsections" value="true" valueType="boolean"/>

Upstream/.settings/language.settings.xml

@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="1687181002117189685" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings Cross ARM" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="1652225971839999893" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings Cross ARM" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>

Upstream/Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_spi.c

@@ -102,7 +102,7 @@
 
 /* Private typedef -----------------------------------------------------------*/
 /* Private define ------------------------------------------------------------*/
-#define SPI_TIMEOUT_VALUE  10
+#define SPI_TIMEOUT_VALUE  2
 /* Private macro -------------------------------------------------------------*/
 /* Private variables ---------------------------------------------------------*/
 /* Private function prototypes -----------------------------------------------*/
@@ -2066,14 +2066,14 @@ static void SPI_DMAEndTransmitReceive(SPI_HandleTypeDef *hspi)
   if(hspi->Init.CRCCalculation == SPI_CRCCALCULATION_ENABLE)
   {
     /* Check if CRC is done on going (RXNE flag set) */
-    if(SPI_WaitOnFlagUntilTimeout(hspi, SPI_FLAG_RXNE, SET, SPI_TIMEOUT_VALUE) == HAL_OK)
+//    if(SPI_WaitOnFlagUntilTimeout(hspi, SPI_FLAG_RXNE, SET, SPI_TIMEOUT_VALUE) == HAL_OK)
-    {
+//    {
       /* Wait until RXNE flag is set to send data */
       if(SPI_WaitOnFlagUntilTimeout(hspi, SPI_FLAG_RXNE, RESET, SPI_TIMEOUT_VALUE) != HAL_OK)
       {
         hspi->ErrorCode |= HAL_SPI_ERROR_FLAG;
       }
-    }
+//    }
     /* Read CRC */
     tmpreg = hspi->Instance->DR;
     UNUSED(tmpreg);

Upstream/Inc/board_config.h

@@ -30,10 +30,10 @@
 #define FAULT_LED_ON			STAT_LED_ON
 #define FAULT_LED_OFF			STAT_LED_OFF
 
-//#define SPI_DMA_ACTIVE_PIN		GPIO_PIN_5		/////////Temporary indicator of SPI & DMA activity
+#define SPI_INT_ACTIVE_PIN		GPIO_PIN_5		/////////Temporary indicator of SPI activity
-//#define SPI_DMA_ACTIVE_PORT		GPIOB
+#define SPI_INT_ACTIVE_PORT		GPIOB
-//#define SPI_DMA_ACTIVE_ON		SPI_DMA_ACTIVE_PORT->BSRR = (SPI_DMA_ACTIVE_PIN << BSRR_SHIFT_LOW)
+#define SPI_INT_ACTIVE_ON		SPI_INT_ACTIVE_PORT->BSRR = (SPI_INT_ACTIVE_PIN << BSRR_SHIFT_HIGH)
-//#define SPI_DMA_ACTIVE_OFF		SPI_DMA_ACTIVE_PORT->BSRR = (SPI_DMA_ACTIVE_PIN << BSRR_SHIFT_HIGH)
+#define SPI_INT_ACTIVE_OFF		SPI_INT_ACTIVE_PORT->BSRR = (SPI_INT_ACTIVE_PIN << BSRR_SHIFT_LOW)
 
 #define SPI1_NSS_PIN			GPIO_PIN_4
 #define SPI1_NSS_PORT			GPIOA

Upstream/Inc/interrupts.h

@@ -49,8 +49,9 @@
 *         A lower priority value indicates a higher priority. */
 
 #define INT_PRIORITY_SYSTICK	2
-#define INT_PRIORITY_SPI_DMA	10			//SPI interacts heavily with USB_OTG,
+#define INT_PRIORITY_SPI		8			//SPI is more important than USB now!
-#define INT_PRIORITY_OTG_FS		10			//so set them at the same priority.
+#define INT_PRIORITY_OTG_FS		10
+#define INT_PRIORITY_EXT3I		INT_PRIORITY_OTG_FS
 
 
 /* Exported macro ------------------------------------------------------------*/
@@ -58,8 +59,8 @@
 
 void OTG_FS_IRQHandler(void);
 void SysTick_Handler(void);
-void DMA2_Stream2_IRQHandler(void);
+//void DMA2_Stream2_IRQHandler(void);
-void DMA2_Stream3_IRQHandler(void);
+//void DMA2_Stream3_IRQHandler(void);
 void EXTI3_IRQHandler(void);
 
 

Upstream/Inc/upstream_interface_def.h

@@ -45,8 +45,8 @@ typedef enum
 {
 	COMMAND_MSC_TEST_UNIT_READY,	//Returns HAL_StatusTypeDef result
 	COMMAND_MSC_GET_CAPACITY,		//Returns uint32_t blk_nbr, uint32_t blk_size
-	COMMAND_MSC_BEGIN_READ,			//Returns HAL_StatusTypeDef result, then data stream
+	COMMAND_MSC_READ,				//Returns HAL_StatusTypeDef result, then data stream
-	COMMAND_MSC_BEGIN_WRITE,		//Returns HAL_OK, HAL_ERROR if medium not present, HAL_BUSY if write-protected result, then waits for data stream
+	COMMAND_MSC_WRITE,				//Returns HAL_OK, HAL_ERROR if medium not present, HAL_BUSY if write-protected result, then waits for data stream
 }
 InterfaceCommandMscTypeDef;
 

Upstream/Inc/upstream_msc.h

@@ -14,7 +14,7 @@
 
 typedef void (*UpstreamMSCCallbackTypeDef)(HAL_StatusTypeDef result);
 typedef void (*UpstreamMSCCallbackPacketTypeDef)(UpstreamPacketTypeDef* upstreamPacket,
-												 uint16_t dataLength);
+												 uint16_t dataLength8);
 typedef void (*UpstreamMSCCallbackUintPacketTypeDef)(UpstreamPacketTypeDef* upstreamPacket,
 													 uint32_t result_uint1,
 													 uint32_t result_uint2);
@@ -28,10 +28,10 @@ HAL_StatusTypeDef Upstream_MSC_BeginRead(UpstreamMSCCallbackTypeDef callback,
 										 uint32_t readByteCount);
 HAL_StatusTypeDef Upstream_MSC_GetStreamDataPacket(UpstreamMSCCallbackPacketTypeDef callback);
 HAL_StatusTypeDef Upstream_MSC_BeginWrite(UpstreamMSCCallbackTypeDef callback,
-										  uint64_t readBlockStart,
+										  uint64_t writeBlockStart,
-										  uint32_t readBlockCount);
+										  uint32_t writeBlockCount);
 HAL_StatusTypeDef Upstream_MSC_PutStreamDataPacket(UpstreamPacketTypeDef* packetToSend,
-												   uint32_t dataLength);
+												   uint32_t dataLength8);
 
 
 

Upstream/Inc/upstream_spi.h

@@ -12,15 +12,19 @@
 #include "usbd_config.h"
 
 
-#define UPSTREAM_PACKET_HEADER_LEN	(2)			//Min length = CommandClass & Command bytes
+#define UPSTREAM_PACKET_HEADER_LEN		(2)			//Min length = CommandClass & Command bytes
-#define UPSTREAM_PACKET_LEN			(UPSTREAM_PACKET_HEADER_LEN + MSC_MEDIA_PACKET)
+#define UPSTREAM_PACKET_LEN				(UPSTREAM_PACKET_HEADER_LEN + MSC_MEDIA_PACKET)
-#define UPSTREAM_PACKET_LEN_MIN		(UPSTREAM_PACKET_HEADER_LEN)
+#define UPSTREAM_PACKET_LEN_MIN			(UPSTREAM_PACKET_HEADER_LEN)
+
+#define UPSTREAM_PACKET_HEADER_LEN_16	(UPSTREAM_PACKET_HEADER_LEN / 2)
+#define UPSTREAM_PACKET_LEN_16			(UPSTREAM_PACKET_LEN / 2)
+#define UPSTREAM_PACKET_LEN_MIN_16		(UPSTREAM_PACKET_LEN_MIN / 2)
 
 
 #define UPSTREAM_SPI_FREAKOUT								\
 	do {													\
 		LED_Fault_SetBlinkRate(LED_FAST_BLINK_RATE);		\
-		UpstreamInterfaceState = UPSTREAM_INTERFACE_ERROR;	\
+		/*UpstreamInterfaceState = UPSTREAM_INTERFACE_ERROR; */ \
 		Upstream_StateMachine_SetErrorState();				\
 		while (1);											\
 } while (0);
@@ -54,11 +58,10 @@ PacketBusyTypeDef;
 typedef struct
 {
 	PacketBusyTypeDef	Busy;						//Everything after Busy should be word-aligned
-	uint16_t			Length __ALIGN_END;			//Packet length includes CommandClass, Command, and Data
+	uint16_t			Length16 __ALIGN_END;			//Packet length includes CommandClass, Command, and Data
 	uint8_t				CommandClass;
 	uint8_t				Command;
 	uint8_t				Data[MSC_MEDIA_PACKET];		//Should (must?) be word-aligned, for USB copy routine
-	uint8_t				RxCrc;
 }
 UpstreamPacketTypeDef;
 
@@ -75,8 +78,8 @@ void Upstream_ReleasePacket(UpstreamPacketTypeDef* packetToRelease);
 HAL_StatusTypeDef Upstream_TransmitPacket(UpstreamPacketTypeDef* packetToWrite);
 HAL_StatusTypeDef Upstream_ReceivePacket(SpiPacketReceivedCallbackTypeDef callback);
 void Upstream_TxOkInterrupt(void);
-void HAL_SPI_TxCpltCallback(SPI_HandleTypeDef *hspi);
+void Upstream_SPIProcess_InterruptSafe(void);
-void HAL_SPI_RxCpltCallback(SPI_HandleTypeDef *hspi);
+void HAL_SPI_TxRxCpltCallback(SPI_HandleTypeDef *hspi);
 void HAL_SPI_ErrorCallback(SPI_HandleTypeDef *hspi);
 
 

Upstream/Inc/upstream_statemachine.h

@@ -26,6 +26,7 @@ typedef enum
 	do {												\
 		LED_Fault_SetBlinkRate(LED_FAST_BLINK_RATE);	\
 		Upstream_StateMachine_SetErrorState();			\
+		while (1);										\
 } while (0);
 
 

Upstream/Middlewares/ST/STM32_USB_Device_Library/Class/MSC/Src/usbd_msc_bot.c

@@ -353,6 +353,10 @@ void  MSC_BOT_SendCSW (USBD_HandleTypeDef  *pdev,
   hmsc->csw.bStatus = CSW_Status;
   hmsc->bot_state = USBD_BOT_IDLE;
   
+  //De-register UpstreamPacket* from USB interface,
+  //so we don't unintentionally free it on USB transaction completion.
+  hmsc->bot_packet = NULL;
+
   USBD_LL_Transmit (pdev, 
              MSC_EPIN_ADDR, 
              (uint8_t *)&hmsc->csw, 

Upstream/Middlewares/ST/STM32_USB_Device_Library/Class/MSC/Src/usbd_msc_scsi.c

@@ -285,6 +285,7 @@ static void SCSI_Inquiry(void)
 	}
 	else
 	{
+		//Standard INQUIRY data
 		//Return the same info for any LUN requested
 		pPage = (uint8_t *)&STORAGE_Inquirydata_FS;
 		len = pPage[4] + 5;
@@ -589,9 +590,9 @@ static void SCSI_Read10(void)
 		}
 
 		if (Upstream_MSC_BeginRead(SCSI_Read10BeginCallback,
-										  SCSI_ProcessCmd_hmsc->scsi_blk_addr,
+								   SCSI_ProcessCmd_hmsc->scsi_blk_addr,
-										  SCSI_ProcessCmd_hmsc->scsi_blk_len,
+								   SCSI_ProcessCmd_hmsc->scsi_blk_len,
-										  SCSI_ProcessCmd_hmsc->cbw.dDataLength) != HAL_OK)
+								   SCSI_ProcessCmd_hmsc->cbw.dDataLength) != HAL_OK)
 		{
 			SCSI_Read10BeginCallback(HAL_ERROR);
 		}
@@ -667,7 +668,6 @@ void SCSI_Read10ReplyCallback(UpstreamPacketTypeDef* upstreamPacket,
 * @param  params: Command parameters
 * @retval status
 */
-
 static void SCSI_Write10(void)
 {
 	uint32_t dataLength;
@@ -715,8 +715,8 @@ static void SCSI_Write10(void)
 		}
 
 		if (Upstream_MSC_BeginWrite(SCSI_Write10BeginCallback,
-										   SCSI_ProcessCmd_hmsc->scsi_blk_addr,
+									SCSI_ProcessCmd_hmsc->scsi_blk_addr,
-										   SCSI_ProcessCmd_hmsc->scsi_blk_len) != HAL_OK)
+									SCSI_ProcessCmd_hmsc->scsi_blk_len) != HAL_OK)
 		{
 			SCSI_Write10BeginCallback(HAL_ERROR);
 		}

Upstream/Src/hal_msp.c

@@ -38,8 +38,8 @@
 #include "board_config.h"
 
 
-DMA_HandleTypeDef	spiTxDmaHandle;
+//DMA_HandleTypeDef	spiTxDmaHandle;
-DMA_HandleTypeDef	spiRxDmaHandle;
+//DMA_HandleTypeDef	spiRxDmaHandle;
 
 
 /**
@@ -64,7 +64,7 @@ void HAL_SPI_MspInit(SPI_HandleTypeDef* hspi)
   {
     /* Peripheral clock enable */
 	  __HAL_RCC_SPI1_CLK_ENABLE();
-	  __HAL_RCC_DMA2_CLK_ENABLE();
+//	  __HAL_RCC_DMA2_CLK_ENABLE();
 
     /**SPI1 GPIO Configuration    
     PA4     ------> GPIO manual slave select
@@ -74,7 +74,7 @@ void HAL_SPI_MspInit(SPI_HandleTypeDef* hspi)
     */
     GPIO_InitStruct.Pin = GPIO_PIN_5|GPIO_PIN_6|GPIO_PIN_7;
     GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
-    GPIO_InitStruct.Pull = GPIO_NOPULL;
+    GPIO_InitStruct.Pull = GPIO_PULLDOWN;
     GPIO_InitStruct.Speed = GPIO_SPEED_MEDIUM;
     GPIO_InitStruct.Alternate = GPIO_AF5_SPI1;
     HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
@@ -82,6 +82,7 @@ void HAL_SPI_MspInit(SPI_HandleTypeDef* hspi)
     SPI1_NSS_DEASSERT;
     GPIO_InitStruct.Pin = SPI1_NSS_PIN;
     GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
+    GPIO_InitStruct.Pull = GPIO_NOPULL;
     HAL_GPIO_Init(SPI1_NSS_PORT, &GPIO_InitStruct);
 
 	//Configure downstream request pin and interrupt
@@ -89,42 +90,46 @@ void HAL_SPI_MspInit(SPI_HandleTypeDef* hspi)
 	GPIO_InitStruct.Mode = GPIO_MODE_INPUT | GPIO_MODE_IT_FALLING;
 	GPIO_InitStruct.Pull = GPIO_PULLUP;
 	HAL_GPIO_Init(DOWNSTREAM_TX_OK_PORT, &GPIO_InitStruct);
-	HAL_NVIC_SetPriority(EXTI3_IRQn, INT_PRIORITY_SPI_DMA, 0);
+	HAL_NVIC_SetPriority(EXTI3_IRQn, INT_PRIORITY_EXT3I, 0);
 	HAL_NVIC_EnableIRQ(EXTI3_IRQn);
 
-	//Prepare Tx DMA stream
+	//Interrupt-based SPI now!
-	hspi->hdmatx = &spiTxDmaHandle;
+	HAL_NVIC_SetPriority(SPI1_IRQn, INT_PRIORITY_SPI, 0);
-	spiTxDmaHandle.Instance = DMA2_Stream3;
+	HAL_NVIC_EnableIRQ(SPI1_IRQn);
-	spiTxDmaHandle.Parent = hspi;
+
-	spiTxDmaHandle.Init.Channel = DMA_CHANNEL_3;
+//	//Prepare Tx DMA stream
-	spiTxDmaHandle.Init.Direction = DMA_MEMORY_TO_PERIPH;
+//	hspi->hdmatx = &spiTxDmaHandle;
-	spiTxDmaHandle.Init.PeriphInc = DMA_PINC_DISABLE;
+//	spiTxDmaHandle.Instance = DMA2_Stream3;
-	spiTxDmaHandle.Init.MemInc = DMA_MINC_ENABLE;
+//	spiTxDmaHandle.Parent = hspi;
-	spiTxDmaHandle.Init.PeriphDataAlignment = DMA_PDATAALIGN_BYTE;
+//	spiTxDmaHandle.Init.Channel = DMA_CHANNEL_3;
-	spiTxDmaHandle.Init.MemDataAlignment = DMA_MDATAALIGN_BYTE;
+//	spiTxDmaHandle.Init.Direction = DMA_MEMORY_TO_PERIPH;
-	spiTxDmaHandle.Init.Mode = DMA_NORMAL;
+//	spiTxDmaHandle.Init.PeriphInc = DMA_PINC_DISABLE;
-	spiTxDmaHandle.Init.Priority = DMA_PRIORITY_MEDIUM;
+//	spiTxDmaHandle.Init.MemInc = DMA_MINC_ENABLE;
-	spiTxDmaHandle.Init.FIFOMode = DMA_FIFOMODE_DISABLE;
+//	spiTxDmaHandle.Init.PeriphDataAlignment = DMA_PDATAALIGN_HALFWORD;	//DMA_PDATAALIGN_BYTE;
-	HAL_DMA_Init(&spiTxDmaHandle);
+//	spiTxDmaHandle.Init.MemDataAlignment = DMA_MDATAALIGN_HALFWORD;		//DMA_MDATAALIGN_BYTE;
-	HAL_NVIC_SetPriority(DMA2_Stream3_IRQn, INT_PRIORITY_SPI_DMA, 0);
+//	spiTxDmaHandle.Init.Mode = DMA_NORMAL;
-	HAL_NVIC_EnableIRQ(DMA2_Stream3_IRQn);
+//	spiTxDmaHandle.Init.Priority = DMA_PRIORITY_MEDIUM;
-
+//	spiTxDmaHandle.Init.FIFOMode = DMA_FIFOMODE_DISABLE;
-	//Prepare Rx DMA stream
+//	HAL_DMA_Init(&spiTxDmaHandle);
-	hspi->hdmarx = &spiRxDmaHandle;
+//	HAL_NVIC_SetPriority(DMA2_Stream3_IRQn, INT_PRIORITY_SPI_DMA, 0);
-	spiRxDmaHandle.Instance = DMA2_Stream2;
+//	HAL_NVIC_EnableIRQ(DMA2_Stream3_IRQn);
-	spiRxDmaHandle.Parent = hspi;
+//
-	spiRxDmaHandle.Init.Channel = DMA_CHANNEL_3;
+//	//Prepare Rx DMA stream
-	spiRxDmaHandle.Init.Direction = DMA_PERIPH_TO_MEMORY;
+//	hspi->hdmarx = &spiRxDmaHandle;
-	spiRxDmaHandle.Init.PeriphInc = DMA_PINC_DISABLE;
+//	spiRxDmaHandle.Instance = DMA2_Stream2;
-	spiRxDmaHandle.Init.MemInc = DMA_MINC_ENABLE;
+//	spiRxDmaHandle.Parent = hspi;
-	spiRxDmaHandle.Init.PeriphDataAlignment = DMA_PDATAALIGN_BYTE;
+//	spiRxDmaHandle.Init.Channel = DMA_CHANNEL_3;
-	spiRxDmaHandle.Init.MemDataAlignment = DMA_MDATAALIGN_BYTE;
+//	spiRxDmaHandle.Init.Direction = DMA_PERIPH_TO_MEMORY;
-	spiRxDmaHandle.Init.Mode = DMA_NORMAL;
+//	spiRxDmaHandle.Init.PeriphInc = DMA_PINC_DISABLE;
-	spiRxDmaHandle.Init.Priority = DMA_PRIORITY_MEDIUM;
+//	spiRxDmaHandle.Init.MemInc = DMA_MINC_ENABLE;
-	spiRxDmaHandle.Init.FIFOMode = DMA_FIFOMODE_DISABLE;
+//	spiRxDmaHandle.Init.PeriphDataAlignment = DMA_PDATAALIGN_HALFWORD;	//DMA_PDATAALIGN_BYTE;
-	HAL_DMA_Init(&spiRxDmaHandle);
+//	spiRxDmaHandle.Init.MemDataAlignment = DMA_MDATAALIGN_HALFWORD;		//DMA_MDATAALIGN_BYTE;
-	HAL_NVIC_SetPriority(DMA2_Stream2_IRQn, INT_PRIORITY_SPI_DMA, 0);
+//	spiRxDmaHandle.Init.Mode = DMA_NORMAL;
-	HAL_NVIC_EnableIRQ(DMA2_Stream2_IRQn);
+//	spiRxDmaHandle.Init.Priority = DMA_PRIORITY_MEDIUM;
+//	spiRxDmaHandle.Init.FIFOMode = DMA_FIFOMODE_DISABLE;
+//	HAL_DMA_Init(&spiRxDmaHandle);
+//	HAL_NVIC_SetPriority(DMA2_Stream2_IRQn, INT_PRIORITY_SPI_DMA, 0);
+//	HAL_NVIC_EnableIRQ(DMA2_Stream2_IRQn);
   }
 }
 
@@ -135,7 +140,7 @@ void HAL_SPI_MspDeInit(SPI_HandleTypeDef* hspi)
   {
     /* Peripheral clock disable */
     __HAL_RCC_SPI1_CLK_DISABLE();
-    __HAL_RCC_DMA2_CLK_DISABLE();
+//    __HAL_RCC_DMA2_CLK_DISABLE();
   
     /**SPI1 GPIO Configuration    
     PA4     ------> SPI1_NSS
@@ -144,11 +149,11 @@ void HAL_SPI_MspDeInit(SPI_HandleTypeDef* hspi)
     PA7     ------> SPI1_MOSI 
     */
     HAL_GPIO_DeInit(GPIOA, GPIO_PIN_5|GPIO_PIN_6|GPIO_PIN_7);
-    HAL_DMA_DeInit(&spiTxDmaHandle);
+//    HAL_DMA_DeInit(&spiTxDmaHandle);
-    HAL_DMA_DeInit(&spiRxDmaHandle);
+//    HAL_DMA_DeInit(&spiRxDmaHandle);
-
+//
-    HAL_NVIC_DisableIRQ(DMA2_Stream3_IRQn);
+//    HAL_NVIC_DisableIRQ(DMA2_Stream3_IRQn);
-    HAL_NVIC_DisableIRQ(DMA2_Stream2_IRQn);
+//    HAL_NVIC_DisableIRQ(DMA2_Stream2_IRQn);
   }
 
 }

Upstream/Src/interrupts.c

@@ -45,8 +45,10 @@
 /* External variables --------------------------------------------------------*/
 
 extern PCD_HandleTypeDef	hpcd_USB_OTG_FS;
-extern DMA_HandleTypeDef	spiTxDmaHandle;
+extern SPI_HandleTypeDef	Hspi1;
-extern DMA_HandleTypeDef	spiRxDmaHandle;
+
+//extern DMA_HandleTypeDef	spiTxDmaHandle;
+//extern DMA_HandleTypeDef	spiRxDmaHandle;
 
 
 /******************************************************************************/
@@ -66,34 +68,38 @@ void SysTick_Handler(void)
 /////////////////////////
 void OTG_FS_IRQHandler(void)
 {
-	//STAT_LED_ON;		//blink STAT LED while processing interrupt
 	HAL_PCD_IRQHandler(&hpcd_USB_OTG_FS);
-	//STAT_LED_OFF;
 }
 
-void DMA2_Stream2_IRQHandler(void)
+//void DMA2_Stream2_IRQHandler(void)
-{
+//{
-	//SPI_DMA_ACTIVE_ON;
+//	//SPI_DMA_ACTIVE_ON;
-	HAL_DMA_IRQHandler(&spiRxDmaHandle);
+//	HAL_DMA_IRQHandler(&spiRxDmaHandle);
-	//SPI_DMA_ACTIVE_OFF;
+//	//SPI_DMA_ACTIVE_OFF;
-}
+//}
-
+//
-void DMA2_Stream3_IRQHandler(void)
+//void DMA2_Stream3_IRQHandler(void)
-{
+//{
-	//SPI_DMA_ACTIVE_ON;
+//	//SPI_DMA_ACTIVE_ON;
-	HAL_DMA_IRQHandler(&spiTxDmaHandle);
+//	HAL_DMA_IRQHandler(&spiTxDmaHandle);
-	//SPI_DMA_ACTIVE_OFF;
+//	//SPI_DMA_ACTIVE_OFF;
-}
+//}
 
 void EXTI3_IRQHandler(void)
 {
-	//SPI_DMA_ACTIVE_ON;
+	__HAL_GPIO_EXTI_CLEAR_IT(DOWNSTREAM_TX_OK_PIN);
-	__HAL_GPIO_EXTI_CLEAR_IT(3);
 	Upstream_TxOkInterrupt();
-	//SPI_DMA_ACTIVE_OFF;
 }
 /////////////////////////
 /////////////////////////
 
 
+void SPI1_IRQHandler(void)
+{
+	SPI_INT_ACTIVE_ON;
+	HAL_SPI_IRQHandler(&Hspi1);
+	SPI_INT_ACTIVE_OFF;
+}
+
+
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

Upstream/Src/main.c

@@ -38,6 +38,7 @@
 #include "board_config.h"
 #include "led.h"
 #include "upstream_statemachine.h"
+#include "upstream_spi.h"
 
 
 /* Private variables ---------------------------------------------------------*/
@@ -68,10 +69,11 @@ int main(void)
 
   while (1)
   {
-
+	  Upstream_SPIProcess_InterruptSafe();
   }
 }
 
+
 /** System Clock Configuration
 */
 void SystemClock_Config(void)
@@ -151,12 +153,12 @@ void GPIO_Init(void)
 	HAL_GPIO_Init(STAT_LED_PORT, &GPIO_InitStruct);
 	STAT_LED_OFF;
 
-//	//SPI_DMA_ACTIVE indicator
+	//SPI_INT_ACTIVE indicator
-//	GPIO_InitStruct.Pin = SPI_DMA_ACTIVE_PIN;
+	GPIO_InitStruct.Pin = SPI_INT_ACTIVE_PIN;
-//	GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
+	//GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
-//	GPIO_InitStruct.Pull = GPIO_NOPULL;
+	//GPIO_InitStruct.Pull = GPIO_NOPULL;
-//	HAL_GPIO_Init(SPI_DMA_ACTIVE_PORT, &GPIO_InitStruct);
+	HAL_GPIO_Init(SPI_INT_ACTIVE_PORT, &GPIO_InitStruct);
-//	SPI_DMA_ACTIVE_OFF;
+	SPI_INT_ACTIVE_OFF;
 }
 
 /* USER CODE BEGIN 4 */

Upstream/Src/upstream_msc.c

@@ -17,46 +17,59 @@
 UpstreamMSCCallbackTypeDef 				TestReadyCallback;
 UpstreamMSCCallbackUintPacketTypeDef	GetCapacityCallback;
 UpstreamMSCCallbackPacketTypeDef		GetStreamDataCallback;
+uint64_t								BlockStart;
+uint32_t								BlockCount;
 uint32_t								ByteCount;
+
 UpstreamPacketTypeDef*					ReadStreamPacket;
 uint8_t									ReadStreamBusy;
 
 
+static void Upstream_MSC_TestReadyFreePacketCallback(UpstreamPacketTypeDef* freePacket);
 static void Upstream_MSC_TestReadyReplyCallback(UpstreamPacketTypeDef* replyPacket);
 static void Upstream_MSC_GetCapacityReplyCallback(UpstreamPacketTypeDef* replyPacket);
 static void Upstream_MSC_GetStreamDataPacketCallback(UpstreamPacketTypeDef* replyPacket);
+static void Upstream_MSC_BeginWriteFreePacketCallback(UpstreamPacketTypeDef* freePacket);
 static void Upstream_MSC_BeginWriteReplyCallback(UpstreamPacketTypeDef* replyPacket);
 
 
 
 HAL_StatusTypeDef Upstream_MSC_TestReady(UpstreamMSCCallbackTypeDef callback)
 {
-	UpstreamPacketTypeDef* freePacket;
-
 	if (Upstream_StateMachine_CheckClassOperationOk() != HAL_OK)
 	{
 		return HAL_ERROR;
 	}
 	
 	TestReadyCallback = callback;
-	freePacket = Upstream_GetFreePacketImmediately();
+	return Upstream_GetFreePacket(Upstream_MSC_TestReadyFreePacketCallback);
-	if (freePacket == NULL)
+}
-	{
+
-		return HAL_ERROR;
-	}
 
-	freePacket->Length = UPSTREAM_PACKET_HEADER_LEN;
+
+void Upstream_MSC_TestReadyFreePacketCallback(UpstreamPacketTypeDef* freePacket)
+{
+	freePacket->Length16 = UPSTREAM_PACKET_HEADER_LEN_16;
 	freePacket->CommandClass = COMMAND_CLASS_MASS_STORAGE;
 	freePacket->Command = COMMAND_MSC_TEST_UNIT_READY;
+
 	if (Upstream_TransmitPacket(freePacket) == HAL_OK)
 	{
-		return Upstream_ReceivePacket(Upstream_MSC_TestReadyReplyCallback);
+		Upstream_ReleasePacket(freePacket);
+		if (Upstream_ReceivePacket(Upstream_MSC_TestReadyReplyCallback) != HAL_OK)
+		{
+			TestReadyCallback(HAL_ERROR);
+		}
+		return;
 	}
+
 	//else:
-	return HAL_ERROR;
+	Upstream_ReleasePacket(freePacket);
+	TestReadyCallback(HAL_ERROR);
 }
 
 
+
 void Upstream_MSC_TestReadyReplyCallback(UpstreamPacketTypeDef* replyPacket)
 {
 	if (Upstream_StateMachine_CheckClassOperationOk() != HAL_OK)
@@ -70,7 +83,7 @@ void Upstream_MSC_TestReadyReplyCallback(UpstreamPacketTypeDef* replyPacket)
 		return;
 	}
 
-	if ((replyPacket->Length != (UPSTREAM_PACKET_HEADER_LEN + 1)) ||
+	if ((replyPacket->Length16 != (UPSTREAM_PACKET_HEADER_LEN_16 + 1)) ||
 		(replyPacket->Data[0] != HAL_OK))
 	{
 		Upstream_ReleasePacket(replyPacket);
@@ -100,7 +113,7 @@ HAL_StatusTypeDef Upstream_MSC_GetCapacity(UpstreamMSCCallbackUintPacketTypeDef
 		return HAL_ERROR;
 	}
 
-	freePacket->Length = UPSTREAM_PACKET_HEADER_LEN;
+	freePacket->Length16 = UPSTREAM_PACKET_HEADER_LEN_16;
 	freePacket->CommandClass = COMMAND_CLASS_MASS_STORAGE;
 	freePacket->Command = COMMAND_MSC_GET_CAPACITY;
 	if (Upstream_TransmitPacket(freePacket) == HAL_OK)
@@ -128,7 +141,7 @@ void Upstream_MSC_GetCapacityReplyCallback(UpstreamPacketTypeDef* replyPacket)
 		return;
 	}
 
-	if (replyPacket->Length != (UPSTREAM_PACKET_HEADER_LEN + 8))
+	if (replyPacket->Length16 != (UPSTREAM_PACKET_HEADER_LEN_16 + (8 / 2)))
 	{
 		GetCapacityCallback(NULL, 0, 0);
 		return;
@@ -164,9 +177,9 @@ HAL_StatusTypeDef Upstream_MSC_BeginRead(UpstreamMSCCallbackTypeDef callback,
 		return HAL_ERROR;
 	}
 
-	freePacket->Length = UPSTREAM_PACKET_HEADER_LEN + (4 * 3);
+	freePacket->Length16 = UPSTREAM_PACKET_HEADER_LEN_16 + ((4 * 3) / 2);
 	freePacket->CommandClass = COMMAND_CLASS_MASS_STORAGE;
-	freePacket->Command = COMMAND_MSC_BEGIN_READ;
+	freePacket->Command = COMMAND_MSC_READ;
 	*(uint64_t*)&(freePacket->Data[0]) = readBlockStart;
 	*(uint32_t*)&(freePacket->Data[8]) = readBlockCount;
 
@@ -204,9 +217,10 @@ HAL_StatusTypeDef Upstream_MSC_GetStreamDataPacket(UpstreamMSCCallbackPacketType
 }
 
 
+
 void Upstream_MSC_GetStreamDataPacketCallback(UpstreamPacketTypeDef* replyPacket)
 {
-	uint16_t dataLength;
+	uint16_t dataLength8;
 
 	ReadStreamBusy = 0;
 
@@ -227,59 +241,68 @@ void Upstream_MSC_GetStreamDataPacketCallback(UpstreamPacketTypeDef* replyPacket
 		return;
 	}
 
-	dataLength = replyPacket->Length - UPSTREAM_PACKET_HEADER_LEN;
+	dataLength8 = (replyPacket->Length16 - UPSTREAM_PACKET_HEADER_LEN_16) * 2;
 
 	if (((replyPacket->CommandClass & COMMAND_CLASS_DATA_FLAG) == 0) ||		//Any 'command' reply (as opposed to 'data' reply) is an automatic fail here
-		 (replyPacket->Length <= UPSTREAM_PACKET_HEADER_LEN) ||				//Should be at least one data byte in the reply.
+		 (replyPacket->Length16 <= UPSTREAM_PACKET_HEADER_LEN_16) ||			//Should be at least one data byte in the reply.
-		 (dataLength > ByteCount))											//No more data than expected transfer length
+		 (dataLength8 > ByteCount))											//No more data than expected transfer length
 	{
 		GetStreamDataCallback(NULL, 0);
 		return;
 	}
 
-	ByteCount -= dataLength;
+	ByteCount -= dataLength8;
-	GetStreamDataCallback(replyPacket, dataLength);	//usb_msc_scsi will use this packet, so don't release now
+	GetStreamDataCallback(replyPacket, dataLength8);	//usb_msc_scsi will use this packet, so don't release now
 	if (ByteCount > 0)
 	{
-		Upstream_MSC_GetStreamDataPacket(NULL);				//Try to get the next packet now, before USB asks for it
+		Upstream_MSC_GetStreamDataPacket(NULL);			//Try to get the next packet now, before USB asks for it
 	}
 }
 
 
 
 HAL_StatusTypeDef Upstream_MSC_BeginWrite(UpstreamMSCCallbackTypeDef callback,
-										  uint64_t readBlockStart,
+										  uint64_t writeBlockStart,
-										  uint32_t readBlockCount)
+										  uint32_t writeBlockCount)
 {
-	UpstreamPacketTypeDef* freePacket;
-
 	if (Upstream_StateMachine_CheckClassOperationOk() != HAL_OK)
 	{
 		return HAL_ERROR;
 	}
 
+	BlockStart = writeBlockStart;
+	BlockCount = writeBlockCount;
 	TestReadyCallback = callback;
-	freePacket = Upstream_GetFreePacketImmediately();
+	return Upstream_GetFreePacket(Upstream_MSC_BeginWriteFreePacketCallback);
-	if (freePacket == NULL)
+}
-	{
+
-		return HAL_ERROR;
+
-	}
 
-	freePacket->Length = UPSTREAM_PACKET_HEADER_LEN + (4 * 3);
+void Upstream_MSC_BeginWriteFreePacketCallback(UpstreamPacketTypeDef* freePacket)
+{
+	freePacket->Length16 = UPSTREAM_PACKET_HEADER_LEN_16 + ((4 * 3) / 2);
 	freePacket->CommandClass = COMMAND_CLASS_MASS_STORAGE;
-	freePacket->Command = COMMAND_MSC_BEGIN_WRITE;
+	freePacket->Command = COMMAND_MSC_WRITE;
-	*(uint64_t*)&(freePacket->Data[0]) = readBlockStart;
+	*(uint64_t*)&(freePacket->Data[0]) = BlockStart;
-	*(uint32_t*)&(freePacket->Data[8]) = readBlockCount;
+	*(uint32_t*)&(freePacket->Data[8]) = BlockCount;
 
 	if (Upstream_TransmitPacket(freePacket) == HAL_OK)
 	{
-		return Upstream_ReceivePacket(Upstream_MSC_BeginWriteReplyCallback);
+		Upstream_ReleasePacket(freePacket);
+		if (Upstream_ReceivePacket(Upstream_MSC_BeginWriteReplyCallback) != HAL_OK)
+		{
+			TestReadyCallback(HAL_ERROR);
+		}
+		return;
 	}
+
 	//else:
-	return HAL_ERROR;
+	Upstream_ReleasePacket(freePacket);
+	TestReadyCallback(HAL_ERROR);
 }
 
 
+
 void Upstream_MSC_BeginWriteReplyCallback(UpstreamPacketTypeDef* replyPacket)
 {
 	uint8_t tempResult;
@@ -295,7 +318,7 @@ void Upstream_MSC_BeginWriteReplyCallback(UpstreamPacketTypeDef* replyPacket)
 		return;
 	}
 
-	if ((replyPacket->Length != (UPSTREAM_PACKET_HEADER_LEN + 1)) ||
+	if ((replyPacket->Length16 != (UPSTREAM_PACKET_HEADER_LEN_16 + 1)) ||
 		((replyPacket->Data[0] != HAL_OK) && (replyPacket->Data[0] != HAL_BUSY)))
 	{
 		Upstream_ReleasePacket(replyPacket);
@@ -311,16 +334,21 @@ void Upstream_MSC_BeginWriteReplyCallback(UpstreamPacketTypeDef* replyPacket)
 
 
 HAL_StatusTypeDef Upstream_MSC_PutStreamDataPacket(UpstreamPacketTypeDef* packetToSend,
-												   uint32_t dataLength)
+												   uint32_t dataLength8)
 {
 	if (Upstream_StateMachine_CheckClassOperationOk() != HAL_OK)
 	{
 		return HAL_ERROR;
 	}
 
-	packetToSend->Length = dataLength + UPSTREAM_PACKET_HEADER_LEN;
+	if ((dataLength8 % 2) != 0)
+	{
+		return HAL_ERROR;
+	}
+
+	packetToSend->Length16 = (dataLength8 / 2) + UPSTREAM_PACKET_HEADER_LEN_16;
 	packetToSend->CommandClass = COMMAND_CLASS_MASS_STORAGE | COMMAND_CLASS_DATA_FLAG;
-	packetToSend->Command = COMMAND_MSC_BEGIN_WRITE;
+	packetToSend->Command = COMMAND_MSC_WRITE;
 	return Upstream_TransmitPacket(packetToSend);
 }
 

Upstream/Src/upstream_spi.c

@@ -11,6 +11,7 @@
 #include "stm32f4xx_hal.h"
 #include "usbd_def.h"
 #include "board_config.h"
+#include "interrupts.h"
 
 
 
@@ -24,7 +25,9 @@ InterfaceStateTypeDef				UpstreamInterfaceState		= UPSTREAM_INTERFACE_IDLE;
 FreePacketCallbackTypeDef			PendingFreePacketCallback	= NULL;	//Indicates someone is waiting for a packet buffer to become available
 SpiPacketReceivedCallbackTypeDef	ReceivePacketCallback		= NULL;	//Indicates someone is waiting for a received packet
 
+uint32_t					TemporaryIncomingPacketLength;		//We don't actually care about what Downstream sends us when we are transmitting. We just need somewhere to put it so that our own packet length is not overwritten.
 uint8_t						TxOkInterruptReceived = 0;
+uint8_t						SpiInterruptCompleted = 0;
 uint8_t						SentCommandClass;
 uint8_t						SentCommand;
 
@@ -34,6 +37,7 @@ void Upstream_BeginTransmitPacketBody(void);
 HAL_StatusTypeDef Upstream_CheckBeginPacketReception(void);
 void Upstream_BeginReceivePacketSize(UpstreamPacketTypeDef* freePacket);
 void Upstream_BeginReceivePacketBody(void);
+void Upstream_SPIProcess(void);
 
 
 
@@ -46,7 +50,7 @@ void Upstream_InitSPI(void)
 	Hspi1.State = HAL_SPI_STATE_RESET;
 	Hspi1.Init.Mode = SPI_MODE_MASTER;
 	Hspi1.Init.Direction = SPI_DIRECTION_2LINES;
-	Hspi1.Init.DataSize = SPI_DATASIZE_8BIT;
+	Hspi1.Init.DataSize = SPI_DATASIZE_16BIT;
 	Hspi1.Init.CLKPolarity = SPI_POLARITY_LOW;
 	Hspi1.Init.CLKPhase = SPI_PHASE_1EDGE;
 	Hspi1.Init.NSS = SPI_NSS_SOFT;
@@ -56,6 +60,11 @@ void Upstream_InitSPI(void)
 	Hspi1.Init.CRCCalculation = SPI_CRCCALCULATION_ENABLED;
 	Hspi1.Init.CRCPolynomial = SPI_CRC_DEFAULTPOLYNOMIAL;
 	HAL_SPI_Init(&Hspi1);
+
+	if (DOWNSTREAM_TX_OK_ACTIVE)
+	{
+		TxOkInterruptReceived = 1;
+	}
 }
 
 
@@ -169,8 +178,8 @@ HAL_StatusTypeDef Upstream_TransmitPacket(UpstreamPacketTypeDef* packetToWrite)
 		return HAL_ERROR;
 	}
 	if ((packetToWrite->Busy != BUSY) ||
-		(packetToWrite->Length < UPSTREAM_PACKET_LEN_MIN) ||
+		(packetToWrite->Length16 < UPSTREAM_PACKET_LEN_MIN_16) ||
-		(packetToWrite->Length > UPSTREAM_PACKET_LEN))
+		(packetToWrite->Length16 > UPSTREAM_PACKET_LEN_16))
 	{
 		UPSTREAM_SPI_FREAKOUT;
 		return HAL_ERROR;
@@ -214,10 +223,45 @@ HAL_StatusTypeDef Upstream_TransmitPacket(UpstreamPacketTypeDef* packetToWrite)
 
 
 
-//Called at the end of the SPI TX DMA transfer,
+//Called at the end of the SPI TxRx transfer,
-//at DMA2 interrupt priority. Assume *hspi points to our hspi1.
+//at SPI1 interrupt priority. Assume *hspi points to our hspi1.
-void HAL_SPI_TxCpltCallback(SPI_HandleTypeDef *hspi)
+//We TxRx our outgoing packet because the SPI hardware freaks out if we only Tx it :-/
+void HAL_SPI_TxRxCpltCallback(SPI_HandleTypeDef *hspi)
+{
+	SpiInterruptCompleted = 1;
+
+	//Elevate priority here to stop EXT3I sneaking in
+	//before we have a chance to process UpstreamInterfaceState change.
+	__set_BASEPRI(INT_PRIORITY_OTG_FS << (8 - __NVIC_PRIO_BITS));
+}
+
+
+
+//Preemption protection wrapper around Upstream_SPIProcess()
+//We must protect against preemption by USB and EXT3 interrupts at priority 10!
+void Upstream_SPIProcess_InterruptSafe(void)
 {
+	//This is done on SPI interrupt callback...
+	//__set_BASEPRI(INT_PRIORITY_OTG_FS << (8 - __NVIC_PRIO_BITS));
+
+	if (SpiInterruptCompleted == 0)
+	{
+		return;
+	}
+	SpiInterruptCompleted = 0;
+	Upstream_SPIProcess();
+	__set_BASEPRI(0);
+}
+
+
+
+//Called from main().
+//Must be protected against preemption by USB and EXT3 interrupts at priority 10!
+void Upstream_SPIProcess(void)
+{
+	SpiPacketReceivedCallbackTypeDef tempPacketCallback;
+	UpstreamPacketTypeDef* tempPacketToFree;
+
 	SPI1_NSS_DEASSERT;
 
 	if (UpstreamInterfaceState >= UPSTREAM_INTERFACE_ERROR)
@@ -246,11 +290,8 @@ void HAL_SPI_TxCpltCallback(SPI_HandleTypeDef *hspi)
 			return;
 		}
 
-		Upstream_ReleasePacket(CurrentWorkingPacket);
+		tempPacketToFree = CurrentWorkingPacket;
-		if (UpstreamInterfaceState == UPSTREAM_INTERFACE_ERROR)
+
-		{
-			return;						//Really shouldn't happen, but we are being paranoid...
-		}
 		if (NextTxPacket != NULL)
 		{
 			//NextTxPacket has already passed the checks in Upstream_TransmitPacket.
@@ -258,22 +299,84 @@ void HAL_SPI_TxCpltCallback(SPI_HandleTypeDef *hspi)
 			UpstreamInterfaceState = UPSTREAM_INTERFACE_TX_SIZE_WAIT;
 			CurrentWorkingPacket = NextTxPacket;
 			NextTxPacket = NULL;
+			SentCommandClass = CurrentWorkingPacket->CommandClass;
+			SentCommand = CurrentWorkingPacket->Command;
 			if (TxOkInterruptReceived)
 			{
 				TxOkInterruptReceived = 0;
 				Upstream_BeginTransmitPacketSize();
 			}
+		}
+		else
+		{
+			//No packet queued for transmission:
+			UpstreamInterfaceState = UPSTREAM_INTERFACE_IDLE;
+			if (ReceivePacketCallback != NULL)
+			{
+				Upstream_CheckBeginPacketReception();
+			}
+		}
+
+		//Release old packet after moving Next to Current
+		Upstream_ReleasePacket(tempPacketToFree);
+		return;
+	}
+	
+
+
+	if (UpstreamInterfaceState == UPSTREAM_INTERFACE_RX_SIZE)
+	{
+		if ((CurrentWorkingPacket->Length16 < UPSTREAM_PACKET_LEN_MIN_16) ||
+			(CurrentWorkingPacket->Length16 > UPSTREAM_PACKET_LEN_16))
+		{
+			UPSTREAM_SPI_FREAKOUT;
 			return;
 		}
+		UpstreamInterfaceState = UPSTREAM_INTERFACE_RX_PACKET_WAIT;
+		if (TxOkInterruptReceived)
+		{
+			TxOkInterruptReceived = 0;
+			Upstream_BeginReceivePacketBody();
+		}
+		return;
+	}
 
+	if (UpstreamInterfaceState == UPSTREAM_INTERFACE_RX_PACKET)
+	{
 		UpstreamInterfaceState = UPSTREAM_INTERFACE_IDLE;
-		if (ReceivePacketCallback != NULL)
+		if (ReceivePacketCallback == NULL)
 		{
-			Upstream_CheckBeginPacketReception();
+			UPSTREAM_SPI_FREAKOUT;
+			return;
 		}
+
+		if ((CurrentWorkingPacket->CommandClass == COMMAND_CLASS_ERROR) &&
+			(CurrentWorkingPacket->Command == COMMAND_ERROR_DEVICE_DISCONNECTED))
+		{
+			Upstream_ReleasePacket(CurrentWorkingPacket);
+			ReceivePacketCallback = NULL;
+			Upstream_StateMachine_DeviceDisconnected();
+			return;
+		}
+
+		if (((CurrentWorkingPacket->CommandClass & COMMAND_CLASS_MASK) != (SentCommandClass & COMMAND_CLASS_MASK)) ||
+			(CurrentWorkingPacket->Command != SentCommand))
+		{
+			UPSTREAM_SPI_FREAKOUT;
+			Upstream_ReleasePacket(CurrentWorkingPacket);
+			CurrentWorkingPacket = NULL;		//Call back with a NULL packet to indicate error
+		}
+
+		//USB interface may want to receive another packet immediately,
+		//so clear ReceivePacketCallback before the call.
+		//It is the callback's responsibility to release the packet buffer we are passing to it!
+		tempPacketCallback = ReceivePacketCallback;
+		ReceivePacketCallback = NULL;
+		tempPacketCallback(CurrentWorkingPacket);
 		return;
 	}
 
+
 	//case default:
 	UPSTREAM_SPI_FREAKOUT;
 }
@@ -368,9 +471,10 @@ void Upstream_BeginTransmitPacketSize(void)
 {
 	UpstreamInterfaceState = UPSTREAM_INTERFACE_TX_SIZE;
 	SPI1_NSS_ASSERT;
-	if (HAL_SPI_Transmit_DMA(&Hspi1,
+	if (HAL_SPI_TransmitReceive_IT(&Hspi1,
-							 (uint8_t*)&CurrentWorkingPacket->Length,
+								   (uint8_t*)&CurrentWorkingPacket->Length16,
-							 2) != HAL_OK)
+								   (uint8_t*)&TemporaryIncomingPacketLength,
+								   2) != HAL_OK)		//We only need to write one word, but the peripheral library freaks out...
 	{
 		UPSTREAM_SPI_FREAKOUT;
 	}
@@ -381,9 +485,11 @@ void Upstream_BeginTransmitPacketBody(void)
 {
 	UpstreamInterfaceState = UPSTREAM_INTERFACE_TX_PACKET;
 	SPI1_NSS_ASSERT;
-	if ((HAL_SPI_Transmit_DMA(&Hspi1,
+
-							  &CurrentWorkingPacket->CommandClass,
+	if (HAL_SPI_TransmitReceive_IT(&Hspi1,
-							  CurrentWorkingPacket->Length)) != HAL_OK)
+								   &CurrentWorkingPacket->CommandClass,
+								   &CurrentWorkingPacket->CommandClass,
+								   ((CurrentWorkingPacket->Length16 < 2) ? 2 : CurrentWorkingPacket->Length16)) != HAL_OK)
 	{
 		UPSTREAM_SPI_FREAKOUT;
 	}
@@ -406,11 +512,13 @@ void Upstream_BeginReceivePacketSize(UpstreamPacketTypeDef* freePacket)
 	}
 	UpstreamInterfaceState = UPSTREAM_INTERFACE_RX_SIZE;
 	CurrentWorkingPacket = freePacket;
-	CurrentWorkingPacket->Length = 0;		//Our RX buffer is used by HAL_SPI_Receive_DMA as dummy TX data, we set Length to 0 so downstream will know this is a dummy packet.
+	CurrentWorkingPacket->Length16 = 0;		//Our RX buffer is used by HAL_SPI_Receive_DMA as dummy TX data, we set Length to 0 so downstream will know this is a dummy packet.
 	SPI1_NSS_ASSERT;
-	if (HAL_SPI_Receive_DMA(&Hspi1,
+	TemporaryIncomingPacketLength = 0;
-							(uint8_t*)&CurrentWorkingPacket->Length,
+	if (HAL_SPI_TransmitReceive_IT(&Hspi1,
-							(2 + 1)) != HAL_OK)		//"When the CRC feature is enabled the pData Length must be Size + 1"
+								   (uint8_t*)&TemporaryIncomingPacketLength,
+								   (uint8_t*)&CurrentWorkingPacket->Length16,
+								   2) != HAL_OK)		//We only need to write one word, but the peripheral library freaks out...
 	{
 		UPSTREAM_SPI_FREAKOUT;
 	}
@@ -421,84 +529,16 @@ void Upstream_BeginReceivePacketBody(void)
 {
 	UpstreamInterfaceState = UPSTREAM_INTERFACE_RX_PACKET;
 	SPI1_NSS_ASSERT;
-	if ((HAL_SPI_Receive_DMA(&Hspi1,
+	if (HAL_SPI_TransmitReceive_IT(&Hspi1,
-							 &CurrentWorkingPacket->CommandClass,
+								   &CurrentWorkingPacket->CommandClass,
-							 (CurrentWorkingPacket->Length + 1))) != HAL_OK)	//"When the CRC feature is enabled the pData Length must be Size + 1"
+								   &CurrentWorkingPacket->CommandClass,
+								   ((CurrentWorkingPacket->Length16 < 2) ? 2 : CurrentWorkingPacket->Length16)) != HAL_OK)
 	{
 		UPSTREAM_SPI_FREAKOUT;
 	}
 }
 
 
-//Called at the end of the SPI RX DMA transfer,
-//at DMA2 interrupt priority. Assume *hspi points to our hspi1.
-void HAL_SPI_RxCpltCallback(SPI_HandleTypeDef *hspi)
-{
-	SpiPacketReceivedCallbackTypeDef tempPacketCallback;
-
-	SPI1_NSS_DEASSERT;
-
-	if (UpstreamInterfaceState >= UPSTREAM_INTERFACE_ERROR)
-	{
-		return;
-	}
-
-	if (UpstreamInterfaceState == UPSTREAM_INTERFACE_RX_SIZE)
-	{
-		if ((CurrentWorkingPacket->Length < UPSTREAM_PACKET_LEN_MIN) ||
-			(CurrentWorkingPacket->Length > UPSTREAM_PACKET_LEN))
-		{
-			UPSTREAM_SPI_FREAKOUT;
-			return;
-		}
-		UpstreamInterfaceState = UPSTREAM_INTERFACE_RX_PACKET_WAIT;
-		if (TxOkInterruptReceived)
-		{
-			TxOkInterruptReceived = 0;
-			Upstream_BeginReceivePacketBody();
-		}
-		return;
-	}
-
-	if (UpstreamInterfaceState == UPSTREAM_INTERFACE_RX_PACKET)
-	{
-		UpstreamInterfaceState = UPSTREAM_INTERFACE_IDLE;
-		if (ReceivePacketCallback == NULL)
-		{
-			UPSTREAM_SPI_FREAKOUT;
-			return;
-		}
-
-		if ((CurrentWorkingPacket->CommandClass == COMMAND_CLASS_ERROR) &&
-			(CurrentWorkingPacket->Command == COMMAND_ERROR_DEVICE_DISCONNECTED))
-		{
-			Upstream_ReleasePacket(CurrentWorkingPacket);
-			ReceivePacketCallback = NULL;
-			Upstream_StateMachine_DeviceDisconnected();
-			return;
-		}
-
-		if (((CurrentWorkingPacket->CommandClass & COMMAND_CLASS_MASK) != SentCommandClass) ||
-			(CurrentWorkingPacket->Command != SentCommand))
-		{
-			UPSTREAM_SPI_FREAKOUT;
-			Upstream_ReleasePacket(CurrentWorkingPacket);
-			CurrentWorkingPacket = NULL;		//Call back with a NULL packet to indicate error
-		}
-
-		//USB interface may want to receive another packet immediately,
-		//so clear ReceivePacketCallback before the call.
-		//It is the callback's responsibility to release the packet buffer we are passing to it!
-		tempPacketCallback = ReceivePacketCallback;
-		ReceivePacketCallback = NULL;
-		tempPacketCallback(CurrentWorkingPacket);
-		return;
-	}
-	
-	//case default:
-	UPSTREAM_SPI_FREAKOUT;
-}
-
 
 //Something bad happened! Possibly CRC error...
 void HAL_SPI_ErrorCallback(SPI_HandleTypeDef *hspi)

Upstream/Src/upstream_statemachine.c

@@ -40,7 +40,7 @@ void Upstream_InitStateMachine(void)
 		return;
 	}
 
-	freePacket->Length = UPSTREAM_PACKET_HEADER_LEN + MSC_MEDIA_PACKET;
+	freePacket->Length16 = UPSTREAM_PACKET_LEN_16;
 	freePacket->CommandClass = COMMAND_CLASS_INTERFACE;
 	freePacket->Command = COMMAND_INTERFACE_ECHO;
 
@@ -105,7 +105,7 @@ void Upstream_StateMachine_TestInterfaceReplyCallback(UpstreamPacketTypeDef* rep
 		return;
 	}
 
-	if (replyPacket->Length != (UPSTREAM_PACKET_HEADER_LEN + MSC_MEDIA_PACKET))
+	if (replyPacket->Length16 != UPSTREAM_PACKET_LEN_16)
 	{
 		UPSTREAM_STATEMACHINE_FREAKOUT;
 		return;
@@ -130,7 +130,7 @@ void Upstream_StateMachine_TestInterfaceReplyCallback(UpstreamPacketTypeDef* rep
 void Upstream_StateMachine_NotifyDevice(UpstreamPacketTypeDef* freePacket)
 {
 	UpstreamState = STATE_WAIT_DEVICE;
-	freePacket->Length = UPSTREAM_PACKET_HEADER_LEN;
+	freePacket->Length16 = UPSTREAM_PACKET_HEADER_LEN_16;
 	freePacket->CommandClass = COMMAND_CLASS_INTERFACE;
 	freePacket->Command = COMMAND_INTERFACE_NOTIFY_DEVICE;
 	if (Upstream_TransmitPacket(freePacket) == HAL_OK)
@@ -157,7 +157,7 @@ void Upstream_StateMachine_NotifyDeviceReplyCallback(UpstreamPacketTypeDef* repl
 		return;
 	}
 
-	if (replyPacket->Length != (UPSTREAM_PACKET_HEADER_LEN + 1))
+	if (replyPacket->Length16 != (UPSTREAM_PACKET_HEADER_LEN_16 + 1))
 	{
 		UPSTREAM_STATEMACHINE_FREAKOUT;
 		return;
@@ -173,6 +173,8 @@ void Upstream_StateMachine_NotifyDeviceReplyCallback(UpstreamPacketTypeDef* repl
 	//Add other supported classes here...
 	}
 
+	Upstream_ReleasePacket(replyPacket);
+
 	if (newActiveClass == COMMAND_CLASS_INTERFACE)
 	{
 		UPSTREAM_STATEMACHINE_FREAKOUT;

Upstream/Upstream Debug.launch

@@ -61,6 +61,6 @@
 <listAttribute key="org.eclipse.debug.ui.favoriteGroups">
 <listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
 </listAttribute>
-<stringAttribute key="org.eclipse.dsf.launch.MEMORY_BLOCKS" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;memoryBlockExpressionList context=&quot;Context string&quot;&gt;&#10;&lt;memoryBlockExpression address=&quot;3758157060&quot; label=&quot;0xE000ED04&quot;/&gt;&#10;&lt;/memoryBlockExpressionList&gt;&#10;"/>
+<stringAttribute key="org.eclipse.dsf.launch.MEMORY_BLOCKS" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;memoryBlockExpressionList context=&quot;Context string&quot;/&gt;&#10;"/>
 <stringAttribute key="process_factory_id" value="org.eclipse.cdt.dsf.gdb.GdbProcessFactory"/>
 </launchConfiguration>

Upstream/Upstream Release.launch

@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="ilg.gnuarmeclipse.debug.gdbjtag.openocd.launchConfigurationType">
+<stringAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.PERIPHERALS" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;peripherals/&gt;&#10;"/>
+<booleanAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.openocd.doContinue" value="true"/>
+<booleanAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.openocd.doDebugInRam" value="false"/>
+<booleanAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.openocd.doFirstReset" value="true"/>
+<booleanAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.openocd.doGdbServerAllocateConsole" value="true"/>
+<booleanAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.openocd.doGdbServerAllocateTelnetConsole" value="false"/>
+<booleanAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.openocd.doSecondReset" value="true"/>
+<booleanAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.openocd.doStartGdbServer" value="true"/>
+<booleanAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.openocd.enableSemihosting" value="true"/>
+<stringAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.openocd.firstResetType" value="init"/>
+<stringAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.openocd.gdbClientOtherCommands" value="set mem inaccessible-by-default off"/>
+<stringAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.openocd.gdbClientOtherOptions" value=""/>
+<stringAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.openocd.gdbServerConnectionAddress" value=""/>
+<stringAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.openocd.gdbServerExecutable" value="${openocd_path}/${openocd_executable}"/>
+<intAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.openocd.gdbServerGdbPortNumber" value="3333"/>
+<stringAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.openocd.gdbServerLog" value=""/>
+<stringAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.openocd.gdbServerOther" value="-f interface/ftdi/olimex-arm-usb-tiny-h.cfg -f board/olimex_stm32_h405.cfg"/>
+<intAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.openocd.gdbServerTelnetPortNumber" value="4444"/>
+<stringAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.openocd.otherInitCommands" value=""/>
+<stringAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.openocd.otherRunCommands" value=""/>
+<stringAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.openocd.secondResetType" value="halt"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.imageFileName" value=""/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.imageOffset" value=""/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.ipAddress" value="localhost"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.jtagDevice" value="GNU ARM OpenOCD"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.loadImage" value="true"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.loadSymbols" value="true"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.pcRegister" value=""/>
+<intAttribute key="org.eclipse.cdt.debug.gdbjtag.core.portNumber" value="3333"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.setPcRegister" value="false"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.setResume" value="false"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.setStopAt" value="true"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.stopAt" value="main"/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.symbolsFileName" value=""/>
+<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.symbolsOffset" value=""/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.useFileForImage" value="false"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.useFileForSymbols" value="false"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.useProjBinaryForImage" value="true"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.useProjBinaryForSymbols" value="true"/>
+<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.useRemoteTarget" value="true"/>
+<stringAttribute key="org.eclipse.cdt.debug.mi.core.commandFactory" value="Standard (Linux)"/>
+<stringAttribute key="org.eclipse.cdt.debug.mi.core.protocol" value="mi"/>
+<booleanAttribute key="org.eclipse.cdt.debug.mi.core.verboseMode" value="false"/>
+<stringAttribute key="org.eclipse.cdt.dsf.gdb.DEBUG_NAME" value="${cross_prefix}gdb${cross_suffix}"/>
+<booleanAttribute key="org.eclipse.cdt.dsf.gdb.UPDATE_THREADLIST_ON_SUSPEND" value="false"/>
+<intAttribute key="org.eclipse.cdt.launch.ATTR_BUILD_BEFORE_LAUNCH_ATTR" value="2"/>
+<stringAttribute key="org.eclipse.cdt.launch.COREFILE_PATH" value=""/>
+<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_REGISTER_GROUPS" value=""/>
+<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="Release/Upstream.elf"/>
+<stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="Upstream"/>
+<booleanAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_AUTO_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_ID_ATTR" value="ilg.gnuarmeclipse.managedbuild.cross.config.elf.release.441554085"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/Upstream"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="4"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.dsf.launch.MEMORY_BLOCKS" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;memoryBlockExpressionList context=&quot;Context string&quot;&gt;&#10;&lt;memoryBlockExpression address=&quot;3758157060&quot; label=&quot;0xE000ED04&quot;/&gt;&#10;&lt;/memoryBlockExpressionList&gt;&#10;"/>
+<stringAttribute key="process_factory_id" value="org.eclipse.cdt.dsf.gdb.GdbProcessFactory"/>
+</launchConfiguration>