diff --git a/Upstream/.cproject b/Upstream/.cproject
new file mode 100644
index 0000000..3494399
--- /dev/null
+++ b/Upstream/.cproject
@@ -0,0 +1,324 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Upstream/.project b/Upstream/.project
new file mode 100644
index 0000000..66a4987
--- /dev/null
+++ b/Upstream/.project
@@ -0,0 +1,26 @@
+
+
+ Upstream
+
+
+
+
+ org.eclipse.cdt.managedbuilder.core.genmakebuilder
+ clean,full,incremental,
+
+
+
+
+ org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder
+ full,incremental,
+
+
+
+
+
+ org.eclipse.cdt.core.cnature
+ org.eclipse.cdt.managedbuilder.core.managedBuildNature
+ org.eclipse.cdt.managedbuilder.core.ScannerConfigNature
+
+
diff --git a/Upstream/.settings/language.settings.xml b/Upstream/.settings/language.settings.xml
new file mode 100644
index 0000000..a15f1bb
--- /dev/null
+++ b/Upstream/.settings/language.settings.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Upstream/.settings/org.eclipse.cdt.managedbuilder.core.prefs b/Upstream/.settings/org.eclipse.cdt.managedbuilder.core.prefs
new file mode 100644
index 0000000..a4974f2
--- /dev/null
+++ b/Upstream/.settings/org.eclipse.cdt.managedbuilder.core.prefs
@@ -0,0 +1,21 @@
+eclipse.preferences.version=1
+environment/buildEnvironmentInclude/ilg.gnuarmeclipse.managedbuild.cross.config.elf.debug.647490853/CPATH/delimiter=\:
+environment/buildEnvironmentInclude/ilg.gnuarmeclipse.managedbuild.cross.config.elf.debug.647490853/CPATH/operation=remove
+environment/buildEnvironmentInclude/ilg.gnuarmeclipse.managedbuild.cross.config.elf.debug.647490853/C_INCLUDE_PATH/delimiter=\:
+environment/buildEnvironmentInclude/ilg.gnuarmeclipse.managedbuild.cross.config.elf.debug.647490853/C_INCLUDE_PATH/operation=remove
+environment/buildEnvironmentInclude/ilg.gnuarmeclipse.managedbuild.cross.config.elf.debug.647490853/append=true
+environment/buildEnvironmentInclude/ilg.gnuarmeclipse.managedbuild.cross.config.elf.debug.647490853/appendContributed=true
+environment/buildEnvironmentInclude/ilg.gnuarmeclipse.managedbuild.cross.config.elf.release.441554085/CPATH/delimiter=\:
+environment/buildEnvironmentInclude/ilg.gnuarmeclipse.managedbuild.cross.config.elf.release.441554085/CPATH/operation=remove
+environment/buildEnvironmentInclude/ilg.gnuarmeclipse.managedbuild.cross.config.elf.release.441554085/C_INCLUDE_PATH/delimiter=\:
+environment/buildEnvironmentInclude/ilg.gnuarmeclipse.managedbuild.cross.config.elf.release.441554085/C_INCLUDE_PATH/operation=remove
+environment/buildEnvironmentInclude/ilg.gnuarmeclipse.managedbuild.cross.config.elf.release.441554085/append=true
+environment/buildEnvironmentInclude/ilg.gnuarmeclipse.managedbuild.cross.config.elf.release.441554085/appendContributed=true
+environment/buildEnvironmentLibrary/ilg.gnuarmeclipse.managedbuild.cross.config.elf.debug.647490853/LIBRARY_PATH/delimiter=\:
+environment/buildEnvironmentLibrary/ilg.gnuarmeclipse.managedbuild.cross.config.elf.debug.647490853/LIBRARY_PATH/operation=remove
+environment/buildEnvironmentLibrary/ilg.gnuarmeclipse.managedbuild.cross.config.elf.debug.647490853/append=true
+environment/buildEnvironmentLibrary/ilg.gnuarmeclipse.managedbuild.cross.config.elf.debug.647490853/appendContributed=true
+environment/buildEnvironmentLibrary/ilg.gnuarmeclipse.managedbuild.cross.config.elf.release.441554085/LIBRARY_PATH/delimiter=\:
+environment/buildEnvironmentLibrary/ilg.gnuarmeclipse.managedbuild.cross.config.elf.release.441554085/LIBRARY_PATH/operation=remove
+environment/buildEnvironmentLibrary/ilg.gnuarmeclipse.managedbuild.cross.config.elf.release.441554085/append=true
+environment/buildEnvironmentLibrary/ilg.gnuarmeclipse.managedbuild.cross.config.elf.release.441554085/appendContributed=true
diff --git a/Upstream/Inc/board_config.h b/Upstream/Inc/board_config.h
new file mode 100644
index 0000000..8e6a04a
--- /dev/null
+++ b/Upstream/Inc/board_config.h
@@ -0,0 +1,61 @@
+/*
+ * board_config.h
+ *
+ * Created on: 25/03/2015
+ * 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_BOARD_CONFIG_H_
+#define INC_BOARD_CONFIG_H_
+
+
+#define BSRR_SHIFT_HIGH 0
+#define BSRR_SHIFT_LOW 16
+
+#define PA_JTMS GPIO_PIN_13
+#define PA_JTCK GPIO_PIN_14
+#define PA_JTDI GPIO_PIN_15
+#define PB_JTDO GPIO_PIN_3
+#define PB_NJTRST GPIO_PIN_4
+
+#define FAULT_LED_PIN GPIO_PIN_13
+#define FAULT_LED_PORT GPIOC
+#define FAULT_LED_ON (FAULT_LED_PORT->BSRR = (FAULT_LED_PIN << BSRR_SHIFT_LOW)) //Fault LED is active-low
+#define FAULT_LED_OFF (FAULT_LED_PORT->BSRR = (FAULT_LED_PIN << BSRR_SHIFT_HIGH))
+
+#define H405_FAULT_LED_PIN GPIO_PIN_12 //Fault LED on Olimex H405 board
+#define H405_FAULT_LED_ON (FAULT_LED_PORT->BSRR = (H405_FAULT_LED_PIN << BSRR_SHIFT_LOW))
+
+#define INT_ACTIVE_PIN GPIO_PIN_5 //Temporary indicator of SPI (or whatever) activity
+#define INT_ACTIVE_PORT GPIOB
+#define INT_ACTIVE_ON INT_ACTIVE_PORT->BSRR = (INT_ACTIVE_PIN << BSRR_SHIFT_HIGH)
+#define INT_ACTIVE_OFF INT_ACTIVE_PORT->BSRR = (INT_ACTIVE_PIN << BSRR_SHIFT_LOW)
+
+#define SPI1_NSS_PIN GPIO_PIN_4
+#define SPI1_NSS_PORT GPIOA
+#define SPI1_NSS_ASSERT SPI1_NSS_PORT->BSRR = (SPI1_NSS_PIN << BSRR_SHIFT_LOW)
+#define SPI1_NSS_DEASSERT SPI1_NSS_PORT->BSRR = (SPI1_NSS_PIN << BSRR_SHIFT_HIGH)
+
+#define DOWNSTREAM_TX_OK_PIN GPIO_PIN_3
+#define DOWNSTREAM_TX_OK_PORT GPIOA
+#define DOWNSTREAM_TX_OK_ACTIVE (!(DOWNSTREAM_TX_OK_PORT->IDR & DOWNSTREAM_TX_OK_PIN))
+
+#define DBGMCU_IDCODE_DEV_ID_405_407_415_417 0x413
+#define DBGMCU_IDCODE_DEV_ID_401xB_xC 0x423
+
+#define BOARD_REV_PIN_MASK 0xE000
+#define BOARD_ID_PIN_MASK 0x1000
+#define BOARD_REV_ID_PORT GPIOB
+
+#define BOARD_REV_1_0_BETA 0
+#define BOARD_REV_1_0_BETA_3 1
+
+#define BOARD_REV_1_0_BETA_FREQ 8
+#define BOARD_REV_1_0_BETA_3_FREQ 16
+
+
+#endif /* INC_BOARD_CONFIG_H_ */
diff --git a/Upstream/Inc/build_config.h b/Upstream/Inc/build_config.h
new file mode 100644
index 0000000..f0a7bd0
--- /dev/null
+++ b/Upstream/Inc/build_config.h
@@ -0,0 +1,79 @@
+/*
+ * build_config.h
+ *
+ * Created on: Jun 20, 2017
+ * 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_BUILD_CONFIG_H_
+#define INC_BUILD_CONFIG_H_
+
+
+#define CONFIG_MASS_STORAGE_ENABLED
+#define CONFIG_MASS_STORAGE_WRITES_PERMITTED
+
+#define CONFIG_KEYBOARD_ENABLED
+#define CONFIG_KEYBOARD_BOT_DETECT_ENABLED
+
+#define CONFIG_MOUSE_ENABLED
+#define CONFIG_MOUSE_BOT_DETECT_ENABLED
+
+#define CONFIG_WRITE_FLASH_TIME_MS 3000 //Enable write LED flashes for the specified length of time
+
+
+
+//Configure keyboard bot detection here:
+#ifdef CONFIG_KEYBOARD_BOT_DETECT_ENABLED
+ //-----------------------------------------------------------
+ //Adjust this threshold first to tune keyboard bot detection. Lower values = more sensitive
+ #define KEYBOARD_BOTDETECT_LOCKOUT_BIN_THRESHOLD 5 //4 is a good setting for the paranoid. 5 is good for the average user who doesn't want to encounter a rare false-positive.
+ //-----------------------------------------------------------
+
+ #define KEYBOARD_BOTDETECT_FAST_BIN_WIDTH_MS 10 //10ms per bin
+ #define KEYBOARD_BOTDETECT_SLOW_BIN_WIDTH_MS 20 //20ms per bin
+ #define KEYBOARD_BOTDETECT_FAST_BIN_COUNT 30 //30 bins at 10ms = 300ms fast coverage
+ #define KEYBOARD_BOTDETECT_SLOW_BIN_COUNT 50 //50 bins at 20ms = 1 sec slow coverage, wrapped
+ #define KEYBOARD_BOTDETECT_FAST_BIN_DRAIN_DIVIDER 2
+ #define KEYBOARD_BOTDETECT_SLOW_BIN_DRAIN_DIVIDER 4
+#endif
+
+
+//Configure mouse bot detection here:
+#ifdef CONFIG_MOUSE_BOT_DETECT_ENABLED
+ #define MOUSE_BOTDETECT_VELOCITY_MULTIPLIER 10
+
+ //Jump detection stuff
+ #define MOUSE_BOTDETECT_JUMP_VELOCITY_THRESHOLD 20 //Varies by mouse. Most short jumps are <= 10 velocity
+ #define MOUSE_BOTDETECT_JUMP_PERIODS 4
+
+ //Constant acceleration detection stuff
+ #define MOUSE_BOTDETECT_CONSTANT_ACCEL_LOCKOUT 300 //Lock when constant acceleration counter reaches this number
+ #define MOUSE_BOTDETECT_CONSTANT_ACCEL_STOP 100 //Block mouse movements when counter is above this value
+ #define MOUSE_BOTDETECT_CONSTANT_ACCEL_CREDIT 100 //Non-constant-acceleration movements can build a credit that will be used before hitting the limits above. Handy for mice or users that exhibit constant velocity characteristics mid-movement.
+ #define MOUSE_BOTDETECT_VELOCITY_RESET_TIMEOUT_MS 3000 //Reset constant acceleration counter when mouse stops for this time
+
+ #define MOUSE_BOTDETECT_VELOCITY_HISTORY_SIZE 12
+ #define MOUSE_BOTDETECT_VELOCITY_MATCH_BASE 256
+ #define MOUSE_BOTDETECT_VELOCITY_MATCH_ERROR 6
+
+ //Jiggle detection stuff
+ #define MOUSE_BOTDETECT_JIGGLE_STOP_PERIODS 10
+ #define MOUSE_BOTDETECT_JIGGLE_BIN_WIDTH_MS 20 //20ms per bin
+ #define MOUSE_BOTDETECT_JIGGLE_BIN_COUNT 50 //50 bins at 20ms = 1 sec coverage, wrapped
+ #define MOUSE_BOTDETECT_JIGGLE_BIN_DIVIDER 3
+ #define MOUSE_BOTDETECT_LOCKOUT_JIGGLE_BIN_THRESHOLD 4
+#endif
+
+
+//Configuration common to all bot detectors
+#if defined CONFIG_KEYBOARD_BOT_DETECT_ENABLED || defined CONFIG_MOUSE_BOT_DETECT_ENABLED
+ #define BOTDETECT_TEMPORARY_LOCKOUT_TIME_MS 4000 //Lock keyboard/mouse for 4 seconds as a first warning
+ #define BOTDETECT_TEMPORARY_LOCKOUT_FLASH_TIME_MS 60000 //Flash fault LED for 60 seconds after warning lockout
+#endif
+
+
+#endif /* INC_BUILD_CONFIG_H_ */
diff --git a/Upstream/Inc/hal_config.h b/Upstream/Inc/hal_config.h
new file mode 100644
index 0000000..b839c5b
--- /dev/null
+++ b/Upstream/Inc/hal_config.h
@@ -0,0 +1,401 @@
+/**
+ ******************************************************************************
+ * @file stm32f4xx_hal_conf.h
+ * @brief HAL configuration file.
+ ******************************************************************************
+ * @attention
+ *
+ * © COPYRIGHT(c) 2015 STMicroelectronics
+#include
+#include
+#include "stm32f4xx.h"
+#include "stm32f4xx_hal.h"
+#include "usbd_def.h"
+
+/** @addtogroup USBD_OTG_DRIVER
+ * @{
+ */
+
+/** @defgroup USBD_CONF
+ * @brief usb otg low level driver configuration file
+ * @{
+ */
+
+/** @defgroup USBD_CONF_Exported_Defines
+ * @{
+ */
+
+/*---------- -----------*/
+#define USBD_MAX_NUM_INTERFACES 1
+/*---------- -----------*/
+#define USBD_MAX_NUM_CONFIGURATION 1
+/*---------- -----------*/
+#define USBD_MAX_STR_DESC_SIZ 512
+/*---------- -----------*/
+#define USBD_SUPPORT_USER_STRING 0
+/*---------- -----------*/
+#define USBD_DEBUG_LEVEL 0
+/*---------- -----------*/
+#define USBD_SELF_POWERED 1
+/*---------- -----------*/
+#define MSC_MEDIA_PACKET 512
+/****************************************/
+/* #define for FS and HS identification */
+#define DEVICE_FS 0
+#define DEVICE_HS 1
+
+/** @defgroup USBD_Exported_Macros
+ * @{
+ */
+
+ /* Memory management macros */
+#define USBD_malloc malloc
+#define USBD_free free
+#define USBD_memset memset
+#define USBD_memcpy memcpy
+
+#define USBD_Delay HAL_Delay
+
+ /* DEBUG macros */
+
+#if (USBD_DEBUG_LEVEL > 0)
+#define USBD_UsrLog(...) printf(__VA_ARGS__);\
+ printf("\n");
+#else
+#define USBD_UsrLog(...)
+#endif
+
+
+#if (USBD_DEBUG_LEVEL > 1)
+
+#define USBD_ErrLog(...) printf("ERROR: ") ;\
+ printf(__VA_ARGS__);\
+ printf("\n");
+#else
+#define USBD_ErrLog(...)
+#endif
+
+
+#if (USBD_DEBUG_LEVEL > 2)
+#define USBD_DbgLog(...) printf("DEBUG : ") ;\
+ printf(__VA_ARGS__);\
+ printf("\n");
+#else
+#define USBD_DbgLog(...)
+#endif
+
+/**
+ * @}
+ */
+
+
+
+/**
+ * @}
+ */
+
+/** @defgroup USBD_CONF_Exported_Types
+ * @{
+ */
+/**
+ * @}
+ */
+
+/** @defgroup USBD_CONF_Exported_Macros
+ * @{
+ */
+/**
+ * @}
+ */
+
+/** @defgroup USBD_CONF_Exported_Variables
+ * @{
+ */
+/**
+ * @}
+ */
+
+/** @defgroup USBD_CONF_Exported_FunctionsPrototype
+ * @{
+ */
+/**
+ * @}
+ */
+
+#endif //__USBD_CONF__H__
+
+/**
+ * @}
+ */
+
+/**
+ * @}
+ */
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/Upstream/Inc/usbd_descriptors.h b/Upstream/Inc/usbd_descriptors.h
new file mode 100644
index 0000000..6b5cf3f
--- /dev/null
+++ b/Upstream/Inc/usbd_descriptors.h
@@ -0,0 +1,103 @@
+/**
+ ******************************************************************************
+ * @file : usbd_desc.h
+ * @date : 03/02/2015 20:26:59
+ * @version : v1.0_Cube
+ * @brief : Header for usbd_desc file.
+ ******************************************************************************
+ * COPYRIGHT(c) 2015 STMicroelectronics
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * 3. Neither the name of STMicroelectronics nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ ******************************************************************************
+*/
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __USBD_DESC__H__
+#define __USBD_DESC__H__
+
+/* Includes ------------------------------------------------------------------*/
+#include "usbd_def.h"
+
+/** @addtogroup STM32_USB_OTG_DEVICE_LIBRARY
+ * @{
+ */
+
+/** @defgroup USB_DESC
+ * @brief general defines for the usb device library file
+ * @{
+ */
+
+/** @defgroup USB_DESC_Exported_Defines
+ * @{
+ */
+
+#define USBD_PID_LOBYTE_OFFSET 0x0A
+#define USBD_PID_HIBYTE_OFFSET 0x0B
+
+/**
+ * @}
+ */
+
+/** @defgroup USBD_DESC_Exported_TypesDefinitions
+ * @{
+ */
+/**
+ * @}
+ */
+
+/** @defgroup USBD_DESC_Exported_Macros
+ * @{
+ */
+/**
+ * @}
+ */
+
+/** @defgroup USBD_DESC_Exported_Variables
+ * @{
+ */
+extern USBD_DescriptorsTypeDef FS_Desc;
+extern uint8_t USBD_FS_DeviceDesc[];
+extern const int8_t STORAGE_Inquirydata_FS[];
+/**
+ * @}
+ */
+
+/** @defgroup USBD_DESC_Exported_FunctionsPrototype
+ * @{
+ */
+
+/**
+ * @}
+ */
+
+#endif /* __USBD_DESC_H */
+
+/**
+ * @}
+ */
+
+/**
+* @}
+*/
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
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
new file mode 100644
index 0000000..fa3e31d
--- /dev/null
+++ b/Upstream/Middlewares/ST/STM32_USB_Device_Library/Class/HID/Inc/usbd_hid.h
@@ -0,0 +1,157 @@
+/**
+ ******************************************************************************
+ * @file usbd_hid.h
+ * @author MCD Application Team
+ * @version V2.4.1
+ * @date 19-June-2015
+ * @brief Header file for the usbd_hid_core.c file.
+ ******************************************************************************
+ * @attention
+ *
+ * © COPYRIGHT 2015 STMicroelectronics © COPYRIGHT 2015 STMicroelectronics © COPYRIGHT 2014 STMicroelectronics
+
+/** @addtogroup USBD_MSC_BOT
+ * @{
+ */
+
+/** @defgroup USBD_MSC
+ * @brief This file is the Header file for usbd_msc.c
+ * @{
+ */
+
+
+/** @defgroup USBD_BOT_Exported_Defines
+ * @{
+ */
+#define MSC_MAX_FS_PACKET 0x40
+#define MSC_MAX_HS_PACKET 0x200
+
+#define BOT_GET_MAX_LUN 0xFE
+#define BOT_RESET 0xFF
+#define USB_MSC_CONFIG_DESC_SIZ 32
+
+
+#define MSC_EPIN_ADDR 0x81
+#define MSC_EPOUT_ADDR 0x01
+
+/**
+ * @}
+ */
+
+/** @defgroup USB_CORE_Exported_Types
+ * @{
+ */
+
+
+typedef struct
+{
+ uint32_t max_lun;
+ uint32_t interface;
+ uint8_t bot_state;
+ uint8_t bot_status;
+ uint16_t bot_data_length;
+ uint8_t* bot_data;
+ UpstreamPacketTypeDef* bot_packet; //Not NULL indicates we currently own an upstream packet buffer, and should free it when we are done.
+ USBD_MSC_BOT_CBWTypeDef cbw;
+ USBD_MSC_BOT_CSWTypeDef csw;
+ HAL_StatusTypeDef last_test_unit_result;
+
+ USBD_SCSI_SenseTypeDef scsi_sense [SENSE_LIST_DEPTH];
+ uint8_t scsi_sense_head;
+ uint8_t scsi_sense_tail;
+
+ uint16_t scsi_blk_size; //LOGICAL BLOCK LENGTH IN BYTES: Number of bytes of user data in a logical block [SBC-4]
+ uint32_t scsi_blk_nbr; //This is total block count = LOGICAL BLOCK ADDRESS + 1. LOGICAL BLOCK ADDRESS: LBA of the last logical block on the direct access block device [SBC-4]
+
+ uint32_t scsi_blk_addr; //LOGICAL BLOCK ADDRESS: Starting with the logical block referenced [SBC-4]
+ uint16_t scsi_blk_len; //TRANSFER LENGTH: Number of contiguous logical blocks of data that shall be read [SBC-4]
+
+}
+USBD_MSC_BOT_HandleTypeDef;
+
+/* Structure for MSC process */
+extern USBD_ClassTypeDef USBD_MSC;
+#define USBD_MSC_CLASS &USBD_MSC
+
+/**
+ * @}
+ */
+
+/**
+ * @}
+ */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __USBD_MSC_H */
+/**
+ * @}
+ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Upstream/Middlewares/ST/STM32_USB_Device_Library/Class/MSC/Inc/usbd_msc_bot.h b/Upstream/Middlewares/ST/STM32_USB_Device_Library/Class/MSC/Inc/usbd_msc_bot.h
new file mode 100644
index 0000000..3a7a1b5
--- /dev/null
+++ b/Upstream/Middlewares/ST/STM32_USB_Device_Library/Class/MSC/Inc/usbd_msc_bot.h
@@ -0,0 +1,156 @@
+/**
+ ******************************************************************************
+ * @file usbd_msc_bot.h
+ * @author MCD Application Team
+ * @version V2.3.0
+ * @date 04-November-2014
+ * @brief Header for the usbd_msc_bot.c file
+ ******************************************************************************
+ * @attention
+ *
+ * © COPYRIGHT 2014 STMicroelectronics © COPYRIGHT 2014 STMicroelectronics
+
+/** @addtogroup STM32_USB_DEVICE_LIBRARY
+ * @{
+ */
+
+/** @defgroup USB_INFO
+ * @brief general defines for the usb device library file
+ * @{
+ */
+
+/** @defgroup USB_INFO_Exported_Defines
+ * @{
+ */
+#define MODE_SENSE6_LEN 8
+#define MODE_SENSE10_LEN 8
+#define LENGTH_INQUIRY_PAGE00 7
+#define LENGTH_FORMAT_CAPACITIES 20
+
+/**
+ * @}
+ */
+
+
+/** @defgroup USBD_INFO_Exported_TypesDefinitions
+ * @{
+ */
+/**
+ * @}
+ */
+
+
+
+/** @defgroup USBD_INFO_Exported_Macros
+ * @{
+ */
+
+/**
+ * @}
+ */
+
+/** @defgroup USBD_INFO_Exported_Variables
+ * @{
+ */
+extern const uint8_t MSC_Page00_Inquiry_Data[];
+extern const uint8_t MSC_Mode_Sense6_data[];
+extern const uint8_t MSC_Mode_Sense10_data[] ;
+
+/**
+ * @}
+ */
+
+/** @defgroup USBD_INFO_Exported_FunctionsPrototype
+ * @{
+ */
+
+/**
+ * @}
+ */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __USBD_MSC_DATA_H */
+
+/**
+ * @}
+ */
+
+/**
+* @}
+*/
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Upstream/Middlewares/ST/STM32_USB_Device_Library/Class/MSC/Inc/usbd_msc_scsi.h b/Upstream/Middlewares/ST/STM32_USB_Device_Library/Class/MSC/Inc/usbd_msc_scsi.h
new file mode 100644
index 0000000..2fc9b01
--- /dev/null
+++ b/Upstream/Middlewares/ST/STM32_USB_Device_Library/Class/MSC/Inc/usbd_msc_scsi.h
@@ -0,0 +1,210 @@
+/**
+ ******************************************************************************
+ * @file usbd_msc_scsi.h
+ * @author MCD Application Team
+ * @version V2.3.0
+ * @date 04-November-2014
+ * @brief Header for the usbd_msc_scsi.c file
+ ******************************************************************************
+ * @attention
+ *
+ * © COPYRIGHT 2014 STMicroelectronics © COPYRIGHT 2014 STMicroelectronics
+#include
+#include "usbd_msc.h"
+#include "build_config.h"
+
+
+#ifdef CONFIG_MASS_STORAGE_ENABLED
+
+/** @addtogroup STM32_USB_DEVICE_LIBRARY
+ * @{
+ */
+
+
+/** @defgroup MSC_CORE
+ * @brief Mass storage core module
+ * @{
+ */
+
+/** @defgroup MSC_CORE_Private_TypesDefinitions
+ * @{
+ */
+/**
+ * @}
+ */
+
+
+/** @defgroup MSC_CORE_Private_Defines
+ * @{
+ */
+
+
+/**
+ * @}
+ */
+
+
+/** @defgroup MSC_CORE_Private_Macros
+ * @{
+ */
+/**
+ * @}
+ */
+
+
+/** @defgroup MSC_CORE_Private_FunctionPrototypes
+ * @{
+ */
+uint8_t USBD_MSC_Init (USBD_HandleTypeDef *pdev,
+ uint8_t cfgidx);
+
+uint8_t USBD_MSC_DeInit (USBD_HandleTypeDef *pdev,
+ uint8_t cfgidx);
+
+uint8_t USBD_MSC_Setup (USBD_HandleTypeDef *pdev,
+ USBD_SetupReqTypedef *req);
+
+uint8_t USBD_MSC_DataIn (USBD_HandleTypeDef *pdev,
+ uint8_t epnum);
+
+
+uint8_t USBD_MSC_DataOut (USBD_HandleTypeDef *pdev,
+ uint8_t epnum);
+
+uint8_t *USBD_MSC_GetHSCfgDesc (uint16_t *length);
+
+uint8_t *USBD_MSC_GetFSCfgDesc (uint16_t *length);
+
+uint8_t *USBD_MSC_GetOtherSpeedCfgDesc (uint16_t *length);
+
+uint8_t *USBD_MSC_GetDeviceQualifierDescriptor (uint16_t *length);
+
+uint8_t USBD_MSC_BufferFreed(USBD_HandleTypeDef *pdev);
+
+
+/**
+ * @}
+ */
+
+
+/** @defgroup MSC_CORE_Private_Variables
+ * @{
+ */
+
+
+#define USBD_PID_MSC 0x0001
+
+
+
+USBD_ClassTypeDef USBD_MSC =
+{
+ USBD_MSC_Init,
+ USBD_MSC_DeInit,
+ USBD_MSC_Setup,
+ NULL, /*EP0_TxSent*/
+ NULL, /*EP0_RxReady*/
+ USBD_MSC_DataIn,
+ USBD_MSC_DataOut,
+ NULL, /*SOF */
+ NULL,
+ NULL,
+ USBD_MSC_BufferFreed,
+ USBD_MSC_GetHSCfgDesc,
+ USBD_MSC_GetFSCfgDesc,
+ USBD_MSC_GetOtherSpeedCfgDesc,
+ USBD_MSC_GetDeviceQualifierDescriptor,
+ USBD_PID_MSC
+};
+
+/* USB Mass storage device Configuration Descriptor */
+/* All Descriptors (Configuration, Interface, Endpoint, Class, Vendor */
+__ALIGN_BEGIN uint8_t USBD_MSC_CfgHSDesc[USB_MSC_CONFIG_DESC_SIZ] __ALIGN_END =
+{
+
+ 0x09, /* bLength: Configuation Descriptor size */
+ USB_DESC_TYPE_CONFIGURATION, /* bDescriptorType: Configuration */
+ USB_MSC_CONFIG_DESC_SIZ,
+
+ 0x00,
+ 0x01, /* bNumInterfaces: 1 interface */
+ 0x01, /* bConfigurationValue: */
+ 0x04, /* iConfiguration: */
+ 0xC0, /* bmAttributes: */
+ 0xFA, /* MaxPower 500 mA */
+
+ /******************** Mass Storage interface ********************/
+ 0x09, /* bLength: Interface Descriptor size */
+ 0x04, /* bDescriptorType: */
+ 0x00, /* bInterfaceNumber: Number of Interface */
+ 0x00, /* bAlternateSetting: Alternate setting */
+ 0x02, /* bNumEndpoints*/
+ 0x08, /* bInterfaceClass: MSC Class */
+ 0x06, /* bInterfaceSubClass : SCSI transparent*/
+ 0x50, /* nInterfaceProtocol */
+ 0x05, /* iInterface: */
+ /******************** Mass Storage Endpoints ********************/
+ 0x07, /*Endpoint descriptor length = 7*/
+ 0x05, /*Endpoint descriptor type */
+ MSC_EPIN_ADDR, /*Endpoint address (IN, address 1) */
+ 0x02, /*Bulk endpoint type */
+ LOBYTE(MSC_MAX_HS_PACKET),
+ HIBYTE(MSC_MAX_HS_PACKET),
+ 0x00, /*Polling interval in milliseconds */
+
+ 0x07, /*Endpoint descriptor length = 7 */
+ 0x05, /*Endpoint descriptor type */
+ MSC_EPOUT_ADDR, /*Endpoint address (OUT, address 1) */
+ 0x02, /*Bulk endpoint type */
+ LOBYTE(MSC_MAX_HS_PACKET),
+ HIBYTE(MSC_MAX_HS_PACKET),
+ 0x00 /*Polling interval in milliseconds*/
+};
+
+/* USB Mass storage device Configuration Descriptor */
+/* All Descriptors (Configuration, Interface, Endpoint, Class, Vendor */
+__ALIGN_BEGIN uint8_t USBD_MSC_CfgFSDesc[USB_MSC_CONFIG_DESC_SIZ] __ALIGN_END =
+{
+
+ 0x09, /* bLength: Configuation Descriptor size */
+ USB_DESC_TYPE_CONFIGURATION, /* bDescriptorType: Configuration */
+ USB_MSC_CONFIG_DESC_SIZ,
+
+ 0x00,
+ 0x01, /* bNumInterfaces: 1 interface */
+ 0x01, /* bConfigurationValue: */
+ 0x04, /* iConfiguration: */
+ 0xC0, /* bmAttributes: */
+ 0x32, /* MaxPower 100 mA */
+
+ /******************** Mass Storage interface ********************/
+ 0x09, /* bLength: Interface Descriptor size */
+ 0x04, /* bDescriptorType: */
+ 0x00, /* bInterfaceNumber: Number of Interface */
+ 0x00, /* bAlternateSetting: Alternate setting */
+ 0x02, /* bNumEndpoints*/
+ 0x08, /* bInterfaceClass: MSC Class */
+ 0x06, /* bInterfaceSubClass : SCSI transparent*/
+ 0x50, /* nInterfaceProtocol */
+ 0x05, /* iInterface: */
+ /******************** Mass Storage Endpoints ********************/
+ 0x07, /*Endpoint descriptor length = 7*/
+ 0x05, /*Endpoint descriptor type */
+ MSC_EPIN_ADDR, /*Endpoint address (IN, address 1) */
+ 0x02, /*Bulk endpoint type */
+ LOBYTE(MSC_MAX_FS_PACKET),
+ HIBYTE(MSC_MAX_FS_PACKET),
+ 0x00, /*Polling interval in milliseconds */
+
+ 0x07, /*Endpoint descriptor length = 7 */
+ 0x05, /*Endpoint descriptor type */
+ MSC_EPOUT_ADDR, /*Endpoint address (OUT, address 1) */
+ 0x02, /*Bulk endpoint type */
+ LOBYTE(MSC_MAX_FS_PACKET),
+ HIBYTE(MSC_MAX_FS_PACKET),
+ 0x00 /*Polling interval in milliseconds*/
+};
+
+__ALIGN_BEGIN uint8_t USBD_MSC_OtherSpeedCfgDesc[USB_MSC_CONFIG_DESC_SIZ] __ALIGN_END =
+{
+
+ 0x09, /* bLength: Configuration Descriptor size */
+ USB_DESC_TYPE_OTHER_SPEED_CONFIGURATION,
+ USB_MSC_CONFIG_DESC_SIZ,
+
+ 0x00,
+ 0x01, /* bNumInterfaces: 1 interface */
+ 0x01, /* bConfigurationValue: */
+ 0x04, /* iConfiguration: */
+ 0xC0, /* bmAttributes: */
+ 0x32, /* MaxPower 100 mA */
+
+ /******************** Mass Storage interface ********************/
+ 0x09, /* bLength: Interface Descriptor size */
+ 0x04, /* bDescriptorType: */
+ 0x00, /* bInterfaceNumber: Number of Interface */
+ 0x00, /* bAlternateSetting: Alternate setting */
+ 0x02, /* bNumEndpoints*/
+ 0x08, /* bInterfaceClass: MSC Class */
+ 0x06, /* bInterfaceSubClass : SCSI transparent command set*/
+ 0x50, /* nInterfaceProtocol */
+ 0x05, /* iInterface: */
+ /******************** Mass Storage Endpoints ********************/
+ 0x07, /*Endpoint descriptor length = 7*/
+ 0x05, /*Endpoint descriptor type */
+ MSC_EPIN_ADDR, /*Endpoint address (IN, address 1) */
+ 0x02, /*Bulk endpoint type */
+ 0x40,
+ 0x00,
+ 0x00, /*Polling interval in milliseconds */
+
+ 0x07, /*Endpoint descriptor length = 7 */
+ 0x05, /*Endpoint descriptor type */
+ MSC_EPOUT_ADDR, /*Endpoint address (OUT, address 1) */
+ 0x02, /*Bulk endpoint type */
+ 0x40,
+ 0x00,
+ 0x00 /*Polling interval in milliseconds*/
+};
+
+/* USB Standard Device Descriptor */
+__ALIGN_BEGIN uint8_t USBD_MSC_DeviceQualifierDesc[USB_LEN_DEV_QUALIFIER_DESC] __ALIGN_END =
+{
+ USB_LEN_DEV_QUALIFIER_DESC,
+ USB_DESC_TYPE_DEVICE_QUALIFIER,
+ 0x00,
+ 0x02,
+ 0x00,
+ 0x00,
+ 0x00,
+ MSC_MAX_FS_PACKET,
+ 0x01,
+ 0x00,
+};
+/**
+ * @}
+ */
+
+
+/** @defgroup MSC_CORE_Private_Functions
+ * @{
+ */
+
+/**
+ * @brief USBD_MSC_Init
+ * Initialize the mass storage configuration
+ * @param pdev: device instance
+ * @param cfgidx: configuration index
+ * @retval status
+ */
+uint8_t USBD_MSC_Init (USBD_HandleTypeDef *pdev,
+ uint8_t cfgidx)
+{
+ int16_t ret = 0;
+
+ if(pdev->dev_speed == USBD_SPEED_HIGH )
+ {
+ /* Open EP OUT */
+ USBD_LL_OpenEP(pdev,
+ MSC_EPOUT_ADDR,
+ USBD_EP_TYPE_BULK,
+ MSC_MAX_HS_PACKET);
+
+ /* Open EP IN */
+ USBD_LL_OpenEP(pdev,
+ MSC_EPIN_ADDR,
+ USBD_EP_TYPE_BULK,
+ MSC_MAX_HS_PACKET);
+ }
+ else
+ {
+ /* Open EP OUT */
+ USBD_LL_OpenEP(pdev,
+ MSC_EPOUT_ADDR,
+ USBD_EP_TYPE_BULK,
+ MSC_MAX_FS_PACKET);
+
+ /* Open EP IN */
+ USBD_LL_OpenEP(pdev,
+ MSC_EPIN_ADDR,
+ USBD_EP_TYPE_BULK,
+ MSC_MAX_FS_PACKET);
+ }
+ pdev->pClassData = USBD_malloc(sizeof (USBD_MSC_BOT_HandleTypeDef));
+
+ if(pdev->pClassData == NULL)
+ {
+ ret = 1;
+ }
+ else
+ {
+ /* Init the BOT layer */
+ MSC_BOT_Init(pdev);
+ ret = 0;
+ }
+
+ return ret;
+}
+
+/**
+ * @brief USBD_MSC_DeInit
+ * DeInitilaize the mass storage configuration
+ * @param pdev: device instance
+ * @param cfgidx: configuration index
+ * @retval status
+ */
+uint8_t USBD_MSC_DeInit (USBD_HandleTypeDef *pdev,
+ uint8_t cfgidx)
+{
+ /* Close MSC EPs */
+ USBD_LL_CloseEP(pdev,
+ MSC_EPOUT_ADDR);
+
+ /* Open EP IN */
+ USBD_LL_CloseEP(pdev,
+ MSC_EPIN_ADDR);
+
+ if(pdev->pClassData != NULL)
+ {
+ /* De-Init the BOT layer */
+ MSC_BOT_DeInit(pdev);
+
+ /* Free MSC Class Resources */
+ USBD_free(pdev->pClassData);
+ pdev->pClassData = NULL;
+ }
+ return 0;
+}
+/**
+* @brief USBD_MSC_Setup
+* Handle the MSC specific requests
+* @param pdev: device instance
+* @param req: USB request
+* @retval status
+*/
+uint8_t USBD_MSC_Setup (USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req)
+{
+ USBD_MSC_BOT_HandleTypeDef *hmsc = (USBD_MSC_BOT_HandleTypeDef*) pdev->pClassData;
+
+ switch (req->bmRequest & USB_REQ_TYPE_MASK)
+ {
+
+ /* Class request */
+ case USB_REQ_TYPE_CLASS :
+ switch (req->bRequest)
+ {
+ case BOT_GET_MAX_LUN :
+
+ if((req->wValue == 0) &&
+ (req->wLength == 1) &&
+ ((req->bmRequest & 0x80) == 0x80))
+ {
+ hmsc->max_lun = (UPSTREAM_LUN_NBR - 1);
+ USBD_CtlSendData (pdev,
+ (uint8_t *)&hmsc->max_lun,
+ 1);
+ }
+ else
+ {
+ USBD_CtlError(pdev , req);
+ return USBD_FAIL;
+ }
+ break;
+
+ case BOT_RESET :
+ if((req->wValue == 0) &&
+ (req->wLength == 0) &&
+ ((req->bmRequest & 0x80) != 0x80))
+ {
+ MSC_BOT_Reset(pdev);
+ }
+ else
+ {
+ USBD_CtlError(pdev , req);
+ return USBD_FAIL;
+ }
+ break;
+
+ default:
+ USBD_CtlError(pdev , req);
+ return USBD_FAIL;
+ }
+ break;
+ /* Interface & Endpoint request */
+ case USB_REQ_TYPE_STANDARD:
+ switch (req->bRequest)
+ {
+ case USB_REQ_GET_INTERFACE :
+ USBD_CtlSendData (pdev,
+ (uint8_t *)&hmsc->interface,
+ 1);
+ break;
+
+ case USB_REQ_SET_INTERFACE :
+ hmsc->interface = (uint8_t)(req->wValue);
+ break;
+
+ case USB_REQ_CLEAR_FEATURE:
+
+ /* Flush the FIFO and Clear the stall status */
+ USBD_LL_FlushEP(pdev, (uint8_t)req->wIndex);
+
+ /* Reactivate the EP */
+ USBD_LL_CloseEP (pdev , (uint8_t)req->wIndex);
+ if((((uint8_t)req->wIndex) & 0x80) == 0x80)
+ {
+ if(pdev->dev_speed == USBD_SPEED_HIGH )
+ {
+ /* Open EP IN */
+ USBD_LL_OpenEP(pdev,
+ MSC_EPIN_ADDR,
+ USBD_EP_TYPE_BULK,
+ MSC_MAX_HS_PACKET);
+ }
+ else
+ {
+ /* Open EP IN */
+ USBD_LL_OpenEP(pdev,
+ MSC_EPIN_ADDR,
+ USBD_EP_TYPE_BULK,
+ MSC_MAX_FS_PACKET);
+ }
+ }
+ else
+ {
+ if(pdev->dev_speed == USBD_SPEED_HIGH )
+ {
+ /* Open EP IN */
+ USBD_LL_OpenEP(pdev,
+ MSC_EPOUT_ADDR,
+ USBD_EP_TYPE_BULK,
+ MSC_MAX_HS_PACKET);
+ }
+ else
+ {
+ /* Open EP IN */
+ USBD_LL_OpenEP(pdev,
+ MSC_EPOUT_ADDR,
+ USBD_EP_TYPE_BULK,
+ MSC_MAX_FS_PACKET);
+ }
+ }
+
+ /* Handle BOT error */
+ MSC_BOT_CplClrFeature(pdev, (uint8_t)req->wIndex);
+ break;
+
+ }
+ break;
+
+ default:
+ break;
+ }
+ return 0;
+}
+
+/**
+* @brief USBD_MSC_DataIn
+* handle data IN Stage
+* @param pdev: device instance
+* @param epnum: endpoint index
+* @retval status
+*/
+uint8_t USBD_MSC_DataIn (USBD_HandleTypeDef *pdev,
+ uint8_t epnum)
+{
+ MSC_BOT_DataIn(pdev , epnum);
+ return 0;
+}
+
+/**
+* @brief USBD_MSC_DataOut
+* handle data OUT Stage
+* @param pdev: device instance
+* @param epnum: endpoint index
+* @retval status
+*/
+uint8_t USBD_MSC_DataOut (USBD_HandleTypeDef *pdev,
+ uint8_t epnum)
+{
+ MSC_BOT_DataOut(pdev , epnum);
+ return 0;
+}
+
+
+uint8_t USBD_MSC_BufferFreed(USBD_HandleTypeDef *pdev)
+{
+ if (((USBD_MSC_BOT_HandleTypeDef*)pdev->pClassData) != NULL)
+ {
+ if (((USBD_MSC_BOT_HandleTypeDef*)pdev->pClassData)->bot_packet != NULL)
+ {
+ Upstream_ReleasePacket(((USBD_MSC_BOT_HandleTypeDef*)pdev->pClassData)->bot_packet);
+ ((USBD_MSC_BOT_HandleTypeDef*)pdev->pClassData)->bot_packet = NULL;
+ }
+ }
+ return 0;
+}
+
+
+/**
+* @brief USBD_MSC_GetHSCfgDesc
+* return configuration descriptor
+* @param length : pointer data length
+* @retval pointer to descriptor buffer
+*/
+uint8_t *USBD_MSC_GetHSCfgDesc (uint16_t *length)
+{
+ *length = sizeof (USBD_MSC_CfgHSDesc);
+ return USBD_MSC_CfgHSDesc;
+}
+
+/**
+* @brief USBD_MSC_GetFSCfgDesc
+* return configuration descriptor
+* @param length : pointer data length
+* @retval pointer to descriptor buffer
+*/
+uint8_t *USBD_MSC_GetFSCfgDesc (uint16_t *length)
+{
+ *length = sizeof (USBD_MSC_CfgFSDesc);
+ return USBD_MSC_CfgFSDesc;
+}
+
+/**
+* @brief USBD_MSC_GetOtherSpeedCfgDesc
+* return other speed configuration descriptor
+* @param length : pointer data length
+* @retval pointer to descriptor buffer
+*/
+uint8_t *USBD_MSC_GetOtherSpeedCfgDesc (uint16_t *length)
+{
+ *length = sizeof (USBD_MSC_OtherSpeedCfgDesc);
+ return USBD_MSC_OtherSpeedCfgDesc;
+}
+/**
+* @brief DeviceQualifierDescriptor
+* return Device Qualifier descriptor
+* @param length : pointer data length
+* @retval pointer to descriptor buffer
+*/
+uint8_t *USBD_MSC_GetDeviceQualifierDescriptor (uint16_t *length)
+{
+ *length = sizeof (USBD_MSC_DeviceQualifierDesc);
+ return USBD_MSC_DeviceQualifierDesc;
+}
+
+#endif //#ifdef CONFIG_MASS_STORAGE_ENABLED
+
+
+/**
+ * @}
+ */
+
+
+/**
+ * @}
+ */
+
+
+/**
+ * @}
+ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Upstream/Middlewares/ST/STM32_USB_Device_Library/Class/MSC/Src/usbd_msc_bot.c b/Upstream/Middlewares/ST/STM32_USB_Device_Library/Class/MSC/Src/usbd_msc_bot.c
new file mode 100644
index 0000000..5a225ff
--- /dev/null
+++ b/Upstream/Middlewares/ST/STM32_USB_Device_Library/Class/MSC/Src/usbd_msc_bot.c
@@ -0,0 +1,450 @@
+/**
+ ******************************************************************************
+ * @file usbd_msc_bot.c
+ * @author MCD Application Team
+ * @version V2.3.0
+ * @date 04-November-2014
+ * @brief This file provides all the BOT protocol core functions.
+ ******************************************************************************
+ * @attention
+ *
+ * © COPYRIGHT 2014 STMicroelectronics © COPYRIGHT 2014 STMicroelectronics © COPYRIGHT 2014 STMicroelectronics
+#include
+#include
+#include "usbd_msc_bot.h"
+#include "usbd_msc_scsi.h"
+#include "usbd_msc.h"
+#include "usbd_msc_data.h"
+#include "usbd_descriptors.h"
+#include "build_config.h"
+
+
+#ifdef CONFIG_MASS_STORAGE_ENABLED
+
+/** @addtogroup STM32_USB_DEVICE_LIBRARY
+ * @{
+ */
+
+
+/** @defgroup MSC_SCSI
+ * @brief Mass storage SCSI layer module
+ * @{
+ */
+
+/** @defgroup MSC_SCSI_Private_TypesDefinitions
+ * @{
+ */
+/**
+ * @}
+ */
+
+
+/** @defgroup MSC_SCSI_Private_Defines
+ * @{
+ */
+
+/**
+ * @}
+ */
+
+
+/** @defgroup MSC_SCSI_Private_Macros
+ * @{
+ */
+/**
+ * @}
+ */
+
+
+/** @defgroup MSC_SCSI_Private_Variables
+ * @{
+ */
+
+USBD_HandleTypeDef *SCSI_ProcessCmd_pdev;
+uint8_t SCSI_ProcessCmd_lun;
+uint8_t *SCSI_ProcessCmd_params;
+SCSI_ProcessCmdCallbackTypeDef SCSI_ProcessCmd_callback;
+USBD_MSC_BOT_HandleTypeDef *SCSI_ProcessCmd_hmsc;
+
+
+/**
+ * @}
+ */
+
+
+/** @defgroup MSC_SCSI_Private_FunctionPrototypes
+ * @{
+ */
+static void SCSI_TestUnitReady(void);
+static void SCSI_Inquiry(void);
+static void SCSI_ReadFormatCapacity(void);
+static void SCSI_ReadCapacity10(void);
+static void SCSI_RequestSense (void);
+static void SCSI_StartStopUnit(void);
+static void SCSI_AllowMediumRemoval(void);
+static void SCSI_ModeSense6 (void);
+static void SCSI_ModeSense10 (void);
+static void SCSI_Write10(void);
+static void SCSI_Read10(void);
+static void SCSI_Verify10(void);
+static int8_t SCSI_CheckAddressRange (uint32_t blk_offset , uint16_t blk_nbr);
+
+static void SCSI_TestUnitReadyCallback(HAL_StatusTypeDef result);
+static void SCSI_ReadCapacity10Callback(UpstreamPacketTypeDef* upstreamPacket,
+ uint32_t result_uint1,
+ uint32_t result_uint2);
+static void SCSI_ReadFormatCapacityCallback(UpstreamPacketTypeDef* upstreamPacket,
+ uint32_t result_uint1,
+ uint32_t result_uint2);
+static void SCSI_Read10BeginCallback(HAL_StatusTypeDef result);
+static void SCSI_Read10ReplyCallback(UpstreamPacketTypeDef* upstreamPacket,
+ uint16_t dataLength);
+static void SCSI_Write10BeginCallback(HAL_StatusTypeDef result);
+static void SCSI_Write10FreePacketCallback(UpstreamPacketTypeDef* freePacket);
+static void SCSI_StartStopUnitCallback(HAL_StatusTypeDef result);
+static void SCSI_ModeSense6_FreePacketCallback(UpstreamPacketTypeDef* freePacket);
+static void SCSI_ModeSense10_FreePacketCallback(UpstreamPacketTypeDef* freePacket);
+
+
+/**
+ * @}
+ */
+
+
+/** @defgroup MSC_SCSI_Private_Functions
+ * @{
+ */
+
+
+/**
+* @brief SCSI_ProcessCmd
+* Process SCSI commands
+* @param pdev: device instance
+* @param lun: Logical unit number
+* @param params: Command parameters
+* @retval status
+*/
+void SCSI_ProcessCmd(USBD_HandleTypeDef *pdev,
+ uint8_t lun,
+ uint8_t *params,
+ SCSI_ProcessCmdCallbackTypeDef callback)
+{
+ //Save all our parameters for easy access in callback routines
+ SCSI_ProcessCmd_pdev = pdev;
+ SCSI_ProcessCmd_params = params;
+ SCSI_ProcessCmd_lun = lun;
+ SCSI_ProcessCmd_callback = callback;
+ SCSI_ProcessCmd_hmsc = (USBD_MSC_BOT_HandleTypeDef*)pdev->pClassData;
+
+ switch (params[0])
+ {
+ case SCSI_TEST_UNIT_READY:
+ SCSI_TestUnitReady();
+ return;
+
+ case SCSI_REQUEST_SENSE:
+ SCSI_RequestSense();
+ return;
+
+ case SCSI_INQUIRY:
+ SCSI_Inquiry();
+ return;
+
+ case SCSI_START_STOP_UNIT:
+ SCSI_StartStopUnit();
+ return;
+
+ case SCSI_ALLOW_MEDIUM_REMOVAL:
+ SCSI_AllowMediumRemoval();
+ return;
+
+ case SCSI_MODE_SENSE6:
+ SCSI_ModeSense6();
+ return;
+
+ case SCSI_MODE_SENSE10:
+ SCSI_ModeSense10();
+ return;
+
+ case SCSI_READ_FORMAT_CAPACITIES:
+ SCSI_ReadFormatCapacity();
+ return;
+
+ case SCSI_READ_CAPACITY10:
+ SCSI_ReadCapacity10();
+ return;
+
+ case SCSI_READ10:
+ SCSI_Read10();
+ return;
+
+ case SCSI_WRITE10:
+#ifdef CONFIG_MASS_STORAGE_WRITES_PERMITTED
+ SCSI_Write10();
+#else
+ SCSI_SenseCode(pdev,
+ lun,
+ DATA_PROTECT,
+ WRITE_PROTECTED);
+ SCSI_ProcessCmd_callback(-1);
+#endif
+ return;
+
+ case SCSI_VERIFY10:
+ SCSI_Verify10();
+ return;
+
+ default:
+ SCSI_SenseCode(pdev,
+ lun,
+ ILLEGAL_REQUEST,
+ INVALID_CDB);
+ SCSI_ProcessCmd_callback(-1);
+ }
+}
+
+
+/**
+* @brief SCSI_TestUnitReady
+* Process SCSI Test Unit Ready Command
+* @param lun: Logical unit number
+* @param params: Command parameters
+* @retval status
+*/
+static void SCSI_TestUnitReady(void)
+{
+ /* case 9 : Hi > D0 */
+ if (SCSI_ProcessCmd_hmsc->cbw.dDataLength != 0)
+ {
+ SCSI_SenseCode(SCSI_ProcessCmd_pdev,
+ SCSI_ProcessCmd_lun,
+ ILLEGAL_REQUEST,
+ INVALID_CDB);
+ SCSI_ProcessCmd_callback(-1);
+ return;
+ }
+
+ if (SCSI_ProcessCmd_lun >= UPSTREAM_LUN_NBR)
+ {
+ SCSI_TestUnitReadyCallback(HAL_ERROR);
+ return;
+ }
+
+ if (Upstream_MSC_TestReady(SCSI_TestUnitReadyCallback) != HAL_OK)
+ {
+ SCSI_TestUnitReadyCallback(HAL_ERROR);
+ }
+}
+
+
+static void SCSI_TestUnitReadyCallback(HAL_StatusTypeDef result)
+{
+ SCSI_ProcessCmd_hmsc->last_test_unit_result = result;
+
+ if (result != HAL_OK)
+ {
+ SCSI_SenseCode(SCSI_ProcessCmd_pdev,
+ SCSI_ProcessCmd_lun,
+ NOT_READY,
+ MEDIUM_NOT_PRESENT);
+ SCSI_ProcessCmd_hmsc->bot_state = USBD_BOT_NO_DATA;
+ SCSI_ProcessCmd_callback(-1);
+ return;
+ }
+
+ //Success!
+ SCSI_ProcessCmd_hmsc->bot_data_length = 0;
+ SCSI_ProcessCmd_callback(0);
+}
+
+
+
+
+/**
+* @brief SCSI_Inquiry
+* Process Inquiry command
+* @param lun: Logical unit number
+* @param params: Command parameters
+* @retval status
+*/
+static void SCSI_Inquiry(void)
+{
+ uint8_t* pPage;
+ uint16_t len;
+ UpstreamPacketTypeDef* freePacket;
+
+ freePacket = Upstream_GetFreePacketImmediately();
+ SCSI_ProcessCmd_hmsc->bot_packet = freePacket;
+ SCSI_ProcessCmd_hmsc->bot_data = freePacket->Data;
+
+ if (SCSI_ProcessCmd_params[1] & 0x01)/*Evpd is set*/
+ {
+ pPage = (uint8_t *)MSC_Page00_Inquiry_Data;
+ len = LENGTH_INQUIRY_PAGE00;
+ }
+ else
+ {
+ //Standard INQUIRY data
+ //Return the same info for any LUN requested
+ pPage = (uint8_t *)&STORAGE_Inquirydata_FS;
+ len = pPage[4] + 5;
+
+ if (SCSI_ProcessCmd_params[4] <= len)
+ {
+ len = SCSI_ProcessCmd_params[4];
+ }
+ }
+ SCSI_ProcessCmd_hmsc->bot_data_length = len;
+
+ while (len)
+ {
+ len--;
+ SCSI_ProcessCmd_hmsc->bot_data[len] = pPage[len];
+ }
+ SCSI_ProcessCmd_callback(0);
+}
+
+/**
+* @brief SCSI_ReadCapacity10
+* Process Read Capacity 10 command
+* @param lun: Logical unit number
+* @param params: Command parameters
+* @retval status
+*/
+static void SCSI_ReadCapacity10(void)
+{
+ if (Upstream_MSC_GetCapacity(SCSI_ReadCapacity10Callback) != HAL_OK)
+ {
+ SCSI_ReadCapacity10Callback(NULL, 0, 0);
+ }
+}
+
+
+void SCSI_ReadCapacity10Callback(UpstreamPacketTypeDef* upstreamPacket,
+ uint32_t result_uint1,
+ uint32_t result_uint2)
+{
+ if (upstreamPacket == NULL)
+ {
+ SCSI_SenseCode(SCSI_ProcessCmd_pdev,
+ SCSI_ProcessCmd_lun,
+ NOT_READY,
+ MEDIUM_NOT_PRESENT);
+ SCSI_ProcessCmd_callback(-1);
+ return;
+ }
+
+ SCSI_ProcessCmd_hmsc->bot_packet = upstreamPacket;
+ SCSI_ProcessCmd_hmsc->bot_data = upstreamPacket->Data;
+
+ SCSI_ProcessCmd_hmsc->scsi_blk_nbr = result_uint1;
+ SCSI_ProcessCmd_hmsc->scsi_blk_size = result_uint2;
+
+ SCSI_ProcessCmd_hmsc->bot_data[0] = (uint8_t)((SCSI_ProcessCmd_hmsc->scsi_blk_nbr - 1) >> 24);
+ SCSI_ProcessCmd_hmsc->bot_data[1] = (uint8_t)((SCSI_ProcessCmd_hmsc->scsi_blk_nbr - 1) >> 16);
+ SCSI_ProcessCmd_hmsc->bot_data[2] = (uint8_t)((SCSI_ProcessCmd_hmsc->scsi_blk_nbr - 1) >> 8);
+ SCSI_ProcessCmd_hmsc->bot_data[3] = (uint8_t)(SCSI_ProcessCmd_hmsc->scsi_blk_nbr - 1);
+
+ SCSI_ProcessCmd_hmsc->bot_data[4] = (uint8_t)(SCSI_ProcessCmd_hmsc->scsi_blk_size >> 24);
+ SCSI_ProcessCmd_hmsc->bot_data[5] = (uint8_t)(SCSI_ProcessCmd_hmsc->scsi_blk_size >> 16);
+ SCSI_ProcessCmd_hmsc->bot_data[6] = (uint8_t)(SCSI_ProcessCmd_hmsc->scsi_blk_size >> 8);
+ SCSI_ProcessCmd_hmsc->bot_data[7] = (uint8_t)(SCSI_ProcessCmd_hmsc->scsi_blk_size);
+
+ SCSI_ProcessCmd_hmsc->bot_data_length = 8;
+ SCSI_ProcessCmd_callback(0);
+}
+
+
+
+/**
+* @brief SCSI_ReadFormatCapacity
+* Process Read Format Capacity command
+* @param lun: Logical unit number
+* @param params: Command parameters
+* @retval status
+*/
+static void SCSI_ReadFormatCapacity(void)
+{
+ if (Upstream_MSC_GetCapacity(SCSI_ReadFormatCapacityCallback) != HAL_OK)
+ {
+ SCSI_ReadFormatCapacityCallback(NULL, 0, 0);
+ }
+}
+
+
+static void SCSI_ReadFormatCapacityCallback(UpstreamPacketTypeDef* upstreamPacket,
+ uint32_t result_uint1,
+ uint32_t result_uint2)
+{
+ if (upstreamPacket == NULL)
+ {
+ SCSI_SenseCode(SCSI_ProcessCmd_pdev,
+ SCSI_ProcessCmd_lun,
+ NOT_READY,
+ MEDIUM_NOT_PRESENT);
+ SCSI_ProcessCmd_callback(-1);
+ return;
+ }
+
+ SCSI_ProcessCmd_hmsc->bot_packet = upstreamPacket;
+ SCSI_ProcessCmd_hmsc->bot_data = upstreamPacket->Data;
+
+ SCSI_ProcessCmd_hmsc->bot_data[0] = 0;
+ SCSI_ProcessCmd_hmsc->bot_data[1] = 0;
+ SCSI_ProcessCmd_hmsc->bot_data[2] = 0;
+ SCSI_ProcessCmd_hmsc->bot_data[3] = 0x08;
+ SCSI_ProcessCmd_hmsc->bot_data[4] = (uint8_t)((result_uint1 - 1) >> 24);
+ SCSI_ProcessCmd_hmsc->bot_data[5] = (uint8_t)((result_uint1 - 1) >> 16);
+ SCSI_ProcessCmd_hmsc->bot_data[6] = (uint8_t)((result_uint1 - 1) >> 8);
+ SCSI_ProcessCmd_hmsc->bot_data[7] = (uint8_t)(result_uint1 - 1);
+
+ SCSI_ProcessCmd_hmsc->bot_data[8] = 0x02;
+ SCSI_ProcessCmd_hmsc->bot_data[9] = (uint8_t)(result_uint2 >> 16);
+ SCSI_ProcessCmd_hmsc->bot_data[10] = (uint8_t)(result_uint2 >> 8);
+ SCSI_ProcessCmd_hmsc->bot_data[11] = (uint8_t)(result_uint2);
+
+ SCSI_ProcessCmd_hmsc->bot_data_length = 12;
+ SCSI_ProcessCmd_callback(0);
+}
+
+/**
+* @brief SCSI_ModeSense6
+* Process Mode Sense6 command
+* @param lun: Logical unit number
+* @param params: Command parameters
+* @retval status
+*/
+static void SCSI_ModeSense6(void)
+{
+ Upstream_GetFreePacket(SCSI_ModeSense6_FreePacketCallback);
+}
+
+
+static void SCSI_ModeSense6_FreePacketCallback(UpstreamPacketTypeDef* freePacket)
+{
+ uint16_t len = 4;
+
+ SCSI_ProcessCmd_hmsc->bot_packet = freePacket;
+ SCSI_ProcessCmd_hmsc->bot_data = freePacket->Data;
+
+ SCSI_ProcessCmd_hmsc->bot_data_length = len;
+
+ while (len)
+ {
+ len--;
+ SCSI_ProcessCmd_hmsc->bot_data[len] = MSC_Mode_Sense6_data[len];
+ }
+ SCSI_ProcessCmd_callback(0);
+}
+
+/**
+* @brief SCSI_ModeSense10
+* Process Mode Sense10 command
+* @param lun: Logical unit number
+* @param params: Command parameters
+* @retval status
+*/
+static void SCSI_ModeSense10(void)
+{
+ Upstream_GetFreePacket(SCSI_ModeSense10_FreePacketCallback);
+}
+
+
+static void SCSI_ModeSense10_FreePacketCallback(UpstreamPacketTypeDef* freePacket)
+{
+ uint16_t len = 8;
+
+ SCSI_ProcessCmd_hmsc->bot_packet = freePacket;
+ SCSI_ProcessCmd_hmsc->bot_data = freePacket->Data;
+
+ SCSI_ProcessCmd_hmsc->bot_data_length = len;
+
+ while (len)
+ {
+ len--;
+ SCSI_ProcessCmd_hmsc->bot_data[len] = MSC_Mode_Sense10_data[len];
+ }
+ SCSI_ProcessCmd_callback(0);
+}
+
+/**
+* @brief SCSI_RequestSense
+* Process Request Sense command
+* @param lun: Logical unit number
+* @param params: Command parameters
+* @retval status
+*/
+
+static void SCSI_RequestSense(void)
+{
+ uint8_t i;
+ UpstreamPacketTypeDef* freePacket;
+
+ freePacket = Upstream_GetFreePacketImmediately();
+ SCSI_ProcessCmd_hmsc->bot_packet = freePacket;
+ SCSI_ProcessCmd_hmsc->bot_data = freePacket->Data;
+
+ for (i=0 ; i < REQUEST_SENSE_DATA_LEN ; i++)
+ {
+ SCSI_ProcessCmd_hmsc->bot_data[i] = 0;
+ }
+
+ SCSI_ProcessCmd_hmsc->bot_data[0] = 0x70;
+ SCSI_ProcessCmd_hmsc->bot_data[7] = REQUEST_SENSE_DATA_LEN - 6;
+
+ if((SCSI_ProcessCmd_hmsc->scsi_sense_head != SCSI_ProcessCmd_hmsc->scsi_sense_tail))
+ {
+ SCSI_ProcessCmd_hmsc->bot_data[2] = SCSI_ProcessCmd_hmsc->scsi_sense[SCSI_ProcessCmd_hmsc->scsi_sense_head].Skey;
+ SCSI_ProcessCmd_hmsc->bot_data[12] = SCSI_ProcessCmd_hmsc->scsi_sense[SCSI_ProcessCmd_hmsc->scsi_sense_head].w.b.ASCQ;
+ SCSI_ProcessCmd_hmsc->bot_data[13] = SCSI_ProcessCmd_hmsc->scsi_sense[SCSI_ProcessCmd_hmsc->scsi_sense_head].w.b.ASC;
+ SCSI_ProcessCmd_hmsc->scsi_sense_head++;
+ if (SCSI_ProcessCmd_hmsc->scsi_sense_head == SENSE_LIST_DEPTH)
+ {
+ SCSI_ProcessCmd_hmsc->scsi_sense_head = 0;
+ }
+ }
+ SCSI_ProcessCmd_hmsc->bot_data_length = REQUEST_SENSE_DATA_LEN;
+
+ if (SCSI_ProcessCmd_params[4] <= REQUEST_SENSE_DATA_LEN)
+ {
+ SCSI_ProcessCmd_hmsc->bot_data_length = SCSI_ProcessCmd_params[4];
+ }
+ SCSI_ProcessCmd_callback(0);
+}
+
+/**
+* @brief SCSI_SenseCode
+* Load the last error code in the error list
+* @param lun: Logical unit number
+* @param sKey: Sense Key
+* @param ASC: Additional Sense Key
+* @retval none
+
+*/
+void SCSI_SenseCode(USBD_HandleTypeDef *pdev, uint8_t lun, uint8_t sKey, uint8_t ASC)
+{
+ USBD_MSC_BOT_HandleTypeDef *hmsc = (USBD_MSC_BOT_HandleTypeDef*)pdev->pClassData;
+
+ hmsc->scsi_sense[hmsc->scsi_sense_tail].Skey = sKey;
+ hmsc->scsi_sense[hmsc->scsi_sense_tail].w.ASC = ASC << 8;
+ hmsc->scsi_sense_tail++;
+ if (hmsc->scsi_sense_tail == SENSE_LIST_DEPTH)
+ {
+ hmsc->scsi_sense_tail = 0;
+ }
+}
+/**
+* @brief SCSI_StartStopUnit
+* Process Start Stop Unit command
+* @param lun: Logical unit number
+* @param params: Command parameters
+* @retval status
+*/
+static void SCSI_StartStopUnit(void)
+{
+ if ((SCSI_ProcessCmd_params[4] & START_STOP_DATA_MASK) == START_STOP_DATA_EJECT_STOP_MOTOR)
+ {
+ SCSI_ProcessCmd_hmsc->last_test_unit_result = HAL_ERROR;
+ if (Upstream_MSC_RequestDisconnect(SCSI_StartStopUnitCallback) != HAL_OK) //Host is signalling us to disconnect
+ {
+ SCSI_StartStopUnitCallback(HAL_ERROR);
+ }
+ }
+ else
+ {
+ SCSI_StartStopUnitCallback(HAL_OK);
+ }
+}
+
+
+
+static void SCSI_StartStopUnitCallback(HAL_StatusTypeDef result)
+{
+ if (result == HAL_OK)
+ {
+ SCSI_ProcessCmd_hmsc->bot_data_length = 0;
+ SCSI_ProcessCmd_callback(0);
+ }
+}
+
+
+
+static void SCSI_AllowMediumRemoval(void)
+{
+ SCSI_ProcessCmd_hmsc->bot_data_length = 0;
+ SCSI_ProcessCmd_callback(0);
+}
+
+
+/**
+* @brief SCSI_Read10
+* Process Read10 command
+* @param lun: Logical unit number
+* @param params: Command parameters
+* @retval status
+*/
+static void SCSI_Read10(void)
+{
+ if (SCSI_ProcessCmd_hmsc->bot_state == USBD_BOT_IDLE) /* Idle */
+ {
+ /* case 10 : Ho <> Di */
+ if ((SCSI_ProcessCmd_hmsc->cbw.bmFlags & 0x80) != 0x80)
+ {
+ SCSI_SenseCode(SCSI_ProcessCmd_pdev,
+ SCSI_ProcessCmd_hmsc->cbw.bLUN,
+ ILLEGAL_REQUEST,
+ INVALID_CDB);
+ SCSI_ProcessCmd_callback(-1);
+ return;
+ }
+
+ if (SCSI_ProcessCmd_hmsc->last_test_unit_result != HAL_OK)
+ {
+ SCSI_SenseCode(SCSI_ProcessCmd_pdev,
+ SCSI_ProcessCmd_hmsc->cbw.bLUN,
+ NOT_READY,
+ MEDIUM_NOT_PRESENT);
+ SCSI_ProcessCmd_callback(-1);
+ return;
+ }
+
+ SCSI_ProcessCmd_hmsc->scsi_blk_addr = (SCSI_ProcessCmd_params[2] << 24) | \
+ (SCSI_ProcessCmd_params[3] << 16) | \
+ (SCSI_ProcessCmd_params[4] << 8) | \
+ SCSI_ProcessCmd_params[5];
+ SCSI_ProcessCmd_hmsc->scsi_blk_len = (SCSI_ProcessCmd_params[7] << 8) | \
+ SCSI_ProcessCmd_params[8];
+
+ if (SCSI_CheckAddressRange(SCSI_ProcessCmd_hmsc->scsi_blk_addr,
+ SCSI_ProcessCmd_hmsc->scsi_blk_len) < 0)
+ {
+ SCSI_SenseCode(SCSI_ProcessCmd_pdev,
+ SCSI_ProcessCmd_hmsc->cbw.bLUN,
+ ILLEGAL_REQUEST,
+ INVALID_CDB);
+ SCSI_ProcessCmd_callback(-1); /* error */
+ return;
+ }
+
+ /* cases 4,5 : Hi <> Dn */
+ if (SCSI_ProcessCmd_hmsc->cbw.dDataLength != (uint32_t)(SCSI_ProcessCmd_hmsc->scsi_blk_len * SCSI_ProcessCmd_hmsc->scsi_blk_size))
+ {
+ SCSI_SenseCode(SCSI_ProcessCmd_pdev,
+ SCSI_ProcessCmd_hmsc->cbw.bLUN,
+ ILLEGAL_REQUEST,
+ INVALID_CDB);
+ SCSI_ProcessCmd_callback(-1);
+ return;
+ }
+
+ if (Upstream_MSC_BeginRead(SCSI_Read10BeginCallback,
+ SCSI_ProcessCmd_hmsc->scsi_blk_addr,
+ SCSI_ProcessCmd_hmsc->scsi_blk_len,
+ SCSI_ProcessCmd_hmsc->cbw.dDataLength) != HAL_OK)
+ {
+ SCSI_Read10BeginCallback(HAL_ERROR);
+ }
+ return;
+ }
+
+ if (Upstream_MSC_GetStreamDataPacket(SCSI_Read10ReplyCallback) != HAL_OK)
+ {
+ SCSI_Read10ReplyCallback(NULL, 0);
+ }
+}
+
+
+static void SCSI_Read10BeginCallback(HAL_StatusTypeDef result)
+{
+ if (result != HAL_OK)
+ {
+ SCSI_SenseCode(SCSI_ProcessCmd_pdev,
+ SCSI_ProcessCmd_lun,
+ NOT_READY,
+ MEDIUM_NOT_PRESENT);
+ SCSI_ProcessCmd_callback(-1);
+ return;
+ }
+ SCSI_ProcessCmd_hmsc->bot_state = USBD_BOT_DATA_IN;
+
+ if (Upstream_MSC_GetStreamDataPacket(SCSI_Read10ReplyCallback) != HAL_OK)
+ {
+ SCSI_Read10ReplyCallback(NULL, 0);
+ }
+}
+
+
+static void SCSI_Read10ReplyCallback(UpstreamPacketTypeDef* upstreamPacket,
+ uint16_t dataLength)
+{
+ if (upstreamPacket == NULL)
+ {
+ SCSI_SenseCode(SCSI_ProcessCmd_pdev,
+ SCSI_ProcessCmd_lun,
+ HARDWARE_ERROR,
+ UNRECOVERED_READ_ERROR);
+ SCSI_ProcessCmd_callback(-1);
+ return;
+ }
+
+ if (SCSI_ProcessCmd_hmsc->bot_packet != NULL)
+ while (1); /////////////////////////////////////////!
+
+ SCSI_ProcessCmd_hmsc->bot_packet = upstreamPacket;
+ SCSI_ProcessCmd_hmsc->bot_data = upstreamPacket->Data;
+ USBD_LL_Transmit (SCSI_ProcessCmd_pdev,
+ MSC_EPIN_ADDR,
+ SCSI_ProcessCmd_hmsc->bot_data,
+ dataLength);
+
+ /* case 6 : Hi = Di */
+ SCSI_ProcessCmd_hmsc->csw.dDataResidue -= dataLength;
+
+ if (SCSI_ProcessCmd_hmsc->csw.dDataResidue == 0)
+ {
+ SCSI_ProcessCmd_hmsc->bot_state = USBD_BOT_LAST_DATA_IN;
+ }
+ SCSI_ProcessCmd_callback(0);
+}
+
+
+/**
+* @brief SCSI_Write10
+* Process Write10 command
+* @param lun: Logical unit number
+* @param params: Command parameters
+* @retval status
+*/
+#ifdef CONFIG_MASS_STORAGE_WRITES_PERMITTED
+static void SCSI_Write10(void)
+{
+ uint32_t dataLength;
+
+ if (SCSI_ProcessCmd_hmsc->bot_state == USBD_BOT_IDLE) /* Idle */
+ {
+ /* case 8 : Hi <> Do */
+ if ((SCSI_ProcessCmd_hmsc->cbw.bmFlags & 0x80) == 0x80)
+ {
+ SCSI_SenseCode(SCSI_ProcessCmd_pdev,
+ SCSI_ProcessCmd_hmsc->cbw.bLUN,
+ ILLEGAL_REQUEST,
+ INVALID_CDB);
+ SCSI_ProcessCmd_callback(-1);
+ return;
+ }
+
+ if (SCSI_ProcessCmd_hmsc->last_test_unit_result != HAL_OK)
+ {
+ SCSI_SenseCode(SCSI_ProcessCmd_pdev,
+ SCSI_ProcessCmd_hmsc->cbw.bLUN,
+ NOT_READY,
+ MEDIUM_NOT_PRESENT);
+ SCSI_ProcessCmd_callback(-1);
+ return;
+ }
+
+ SCSI_ProcessCmd_hmsc->scsi_blk_addr = (SCSI_ProcessCmd_params[2] << 24) | \
+ (SCSI_ProcessCmd_params[3] << 16) | \
+ (SCSI_ProcessCmd_params[4] << 8) | \
+ SCSI_ProcessCmd_params[5];
+ SCSI_ProcessCmd_hmsc->scsi_blk_len = (SCSI_ProcessCmd_params[7] << 8) | \
+ SCSI_ProcessCmd_params[8];
+
+ if (SCSI_CheckAddressRange(SCSI_ProcessCmd_hmsc->scsi_blk_addr,
+ SCSI_ProcessCmd_hmsc->scsi_blk_len) < 0)
+ {
+ SCSI_SenseCode(SCSI_ProcessCmd_pdev,
+ SCSI_ProcessCmd_hmsc->cbw.bLUN,
+ ILLEGAL_REQUEST,
+ INVALID_CDB);
+ SCSI_ProcessCmd_callback(-1); /* error */
+ return;
+ }
+
+ /* cases 3,11,13 : Hn,Ho <> D0 */
+ if (SCSI_ProcessCmd_hmsc->cbw.dDataLength != (uint32_t)(SCSI_ProcessCmd_hmsc->scsi_blk_len * SCSI_ProcessCmd_hmsc->scsi_blk_size))
+ {
+ SCSI_SenseCode(SCSI_ProcessCmd_pdev,
+ SCSI_ProcessCmd_hmsc->cbw.bLUN,
+ ILLEGAL_REQUEST,
+ INVALID_CDB);
+ SCSI_ProcessCmd_callback(-1);
+ return;
+ }
+
+ if (Upstream_MSC_BeginWrite(SCSI_Write10BeginCallback,
+ SCSI_ProcessCmd_hmsc->scsi_blk_addr,
+ SCSI_ProcessCmd_hmsc->scsi_blk_len) != HAL_OK)
+ {
+ SCSI_Write10BeginCallback(HAL_ERROR);
+ }
+ return;
+ }
+
+
+ //hmsc->bot_state is already USBD_BOT_DATA_OUT
+ dataLength = MIN(SCSI_ProcessCmd_hmsc->csw.dDataResidue, MSC_MEDIA_PACKET);
+ if (Upstream_MSC_PutStreamDataPacket(SCSI_ProcessCmd_hmsc->bot_packet,
+ dataLength) != HAL_OK)
+ {
+ SCSI_SenseCode(SCSI_ProcessCmd_pdev,
+ SCSI_ProcessCmd_lun,
+ HARDWARE_ERROR,
+ WRITE_FAULT);
+ SCSI_ProcessCmd_callback(-1);
+ return;
+ }
+
+ SCSI_ProcessCmd_hmsc->csw.dDataResidue -= dataLength;
+ if (SCSI_ProcessCmd_hmsc->csw.dDataResidue == 0)
+ {
+ MSC_BOT_SendCSW (SCSI_ProcessCmd_pdev, USBD_CSW_CMD_PASSED);
+ SCSI_ProcessCmd_callback(0);
+ return;
+ }
+
+ /* Prepare EP to Receive next packet */
+ if (Upstream_GetFreePacket(SCSI_Write10FreePacketCallback) != HAL_OK)
+ {
+ SCSI_SenseCode(SCSI_ProcessCmd_pdev,
+ SCSI_ProcessCmd_lun,
+ NOT_READY,
+ MEDIUM_NOT_PRESENT);
+ SCSI_ProcessCmd_callback(-1);
+ }
+}
+
+
+void SCSI_Write10BeginCallback(HAL_StatusTypeDef result)
+{
+ if (result == HAL_BUSY)
+ {
+ SCSI_SenseCode(SCSI_ProcessCmd_pdev,
+ SCSI_ProcessCmd_lun,
+ DATA_PROTECT,
+ WRITE_PROTECTED);
+ SCSI_ProcessCmd_callback(-1);
+ return;
+ }
+ if (result != HAL_OK)
+ {
+ SCSI_SenseCode(SCSI_ProcessCmd_pdev,
+ SCSI_ProcessCmd_lun,
+ NOT_READY,
+ MEDIUM_NOT_PRESENT);
+ SCSI_ProcessCmd_callback(-1);
+ return;
+ }
+
+ /* Prepare EP to receive first data packet */
+ SCSI_ProcessCmd_hmsc->bot_state = USBD_BOT_DATA_OUT;
+ if (Upstream_GetFreePacket(SCSI_Write10FreePacketCallback) != HAL_OK)
+ {
+ SCSI_SenseCode(SCSI_ProcessCmd_pdev,
+ SCSI_ProcessCmd_lun,
+ NOT_READY,
+ MEDIUM_NOT_PRESENT);
+ SCSI_ProcessCmd_callback(-1);
+ }
+}
+
+
+
+static void SCSI_Write10FreePacketCallback(UpstreamPacketTypeDef* freePacket)
+{
+ SCSI_ProcessCmd_hmsc->bot_packet = freePacket;
+ SCSI_ProcessCmd_hmsc->bot_data = freePacket->Data;
+
+ USBD_LL_PrepareReceive (SCSI_ProcessCmd_pdev,
+ MSC_EPOUT_ADDR,
+ SCSI_ProcessCmd_hmsc->bot_data,
+ MIN(SCSI_ProcessCmd_hmsc->csw.dDataResidue, MSC_MEDIA_PACKET));
+ SCSI_ProcessCmd_callback(0); //Report eventual success!
+}
+#endif
+
+/**
+* @brief SCSI_Verify10
+* Process Verify10 command
+* @param lun: Logical unit number
+* @param params: Command parameters
+* @retval status
+*/
+
+static void SCSI_Verify10(void)
+{
+ if ((SCSI_ProcessCmd_params[1]& 0x02) == 0x02)
+ {
+ SCSI_SenseCode (SCSI_ProcessCmd_pdev,
+ SCSI_ProcessCmd_lun,
+ ILLEGAL_REQUEST,
+ INVALID_FIELD_IN_COMMAND);
+ SCSI_ProcessCmd_callback(-1); /* Error, Verify Mode Not supported*/
+ return;
+ }
+
+ if(SCSI_CheckAddressRange(SCSI_ProcessCmd_hmsc->scsi_blk_addr,
+ SCSI_ProcessCmd_hmsc->scsi_blk_len) < 0)
+ {
+ SCSI_ProcessCmd_callback(-1); /* error */
+ return;
+ }
+ SCSI_ProcessCmd_hmsc->bot_data_length = 0;
+ SCSI_ProcessCmd_callback(0);
+}
+
+/**
+* @brief SCSI_CheckAddressRange
+* Check address range
+* @param lun: Logical unit number
+* @param blk_offset: first block address
+* @param blk_nbr: number of block to be processed
+* @retval status
+*/
+static int8_t SCSI_CheckAddressRange (uint32_t blk_offset , uint16_t blk_nbr)
+{
+ if ((blk_offset >= SCSI_ProcessCmd_hmsc->scsi_blk_nbr) ||
+ ((blk_offset + blk_nbr - 1) >= SCSI_ProcessCmd_hmsc->scsi_blk_nbr))
+ {
+ SCSI_SenseCode(SCSI_ProcessCmd_pdev,
+ SCSI_ProcessCmd_lun,
+ ILLEGAL_REQUEST,
+ ADDRESS_OUT_OF_RANGE);
+ return -1;
+ }
+ return 0;
+}
+
+#endif //#ifdef CONFIG_MASS_STORAGE_ENABLED
+/**
+ * @}
+ */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Upstream/Middlewares/ST/STM32_USB_Device_Library/Core/Inc/usbd_core.h b/Upstream/Middlewares/ST/STM32_USB_Device_Library/Core/Inc/usbd_core.h
new file mode 100644
index 0000000..1331b22
--- /dev/null
+++ b/Upstream/Middlewares/ST/STM32_USB_Device_Library/Core/Inc/usbd_core.h
@@ -0,0 +1,172 @@
+/**
+ ******************************************************************************
+ * @file usbd_core.h
+ * @author MCD Application Team
+ * @version V2.3.0
+ * @date 04-November-2014
+ * @brief Header file for usbd_core.c file
+ ******************************************************************************
+ * @attention
+ *
+ * © COPYRIGHT 2014 STMicroelectronics
+#include "usbd_def.h"
+#include "usbd_ioreq.h"
+#include "usbd_ctlreq.h"
+
+/** @addtogroup STM32_USB_DEVICE_LIBRARY
+ * @{
+ */
+
+/** @defgroup USBD_CORE
+ * @brief This file is the Header file for usbd_core.c file
+ * @{
+ */
+
+
+/** @defgroup USBD_CORE_Exported_Defines
+ * @{
+ */
+
+/**
+ * @}
+ */
+
+
+/** @defgroup USBD_CORE_Exported_TypesDefinitions
+ * @{
+ */
+
+
+/**
+ * @}
+ */
+
+
+
+/** @defgroup USBD_CORE_Exported_Macros
+ * @{
+ */
+
+/**
+ * @}
+ */
+
+/** @defgroup USBD_CORE_Exported_Variables
+ * @{
+ */
+
+/**
+ * @}
+ */
+
+/** @defgroup USBD_CORE_Exported_FunctionsPrototype
+ * @{
+ */
+USBD_StatusTypeDef USBD_Init(USBD_HandleTypeDef *pdev, USBD_DescriptorsTypeDef *pdesc, uint8_t id);
+USBD_ClassTypeDef* USBD_DeInit(USBD_HandleTypeDef *pdev);
+USBD_StatusTypeDef USBD_Start (USBD_HandleTypeDef *pdev);
+USBD_StatusTypeDef USBD_Stop (USBD_HandleTypeDef *pdev);
+USBD_StatusTypeDef USBD_RegisterClass(USBD_HandleTypeDef *pdev, USBD_ClassTypeDef *pclass);
+
+USBD_StatusTypeDef USBD_RunTestMode (USBD_HandleTypeDef *pdev);
+USBD_StatusTypeDef USBD_SetClassConfig(USBD_HandleTypeDef *pdev, uint8_t cfgidx);
+USBD_StatusTypeDef USBD_ClrClassConfig(USBD_HandleTypeDef *pdev, uint8_t cfgidx);
+
+USBD_StatusTypeDef USBD_SetupStage(USBD_HandleTypeDef *pdev, uint8_t *psetup);
+USBD_StatusTypeDef USBD_DataOutStage(USBD_HandleTypeDef *pdev , uint8_t epnum, uint8_t *pdata);
+USBD_StatusTypeDef USBD_DataInStage(USBD_HandleTypeDef *pdev , uint8_t epnum, uint8_t *pdata);
+
+USBD_StatusTypeDef USBD_Reset(USBD_HandleTypeDef *pdev);
+USBD_StatusTypeDef USBD_SetSpeed(USBD_HandleTypeDef *pdev, USBD_SpeedTypeDef speed);
+USBD_StatusTypeDef USBD_Suspend(USBD_HandleTypeDef *pdev);
+USBD_StatusTypeDef USBD_Resume(USBD_HandleTypeDef *pdev);
+
+USBD_StatusTypeDef USBD_SOF(USBD_HandleTypeDef *pdev);
+USBD_StatusTypeDef USBD_IsoINIncomplete(USBD_HandleTypeDef *pdev, uint8_t epnum);
+USBD_StatusTypeDef USBD_IsoOUTIncomplete(USBD_HandleTypeDef *pdev, uint8_t epnum);
+
+USBD_StatusTypeDef USBD_DevConnected(USBD_HandleTypeDef *pdev);
+USBD_StatusTypeDef USBD_DevDisconnected(USBD_HandleTypeDef *pdev);
+
+USBD_StatusTypeDef USBD_BufferFreed(USBD_HandleTypeDef *pdev);
+
+
+/* USBD Low Level Driver */
+USBD_StatusTypeDef USBD_LL_Init (USBD_HandleTypeDef *pdev);
+USBD_StatusTypeDef USBD_LL_DeInit (USBD_HandleTypeDef *pdev);
+USBD_StatusTypeDef USBD_LL_Start(USBD_HandleTypeDef *pdev);
+USBD_StatusTypeDef USBD_LL_Stop (USBD_HandleTypeDef *pdev);
+USBD_StatusTypeDef USBD_LL_OpenEP (USBD_HandleTypeDef *pdev,
+ uint8_t ep_addr,
+ uint8_t ep_type,
+ uint16_t ep_mps);
+
+USBD_StatusTypeDef USBD_LL_CloseEP (USBD_HandleTypeDef *pdev, uint8_t ep_addr);
+USBD_StatusTypeDef USBD_LL_FlushEP (USBD_HandleTypeDef *pdev, uint8_t ep_addr);
+USBD_StatusTypeDef USBD_LL_StallEP (USBD_HandleTypeDef *pdev, uint8_t ep_addr);
+USBD_StatusTypeDef USBD_LL_ClearStallEP (USBD_HandleTypeDef *pdev, uint8_t ep_addr);
+uint8_t USBD_LL_IsStallEP (USBD_HandleTypeDef *pdev, uint8_t ep_addr);
+USBD_StatusTypeDef USBD_LL_SetUSBAddress (USBD_HandleTypeDef *pdev, uint8_t dev_addr);
+USBD_StatusTypeDef USBD_LL_Transmit (USBD_HandleTypeDef *pdev,
+ uint8_t ep_addr,
+ uint8_t *pbuf,
+ uint16_t size);
+
+USBD_StatusTypeDef USBD_LL_PrepareReceive(USBD_HandleTypeDef *pdev,
+ uint8_t ep_addr,
+ uint8_t *pbuf,
+ uint16_t size);
+
+uint32_t USBD_LL_GetRxDataSize (USBD_HandleTypeDef *pdev, uint8_t ep_addr);
+void USBD_LL_Delay (uint32_t Delay);
+
+void USBD_LL_WakeupHost(USBD_HandleTypeDef *pdev);
+
+/**
+ * @}
+ */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __USBD_CORE_H */
+
+/**
+ * @}
+ */
+
+/**
+* @}
+*/
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
+
+
diff --git a/Upstream/Middlewares/ST/STM32_USB_Device_Library/Core/Inc/usbd_ctlreq.h b/Upstream/Middlewares/ST/STM32_USB_Device_Library/Core/Inc/usbd_ctlreq.h
new file mode 100644
index 0000000..d5e7214
--- /dev/null
+++ b/Upstream/Middlewares/ST/STM32_USB_Device_Library/Core/Inc/usbd_ctlreq.h
@@ -0,0 +1,113 @@
+/**
+ ******************************************************************************
+ * @file usbd_req.h
+ * @author MCD Application Team
+ * @version V2.3.0
+ * @date 04-November-2014
+ * @brief Header file for the usbd_req.c file
+ ******************************************************************************
+ * @attention
+ *
+ * © COPYRIGHT 2014 STMicroelectronics © COPYRIGHT 2014 STMicroelectronics
+
+/** @addtogroup STM32_USBD_DEVICE_LIBRARY
+ * @{
+ */
+
+/** @defgroup USB_DEF
+ * @brief general defines for the usb device library file
+ * @{
+ */
+
+/** @defgroup USB_DEF_Exported_Defines
+ * @{
+ */
+
+#ifndef NULL
+#define NULL 0
+#endif
+
+
+#define USB_LEN_DEV_QUALIFIER_DESC 0x0A
+#define USB_LEN_DEV_DESC 0x12
+#define USB_LEN_CFG_DESC 0x09
+#define USB_LEN_IF_DESC 0x09
+#define USB_LEN_EP_DESC 0x07
+#define USB_LEN_OTG_DESC 0x03
+#define USB_LEN_LANGID_STR_DESC 0x04
+#define USB_LEN_OTHER_SPEED_DESC_SIZ 0x09
+
+#define USBD_IDX_LANGID_STR 0x00
+#define USBD_IDX_MFC_STR 0x01
+#define USBD_IDX_PRODUCT_STR 0x02
+#define USBD_IDX_SERIAL_STR 0x03
+#define USBD_IDX_CONFIG_STR 0x04
+#define USBD_IDX_INTERFACE_STR 0x05
+
+#define USB_REQ_TYPE_STANDARD 0x00
+#define USB_REQ_TYPE_CLASS 0x20
+#define USB_REQ_TYPE_VENDOR 0x40
+#define USB_REQ_TYPE_MASK 0x60
+
+#define USB_REQ_RECIPIENT_DEVICE 0x00
+#define USB_REQ_RECIPIENT_INTERFACE 0x01
+#define USB_REQ_RECIPIENT_ENDPOINT 0x02
+#define USB_REQ_RECIPIENT_MASK 0x03
+
+#define USB_REQ_GET_STATUS 0x00
+#define USB_REQ_CLEAR_FEATURE 0x01
+#define USB_REQ_SET_FEATURE 0x03
+#define USB_REQ_SET_ADDRESS 0x05
+#define USB_REQ_GET_DESCRIPTOR 0x06
+#define USB_REQ_SET_DESCRIPTOR 0x07
+#define USB_REQ_GET_CONFIGURATION 0x08
+#define USB_REQ_SET_CONFIGURATION 0x09
+#define USB_REQ_GET_INTERFACE 0x0A
+#define USB_REQ_SET_INTERFACE 0x0B
+#define USB_REQ_SYNCH_FRAME 0x0C
+
+#define USB_DESC_TYPE_DEVICE 1
+#define USB_DESC_TYPE_CONFIGURATION 2
+#define USB_DESC_TYPE_STRING 3
+#define USB_DESC_TYPE_INTERFACE 4
+#define USB_DESC_TYPE_ENDPOINT 5
+#define USB_DESC_TYPE_DEVICE_QUALIFIER 6
+#define USB_DESC_TYPE_OTHER_SPEED_CONFIGURATION 7
+
+
+#define USB_CONFIG_REMOTE_WAKEUP 2
+#define USB_CONFIG_SELF_POWERED 1
+
+#define USB_FEATURE_EP_HALT 0
+#define USB_FEATURE_REMOTE_WAKEUP 1
+#define USB_FEATURE_TEST_MODE 2
+
+
+#define USB_HS_MAX_PACKET_SIZE 512
+#define USB_FS_MAX_PACKET_SIZE 64
+#define USB_MAX_EP0_SIZE 64
+
+/* Device Status */
+#define USBD_STATE_DEFAULT 1
+#define USBD_STATE_ADDRESSED 2
+#define USBD_STATE_CONFIGURED 3
+#define USBD_STATE_SUSPENDED 4
+
+
+/* EP0 State */
+#define USBD_EP0_IDLE 0
+#define USBD_EP0_SETUP 1
+#define USBD_EP0_DATA_IN 2
+#define USBD_EP0_DATA_OUT 3
+#define USBD_EP0_STATUS_IN 4
+#define USBD_EP0_STATUS_OUT 5
+#define USBD_EP0_STALL 6
+
+#define USBD_EP_TYPE_CTRL 0
+#define USBD_EP_TYPE_ISOC 1
+#define USBD_EP_TYPE_BULK 2
+#define USBD_EP_TYPE_INTR 3
+
+
+/**
+ * @}
+ */
+
+
+/** @defgroup USBD_DEF_Exported_TypesDefinitions
+ * @{
+ */
+
+typedef struct usb_setup_req
+{
+
+ uint8_t bmRequest;
+ uint8_t bRequest;
+ uint16_t wValue;
+ uint16_t wIndex;
+ uint16_t wLength;
+}USBD_SetupReqTypedef;
+
+struct _USBD_HandleTypeDef;
+
+typedef struct _Device_cb
+{
+ uint8_t (*Init) (struct _USBD_HandleTypeDef *pdev , uint8_t cfgidx);
+ uint8_t (*DeInit) (struct _USBD_HandleTypeDef *pdev , uint8_t cfgidx);
+ /* Control Endpoints*/
+ uint8_t (*Setup) (struct _USBD_HandleTypeDef *pdev , USBD_SetupReqTypedef *req);
+ uint8_t (*EP0_TxSent) (struct _USBD_HandleTypeDef *pdev );
+ uint8_t (*EP0_RxReady) (struct _USBD_HandleTypeDef *pdev );
+ /* Class Specific Endpoints*/
+ uint8_t (*DataIn) (struct _USBD_HandleTypeDef *pdev , uint8_t epnum);
+ uint8_t (*DataOut) (struct _USBD_HandleTypeDef *pdev , uint8_t epnum);
+ uint8_t (*SOF) (struct _USBD_HandleTypeDef *pdev);
+ uint8_t (*IsoINIncomplete) (struct _USBD_HandleTypeDef *pdev , uint8_t epnum);
+ uint8_t (*IsoOUTIncomplete) (struct _USBD_HandleTypeDef *pdev , uint8_t epnum);
+
+ uint8_t (*FreeDataBuffer) (struct _USBD_HandleTypeDef *pdev);
+
+ uint8_t *(*GetHSConfigDescriptor)(uint16_t *length);
+ uint8_t *(*GetFSConfigDescriptor)(uint16_t *length);
+ uint8_t *(*GetOtherSpeedConfigDescriptor)(uint16_t *length);
+ uint8_t *(*GetDeviceQualifierDescriptor)(uint16_t *length);
+
+ uint16_t USBDevPid;
+
+#if (USBD_SUPPORT_USER_STRING == 1)
+ uint8_t *(*GetUsrStrDescriptor)(struct _USBD_HandleTypeDef *pdev ,uint8_t index, uint16_t *length);
+#endif
+
+} USBD_ClassTypeDef;
+
+/* Following USB Device Speed */
+typedef enum
+{
+ USBD_SPEED_HIGH = 0,
+ USBD_SPEED_FULL = 1,
+ USBD_SPEED_LOW = 2,
+}USBD_SpeedTypeDef;
+
+/* Following USB Device status */
+typedef enum {
+ USBD_OK = 0,
+ USBD_BUSY,
+ USBD_FAIL,
+}USBD_StatusTypeDef;
+
+/* USB Device descriptors structure */
+typedef struct
+{
+ uint8_t *(*GetDeviceDescriptor)( USBD_SpeedTypeDef speed , uint16_t *length);
+ uint8_t *(*GetLangIDStrDescriptor)( USBD_SpeedTypeDef speed , uint16_t *length);
+ uint8_t *(*GetManufacturerStrDescriptor)( USBD_SpeedTypeDef speed , uint16_t *length);
+ uint8_t *(*GetProductStrDescriptor)( USBD_SpeedTypeDef speed , uint16_t *length);
+ uint8_t *(*GetSerialStrDescriptor)( USBD_SpeedTypeDef speed , uint16_t *length);
+ uint8_t *(*GetConfigurationStrDescriptor)( USBD_SpeedTypeDef speed , uint16_t *length);
+ uint8_t *(*GetInterfaceStrDescriptor)( USBD_SpeedTypeDef speed , uint16_t *length);
+} USBD_DescriptorsTypeDef;
+
+/* USB Device handle structure */
+typedef struct
+{
+ uint32_t status;
+ uint32_t total_length;
+ uint32_t rem_length;
+ uint32_t maxpacket;
+} USBD_EndpointTypeDef;
+
+
+typedef enum
+{
+ USB_STATUS_STOP,
+ USB_STATUS_START
+} UsbCoreStatusTypeDef;
+
+
+/* USB Device handle structure */
+typedef struct _USBD_HandleTypeDef
+{
+ uint32_t dev_config;
+ uint32_t dev_default_config;
+ uint32_t dev_config_status;
+ USBD_SpeedTypeDef dev_speed;
+ USBD_EndpointTypeDef ep_in[15];
+ USBD_EndpointTypeDef ep_out[15];
+ uint32_t ep0_state;
+ uint32_t ep0_data_len;
+ uint32_t usbRequestEjectTime;
+ uint8_t id;
+ uint8_t usbCoreStatus;
+ uint8_t dev_state;
+ uint8_t dev_old_state;
+ uint8_t dev_address;
+ uint8_t dev_connection_status;
+ uint8_t dev_test_mode;
+ uint32_t dev_remote_wakeup;
+
+ USBD_SetupReqTypedef request;
+ USBD_DescriptorsTypeDef *pDesc;
+ USBD_ClassTypeDef *pClass;
+ void *pClassData;
+ void *pUserData;
+ void *pData;
+} USBD_HandleTypeDef;
+
+/**
+ * @}
+ */
+
+
+
+/** @defgroup USBD_DEF_Exported_Macros
+ * @{
+ */
+#define SWAPBYTE(addr) (((uint16_t)(*((uint8_t *)(addr)))) + \
+ (((uint16_t)(*(((uint8_t *)(addr)) + 1))) << 8))
+
+#define LOBYTE(x) ((uint8_t)(x & 0x00FF))
+#define HIBYTE(x) ((uint8_t)((x & 0xFF00) >>8))
+#define MIN(a, b) (((a) < (b)) ? (a) : (b))
+#define MAX(a, b) (((a) > (b)) ? (a) : (b))
+
+
+#if defined ( __GNUC__ )
+ #ifndef __weak
+ #define __weak __attribute__((weak))
+ #endif /* __weak */
+ #ifndef __packed
+ #define __packed __attribute__((__packed__))
+ #endif /* __packed */
+#endif /* __GNUC__ */
+
+
+/* In HS mode and when the DMA is used, all variables and data structures dealing
+ with the DMA during the transaction process should be 4-bytes aligned */
+
+#if defined (__GNUC__) /* GNU Compiler */
+ #define __ALIGN_END __attribute__ ((aligned (4)))
+ #define __ALIGN_BEGIN
+#else
+ #define __ALIGN_END
+ #if defined (__CC_ARM) /* ARM Compiler */
+ #define __ALIGN_BEGIN __align(4)
+ #elif defined (__ICCARM__) /* IAR Compiler */
+ #define __ALIGN_BEGIN
+ #elif defined (__TASKING__) /* TASKING Compiler */
+ #define __ALIGN_BEGIN __align(4)
+ #endif /* __CC_ARM */
+#endif /* __GNUC__ */
+
+
+/**
+ * @}
+ */
+
+/** @defgroup USBD_DEF_Exported_Variables
+ * @{
+ */
+
+/**
+ * @}
+ */
+
+/** @defgroup USBD_DEF_Exported_FunctionsPrototype
+ * @{
+ */
+
+/**
+ * @}
+ */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __USBD_DEF_H */
+
+/**
+ * @}
+ */
+
+/**
+* @}
+*/
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Upstream/Middlewares/ST/STM32_USB_Device_Library/Core/Inc/usbd_ioreq.h b/Upstream/Middlewares/ST/STM32_USB_Device_Library/Core/Inc/usbd_ioreq.h
new file mode 100644
index 0000000..7e7965f
--- /dev/null
+++ b/Upstream/Middlewares/ST/STM32_USB_Device_Library/Core/Inc/usbd_ioreq.h
@@ -0,0 +1,128 @@
+/**
+ ******************************************************************************
+ * @file usbd_ioreq.h
+ * @author MCD Application Team
+ * @version V2.3.0
+ * @date 04-November-2014
+ * @brief Header file for the usbd_ioreq.c file
+ ******************************************************************************
+ * @attention
+ *
+ * © COPYRIGHT 2014 STMicroelectronics © COPYRIGHT 2014 STMicroelectronics © COPYRIGHT 2015 STMicroelectronics © COPYRIGHT 2015 STMicroelectronics © COPYRIGHT 2014 STMicroelectronics
+
+
+
+
+
+
+
diff --git a/Upstream/Upstream Debug.launch b/Upstream/Upstream Debug.launch
new file mode 100644
index 0000000..93952cc
--- /dev/null
+++ b/Upstream/Upstream Debug.launch
@@ -0,0 +1,64 @@
+
+
+
+
+
+
+
+
+
diff --git a/Upstream/Upstream Release.launch b/Upstream/Upstream Release.launch
new file mode 100644
index 0000000..272f393
--- /dev/null
+++ b/Upstream/Upstream Release.launch
@@ -0,0 +1,64 @@
+
+
+
+
+
+
+
+
+
diff --git a/Upstream/gcc_arm_stm32f401.ld b/Upstream/gcc_arm_stm32f401.ld
new file mode 100644
index 0000000..0fffc55
--- /dev/null
+++ b/Upstream/gcc_arm_stm32f401.ld
@@ -0,0 +1,115 @@
+/* Linker script to configure memory regions. */
+MEMORY
+{
+ FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 256K
+ SRAM1 (xrw) : ORIGIN = 0x20000000, LENGTH = 64K
+
+}
+
+/* Library configurations */
+GROUP(libgcc.a libc.a libm.a libnosys.a)
+
+/* Linker script to place sections and symbol values. Should be used together
+ * with other linker script that defines memory regions FLASH and RAM.
+ * It references following symbols, which must be defined in code:
+ * Reset_Handler : Entry of reset handler
+ *
+ * It defines following symbols, which code can use without definition:
+ * __exidx_start
+ * __exidx_end
+ * __copy_table_start__
+ * __copy_table_end__
+ * __zero_table_start__
+ * __zero_table_end__
+ * __etext
+ * __data_start__
+ * __preinit_array_start
+ * __preinit_array_end
+ * __init_array_start
+ * __init_array_end
+ * __fini_array_start
+ * __fini_array_end
+ * __data_end__
+ * __bss_start__
+ * __bss_end__
+ * __end__
+ * end
+ * __HeapLimit
+ * __StackLimit
+ * __StackTop
+ * __stack
+ * __Vectors_End
+ * __Vectors_Size
+ */
+ENTRY(Reset_Handler)
+
+SECTIONS
+{
+ .text :
+ {
+ KEEP(*(.vectors))
+ __Vectors_End = .;
+ __Vectors_Size = __Vectors_End - __Vectors;
+ __end__ = .;
+
+ *(.text*)
+
+ KEEP(*(.init))
+ KEEP(*(.fini))
+
+
+ *(.rodata*)
+
+ KEEP(*(.eh_frame*))
+ } > FLASH
+
+ __etext = .;
+
+ .data : AT (__etext)
+ {
+ __data_start__ = .;
+ *(vtable)
+ *(.data*)
+
+ /* All data end */
+ __data_end__ = .;
+
+ } > SRAM1
+
+ .bss :
+ {
+ . = ALIGN(4);
+ __bss_start__ = .;
+ *(.bss*)
+ *(COMMON)
+ . = ALIGN(4);
+ __bss_end__ = .;
+ } > SRAM1
+
+ .heap (COPY):
+ {
+ __HeapBase = .;
+ __end__ = .;
+ end = __end__;
+ KEEP(*(.heap*))
+ __HeapLimit = .;
+ } > SRAM1
+
+ /* .stack_dummy section doesn't contains any symbols. It is only
+ * used for linker to calculate size of stack sections, and assign
+ * values to stack symbols later */
+ .stack_dummy (COPY):
+ {
+ KEEP(*(.stack*))
+ } > SRAM1
+
+ /* Set stack top to end of RAM, and stack limit move down by
+ * size of stack_dummy section */
+ __StackTop = ORIGIN(SRAM1) + LENGTH(SRAM1);
+ __StackLimit = __StackTop - SIZEOF(.stack_dummy);
+ PROVIDE(__stack = __StackTop);
+
+ /* Check if data + heap + stack exceeds RAM limit */
+ ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed with stack")
+
+}