From 6886ccd2d46ad77798f0ededf510d1ba875537e9 Mon Sep 17 00:00:00 2001
From: Robert Fisk <robert_fisk@fastmail.fm>
Date: Sun, 3 Jan 2016 13:01:16 +1300
Subject: [PATCH 01/11] Tweak device descriptor strings

---
 Downstream/.settings/language.settings.xml | 4 ++--
 Upstream/.settings/language.settings.xml   | 4 ++--
 Upstream/Src/usbd_descriptors.c            | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Downstream/.settings/language.settings.xml b/Downstream/.settings/language.settings.xml
index 7a9fc8b..3f82d32 100644
--- a/Downstream/.settings/language.settings.xml
+++ b/Downstream/.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="1699849300025239643" 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="-839238988286016573" 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>
@@ -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="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">
+			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-837855297831848983" 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>
diff --git a/Upstream/.settings/language.settings.xml b/Upstream/.settings/language.settings.xml
index 458d877..3b1adc1 100755
--- a/Upstream/.settings/language.settings.xml
+++ b/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="1746152686454047893" 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="-890590691781474359" 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>
@@ -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="1649595214690430971" 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="-829022676999536605" 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>
diff --git a/Upstream/Src/usbd_descriptors.c b/Upstream/Src/usbd_descriptors.c
index 8eb2cce..6368639 100755
--- a/Upstream/Src/usbd_descriptors.c
+++ b/Upstream/Src/usbd_descriptors.c
@@ -61,12 +61,12 @@
   */ 
 #define USBD_VID     1155
 #define USBD_LANGID_STRING     1033
-#define USBD_MANUFACTURER_STRING     "STMicroelectronics"
+#define USBD_MANUFACTURER_STRING     "The USG is Good, not Bad"
 #define USBD_PID_FS     22314
-#define USBD_PRODUCT_STRING_FS     "STM32 Mass Storage"
+#define USBD_PRODUCT_STRING_FS     "USG v1.0"
 #define USBD_SERIALNUMBER_STRING_FS     "00000000001A"
-#define USBD_CONFIGURATION_STRING_FS     "MSC Config"
-#define USBD_INTERFACE_STRING_FS     "MSC Interface"
+#define USBD_CONFIGURATION_STRING_FS     "USG multipurpose configuration"
+#define USBD_INTERFACE_STRING_FS     "USG multipurpose interface"
 
 /**
   * @}

From 4615f2c740c4d54dcdc32e66b34e0f2725422605 Mon Sep 17 00:00:00 2001
From: Robert Fisk <robert_fisk@fastmail.fm>
Date: Mon, 11 Jan 2016 14:07:00 +1300
Subject: [PATCH 02/11] Tweak product strings again

---
 Upstream/Src/usbd_descriptors.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/Upstream/Src/usbd_descriptors.c b/Upstream/Src/usbd_descriptors.c
index 6368639..5a06500 100755
--- a/Upstream/Src/usbd_descriptors.c
+++ b/Upstream/Src/usbd_descriptors.c
@@ -59,14 +59,14 @@
 /** @defgroup USBD_DESC_Private_Defines
   * @{
   */ 
-#define USBD_VID     1155
-#define USBD_LANGID_STRING     1033
-#define USBD_MANUFACTURER_STRING     "The USG is Good, not Bad"
-#define USBD_PID_FS     22314
-#define USBD_PRODUCT_STRING_FS     "USG v1.0"
+#define USBD_VID                        1155
+#define USBD_LANGID_STRING              1033
+#define USBD_MANUFACTURER_STRING        "The USG is Good, not Bad"
+#define USBD_PID_FS                     22314
+#define USBD_PRODUCT_STRING_FS          "USG v1.0"
 #define USBD_SERIALNUMBER_STRING_FS     "00000000001A"
-#define USBD_CONFIGURATION_STRING_FS     "USG multipurpose configuration"
-#define USBD_INTERFACE_STRING_FS     "USG multipurpose interface"
+#define USBD_CONFIGURATION_STRING_FS    "USG multipurpose configuration"
+#define USBD_INTERFACE_STRING_FS        "USG multipurpose interface"
 
 /**
   * @}
@@ -162,10 +162,10 @@ const int8_t  STORAGE_Inquirydata_FS[] = { //36
   0x00,
   0x00,
   0x00,
-  'S', 'T', 'M', ' ', ' ', ' ', ' ', ' ', /* Manufacturer : 8 bytes */
-  'P', 'r', 'o', 'd', 'u', 'c', 't', ' ', /* Product      : 16 Bytes */
-  ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ',
-  '0', '.', '0' ,'1',                     /* Version      : 4 Bytes */
+  'T', 'h', 'e', ' ', 'U', 'S', 'G', ' ', /* Manufacturer : 8 bytes */
+  'i', 's', ' ', 'G', 'o', 'o', 'd', ',', /* Product      : 16 Bytes */
+  'n', 'o', 't', ' ', 'b', 'a', 'd', '.',
+  'v', '1', '.' ,'0',                     /* Version      : 4 Bytes */
 };
 
 /**

From c3c4d4714524d7de17fa24818156cc4e35953b35 Mon Sep 17 00:00:00 2001
From: Robert Fisk <robert_fisk@fastmail.fm>
Date: Sat, 16 Jan 2016 01:43:15 +1300
Subject: [PATCH 03/11] Mouse Upstream code half-done.

---
 Upstream/.cproject                            |  12 +-
 Upstream/Inc/upstream_interface_def.h         |   1 +
 .../Class/HID/Inc/usbd_hid.h                  |   6 +-
 .../Class/HID/Src/usbd_hid.c                  | 115 ++++++++++--------
 Upstream/Src/upstream_statemachine.c          |   6 +
 5 files changed, 86 insertions(+), 54 deletions(-)

diff --git a/Upstream/.cproject b/Upstream/.cproject
index 5f285a8..e0a67c4 100755
--- a/Upstream/.cproject
+++ b/Upstream/.cproject
@@ -8,6 +8,8 @@
 					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
 				</extensions>
 			</storageModule>
@@ -46,7 +48,7 @@
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.padded.1572432926" name="Warn if padding is included (-Wpadded)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.padded" value="false" valueType="boolean"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.logicalop.740202841" 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.628949634" isAbstract="false" osList="all" superClass="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform"/>
-							<builder buildPath="${workspace_loc:/USPDevice}/Debug" id="org.eclipse.cdt.build.core.internal.builder.1744900233" keepEnvironmentInBuildfile="false" name="CDT Internal Builder" superClass="org.eclipse.cdt.build.core.internal.builder"/>
+							<builder buildPath="${workspace_loc:/Upstream}/Debug" command="make" id="ilg.gnuarmeclipse.managedbuild.cross.builder.1480076349" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="ilg.gnuarmeclipse.managedbuild.cross.builder"/>
 							<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler.1030197418" name="Cross ARM GNU Assembler" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler">
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor.1741569390" name="Use preprocessor" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor" value="true" valueType="boolean"/>
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.include.paths.2044612762" name="Include paths (-I)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.include.paths" valueType="includePath">
@@ -56,6 +58,7 @@
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Upstream/Drivers/CMSIS/Device/ST/STM32F4xx/Include}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Upstream/Middlewares/ST/STM32_USB_Device_Library/Core/Inc}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Upstream/Middlewares/ST/STM32_USB_Device_Library/Class/MSC/Inc}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Upstream/Middlewares/ST/STM32_USB_Device_Library/Class/HID/Inc}&quot;"/>
 								</option>
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.defs.318992672" name="Defined symbols (-D)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.defs" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="STM32F401xC"/>
@@ -70,6 +73,7 @@
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Upstream/Inc}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Upstream/Drivers/CMSIS/Include}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Upstream/Middlewares/ST/STM32_USB_Device_Library/Class/MSC/Inc}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Upstream/Middlewares/ST/STM32_USB_Device_Library/Class/HID/Inc}&quot;"/>
 								</option>
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.defs.1985218796" name="Defined symbols (-D)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.defs" useByScannerDiscovery="false" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="STM32F401xC"/>
@@ -136,6 +140,8 @@
 					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
 				</extensions>
 			</storageModule>
@@ -171,7 +177,7 @@
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.pointerarith.1615061633" 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.1292304015" 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.1338907066" isAbstract="false" osList="all" superClass="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform"/>
-							<builder buildPath="${workspace_loc:/USPDevice}/Release" id="org.eclipse.cdt.build.core.internal.builder.77578434" keepEnvironmentInBuildfile="false" name="CDT Internal Builder" superClass="org.eclipse.cdt.build.core.internal.builder"/>
+							<builder buildPath="${workspace_loc:/Upstream}/Release" command="make" id="ilg.gnuarmeclipse.managedbuild.cross.builder.836101662" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="ilg.gnuarmeclipse.managedbuild.cross.builder"/>
 							<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler.290553164" name="Cross ARM GNU Assembler" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler">
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor.1693864736" name="Use preprocessor" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor" value="true" valueType="boolean"/>
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.include.paths.1982648457" name="Include paths (-I)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.include.paths" valueType="includePath">
@@ -181,6 +187,7 @@
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Upstream/Drivers/CMSIS/Include}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Upstream/Middlewares/ST/STM32_USB_Device_Library/Core/Inc}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Upstream/Middlewares/ST/STM32_USB_Device_Library/Class/MSC/Inc}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Upstream/Middlewares/ST/STM32_USB_Device_Library/Class/HID/Inc}&quot;"/>
 								</option>
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.defs.1371136113" name="Defined symbols (-D)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.defs" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="STM32F401xC"/>
@@ -195,6 +202,7 @@
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Upstream/Drivers/CMSIS/Include}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Upstream/Middlewares/ST/STM32_USB_Device_Library/Core/Inc}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Upstream/Middlewares/ST/STM32_USB_Device_Library/Class/MSC/Inc}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Upstream/Middlewares/ST/STM32_USB_Device_Library/Class/HID/Inc}&quot;"/>
 								</option>
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.defs.1897209462" name="Defined symbols (-D)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.defs" useByScannerDiscovery="false" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="STM32F401xC"/>
diff --git a/Upstream/Inc/upstream_interface_def.h b/Upstream/Inc/upstream_interface_def.h
index dc2a12c..825c6da 100644
--- a/Upstream/Inc/upstream_interface_def.h
+++ b/Upstream/Inc/upstream_interface_def.h
@@ -31,6 +31,7 @@ typedef enum
 {
     COMMAND_CLASS_INTERFACE,
     COMMAND_CLASS_MASS_STORAGE,
+    COMMAND_CLASS_HID_MOUSE,
     //...
     COMMAND_CLASS_ERROR
 }
diff --git a/Upstream/Middlewares/ST/STM32_USB_Device_Library/Class/HID/Inc/usbd_hid.h b/Upstream/Middlewares/ST/STM32_USB_Device_Library/Class/HID/Inc/usbd_hid.h
index 68b5526..2c5b69f 100644
--- a/Upstream/Middlewares/ST/STM32_USB_Device_Library/Class/HID/Inc/usbd_hid.h
+++ b/Upstream/Middlewares/ST/STM32_USB_Device_Library/Class/HID/Inc/usbd_hid.h
@@ -113,8 +113,10 @@ USBD_HID_HandleTypeDef;
   * @{
   */ 
 
-extern USBD_ClassTypeDef  USBD_HID;
-#define USBD_HID_CLASS    &USBD_HID
+extern USBD_ClassTypeDef  USBD_HID_Mouse;
+extern USBD_ClassTypeDef  USBD_HID_Keyboard;
+
+//#define USBD_HID_CLASS    &USBD_HID
 /**
   * @}
   */ 
diff --git a/Upstream/Middlewares/ST/STM32_USB_Device_Library/Class/HID/Src/usbd_hid.c b/Upstream/Middlewares/ST/STM32_USB_Device_Library/Class/HID/Src/usbd_hid.c
index 41aff43..91875e3 100644
--- a/Upstream/Middlewares/ST/STM32_USB_Device_Library/Class/HID/Src/usbd_hid.c
+++ b/Upstream/Middlewares/ST/STM32_USB_Device_Library/Class/HID/Src/usbd_hid.c
@@ -48,51 +48,15 @@
 
 /* Includes ------------------------------------------------------------------*/
 #include "usbd_hid.h"
-#include "usbd_desc.h"
 #include "usbd_ctlreq.h"
 
 
-/** @addtogroup STM32_USB_DEVICE_LIBRARY
-  * @{
-  */
-
-
-/** @defgroup USBD_HID 
-  * @brief usbd core module
-  * @{
-  */ 
-
-/** @defgroup USBD_HID_Private_TypesDefinitions
-  * @{
-  */ 
-/**
-  * @}
-  */ 
-
-
-/** @defgroup USBD_HID_Private_Defines
-  * @{
-  */ 
 
-/**
-  * @}
-  */ 
-
-
-/** @defgroup USBD_HID_Private_Macros
-  * @{
-  */ 
-/**
-  * @}
-  */ 
-
-
-
-
-/** @defgroup USBD_HID_Private_FunctionPrototypes
-  * @{
-  */
+static uint8_t  USBD_HID_InitMouse(USBD_HandleTypeDef *pdev,
+                                   uint8_t cfgidx);
 
+static uint8_t  USBD_HID_InitKeyboard(USBD_HandleTypeDef *pdev,
+                                      uint8_t cfgidx);
 
 static uint8_t  USBD_HID_Init (USBD_HandleTypeDef *pdev, 
                                uint8_t cfgidx);
@@ -108,17 +72,30 @@ static uint8_t  *USBD_HID_GetCfgDesc (uint16_t *length);
 static uint8_t  *USBD_HID_GetDeviceQualifierDesc (uint16_t *length);
 
 static uint8_t  USBD_HID_DataIn (USBD_HandleTypeDef *pdev, uint8_t epnum);
-/**
-  * @}
-  */ 
 
-/** @defgroup USBD_HID_Private_Variables
-  * @{
-  */ 
 
-USBD_ClassTypeDef  USBD_HID = 
+
+USBD_ClassTypeDef  USBD_HID_Mouse =
 {
-  USBD_HID_Init,
+  USBD_HID_InitMouse,
+  USBD_HID_DeInit,
+  USBD_HID_Setup,
+  NULL, /*EP0_TxSent*/
+  NULL, /*EP0_RxReady*/
+  USBD_HID_DataIn, /*DataIn*/
+  NULL, /*DataOut*/
+  NULL, /*SOF */
+  NULL,
+  NULL,
+  USBD_HID_GetCfgDesc,
+  USBD_HID_GetCfgDesc,
+  USBD_HID_GetCfgDesc,
+  USBD_HID_GetDeviceQualifierDesc,
+};
+
+USBD_ClassTypeDef  USBD_HID_Keyboard =
+{
+  USBD_HID_InitKeyboard,
   USBD_HID_DeInit,
   USBD_HID_Setup,
   NULL, /*EP0_TxSent*/  
@@ -134,6 +111,12 @@ USBD_ClassTypeDef  USBD_HID =
   USBD_HID_GetDeviceQualifierDesc,
 };
 
+
+
+#define USB_HID_CFGDESC_HID_REPORT_DESC_SIZE_OFFSET     25
+#define USB_HID_DESC_HID_REPORT_DESC_SIZE_OFFSET        7
+
+
 /* USB HID device Configuration Descriptor */
 __ALIGN_BEGIN static uint8_t USBD_HID_CfgDesc[USB_HID_CONFIG_DESC_SIZ]  __ALIGN_END =
 {
@@ -187,7 +170,6 @@ __ALIGN_BEGIN static uint8_t USBD_HID_CfgDesc[USB_HID_CONFIG_DESC_SIZ]  __ALIGN_
 /* USB HID device Configuration Descriptor */
 __ALIGN_BEGIN static uint8_t USBD_HID_Desc[USB_HID_DESC_SIZ]  __ALIGN_END  =
 {
-  /* 18 */
   0x09,         /*bLength: HID Descriptor size*/
   HID_DESCRIPTOR_TYPE, /*bDescriptorType: HID*/
   0x11,         /*bcdHID: HID Class Spec release number*/
@@ -264,6 +246,11 @@ __ALIGN_BEGIN static uint8_t HID_MOUSE_ReportDesc[HID_MOUSE_REPORT_DESC_SIZE]  _
   0x01,   0xc0
 }; 
 
+
+uint8_t*    ActiveReportDescriptor = NULL;
+uint8_t     ActiveReportDescriptorLength;
+
+
 /**
   * @}
   */ 
@@ -279,6 +266,21 @@ __ALIGN_BEGIN static uint8_t HID_MOUSE_ReportDesc[HID_MOUSE_REPORT_DESC_SIZE]  _
   * @param  cfgidx: Configuration index
   * @retval status
   */
+static uint8_t  USBD_HID_InitMouse(USBD_HandleTypeDef *pdev,
+                                   uint8_t cfgidx)
+{
+  ActiveReportDescriptor = HID_MOUSE_ReportDesc;
+  ActiveReportDescriptorLength = HID_MOUSE_REPORT_DESC_SIZE;
+
+  USBD_HID_CfgDesc[USB_HID_CFGDESC_HID_REPORT_DESC_SIZE_OFFSET] = HID_MOUSE_REPORT_DESC_SIZE;
+  USBD_HID_Desc[USB_HID_DESC_HID_REPORT_DESC_SIZE_OFFSET] = HID_MOUSE_REPORT_DESC_SIZE;
+
+  return USBD_HID_Init(pdev, cfgidx);
+}
+
+
+
+
 static uint8_t  USBD_HID_Init (USBD_HandleTypeDef *pdev, 
                                uint8_t cfgidx)
 {
@@ -313,6 +315,8 @@ static uint8_t  USBD_HID_Init (USBD_HandleTypeDef *pdev,
 static uint8_t  USBD_HID_DeInit (USBD_HandleTypeDef *pdev, 
                                  uint8_t cfgidx)
 {
+  ActiveReportDescriptor = NULL;
+
   /* Close HID EPs */
   USBD_LL_CloseEP(pdev,
                   HID_EPIN_ADDR);
@@ -341,6 +345,12 @@ static uint8_t  USBD_HID_Setup (USBD_HandleTypeDef *pdev,
   uint8_t  *pbuf = NULL;
   USBD_HID_HandleTypeDef     *hhid = (USBD_HID_HandleTypeDef*) pdev->pClassData;
   
+  if (ActiveReportDescriptor == NULL)
+  {
+    while (1);
+  }
+
+
   switch (req->bmRequest & USB_REQ_TYPE_MASK)
   {
   case USB_REQ_TYPE_CLASS :  
@@ -380,7 +390,7 @@ static uint8_t  USBD_HID_Setup (USBD_HandleTypeDef *pdev,
     case USB_REQ_GET_DESCRIPTOR: 
       if( req->wValue >> 8 == HID_REPORT_DESC)
       {
-        len = MIN(HID_MOUSE_REPORT_DESC_SIZE , req->wLength);
+        len = MIN(ActiveReportDescriptorLength , req->wLength);
         pbuf = HID_MOUSE_ReportDesc;
       }
       else if( req->wValue >> 8 == HID_DESCRIPTOR_TYPE)
@@ -473,6 +483,11 @@ uint32_t USBD_HID_GetPollingInterval (USBD_HandleTypeDef *pdev)
   */
 static uint8_t  *USBD_HID_GetCfgDesc (uint16_t *length)
 {
+  if (ActiveReportDescriptor == NULL)
+  {
+    while (1);
+  }
+
   *length = sizeof (USBD_HID_CfgDesc);
   return USBD_HID_CfgDesc;
 }
diff --git a/Upstream/Src/upstream_statemachine.c b/Upstream/Src/upstream_statemachine.c
index cf2dbc8..1f1fdbe 100644
--- a/Upstream/Src/upstream_statemachine.c
+++ b/Upstream/Src/upstream_statemachine.c
@@ -16,6 +16,7 @@
 #include "usb_device.h"
 #include "usbd_core.h"
 #include "usbd_msc.h"
+#include "usbd_hid.h"
 
 
 UpstreamStateTypeDef            UpstreamState           = STATE_TEST_INTERFACE;
@@ -174,6 +175,11 @@ void Upstream_StateMachine_NotifyDeviceReplyCallback(UpstreamPacketTypeDef* repl
         newClassPointer = &USBD_MSC;
         break;
 
+    case COMMAND_CLASS_HID_MOUSE:
+      newActiveClass = COMMAND_CLASS_HID_MOUSE;
+      newClassPointer = &USBD_HID_Mouse;
+      break;
+
     //Add other supported classes here...
     }
 

From 4c40373a322d34b37266efa8f0641e97ca4537c1 Mon Sep 17 00:00:00 2001
From: Robert Fisk <robert_fisk@fastmail.fm>
Date: Sun, 17 Jan 2016 12:10:12 +1300
Subject: [PATCH 04/11] Upstream HID mouse support probably done, not tested
 yet.

---
 Upstream/Inc/upstream_hid.h                   |  35 +++++
 Upstream/Inc/upstream_interface_def.h         |   7 +
 Upstream/Inc/upstream_spi.h                   |   5 +
 .../Class/HID/Inc/usbd_hid.h                  |   5 +-
 .../Class/HID/Src/usbd_hid.c                  | 131 +++++++++---------
 Upstream/Src/upstream_hid.c                   | 117 ++++++++++++++++
 Upstream/Src/upstream_spi.c                   |  26 +++-
 7 files changed, 254 insertions(+), 72 deletions(-)
 create mode 100644 Upstream/Inc/upstream_hid.h
 create mode 100644 Upstream/Src/upstream_hid.c

diff --git a/Upstream/Inc/upstream_hid.h b/Upstream/Inc/upstream_hid.h
new file mode 100644
index 0000000..fa5d5fd
--- /dev/null
+++ b/Upstream/Inc/upstream_hid.h
@@ -0,0 +1,35 @@
+/*
+ * upstream_hid.h
+ *
+ *  Created on: Jan 16, 2016
+ *      Author: Robert Fisk
+  *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+
+#ifndef UPSTREAM_HID_H_
+#define UPSTREAM_HID_H_
+
+
+
+//#include "usbd_def.h"
+#include "stm32f4xx_hal.h"
+#include "upstream_interface_def.h"
+
+
+typedef uint8_t UpstreamHidSendReportCallback(uint8_t *report,
+                                              uint16_t len);
+
+
+void Upstream_HID_Init(InterfaceCommandClassTypeDef newClass);
+void Upstream_HID_DeInit(void);
+void Upstream_HID_GetNextReport(UpstreamHidSendReportCallback callback);
+
+
+
+
+
+#endif /* UPSTREAM_HID_H_ */
diff --git a/Upstream/Inc/upstream_interface_def.h b/Upstream/Inc/upstream_interface_def.h
index 825c6da..d2366a6 100644
--- a/Upstream/Inc/upstream_interface_def.h
+++ b/Upstream/Inc/upstream_interface_def.h
@@ -56,6 +56,13 @@ typedef enum
 InterfaceCommandMscTypeDef;
 
 
+typedef enum
+{
+  COMMAND_HID_REPORT,               //Downstream initiates HID report transfer to Upstream. Upstream just needs to Upstream_ReceivePacket each time.
+}
+InterfaceCommandHidTypeDef;
+
+
 typedef enum
 {
     COMMAND_ERROR_GENERIC,
diff --git a/Upstream/Inc/upstream_spi.h b/Upstream/Inc/upstream_spi.h
index f41c8c6..b96e00c 100644
--- a/Upstream/Inc/upstream_spi.h
+++ b/Upstream/Inc/upstream_spi.h
@@ -13,7 +13,10 @@
 #define INC_UPSTREAM_SPI_H_
 
 
+#include "upstream_statemachine.h"
 #include "usbd_config.h"
+#include "led.h"
+
 
 
 #define UPSTREAM_PACKET_HEADER_LEN      (2)         //Min length = CommandClass & Command bytes
@@ -84,6 +87,8 @@ HAL_StatusTypeDef Upstream_ReceivePacket(SpiPacketReceivedCallbackTypeDef callba
 void Upstream_TxOkInterrupt(void);
 void HAL_SPI_TxRxCpltCallback(SPI_HandleTypeDef *hspi);
 void HAL_SPI_ErrorCallback(SPI_HandleTypeDef *hspi);
+void Upstream_SetExpectedReceivedCommand(uint8_t expectedCommandClass,
+                                         uint8_t expectedCommand);
 
 
 #endif /* INC_UPSTREAM_SPI_H_ */
diff --git a/Upstream/Middlewares/ST/STM32_USB_Device_Library/Class/HID/Inc/usbd_hid.h b/Upstream/Middlewares/ST/STM32_USB_Device_Library/Class/HID/Inc/usbd_hid.h
index 2c5b69f..e0a1e25 100644
--- a/Upstream/Middlewares/ST/STM32_USB_Device_Library/Class/HID/Inc/usbd_hid.h
+++ b/Upstream/Middlewares/ST/STM32_USB_Device_Library/Class/HID/Inc/usbd_hid.h
@@ -124,9 +124,8 @@ extern USBD_ClassTypeDef  USBD_HID_Keyboard;
 /** @defgroup USB_CORE_Exported_Functions
   * @{
   */ 
-uint8_t USBD_HID_SendReport (USBD_HandleTypeDef *pdev, 
-                                 uint8_t *report,
-                                 uint16_t len);
+uint8_t USBD_HID_SendReport (uint8_t *report,
+                             uint16_t len);
 
 uint32_t USBD_HID_GetPollingInterval (USBD_HandleTypeDef *pdev);
 
diff --git a/Upstream/Middlewares/ST/STM32_USB_Device_Library/Class/HID/Src/usbd_hid.c b/Upstream/Middlewares/ST/STM32_USB_Device_Library/Class/HID/Src/usbd_hid.c
index 91875e3..3925e7e 100644
--- a/Upstream/Middlewares/ST/STM32_USB_Device_Library/Class/HID/Src/usbd_hid.c
+++ b/Upstream/Middlewares/ST/STM32_USB_Device_Library/Class/HID/Src/usbd_hid.c
@@ -44,11 +44,14 @@
   * limitations under the License.
   *
   ******************************************************************************
-  */ 
+  *
+  * Modifications by Robert Fisk
+  */
 
 /* Includes ------------------------------------------------------------------*/
 #include "usbd_hid.h"
 #include "usbd_ctlreq.h"
+#include "upstream_hid.h"
 
 
 
@@ -113,8 +116,8 @@ USBD_ClassTypeDef  USBD_HID_Keyboard =
 
 
 
-#define USB_HID_CFGDESC_HID_REPORT_DESC_SIZE_OFFSET     25
-#define USB_HID_DESC_HID_REPORT_DESC_SIZE_OFFSET        7
+#define USB_HID_CFGDESC__HID_REPORT_DESC_SIZE_OFFSET     25
+#define USB_HID_DESC__HID_REPORT_DESC_SIZE_OFFSET        7
 
 
 /* USB HID device Configuration Descriptor */
@@ -198,57 +201,52 @@ __ALIGN_BEGIN static uint8_t USBD_HID_DeviceQualifierDesc[USB_LEN_DEV_QUALIFIER_
 
 __ALIGN_BEGIN static uint8_t HID_MOUSE_ReportDesc[HID_MOUSE_REPORT_DESC_SIZE]  __ALIGN_END =
 {
-  0x05,   0x01,
-  0x09,   0x02,
-  0xA1,   0x01,
-  0x09,   0x01,
-  
-  0xA1,   0x00,
-  0x05,   0x09,
-  0x19,   0x01,
-  0x29,   0x03,
-  
-  0x15,   0x00,
-  0x25,   0x01,
-  0x95,   0x03,
-  0x75,   0x01,
-  
-  0x81,   0x02,
-  0x95,   0x01,
-  0x75,   0x05,
-  0x81,   0x01,
-  
-  0x05,   0x01,
-  0x09,   0x30,
-  0x09,   0x31,
-  0x09,   0x38,
-  
-  0x15,   0x81,
-  0x25,   0x7F,
-  0x75,   0x08,
-  0x95,   0x03,
-  
-  0x81,   0x06,
-  0xC0,   0x09,
-  0x3c,   0x05,
-  0xff,   0x09,
+  0x05, 0x01,        // Usage Page (Generic Desktop Ctrls)
+  0x09, 0x02,        // Usage (Mouse)
+  0xA1, 0x01,        // Collection (Application)
+  0x09, 0x01,        //   Usage (Pointer)
+  0xA1, 0x00,        //   Collection (Physical)
+  0x05, 0x09,        //     Usage Page (Button)
+  0x19, 0x01,        //     Usage Minimum (0x01)
+  0x29, 0x03,        //     Usage Maximum (0x03)
+  0x15, 0x00,        //     Logical Minimum (0)
+  0x25, 0x01,        //     Logical Maximum (1)
+  0x95, 0x03,        //     Report Count (3)
+  0x75, 0x01,        //     Report Size (1)
+  0x81, 0x02,        //     Input (Data,Var,Abs,No Wrap,Linear,Preferred State,No Null Position)
+  0x95, 0x01,        //     Report Count (1)
+  0x75, 0x05,        //     Report Size (5)
+  0x81, 0x01,        //     Input (Const,Array,Abs,No Wrap,Linear,Preferred State,No Null Position)
+  0x05, 0x01,        //     Usage Page (Generic Desktop Ctrls)
+  0x09, 0x30,        //     Usage (X)
+  0x09, 0x31,        //     Usage (Y)
+  0x09, 0x38,        //     Usage (Wheel)
+  0x15, 0x81,        //     Logical Minimum (129)
+  0x25, 0x7F,        //     Logical Maximum (127)
+  0x75, 0x08,        //     Report Size (8)
+  0x95, 0x03,        //     Report Count (3)
+  0x81, 0x06,        //     Input (Data,Var,Rel,No Wrap,Linear,Preferred State,No Null Position)
+  0xC0,              //   End Collection
+  0x09, 0x3C,        //   Usage (Motion Wakeup)
+  0x05, 0xFF,        //   Usage Page (Reserved 0xFF)
+  0x09, 0x01,        //   Usage (0x01)
+  0x15, 0x00,        //   Logical Minimum (0)
+  0x25, 0x01,        //   Logical Maximum (1)
+  0x75, 0x01,        //   Report Size (1)
+  0x95, 0x01,        //   Report Count (1)
+  0xB1, 0x22,        //   Feature (Data,Var,Abs,No Wrap,Linear,No Preferred State,No Null Position,Non-volatile)
+  0x75, 0x07,        //   Report Size (7)
+  0x95, 0x01,        //   Report Count (1)
+  0xB1, 0x01,        //   Feature (Const,Array,Abs,No Wrap,Linear,Preferred State,No Null Position,Non-volatile)
+  0xC0,              // End Collection
   
-  0x01,   0x15,
-  0x00,   0x25,
-  0x01,   0x75,
-  0x01,   0x95,
-  
-  0x02,   0xb1,
-  0x22,   0x75,
-  0x06,   0x95,
-  0x01,   0xb1,
-  
-  0x01,   0xc0
+  // 74 bytes
 }; 
 
 
-uint8_t*    ActiveReportDescriptor = NULL;
-uint8_t     ActiveReportDescriptorLength;
+USBD_HandleTypeDef  *USBD_HID_pdev;
+uint8_t*            ActiveReportDescriptor = NULL;
+uint8_t             ActiveReportDescriptorLength;
 
 
 /**
@@ -266,14 +264,16 @@ uint8_t     ActiveReportDescriptorLength;
   * @param  cfgidx: Configuration index
   * @retval status
   */
-static uint8_t  USBD_HID_InitMouse(USBD_HandleTypeDef *pdev,
-                                   uint8_t cfgidx)
+static uint8_t USBD_HID_InitMouse(USBD_HandleTypeDef *pdev,
+                                  uint8_t cfgidx)
 {
   ActiveReportDescriptor = HID_MOUSE_ReportDesc;
   ActiveReportDescriptorLength = HID_MOUSE_REPORT_DESC_SIZE;
 
-  USBD_HID_CfgDesc[USB_HID_CFGDESC_HID_REPORT_DESC_SIZE_OFFSET] = HID_MOUSE_REPORT_DESC_SIZE;
-  USBD_HID_Desc[USB_HID_DESC_HID_REPORT_DESC_SIZE_OFFSET] = HID_MOUSE_REPORT_DESC_SIZE;
+  USBD_HID_CfgDesc[USB_HID_CFGDESC__HID_REPORT_DESC_SIZE_OFFSET] = HID_MOUSE_REPORT_DESC_SIZE;
+  USBD_HID_Desc[USB_HID_DESC__HID_REPORT_DESC_SIZE_OFFSET] = HID_MOUSE_REPORT_DESC_SIZE;
+
+  Upstream_HID_Init(COMMAND_CLASS_HID_MOUSE);
 
   return USBD_HID_Init(pdev, cfgidx);
 }
@@ -301,7 +301,11 @@ static uint8_t  USBD_HID_Init (USBD_HandleTypeDef *pdev,
   else
   {
     ((USBD_HID_HandleTypeDef *)pdev->pClassData)->state = HID_IDLE;
+
+    USBD_HID_pdev = pdev;
+    Upstream_HID_GetNextReport(USBD_HID_SendReport);
   }
+
   return ret;
 }
 
@@ -316,6 +320,7 @@ static uint8_t  USBD_HID_DeInit (USBD_HandleTypeDef *pdev,
                                  uint8_t cfgidx)
 {
   ActiveReportDescriptor = NULL;
+  Upstream_HID_DeInit();
 
   /* Close HID EPs */
   USBD_LL_CloseEP(pdev,
@@ -426,18 +431,17 @@ static uint8_t  USBD_HID_Setup (USBD_HandleTypeDef *pdev,
   * @param  buff: pointer to report
   * @retval status
   */
-uint8_t USBD_HID_SendReport     (USBD_HandleTypeDef  *pdev, 
-                                 uint8_t *report,
-                                 uint16_t len)
+uint8_t USBD_HID_SendReport(uint8_t *report,
+                            uint16_t len)
 {
-  USBD_HID_HandleTypeDef     *hhid = (USBD_HID_HandleTypeDef*)pdev->pClassData;
+  USBD_HID_HandleTypeDef *hhid = (USBD_HID_HandleTypeDef*)USBD_HID_pdev->pClassData;
   
-  if (pdev->dev_state == USBD_STATE_CONFIGURED )
+  if (USBD_HID_pdev->dev_state == USBD_STATE_CONFIGURED )
   {
     if(hhid->state == HID_IDLE)
     {
       hhid->state = HID_BUSY;
-      USBD_LL_Transmit (pdev, 
+      USBD_LL_Transmit (USBD_HID_pdev,
                         HID_EPIN_ADDR,                                      
                         report,
                         len);
@@ -501,12 +505,15 @@ static uint8_t  *USBD_HID_GetCfgDesc (uint16_t *length)
   * @retval status
   */
 static uint8_t  USBD_HID_DataIn (USBD_HandleTypeDef *pdev, 
-                              uint8_t epnum)
+                                 uint8_t epnum)
 {
-  
   /* Ensure that the FIFO is empty before a new transfer, this condition could 
   be caused by  a new transfer before the end of the previous transfer */
   ((USBD_HID_HandleTypeDef *)pdev->pClassData)->state = HID_IDLE;
+
+  USBD_HID_pdev = pdev;
+  Upstream_HID_GetNextReport(USBD_HID_SendReport);
+
   return USBD_OK;
 }
 
diff --git a/Upstream/Src/upstream_hid.c b/Upstream/Src/upstream_hid.c
new file mode 100644
index 0000000..cd7502f
--- /dev/null
+++ b/Upstream/Src/upstream_hid.c
@@ -0,0 +1,117 @@
+/*
+ * upstream_hid.c
+ *
+ *  Created on: Jan 16, 2016
+ *      Author: Robert Fisk
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+
+
+#include "upstream_hid.h"
+#include "upstream_spi.h"
+#include "upstream_interface_def.h"
+#include "usbd_hid.h"
+
+
+#define HID_MOUSE_REPORT_LEN    4
+
+
+
+InterfaceCommandClassTypeDef    ActiveHidClass = COMMAND_CLASS_INTERFACE;
+UpstreamPacketTypeDef*          UpstreamHidPacket = NULL;
+
+
+void Upstream_HID_GetNextReportReceiveCallback(UpstreamPacketTypeDef* receivedPacket);
+
+
+
+void Upstream_HID_Init(InterfaceCommandClassTypeDef newClass)
+{
+    if ((newClass != COMMAND_CLASS_HID_MOUSE))          //add classes here
+    {
+        UPSTREAM_SPI_FREAKOUT;
+        return;
+    }
+
+    if (UpstreamHidPacket != NULL)
+    {
+        UPSTREAM_SPI_FREAKOUT;
+        return;
+    }
+
+    ActiveHidClass = newClass;
+}
+
+
+void Upstream_HID_DeInit(void)
+{
+    ActiveHidClass = COMMAND_CLASS_INTERFACE;
+    if (UpstreamHidPacket != NULL)
+    {
+        Upstream_ReleasePacket(UpstreamHidPacket);
+        UpstreamHidPacket = NULL;
+    }
+}
+
+
+void Upstream_HID_GetNextReport(UpstreamHidSendReportCallback callback)
+{
+    if ((ActiveHidClass != COMMAND_CLASS_HID_MOUSE))      //add classes here
+    {
+        UPSTREAM_SPI_FREAKOUT;
+        return;
+    }
+
+    //Release packet used for last transaction (if any)
+    if (UpstreamHidPacket != NULL)
+    {
+        Upstream_ReleasePacket(UpstreamHidPacket);
+        UpstreamHidPacket = NULL;
+    }
+
+    //Get next packet
+    Upstream_SetExpectedReceivedCommand(ActiveHidClass, COMMAND_HID_REPORT);
+    Upstream_ReceivePacket(Upstream_HID_GetNextReportReceiveCallback);
+}
+
+
+void Upstream_HID_GetNextReportReceiveCallback(UpstreamPacketTypeDef* receivedPacket)
+{
+    uint8_t reportLength;
+
+    if (UpstreamHidPacket != NULL)
+    {
+        UPSTREAM_SPI_FREAKOUT;
+        return;
+    }
+
+    if (receivedPacket == NULL)
+    {
+        return;             //Just give up...
+    }
+
+
+    if (ActiveHidClass == COMMAND_CLASS_HID_MOUSE)
+    {
+        if (receivedPacket->Length16 != (UPSTREAM_PACKET_HEADER_LEN_16 + ((HID_MOUSE_REPORT_LEN + 1) / 2)))
+        {
+            UPSTREAM_SPI_FREAKOUT;
+            return;
+        }
+
+        //Mouse sanity checks & stuff go here...
+
+        reportLength = HID_MOUSE_REPORT_LEN;
+    }
+
+    //Other HID classes go here...
+
+
+    UpstreamHidPacket = receivedPacket;           //Save packet so we can free it when upstream USB transaction is done
+    USBD_HID_SendReport(receivedPacket->Data, reportLength);
+}
+
diff --git a/Upstream/Src/upstream_spi.c b/Upstream/Src/upstream_spi.c
index e4787d1..25478cd 100644
--- a/Upstream/Src/upstream_spi.c
+++ b/Upstream/Src/upstream_spi.c
@@ -11,9 +11,7 @@
 
 #include "upstream_interface_def.h"
 #include "upstream_spi.h"
-#include "upstream_statemachine.h"
 #include "stm32f4xx_hal.h"
-#include "usbd_def.h"
 #include "board_config.h"
 #include "interrupts.h"
 
@@ -148,6 +146,12 @@ void Upstream_ReleasePacket(UpstreamPacketTypeDef* packetToRelease)
         return;
     }
 
+    if (packetToRelease->Busy != BUSY)
+    {
+        UPSTREAM_SPI_FREAKOUT;
+        return;
+    }
+
     if (PendingFreePacketCallback != NULL)
     {
         tempCallback = PendingFreePacketCallback;   //In extreme situations, running this callback can trigger another request for a free packet,
@@ -445,8 +449,8 @@ void Upstream_BeginTransmitPacketSize(void)
     if (HAL_SPI_TransmitReceive(&Hspi1,
                                     (uint8_t*)&CurrentWorkingPacket->Length16,
                                     (uint8_t*)&TemporaryIncomingPacketLength,
-                                    2,
-                                    SPI_TIMEOUT_VALUE) != HAL_OK)       //We only need to write one word, but the peripheral library freaks out...
+                                    2,                                  //We only need to write one word, but the peripheral library freaks out...
+                                    SPI_TIMEOUT_VALUE) != HAL_OK)
     {
         UPSTREAM_SPI_FREAKOUT;
     }
@@ -491,8 +495,8 @@ void Upstream_BeginReceivePacketSize(UpstreamPacketTypeDef* freePacket)
     if (HAL_SPI_TransmitReceive(&Hspi1,
                                     (uint8_t*)&CurrentWorkingPacket->Length16,
                                     (uint8_t*)&CurrentWorkingPacket->Length16,
-                                    2,
-                                    SPI_TIMEOUT_VALUE) != HAL_OK)       //We only need to write one word, but the peripheral library freaks out...
+                                    2,                                     //We only need to write one word, but the peripheral library freaks out...
+                                    SPI_TIMEOUT_VALUE) != HAL_OK)
     {
         UPSTREAM_SPI_FREAKOUT;
     }
@@ -515,7 +519,6 @@ void Upstream_BeginReceivePacketBody(void)
 }
 
 
-
 //Something bad happened! Possibly CRC error...
 void HAL_SPI_ErrorCallback(SPI_HandleTypeDef *hspi)
 {
@@ -537,3 +540,12 @@ void HAL_SPI_ErrorCallback(SPI_HandleTypeDef *hspi)
 }
 
 
+//Used by USB interface classes.
+//This is required when Downstream sends a packet without an initiating request from us
+void Upstream_SetExpectedReceivedCommand(uint8_t expectedCommandClass,
+                                         uint8_t expectedCommand)
+{
+    SentCommandClass = expectedCommandClass;
+    SentCommand = expectedCommand;
+}
+

From e8a445a071f52fafd536b33a7346c6f2ec7ea152 Mon Sep 17 00:00:00 2001
From: Robert Fisk <robert_fisk@fastmail.fm>
Date: Sat, 9 Apr 2016 15:30:57 +1200
Subject: [PATCH 05/11] Work on Downstream HID support. Also a bunch of random
 tweaks.

---
 Downstream/.cproject                          |  10 +-
 .../org.eclipse.cdt.codan.core.prefs          |   4 +
 .../Src/stm32f4xx_hal_hcd.c                   |  13 +-
 Downstream/Inc/downstream_interface_def.h     |  10 +-
 Downstream/Inc/usbh_config.h                  |   4 +-
 .../Class/HID/Inc/usbh_hid.h                  |   8 +-
 .../Class/HID/Src/usbh_hid.c                  | 120 +++++++++---------
 Downstream/Src/downstream_statemachine.c      |   2 +-
 Downstream/Src/usb_host.c                     |   2 +
 Upstream/Inc/upstream_interface_def.h         |   2 +-
 Upstream/Src/upstream_hid.c                   |  14 +-
 Upstream/Src/upstream_statemachine.c          |   8 +-
 12 files changed, 112 insertions(+), 85 deletions(-)

diff --git a/Downstream/.cproject b/Downstream/.cproject
index 2730d12..a64ae34 100644
--- a/Downstream/.cproject
+++ b/Downstream/.cproject
@@ -48,7 +48,7 @@
 							<builder autoBuildTarget="all" buildPath="${workspace_loc:/Downstream}/Debug" cleanBuildTarget="clean" command="${cross_make}" id="org.eclipse.cdt.build.core.internal.builder.1804403788" 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.789837881" name="Cross ARM GNU Assembler" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler">
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor.1524992420" name="Use preprocessor" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor" value="true" valueType="boolean"/>
-								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.defs.559716966" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.defs" valueType="definedSymbols">
+								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.defs.559716966" name="Defined symbols (-D)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.defs" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="STM32F401xC"/>
 								</option>
 								<inputType id="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler.input.1659311775" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler.input"/>
@@ -61,6 +61,7 @@
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Downstream/Drivers/CMSIS/Include}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Downstream/Middlewares/ST/STM32_USB_Host_Library/Core/Inc}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Downstream/Middlewares/ST/STM32_USB_Host_Library/Class/MSC/Inc}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Downstream/Middlewares/ST/STM32_USB_Host_Library/Class/HID/Inc}&quot;"/>
 								</option>
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.defs.914524327" name="Defined symbols (-D)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.defs" useByScannerDiscovery="false" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="STM32F401xC"/>
@@ -103,7 +104,7 @@
 						</toolChain>
 					</folderInfo>
 					<sourceEntries>
-						<entry excluding="Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_pwr.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_pwr_ex.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dma_ex.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_flash.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_flash_ex.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_flash_ramfunc.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_rcc_ex.c|Middlewares/ST/STM32_USB_Host_Library/Core/Src/usbh_conf_template.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_sdmmc.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_fsmc.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_fmc.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_wwdg.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_usart.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_uart.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_tim.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_tim_ex.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_sram.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_spdifrx.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_smartcard.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_sdram.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_sd.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_sai.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_sai_ex.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_rtc.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_rtc_ex.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_rng.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_qspi.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_pcd.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_pcd_ex.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_pccard.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_nor.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_nand.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_msp_template.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_ltdc.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_iwdg.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_irda.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_i2s.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_i2s_ex.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_i2c.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_i2c_ex.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_hash.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_hash_ex.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_fmpi2c.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_fmpi2c_ex.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_eth.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dma2d.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dcmi.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dcmi_ex.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dac.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dac_ex.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_cryp.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_cryp_ex.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_crc.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_cec.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_can.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_adc.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_adc_ex.c" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
+						<entry excluding="Middlewares/ST/STM32_USB_Host_Library/Class/HID/Src/usbh_hid_keybd.c|Middlewares/ST/STM32_USB_Host_Library/Class/HID/Src/usbh_hid_mouse.c|Middlewares/ST/STM32_USB_Host_Library/Class/HID/Src/usbh_hid_parser.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_pwr.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_pwr_ex.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dma_ex.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_flash.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_flash_ex.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_flash_ramfunc.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_rcc_ex.c|Middlewares/ST/STM32_USB_Host_Library/Core/Src/usbh_conf_template.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_sdmmc.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_fsmc.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_fmc.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_wwdg.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_usart.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_uart.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_tim.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_tim_ex.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_sram.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_spdifrx.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_smartcard.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_sdram.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_sd.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_sai.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_sai_ex.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_rtc.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_rtc_ex.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_rng.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_qspi.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_pcd.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_pcd_ex.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_pccard.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_nor.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_nand.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_msp_template.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_ltdc.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_iwdg.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_irda.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_i2s.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_i2s_ex.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_i2c.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_i2c_ex.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_hash.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_hash_ex.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_fmpi2c.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_fmpi2c_ex.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_eth.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dma2d.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dcmi.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dcmi_ex.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dac.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dac_ex.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_cryp.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_cryp_ex.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_crc.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_cec.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_can.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_adc.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_adc_ex.c" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
 					</sourceEntries>
 				</configuration>
 			</storageModule>
@@ -169,7 +170,7 @@
 							<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">
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor.2143421487" name="Use preprocessor" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor" value="true" valueType="boolean"/>
-								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.defs.1659712048" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.defs" valueType="definedSymbols">
+								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.defs.1659712048" name="Defined symbols (-D)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.defs" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="STM32F401xC"/>
 								</option>
 								<inputType id="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler.input.2143048963" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler.input"/>
@@ -182,6 +183,7 @@
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Downstream/Drivers/CMSIS/Include}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Downstream/Middlewares/ST/STM32_USB_Host_Library/Core/Inc}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Downstream/Middlewares/ST/STM32_USB_Host_Library/Class/MSC/Inc}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Downstream/Middlewares/ST/STM32_USB_Host_Library/Class/HID/Inc}&quot;"/>
 								</option>
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.defs.569825136" name="Defined symbols (-D)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.defs" useByScannerDiscovery="false" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="STM32F401xC"/>
@@ -223,7 +225,7 @@
 						</toolChain>
 					</folderInfo>
 					<sourceEntries>
-						<entry excluding="Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_pwr.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_pwr_ex.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dma_ex.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_flash.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_flash_ex.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_flash_ramfunc.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_rcc_ex.c|Middlewares/ST/STM32_USB_Host_Library/Core/Src/usbh_conf_template.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_sdmmc.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_fsmc.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_fmc.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_wwdg.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_usart.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_uart.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_tim.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_tim_ex.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_sram.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_spdifrx.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_smartcard.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_sdram.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_sd.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_sai.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_sai_ex.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_rtc.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_rtc_ex.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_rng.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_qspi.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_pcd.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_pcd_ex.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_pccard.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_nor.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_nand.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_msp_template.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_ltdc.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_iwdg.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_irda.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_i2s.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_i2s_ex.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_i2c.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_i2c_ex.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_hash.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_hash_ex.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_fmpi2c.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_fmpi2c_ex.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_eth.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dma2d.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dcmi.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dcmi_ex.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dac.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dac_ex.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_cryp.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_cryp_ex.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_crc.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_cec.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_can.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_adc.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_adc_ex.c" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
+						<entry excluding="Middlewares/ST/STM32_USB_Host_Library/Class/HID/Src/usbh_hid_keybd.c|Middlewares/ST/STM32_USB_Host_Library/Class/HID/Src/usbh_hid_mouse.c|Middlewares/ST/STM32_USB_Host_Library/Class/HID/Src/usbh_hid_parser.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_pwr.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_pwr_ex.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dma_ex.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_flash.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_flash_ex.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_flash_ramfunc.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_rcc_ex.c|Middlewares/ST/STM32_USB_Host_Library/Core/Src/usbh_conf_template.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_sdmmc.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_fsmc.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_fmc.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_wwdg.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_usart.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_uart.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_tim.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_tim_ex.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_sram.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_spdifrx.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_smartcard.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_sdram.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_sd.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_sai.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_sai_ex.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_rtc.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_rtc_ex.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_rng.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_qspi.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_pcd.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_pcd_ex.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_pccard.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_nor.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_nand.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_msp_template.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_ltdc.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_iwdg.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_irda.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_i2s.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_i2s_ex.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_i2c.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_i2c_ex.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_hash.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_hash_ex.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_fmpi2c.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_fmpi2c_ex.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_eth.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dma2d.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dcmi.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dcmi_ex.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dac.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dac_ex.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_cryp.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_cryp_ex.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_crc.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_cec.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_can.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_adc.c|Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_adc_ex.c" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
 					</sourceEntries>
 				</configuration>
 			</storageModule>
diff --git a/Downstream/.settings/org.eclipse.cdt.codan.core.prefs b/Downstream/.settings/org.eclipse.cdt.codan.core.prefs
index 77386c2..ff135cf 100644
--- a/Downstream/.settings/org.eclipse.cdt.codan.core.prefs
+++ b/Downstream/.settings/org.eclipse.cdt.codan.core.prefs
@@ -3,6 +3,10 @@ org.eclipse.cdt.codan.checkers.errnoreturn=Warning
 org.eclipse.cdt.codan.checkers.errnoreturn.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},implicit\=>false}
 org.eclipse.cdt.codan.checkers.errreturnvalue=Error
 org.eclipse.cdt.codan.checkers.errreturnvalue.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
+org.eclipse.cdt.codan.checkers.nocommentinside=-Error
+org.eclipse.cdt.codan.checkers.nocommentinside.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
+org.eclipse.cdt.codan.checkers.nolinecomment=-Error
+org.eclipse.cdt.codan.checkers.nolinecomment.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}}
 org.eclipse.cdt.codan.checkers.noreturn=Error
 org.eclipse.cdt.codan.checkers.noreturn.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},implicit\=>false}
 org.eclipse.cdt.codan.internal.checkers.AbstractClassCreation=Error
diff --git a/Downstream/Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_hcd.c b/Downstream/Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_hcd.c
index 1c26e4d..cb659bf 100644
--- a/Downstream/Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_hcd.c
+++ b/Downstream/Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_hcd.c
@@ -879,11 +879,14 @@ static void HCD_HC_IN_IRQHandler(HCD_HandleTypeDef *hhcd, uint8_t chnum)
         hhcd->hc[chnum].urb_state = URB_NOTREADY;
       }
       
-      /* re-activate the channel  */
-      tmpreg = USBx_HC(chnum)->HCCHAR;
-      tmpreg &= ~USB_OTG_HCCHAR_CHDIS;
-      tmpreg |= USB_OTG_HCCHAR_CHENA;
-      USBx_HC(chnum)->HCCHAR = tmpreg;
+      if (hhcd->hc[chnum].ep_type != EP_TYPE_INTR)  //DON'T re-enable an interrupt-in transaction
+      {
+          /* re-activate the channel  */
+          tmpreg = USBx_HC(chnum)->HCCHAR;
+          tmpreg &= ~USB_OTG_HCCHAR_CHDIS;
+          tmpreg |= USB_OTG_HCCHAR_CHENA;
+          USBx_HC(chnum)->HCCHAR = tmpreg;
+      }
     }
     __HAL_HCD_CLEAR_HC_INT(chnum, USB_OTG_HCINT_CHH);
     HAL_HCD_HC_NotifyURBChange_Callback(hhcd, chnum, hhcd->hc[chnum].urb_state);
diff --git a/Downstream/Inc/downstream_interface_def.h b/Downstream/Inc/downstream_interface_def.h
index 435d6e8..b3dfaf2 100644
--- a/Downstream/Inc/downstream_interface_def.h
+++ b/Downstream/Inc/downstream_interface_def.h
@@ -15,7 +15,7 @@
 
 //***************
 // Attention!
-// Keep this file synchronised with downstream_interface_def.h
+// Keep this file synchronised with upstream_interface_def.h
 // in the Upstream project.
 //***************
 
@@ -29,6 +29,7 @@ typedef enum
 {
     COMMAND_CLASS_INTERFACE,
     COMMAND_CLASS_MASS_STORAGE,
+    COMMAND_CLASS_HID_MOUSE,
     //...
     COMMAND_CLASS_ERROR
 }
@@ -53,6 +54,13 @@ typedef enum
 InterfaceCommandMscTypeDef;
 
 
+typedef enum
+{
+    COMMAND_HID_REPORT,               //Downstream initiates HID report transfer to Upstream. Upstream just needs to Upstream_ReceivePacket each time.
+}
+InterfaceCommandHidTypeDef;
+
+
 typedef enum
 {
     COMMAND_ERROR_GENERIC,
diff --git a/Downstream/Inc/usbh_config.h b/Downstream/Inc/usbh_config.h
index a576fa4..59e70eb 100644
--- a/Downstream/Inc/usbh_config.h
+++ b/Downstream/Inc/usbh_config.h
@@ -62,13 +62,13 @@
 #define USBH_KEEP_CFG_DESCRIPTOR      1 
  
 /*----------   -----------*/
-#define USBH_MAX_NUM_SUPPORTED_CLASS      1 
+#define USBH_MAX_NUM_SUPPORTED_CLASS      2
  
 /*----------   -----------*/
 #define USBH_MAX_SIZE_CONFIGURATION      256 
  
 /*----------   -----------*/
-#define USBH_MAX_DATA_BUFFER      512 
+#define USBH_MAX_DATA_BUFFER      256       //was 512, string descriptors are max 255 bytes
  
 /*----------   -----------*/
 #define USBH_DEBUG_LEVEL      0 
diff --git a/Downstream/Middlewares/ST/STM32_USB_Host_Library/Class/HID/Inc/usbh_hid.h b/Downstream/Middlewares/ST/STM32_USB_Host_Library/Class/HID/Inc/usbh_hid.h
index 9d4bdd2..1f292f3 100644
--- a/Downstream/Middlewares/ST/STM32_USB_Host_Library/Class/HID/Inc/usbh_hid.h
+++ b/Downstream/Middlewares/ST/STM32_USB_Host_Library/Class/HID/Inc/usbh_hid.h
@@ -112,8 +112,8 @@ typedef enum
 {
   HID_INIT= 0,  
   HID_IDLE,
-  HID_SEND_DATA,
-  HID_BUSY,
+//  HID_SEND_DATA,
+//  HID_BUSY,
   HID_GET_DATA,   
   HID_SYNC,     
   HID_POLL,
@@ -227,9 +227,9 @@ typedef struct _HID_Process
   uint8_t              ep_addr;
   uint16_t             poll; 
   uint32_t             timer;
-  uint8_t              DataReady;
+//  uint8_t              DataReady;
   HID_DescTypeDef      HID_Desc;  
-  USBH_StatusTypeDef  ( * Init)(USBH_HandleTypeDef *phost);
+  //USBH_StatusTypeDef  ( * Init)(USBH_HandleTypeDef *phost);
 }
 HID_HandleTypeDef;
 
diff --git a/Downstream/Middlewares/ST/STM32_USB_Host_Library/Class/HID/Src/usbh_hid.c b/Downstream/Middlewares/ST/STM32_USB_Host_Library/Class/HID/Src/usbh_hid.c
index 8b8ea93..972bf23 100644
--- a/Downstream/Middlewares/ST/STM32_USB_Host_Library/Class/HID/Src/usbh_hid.c
+++ b/Downstream/Middlewares/ST/STM32_USB_Host_Library/Class/HID/Src/usbh_hid.c
@@ -37,6 +37,8 @@
   * limitations under the License.
   *
   ******************************************************************************
+  *
+  * Modifications by Robert Fisk
   */
 
 /* Includes ------------------------------------------------------------------*/
@@ -105,8 +107,8 @@ static USBH_StatusTypeDef USBH_HID_Process(USBH_HandleTypeDef *phost);
 static USBH_StatusTypeDef USBH_HID_SOFProcess(USBH_HandleTypeDef *phost);
 static void  USBH_HID_ParseHIDDesc (HID_DescTypeDef *desc, uint8_t *buf);
 
-extern USBH_StatusTypeDef USBH_HID_MouseInit(USBH_HandleTypeDef *phost);
-extern USBH_StatusTypeDef USBH_HID_KeybdInit(USBH_HandleTypeDef *phost);
+//extern USBH_StatusTypeDef USBH_HID_MouseInit(USBH_HandleTypeDef *phost);
+//extern USBH_StatusTypeDef USBH_HID_KeybdInit(USBH_HandleTypeDef *phost);
 
 USBH_ClassTypeDef  HID_Class = 
 {
@@ -162,12 +164,12 @@ static USBH_StatusTypeDef USBH_HID_InterfaceInit (USBH_HandleTypeDef *phost)
     if(phost->device.CfgDesc.Itf_Desc[phost->device.current_interface].bInterfaceProtocol == HID_KEYBRD_BOOT_CODE)
     {
       USBH_UsrLog ("KeyBoard device found!"); 
-      HID_Handle->Init =  USBH_HID_KeybdInit;     
+      //HID_Handle->Init =  USBH_HID_KeybdInit;
     }
     else if(phost->device.CfgDesc.Itf_Desc[phost->device.current_interface].bInterfaceProtocol  == HID_MOUSE_BOOT_CODE)		  
     {
       USBH_UsrLog ("Mouse device found!");         
-      HID_Handle->Init =  USBH_HID_MouseInit;     
+      //HID_Handle->Init =  USBH_HID_MouseInit;
     }
     else
     {
@@ -296,22 +298,22 @@ static USBH_StatusTypeDef USBH_HID_ClassRequest(USBH_HandleTypeDef *phost)
     {
       
       USBH_HID_ParseHIDDesc(&HID_Handle->HID_Desc, phost->device.Data);
-      HID_Handle->ctl_state = HID_REQ_GET_REPORT_DESC;
+      HID_Handle->ctl_state = HID_REQ_SET_IDLE;     //HID_REQ_GET_REPORT_DESC;
     }
     
     break;     
-  case HID_REQ_GET_REPORT_DESC:
-    
-    
-    /* Get Report Desc */ 
-    if (USBH_HID_GetHIDReportDescriptor(phost, HID_Handle->HID_Desc.wItemLength) == USBH_OK)
-    {
-      /* The descriptor is available in phost->device.Data */
-
-      HID_Handle->ctl_state = HID_REQ_SET_IDLE;
-    }
-    
-    break;
+//  case HID_REQ_GET_REPORT_DESC:
+//
+//
+//    /* Get Report Desc */
+//    if (USBH_HID_GetHIDReportDescriptor(phost, HID_Handle->HID_Desc.wItemLength) == USBH_OK)
+//    {
+//      /* The descriptor is available in phost->device.Data */
+//
+//      HID_Handle->ctl_state = HID_REQ_SET_IDLE;
+//    }
+//
+//    break;
     
   case HID_REQ_SET_IDLE:
     
@@ -356,41 +358,41 @@ static USBH_StatusTypeDef USBH_HID_ClassRequest(USBH_HandleTypeDef *phost)
   */
 static USBH_StatusTypeDef USBH_HID_Process(USBH_HandleTypeDef *phost)
 {
-  USBH_StatusTypeDef status = USBH_OK;
+  USBH_URBStateTypeDef urbStatus;
   HID_HandleTypeDef *HID_Handle =  (HID_HandleTypeDef *) phost->pActiveClass->pData;
   
   switch (HID_Handle->state)
   {
   case HID_INIT:
-    HID_Handle->Init(phost); 
-  case HID_IDLE:
-    if(USBH_HID_GetReport (phost,
-                           0x01,
-                            0,
-                            HID_Handle->pData,
-                            HID_Handle->length) == USBH_OK)
-    {
-      
-      fifo_write(&HID_Handle->fifo, HID_Handle->pData, HID_Handle->length);  
-      HID_Handle->state = HID_SYNC;
-    }
-    
-    break;
+//    HID_Handle->Init(phost);
+      HID_Handle->pData = phost->device.Data;
+
+//  case HID_IDLE:
+//    if(USBH_HID_GetReport (phost,
+//                           0x01,
+//                            0,
+//                            HID_Handle->pData,
+//                            HID_Handle->length) == USBH_OK)
+//    {
+//
+//      fifo_write(&HID_Handle->fifo, HID_Handle->pData, HID_Handle->length);
+//      HID_Handle->state = HID_SYNC;
+//    }
+//
+//    break;
     
   case HID_SYNC:
-
     /* Sync with start of Even Frame */
+    //Uhhh, doesn't this sync with an odd frame?
+    //Also, do we need to sync at all?
+
     if(phost->Timer & 1)
     {
       HID_Handle->state = HID_GET_DATA; 
     }
-#if (USBH_USE_OS == 1)
-    osMessagePut ( phost->os_event, USBH_URB_EVENT, 0);
-#endif   
     break;
     
   case HID_GET_DATA:
-
     USBH_InterruptReceiveData(phost, 
                               HID_Handle->pData,
                               HID_Handle->length,
@@ -398,42 +400,43 @@ static USBH_StatusTypeDef USBH_HID_Process(USBH_HandleTypeDef *phost)
     
     HID_Handle->state = HID_POLL;
     HID_Handle->timer = phost->Timer;
-    HID_Handle->DataReady = 0;
     break;
     
   case HID_POLL:
+    urbStatus = USBH_LL_GetURBState(phost , HID_Handle->InPipe);
     
-    if(USBH_LL_GetURBState(phost , HID_Handle->InPipe) == USBH_URB_DONE)
+    if (urbStatus == USBH_URB_DONE)
     {
-      if(HID_Handle->DataReady == 0)
-      {
-        fifo_write(&HID_Handle->fifo, HID_Handle->pData, HID_Handle->length);
-        HID_Handle->DataReady = 1;
         USBH_HID_EventCallback(phost);
-#if (USBH_USE_OS == 1)
-    osMessagePut ( phost->os_event, USBH_URB_EVENT, 0);
-#endif          
-      }
+        HID_Handle->state = HID_IDLE;
+        break;
     }
-    else if(USBH_LL_GetURBState(phost , HID_Handle->InPipe) == USBH_URB_STALL) /* IN Endpoint Stalled */
+
+    if (urbStatus == USBH_URB_NOTREADY)
+    {
+        HID_Handle->state = HID_IDLE;
+        break;
+    }
+
+    if (urbStatus == USBH_URB_STALL)
     {
-      
       /* Issue Clear Feature on interrupt IN endpoint */ 
       if(USBH_ClrFeature(phost,
                          HID_Handle->ep_addr) == USBH_OK)
       {
-        /* Change state to issue next IN token */
-        HID_Handle->state = HID_GET_DATA;
+        HID_Handle->state = HID_IDLE;
       }
-    } 
-    
-
+    }
     break;
+
+  case HID_IDLE:
+      break;
+
     
   default:
     break;
   }
-  return status;
+  return USBH_OK;
 }
 
 /**
@@ -446,14 +449,11 @@ static USBH_StatusTypeDef USBH_HID_SOFProcess(USBH_HandleTypeDef *phost)
 {
   HID_HandleTypeDef *HID_Handle =  (HID_HandleTypeDef *) phost->pActiveClass->pData;
   
-  if(HID_Handle->state == HID_POLL)
+  if (HID_Handle->state == HID_IDLE)
   {
-    if(( phost->Timer - HID_Handle->timer) >= HID_Handle->poll)
+    if ((int32_t)(phost->Timer - HID_Handle->timer) >= HID_Handle->poll)
     {
       HID_Handle->state = HID_GET_DATA;
-#if (USBH_USE_OS == 1)
-    osMessagePut ( phost->os_event, USBH_URB_EVENT, 0);
-#endif       
     }
   }
   return USBH_OK;
diff --git a/Downstream/Src/downstream_statemachine.c b/Downstream/Src/downstream_statemachine.c
index d4482cd..75ea5b3 100644
--- a/Downstream/Src/downstream_statemachine.c
+++ b/Downstream/Src/downstream_statemachine.c
@@ -190,7 +190,7 @@ void Downstream_HostUserCallback(USBH_HandleTypeDef *phost, uint8_t id)
     }
 
     //Called from main()
-    if (id == HOST_USER_CLASS_ACTIVE)
+    if (id == HOST_USER_CLASS_SELECTED)
     {
         switch (phost->pActiveClass->ClassCode)
         {
diff --git a/Downstream/Src/usb_host.c b/Downstream/Src/usb_host.c
index 442eea1..5db673e 100644
--- a/Downstream/Src/usb_host.c
+++ b/Downstream/Src/usb_host.c
@@ -38,6 +38,7 @@
 #include "usb_host.h"
 #include "usbh_core.h"
 #include "usbh_msc.h"
+#include "usbh_hid.h"
 #include "downstream_statemachine.h"
 
 /* USB Host Core handle declaration */
@@ -51,6 +52,7 @@ void USB_Host_Init(void)
   USBH_Init(&hUsbHostFS, Downstream_HostUserCallback, HOST_FS);
 
   USBH_RegisterClass(&hUsbHostFS, USBH_MSC_CLASS);
+  USBH_RegisterClass(&hUsbHostFS, USBH_HID_CLASS);
 
   USBH_Start(&hUsbHostFS);
 }
diff --git a/Upstream/Inc/upstream_interface_def.h b/Upstream/Inc/upstream_interface_def.h
index d2366a6..f76a6df 100644
--- a/Upstream/Inc/upstream_interface_def.h
+++ b/Upstream/Inc/upstream_interface_def.h
@@ -58,7 +58,7 @@ InterfaceCommandMscTypeDef;
 
 typedef enum
 {
-  COMMAND_HID_REPORT,               //Downstream initiates HID report transfer to Upstream. Upstream just needs to Upstream_ReceivePacket each time.
+    COMMAND_HID_REPORT,               //Downstream initiates HID report transfer to Upstream. Upstream just needs to Upstream_ReceivePacket each time.
 }
 InterfaceCommandHidTypeDef;
 
diff --git a/Upstream/Src/upstream_hid.c b/Upstream/Src/upstream_hid.c
index cd7502f..6a48b2d 100644
--- a/Upstream/Src/upstream_hid.c
+++ b/Upstream/Src/upstream_hid.c
@@ -21,7 +21,7 @@
 
 
 
-InterfaceCommandClassTypeDef    ActiveHidClass = COMMAND_CLASS_INTERFACE;
+InterfaceCommandClassTypeDef    ActiveHidClass    = COMMAND_CLASS_INTERFACE;
 UpstreamPacketTypeDef*          UpstreamHidPacket = NULL;
 
 
@@ -37,7 +37,8 @@ void Upstream_HID_Init(InterfaceCommandClassTypeDef newClass)
         return;
     }
 
-    if (UpstreamHidPacket != NULL)
+    if ((ActiveHidClass != COMMAND_CLASS_INTERFACE) ||
+        (UpstreamHidPacket != NULL))
     {
         UPSTREAM_SPI_FREAKOUT;
         return;
@@ -81,7 +82,7 @@ void Upstream_HID_GetNextReport(UpstreamHidSendReportCallback callback)
 
 void Upstream_HID_GetNextReportReceiveCallback(UpstreamPacketTypeDef* receivedPacket)
 {
-    uint8_t reportLength;
+    uint8_t reportLength = 0;
 
     if (UpstreamHidPacket != NULL)
     {
@@ -111,7 +112,14 @@ void Upstream_HID_GetNextReportReceiveCallback(UpstreamPacketTypeDef* receivedPa
     //Other HID classes go here...
 
 
+    if (reportLength == 0)
+    {
+        UPSTREAM_SPI_FREAKOUT;
+        return;
+    }
+
     UpstreamHidPacket = receivedPacket;           //Save packet so we can free it when upstream USB transaction is done
     USBD_HID_SendReport(receivedPacket->Data, reportLength);
 }
 
+
diff --git a/Upstream/Src/upstream_statemachine.c b/Upstream/Src/upstream_statemachine.c
index 1f1fdbe..0b38360 100644
--- a/Upstream/Src/upstream_statemachine.c
+++ b/Upstream/Src/upstream_statemachine.c
@@ -176,11 +176,11 @@ void Upstream_StateMachine_NotifyDeviceReplyCallback(UpstreamPacketTypeDef* repl
         break;
 
     case COMMAND_CLASS_HID_MOUSE:
-      newActiveClass = COMMAND_CLASS_HID_MOUSE;
-      newClassPointer = &USBD_HID_Mouse;
-      break;
+        newActiveClass = COMMAND_CLASS_HID_MOUSE;
+        newClassPointer = &USBD_HID_Mouse;
+        break;
 
-    //Add other supported classes here...
+        //Add other supported classes here...
     }
 
     Upstream_ReleasePacket(replyPacket);

From 56e8b99ae50588ddf4c3839b09dbe8bae794876e Mon Sep 17 00:00:00 2001
From: Robert Fisk <robert_fisk@fastmail.fm>
Date: Sun, 10 Apr 2016 01:43:32 +1200
Subject: [PATCH 06/11] Downstream mouse support working!

---
 Downstream/Downstream Debug.launch                     |  2 +-
 Downstream/Downstream Release.launch                   |  2 +-
 Downstream/Inc/downstream_spi.h                        |  4 ++--
 Downstream/Inc/usbh_config.h                           |  5 +++--
 .../ST/STM32_USB_Host_Library/Class/HID/Inc/usbh_hid.h |  4 ++--
 .../ST/STM32_USB_Host_Library/Class/MSC/Inc/usbh_msc.h |  2 +-
 .../Class/MSC/Inc/usbh_msc_bot.h                       |  3 ---
 .../Class/MSC/Src/usbh_msc_bot.c                       |  2 +-
 .../ST/STM32_USB_Host_Library/Core/Inc/usbh_ctlreq.h   |  2 +-
 Downstream/Src/downstream_statemachine.c               | 10 +++++++++-
 OpenOCD_scripts/README                                 |  8 +++++---
 Upstream/Upstream Debug.launch                         |  2 +-
 Upstream/Upstream Release.launch                       |  2 +-
 13 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/Downstream/Downstream Debug.launch b/Downstream/Downstream Debug.launch
index 0db9354..5183485 100644
--- a/Downstream/Downstream Debug.launch	
+++ b/Downstream/Downstream Debug.launch	
@@ -16,7 +16,7 @@
 <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/OpenOCD_USG_v1.0.cfg"/>
+<stringAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.openocd.gdbServerOther" value="-f interface/ftdi/olimex-arm-usb-tiny-h.cfg -f ${project_loc}/../OpenOCD_scripts/board/OpenOCD_USG_v1.0.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=""/>
diff --git a/Downstream/Downstream Release.launch b/Downstream/Downstream Release.launch
index ff869a2..a494c21 100644
--- a/Downstream/Downstream Release.launch	
+++ b/Downstream/Downstream Release.launch	
@@ -16,7 +16,7 @@
 <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/OpenOCD_USG_v1.0.cfg"/>
+<stringAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.openocd.gdbServerOther" value="-f interface/ftdi/olimex-arm-usb-tiny-h.cfg -f ${project_loc}/../OpenOCD_scripts/board/OpenOCD_USG_v1.0.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=""/>
diff --git a/Downstream/Inc/downstream_spi.h b/Downstream/Inc/downstream_spi.h
index 5e6f0fb..6f59a6f 100644
--- a/Downstream/Inc/downstream_spi.h
+++ b/Downstream/Inc/downstream_spi.h
@@ -17,7 +17,7 @@
 
 
 #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 + BOT_PAGE_LENGTH)
 #define DOWNSTREAM_PACKET_LEN_MIN           (DOWNSTREAM_PACKET_HEADER_LEN)
 
 #define DOWNSTREAM_PACKET_HEADER_LEN_16     (DOWNSTREAM_PACKET_HEADER_LEN / 2)
@@ -59,7 +59,7 @@ typedef struct
     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             Data[BOT_PAGE_LENGTH];      //Should (must?) be word-aligned, for USB copy routine
 }
 DownstreamPacketTypeDef;
 
diff --git a/Downstream/Inc/usbh_config.h b/Downstream/Inc/usbh_config.h
index 59e70eb..9552859 100644
--- a/Downstream/Inc/usbh_config.h
+++ b/Downstream/Inc/usbh_config.h
@@ -75,9 +75,10 @@
  
 /*----------   -----------*/
 #define USBH_USE_OS      0 
+
  
- 
- 
+#define BOT_PAGE_LENGTH           512       //Moved here from usbh_msc_bot.h to avoid a circular include loop :(
+
 
 /****************************************/
 /* #define for FS and HS identification */
diff --git a/Downstream/Middlewares/ST/STM32_USB_Host_Library/Class/HID/Inc/usbh_hid.h b/Downstream/Middlewares/ST/STM32_USB_Host_Library/Class/HID/Inc/usbh_hid.h
index 1f292f3..40f7790 100644
--- a/Downstream/Middlewares/ST/STM32_USB_Host_Library/Class/HID/Inc/usbh_hid.h
+++ b/Downstream/Middlewares/ST/STM32_USB_Host_Library/Class/HID/Inc/usbh_hid.h
@@ -35,8 +35,8 @@
 
 /* Includes ------------------------------------------------------------------*/
 #include "usbh_core.h"
-#include "usbh_hid_mouse.h"
-#include "usbh_hid_keybd.h"
+//#include "usbh_hid_mouse.h"
+//#include "usbh_hid_keybd.h"
  
 /** @addtogroup USBH_LIB
   * @{
diff --git a/Downstream/Middlewares/ST/STM32_USB_Host_Library/Class/MSC/Inc/usbh_msc.h b/Downstream/Middlewares/ST/STM32_USB_Host_Library/Class/MSC/Inc/usbh_msc.h
index 83d2a3f..d184b7a 100644
--- a/Downstream/Middlewares/ST/STM32_USB_Host_Library/Class/MSC/Inc/usbh_msc.h
+++ b/Downstream/Middlewares/ST/STM32_USB_Host_Library/Class/MSC/Inc/usbh_msc.h
@@ -144,7 +144,7 @@ MSC_HandleTypeDef;
 
 /* Interface Descriptor field values for MSC Protocol */
 #define MSC_BOT                                        0x50 
-#define MSC_TRANSPARENT                                0x06     
+#define MSC_TRANSPARENT                                0x06
 /**
   * @}
   */ 
diff --git a/Downstream/Middlewares/ST/STM32_USB_Host_Library/Class/MSC/Inc/usbh_msc_bot.h b/Downstream/Middlewares/ST/STM32_USB_Host_Library/Class/MSC/Inc/usbh_msc_bot.h
index 2c8e805..3067d30 100644
--- a/Downstream/Middlewares/ST/STM32_USB_Host_Library/Class/MSC/Inc/usbh_msc_bot.h
+++ b/Downstream/Middlewares/ST/STM32_USB_Host_Library/Class/MSC/Inc/usbh_msc_bot.h
@@ -38,7 +38,6 @@
 
 /* Includes ------------------------------------------------------------------*/
 #include "usbh_core.h"
-#include "usbh_msc_bot.h"
 #include "downstream_spi.h"
 
 
@@ -177,8 +176,6 @@ BOT_HandleTypeDef;
 #define BOT_DIR_OUT                  1
 #define BOT_DIR_BOTH                 2
 
-#define BOT_PAGE_LENGTH              512
-
 
 #define BOT_CBW_CB_LENGTH            16
 
diff --git a/Downstream/Middlewares/ST/STM32_USB_Host_Library/Class/MSC/Src/usbh_msc_bot.c b/Downstream/Middlewares/ST/STM32_USB_Host_Library/Class/MSC/Src/usbh_msc_bot.c
index e49aafc..65f7f13 100644
--- a/Downstream/Middlewares/ST/STM32_USB_Host_Library/Class/MSC/Src/usbh_msc_bot.c
+++ b/Downstream/Middlewares/ST/STM32_USB_Host_Library/Class/MSC/Src/usbh_msc_bot.c
@@ -243,7 +243,7 @@ USBH_StatusTypeDef USBH_MSC_BOT_Process (USBH_HandleTypeDef *phost, uint8_t lun)
                 {
                     //Dispatch current bot_packet, then get a new one
                     if (Downstream_MSC_PutStreamDataPacket(MSC_Handle->hbot.bot_packet,
-                                                           (BOT_PAGE_LENGTH - MSC_Handle->hbot.bot_packet_bytes_remaining)) != HAL_OK)
+                                                           BOT_PAGE_LENGTH) != HAL_OK)
                     {
                         MSC_Handle->hbot.state  = BOT_ERROR_IN;
                         break;
diff --git a/Downstream/Middlewares/ST/STM32_USB_Host_Library/Core/Inc/usbh_ctlreq.h b/Downstream/Middlewares/ST/STM32_USB_Host_Library/Core/Inc/usbh_ctlreq.h
index 8b2f7c2..59042d9 100644
--- a/Downstream/Middlewares/ST/STM32_USB_Host_Library/Core/Inc/usbh_ctlreq.h
+++ b/Downstream/Middlewares/ST/STM32_USB_Host_Library/Core/Inc/usbh_ctlreq.h
@@ -88,7 +88,7 @@
 /** @defgroup USBH_CTLREQ_Exported_Variables
   * @{
   */ 
-extern uint8_t USBH_CfgDesc[512];
+//extern uint8_t USBH_CfgDesc[512];
 /**
   * @}
   */ 
diff --git a/Downstream/Src/downstream_statemachine.c b/Downstream/Src/downstream_statemachine.c
index 75ea5b3..a693a76 100644
--- a/Downstream/Src/downstream_statemachine.c
+++ b/Downstream/Src/downstream_statemachine.c
@@ -16,6 +16,7 @@
 #include "downstream_msc.h"
 #include "usbh_core.h"
 #include "usbh_msc.h"
+#include "usbh_hid.h"
 #include "led.h"
 
 
@@ -190,7 +191,7 @@ void Downstream_HostUserCallback(USBH_HandleTypeDef *phost, uint8_t id)
     }
 
     //Called from main()
-    if (id == HOST_USER_CLASS_SELECTED)
+    if (id == HOST_USER_CLASS_ACTIVE)
     {
         switch (phost->pActiveClass->ClassCode)
         {
@@ -201,6 +202,13 @@ void Downstream_HostUserCallback(USBH_HandleTypeDef *phost, uint8_t id)
             }
             break;
 
+        case USB_HID_CLASS:
+
+            //FIXME!
+
+            newActiveClass = COMMAND_CLASS_HID_MOUSE;
+            break;
+
         //Add other classes here...
 
 
diff --git a/OpenOCD_scripts/README b/OpenOCD_scripts/README
index d91fa55..8913e8a 100644
--- a/OpenOCD_scripts/README
+++ b/OpenOCD_scripts/README
@@ -1,7 +1,9 @@
-Copy these files into your OpenOCD/scripts directory, then configure Eclipse and OpenOCD to use them.
+The OpenOCD scripts in ./board/ are used in-place by the Eclipse debug configurations. You
+don't need to copy them anywhere.
 
-Example OpenOCD options:
--f interface/ftdi/olimex-arm-usb-tiny-h.cfg -f board/OpenOCD_USG_v1.0.cfg
+If your OpenOCD version is <= 0.8, you will need to copy ./target/stm32f4x.cfg to your OpenOCD
+installation's /scripts/target/ folder, replacing the version currently there.
+If you have OpenOCD >= 0.9, this is not necessary.
 
 More info for Eclipse OpenOCD configuration:
 http://gnuarmeclipse.github.io/debug/openocd/
diff --git a/Upstream/Upstream Debug.launch b/Upstream/Upstream Debug.launch
index 3cb0dd2..33e69f3 100644
--- a/Upstream/Upstream Debug.launch	
+++ b/Upstream/Upstream Debug.launch	
@@ -16,7 +16,7 @@
 <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/OpenOCD_USG_v1.0.cfg"/>
+<stringAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.openocd.gdbServerOther" value="-f interface/ftdi/olimex-arm-usb-tiny-h.cfg -f ${project_loc}/../OpenOCD_scripts/board/OpenOCD_USG_v1.0.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=""/>
diff --git a/Upstream/Upstream Release.launch b/Upstream/Upstream Release.launch
index 345f6aa..985eda2 100644
--- a/Upstream/Upstream Release.launch	
+++ b/Upstream/Upstream Release.launch	
@@ -16,7 +16,7 @@
 <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/OpenOCD_USG_v1.0.cfg"/>
+<stringAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.openocd.gdbServerOther" value="-f interface/ftdi/olimex-arm-usb-tiny-h.cfg -f ${project_loc}/../OpenOCD_scripts/board/OpenOCD_USG_v1.0.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=""/>

From cda254c8bbae53f56fde9ea7b293d9794ee44ccc Mon Sep 17 00:00:00 2001
From: Robert Fisk <robert_fisk@fastmail.fm>
Date: Mon, 11 Apr 2016 01:09:41 +1200
Subject: [PATCH 07/11] Downstream HID SPI interface done, untested.

---
 Downstream/Inc/downstream_hid.h               | 31 +++++++
 Downstream/Inc/downstream_interface_def.h     |  1 +
 Downstream/Inc/downstream_msc.h               |  3 +-
 .../Class/HID/Inc/usbh_hid.h                  | 30 ++++---
 .../Class/HID/Src/usbh_hid.c                  | 89 +++++++++----------
 Downstream/Src/downstream_hid.c               | 77 ++++++++++++++++
 Downstream/Src/downstream_msc.c               | 10 +--
 Downstream/Src/downstream_statemachine.c      | 34 ++++---
 Upstream/Inc/upstream_interface_def.h         |  1 +
 9 files changed, 202 insertions(+), 74 deletions(-)
 create mode 100644 Downstream/Inc/downstream_hid.h
 create mode 100644 Downstream/Src/downstream_hid.c

diff --git a/Downstream/Inc/downstream_hid.h b/Downstream/Inc/downstream_hid.h
new file mode 100644
index 0000000..1f80859
--- /dev/null
+++ b/Downstream/Inc/downstream_hid.h
@@ -0,0 +1,31 @@
+/*
+ * downstream_hid.h
+ *
+ *  Created on: Apr 10, 2016
+ *      Author: Robert Fisk
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INC_DOWNSTREAM_HID_H_
+#define INC_DOWNSTREAM_HID_H_
+
+
+#include "downstream_interface_def.h"
+#include "downstream_spi.h"
+
+
+#define HID_MOUSE_TRANSFER_BYTES        5
+#define HID_KEYBOARD_TRANSFER_BYTES     0
+
+
+
+InterfaceCommandClassTypeDef Downstream_HID_ApproveConnectedDevice(void);
+void Downstream_HID_PacketProcessor(DownstreamPacketTypeDef* receivedPacket);
+void Downstream_HID_InterruptReportCallback(DownstreamPacketTypeDef* packetToSend);
+
+
+
+#endif /* INC_DOWNSTREAM_HID_H_ */
diff --git a/Downstream/Inc/downstream_interface_def.h b/Downstream/Inc/downstream_interface_def.h
index b3dfaf2..a5cdf56 100644
--- a/Downstream/Inc/downstream_interface_def.h
+++ b/Downstream/Inc/downstream_interface_def.h
@@ -30,6 +30,7 @@ typedef enum
     COMMAND_CLASS_INTERFACE,
     COMMAND_CLASS_MASS_STORAGE,
     COMMAND_CLASS_HID_MOUSE,
+    COMMAND_CLASS_HID_KEYBOARD,
     //...
     COMMAND_CLASS_ERROR
 }
diff --git a/Downstream/Inc/downstream_msc.h b/Downstream/Inc/downstream_msc.h
index 9b5bbd8..d78c226 100644
--- a/Downstream/Inc/downstream_msc.h
+++ b/Downstream/Inc/downstream_msc.h
@@ -13,6 +13,7 @@
 #define INC_DOWNSTREAM_MSC_H_
 
 
+#include "downstream_interface_def.h"
 #include "downstream_spi.h"
 
 
@@ -24,7 +25,7 @@ typedef void (*DownstreamMSCCallbackPacketTypeDef)(DownstreamPacketTypeDef* rece
                                                    uint16_t dataLength8);
 
 
-HAL_StatusTypeDef Downstream_MSC_ApproveConnectedDevice(void);
+InterfaceCommandClassTypeDef Downstream_MSC_ApproveConnectedDevice(void);
 void Downstream_MSC_PacketProcessor(DownstreamPacketTypeDef* receivedPacket);
 HAL_StatusTypeDef Downstream_MSC_PutStreamDataPacket(DownstreamPacketTypeDef* packetToSend,
                                                      uint32_t dataLength8);
diff --git a/Downstream/Middlewares/ST/STM32_USB_Host_Library/Class/HID/Inc/usbh_hid.h b/Downstream/Middlewares/ST/STM32_USB_Host_Library/Class/HID/Inc/usbh_hid.h
index 40f7790..a611ace 100644
--- a/Downstream/Middlewares/ST/STM32_USB_Host_Library/Class/HID/Inc/usbh_hid.h
+++ b/Downstream/Middlewares/ST/STM32_USB_Host_Library/Class/HID/Inc/usbh_hid.h
@@ -35,8 +35,8 @@
 
 /* Includes ------------------------------------------------------------------*/
 #include "usbh_core.h"
-//#include "usbh_hid_mouse.h"
-//#include "usbh_hid_keybd.h"
+#include "downstream_spi.h"
+
  
 /** @addtogroup USBH_LIB
   * @{
@@ -112,8 +112,6 @@ typedef enum
 {
   HID_INIT= 0,  
   HID_IDLE,
-//  HID_SEND_DATA,
-//  HID_BUSY,
   HID_GET_DATA,   
   HID_SYNC,     
   HID_POLL,
@@ -212,27 +210,32 @@ typedef struct
 } FIFO_TypeDef;
 
 
+
+typedef void (*HID_InterruptReportCallback)(DownstreamPacketTypeDef* packetToSend);
+
+
 /* Structure for HID process */
 typedef struct _HID_Process
 {
   uint8_t              OutPipe; 
   uint8_t              InPipe; 
-  HID_StateTypeDef     state; 
   uint8_t              OutEp;
   uint8_t              InEp;
+  HID_StateTypeDef     state;
   HID_CtlStateTypeDef  ctl_state;
-  FIFO_TypeDef         fifo; 
-  uint8_t              *pData;   
   uint16_t             length;
-  uint8_t              ep_addr;
   uint16_t             poll; 
   uint32_t             timer;
-//  uint8_t              DataReady;
-  HID_DescTypeDef      HID_Desc;  
-  //USBH_StatusTypeDef  ( * Init)(USBH_HandleTypeDef *phost);
+  uint8_t              ep_addr;
+  uint8_t              Protocol;
+  HID_DescTypeDef      HID_Desc;
+  HID_InterruptReportCallback   ReportCallback;
+  DownstreamPacketTypeDef*      hid_packet;
+  uint8_t*                      hid_packet_pbuf;
 }
 HID_HandleTypeDef;
 
+
 /**
   * @}
   */ 
@@ -321,6 +324,11 @@ uint16_t  fifo_read(FIFO_TypeDef * f, void * buf, uint16_t  nbytes);
 
 uint16_t  fifo_write(FIFO_TypeDef * f, const void * buf, uint16_t  nbytes);
 
+HAL_StatusTypeDef USBH_HID_GetInterruptReport(USBH_HandleTypeDef *phost,
+                                              HID_InterruptReportCallback callback,
+                                              DownstreamPacketTypeDef* packetToUse);
+
+
 /**
   * @}
   */ 
diff --git a/Downstream/Middlewares/ST/STM32_USB_Host_Library/Class/HID/Src/usbh_hid.c b/Downstream/Middlewares/ST/STM32_USB_Host_Library/Class/HID/Src/usbh_hid.c
index 972bf23..be36dfa 100644
--- a/Downstream/Middlewares/ST/STM32_USB_Host_Library/Class/HID/Src/usbh_hid.c
+++ b/Downstream/Middlewares/ST/STM32_USB_Host_Library/Class/HID/Src/usbh_hid.c
@@ -181,7 +181,8 @@ static USBH_StatusTypeDef USBH_HID_InterfaceInit (USBH_HandleTypeDef *phost)
     HID_Handle->ctl_state = HID_REQ_INIT; 
     HID_Handle->ep_addr   = phost->device.CfgDesc.Itf_Desc[phost->device.current_interface].Ep_Desc[0].bEndpointAddress;
     HID_Handle->length    = phost->device.CfgDesc.Itf_Desc[phost->device.current_interface].Ep_Desc[0].wMaxPacketSize;
-    HID_Handle->poll      = phost->device.CfgDesc.Itf_Desc[phost->device.current_interface].Ep_Desc[0].bInterval ;
+    HID_Handle->poll      = phost->device.CfgDesc.Itf_Desc[phost->device.current_interface].Ep_Desc[0].bInterval;
+    HID_Handle->Protocol  = phost->device.CfgDesc.Itf_Desc[phost->device.current_interface].bInterfaceProtocol;
     
     if (HID_Handle->poll  < HID_MIN_POLL) 
     {
@@ -298,7 +299,7 @@ static USBH_StatusTypeDef USBH_HID_ClassRequest(USBH_HandleTypeDef *phost)
     {
       
       USBH_HID_ParseHIDDesc(&HID_Handle->HID_Desc, phost->device.Data);
-      HID_Handle->ctl_state = HID_REQ_SET_IDLE;     //HID_REQ_GET_REPORT_DESC;
+      HID_Handle->ctl_state = HID_REQ_SET_IDLE;
     }
     
     break;     
@@ -364,50 +365,29 @@ static USBH_StatusTypeDef USBH_HID_Process(USBH_HandleTypeDef *phost)
   switch (HID_Handle->state)
   {
   case HID_INIT:
-//    HID_Handle->Init(phost);
-      HID_Handle->pData = phost->device.Data;
-
-//  case HID_IDLE:
-//    if(USBH_HID_GetReport (phost,
-//                           0x01,
-//                            0,
-//                            HID_Handle->pData,
-//                            HID_Handle->length) == USBH_OK)
-//    {
-//
-//      fifo_write(&HID_Handle->fifo, HID_Handle->pData, HID_Handle->length);
-//      HID_Handle->state = HID_SYNC;
-//    }
-//
-//    break;
-    
-  case HID_SYNC:
-    /* Sync with start of Even Frame */
-    //Uhhh, doesn't this sync with an odd frame?
-    //Also, do we need to sync at all?
-
-    if(phost->Timer & 1)
-    {
-      HID_Handle->state = HID_GET_DATA; 
-    }
-    break;
+      HID_Handle->timer = phost->Timer;
+      HID_Handle->state = HID_IDLE;
+      break;
     
   case HID_GET_DATA:
-    USBH_InterruptReceiveData(phost, 
-                              HID_Handle->pData,
-                              HID_Handle->length,
-                              HID_Handle->InPipe);
-    
-    HID_Handle->state = HID_POLL;
-    HID_Handle->timer = phost->Timer;
+      if ((int32_t)(phost->Timer - HID_Handle->timer) >= HID_Handle->poll)
+      {
+        USBH_InterruptReceiveData(phost,
+                                  HID_Handle->hid_packet_pbuf,
+                                  HID_Handle->length,
+                                  HID_Handle->InPipe);
+
+        HID_Handle->state = HID_POLL;
+        HID_Handle->timer = phost->Timer;
+      }
     break;
     
   case HID_POLL:
-    urbStatus = USBH_LL_GetURBState(phost , HID_Handle->InPipe);
+    urbStatus = USBH_LL_GetURBState(phost, HID_Handle->InPipe);
     
     if (urbStatus == USBH_URB_DONE)
     {
-        USBH_HID_EventCallback(phost);
+        HID_Handle->ReportCallback(HID_Handle->hid_packet);
         HID_Handle->state = HID_IDLE;
         break;
     }
@@ -447,18 +427,35 @@ static USBH_StatusTypeDef USBH_HID_Process(USBH_HandleTypeDef *phost)
   */
 static USBH_StatusTypeDef USBH_HID_SOFProcess(USBH_HandleTypeDef *phost)
 {
-  HID_HandleTypeDef *HID_Handle =  (HID_HandleTypeDef *) phost->pActiveClass->pData;
-  
-  if (HID_Handle->state == HID_IDLE)
-  {
-    if ((int32_t)(phost->Timer - HID_Handle->timer) >= HID_Handle->poll)
+
+  return USBH_OK;
+}
+
+
+
+//Downstream_HID calls into here at main() priority,
+//to request a new report for Upstream.
+HAL_StatusTypeDef USBH_HID_GetInterruptReport(USBH_HandleTypeDef *phost,
+                                              HID_InterruptReportCallback callback,
+                                              DownstreamPacketTypeDef* packetToUse)
+{
+    HID_HandleTypeDef *HID_Handle =  (HID_HandleTypeDef *) phost->pActiveClass->pData;
+
+    if (HID_Handle->state == HID_IDLE)
     {
-      HID_Handle->state = HID_GET_DATA;
+        HID_Handle->ReportCallback = callback;
+        HID_Handle->hid_packet = packetToUse;
+        HID_Handle->hid_packet_pbuf = packetToUse->Data;
+        HID_Handle->state = HID_GET_DATA;
+        return HAL_OK;
     }
-  }
-  return USBH_OK;
+
+    return HAL_ERROR;
 }
 
+
+
+
 /**
 * @brief  USBH_Get_HID_ReportDescriptor
   *         Issue report Descriptor command to the device. Once the response 
diff --git a/Downstream/Src/downstream_hid.c b/Downstream/Src/downstream_hid.c
new file mode 100644
index 0000000..27d1843
--- /dev/null
+++ b/Downstream/Src/downstream_hid.c
@@ -0,0 +1,77 @@
+/*
+ * downstream_hid.c
+ *
+ *  Created on: Apr 10, 2016
+ *      Author: Robert Fisk
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+
+
+#include "downstream_hid.h"
+#include "downstream_statemachine.h"
+#include "usbh_hid.h"
+
+
+
+extern USBH_HandleTypeDef hUsbHostFS;                       //Hard-link ourselves to usb_host.c
+extern InterfaceCommandClassTypeDef ConfiguredDeviceClass;  //Do a cheap hard-link to downstream_statemachine.c, rather than keep a duplicate here
+
+
+
+InterfaceCommandClassTypeDef Downstream_HID_ApproveConnectedDevice(void)
+{
+    HID_HandleTypeDef* HID_Handle =  (HID_HandleTypeDef*)hUsbHostFS.pActiveClass->pData;
+
+    if (HID_Handle->Protocol == HID_MOUSE_BOOT_CODE)
+    {
+        if (HID_Handle->length == 8)
+        {
+            return COMMAND_CLASS_HID_MOUSE;
+        }
+    }
+
+    return COMMAND_CLASS_INTERFACE;         //fail
+}
+
+
+
+void Downstream_HID_PacketProcessor(DownstreamPacketTypeDef* receivedPacket)
+{
+    if (receivedPacket->Command != COMMAND_HID_REPORT)
+    {
+        Downstream_PacketProcessor_FreakOut();
+        return;
+    }
+
+    if (USBH_HID_GetInterruptReport(&hUsbHostFS,
+                                    Downstream_HID_InterruptReportCallback,
+                                    receivedPacket) != HAL_OK)      //Don't free the packet, USBH_HID will use it then return it to InterruptReportCallback below
+    {
+        Downstream_PacketProcessor_FreakOut();
+    }
+
+}
+
+
+void Downstream_HID_InterruptReportCallback(DownstreamPacketTypeDef* packetToSend)
+{
+    if (ConfiguredDeviceClass == COMMAND_CLASS_HID_MOUSE)
+    {
+        packetToSend->Length16 = (HID_MOUSE_TRANSFER_BYTES / 2) + DOWNSTREAM_PACKET_HEADER_LEN_16;
+    }
+    //else if...
+    else
+    {
+        Downstream_PacketProcessor_FreakOut();
+        return;
+    }
+
+
+    Downstream_TransmitPacket(packetToSend);
+}
+
+
diff --git a/Downstream/Src/downstream_msc.c b/Downstream/Src/downstream_msc.c
index b6b83a9..23ef28f 100644
--- a/Downstream/Src/downstream_msc.c
+++ b/Downstream/Src/downstream_msc.c
@@ -37,27 +37,27 @@ void Downstream_MSC_GetStreamDataPacketCallback(DownstreamPacketTypeDef* receive
 
 //High-level checks on the connected device. We don't want some weirdly
 //configured device to bomb our USB stack, accidentally or otherwise.
-HAL_StatusTypeDef Downstream_MSC_ApproveConnectedDevice(void)
+InterfaceCommandClassTypeDef Downstream_MSC_ApproveConnectedDevice(void)
 {
     MSC_HandleTypeDef* MSC_Handle =  (MSC_HandleTypeDef*)hUsbHostFS.pActiveClass->pData;
 
     if (MSC_Handle->unit[MSC_FIXED_LUN].error != MSC_OK)
     {
-        return HAL_ERROR;
+        return COMMAND_CLASS_INTERFACE;         //fail
     }
 
     if ((MSC_Handle->unit[MSC_FIXED_LUN].capacity.block_nbr == 0) ||
         (MSC_Handle->unit[MSC_FIXED_LUN].capacity.block_nbr == UINT32_MAX))
     {
-        return HAL_ERROR;
+        return COMMAND_CLASS_INTERFACE;         //fail
     }
 
     if (MSC_Handle->unit[MSC_FIXED_LUN].capacity.block_size != MSC_SUPPORTED_BLOCK_SIZE)
     {
-        return HAL_ERROR;
+        return COMMAND_CLASS_INTERFACE;         //fail
     }
 
-    return HAL_OK;
+    return COMMAND_CLASS_MASS_STORAGE;
 }
 
 
diff --git a/Downstream/Src/downstream_statemachine.c b/Downstream/Src/downstream_statemachine.c
index a693a76..347c415 100644
--- a/Downstream/Src/downstream_statemachine.c
+++ b/Downstream/Src/downstream_statemachine.c
@@ -10,10 +10,12 @@
  */
 
 
+#include <downstream_hid.h>
 #include "downstream_statemachine.h"
 #include "downstream_interface_def.h"
 #include "downstream_spi.h"
 #include "downstream_msc.h"
+#include "downstream_hid.h"
 #include "usbh_core.h"
 #include "usbh_msc.h"
 #include "usbh_hid.h"
@@ -32,6 +34,13 @@ void Downstream_PacketProcessor_Interface_ReplyNotifyDevice(DownstreamPacketType
 
 void Downstream_InitStateMachine(void)
 {
+    if ((DownstreamState       != STATE_DEVICE_NOT_READY) ||
+        (ConfiguredDeviceClass != COMMAND_CLASS_INTERFACE))
+    {
+        DOWNSTREAM_STATEMACHINE_FREAKOUT;
+        return;
+    }
+
     Downstream_InitSPI();
 
     //Prepare to receive our first packet from Upstream!
@@ -69,19 +78,28 @@ void Downstream_PacketProcessor(DownstreamPacketTypeDef* receivedPacket)
         return;
     }
 
-    //We should only receive class-specific messages when we are in the Active state.
-    if (DownstreamState != STATE_ACTIVE)
+    //We should only receive class-specific messages when we are in the Active state,
+    //and only to our currently active device class.
+    if ((DownstreamState != STATE_ACTIVE) ||
+        (receivedPacket->CommandClass != ConfiguredDeviceClass))
     {
         DOWNSTREAM_STATEMACHINE_FREAKOUT;
         return;
     }
 
-    switch (receivedPacket->CommandClass)
+
+    switch (ConfiguredDeviceClass)
     {
     case COMMAND_CLASS_MASS_STORAGE:
         Downstream_MSC_PacketProcessor(receivedPacket);
         break;
 
+    case COMMAND_CLASS_HID_MOUSE:
+    case COMMAND_CLASS_HID_KEYBOARD:
+        Downstream_HID_PacketProcessor(receivedPacket);
+        break;
+
+
     //Add other classes here...
 
     default:
@@ -196,17 +214,11 @@ void Downstream_HostUserCallback(USBH_HandleTypeDef *phost, uint8_t id)
         switch (phost->pActiveClass->ClassCode)
         {
         case USB_MSC_CLASS:
-            if (Downstream_MSC_ApproveConnectedDevice() == HAL_OK)
-            {
-                newActiveClass = COMMAND_CLASS_MASS_STORAGE;
-            }
+            newActiveClass = Downstream_MSC_ApproveConnectedDevice();
             break;
 
         case USB_HID_CLASS:
-
-            //FIXME!
-
-            newActiveClass = COMMAND_CLASS_HID_MOUSE;
+            newActiveClass = Downstream_HID_ApproveConnectedDevice();
             break;
 
         //Add other classes here...
diff --git a/Upstream/Inc/upstream_interface_def.h b/Upstream/Inc/upstream_interface_def.h
index f76a6df..9f00626 100644
--- a/Upstream/Inc/upstream_interface_def.h
+++ b/Upstream/Inc/upstream_interface_def.h
@@ -32,6 +32,7 @@ typedef enum
     COMMAND_CLASS_INTERFACE,
     COMMAND_CLASS_MASS_STORAGE,
     COMMAND_CLASS_HID_MOUSE,
+    COMMAND_CLASS_HID_KEYBOARD,
     //...
     COMMAND_CLASS_ERROR
 }

From 4d9e26b6ef6f205fa071160e5813462a921d323d Mon Sep 17 00:00:00 2001
From: Robert Fisk <robert_fisk@fastmail.fm>
Date: Wed, 13 Apr 2016 01:07:01 +1200
Subject: [PATCH 08/11] Upstream HID bugfixes.

---
 Downstream/Inc/downstream_hid.h               |  3 --
 Downstream/Src/downstream_hid.c               |  6 ++-
 Upstream/Inc/upstream_hid.h                   |  5 +-
 .../Class/HID/Inc/usbd_hid.h                  | 10 ++--
 .../Class/HID/Src/usbd_hid.c                  | 46 ++++---------------
 .../Core/Src/usbd_core.c                      |  5 +-
 Upstream/Src/upstream_hid.c                   | 37 +++++++++++----
 Upstream/Src/upstream_statemachine.c          |  3 +-
 8 files changed, 58 insertions(+), 57 deletions(-)

diff --git a/Downstream/Inc/downstream_hid.h b/Downstream/Inc/downstream_hid.h
index 1f80859..e3c3bbd 100644
--- a/Downstream/Inc/downstream_hid.h
+++ b/Downstream/Inc/downstream_hid.h
@@ -17,9 +17,6 @@
 #include "downstream_spi.h"
 
 
-#define HID_MOUSE_TRANSFER_BYTES        5
-#define HID_KEYBOARD_TRANSFER_BYTES     0
-
 
 
 InterfaceCommandClassTypeDef Downstream_HID_ApproveConnectedDevice(void);
diff --git a/Downstream/Src/downstream_hid.c b/Downstream/Src/downstream_hid.c
index 27d1843..b941663 100644
--- a/Downstream/Src/downstream_hid.c
+++ b/Downstream/Src/downstream_hid.c
@@ -17,6 +17,10 @@
 
 
 
+#define HID_MOUSE_DATA_LEN        4
+#define HID_KEYBOARD_DATA_LEN     0
+
+
 extern USBH_HandleTypeDef hUsbHostFS;                       //Hard-link ourselves to usb_host.c
 extern InterfaceCommandClassTypeDef ConfiguredDeviceClass;  //Do a cheap hard-link to downstream_statemachine.c, rather than keep a duplicate here
 
@@ -61,7 +65,7 @@ void Downstream_HID_InterruptReportCallback(DownstreamPacketTypeDef* packetToSen
 {
     if (ConfiguredDeviceClass == COMMAND_CLASS_HID_MOUSE)
     {
-        packetToSend->Length16 = (HID_MOUSE_TRANSFER_BYTES / 2) + DOWNSTREAM_PACKET_HEADER_LEN_16;
+        packetToSend->Length16 = ((HID_MOUSE_DATA_LEN + 1) / 2) + DOWNSTREAM_PACKET_HEADER_LEN_16;
     }
     //else if...
     else
diff --git a/Upstream/Inc/upstream_hid.h b/Upstream/Inc/upstream_hid.h
index fa5d5fd..c3c0d03 100644
--- a/Upstream/Inc/upstream_hid.h
+++ b/Upstream/Inc/upstream_hid.h
@@ -20,8 +20,9 @@
 #include "upstream_interface_def.h"
 
 
-typedef uint8_t UpstreamHidSendReportCallback(uint8_t *report,
-                                              uint16_t len);
+typedef uint8_t (*UpstreamHidSendReportCallback)(uint8_t *report,
+                                                 uint16_t len);
+
 
 
 void Upstream_HID_Init(InterfaceCommandClassTypeDef newClass);
diff --git a/Upstream/Middlewares/ST/STM32_USB_Device_Library/Class/HID/Inc/usbd_hid.h b/Upstream/Middlewares/ST/STM32_USB_Device_Library/Class/HID/Inc/usbd_hid.h
index e0a1e25..2aef166 100644
--- a/Upstream/Middlewares/ST/STM32_USB_Device_Library/Class/HID/Inc/usbd_hid.h
+++ b/Upstream/Middlewares/ST/STM32_USB_Device_Library/Class/HID/Inc/usbd_hid.h
@@ -113,8 +113,8 @@ USBD_HID_HandleTypeDef;
   * @{
   */ 
 
-extern USBD_ClassTypeDef  USBD_HID_Mouse;
-extern USBD_ClassTypeDef  USBD_HID_Keyboard;
+extern USBD_ClassTypeDef  USBD_HID;
+
 
 //#define USBD_HID_CLASS    &USBD_HID
 /**
@@ -124,11 +124,13 @@ extern USBD_ClassTypeDef  USBD_HID_Keyboard;
 /** @defgroup USB_CORE_Exported_Functions
   * @{
   */ 
-uint8_t USBD_HID_SendReport (uint8_t *report,
-                             uint16_t len);
 
 uint32_t USBD_HID_GetPollingInterval (USBD_HandleTypeDef *pdev);
 
+void  USBD_HID_PreinitMouse(void);
+void  USBD_HID_PreinitKeyboard(void);
+
+
 /**
   * @}
   */ 
diff --git a/Upstream/Middlewares/ST/STM32_USB_Device_Library/Class/HID/Src/usbd_hid.c b/Upstream/Middlewares/ST/STM32_USB_Device_Library/Class/HID/Src/usbd_hid.c
index 3925e7e..c60c011 100644
--- a/Upstream/Middlewares/ST/STM32_USB_Device_Library/Class/HID/Src/usbd_hid.c
+++ b/Upstream/Middlewares/ST/STM32_USB_Device_Library/Class/HID/Src/usbd_hid.c
@@ -55,12 +55,6 @@
 
 
 
-static uint8_t  USBD_HID_InitMouse(USBD_HandleTypeDef *pdev,
-                                   uint8_t cfgidx);
-
-static uint8_t  USBD_HID_InitKeyboard(USBD_HandleTypeDef *pdev,
-                                      uint8_t cfgidx);
-
 static uint8_t  USBD_HID_Init (USBD_HandleTypeDef *pdev, 
                                uint8_t cfgidx);
 
@@ -76,11 +70,14 @@ static uint8_t  *USBD_HID_GetDeviceQualifierDesc (uint16_t *length);
 
 static uint8_t  USBD_HID_DataIn (USBD_HandleTypeDef *pdev, uint8_t epnum);
 
+static uint8_t USBD_HID_SendReport (uint8_t *report,
+                                    uint16_t len);
+
 
 
-USBD_ClassTypeDef  USBD_HID_Mouse =
+USBD_ClassTypeDef  USBD_HID =
 {
-  USBD_HID_InitMouse,
+  USBD_HID_Init,
   USBD_HID_DeInit,
   USBD_HID_Setup,
   NULL, /*EP0_TxSent*/
@@ -90,26 +87,9 @@ USBD_ClassTypeDef  USBD_HID_Mouse =
   NULL, /*SOF */
   NULL,
   NULL,
-  USBD_HID_GetCfgDesc,
-  USBD_HID_GetCfgDesc,
-  USBD_HID_GetCfgDesc,
-  USBD_HID_GetDeviceQualifierDesc,
-};
-
-USBD_ClassTypeDef  USBD_HID_Keyboard =
-{
-  USBD_HID_InitKeyboard,
-  USBD_HID_DeInit,
-  USBD_HID_Setup,
-  NULL, /*EP0_TxSent*/  
-  NULL, /*EP0_RxReady*/
-  USBD_HID_DataIn, /*DataIn*/
-  NULL, /*DataOut*/
-  NULL, /*SOF */
   NULL,
-  NULL,      
   USBD_HID_GetCfgDesc,
-  USBD_HID_GetCfgDesc, 
+  USBD_HID_GetCfgDesc,
   USBD_HID_GetCfgDesc,
   USBD_HID_GetDeviceQualifierDesc,
 };
@@ -155,7 +135,7 @@ __ALIGN_BEGIN static uint8_t USBD_HID_CfgDesc[USB_HID_CONFIG_DESC_SIZ]  __ALIGN_
   0x00,         /*bCountryCode: Hardware target country*/
   0x01,         /*bNumDescriptors: Number of HID class descriptors to follow*/
   0x22,         /*bDescriptorType*/
-  HID_MOUSE_REPORT_DESC_SIZE,/*wItemLength: Total length of Report descriptor*/
+  0x00,  //HID_MOUSE_REPORT_DESC_SIZE,  /*wItemLength: Total length of Report descriptor*/
   0x00,
   /******************** Descriptor of Mouse endpoint ********************/
   /* 27 */
@@ -180,7 +160,7 @@ __ALIGN_BEGIN static uint8_t USBD_HID_Desc[USB_HID_DESC_SIZ]  __ALIGN_END  =
   0x00,         /*bCountryCode: Hardware target country*/
   0x01,         /*bNumDescriptors: Number of HID class descriptors to follow*/
   0x22,         /*bDescriptorType*/
-  HID_MOUSE_REPORT_DESC_SIZE,/*wItemLength: Total length of Report descriptor*/
+  0x00, //HID_MOUSE_REPORT_DESC_SIZE,   /*wItemLength: Total length of Report descriptor*/
   0x00,
 };
 
@@ -264,18 +244,13 @@ uint8_t             ActiveReportDescriptorLength;
   * @param  cfgidx: Configuration index
   * @retval status
   */
-static uint8_t USBD_HID_InitMouse(USBD_HandleTypeDef *pdev,
-                                  uint8_t cfgidx)
+void USBD_HID_PreinitMouse(void)
 {
   ActiveReportDescriptor = HID_MOUSE_ReportDesc;
   ActiveReportDescriptorLength = HID_MOUSE_REPORT_DESC_SIZE;
 
   USBD_HID_CfgDesc[USB_HID_CFGDESC__HID_REPORT_DESC_SIZE_OFFSET] = HID_MOUSE_REPORT_DESC_SIZE;
   USBD_HID_Desc[USB_HID_DESC__HID_REPORT_DESC_SIZE_OFFSET] = HID_MOUSE_REPORT_DESC_SIZE;
-
-  Upstream_HID_Init(COMMAND_CLASS_HID_MOUSE);
-
-  return USBD_HID_Init(pdev, cfgidx);
 }
 
 
@@ -396,7 +371,7 @@ static uint8_t  USBD_HID_Setup (USBD_HandleTypeDef *pdev,
       if( req->wValue >> 8 == HID_REPORT_DESC)
       {
         len = MIN(ActiveReportDescriptorLength , req->wLength);
-        pbuf = HID_MOUSE_ReportDesc;
+        pbuf = ActiveReportDescriptor;
       }
       else if( req->wValue >> 8 == HID_DESCRIPTOR_TYPE)
       {
@@ -407,7 +382,6 @@ static uint8_t  USBD_HID_Setup (USBD_HandleTypeDef *pdev,
       USBD_CtlSendData (pdev, 
                         pbuf,
                         len);
-      
       break;
       
     case USB_REQ_GET_INTERFACE :
diff --git a/Upstream/Middlewares/ST/STM32_USB_Device_Library/Core/Src/usbd_core.c b/Upstream/Middlewares/ST/STM32_USB_Device_Library/Core/Src/usbd_core.c
index 6e00101..8353a12 100755
--- a/Upstream/Middlewares/ST/STM32_USB_Device_Library/Core/Src/usbd_core.c
+++ b/Upstream/Middlewares/ST/STM32_USB_Device_Library/Core/Src/usbd_core.c
@@ -548,7 +548,10 @@ USBD_StatusTypeDef USBD_DevDisconnected(USBD_HandleTypeDef  *pdev)
 
 USBD_StatusTypeDef USBD_BufferFreed(USBD_HandleTypeDef *pdev)
 {
-    pdev->pClass->FreeDataBuffer(pdev);
+    if(pdev->pClass->FreeDataBuffer != NULL)
+    {
+        pdev->pClass->FreeDataBuffer(pdev);
+    }
     return USBD_OK;
 }
 /**
diff --git a/Upstream/Src/upstream_hid.c b/Upstream/Src/upstream_hid.c
index 6a48b2d..2de79ad 100644
--- a/Upstream/Src/upstream_hid.c
+++ b/Upstream/Src/upstream_hid.c
@@ -14,15 +14,17 @@
 #include "upstream_hid.h"
 #include "upstream_spi.h"
 #include "upstream_interface_def.h"
-#include "usbd_hid.h"
 
 
-#define HID_MOUSE_REPORT_LEN    4
+#define HID_REPORT_DATA_LEN     8
+#define HID_MOUSE_DATA_LEN      4
 
 
 
 InterfaceCommandClassTypeDef    ActiveHidClass    = COMMAND_CLASS_INTERFACE;
 UpstreamPacketTypeDef*          UpstreamHidPacket = NULL;
+UpstreamHidSendReportCallback   ReportCallback    = NULL;
+
 
 
 void Upstream_HID_GetNextReportReceiveCallback(UpstreamPacketTypeDef* receivedPacket);
@@ -74,6 +76,13 @@ void Upstream_HID_GetNextReport(UpstreamHidSendReportCallback callback)
         UpstreamHidPacket = NULL;
     }
 
+    if (ReportCallback != NULL)
+    {
+        UPSTREAM_SPI_FREAKOUT;
+        return;
+    }
+    ReportCallback = callback;
+
     //Get next packet
     Upstream_SetExpectedReceivedCommand(ActiveHidClass, COMMAND_HID_REPORT);
     Upstream_ReceivePacket(Upstream_HID_GetNextReportReceiveCallback);
@@ -82,9 +91,12 @@ void Upstream_HID_GetNextReport(UpstreamHidSendReportCallback callback)
 
 void Upstream_HID_GetNextReportReceiveCallback(UpstreamPacketTypeDef* receivedPacket)
 {
-    uint8_t reportLength = 0;
+    UpstreamHidSendReportCallback tempReportCallback;
+    uint8_t dataLength = 0;
+    uint8_t i;
 
-    if (UpstreamHidPacket != NULL)
+    if ((UpstreamHidPacket != NULL) ||
+        (ReportCallback == NULL))
     {
         UPSTREAM_SPI_FREAKOUT;
         return;
@@ -98,7 +110,7 @@ void Upstream_HID_GetNextReportReceiveCallback(UpstreamPacketTypeDef* receivedPa
 
     if (ActiveHidClass == COMMAND_CLASS_HID_MOUSE)
     {
-        if (receivedPacket->Length16 != (UPSTREAM_PACKET_HEADER_LEN_16 + ((HID_MOUSE_REPORT_LEN + 1) / 2)))
+        if (receivedPacket->Length16 != (UPSTREAM_PACKET_HEADER_LEN_16 + ((HID_MOUSE_DATA_LEN + 1) / 2)))
         {
             UPSTREAM_SPI_FREAKOUT;
             return;
@@ -106,20 +118,27 @@ void Upstream_HID_GetNextReportReceiveCallback(UpstreamPacketTypeDef* receivedPa
 
         //Mouse sanity checks & stuff go here...
 
-        reportLength = HID_MOUSE_REPORT_LEN;
+        dataLength = HID_MOUSE_DATA_LEN;
     }
 
     //Other HID classes go here...
 
 
-    if (reportLength == 0)
+    if (dataLength == 0)
     {
         UPSTREAM_SPI_FREAKOUT;
         return;
     }
 
-    UpstreamHidPacket = receivedPacket;           //Save packet so we can free it when upstream USB transaction is done
-    USBD_HID_SendReport(receivedPacket->Data, reportLength);
+    for (i = dataLength; i > HID_REPORT_DATA_LEN; i++)
+    {
+        receivedPacket->Data[i] = 0;            //Zero out unused bytes before we send report upstream
+    }
+
+    UpstreamHidPacket = receivedPacket;         //Save packet so we can free it when upstream USB transaction is done
+    tempReportCallback = ReportCallback;
+    ReportCallback = NULL;
+    tempReportCallback(receivedPacket->Data, HID_REPORT_DATA_LEN);
 }
 
 
diff --git a/Upstream/Src/upstream_statemachine.c b/Upstream/Src/upstream_statemachine.c
index 0b38360..d43b6c0 100644
--- a/Upstream/Src/upstream_statemachine.c
+++ b/Upstream/Src/upstream_statemachine.c
@@ -177,7 +177,8 @@ void Upstream_StateMachine_NotifyDeviceReplyCallback(UpstreamPacketTypeDef* repl
 
     case COMMAND_CLASS_HID_MOUSE:
         newActiveClass = COMMAND_CLASS_HID_MOUSE;
-        newClassPointer = &USBD_HID_Mouse;
+        newClassPointer = &USBD_HID;
+        USBD_HID_PreinitMouse();
         break;
 
         //Add other supported classes here...

From b7298c5f65253f9f4fcc0b03d2baacee570d4a71 Mon Sep 17 00:00:00 2001
From: Robert Fisk <robert_fisk@fastmail.fm>
Date: Fri, 15 Apr 2016 00:02:09 +1200
Subject: [PATCH 09/11] Restructure & bugfix Upstream HID. Still some issue
 with Downstream...

---
 Downstream/.cproject                          |  4 +-
 Downstream/Inc/downstream_interface_def.h     |  2 +-
 Downstream/Inc/downstream_statemachine.h      |  2 +-
 .../Class/HID/Src/usbh_hid.c                  |  4 +-
 Downstream/Src/downstream_hid.c               |  3 +-
 Upstream/Inc/upstream_hid.h                   |  5 +-
 Upstream/Inc/upstream_interface_def.h         |  2 +-
 Upstream/Inc/upstream_spi.h                   |  3 +-
 Upstream/Inc/upstream_statemachine.h          |  3 +-
 Upstream/Src/upstream_hid.c                   | 70 +++++++++++--------
 Upstream/Src/upstream_msc.c                   | 28 ++++----
 Upstream/Src/upstream_spi.c                   |  8 ---
 Upstream/Src/upstream_statemachine.c          |  9 ++-
 13 files changed, 70 insertions(+), 73 deletions(-)

diff --git a/Downstream/.cproject b/Downstream/.cproject
index a64ae34..1f23b55 100644
--- a/Downstream/.cproject
+++ b/Downstream/.cproject
@@ -45,7 +45,7 @@
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.logicalop.1966851850" name="Warn if suspicious logical ops (-Wlogical-op)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.logicalop" value="true" valueType="boolean"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.pointerarith.1529172556" name="Warn if pointer arithmetic (-Wpointer-arith)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.pointerarith" value="true" valueType="boolean"/>
 							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform.1042769951" isAbstract="false" osList="all" superClass="ilg.gnuarmeclipse.managedbuild.cross.targetPlatform"/>
-							<builder autoBuildTarget="all" buildPath="${workspace_loc:/Downstream}/Debug" cleanBuildTarget="clean" command="${cross_make}" id="org.eclipse.cdt.build.core.internal.builder.1804403788" incrementalBuildTarget="all" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="CDT Internal Builder" superClass="org.eclipse.cdt.build.core.internal.builder"/>
+							<builder autoBuildTarget="all" buildPath="${workspace_loc:/Downstream}/Debug" cleanBuildTarget="clean" command="${cross_make}" id="org.eclipse.cdt.build.core.internal.builder.1804403788" incrementalBuildTarget="all" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="CDT Internal Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="org.eclipse.cdt.build.core.internal.builder"/>
 							<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler.789837881" name="Cross ARM GNU Assembler" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler">
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor.1524992420" name="Use preprocessor" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor" value="true" valueType="boolean"/>
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.defs.559716966" name="Defined symbols (-D)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.defs" valueType="definedSymbols">
@@ -167,7 +167,7 @@
 							<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"/>
+							<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" parallelBuildOn="true" parallelizationNumber="optimal" 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">
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor.2143421487" name="Use preprocessor" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.usepreprocessor" value="true" valueType="boolean"/>
 								<option id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.defs.1659712048" name="Defined symbols (-D)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.defs" valueType="definedSymbols">
diff --git a/Downstream/Inc/downstream_interface_def.h b/Downstream/Inc/downstream_interface_def.h
index a5cdf56..57ebfcf 100644
--- a/Downstream/Inc/downstream_interface_def.h
+++ b/Downstream/Inc/downstream_interface_def.h
@@ -57,7 +57,7 @@ InterfaceCommandMscTypeDef;
 
 typedef enum
 {
-    COMMAND_HID_REPORT,               //Downstream initiates HID report transfer to Upstream. Upstream just needs to Upstream_ReceivePacket each time.
+    COMMAND_HID_REPORT,               //Returns HID report
 }
 InterfaceCommandHidTypeDef;
 
diff --git a/Downstream/Inc/downstream_statemachine.h b/Downstream/Inc/downstream_statemachine.h
index fbd5874..6e86311 100644
--- a/Downstream/Inc/downstream_statemachine.h
+++ b/Downstream/Inc/downstream_statemachine.h
@@ -33,7 +33,7 @@ typedef enum
     do {                                                \
         USB_Host_Disconnect();                          \
         LED_Fault_SetBlinkRate(LED_FAST_BLINK_RATE);    \
-        DownstreamState = STATE_ERROR;                  \
+        /*DownstreamState = STATE_ERROR;   */               \
         while (1);                                      \
 } while (0);
 
diff --git a/Downstream/Middlewares/ST/STM32_USB_Host_Library/Class/HID/Src/usbh_hid.c b/Downstream/Middlewares/ST/STM32_USB_Host_Library/Class/HID/Src/usbh_hid.c
index be36dfa..19e6bea 100644
--- a/Downstream/Middlewares/ST/STM32_USB_Host_Library/Class/HID/Src/usbh_hid.c
+++ b/Downstream/Middlewares/ST/STM32_USB_Host_Library/Class/HID/Src/usbh_hid.c
@@ -394,7 +394,7 @@ static USBH_StatusTypeDef USBH_HID_Process(USBH_HandleTypeDef *phost)
 
     if (urbStatus == USBH_URB_NOTREADY)
     {
-        HID_Handle->state = HID_IDLE;
+        HID_Handle->state = HID_GET_DATA;
         break;
     }
 
@@ -404,7 +404,7 @@ static USBH_StatusTypeDef USBH_HID_Process(USBH_HandleTypeDef *phost)
       if(USBH_ClrFeature(phost,
                          HID_Handle->ep_addr) == USBH_OK)
       {
-        HID_Handle->state = HID_IDLE;
+        HID_Handle->state = HID_GET_DATA;
       }
     }
     break;
diff --git a/Downstream/Src/downstream_hid.c b/Downstream/Src/downstream_hid.c
index b941663..9dd42dd 100644
--- a/Downstream/Src/downstream_hid.c
+++ b/Downstream/Src/downstream_hid.c
@@ -74,8 +74,7 @@ void Downstream_HID_InterruptReportCallback(DownstreamPacketTypeDef* packetToSen
         return;
     }
 
-
-    Downstream_TransmitPacket(packetToSend);
+    Downstream_PacketProcessor_ClassReply(packetToSend);
 }
 
 
diff --git a/Upstream/Inc/upstream_hid.h b/Upstream/Inc/upstream_hid.h
index c3c0d03..9bc5de7 100644
--- a/Upstream/Inc/upstream_hid.h
+++ b/Upstream/Inc/upstream_hid.h
@@ -15,9 +15,7 @@
 
 
 
-//#include "usbd_def.h"
 #include "stm32f4xx_hal.h"
-#include "upstream_interface_def.h"
 
 
 typedef uint8_t (*UpstreamHidSendReportCallback)(uint8_t *report,
@@ -25,9 +23,8 @@ typedef uint8_t (*UpstreamHidSendReportCallback)(uint8_t *report,
 
 
 
-void Upstream_HID_Init(InterfaceCommandClassTypeDef newClass);
 void Upstream_HID_DeInit(void);
-void Upstream_HID_GetNextReport(UpstreamHidSendReportCallback callback);
+HAL_StatusTypeDef Upstream_HID_GetNextReport(UpstreamHidSendReportCallback callback);
 
 
 
diff --git a/Upstream/Inc/upstream_interface_def.h b/Upstream/Inc/upstream_interface_def.h
index 9f00626..f122887 100644
--- a/Upstream/Inc/upstream_interface_def.h
+++ b/Upstream/Inc/upstream_interface_def.h
@@ -59,7 +59,7 @@ InterfaceCommandMscTypeDef;
 
 typedef enum
 {
-    COMMAND_HID_REPORT,               //Downstream initiates HID report transfer to Upstream. Upstream just needs to Upstream_ReceivePacket each time.
+    COMMAND_HID_REPORT,				//Returns HID report
 }
 InterfaceCommandHidTypeDef;
 
diff --git a/Upstream/Inc/upstream_spi.h b/Upstream/Inc/upstream_spi.h
index b96e00c..7e180c2 100644
--- a/Upstream/Inc/upstream_spi.h
+++ b/Upstream/Inc/upstream_spi.h
@@ -87,8 +87,7 @@ HAL_StatusTypeDef Upstream_ReceivePacket(SpiPacketReceivedCallbackTypeDef callba
 void Upstream_TxOkInterrupt(void);
 void HAL_SPI_TxRxCpltCallback(SPI_HandleTypeDef *hspi);
 void HAL_SPI_ErrorCallback(SPI_HandleTypeDef *hspi);
-void Upstream_SetExpectedReceivedCommand(uint8_t expectedCommandClass,
-                                         uint8_t expectedCommand);
+
 
 
 #endif /* INC_UPSTREAM_SPI_H_ */
diff --git a/Upstream/Inc/upstream_statemachine.h b/Upstream/Inc/upstream_statemachine.h
index c199e66..99b4802 100644
--- a/Upstream/Inc/upstream_statemachine.h
+++ b/Upstream/Inc/upstream_statemachine.h
@@ -14,6 +14,7 @@
 
 
 #include "led.h"
+#include "upstream_interface_def.h"
 
 
 typedef enum
@@ -37,7 +38,7 @@ typedef enum
 
 void Upstream_InitStateMachine(void);
 void Upstream_StateMachine_SetErrorState(void);
-HAL_StatusTypeDef Upstream_StateMachine_CheckClassOperationOk(void);
+InterfaceCommandClassTypeDef Upstream_StateMachine_CheckActiveClass(void);
 void Upstream_StateMachine_DeviceDisconnected(void);
 
 
diff --git a/Upstream/Src/upstream_hid.c b/Upstream/Src/upstream_hid.c
index 2de79ad..56212d6 100644
--- a/Upstream/Src/upstream_hid.c
+++ b/Upstream/Src/upstream_hid.c
@@ -21,7 +21,6 @@
 
 
 
-InterfaceCommandClassTypeDef    ActiveHidClass    = COMMAND_CLASS_INTERFACE;
 UpstreamPacketTypeDef*          UpstreamHidPacket = NULL;
 UpstreamHidSendReportCallback   ReportCallback    = NULL;
 
@@ -31,28 +30,8 @@ void Upstream_HID_GetNextReportReceiveCallback(UpstreamPacketTypeDef* receivedPa
 
 
 
-void Upstream_HID_Init(InterfaceCommandClassTypeDef newClass)
-{
-    if ((newClass != COMMAND_CLASS_HID_MOUSE))          //add classes here
-    {
-        UPSTREAM_SPI_FREAKOUT;
-        return;
-    }
-
-    if ((ActiveHidClass != COMMAND_CLASS_INTERFACE) ||
-        (UpstreamHidPacket != NULL))
-    {
-        UPSTREAM_SPI_FREAKOUT;
-        return;
-    }
-
-    ActiveHidClass = newClass;
-}
-
-
 void Upstream_HID_DeInit(void)
 {
-    ActiveHidClass = COMMAND_CLASS_INTERFACE;
     if (UpstreamHidPacket != NULL)
     {
         Upstream_ReleasePacket(UpstreamHidPacket);
@@ -61,12 +40,17 @@ void Upstream_HID_DeInit(void)
 }
 
 
-void Upstream_HID_GetNextReport(UpstreamHidSendReportCallback callback)
+
+HAL_StatusTypeDef Upstream_HID_GetNextReport(UpstreamHidSendReportCallback callback)
 {
-    if ((ActiveHidClass != COMMAND_CLASS_HID_MOUSE))      //add classes here
+	UpstreamPacketTypeDef* freePacket;
+	InterfaceCommandClassTypeDef activeClass;
+
+	activeClass = Upstream_StateMachine_CheckActiveClass();
+    if ((activeClass != COMMAND_CLASS_HID_MOUSE))      //add classes here
     {
-        UPSTREAM_SPI_FREAKOUT;
-        return;
+        UPSTREAM_STATEMACHINE_FREAKOUT;
+        return HAL_ERROR;
     }
 
     //Release packet used for last transaction (if any)
@@ -78,23 +62,47 @@ void Upstream_HID_GetNextReport(UpstreamHidSendReportCallback callback)
 
     if (ReportCallback != NULL)
     {
-        UPSTREAM_SPI_FREAKOUT;
-        return;
+        UPSTREAM_STATEMACHINE_FREAKOUT;
+        return HAL_ERROR;
     }
     ReportCallback = callback;
 
-    //Get next packet
-    Upstream_SetExpectedReceivedCommand(ActiveHidClass, COMMAND_HID_REPORT);
-    Upstream_ReceivePacket(Upstream_HID_GetNextReportReceiveCallback);
+    freePacket = Upstream_GetFreePacketImmediately();
+    if (freePacket == NULL)
+    {
+        return HAL_ERROR;
+    }
+
+	freePacket->Length16 = UPSTREAM_PACKET_HEADER_LEN_16;
+	freePacket->CommandClass = activeClass;
+	freePacket->Command = COMMAND_HID_REPORT;
+
+	if (Upstream_TransmitPacket(freePacket) == HAL_OK)
+	{
+		return Upstream_ReceivePacket(Upstream_HID_GetNextReportReceiveCallback);
+	}
+
+	//else:
+	Upstream_ReleasePacket(freePacket);
+	return HAL_ERROR;
 }
 
 
+
 void Upstream_HID_GetNextReportReceiveCallback(UpstreamPacketTypeDef* receivedPacket)
 {
     UpstreamHidSendReportCallback tempReportCallback;
+	InterfaceCommandClassTypeDef activeClass;
     uint8_t dataLength = 0;
     uint8_t i;
 
+	activeClass = Upstream_StateMachine_CheckActiveClass();
+    if ((activeClass != COMMAND_CLASS_HID_MOUSE))      //add classes here
+    {
+        UPSTREAM_STATEMACHINE_FREAKOUT;
+        return;
+    }
+
     if ((UpstreamHidPacket != NULL) ||
         (ReportCallback == NULL))
     {
@@ -108,7 +116,7 @@ void Upstream_HID_GetNextReportReceiveCallback(UpstreamPacketTypeDef* receivedPa
     }
 
 
-    if (ActiveHidClass == COMMAND_CLASS_HID_MOUSE)
+    if (activeClass == COMMAND_CLASS_HID_MOUSE)
     {
         if (receivedPacket->Length16 != (UPSTREAM_PACKET_HEADER_LEN_16 + ((HID_MOUSE_DATA_LEN + 1) / 2)))
         {
diff --git a/Upstream/Src/upstream_msc.c b/Upstream/Src/upstream_msc.c
index dd35959..515ee3e 100644
--- a/Upstream/Src/upstream_msc.c
+++ b/Upstream/Src/upstream_msc.c
@@ -41,8 +41,9 @@ static void Upstream_MSC_BeginWriteReplyCallback(UpstreamPacketTypeDef* replyPac
 
 HAL_StatusTypeDef Upstream_MSC_TestReady(UpstreamMSCCallbackTypeDef callback)
 {
-    if (Upstream_StateMachine_CheckClassOperationOk() != HAL_OK)
+    if (Upstream_StateMachine_CheckActiveClass() != COMMAND_CLASS_MASS_STORAGE)
     {
+    	//UPSTREAM_STATEMACHINE_FREAKOUT;
         return HAL_ERROR;
     }
     
@@ -60,7 +61,7 @@ void Upstream_MSC_TestReadyFreePacketCallback(UpstreamPacketTypeDef* freePacket)
 
     if (Upstream_TransmitPacket(freePacket) == HAL_OK)
     {
-        Upstream_ReleasePacket(freePacket);
+        Upstream_ReleasePacket(freePacket);					/////////!!!!!!!!!!!!!???????????
         if (Upstream_ReceivePacket(Upstream_MSC_TestReadyReplyCallback) != HAL_OK)
         {
             TestReadyCallback(HAL_ERROR);
@@ -77,7 +78,7 @@ void Upstream_MSC_TestReadyFreePacketCallback(UpstreamPacketTypeDef* freePacket)
 
 void Upstream_MSC_TestReadyReplyCallback(UpstreamPacketTypeDef* replyPacket)
 {
-    if (Upstream_StateMachine_CheckClassOperationOk() != HAL_OK)
+    if (Upstream_StateMachine_CheckActiveClass() != COMMAND_CLASS_MASS_STORAGE)
     {
         return;
     }
@@ -89,7 +90,7 @@ void Upstream_MSC_TestReadyReplyCallback(UpstreamPacketTypeDef* replyPacket)
     }
 
     if ((replyPacket->Length16 != (UPSTREAM_PACKET_HEADER_LEN_16 + 1)) ||
-        (replyPacket->Data[0] != HAL_OK))
+        (replyPacket->Data[0]  != HAL_OK))
     {
         Upstream_ReleasePacket(replyPacket);
         TestReadyCallback(HAL_ERROR);
@@ -106,7 +107,7 @@ HAL_StatusTypeDef Upstream_MSC_GetCapacity(UpstreamMSCCallbackUintPacketTypeDef
 {
     UpstreamPacketTypeDef* freePacket;
 
-    if (Upstream_StateMachine_CheckClassOperationOk() != HAL_OK)
+    if (Upstream_StateMachine_CheckActiveClass() != COMMAND_CLASS_MASS_STORAGE)
     {
         return HAL_ERROR;
     }
@@ -126,6 +127,7 @@ HAL_StatusTypeDef Upstream_MSC_GetCapacity(UpstreamMSCCallbackUintPacketTypeDef
         return Upstream_ReceivePacket(Upstream_MSC_GetCapacityReplyCallback);
     }
     //else:
+    Upstream_ReleasePacket(freePacket); ////////?????????
     return HAL_ERROR;
 }
 
@@ -135,7 +137,7 @@ void Upstream_MSC_GetCapacityReplyCallback(UpstreamPacketTypeDef* replyPacket)
     uint32_t uint1;
     uint32_t uint2;
 
-    if (Upstream_StateMachine_CheckClassOperationOk() != HAL_OK)
+    if (Upstream_StateMachine_CheckActiveClass() != COMMAND_CLASS_MASS_STORAGE)
     {
         return;
     }
@@ -164,7 +166,7 @@ HAL_StatusTypeDef Upstream_MSC_BeginRead(UpstreamMSCCallbackTypeDef callback,
                                          uint32_t readBlockCount,
                                          uint32_t readByteCount)
 {
-    if (Upstream_StateMachine_CheckClassOperationOk() != HAL_OK)
+    if (Upstream_StateMachine_CheckActiveClass() != COMMAND_CLASS_MASS_STORAGE)
     {
         return HAL_ERROR;
     }
@@ -207,7 +209,7 @@ void Upstream_MSC_BeginReadFreePacketCallback(UpstreamPacketTypeDef* freePacket)
 
 HAL_StatusTypeDef Upstream_MSC_GetStreamDataPacket(UpstreamMSCCallbackPacketTypeDef callback)
 {
-    if (Upstream_StateMachine_CheckClassOperationOk() != HAL_OK)
+    if (Upstream_StateMachine_CheckActiveClass() != COMMAND_CLASS_MASS_STORAGE)
     {
         return HAL_ERROR;
     }
@@ -236,7 +238,7 @@ void Upstream_MSC_GetStreamDataPacketCallback(UpstreamPacketTypeDef* replyPacket
 
     ReadStreamBusy = 0;
 
-    if (Upstream_StateMachine_CheckClassOperationOk() != HAL_OK)
+    if (Upstream_StateMachine_CheckActiveClass() != COMMAND_CLASS_MASS_STORAGE)
     {
         return;
     }
@@ -256,7 +258,7 @@ void Upstream_MSC_GetStreamDataPacketCallback(UpstreamPacketTypeDef* replyPacket
     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->Length16 <= UPSTREAM_PACKET_HEADER_LEN_16) ||            //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.
          (dataLength8 > ByteCount))                                         //No more data than expected transfer length
     {
         GetStreamDataCallback(NULL, 0);
@@ -277,7 +279,7 @@ HAL_StatusTypeDef Upstream_MSC_BeginWrite(UpstreamMSCCallbackTypeDef callback,
                                           uint64_t writeBlockStart,
                                           uint32_t writeBlockCount)
 {
-    if (Upstream_StateMachine_CheckClassOperationOk() != HAL_OK)
+    if (Upstream_StateMachine_CheckActiveClass() != COMMAND_CLASS_MASS_STORAGE)
     {
         return HAL_ERROR;
     }
@@ -318,7 +320,7 @@ void Upstream_MSC_BeginWriteReplyCallback(UpstreamPacketTypeDef* replyPacket)
 {
     uint8_t tempResult;
 
-    if (Upstream_StateMachine_CheckClassOperationOk() != HAL_OK)
+    if (Upstream_StateMachine_CheckActiveClass() != COMMAND_CLASS_MASS_STORAGE)
     {
         return;
     }
@@ -347,7 +349,7 @@ void Upstream_MSC_BeginWriteReplyCallback(UpstreamPacketTypeDef* replyPacket)
 HAL_StatusTypeDef Upstream_MSC_PutStreamDataPacket(UpstreamPacketTypeDef* packetToSend,
                                                    uint32_t dataLength8)
 {
-    if (Upstream_StateMachine_CheckClassOperationOk() != HAL_OK)
+    if (Upstream_StateMachine_CheckActiveClass() != COMMAND_CLASS_MASS_STORAGE)
     {
         return HAL_ERROR;
     }
diff --git a/Upstream/Src/upstream_spi.c b/Upstream/Src/upstream_spi.c
index 25478cd..d3c1b42 100644
--- a/Upstream/Src/upstream_spi.c
+++ b/Upstream/Src/upstream_spi.c
@@ -540,12 +540,4 @@ void HAL_SPI_ErrorCallback(SPI_HandleTypeDef *hspi)
 }
 
 
-//Used by USB interface classes.
-//This is required when Downstream sends a packet without an initiating request from us
-void Upstream_SetExpectedReceivedCommand(uint8_t expectedCommandClass,
-                                         uint8_t expectedCommand)
-{
-    SentCommandClass = expectedCommandClass;
-    SentCommand = expectedCommand;
-}
 
diff --git a/Upstream/Src/upstream_statemachine.c b/Upstream/Src/upstream_statemachine.c
index d43b6c0..1002b53 100644
--- a/Upstream/Src/upstream_statemachine.c
+++ b/Upstream/Src/upstream_statemachine.c
@@ -12,7 +12,6 @@
 
 #include "upstream_statemachine.h"
 #include "upstream_spi.h"
-#include "upstream_interface_def.h"
 #include "usb_device.h"
 #include "usbd_core.h"
 #include "usbd_msc.h"
@@ -76,20 +75,20 @@ void Upstream_StateMachine_SetErrorState(void)
 }
 
 
-HAL_StatusTypeDef Upstream_StateMachine_CheckClassOperationOk(void)
+InterfaceCommandClassTypeDef Upstream_StateMachine_CheckActiveClass(void)
 {
     if (UpstreamState == STATE_ERROR)
     {
-        return HAL_ERROR;
+        return COMMAND_CLASS_ERROR;
     }
 
     if (UpstreamState != STATE_DEVICE_ACTIVE)
     {
         UPSTREAM_STATEMACHINE_FREAKOUT;
-        return HAL_ERROR;
+        return COMMAND_CLASS_INTERFACE;
     }
 
-    return HAL_OK;
+    return ConfiguredDeviceClass;
 }
 
 

From 9918cfcb19cc6876ec27f68c77639daa487b3d07 Mon Sep 17 00:00:00 2001
From: Robert Fisk <robert_fisk@fastmail.fm>
Date: Sat, 16 Apr 2016 01:02:12 +1200
Subject: [PATCH 10/11] Mouse WORKS!11111 ...but only in boot mode, so no
 scroll wheel :(

---
 .../ST/STM32_USB_Host_Library/Class/HID/Src/usbh_hid.c     | 2 +-
 Downstream/Src/downstream_hid.c                            | 7 ++++---
 Upstream/Src/upstream_hid.c                                | 6 +++---
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Downstream/Middlewares/ST/STM32_USB_Host_Library/Class/HID/Src/usbh_hid.c b/Downstream/Middlewares/ST/STM32_USB_Host_Library/Class/HID/Src/usbh_hid.c
index 19e6bea..557cc9f 100644
--- a/Downstream/Middlewares/ST/STM32_USB_Host_Library/Class/HID/Src/usbh_hid.c
+++ b/Downstream/Middlewares/ST/STM32_USB_Host_Library/Class/HID/Src/usbh_hid.c
@@ -614,7 +614,7 @@ USBH_StatusTypeDef USBH_HID_SetProtocol(USBH_HandleTypeDef *phost,
   
   
   phost->Control.setup.b.bRequest = USB_HID_SET_PROTOCOL;
-  phost->Control.setup.b.wValue.w = protocol != 0 ? 0 : 1;
+  phost->Control.setup.b.wValue.w = protocol == 0 ? 0 : 1;
   phost->Control.setup.b.wIndex.w = 0;
   phost->Control.setup.b.wLength.w = 0;
   
diff --git a/Downstream/Src/downstream_hid.c b/Downstream/Src/downstream_hid.c
index 9dd42dd..67dee40 100644
--- a/Downstream/Src/downstream_hid.c
+++ b/Downstream/Src/downstream_hid.c
@@ -17,8 +17,9 @@
 
 
 
-#define HID_MOUSE_DATA_LEN        4
-#define HID_KEYBOARD_DATA_LEN     0
+#define HID_REPORT_DATA_LEN     8
+#define HID_MOUSE_DATA_LEN      3
+#define HID_KEYBOARD_DATA_LEN   0
 
 
 extern USBH_HandleTypeDef hUsbHostFS;                       //Hard-link ourselves to usb_host.c
@@ -32,7 +33,7 @@ InterfaceCommandClassTypeDef Downstream_HID_ApproveConnectedDevice(void)
 
     if (HID_Handle->Protocol == HID_MOUSE_BOOT_CODE)
     {
-        if (HID_Handle->length == 8)
+        if ((HID_Handle->length >= HID_MOUSE_DATA_LEN) && (HID_Handle->length <= HID_REPORT_DATA_LEN))
         {
             return COMMAND_CLASS_HID_MOUSE;
         }
diff --git a/Upstream/Src/upstream_hid.c b/Upstream/Src/upstream_hid.c
index 56212d6..3835fcd 100644
--- a/Upstream/Src/upstream_hid.c
+++ b/Upstream/Src/upstream_hid.c
@@ -17,8 +17,8 @@
 
 
 #define HID_REPORT_DATA_LEN     8
-#define HID_MOUSE_DATA_LEN      4
-
+#define HID_MOUSE_DATA_LEN      3
+#define HID_KEYBOARD_DATA_LEN   0
 
 
 UpstreamPacketTypeDef*          UpstreamHidPacket = NULL;
@@ -138,7 +138,7 @@ void Upstream_HID_GetNextReportReceiveCallback(UpstreamPacketTypeDef* receivedPa
         return;
     }
 
-    for (i = dataLength; i > HID_REPORT_DATA_LEN; i++)
+    for (i = dataLength; i < HID_REPORT_DATA_LEN; i++)
     {
         receivedPacket->Data[i] = 0;            //Zero out unused bytes before we send report upstream
     }

From b08c70fe0291e80c44d6b64be48549a19e3a2fe5 Mon Sep 17 00:00:00 2001
From: Robert Fisk <robert_fisk@fastmail.fm>
Date: Sat, 16 Apr 2016 01:34:31 +1200
Subject: [PATCH 11/11] Fixed bug in Upstream MSC. I have no idea why it worked
 before...

---
 Upstream/Src/upstream_msc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Upstream/Src/upstream_msc.c b/Upstream/Src/upstream_msc.c
index 515ee3e..bf71253 100644
--- a/Upstream/Src/upstream_msc.c
+++ b/Upstream/Src/upstream_msc.c
@@ -61,7 +61,7 @@ void Upstream_MSC_TestReadyFreePacketCallback(UpstreamPacketTypeDef* freePacket)
 
     if (Upstream_TransmitPacket(freePacket) == HAL_OK)
     {
-        Upstream_ReleasePacket(freePacket);					/////////!!!!!!!!!!!!!???????????
+        //Upstream_ReleasePacket(freePacket);					/////////!!!!!!!!!!!!!???????????
         if (Upstream_ReceivePacket(Upstream_MSC_TestReadyReplyCallback) != HAL_OK)
         {
             TestReadyCallback(HAL_ERROR);