stm32/usbdev: Convert files to unix line endings.

Also remove trailing whitespace and convert tabs to spaces.

13 files changed, 4029 insertions, 4029 deletions

diff --git a/ports/stm32/usbdev/class/inc/usbd_msc_bot.h b/ports/stm32/usbdev/class/inc/usbd_msc_bot.h
index 41f8ab5a5..4edc912fe 100644
--- a/ports/stm32/usbdev/class/inc/usbd_msc_bot.h
+++ b/ports/stm32/usbdev/class/inc/usbd_msc_bot.h
@@ -1,151 +1,151 @@
-/**

-  ******************************************************************************

-  * @file    usbd_msc_bot.h

-  * @author  MCD Application Team

-  * @version V2.0.0

-  * @date    18-February-2014

-  * @brief   header for the usbd_msc_bot.c file

-  ******************************************************************************

-  * @attention

-  *

-  * <h2><center>&copy; COPYRIGHT 2014 STMicroelectronics</center></h2>

-  *

-  * Licensed under MCD-ST Liberty SW License Agreement V2, (the "License");

-  * You may not use this file except in compliance with the License.

-  * You may obtain a copy of the License at:

-  *

-  *        http://www.st.com/software_license_agreement_liberty_v2

-  *

-  * Unless required by applicable law or agreed to in writing, software 

-  * distributed under the License is distributed on an "AS IS" BASIS, 

-  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-  * See the License for the specific language governing permissions and

-  * limitations under the License.

-  *

-  ******************************************************************************

-  */

-

-/* Define to prevent recursive inclusion -------------------------------------*/

-

-#include "usbd_core.h"

-

-/* Define to prevent recursive inclusion -------------------------------------*/

-#ifndef __USBD_MSC_BOT_H

-#define __USBD_MSC_BOT_H

-

-/** @addtogroup STM32_USB_OTG_DEVICE_LIBRARY

-  * @{

-  */

-  

-/** @defgroup MSC_BOT

-  * @brief This file is the Header file for usbd_bot.c

-  * @{

-  */ 

-

-

-/** @defgroup USBD_CORE_Exported_Defines

-  * @{

-  */ 

-#define USBD_BOT_IDLE                      0       /* Idle state */

-#define USBD_BOT_DATA_OUT                  1       /* Data Out state */

-#define USBD_BOT_DATA_IN                   2       /* Data In state */

-#define USBD_BOT_LAST_DATA_IN              3       /* Last Data In Last */

-#define USBD_BOT_SEND_DATA                 4       /* Send Immediate data */

-#define USBD_BOT_NO_DATA                   5       /* No data Stage */

-

-#define USBD_BOT_CBW_SIGNATURE             0x43425355

-#define USBD_BOT_CSW_SIGNATURE             0x53425355

-#define USBD_BOT_CBW_LENGTH                31

-#define USBD_BOT_CSW_LENGTH                13

-#define USBD_BOT_MAX_DATA                  256

-

-/* CSW Status Definitions */

-#define USBD_CSW_CMD_PASSED                0x00

-#define USBD_CSW_CMD_FAILED                0x01

-#define USBD_CSW_PHASE_ERROR               0x02

-

-/* BOT Status */

-#define USBD_BOT_STATUS_NORMAL             0

-#define USBD_BOT_STATUS_RECOVERY           1

-#define USBD_BOT_STATUS_ERROR              2

-

-

-#define USBD_DIR_IN                        0

-#define USBD_DIR_OUT                       1

-#define USBD_BOTH_DIR                      2

-

-/**

-  * @}

-  */ 

-

-/** @defgroup MSC_CORE_Private_TypesDefinitions

-  * @{

-  */ 

-

-typedef struct

-{

-  uint32_t dSignature;

-  uint32_t dTag;

-  uint32_t dDataLength;

-  uint8_t  bmFlags;

-  uint8_t  bLUN;

-  uint8_t  bCBLength;

-  uint8_t  CB[16];

-  uint8_t  ReservedForAlign;

-}

-USBD_MSC_BOT_CBWTypeDef;

-

-

-typedef struct

-{

-  uint32_t dSignature;

-  uint32_t dTag;

-  uint32_t dDataResidue;

-  uint8_t  bStatus;

-  uint8_t  ReservedForAlign[3];  

-}

-USBD_MSC_BOT_CSWTypeDef;

-

-/**

-  * @}

-  */ 

-

-

-/** @defgroup USBD_CORE_Exported_Types

-  * @{

-  */

-

-/**

-  * @}

-  */ 

-/** @defgroup USBD_CORE_Exported_FunctionsPrototypes

-  * @{

-  */ 

-void MSC_BOT_Init (USBD_HandleTypeDef  *pdev);

-void MSC_BOT_Reset (USBD_HandleTypeDef  *pdev);

-void MSC_BOT_DeInit (USBD_HandleTypeDef  *pdev);

-void MSC_BOT_DataIn (USBD_HandleTypeDef  *pdev, 

-                     uint8_t epnum);

-

-void MSC_BOT_DataOut (USBD_HandleTypeDef  *pdev, 

-                      uint8_t epnum);

-

-void MSC_BOT_SendCSW (USBD_HandleTypeDef  *pdev,

-                             uint8_t CSW_Status);

-

-void  MSC_BOT_CplClrFeature (USBD_HandleTypeDef  *pdev, 

-                             uint8_t epnum);

-/**

-  * @}

-  */ 

-

-#endif /* __USBD_MSC_BOT_H */

-/**

-  * @}

-  */ 

-

-/**

-* @}

-*/ 

-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

-

+/**
+  ******************************************************************************
+  * @file    usbd_msc_bot.h
+  * @author  MCD Application Team
+  * @version V2.0.0
+  * @date    18-February-2014
+  * @brief   header for the usbd_msc_bot.c file
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; COPYRIGHT 2014 STMicroelectronics</center></h2>
+  *
+  * Licensed under MCD-ST Liberty SW License Agreement V2, (the "License");
+  * You may not use this file except in compliance with the License.
+  * You may obtain a copy of the License at:
+  *
+  *        http://www.st.com/software_license_agreement_liberty_v2
+  *
+  * Unless required by applicable law or agreed to in writing, software
+  * distributed under the License is distributed on an "AS IS" BASIS,
+  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  * See the License for the specific language governing permissions and
+  * limitations under the License.
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+
+#include "usbd_core.h"
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __USBD_MSC_BOT_H
+#define __USBD_MSC_BOT_H
+
+/** @addtogroup STM32_USB_OTG_DEVICE_LIBRARY
+  * @{
+  */
+
+/** @defgroup MSC_BOT
+  * @brief This file is the Header file for usbd_bot.c
+  * @{
+  */
+
+
+/** @defgroup USBD_CORE_Exported_Defines
+  * @{
+  */
+#define USBD_BOT_IDLE                      0       /* Idle state */
+#define USBD_BOT_DATA_OUT                  1       /* Data Out state */
+#define USBD_BOT_DATA_IN                   2       /* Data In state */
+#define USBD_BOT_LAST_DATA_IN              3       /* Last Data In Last */
+#define USBD_BOT_SEND_DATA                 4       /* Send Immediate data */
+#define USBD_BOT_NO_DATA                   5       /* No data Stage */
+
+#define USBD_BOT_CBW_SIGNATURE             0x43425355
+#define USBD_BOT_CSW_SIGNATURE             0x53425355
+#define USBD_BOT_CBW_LENGTH                31
+#define USBD_BOT_CSW_LENGTH                13
+#define USBD_BOT_MAX_DATA                  256
+
+/* CSW Status Definitions */
+#define USBD_CSW_CMD_PASSED                0x00
+#define USBD_CSW_CMD_FAILED                0x01
+#define USBD_CSW_PHASE_ERROR               0x02
+
+/* BOT Status */
+#define USBD_BOT_STATUS_NORMAL             0
+#define USBD_BOT_STATUS_RECOVERY           1
+#define USBD_BOT_STATUS_ERROR              2
+
+
+#define USBD_DIR_IN                        0
+#define USBD_DIR_OUT                       1
+#define USBD_BOTH_DIR                      2
+
+/**
+  * @}
+  */
+
+/** @defgroup MSC_CORE_Private_TypesDefinitions
+  * @{
+  */
+
+typedef struct
+{
+  uint32_t dSignature;
+  uint32_t dTag;
+  uint32_t dDataLength;
+  uint8_t  bmFlags;
+  uint8_t  bLUN;
+  uint8_t  bCBLength;
+  uint8_t  CB[16];
+  uint8_t  ReservedForAlign;
+}
+USBD_MSC_BOT_CBWTypeDef;
+
+
+typedef struct
+{
+  uint32_t dSignature;
+  uint32_t dTag;
+  uint32_t dDataResidue;
+  uint8_t  bStatus;
+  uint8_t  ReservedForAlign[3];
+}
+USBD_MSC_BOT_CSWTypeDef;
+
+/**
+  * @}
+  */
+
+
+/** @defgroup USBD_CORE_Exported_Types
+  * @{
+  */
+
+/**
+  * @}
+  */
+/** @defgroup USBD_CORE_Exported_FunctionsPrototypes
+  * @{
+  */
+void MSC_BOT_Init (USBD_HandleTypeDef  *pdev);
+void MSC_BOT_Reset (USBD_HandleTypeDef  *pdev);
+void MSC_BOT_DeInit (USBD_HandleTypeDef  *pdev);
+void MSC_BOT_DataIn (USBD_HandleTypeDef  *pdev,
+                     uint8_t epnum);
+
+void MSC_BOT_DataOut (USBD_HandleTypeDef  *pdev,
+                      uint8_t epnum);
+
+void MSC_BOT_SendCSW (USBD_HandleTypeDef  *pdev,
+                             uint8_t CSW_Status);
+
+void  MSC_BOT_CplClrFeature (USBD_HandleTypeDef  *pdev,
+                             uint8_t epnum);
+/**
+  * @}
+  */
+
+#endif /* __USBD_MSC_BOT_H */
+/**
+  * @}
+  */
+
+/**
+* @}
+*/
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/ports/stm32/usbdev/class/inc/usbd_msc_data.h b/ports/stm32/usbdev/class/inc/usbd_msc_data.h
index f468267f4..afd39e4f0 100644
--- a/ports/stm32/usbdev/class/inc/usbd_msc_data.h
+++ b/ports/stm32/usbdev/class/inc/usbd_msc_data.h
@@ -1,104 +1,104 @@
-/**

-  ******************************************************************************

-  * @file    usbd_msc_data.h

-  * @author  MCD Application Team

-  * @version V2.0.0

-  * @date    18-February-2014

-  * @brief   header for the usbd_msc_data.c file

-  ******************************************************************************

-  * @attention

-  *

-  * <h2><center>&copy; COPYRIGHT 2014 STMicroelectronics</center></h2>

-  *

-  * Licensed under MCD-ST Liberty SW License Agreement V2, (the "License");

-  * You may not use this file except in compliance with the License.

-  * You may obtain a copy of the License at:

-  *

-  *        http://www.st.com/software_license_agreement_liberty_v2

-  *

-  * Unless required by applicable law or agreed to in writing, software 

-  * distributed under the License is distributed on an "AS IS" BASIS, 

-  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-  * See the License for the specific language governing permissions and

-  * limitations under the License.

-  *

-  ******************************************************************************

-  */ 

-

-/* Define to prevent recursive inclusion -------------------------------------*/

-

-#ifndef _USBD_MSC_DATA_H_

-#define _USBD_MSC_DATA_H_

-

-/* Includes ------------------------------------------------------------------*/

-#include "usbd_conf.h"

-

-/** @addtogroup STM32_USB_OTG_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

-  * @{

-  */ 

-

-/**

-  * @}

-  */ 

-

-#endif /* _USBD_MSC_DATA_H_ */

-

-/**

-  * @}

-  */ 

-

-/**

-* @}

-*/ 

-

-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

+/**
+  ******************************************************************************
+  * @file    usbd_msc_data.h
+  * @author  MCD Application Team
+  * @version V2.0.0
+  * @date    18-February-2014
+  * @brief   header for the usbd_msc_data.c file
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; COPYRIGHT 2014 STMicroelectronics</center></h2>
+  *
+  * Licensed under MCD-ST Liberty SW License Agreement V2, (the "License");
+  * You may not use this file except in compliance with the License.
+  * You may obtain a copy of the License at:
+  *
+  *        http://www.st.com/software_license_agreement_liberty_v2
+  *
+  * Unless required by applicable law or agreed to in writing, software
+  * distributed under the License is distributed on an "AS IS" BASIS,
+  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  * See the License for the specific language governing permissions and
+  * limitations under the License.
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+
+#ifndef _USBD_MSC_DATA_H_
+#define _USBD_MSC_DATA_H_
+
+/* Includes ------------------------------------------------------------------*/
+#include "usbd_conf.h"
+
+/** @addtogroup STM32_USB_OTG_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
+  * @{
+  */
+
+/**
+  * @}
+  */
+
+#endif /* _USBD_MSC_DATA_H_ */
+
+/**
+  * @}
+  */
+
+/**
+* @}
+*/
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/ports/stm32/usbdev/class/inc/usbd_msc_scsi.h b/ports/stm32/usbdev/class/inc/usbd_msc_scsi.h
index 34f059ee5..b657cead0 100644
--- a/ports/stm32/usbdev/class/inc/usbd_msc_scsi.h
+++ b/ports/stm32/usbdev/class/inc/usbd_msc_scsi.h
@@ -1,195 +1,195 @@
-/**

-  ******************************************************************************

-  * @file    usbd_msc_scsi.h

-  * @author  MCD Application Team

-  * @version V2.0.0

-  * @date    18-February-2014

-  * @brief   header for the usbd_msc_scsi.c file

-  ******************************************************************************

-  * @attention

-  *

-  * <h2><center>&copy; COPYRIGHT 2014 STMicroelectronics</center></h2>

-  *

-  * Licensed under MCD-ST Liberty SW License Agreement V2, (the "License");

-  * You may not use this file except in compliance with the License.

-  * You may obtain a copy of the License at:

-  *

-  *        http://www.st.com/software_license_agreement_liberty_v2

-  *

-  * Unless required by applicable law or agreed to in writing, software 

-  * distributed under the License is distributed on an "AS IS" BASIS, 

-  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-  * See the License for the specific language governing permissions and

-  * limitations under the License.

-  *

-  ******************************************************************************

-  */ 

-

-/* Define to prevent recursive inclusion -------------------------------------*/

-#ifndef __USBD_MSC_SCSI_H

-#define __USBD_MSC_SCSI_H

-

-/* Includes ------------------------------------------------------------------*/

-#include "usbd_def.h"

-

-/** @addtogroup STM32_USB_OTG_DEVICE_LIBRARY

-  * @{

-  */

-  

-/** @defgroup USBD_SCSI

-  * @brief header file for the storage disk file

-  * @{

-  */ 

-

-/** @defgroup USBD_SCSI_Exported_Defines

-  * @{

-  */ 

-

-#define SENSE_LIST_DEEPTH                          4

-

-/* SCSI Commands */

-#define SCSI_FORMAT_UNIT                            0x04

-#define SCSI_INQUIRY                                0x12

-#define SCSI_MODE_SELECT6                           0x15

-#define SCSI_MODE_SELECT10                          0x55

-#define SCSI_MODE_SENSE6                            0x1A

-#define SCSI_MODE_SENSE10                           0x5A

-#define SCSI_ALLOW_MEDIUM_REMOVAL                   0x1E

-#define SCSI_SYNCHRONIZE_CACHE10                    0x35

-#define SCSI_SYNCHRONIZE_CACHE16                    0x91

-#define SCSI_READ6                                  0x08

-#define SCSI_READ10                                 0x28

-#define SCSI_READ12                                 0xA8

-#define SCSI_READ16                                 0x88

-

-#define SCSI_READ_CAPACITY10                        0x25

-#define SCSI_READ_CAPACITY16                        0x9E

-

-#define SCSI_REQUEST_SENSE                          0x03

-#define SCSI_START_STOP_UNIT                        0x1B

-#define SCSI_TEST_UNIT_READY                        0x00

-#define SCSI_WRITE6                                 0x0A

-#define SCSI_WRITE10                                0x2A

-#define SCSI_WRITE12                                0xAA

-#define SCSI_WRITE16                                0x8A

-

-#define SCSI_VERIFY10                               0x2F

-#define SCSI_VERIFY12                               0xAF

-#define SCSI_VERIFY16                               0x8F

-

-#define SCSI_SEND_DIAGNOSTIC                        0x1D

-#define SCSI_READ_FORMAT_CAPACITIES                 0x23

-

-#define NO_SENSE                                    0

-#define RECOVERED_ERROR                             1

-#define NOT_READY                                   2

-#define MEDIUM_ERROR                                3

-#define HARDWARE_ERROR                              4

-#define ILLEGAL_REQUEST                             5

-#define UNIT_ATTENTION                              6

-#define DATA_PROTECT                                7

-#define BLANK_CHECK                                 8

-#define VENDOR_SPECIFIC                             9

-#define COPY_ABORTED                               10

-#define ABORTED_COMMAND                            11

-#define VOLUME_OVERFLOW                            13

-#define MISCOMPARE                                 14

-

-

-#define INVALID_CDB                                 0x20

-#define INVALID_FIELED_IN_COMMAND                   0x24

-#define PARAMETER_LIST_LENGTH_ERROR                 0x1A

-#define INVALID_FIELD_IN_PARAMETER_LIST             0x26

-#define ADDRESS_OUT_OF_RANGE                        0x21

-#define MEDIUM_NOT_PRESENT                          0x3A

-#define MEDIUM_HAVE_CHANGED                         0x28

-#define WRITE_PROTECTED                             0x27 

-#define UNRECOVERED_READ_ERROR			    0x11

-#define WRITE_FAULT				    0x03 

-

-#define READ_FORMAT_CAPACITY_DATA_LEN               0x0C

-#define READ_CAPACITY10_DATA_LEN                    0x08

-#define MODE_SENSE10_DATA_LEN                       0x08

-#define MODE_SENSE6_DATA_LEN                        0x04

-#define REQUEST_SENSE_DATA_LEN                      0x12

-#define STANDARD_INQUIRY_DATA_LEN                   0x24

-#define BLKVFY                                      0x04

-

-extern  uint8_t Page00_Inquiry_Data[];

-extern  uint8_t Standard_Inquiry_Data[];

-extern  uint8_t Standard_Inquiry_Data2[];

-extern  uint8_t Mode_Sense6_data[];

-extern  uint8_t Mode_Sense10_data[];

-extern  uint8_t Scsi_Sense_Data[];

-extern  uint8_t ReadCapacity10_Data[];

-extern  uint8_t ReadFormatCapacity_Data [];

-/**

-  * @}

-  */ 

-

-

-/** @defgroup USBD_SCSI_Exported_TypesDefinitions

-  * @{

-  */

-

-typedef struct _SENSE_ITEM {                

-  char Skey;

-  union {

-    struct _ASCs {

-      char ASC;

-      char ASCQ;

-    }b;

-    unsigned int	ASC;

-    char *pData;

-  } w;

-} USBD_SCSI_SenseTypeDef; 

-/**

-  * @}

-  */ 

-

-/** @defgroup USBD_SCSI_Exported_Macros

-  * @{

-  */ 

-

-/**

-  * @}

-  */ 

-

-/** @defgroup USBD_SCSI_Exported_Variables

-  * @{

-  */ 

-

-/**

-  * @}

-  */ 

-/** @defgroup USBD_SCSI_Exported_FunctionsPrototype

-  * @{

-  */ 

-int8_t SCSI_ProcessCmd(USBD_HandleTypeDef  *pdev,

-                           uint8_t lun, 

-                           uint8_t *cmd);

-

-void   SCSI_SenseCode(USBD_HandleTypeDef  *pdev,

-                      uint8_t lun, 

-                      uint8_t sKey, 

-                      uint8_t ASC);

-

-/**

-  * @}

-  */ 

-

-#endif /* __USBD_MSC_SCSI_H */

-/**

-  * @}

-  */ 

-

-/**

-  * @}

-  */ 

-

-/**

-* @}

-*/ 

-

-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

-

+/**
+  ******************************************************************************
+  * @file    usbd_msc_scsi.h
+  * @author  MCD Application Team
+  * @version V2.0.0
+  * @date    18-February-2014
+  * @brief   header for the usbd_msc_scsi.c file
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; COPYRIGHT 2014 STMicroelectronics</center></h2>
+  *
+  * Licensed under MCD-ST Liberty SW License Agreement V2, (the "License");
+  * You may not use this file except in compliance with the License.
+  * You may obtain a copy of the License at:
+  *
+  *        http://www.st.com/software_license_agreement_liberty_v2
+  *
+  * Unless required by applicable law or agreed to in writing, software
+  * distributed under the License is distributed on an "AS IS" BASIS,
+  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  * See the License for the specific language governing permissions and
+  * limitations under the License.
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __USBD_MSC_SCSI_H
+#define __USBD_MSC_SCSI_H
+
+/* Includes ------------------------------------------------------------------*/
+#include "usbd_def.h"
+
+/** @addtogroup STM32_USB_OTG_DEVICE_LIBRARY
+  * @{
+  */
+
+/** @defgroup USBD_SCSI
+  * @brief header file for the storage disk file
+  * @{
+  */
+
+/** @defgroup USBD_SCSI_Exported_Defines
+  * @{
+  */
+
+#define SENSE_LIST_DEEPTH                          4
+
+/* SCSI Commands */
+#define SCSI_FORMAT_UNIT                            0x04
+#define SCSI_INQUIRY                                0x12
+#define SCSI_MODE_SELECT6                           0x15
+#define SCSI_MODE_SELECT10                          0x55
+#define SCSI_MODE_SENSE6                            0x1A
+#define SCSI_MODE_SENSE10                           0x5A
+#define SCSI_ALLOW_MEDIUM_REMOVAL                   0x1E
+#define SCSI_SYNCHRONIZE_CACHE10                    0x35
+#define SCSI_SYNCHRONIZE_CACHE16                    0x91
+#define SCSI_READ6                                  0x08
+#define SCSI_READ10                                 0x28
+#define SCSI_READ12                                 0xA8
+#define SCSI_READ16                                 0x88
+
+#define SCSI_READ_CAPACITY10                        0x25
+#define SCSI_READ_CAPACITY16                        0x9E
+
+#define SCSI_REQUEST_SENSE                          0x03
+#define SCSI_START_STOP_UNIT                        0x1B
+#define SCSI_TEST_UNIT_READY                        0x00
+#define SCSI_WRITE6                                 0x0A
+#define SCSI_WRITE10                                0x2A
+#define SCSI_WRITE12                                0xAA
+#define SCSI_WRITE16                                0x8A
+
+#define SCSI_VERIFY10                               0x2F
+#define SCSI_VERIFY12                               0xAF
+#define SCSI_VERIFY16                               0x8F
+
+#define SCSI_SEND_DIAGNOSTIC                        0x1D
+#define SCSI_READ_FORMAT_CAPACITIES                 0x23
+
+#define NO_SENSE                                    0
+#define RECOVERED_ERROR                             1
+#define NOT_READY                                   2
+#define MEDIUM_ERROR                                3
+#define HARDWARE_ERROR                              4
+#define ILLEGAL_REQUEST                             5
+#define UNIT_ATTENTION                              6
+#define DATA_PROTECT                                7
+#define BLANK_CHECK                                 8
+#define VENDOR_SPECIFIC                             9
+#define COPY_ABORTED                               10
+#define ABORTED_COMMAND                            11
+#define VOLUME_OVERFLOW                            13
+#define MISCOMPARE                                 14
+
+
+#define INVALID_CDB                                 0x20
+#define INVALID_FIELED_IN_COMMAND                   0x24
+#define PARAMETER_LIST_LENGTH_ERROR                 0x1A
+#define INVALID_FIELD_IN_PARAMETER_LIST             0x26
+#define ADDRESS_OUT_OF_RANGE                        0x21
+#define MEDIUM_NOT_PRESENT                          0x3A
+#define MEDIUM_HAVE_CHANGED                         0x28
+#define WRITE_PROTECTED                             0x27
+#define UNRECOVERED_READ_ERROR                      0x11
+#define WRITE_FAULT                                 0x03
+
+#define READ_FORMAT_CAPACITY_DATA_LEN               0x0C
+#define READ_CAPACITY10_DATA_LEN                    0x08
+#define MODE_SENSE10_DATA_LEN                       0x08
+#define MODE_SENSE6_DATA_LEN                        0x04
+#define REQUEST_SENSE_DATA_LEN                      0x12
+#define STANDARD_INQUIRY_DATA_LEN                   0x24
+#define BLKVFY                                      0x04
+
+extern  uint8_t Page00_Inquiry_Data[];
+extern  uint8_t Standard_Inquiry_Data[];
+extern  uint8_t Standard_Inquiry_Data2[];
+extern  uint8_t Mode_Sense6_data[];
+extern  uint8_t Mode_Sense10_data[];
+extern  uint8_t Scsi_Sense_Data[];
+extern  uint8_t ReadCapacity10_Data[];
+extern  uint8_t ReadFormatCapacity_Data [];
+/**
+  * @}
+  */
+
+
+/** @defgroup USBD_SCSI_Exported_TypesDefinitions
+  * @{
+  */
+
+typedef struct _SENSE_ITEM {
+  char Skey;
+  union {
+    struct _ASCs {
+      char ASC;
+      char ASCQ;
+    }b;
+    unsigned int        ASC;
+    char *pData;
+  } w;
+} USBD_SCSI_SenseTypeDef;
+/**
+  * @}
+  */
+
+/** @defgroup USBD_SCSI_Exported_Macros
+  * @{
+  */
+
+/**
+  * @}
+  */
+
+/** @defgroup USBD_SCSI_Exported_Variables
+  * @{
+  */
+
+/**
+  * @}
+  */
+/** @defgroup USBD_SCSI_Exported_FunctionsPrototype
+  * @{
+  */
+int8_t SCSI_ProcessCmd(USBD_HandleTypeDef  *pdev,
+                           uint8_t lun,
+                           uint8_t *cmd);
+
+void   SCSI_SenseCode(USBD_HandleTypeDef  *pdev,
+                      uint8_t lun,
+                      uint8_t sKey,
+                      uint8_t ASC);
+
+/**
+  * @}
+  */
+
+#endif /* __USBD_MSC_SCSI_H */
+/**
+  * @}
+  */
+
+/**
+  * @}
+  */
+
+/**
+* @}
+*/
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/ports/stm32/usbdev/class/src/usbd_msc_bot.c b/ports/stm32/usbdev/class/src/usbd_msc_bot.c
index 2fccd9e08..d20f7a8dc 100644
--- a/ports/stm32/usbdev/class/src/usbd_msc_bot.c
+++ b/ports/stm32/usbdev/class/src/usbd_msc_bot.c
@@ -1,407 +1,407 @@
-/**

-  ******************************************************************************

-  * @file    usbd_msc_bot.c

-  * @author  MCD Application Team

-  * @version V2.0.0

-  * @date    18-February-2014

-  * @brief   This file provides all the BOT protocol core functions.

-  ******************************************************************************

-  * @attention

-  *

-  * <h2><center>&copy; COPYRIGHT 2014 STMicroelectronics</center></h2>

-  *

-  * Licensed under MCD-ST Liberty SW License Agreement V2, (the "License");

-  * You may not use this file except in compliance with the License.

-  * You may obtain a copy of the License at:

-  *

-  *        http://www.st.com/software_license_agreement_liberty_v2

-  *

-  * Unless required by applicable law or agreed to in writing, software 

-  * distributed under the License is distributed on an "AS IS" BASIS, 

-  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-  * See the License for the specific language governing permissions and

-  * limitations under the License.

-  *

-  ******************************************************************************

-  */ 

-

-/* Includes ------------------------------------------------------------------*/

-#include "usbd_msc_bot.h"

-#include "usbd_msc_scsi.h"

-#include "usbd_cdc_msc_hid.h"

-#include "usbd_ioreq.h"

-

-/** @addtogroup STM32_USB_OTG_DEVICE_LIBRARY

-  * @{

-  */

-

-

-/** @defgroup MSC_BOT 

-  * @brief BOT protocol module

-  * @{

-  */ 

-

-/** @defgroup MSC_BOT_Private_TypesDefinitions

-  * @{

-  */ 

-/**

-  * @}

-  */ 

-

-

-/** @defgroup MSC_BOT_Private_Defines

-  * @{

-  */ 

-

-/**

-  * @}

-  */ 

-

-

-/** @defgroup MSC_BOT_Private_Macros

-  * @{

-  */ 

-/**

-  * @}

-  */ 

-

-

-/** @defgroup MSC_BOT_Private_Variables

-  * @{

-  */ 

-

-/**

-  * @}

-  */ 

-

-

-/** @defgroup MSC_BOT_Private_FunctionPrototypes

-  * @{

-  */ 

-static void MSC_BOT_CBW_Decode (USBD_HandleTypeDef  *pdev);

-

-static void MSC_BOT_SendData (USBD_HandleTypeDef  *pdev, 

-                              uint8_t* pbuf, 

-                              uint16_t len);

-

-static void MSC_BOT_Abort(USBD_HandleTypeDef  *pdev);

-/**

-  * @}

-  */ 

-

-

-/** @defgroup MSC_BOT_Private_Functions

-  * @{

-  */ 

-

-

-

-/**

-* @brief  MSC_BOT_Init

-*         Initialize the BOT Process

-* @param  pdev: device instance

-* @retval None

-*/

-void MSC_BOT_Init (USBD_HandleTypeDef  *pdev)

-{

-  USBD_MSC_BOT_HandleTypeDef *hmsc = &((usbd_cdc_msc_hid_state_t*)pdev->pClassData)->MSC_BOT_ClassData;

-    

-  hmsc->bot_state  = USBD_BOT_IDLE;

-  hmsc->bot_status = USBD_BOT_STATUS_NORMAL;

-  

-  hmsc->scsi_sense_tail = 0;

-  hmsc->scsi_sense_head = 0;

-  

-  hmsc->bdev_ops->Init(0);

-  

-  USBD_LL_FlushEP(pdev, MSC_OUT_EP);

-  USBD_LL_FlushEP(pdev, MSC_IN_EP);

-  

-  /* Prapare EP to Receive First BOT Cmd */

-  USBD_LL_PrepareReceive (pdev,

-                          MSC_OUT_EP,

-                          (uint8_t *)&hmsc->cbw,

-                          USBD_BOT_CBW_LENGTH);    

-}

-

-/**

-* @brief  MSC_BOT_Reset

-*         Reset the BOT Machine

-* @param  pdev: device instance

-* @retval  None

-*/

-void MSC_BOT_Reset (USBD_HandleTypeDef  *pdev)

-{

-  USBD_MSC_BOT_HandleTypeDef *hmsc = &((usbd_cdc_msc_hid_state_t*)pdev->pClassData)->MSC_BOT_ClassData;

-    

-  hmsc->bot_state  = USBD_BOT_IDLE;

-  hmsc->bot_status = USBD_BOT_STATUS_RECOVERY;  

-  

-  /* Prapare EP to Receive First BOT Cmd */

-  USBD_LL_PrepareReceive (pdev,

-                          MSC_OUT_EP,

-                          (uint8_t *)&hmsc->cbw,

-                          USBD_BOT_CBW_LENGTH);   

-}

-

-/**

-* @brief  MSC_BOT_DeInit

-*         Uninitialize the BOT Machine

-* @param  pdev: device instance

-* @retval None

-*/

-void MSC_BOT_DeInit (USBD_HandleTypeDef  *pdev)

-{

-  USBD_MSC_BOT_HandleTypeDef *hmsc = &((usbd_cdc_msc_hid_state_t*)pdev->pClassData)->MSC_BOT_ClassData;

-  hmsc->bot_state  = USBD_BOT_IDLE;

-}

-

-/**

-* @brief  MSC_BOT_DataIn

-*         Handle BOT IN data stage

-* @param  pdev: device instance

-* @param  epnum: endpoint index

-* @retval None

-*/

-void MSC_BOT_DataIn (USBD_HandleTypeDef  *pdev, 

-                     uint8_t epnum)

-{

-  USBD_MSC_BOT_HandleTypeDef *hmsc = &((usbd_cdc_msc_hid_state_t*)pdev->pClassData)->MSC_BOT_ClassData;

-  

-  switch (hmsc->bot_state)

-  {

-  case USBD_BOT_DATA_IN:

-    if(SCSI_ProcessCmd(pdev,

-                        hmsc->cbw.bLUN,

-                        &hmsc->cbw.CB[0]) < 0)

-    {

-      MSC_BOT_SendCSW (pdev, USBD_CSW_CMD_FAILED);

-    }

-    break;

-    

-  case USBD_BOT_SEND_DATA:

-  case USBD_BOT_LAST_DATA_IN:

-    MSC_BOT_SendCSW (pdev, USBD_CSW_CMD_PASSED);

-    

-    break;

-    

-  default:

-    break;

-  }

-}

-/**

-* @brief  MSC_BOT_DataOut

-*         Proccess MSC OUT data

-* @param  pdev: device instance

-* @param  epnum: endpoint index

-* @retval None

-*/

-void MSC_BOT_DataOut (USBD_HandleTypeDef  *pdev, 

-                      uint8_t epnum)

-{

-  USBD_MSC_BOT_HandleTypeDef *hmsc = &((usbd_cdc_msc_hid_state_t*)pdev->pClassData)->MSC_BOT_ClassData;

-  

-  switch (hmsc->bot_state)

-  {

-  case USBD_BOT_IDLE:

-    MSC_BOT_CBW_Decode(pdev);

-    break;

-    

-  case USBD_BOT_DATA_OUT:

-    

-    if(SCSI_ProcessCmd(pdev,

-                        hmsc->cbw.bLUN,

-                        &hmsc->cbw.CB[0]) < 0)

-    {

-      MSC_BOT_SendCSW (pdev, USBD_CSW_CMD_FAILED);

-    }

-

-    break;

-    

-  default:

-    break;

-  }

-}

-

-/**

-* @brief  MSC_BOT_CBW_Decode

-*         Decode the CBW command and set the BOT state machine accordingtly  

-* @param  pdev: device instance

-* @retval None

-*/

-static void  MSC_BOT_CBW_Decode (USBD_HandleTypeDef  *pdev)

-{

-  USBD_MSC_BOT_HandleTypeDef *hmsc = &((usbd_cdc_msc_hid_state_t*)pdev->pClassData)->MSC_BOT_ClassData;

-  

-  hmsc->csw.dTag = hmsc->cbw.dTag;

-  hmsc->csw.dDataResidue = hmsc->cbw.dDataLength;

-  

-  if ((USBD_LL_GetRxDataSize (pdev ,MSC_OUT_EP) != USBD_BOT_CBW_LENGTH) ||

-      (hmsc->cbw.dSignature != USBD_BOT_CBW_SIGNATURE)||

-        (hmsc->cbw.bLUN > 1) || 

-          (hmsc->cbw.bCBLength < 1) || 

-            (hmsc->cbw.bCBLength > 16))

-  {

-    

-    SCSI_SenseCode(pdev,

-                   hmsc->cbw.bLUN, 

-                   ILLEGAL_REQUEST, 

-                   INVALID_CDB);

-    

-    hmsc->bot_status = USBD_BOT_STATUS_ERROR;   

-    MSC_BOT_Abort(pdev);

- 

-  }

-  else

-  {

-    if(SCSI_ProcessCmd(pdev,

-                       hmsc->cbw.bLUN,

-                       &hmsc->cbw.CB[0]) < 0)

-    {

-      if(hmsc->bot_state == USBD_BOT_NO_DATA)

-      {

-       MSC_BOT_SendCSW (pdev,

-                         USBD_CSW_CMD_FAILED); 

-      }

-      else

-      {

-        MSC_BOT_Abort(pdev);

-      }

-    }

-    /*Burst xfer handled internally*/

-    else if ((hmsc->bot_state != USBD_BOT_DATA_IN) && 

-             (hmsc->bot_state != USBD_BOT_DATA_OUT) &&

-             (hmsc->bot_state != USBD_BOT_LAST_DATA_IN)) 

-    {

-      if (hmsc->bot_data_length > 0)

-      {

-        MSC_BOT_SendData(pdev,

-                         hmsc->bot_data, 

-                         hmsc->bot_data_length);

-      }

-      else if (hmsc->bot_data_length == 0) 

-      {

-        MSC_BOT_SendCSW (pdev,

-                         USBD_CSW_CMD_PASSED);

-      }

-    }

-  }

-}

-

-/**

-* @brief  MSC_BOT_SendData

-*         Send the requested data

-* @param  pdev: device instance

-* @param  buf: pointer to data buffer

-* @param  len: Data Length

-* @retval None

-*/

-static void  MSC_BOT_SendData(USBD_HandleTypeDef  *pdev,

-                              uint8_t* buf, 

-                              uint16_t len)

-{

-  USBD_MSC_BOT_HandleTypeDef *hmsc = &((usbd_cdc_msc_hid_state_t*)pdev->pClassData)->MSC_BOT_ClassData;

-  

-  len = MIN (hmsc->cbw.dDataLength, len);

-  hmsc->csw.dDataResidue -= len;

-  hmsc->csw.bStatus = USBD_CSW_CMD_PASSED;

-  hmsc->bot_state = USBD_BOT_SEND_DATA;

-  

-  USBD_LL_Transmit (pdev, MSC_IN_EP, buf, len);  

-}

-

-/**

-* @brief  MSC_BOT_SendCSW

-*         Send the Command Status Wrapper

-* @param  pdev: device instance

-* @param  status : CSW status

-* @retval None

-*/

-void  MSC_BOT_SendCSW (USBD_HandleTypeDef  *pdev,

-                              uint8_t CSW_Status)

-{

-  USBD_MSC_BOT_HandleTypeDef *hmsc = &((usbd_cdc_msc_hid_state_t*)pdev->pClassData)->MSC_BOT_ClassData;

-  

-  hmsc->csw.dSignature = USBD_BOT_CSW_SIGNATURE;

-  hmsc->csw.bStatus = CSW_Status;

-  hmsc->bot_state = USBD_BOT_IDLE;

-  

-  USBD_LL_Transmit (pdev, 

-             MSC_IN_EP, 

-             (uint8_t *)&hmsc->csw, 

-             USBD_BOT_CSW_LENGTH);

-  

-  /* Prapare EP to Receive next Cmd */

-  USBD_LL_PrepareReceive (pdev,

-                    MSC_OUT_EP,

-                    (uint8_t *)&hmsc->cbw, 

-                    USBD_BOT_CBW_LENGTH);  

-  

-}

-

-/**

-* @brief  MSC_BOT_Abort

-*         Abort the current transfer

-* @param  pdev: device instance

-* @retval status

-*/

-

-static void  MSC_BOT_Abort (USBD_HandleTypeDef  *pdev)

-{

-  USBD_MSC_BOT_HandleTypeDef *hmsc = &((usbd_cdc_msc_hid_state_t*)pdev->pClassData)->MSC_BOT_ClassData;

-  

-  if ((hmsc->cbw.bmFlags == 0) && 

-      (hmsc->cbw.dDataLength != 0) &&

-      (hmsc->bot_status == USBD_BOT_STATUS_NORMAL) )

-  {

-    USBD_LL_StallEP(pdev, MSC_OUT_EP );

-  }

-  USBD_LL_StallEP(pdev, MSC_IN_EP);

-  

-  if(hmsc->bot_status == USBD_BOT_STATUS_ERROR)

-  {

-    USBD_LL_PrepareReceive (pdev,

-                      MSC_OUT_EP,

-                      (uint8_t *)&hmsc->cbw, 

-                      USBD_BOT_CBW_LENGTH);    

-  }

-}

-

-/**

-* @brief  MSC_BOT_CplClrFeature

-*         Complete the clear feature request

-* @param  pdev: device instance

-* @param  epnum: endpoint index

-* @retval None

-*/

-

-void  MSC_BOT_CplClrFeature (USBD_HandleTypeDef  *pdev, uint8_t epnum)

-{

-  USBD_MSC_BOT_HandleTypeDef *hmsc = &((usbd_cdc_msc_hid_state_t*)pdev->pClassData)->MSC_BOT_ClassData;

-  

-  if(hmsc->bot_status == USBD_BOT_STATUS_ERROR )/* Bad CBW Signature */

-  {

-    USBD_LL_StallEP(pdev, MSC_IN_EP);

-    hmsc->bot_status = USBD_BOT_STATUS_NORMAL;    

-  }

-  else if(((epnum & 0x80) == 0x80) && ( hmsc->bot_status != USBD_BOT_STATUS_RECOVERY))

-  {

-    MSC_BOT_SendCSW (pdev, USBD_CSW_CMD_FAILED);

-  }

-  

-}

-/**

-  * @}

-  */ 

-

-

-/**

-  * @}

-  */ 

-

-

-/**

-  * @}

-  */ 

-

-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

+/**
+  ******************************************************************************
+  * @file    usbd_msc_bot.c
+  * @author  MCD Application Team
+  * @version V2.0.0
+  * @date    18-February-2014
+  * @brief   This file provides all the BOT protocol core functions.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; COPYRIGHT 2014 STMicroelectronics</center></h2>
+  *
+  * Licensed under MCD-ST Liberty SW License Agreement V2, (the "License");
+  * You may not use this file except in compliance with the License.
+  * You may obtain a copy of the License at:
+  *
+  *        http://www.st.com/software_license_agreement_liberty_v2
+  *
+  * Unless required by applicable law or agreed to in writing, software
+  * distributed under the License is distributed on an "AS IS" BASIS,
+  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  * See the License for the specific language governing permissions and
+  * limitations under the License.
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "usbd_msc_bot.h"
+#include "usbd_msc_scsi.h"
+#include "usbd_cdc_msc_hid.h"
+#include "usbd_ioreq.h"
+
+/** @addtogroup STM32_USB_OTG_DEVICE_LIBRARY
+  * @{
+  */
+
+
+/** @defgroup MSC_BOT
+  * @brief BOT protocol module
+  * @{
+  */
+
+/** @defgroup MSC_BOT_Private_TypesDefinitions
+  * @{
+  */
+/**
+  * @}
+  */
+
+
+/** @defgroup MSC_BOT_Private_Defines
+  * @{
+  */
+
+/**
+  * @}
+  */
+
+
+/** @defgroup MSC_BOT_Private_Macros
+  * @{
+  */
+/**
+  * @}
+  */
+
+
+/** @defgroup MSC_BOT_Private_Variables
+  * @{
+  */
+
+/**
+  * @}
+  */
+
+
+/** @defgroup MSC_BOT_Private_FunctionPrototypes
+  * @{
+  */
+static void MSC_BOT_CBW_Decode (USBD_HandleTypeDef  *pdev);
+
+static void MSC_BOT_SendData (USBD_HandleTypeDef  *pdev,
+                              uint8_t* pbuf,
+                              uint16_t len);
+
+static void MSC_BOT_Abort(USBD_HandleTypeDef  *pdev);
+/**
+  * @}
+  */
+
+
+/** @defgroup MSC_BOT_Private_Functions
+  * @{
+  */
+
+
+
+/**
+* @brief  MSC_BOT_Init
+*         Initialize the BOT Process
+* @param  pdev: device instance
+* @retval None
+*/
+void MSC_BOT_Init (USBD_HandleTypeDef  *pdev)
+{
+  USBD_MSC_BOT_HandleTypeDef *hmsc = &((usbd_cdc_msc_hid_state_t*)pdev->pClassData)->MSC_BOT_ClassData;
+
+  hmsc->bot_state  = USBD_BOT_IDLE;
+  hmsc->bot_status = USBD_BOT_STATUS_NORMAL;
+
+  hmsc->scsi_sense_tail = 0;
+  hmsc->scsi_sense_head = 0;
+
+  hmsc->bdev_ops->Init(0);
+
+  USBD_LL_FlushEP(pdev, MSC_OUT_EP);
+  USBD_LL_FlushEP(pdev, MSC_IN_EP);
+
+  /* Prapare EP to Receive First BOT Cmd */
+  USBD_LL_PrepareReceive (pdev,
+                          MSC_OUT_EP,
+                          (uint8_t *)&hmsc->cbw,
+                          USBD_BOT_CBW_LENGTH);
+}
+
+/**
+* @brief  MSC_BOT_Reset
+*         Reset the BOT Machine
+* @param  pdev: device instance
+* @retval  None
+*/
+void MSC_BOT_Reset (USBD_HandleTypeDef  *pdev)
+{
+  USBD_MSC_BOT_HandleTypeDef *hmsc = &((usbd_cdc_msc_hid_state_t*)pdev->pClassData)->MSC_BOT_ClassData;
+
+  hmsc->bot_state  = USBD_BOT_IDLE;
+  hmsc->bot_status = USBD_BOT_STATUS_RECOVERY;
+
+  /* Prapare EP to Receive First BOT Cmd */
+  USBD_LL_PrepareReceive (pdev,
+                          MSC_OUT_EP,
+                          (uint8_t *)&hmsc->cbw,
+                          USBD_BOT_CBW_LENGTH);
+}
+
+/**
+* @brief  MSC_BOT_DeInit
+*         Uninitialize the BOT Machine
+* @param  pdev: device instance
+* @retval None
+*/
+void MSC_BOT_DeInit (USBD_HandleTypeDef  *pdev)
+{
+  USBD_MSC_BOT_HandleTypeDef *hmsc = &((usbd_cdc_msc_hid_state_t*)pdev->pClassData)->MSC_BOT_ClassData;
+  hmsc->bot_state  = USBD_BOT_IDLE;
+}
+
+/**
+* @brief  MSC_BOT_DataIn
+*         Handle BOT IN data stage
+* @param  pdev: device instance
+* @param  epnum: endpoint index
+* @retval None
+*/
+void MSC_BOT_DataIn (USBD_HandleTypeDef  *pdev,
+                     uint8_t epnum)
+{
+  USBD_MSC_BOT_HandleTypeDef *hmsc = &((usbd_cdc_msc_hid_state_t*)pdev->pClassData)->MSC_BOT_ClassData;
+
+  switch (hmsc->bot_state)
+  {
+  case USBD_BOT_DATA_IN:
+    if(SCSI_ProcessCmd(pdev,
+                        hmsc->cbw.bLUN,
+                        &hmsc->cbw.CB[0]) < 0)
+    {
+      MSC_BOT_SendCSW (pdev, USBD_CSW_CMD_FAILED);
+    }
+    break;
+
+  case USBD_BOT_SEND_DATA:
+  case USBD_BOT_LAST_DATA_IN:
+    MSC_BOT_SendCSW (pdev, USBD_CSW_CMD_PASSED);
+
+    break;
+
+  default:
+    break;
+  }
+}
+/**
+* @brief  MSC_BOT_DataOut
+*         Proccess MSC OUT data
+* @param  pdev: device instance
+* @param  epnum: endpoint index
+* @retval None
+*/
+void MSC_BOT_DataOut (USBD_HandleTypeDef  *pdev,
+                      uint8_t epnum)
+{
+  USBD_MSC_BOT_HandleTypeDef *hmsc = &((usbd_cdc_msc_hid_state_t*)pdev->pClassData)->MSC_BOT_ClassData;
+
+  switch (hmsc->bot_state)
+  {
+  case USBD_BOT_IDLE:
+    MSC_BOT_CBW_Decode(pdev);
+    break;
+
+  case USBD_BOT_DATA_OUT:
+
+    if(SCSI_ProcessCmd(pdev,
+                        hmsc->cbw.bLUN,
+                        &hmsc->cbw.CB[0]) < 0)
+    {
+      MSC_BOT_SendCSW (pdev, USBD_CSW_CMD_FAILED);
+    }
+
+    break;
+
+  default:
+    break;
+  }
+}
+
+/**
+* @brief  MSC_BOT_CBW_Decode
+*         Decode the CBW command and set the BOT state machine accordingtly
+* @param  pdev: device instance
+* @retval None
+*/
+static void  MSC_BOT_CBW_Decode (USBD_HandleTypeDef  *pdev)
+{
+  USBD_MSC_BOT_HandleTypeDef *hmsc = &((usbd_cdc_msc_hid_state_t*)pdev->pClassData)->MSC_BOT_ClassData;
+
+  hmsc->csw.dTag = hmsc->cbw.dTag;
+  hmsc->csw.dDataResidue = hmsc->cbw.dDataLength;
+
+  if ((USBD_LL_GetRxDataSize (pdev ,MSC_OUT_EP) != USBD_BOT_CBW_LENGTH) ||
+      (hmsc->cbw.dSignature != USBD_BOT_CBW_SIGNATURE)||
+        (hmsc->cbw.bLUN > 1) ||
+          (hmsc->cbw.bCBLength < 1) ||
+            (hmsc->cbw.bCBLength > 16))
+  {
+
+    SCSI_SenseCode(pdev,
+                   hmsc->cbw.bLUN,
+                   ILLEGAL_REQUEST,
+                   INVALID_CDB);
+
+    hmsc->bot_status = USBD_BOT_STATUS_ERROR;
+    MSC_BOT_Abort(pdev);
+
+  }
+  else
+  {
+    if(SCSI_ProcessCmd(pdev,
+                       hmsc->cbw.bLUN,
+                       &hmsc->cbw.CB[0]) < 0)
+    {
+      if(hmsc->bot_state == USBD_BOT_NO_DATA)
+      {
+       MSC_BOT_SendCSW (pdev,
+                         USBD_CSW_CMD_FAILED);
+      }
+      else
+      {
+        MSC_BOT_Abort(pdev);
+      }
+    }
+    /*Burst xfer handled internally*/
+    else if ((hmsc->bot_state != USBD_BOT_DATA_IN) &&
+             (hmsc->bot_state != USBD_BOT_DATA_OUT) &&
+             (hmsc->bot_state != USBD_BOT_LAST_DATA_IN))
+    {
+      if (hmsc->bot_data_length > 0)
+      {
+        MSC_BOT_SendData(pdev,
+                         hmsc->bot_data,
+                         hmsc->bot_data_length);
+      }
+      else if (hmsc->bot_data_length == 0)
+      {
+        MSC_BOT_SendCSW (pdev,
+                         USBD_CSW_CMD_PASSED);
+      }
+    }
+  }
+}
+
+/**
+* @brief  MSC_BOT_SendData
+*         Send the requested data
+* @param  pdev: device instance
+* @param  buf: pointer to data buffer
+* @param  len: Data Length
+* @retval None
+*/
+static void  MSC_BOT_SendData(USBD_HandleTypeDef  *pdev,
+                              uint8_t* buf,
+                              uint16_t len)
+{
+  USBD_MSC_BOT_HandleTypeDef *hmsc = &((usbd_cdc_msc_hid_state_t*)pdev->pClassData)->MSC_BOT_ClassData;
+
+  len = MIN (hmsc->cbw.dDataLength, len);
+  hmsc->csw.dDataResidue -= len;
+  hmsc->csw.bStatus = USBD_CSW_CMD_PASSED;
+  hmsc->bot_state = USBD_BOT_SEND_DATA;
+
+  USBD_LL_Transmit (pdev, MSC_IN_EP, buf, len);
+}
+
+/**
+* @brief  MSC_BOT_SendCSW
+*         Send the Command Status Wrapper
+* @param  pdev: device instance
+* @param  status : CSW status
+* @retval None
+*/
+void  MSC_BOT_SendCSW (USBD_HandleTypeDef  *pdev,
+                              uint8_t CSW_Status)
+{
+  USBD_MSC_BOT_HandleTypeDef *hmsc = &((usbd_cdc_msc_hid_state_t*)pdev->pClassData)->MSC_BOT_ClassData;
+
+  hmsc->csw.dSignature = USBD_BOT_CSW_SIGNATURE;
+  hmsc->csw.bStatus = CSW_Status;
+  hmsc->bot_state = USBD_BOT_IDLE;
+
+  USBD_LL_Transmit (pdev,
+             MSC_IN_EP,
+             (uint8_t *)&hmsc->csw,
+             USBD_BOT_CSW_LENGTH);
+
+  /* Prapare EP to Receive next Cmd */
+  USBD_LL_PrepareReceive (pdev,
+                    MSC_OUT_EP,
+                    (uint8_t *)&hmsc->cbw,
+                    USBD_BOT_CBW_LENGTH);
+
+}
+
+/**
+* @brief  MSC_BOT_Abort
+*         Abort the current transfer
+* @param  pdev: device instance
+* @retval status
+*/
+
+static void  MSC_BOT_Abort (USBD_HandleTypeDef  *pdev)
+{
+  USBD_MSC_BOT_HandleTypeDef *hmsc = &((usbd_cdc_msc_hid_state_t*)pdev->pClassData)->MSC_BOT_ClassData;
+
+  if ((hmsc->cbw.bmFlags == 0) &&
+      (hmsc->cbw.dDataLength != 0) &&
+      (hmsc->bot_status == USBD_BOT_STATUS_NORMAL) )
+  {
+    USBD_LL_StallEP(pdev, MSC_OUT_EP );
+  }
+  USBD_LL_StallEP(pdev, MSC_IN_EP);
+
+  if(hmsc->bot_status == USBD_BOT_STATUS_ERROR)
+  {
+    USBD_LL_PrepareReceive (pdev,
+                      MSC_OUT_EP,
+                      (uint8_t *)&hmsc->cbw,
+                      USBD_BOT_CBW_LENGTH);
+  }
+}
+
+/**
+* @brief  MSC_BOT_CplClrFeature
+*         Complete the clear feature request
+* @param  pdev: device instance
+* @param  epnum: endpoint index
+* @retval None
+*/
+
+void  MSC_BOT_CplClrFeature (USBD_HandleTypeDef  *pdev, uint8_t epnum)
+{
+  USBD_MSC_BOT_HandleTypeDef *hmsc = &((usbd_cdc_msc_hid_state_t*)pdev->pClassData)->MSC_BOT_ClassData;
+
+  if(hmsc->bot_status == USBD_BOT_STATUS_ERROR )/* Bad CBW Signature */
+  {
+    USBD_LL_StallEP(pdev, MSC_IN_EP);
+    hmsc->bot_status = USBD_BOT_STATUS_NORMAL;
+  }
+  else if(((epnum & 0x80) == 0x80) && ( hmsc->bot_status != USBD_BOT_STATUS_RECOVERY))
+  {
+    MSC_BOT_SendCSW (pdev, USBD_CSW_CMD_FAILED);
+  }
+
+}
+/**
+  * @}
+  */
+
+
+/**
+  * @}
+  */
+
+
+/**
+  * @}
+  */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/ports/stm32/usbdev/class/src/usbd_msc_data.c b/ports/stm32/usbdev/class/src/usbd_msc_data.c
index 4d72bd5fc..96740a3a4 100644
--- a/ports/stm32/usbdev/class/src/usbd_msc_data.c
+++ b/ports/stm32/usbdev/class/src/usbd_msc_data.c
@@ -1,134 +1,134 @@
-/**

-  ******************************************************************************

-  * @file    usbd_msc_data.c

-  * @author  MCD Application Team

-  * @version V2.0.0

-  * @date    18-February-2014

-  * @brief   This file provides all the vital inquiry pages and sense data.

-  ******************************************************************************

-  * @attention

-  *

-  * <h2><center>&copy; COPYRIGHT 2014 STMicroelectronics</center></h2>

-  *

-  * Licensed under MCD-ST Liberty SW License Agreement V2, (the "License");

-  * You may not use this file except in compliance with the License.

-  * You may obtain a copy of the License at:

-  *

-  *        http://www.st.com/software_license_agreement_liberty_v2

-  *

-  * Unless required by applicable law or agreed to in writing, software 

-  * distributed under the License is distributed on an "AS IS" BASIS, 

-  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-  * See the License for the specific language governing permissions and

-  * limitations under the License.

-  *

-  ******************************************************************************

-  */ 

-

-/* Includes ------------------------------------------------------------------*/

-#include "usbd_msc_data.h"

-

-

-/** @addtogroup STM32_USB_OTG_DEVICE_LIBRARY

-  * @{

-  */

-

-

-/** @defgroup MSC_DATA 

-  * @brief Mass storage info/data module

-  * @{

-  */ 

-

-/** @defgroup MSC_DATA_Private_TypesDefinitions

-  * @{

-  */ 

-/**

-  * @}

-  */ 

-

-

-/** @defgroup MSC_DATA_Private_Defines

-  * @{

-  */ 

-/**

-  * @}

-  */ 

-

-

-/** @defgroup MSC_DATA_Private_Macros

-  * @{

-  */ 

-/**

-  * @}

-  */ 

-

-

-/** @defgroup MSC_DATA_Private_Variables

-  * @{

-  */ 

-

-

-/* USB Mass storage Page 0 Inquiry Data */

-const uint8_t  MSC_Page00_Inquiry_Data[] = {//7						

-	0x00,		

-	0x00, 

-	0x00, 

-	(LENGTH_INQUIRY_PAGE00 - 4),

-	0x00, 

-	0x80, 

-	0x83 

-};  

-/* USB Mass storage sense 6  Data */

-const uint8_t  MSC_Mode_Sense6_data[] = {

-	0x00,

-	0x00,

-	0x00,

-	0x00,

-	0x00,

-	0x00, 

-	0x00,

-	0x00

-};	

-/* USB Mass storage sense 10  Data */

-const uint8_t  MSC_Mode_Sense10_data[] = {

-	0x00,

-	0x06, 

-	0x00, 

-	0x00, 

-	0x00, 

-	0x00, 

-	0x00, 

-	0x00

-};

-/**

-  * @}

-  */ 

-

-

-/** @defgroup MSC_DATA_Private_FunctionPrototypes

-  * @{

-  */ 

-/**

-  * @}

-  */ 

-

-

-/** @defgroup MSC_DATA_Private_Functions

-  * @{

-  */ 

-

-/**

-  * @}

-  */ 

-

-

-/**

-  * @}

-  */ 

-

-

-/**

-  * @}

-  */ 

-

-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

+/**
+  ******************************************************************************
+  * @file    usbd_msc_data.c
+  * @author  MCD Application Team
+  * @version V2.0.0
+  * @date    18-February-2014
+  * @brief   This file provides all the vital inquiry pages and sense data.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; COPYRIGHT 2014 STMicroelectronics</center></h2>
+  *
+  * Licensed under MCD-ST Liberty SW License Agreement V2, (the "License");
+  * You may not use this file except in compliance with the License.
+  * You may obtain a copy of the License at:
+  *
+  *        http://www.st.com/software_license_agreement_liberty_v2
+  *
+  * Unless required by applicable law or agreed to in writing, software
+  * distributed under the License is distributed on an "AS IS" BASIS,
+  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  * See the License for the specific language governing permissions and
+  * limitations under the License.
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "usbd_msc_data.h"
+
+
+/** @addtogroup STM32_USB_OTG_DEVICE_LIBRARY
+  * @{
+  */
+
+
+/** @defgroup MSC_DATA
+  * @brief Mass storage info/data module
+  * @{
+  */
+
+/** @defgroup MSC_DATA_Private_TypesDefinitions
+  * @{
+  */
+/**
+  * @}
+  */
+
+
+/** @defgroup MSC_DATA_Private_Defines
+  * @{
+  */
+/**
+  * @}
+  */
+
+
+/** @defgroup MSC_DATA_Private_Macros
+  * @{
+  */
+/**
+  * @}
+  */
+
+
+/** @defgroup MSC_DATA_Private_Variables
+  * @{
+  */
+
+
+/* USB Mass storage Page 0 Inquiry Data */
+const uint8_t  MSC_Page00_Inquiry_Data[] = {//7
+        0x00,
+        0x00,
+        0x00,
+        (LENGTH_INQUIRY_PAGE00 - 4),
+        0x00,
+        0x80,
+        0x83
+};
+/* USB Mass storage sense 6  Data */
+const uint8_t  MSC_Mode_Sense6_data[] = {
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00
+};
+/* USB Mass storage sense 10  Data */
+const uint8_t  MSC_Mode_Sense10_data[] = {
+        0x00,
+        0x06,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00,
+        0x00
+};
+/**
+  * @}
+  */
+
+
+/** @defgroup MSC_DATA_Private_FunctionPrototypes
+  * @{
+  */
+/**
+  * @}
+  */
+
+
+/** @defgroup MSC_DATA_Private_Functions
+  * @{
+  */
+
+/**
+  * @}
+  */
+
+
+/**
+  * @}
+  */
+
+
+/**
+  * @}
+  */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/ports/stm32/usbdev/class/src/usbd_msc_scsi.c b/ports/stm32/usbdev/class/src/usbd_msc_scsi.c
index b5363e2d4..9da903377 100644
--- a/ports/stm32/usbdev/class/src/usbd_msc_scsi.c
+++ b/ports/stm32/usbdev/class/src/usbd_msc_scsi.c
@@ -1,811 +1,811 @@
-/**

-  ******************************************************************************

-  * @file    usbd_msc_scsi.c

-  * @author  MCD Application Team

-  * @version V2.0.0

-  * @date    18-February-2014

-  * @brief   This file provides all the USBD SCSI layer functions.

-  ******************************************************************************

-  * @attention

-  *

-  * <h2><center>&copy; COPYRIGHT 2014 STMicroelectronics</center></h2>

-  *

-  * Licensed under MCD-ST Liberty SW License Agreement V2, (the "License");

-  * You may not use this file except in compliance with the License.

-  * You may obtain a copy of the License at:

-  *

-  *        http://www.st.com/software_license_agreement_liberty_v2

-  *

-  * Unless required by applicable law or agreed to in writing, software 

-  * distributed under the License is distributed on an "AS IS" BASIS, 

-  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-  * See the License for the specific language governing permissions and

-  * limitations under the License.

-  *

-  ******************************************************************************

-  */ 

-

-/* Includes ------------------------------------------------------------------*/

-#include "usbd_msc_bot.h"

-#include "usbd_msc_scsi.h"

-#include "usbd_msc_data.h"

-#include "usbd_cdc_msc_hid.h"

-

-

-

-/** @addtogroup STM32_USB_OTG_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

-  * @{

-  */ 

-

-/**

-  * @}

-  */ 

-

-

-/** @defgroup MSC_SCSI_Private_FunctionPrototypes

-  * @{

-  */ 

-static int8_t SCSI_TestUnitReady(USBD_HandleTypeDef  *pdev, uint8_t lun, uint8_t *params);

-static int8_t SCSI_Inquiry(USBD_HandleTypeDef  *pdev, uint8_t lun, uint8_t *params);

-static int8_t SCSI_ReadFormatCapacity(USBD_HandleTypeDef  *pdev, uint8_t lun, uint8_t *params);

-static int8_t SCSI_ReadCapacity10(USBD_HandleTypeDef  *pdev, uint8_t lun, uint8_t *params);

-static int8_t SCSI_RequestSense (USBD_HandleTypeDef  *pdev, uint8_t lun, uint8_t *params);

-static int8_t SCSI_StartStopUnit(USBD_HandleTypeDef  *pdev, uint8_t lun, uint8_t *params);

-static int8_t SCSI_AllowMediumRemoval(USBD_HandleTypeDef  *pdev, uint8_t lun, uint8_t *params);

-static int8_t SCSI_ModeSense6 (USBD_HandleTypeDef  *pdev, uint8_t lun, uint8_t *params);

-static int8_t SCSI_ModeSense10 (USBD_HandleTypeDef  *pdev, uint8_t lun, uint8_t *params);

-static int8_t SCSI_SynchronizeCache(USBD_HandleTypeDef  *pdev, uint8_t lun, uint8_t *params);

-static int8_t SCSI_Write10(USBD_HandleTypeDef  *pdev, uint8_t lun , uint8_t *params);

-static int8_t SCSI_Read10(USBD_HandleTypeDef  *pdev, uint8_t lun , uint8_t *params);

-static int8_t SCSI_Verify10(USBD_HandleTypeDef  *pdev, uint8_t lun, uint8_t *params);

-static int8_t SCSI_CheckAddressRange (USBD_HandleTypeDef  *pdev, 

-                                      uint8_t lun , 

-                                      uint32_t blk_offset , 

-                                      uint16_t blk_nbr);

-static int8_t SCSI_ProcessRead (USBD_HandleTypeDef  *pdev,

-                                uint8_t lun);

-

-static int8_t SCSI_ProcessWrite (USBD_HandleTypeDef  *pdev,

-                                 uint8_t lun);

-/**

-  * @}

-  */ 

-

-

-/** @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

-*/

-int8_t SCSI_ProcessCmd(USBD_HandleTypeDef  *pdev,

-                           uint8_t lun, 

-                           uint8_t *params)

-{

-    /*

-    if (params[0] != SCSI_READ10 && params[0] != SCSI_WRITE10) {

-        printf("SCSI_ProcessCmd(lun=%d, params=%x, %x)\n", lun, params[0], params[1]);

-    }

-    */

-  

-  switch (params[0])

-  {

-  case SCSI_TEST_UNIT_READY:

-    return SCSI_TestUnitReady(pdev, lun, params);

-    

-  case SCSI_REQUEST_SENSE:

-    return SCSI_RequestSense (pdev, lun, params);

-  case SCSI_INQUIRY:

-    return SCSI_Inquiry(pdev, lun, params);

-    

-  case SCSI_START_STOP_UNIT:

-    return SCSI_StartStopUnit(pdev, lun, params);

-    

-  case SCSI_ALLOW_MEDIUM_REMOVAL:

-    return SCSI_AllowMediumRemoval(pdev, lun, params);

-    

-  case SCSI_MODE_SENSE6:

-    return SCSI_ModeSense6 (pdev, lun, params);

-    

-  case SCSI_MODE_SENSE10:

-    return SCSI_ModeSense10 (pdev, lun, params);

-    

-  case SCSI_SYNCHRONIZE_CACHE10:

-  case SCSI_SYNCHRONIZE_CACHE16:

-    return SCSI_SynchronizeCache(pdev, lun, params);

-

-  case SCSI_READ_FORMAT_CAPACITIES:

-    return SCSI_ReadFormatCapacity(pdev, lun, params);

-    

-  case SCSI_READ_CAPACITY10:

-    return SCSI_ReadCapacity10(pdev, lun, params);

-    

-  case SCSI_READ10:

-    return SCSI_Read10(pdev, lun, params); 

-    

-  case SCSI_WRITE10:

-    return SCSI_Write10(pdev, lun, params);

-    

-  case SCSI_VERIFY10:

-    return SCSI_Verify10(pdev, lun, params);

-    

-  default:

-    SCSI_SenseCode(pdev, 

-                   lun,

-                   ILLEGAL_REQUEST, 

-                   INVALID_CDB);    

-    return -1;

-  }

-}

-

-

-/**

-* @brief  SCSI_TestUnitReady

-*         Process SCSI Test Unit Ready Command

-* @param  lun: Logical unit number

-* @param  params: Command parameters

-* @retval status

-*/

-static int8_t SCSI_TestUnitReady(USBD_HandleTypeDef  *pdev, uint8_t lun, uint8_t *params)

-{

-  USBD_MSC_BOT_HandleTypeDef *hmsc = &((usbd_cdc_msc_hid_state_t*)pdev->pClassData)->MSC_BOT_ClassData;

-    

-  /* case 9 : Hi > D0 */

-  if (hmsc->cbw.dDataLength != 0)

-  {

-    SCSI_SenseCode(pdev,

-                   hmsc->cbw.bLUN, 

-                   ILLEGAL_REQUEST, 

-                   INVALID_CDB);

-    return -1;

-  }  

-  

-  if(hmsc->bdev_ops->IsReady(lun) !=0 )

-  {

-    SCSI_SenseCode(pdev,

-                   lun,

-                   NOT_READY, 

-                   MEDIUM_NOT_PRESENT);

-    

-    hmsc->bot_state = USBD_BOT_NO_DATA;

-    return -1;

-  } 

-  hmsc->bot_data_length = 0;

-  return 0;

-}

-

-/**

-* @brief  SCSI_Inquiry

-*         Process Inquiry command

-* @param  lun: Logical unit number

-* @param  params: Command parameters

-* @retval status

-*/

-static int8_t  SCSI_Inquiry(USBD_HandleTypeDef  *pdev, uint8_t lun, uint8_t *params)

-{

-  uint8_t* pPage;

-  uint16_t len;

-  USBD_MSC_BOT_HandleTypeDef *hmsc = &((usbd_cdc_msc_hid_state_t*)pdev->pClassData)->MSC_BOT_ClassData;

-  

-  if (params[1] & 0x01)/*Evpd is set*/

-  {

-    pPage = (uint8_t *)MSC_Page00_Inquiry_Data;

-    len = LENGTH_INQUIRY_PAGE00;

-  }

-  else

-  {

-    

-    pPage = (uint8_t *)&hmsc->bdev_ops->pInquiry[lun * STANDARD_INQUIRY_DATA_LEN];

-    len = pPage[4] + 5;

-    

-    if (params[4] <= len)

-    {

-      len = params[4];

-    }

-  }

-  hmsc->bot_data_length = len;

-  

-  while (len) 

-  {

-    len--;

-    hmsc->bot_data[len] = pPage[len];

-  }

-  return 0;

-}

-

-/**

-* @brief  SCSI_ReadCapacity10

-*         Process Read Capacity 10 command

-* @param  lun: Logical unit number

-* @param  params: Command parameters

-* @retval status

-*/

-static int8_t SCSI_ReadCapacity10(USBD_HandleTypeDef  *pdev, uint8_t lun, uint8_t *params)

-{

-  USBD_MSC_BOT_HandleTypeDef *hmsc = &((usbd_cdc_msc_hid_state_t*)pdev->pClassData)->MSC_BOT_ClassData;

-  

-  if(hmsc->bdev_ops->GetCapacity(lun, &hmsc->scsi_blk_nbr, &hmsc->scsi_blk_size) != 0)

-  {

-    SCSI_SenseCode(pdev,

-                   lun,

-                   NOT_READY, 

-                   MEDIUM_NOT_PRESENT);

-    return -1;

-  } 

-  else

-  {

-    

-    hmsc->bot_data[0] = (uint8_t)((hmsc->scsi_blk_nbr - 1) >> 24);

-    hmsc->bot_data[1] = (uint8_t)((hmsc->scsi_blk_nbr - 1) >> 16);

-    hmsc->bot_data[2] = (uint8_t)((hmsc->scsi_blk_nbr - 1) >>  8);

-    hmsc->bot_data[3] = (uint8_t)(hmsc->scsi_blk_nbr - 1);

-    

-    hmsc->bot_data[4] = (uint8_t)(hmsc->scsi_blk_size >>  24);

-    hmsc->bot_data[5] = (uint8_t)(hmsc->scsi_blk_size >>  16);

-    hmsc->bot_data[6] = (uint8_t)(hmsc->scsi_blk_size >>  8);

-    hmsc->bot_data[7] = (uint8_t)(hmsc->scsi_blk_size);

-    

-    hmsc->bot_data_length = 8;

-    return 0;

-  }

-}

-/**

-* @brief  SCSI_ReadFormatCapacity

-*         Process Read Format Capacity command

-* @param  lun: Logical unit number

-* @param  params: Command parameters

-* @retval status

-*/

-static int8_t SCSI_ReadFormatCapacity(USBD_HandleTypeDef  *pdev, uint8_t lun, uint8_t *params)

-{

-  USBD_MSC_BOT_HandleTypeDef *hmsc = &((usbd_cdc_msc_hid_state_t*)pdev->pClassData)->MSC_BOT_ClassData;

-  

-  uint16_t blk_size;

-  uint32_t blk_nbr;

-  uint16_t i;

-  

-  for(i=0 ; i < 12 ; i++) 

-  {

-    hmsc->bot_data[i] = 0;

-  }

-  

-  if(hmsc->bdev_ops->GetCapacity(lun, &blk_nbr, &blk_size) != 0)

-  {

-    SCSI_SenseCode(pdev,

-                   lun,

-                   NOT_READY, 

-                   MEDIUM_NOT_PRESENT);

-    return -1;

-  } 

-  else

-  {

-    hmsc->bot_data[3] = 0x08;

-    hmsc->bot_data[4] = (uint8_t)((blk_nbr - 1) >> 24);

-    hmsc->bot_data[5] = (uint8_t)((blk_nbr - 1) >> 16);

-    hmsc->bot_data[6] = (uint8_t)((blk_nbr - 1) >>  8);

-    hmsc->bot_data[7] = (uint8_t)(blk_nbr - 1);

-    

-    hmsc->bot_data[8] = 0x02;

-    hmsc->bot_data[9] = (uint8_t)(blk_size >>  16);

-    hmsc->bot_data[10] = (uint8_t)(blk_size >>  8);

-    hmsc->bot_data[11] = (uint8_t)(blk_size);

-    

-    hmsc->bot_data_length = 12;

-    return 0;

-  }

-}

-/**

-* @brief  SCSI_ModeSense6

-*         Process Mode Sense6 command

-* @param  lun: Logical unit number

-* @param  params: Command parameters

-* @retval status

-*/

-static int8_t SCSI_ModeSense6 (USBD_HandleTypeDef  *pdev, uint8_t lun, uint8_t *params)

-{

-  USBD_MSC_BOT_HandleTypeDef *hmsc = &((usbd_cdc_msc_hid_state_t*)pdev->pClassData)->MSC_BOT_ClassData;

-  uint16_t len = 8 ;

-  hmsc->bot_data_length = len;

-  

-  while (len) 

-  {

-    len--;

-    hmsc->bot_data[len] = MSC_Mode_Sense6_data[len];

-  }

-  return 0;

-}

-

-/**

-* @brief  SCSI_ModeSense10

-*         Process Mode Sense10 command

-* @param  lun: Logical unit number

-* @param  params: Command parameters

-* @retval status

-*/

-static int8_t SCSI_ModeSense10 (USBD_HandleTypeDef  *pdev, uint8_t lun, uint8_t *params)

-{

-  uint16_t len = 8;

-  USBD_MSC_BOT_HandleTypeDef *hmsc = &((usbd_cdc_msc_hid_state_t*)pdev->pClassData)->MSC_BOT_ClassData;

-  

-  hmsc->bot_data_length = len;

-

-  while (len) 

-  {

-    len--;

-    hmsc->bot_data[len] = MSC_Mode_Sense10_data[len];

-  }

-  return 0;

-}

-

-static int8_t SCSI_SynchronizeCache(USBD_HandleTypeDef  *pdev, uint8_t lun, uint8_t *params) {

-    // nothing to synchronize, so just return "success"

-  USBD_MSC_BOT_HandleTypeDef *hmsc = &((usbd_cdc_msc_hid_state_t*)pdev->pClassData)->MSC_BOT_ClassData;

-    hmsc->bot_data_length = 0;

-    return 0;

-}

-

-/**

-* @brief  SCSI_RequestSense

-*         Process Request Sense command

-* @param  lun: Logical unit number

-* @param  params: Command parameters

-* @retval status

-*/

-

-static int8_t SCSI_RequestSense (USBD_HandleTypeDef  *pdev, uint8_t lun, uint8_t *params)

-{

-  uint8_t i;

-  USBD_MSC_BOT_HandleTypeDef *hmsc = &((usbd_cdc_msc_hid_state_t*)pdev->pClassData)->MSC_BOT_ClassData;

-  

-  for(i=0 ; i < REQUEST_SENSE_DATA_LEN ; i++) 

-  {

-    hmsc->bot_data[i] = 0;

-  }

-  

-  hmsc->bot_data[0]	= 0x70;		

-  hmsc->bot_data[7]	= REQUEST_SENSE_DATA_LEN - 6;	

-  

-  if((hmsc->scsi_sense_head != hmsc->scsi_sense_tail)) {

-    

-    hmsc->bot_data[2]     = hmsc->scsi_sense[hmsc->scsi_sense_head].Skey;		

-    hmsc->bot_data[12]    = hmsc->scsi_sense[hmsc->scsi_sense_head].w.b.ASCQ;	

-    hmsc->bot_data[13]    = hmsc->scsi_sense[hmsc->scsi_sense_head].w.b.ASC;	

-    hmsc->scsi_sense_head++;

-    

-    if (hmsc->scsi_sense_head == SENSE_LIST_DEEPTH)

-    {

-      hmsc->scsi_sense_head = 0;

-    }

-  }

-  hmsc->bot_data_length = REQUEST_SENSE_DATA_LEN;  

-  

-  if (params[4] <= REQUEST_SENSE_DATA_LEN)

-  {

-    hmsc->bot_data_length = params[4];

-  }

-  return 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_cdc_msc_hid_state_t*)pdev->pClassData)->MSC_BOT_ClassData;

-  

-  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_DEEPTH)

-  {

-    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 int8_t SCSI_StartStopUnit(USBD_HandleTypeDef  *pdev, uint8_t lun, uint8_t *params)

-{

-  USBD_MSC_BOT_HandleTypeDef *hmsc = &((usbd_cdc_msc_hid_state_t*)pdev->pClassData)->MSC_BOT_ClassData;

-  hmsc->bot_data_length = 0;

-

-  // On Mac OS X, when the device is ejected a SCSI_START_STOP_UNIT command is sent.

-  // Bit 0 of params[4] is the START bit.

-  // If we get a stop, we must really stop the device so that the Mac does not

-  // automatically remount it.

-  hmsc->bdev_ops->StartStopUnit(lun, params[4] & 1);

-

-  return 0;

-}

-

-/**

-* @brief  SCSI_AllowMediumRemoval

-*         Process Allow Medium Removal command

-* @param  lun: Logical unit number

-* @param  params: Command parameters

-* @retval status

-*/

-static int8_t SCSI_AllowMediumRemoval(USBD_HandleTypeDef  *pdev, uint8_t lun, uint8_t *params)

-{

-  USBD_MSC_BOT_HandleTypeDef *hmsc = &((usbd_cdc_msc_hid_state_t*)pdev->pClassData)->MSC_BOT_ClassData;

-  hmsc->bot_data_length = 0;

-  hmsc->bdev_ops->PreventAllowMediumRemoval(lun, params[4]);

-  return 0;

-}

-

-/**

-* @brief  SCSI_Read10

-*         Process Read10 command

-* @param  lun: Logical unit number

-* @param  params: Command parameters

-* @retval status

-*/

-static int8_t SCSI_Read10(USBD_HandleTypeDef  *pdev, uint8_t lun , uint8_t *params)

-{

-  USBD_MSC_BOT_HandleTypeDef *hmsc = &((usbd_cdc_msc_hid_state_t*)pdev->pClassData)->MSC_BOT_ClassData;

-  

-  if(hmsc->bot_state == USBD_BOT_IDLE)  /* Idle */

-  {

-    

-    /* case 10 : Ho <> Di */

-    

-    if ((hmsc->cbw.bmFlags & 0x80) != 0x80)

-    {

-      SCSI_SenseCode(pdev,

-                     hmsc->cbw.bLUN, 

-                     ILLEGAL_REQUEST, 

-                     INVALID_CDB);

-      return -1;

-    }    

-    

-    if(hmsc->bdev_ops->IsReady(lun) !=0 )

-    {

-      SCSI_SenseCode(pdev,

-                     lun,

-                     NOT_READY, 

-                     MEDIUM_NOT_PRESENT);

-      return -1;

-    } 

-    

-    hmsc->scsi_blk_addr_in_blks = (params[2] << 24) | \

-      (params[3] << 16) | \

-        (params[4] <<  8) | \

-          params[5];

-    

-    hmsc->scsi_blk_len =  (params[7] <<  8) | \

-      params[8];  

-    

-    

-    

-    if( SCSI_CheckAddressRange(pdev, lun, hmsc->scsi_blk_addr_in_blks, hmsc->scsi_blk_len) < 0)

-    {

-      return -1; /* error */

-    }

-    

-    hmsc->bot_state = USBD_BOT_DATA_IN;

-    hmsc->scsi_blk_len  *= hmsc->scsi_blk_size;

-    

-    /* cases 4,5 : Hi <> Dn */

-    if (hmsc->cbw.dDataLength != hmsc->scsi_blk_len)

-    {

-      SCSI_SenseCode(pdev,

-                     hmsc->cbw.bLUN, 

-                     ILLEGAL_REQUEST, 

-                     INVALID_CDB);

-      return -1;

-    }

-  }

-  hmsc->bot_data_length = MSC_MEDIA_PACKET;  

-  

-  return SCSI_ProcessRead(pdev, lun);

-}

-

-/**

-* @brief  SCSI_Write10

-*         Process Write10 command

-* @param  lun: Logical unit number

-* @param  params: Command parameters

-* @retval status

-*/

-

-static int8_t SCSI_Write10 (USBD_HandleTypeDef  *pdev, uint8_t lun , uint8_t *params)

-{

-  USBD_MSC_BOT_HandleTypeDef *hmsc = &((usbd_cdc_msc_hid_state_t*)pdev->pClassData)->MSC_BOT_ClassData;

-  

-  if (hmsc->bot_state == USBD_BOT_IDLE) /* Idle */

-  {

-    

-    /* case 8 : Hi <> Do */

-    

-    if ((hmsc->cbw.bmFlags & 0x80) == 0x80)

-    {

-      SCSI_SenseCode(pdev,

-                     hmsc->cbw.bLUN, 

-                     ILLEGAL_REQUEST, 

-                     INVALID_CDB);

-      return -1;

-    }

-    

-    /* Check whether Media is ready */

-    if(hmsc->bdev_ops->IsReady(lun) !=0 )

-    {

-      SCSI_SenseCode(pdev,

-                     lun,

-                     NOT_READY, 

-                     MEDIUM_NOT_PRESENT);

-      return -1;

-    } 

-    

-    /* Check If media is write-protected */

-    if(hmsc->bdev_ops->IsWriteProtected(lun) !=0 )

-    {

-      SCSI_SenseCode(pdev,

-                     lun,

-                     NOT_READY, 

-                     WRITE_PROTECTED);

-      return -1;

-    } 

-    

-    

-    hmsc->scsi_blk_addr_in_blks = (params[2] << 24) | \

-      (params[3] << 16) | \

-        (params[4] <<  8) | \

-          params[5];

-    hmsc->scsi_blk_len = (params[7] <<  8) | \

-      params[8];  

-    

-    /* check if LBA address is in the right range */

-    if(SCSI_CheckAddressRange(pdev,

-                              lun,

-                              hmsc->scsi_blk_addr_in_blks,

-                              hmsc->scsi_blk_len) < 0)

-    {

-      return -1; /* error */      

-    }

-    

-    hmsc->scsi_blk_len  *= hmsc->scsi_blk_size;

-    

-    /* cases 3,11,13 : Hn,Ho <> D0 */

-    if (hmsc->cbw.dDataLength != hmsc->scsi_blk_len)

-    {

-      SCSI_SenseCode(pdev,

-                     hmsc->cbw.bLUN, 

-                     ILLEGAL_REQUEST, 

-                     INVALID_CDB);

-      return -1;

-    }

-    

-    /* Prepare EP to receive first data packet */

-    hmsc->bot_state = USBD_BOT_DATA_OUT;  

-    USBD_LL_PrepareReceive (pdev,

-                      MSC_OUT_EP,

-                      hmsc->bot_data, 

-                      MIN (hmsc->scsi_blk_len, MSC_MEDIA_PACKET));  

-  }

-  else /* Write Process ongoing */

-  {

-    return SCSI_ProcessWrite(pdev, lun);

-  }

-  return 0;

-}

-

-

-/**

-* @brief  SCSI_Verify10

-*         Process Verify10 command

-* @param  lun: Logical unit number

-* @param  params: Command parameters

-* @retval status

-*/

-

-static int8_t SCSI_Verify10(USBD_HandleTypeDef  *pdev, uint8_t lun , uint8_t *params)

-{

-  USBD_MSC_BOT_HandleTypeDef *hmsc = &((usbd_cdc_msc_hid_state_t*)pdev->pClassData)->MSC_BOT_ClassData;

-  

-  if ((params[1]& 0x02) == 0x02) 

-  {

-    SCSI_SenseCode (pdev,

-                    lun, 

-                    ILLEGAL_REQUEST, 

-                    INVALID_FIELED_IN_COMMAND);

-    return -1; /* Error, Verify Mode Not supported*/

-  }

-  

-  hmsc->scsi_blk_addr_in_blks = (params[2] << 24) | (params[3] << 16) | (params[4] << 8) | params[5];

-  hmsc->scsi_blk_len = (params[7] << 8) | params[8];

-

-  if(SCSI_CheckAddressRange(pdev,

-                            lun, 

-                            hmsc->scsi_blk_addr_in_blks,

-                            hmsc->scsi_blk_len) < 0)

-  {

-    return -1; /* error */      

-  }

-  hmsc->bot_data_length = 0;

-  return 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 (USBD_HandleTypeDef  *pdev, uint8_t lun , uint32_t blk_offset , uint16_t blk_nbr)

-{

-  USBD_MSC_BOT_HandleTypeDef *hmsc = &((usbd_cdc_msc_hid_state_t*)pdev->pClassData)->MSC_BOT_ClassData;

-  

-  if ((blk_offset + blk_nbr) > hmsc->scsi_blk_nbr )

-  {

-    SCSI_SenseCode(pdev,

-                   lun, 

-                   ILLEGAL_REQUEST, 

-                   ADDRESS_OUT_OF_RANGE);

-    return -1;

-  }

-  return 0;

-}

-

-/**

-* @brief  SCSI_ProcessRead

-*         Handle Read Process

-* @param  lun: Logical unit number

-* @retval status

-*/

-static int8_t SCSI_ProcessRead (USBD_HandleTypeDef  *pdev, uint8_t lun)

-{

-  USBD_MSC_BOT_HandleTypeDef *hmsc = &((usbd_cdc_msc_hid_state_t*)pdev->pClassData)->MSC_BOT_ClassData;

-  uint32_t len;

-  

-  len = MIN(hmsc->scsi_blk_len , MSC_MEDIA_PACKET); 

-  

-  if( hmsc->bdev_ops->Read(lun ,

-                              hmsc->bot_data, 

-                              hmsc->scsi_blk_addr_in_blks,

-                              len / hmsc->scsi_blk_size) < 0)

-  {

-    

-    SCSI_SenseCode(pdev,

-                   lun, 

-                   HARDWARE_ERROR, 

-                   UNRECOVERED_READ_ERROR);

-    return -1; 

-  }

-  

-  

-  USBD_LL_Transmit (pdev, 

-             MSC_IN_EP,

-             hmsc->bot_data,

-             len);

-  

-  

-  hmsc->scsi_blk_addr_in_blks += len / hmsc->scsi_blk_size;

-  hmsc->scsi_blk_len    -= len;  

-  

-  /* case 6 : Hi = Di */

-  hmsc->csw.dDataResidue -= len;

-  

-  if (hmsc->scsi_blk_len == 0)

-  {

-    hmsc->bot_state = USBD_BOT_LAST_DATA_IN;

-  }

-  return 0;

-}

-

-/**

-* @brief  SCSI_ProcessWrite

-*         Handle Write Process

-* @param  lun: Logical unit number

-* @retval status

-*/

-

-static int8_t SCSI_ProcessWrite (USBD_HandleTypeDef  *pdev, uint8_t lun)

-{

-  uint32_t len;

-  USBD_MSC_BOT_HandleTypeDef *hmsc = &((usbd_cdc_msc_hid_state_t*)pdev->pClassData)->MSC_BOT_ClassData;

-  

-  len = MIN(hmsc->scsi_blk_len , MSC_MEDIA_PACKET); 

-  

-  if(hmsc->bdev_ops->Write(lun ,

-                              hmsc->bot_data, 

-                              hmsc->scsi_blk_addr_in_blks,

-                              len / hmsc->scsi_blk_size) < 0)

-  {

-    SCSI_SenseCode(pdev,

-                   lun, 

-                   HARDWARE_ERROR, 

-                   WRITE_FAULT);     

-    return -1; 

-  }

-  

-  

-  hmsc->scsi_blk_addr_in_blks += len / hmsc->scsi_blk_size;

-  hmsc->scsi_blk_len   -= len; 

-  

-  /* case 12 : Ho = Do */

-  hmsc->csw.dDataResidue -= len;

-  

-  if (hmsc->scsi_blk_len == 0)

-  {

-    MSC_BOT_SendCSW (pdev, USBD_CSW_CMD_PASSED);

-  }

-  else

-  {

-    /* Prapare EP to Receive next packet */

-    USBD_LL_PrepareReceive (pdev,

-                            MSC_OUT_EP,

-                            hmsc->bot_data, 

-                            MIN (hmsc->scsi_blk_len, MSC_MEDIA_PACKET)); 

-  }

-  

-  return 0;

-}

-/**

-  * @}

-  */ 

-

-

-/**

-  * @}

-  */ 

-

-

-/**

-  * @}

-  */ 

-

-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

+/**
+  ******************************************************************************
+  * @file    usbd_msc_scsi.c
+  * @author  MCD Application Team
+  * @version V2.0.0
+  * @date    18-February-2014
+  * @brief   This file provides all the USBD SCSI layer functions.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; COPYRIGHT 2014 STMicroelectronics</center></h2>
+  *
+  * Licensed under MCD-ST Liberty SW License Agreement V2, (the "License");
+  * You may not use this file except in compliance with the License.
+  * You may obtain a copy of the License at:
+  *
+  *        http://www.st.com/software_license_agreement_liberty_v2
+  *
+  * Unless required by applicable law or agreed to in writing, software
+  * distributed under the License is distributed on an "AS IS" BASIS,
+  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  * See the License for the specific language governing permissions and
+  * limitations under the License.
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "usbd_msc_bot.h"
+#include "usbd_msc_scsi.h"
+#include "usbd_msc_data.h"
+#include "usbd_cdc_msc_hid.h"
+
+
+
+/** @addtogroup STM32_USB_OTG_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
+  * @{
+  */
+
+/**
+  * @}
+  */
+
+
+/** @defgroup MSC_SCSI_Private_FunctionPrototypes
+  * @{
+  */
+static int8_t SCSI_TestUnitReady(USBD_HandleTypeDef  *pdev, uint8_t lun, uint8_t *params);
+static int8_t SCSI_Inquiry(USBD_HandleTypeDef  *pdev, uint8_t lun, uint8_t *params);
+static int8_t SCSI_ReadFormatCapacity(USBD_HandleTypeDef  *pdev, uint8_t lun, uint8_t *params);
+static int8_t SCSI_ReadCapacity10(USBD_HandleTypeDef  *pdev, uint8_t lun, uint8_t *params);
+static int8_t SCSI_RequestSense (USBD_HandleTypeDef  *pdev, uint8_t lun, uint8_t *params);
+static int8_t SCSI_StartStopUnit(USBD_HandleTypeDef  *pdev, uint8_t lun, uint8_t *params);
+static int8_t SCSI_AllowMediumRemoval(USBD_HandleTypeDef  *pdev, uint8_t lun, uint8_t *params);
+static int8_t SCSI_ModeSense6 (USBD_HandleTypeDef  *pdev, uint8_t lun, uint8_t *params);
+static int8_t SCSI_ModeSense10 (USBD_HandleTypeDef  *pdev, uint8_t lun, uint8_t *params);
+static int8_t SCSI_SynchronizeCache(USBD_HandleTypeDef  *pdev, uint8_t lun, uint8_t *params);
+static int8_t SCSI_Write10(USBD_HandleTypeDef  *pdev, uint8_t lun , uint8_t *params);
+static int8_t SCSI_Read10(USBD_HandleTypeDef  *pdev, uint8_t lun , uint8_t *params);
+static int8_t SCSI_Verify10(USBD_HandleTypeDef  *pdev, uint8_t lun, uint8_t *params);
+static int8_t SCSI_CheckAddressRange (USBD_HandleTypeDef  *pdev,
+                                      uint8_t lun ,
+                                      uint32_t blk_offset ,
+                                      uint16_t blk_nbr);
+static int8_t SCSI_ProcessRead (USBD_HandleTypeDef  *pdev,
+                                uint8_t lun);
+
+static int8_t SCSI_ProcessWrite (USBD_HandleTypeDef  *pdev,
+                                 uint8_t lun);
+/**
+  * @}
+  */
+
+
+/** @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
+*/
+int8_t SCSI_ProcessCmd(USBD_HandleTypeDef  *pdev,
+                           uint8_t lun,
+                           uint8_t *params)
+{
+    /*
+    if (params[0] != SCSI_READ10 && params[0] != SCSI_WRITE10) {
+        printf("SCSI_ProcessCmd(lun=%d, params=%x, %x)\n", lun, params[0], params[1]);
+    }
+    */
+
+  switch (params[0])
+  {
+  case SCSI_TEST_UNIT_READY:
+    return SCSI_TestUnitReady(pdev, lun, params);
+
+  case SCSI_REQUEST_SENSE:
+    return SCSI_RequestSense (pdev, lun, params);
+  case SCSI_INQUIRY:
+    return SCSI_Inquiry(pdev, lun, params);
+
+  case SCSI_START_STOP_UNIT:
+    return SCSI_StartStopUnit(pdev, lun, params);
+
+  case SCSI_ALLOW_MEDIUM_REMOVAL:
+    return SCSI_AllowMediumRemoval(pdev, lun, params);
+
+  case SCSI_MODE_SENSE6:
+    return SCSI_ModeSense6 (pdev, lun, params);
+
+  case SCSI_MODE_SENSE10:
+    return SCSI_ModeSense10 (pdev, lun, params);
+
+  case SCSI_SYNCHRONIZE_CACHE10:
+  case SCSI_SYNCHRONIZE_CACHE16:
+    return SCSI_SynchronizeCache(pdev, lun, params);
+
+  case SCSI_READ_FORMAT_CAPACITIES:
+    return SCSI_ReadFormatCapacity(pdev, lun, params);
+
+  case SCSI_READ_CAPACITY10:
+    return SCSI_ReadCapacity10(pdev, lun, params);
+
+  case SCSI_READ10:
+    return SCSI_Read10(pdev, lun, params);
+
+  case SCSI_WRITE10:
+    return SCSI_Write10(pdev, lun, params);
+
+  case SCSI_VERIFY10:
+    return SCSI_Verify10(pdev, lun, params);
+
+  default:
+    SCSI_SenseCode(pdev,
+                   lun,
+                   ILLEGAL_REQUEST,
+                   INVALID_CDB);
+    return -1;
+  }
+}
+
+
+/**
+* @brief  SCSI_TestUnitReady
+*         Process SCSI Test Unit Ready Command
+* @param  lun: Logical unit number
+* @param  params: Command parameters
+* @retval status
+*/
+static int8_t SCSI_TestUnitReady(USBD_HandleTypeDef  *pdev, uint8_t lun, uint8_t *params)
+{
+  USBD_MSC_BOT_HandleTypeDef *hmsc = &((usbd_cdc_msc_hid_state_t*)pdev->pClassData)->MSC_BOT_ClassData;
+
+  /* case 9 : Hi > D0 */
+  if (hmsc->cbw.dDataLength != 0)
+  {
+    SCSI_SenseCode(pdev,
+                   hmsc->cbw.bLUN,
+                   ILLEGAL_REQUEST,
+                   INVALID_CDB);
+    return -1;
+  }
+
+  if(hmsc->bdev_ops->IsReady(lun) !=0 )
+  {
+    SCSI_SenseCode(pdev,
+                   lun,
+                   NOT_READY,
+                   MEDIUM_NOT_PRESENT);
+
+    hmsc->bot_state = USBD_BOT_NO_DATA;
+    return -1;
+  }
+  hmsc->bot_data_length = 0;
+  return 0;
+}
+
+/**
+* @brief  SCSI_Inquiry
+*         Process Inquiry command
+* @param  lun: Logical unit number
+* @param  params: Command parameters
+* @retval status
+*/
+static int8_t  SCSI_Inquiry(USBD_HandleTypeDef  *pdev, uint8_t lun, uint8_t *params)
+{
+  uint8_t* pPage;
+  uint16_t len;
+  USBD_MSC_BOT_HandleTypeDef *hmsc = &((usbd_cdc_msc_hid_state_t*)pdev->pClassData)->MSC_BOT_ClassData;
+
+  if (params[1] & 0x01)/*Evpd is set*/
+  {
+    pPage = (uint8_t *)MSC_Page00_Inquiry_Data;
+    len = LENGTH_INQUIRY_PAGE00;
+  }
+  else
+  {
+
+    pPage = (uint8_t *)&hmsc->bdev_ops->pInquiry[lun * STANDARD_INQUIRY_DATA_LEN];
+    len = pPage[4] + 5;
+
+    if (params[4] <= len)
+    {
+      len = params[4];
+    }
+  }
+  hmsc->bot_data_length = len;
+
+  while (len)
+  {
+    len--;
+    hmsc->bot_data[len] = pPage[len];
+  }
+  return 0;
+}
+
+/**
+* @brief  SCSI_ReadCapacity10
+*         Process Read Capacity 10 command
+* @param  lun: Logical unit number
+* @param  params: Command parameters
+* @retval status
+*/
+static int8_t SCSI_ReadCapacity10(USBD_HandleTypeDef  *pdev, uint8_t lun, uint8_t *params)
+{
+  USBD_MSC_BOT_HandleTypeDef *hmsc = &((usbd_cdc_msc_hid_state_t*)pdev->pClassData)->MSC_BOT_ClassData;
+
+  if(hmsc->bdev_ops->GetCapacity(lun, &hmsc->scsi_blk_nbr, &hmsc->scsi_blk_size) != 0)
+  {
+    SCSI_SenseCode(pdev,
+                   lun,
+                   NOT_READY,
+                   MEDIUM_NOT_PRESENT);
+    return -1;
+  }
+  else
+  {
+
+    hmsc->bot_data[0] = (uint8_t)((hmsc->scsi_blk_nbr - 1) >> 24);
+    hmsc->bot_data[1] = (uint8_t)((hmsc->scsi_blk_nbr - 1) >> 16);
+    hmsc->bot_data[2] = (uint8_t)((hmsc->scsi_blk_nbr - 1) >>  8);
+    hmsc->bot_data[3] = (uint8_t)(hmsc->scsi_blk_nbr - 1);
+
+    hmsc->bot_data[4] = (uint8_t)(hmsc->scsi_blk_size >>  24);
+    hmsc->bot_data[5] = (uint8_t)(hmsc->scsi_blk_size >>  16);
+    hmsc->bot_data[6] = (uint8_t)(hmsc->scsi_blk_size >>  8);
+    hmsc->bot_data[7] = (uint8_t)(hmsc->scsi_blk_size);
+
+    hmsc->bot_data_length = 8;
+    return 0;
+  }
+}
+/**
+* @brief  SCSI_ReadFormatCapacity
+*         Process Read Format Capacity command
+* @param  lun: Logical unit number
+* @param  params: Command parameters
+* @retval status
+*/
+static int8_t SCSI_ReadFormatCapacity(USBD_HandleTypeDef  *pdev, uint8_t lun, uint8_t *params)
+{
+  USBD_MSC_BOT_HandleTypeDef *hmsc = &((usbd_cdc_msc_hid_state_t*)pdev->pClassData)->MSC_BOT_ClassData;
+
+  uint16_t blk_size;
+  uint32_t blk_nbr;
+  uint16_t i;
+
+  for(i=0 ; i < 12 ; i++)
+  {
+    hmsc->bot_data[i] = 0;
+  }
+
+  if(hmsc->bdev_ops->GetCapacity(lun, &blk_nbr, &blk_size) != 0)
+  {
+    SCSI_SenseCode(pdev,
+                   lun,
+                   NOT_READY,
+                   MEDIUM_NOT_PRESENT);
+    return -1;
+  }
+  else
+  {
+    hmsc->bot_data[3] = 0x08;
+    hmsc->bot_data[4] = (uint8_t)((blk_nbr - 1) >> 24);
+    hmsc->bot_data[5] = (uint8_t)((blk_nbr - 1) >> 16);
+    hmsc->bot_data[6] = (uint8_t)((blk_nbr - 1) >>  8);
+    hmsc->bot_data[7] = (uint8_t)(blk_nbr - 1);
+
+    hmsc->bot_data[8] = 0x02;
+    hmsc->bot_data[9] = (uint8_t)(blk_size >>  16);
+    hmsc->bot_data[10] = (uint8_t)(blk_size >>  8);
+    hmsc->bot_data[11] = (uint8_t)(blk_size);
+
+    hmsc->bot_data_length = 12;
+    return 0;
+  }
+}
+/**
+* @brief  SCSI_ModeSense6
+*         Process Mode Sense6 command
+* @param  lun: Logical unit number
+* @param  params: Command parameters
+* @retval status
+*/
+static int8_t SCSI_ModeSense6 (USBD_HandleTypeDef  *pdev, uint8_t lun, uint8_t *params)
+{
+  USBD_MSC_BOT_HandleTypeDef *hmsc = &((usbd_cdc_msc_hid_state_t*)pdev->pClassData)->MSC_BOT_ClassData;
+  uint16_t len = 8 ;
+  hmsc->bot_data_length = len;
+
+  while (len)
+  {
+    len--;
+    hmsc->bot_data[len] = MSC_Mode_Sense6_data[len];
+  }
+  return 0;
+}
+
+/**
+* @brief  SCSI_ModeSense10
+*         Process Mode Sense10 command
+* @param  lun: Logical unit number
+* @param  params: Command parameters
+* @retval status
+*/
+static int8_t SCSI_ModeSense10 (USBD_HandleTypeDef  *pdev, uint8_t lun, uint8_t *params)
+{
+  uint16_t len = 8;
+  USBD_MSC_BOT_HandleTypeDef *hmsc = &((usbd_cdc_msc_hid_state_t*)pdev->pClassData)->MSC_BOT_ClassData;
+
+  hmsc->bot_data_length = len;
+
+  while (len)
+  {
+    len--;
+    hmsc->bot_data[len] = MSC_Mode_Sense10_data[len];
+  }
+  return 0;
+}
+
+static int8_t SCSI_SynchronizeCache(USBD_HandleTypeDef  *pdev, uint8_t lun, uint8_t *params) {
+    // nothing to synchronize, so just return "success"
+  USBD_MSC_BOT_HandleTypeDef *hmsc = &((usbd_cdc_msc_hid_state_t*)pdev->pClassData)->MSC_BOT_ClassData;
+    hmsc->bot_data_length = 0;
+    return 0;
+}
+
+/**
+* @brief  SCSI_RequestSense
+*         Process Request Sense command
+* @param  lun: Logical unit number
+* @param  params: Command parameters
+* @retval status
+*/
+
+static int8_t SCSI_RequestSense (USBD_HandleTypeDef  *pdev, uint8_t lun, uint8_t *params)
+{
+  uint8_t i;
+  USBD_MSC_BOT_HandleTypeDef *hmsc = &((usbd_cdc_msc_hid_state_t*)pdev->pClassData)->MSC_BOT_ClassData;
+
+  for(i=0 ; i < REQUEST_SENSE_DATA_LEN ; i++)
+  {
+    hmsc->bot_data[i] = 0;
+  }
+
+  hmsc->bot_data[0]     = 0x70;
+  hmsc->bot_data[7]     = REQUEST_SENSE_DATA_LEN - 6;
+
+  if((hmsc->scsi_sense_head != hmsc->scsi_sense_tail)) {
+
+    hmsc->bot_data[2]     = hmsc->scsi_sense[hmsc->scsi_sense_head].Skey;
+    hmsc->bot_data[12]    = hmsc->scsi_sense[hmsc->scsi_sense_head].w.b.ASCQ;
+    hmsc->bot_data[13]    = hmsc->scsi_sense[hmsc->scsi_sense_head].w.b.ASC;
+    hmsc->scsi_sense_head++;
+
+    if (hmsc->scsi_sense_head == SENSE_LIST_DEEPTH)
+    {
+      hmsc->scsi_sense_head = 0;
+    }
+  }
+  hmsc->bot_data_length = REQUEST_SENSE_DATA_LEN;
+
+  if (params[4] <= REQUEST_SENSE_DATA_LEN)
+  {
+    hmsc->bot_data_length = params[4];
+  }
+  return 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_cdc_msc_hid_state_t*)pdev->pClassData)->MSC_BOT_ClassData;
+
+  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_DEEPTH)
+  {
+    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 int8_t SCSI_StartStopUnit(USBD_HandleTypeDef  *pdev, uint8_t lun, uint8_t *params)
+{
+  USBD_MSC_BOT_HandleTypeDef *hmsc = &((usbd_cdc_msc_hid_state_t*)pdev->pClassData)->MSC_BOT_ClassData;
+  hmsc->bot_data_length = 0;
+
+  // On Mac OS X, when the device is ejected a SCSI_START_STOP_UNIT command is sent.
+  // Bit 0 of params[4] is the START bit.
+  // If we get a stop, we must really stop the device so that the Mac does not
+  // automatically remount it.
+  hmsc->bdev_ops->StartStopUnit(lun, params[4] & 1);
+
+  return 0;
+}
+
+/**
+* @brief  SCSI_AllowMediumRemoval
+*         Process Allow Medium Removal command
+* @param  lun: Logical unit number
+* @param  params: Command parameters
+* @retval status
+*/
+static int8_t SCSI_AllowMediumRemoval(USBD_HandleTypeDef  *pdev, uint8_t lun, uint8_t *params)
+{
+  USBD_MSC_BOT_HandleTypeDef *hmsc = &((usbd_cdc_msc_hid_state_t*)pdev->pClassData)->MSC_BOT_ClassData;
+  hmsc->bot_data_length = 0;
+  hmsc->bdev_ops->PreventAllowMediumRemoval(lun, params[4]);
+  return 0;
+}
+
+/**
+* @brief  SCSI_Read10
+*         Process Read10 command
+* @param  lun: Logical unit number
+* @param  params: Command parameters
+* @retval status
+*/
+static int8_t SCSI_Read10(USBD_HandleTypeDef  *pdev, uint8_t lun , uint8_t *params)
+{
+  USBD_MSC_BOT_HandleTypeDef *hmsc = &((usbd_cdc_msc_hid_state_t*)pdev->pClassData)->MSC_BOT_ClassData;
+
+  if(hmsc->bot_state == USBD_BOT_IDLE)  /* Idle */
+  {
+
+    /* case 10 : Ho <> Di */
+
+    if ((hmsc->cbw.bmFlags & 0x80) != 0x80)
+    {
+      SCSI_SenseCode(pdev,
+                     hmsc->cbw.bLUN,
+                     ILLEGAL_REQUEST,
+                     INVALID_CDB);
+      return -1;
+    }
+
+    if(hmsc->bdev_ops->IsReady(lun) !=0 )
+    {
+      SCSI_SenseCode(pdev,
+                     lun,
+                     NOT_READY,
+                     MEDIUM_NOT_PRESENT);
+      return -1;
+    }
+
+    hmsc->scsi_blk_addr_in_blks = (params[2] << 24) | \
+      (params[3] << 16) | \
+        (params[4] <<  8) | \
+          params[5];
+
+    hmsc->scsi_blk_len =  (params[7] <<  8) | \
+      params[8];
+
+
+
+    if( SCSI_CheckAddressRange(pdev, lun, hmsc->scsi_blk_addr_in_blks, hmsc->scsi_blk_len) < 0)
+    {
+      return -1; /* error */
+    }
+
+    hmsc->bot_state = USBD_BOT_DATA_IN;
+    hmsc->scsi_blk_len  *= hmsc->scsi_blk_size;
+
+    /* cases 4,5 : Hi <> Dn */
+    if (hmsc->cbw.dDataLength != hmsc->scsi_blk_len)
+    {
+      SCSI_SenseCode(pdev,
+                     hmsc->cbw.bLUN,
+                     ILLEGAL_REQUEST,
+                     INVALID_CDB);
+      return -1;
+    }
+  }
+  hmsc->bot_data_length = MSC_MEDIA_PACKET;
+
+  return SCSI_ProcessRead(pdev, lun);
+}
+
+/**
+* @brief  SCSI_Write10
+*         Process Write10 command
+* @param  lun: Logical unit number
+* @param  params: Command parameters
+* @retval status
+*/
+
+static int8_t SCSI_Write10 (USBD_HandleTypeDef  *pdev, uint8_t lun , uint8_t *params)
+{
+  USBD_MSC_BOT_HandleTypeDef *hmsc = &((usbd_cdc_msc_hid_state_t*)pdev->pClassData)->MSC_BOT_ClassData;
+
+  if (hmsc->bot_state == USBD_BOT_IDLE) /* Idle */
+  {
+
+    /* case 8 : Hi <> Do */
+
+    if ((hmsc->cbw.bmFlags & 0x80) == 0x80)
+    {
+      SCSI_SenseCode(pdev,
+                     hmsc->cbw.bLUN,
+                     ILLEGAL_REQUEST,
+                     INVALID_CDB);
+      return -1;
+    }
+
+    /* Check whether Media is ready */
+    if(hmsc->bdev_ops->IsReady(lun) !=0 )
+    {
+      SCSI_SenseCode(pdev,
+                     lun,
+                     NOT_READY,
+                     MEDIUM_NOT_PRESENT);
+      return -1;
+    }
+
+    /* Check If media is write-protected */
+    if(hmsc->bdev_ops->IsWriteProtected(lun) !=0 )
+    {
+      SCSI_SenseCode(pdev,
+                     lun,
+                     NOT_READY,
+                     WRITE_PROTECTED);
+      return -1;
+    }
+
+
+    hmsc->scsi_blk_addr_in_blks = (params[2] << 24) | \
+      (params[3] << 16) | \
+        (params[4] <<  8) | \
+          params[5];
+    hmsc->scsi_blk_len = (params[7] <<  8) | \
+      params[8];
+
+    /* check if LBA address is in the right range */
+    if(SCSI_CheckAddressRange(pdev,
+                              lun,
+                              hmsc->scsi_blk_addr_in_blks,
+                              hmsc->scsi_blk_len) < 0)
+    {
+      return -1; /* error */
+    }
+
+    hmsc->scsi_blk_len  *= hmsc->scsi_blk_size;
+
+    /* cases 3,11,13 : Hn,Ho <> D0 */
+    if (hmsc->cbw.dDataLength != hmsc->scsi_blk_len)
+    {
+      SCSI_SenseCode(pdev,
+                     hmsc->cbw.bLUN,
+                     ILLEGAL_REQUEST,
+                     INVALID_CDB);
+      return -1;
+    }
+
+    /* Prepare EP to receive first data packet */
+    hmsc->bot_state = USBD_BOT_DATA_OUT;
+    USBD_LL_PrepareReceive (pdev,
+                      MSC_OUT_EP,
+                      hmsc->bot_data,
+                      MIN (hmsc->scsi_blk_len, MSC_MEDIA_PACKET));
+  }
+  else /* Write Process ongoing */
+  {
+    return SCSI_ProcessWrite(pdev, lun);
+  }
+  return 0;
+}
+
+
+/**
+* @brief  SCSI_Verify10
+*         Process Verify10 command
+* @param  lun: Logical unit number
+* @param  params: Command parameters
+* @retval status
+*/
+
+static int8_t SCSI_Verify10(USBD_HandleTypeDef  *pdev, uint8_t lun , uint8_t *params)
+{
+  USBD_MSC_BOT_HandleTypeDef *hmsc = &((usbd_cdc_msc_hid_state_t*)pdev->pClassData)->MSC_BOT_ClassData;
+
+  if ((params[1]& 0x02) == 0x02)
+  {
+    SCSI_SenseCode (pdev,
+                    lun,
+                    ILLEGAL_REQUEST,
+                    INVALID_FIELED_IN_COMMAND);
+    return -1; /* Error, Verify Mode Not supported*/
+  }
+
+  hmsc->scsi_blk_addr_in_blks = (params[2] << 24) | (params[3] << 16) | (params[4] << 8) | params[5];
+  hmsc->scsi_blk_len = (params[7] << 8) | params[8];
+
+  if(SCSI_CheckAddressRange(pdev,
+                            lun,
+                            hmsc->scsi_blk_addr_in_blks,
+                            hmsc->scsi_blk_len) < 0)
+  {
+    return -1; /* error */
+  }
+  hmsc->bot_data_length = 0;
+  return 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 (USBD_HandleTypeDef  *pdev, uint8_t lun , uint32_t blk_offset , uint16_t blk_nbr)
+{
+  USBD_MSC_BOT_HandleTypeDef *hmsc = &((usbd_cdc_msc_hid_state_t*)pdev->pClassData)->MSC_BOT_ClassData;
+
+  if ((blk_offset + blk_nbr) > hmsc->scsi_blk_nbr )
+  {
+    SCSI_SenseCode(pdev,
+                   lun,
+                   ILLEGAL_REQUEST,
+                   ADDRESS_OUT_OF_RANGE);
+    return -1;
+  }
+  return 0;
+}
+
+/**
+* @brief  SCSI_ProcessRead
+*         Handle Read Process
+* @param  lun: Logical unit number
+* @retval status
+*/
+static int8_t SCSI_ProcessRead (USBD_HandleTypeDef  *pdev, uint8_t lun)
+{
+  USBD_MSC_BOT_HandleTypeDef *hmsc = &((usbd_cdc_msc_hid_state_t*)pdev->pClassData)->MSC_BOT_ClassData;
+  uint32_t len;
+
+  len = MIN(hmsc->scsi_blk_len , MSC_MEDIA_PACKET);
+
+  if( hmsc->bdev_ops->Read(lun ,
+                              hmsc->bot_data,
+                              hmsc->scsi_blk_addr_in_blks,
+                              len / hmsc->scsi_blk_size) < 0)
+  {
+
+    SCSI_SenseCode(pdev,
+                   lun,
+                   HARDWARE_ERROR,
+                   UNRECOVERED_READ_ERROR);
+    return -1;
+  }
+
+
+  USBD_LL_Transmit (pdev,
+             MSC_IN_EP,
+             hmsc->bot_data,
+             len);
+
+
+  hmsc->scsi_blk_addr_in_blks += len / hmsc->scsi_blk_size;
+  hmsc->scsi_blk_len    -= len;
+
+  /* case 6 : Hi = Di */
+  hmsc->csw.dDataResidue -= len;
+
+  if (hmsc->scsi_blk_len == 0)
+  {
+    hmsc->bot_state = USBD_BOT_LAST_DATA_IN;
+  }
+  return 0;
+}
+
+/**
+* @brief  SCSI_ProcessWrite
+*         Handle Write Process
+* @param  lun: Logical unit number
+* @retval status
+*/
+
+static int8_t SCSI_ProcessWrite (USBD_HandleTypeDef  *pdev, uint8_t lun)
+{
+  uint32_t len;
+  USBD_MSC_BOT_HandleTypeDef *hmsc = &((usbd_cdc_msc_hid_state_t*)pdev->pClassData)->MSC_BOT_ClassData;
+
+  len = MIN(hmsc->scsi_blk_len , MSC_MEDIA_PACKET);
+
+  if(hmsc->bdev_ops->Write(lun ,
+                              hmsc->bot_data,
+                              hmsc->scsi_blk_addr_in_blks,
+                              len / hmsc->scsi_blk_size) < 0)
+  {
+    SCSI_SenseCode(pdev,
+                   lun,
+                   HARDWARE_ERROR,
+                   WRITE_FAULT);
+    return -1;
+  }
+
+
+  hmsc->scsi_blk_addr_in_blks += len / hmsc->scsi_blk_size;
+  hmsc->scsi_blk_len   -= len;
+
+  /* case 12 : Ho = Do */
+  hmsc->csw.dDataResidue -= len;
+
+  if (hmsc->scsi_blk_len == 0)
+  {
+    MSC_BOT_SendCSW (pdev, USBD_CSW_CMD_PASSED);
+  }
+  else
+  {
+    /* Prapare EP to Receive next packet */
+    USBD_LL_PrepareReceive (pdev,
+                            MSC_OUT_EP,
+                            hmsc->bot_data,
+                            MIN (hmsc->scsi_blk_len, MSC_MEDIA_PACKET));
+  }
+
+  return 0;
+}
+/**
+  * @}
+  */
+
+
+/**
+  * @}
+  */
+
+
+/**
+  * @}
+  */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/ports/stm32/usbdev/core/inc/usbd_core.h b/ports/stm32/usbdev/core/inc/usbd_core.h
index fb1d541f6..5494be3a2 100644
--- a/ports/stm32/usbdev/core/inc/usbd_core.h
+++ b/ports/stm32/usbdev/core/inc/usbd_core.h
@@ -1,159 +1,159 @@
-/**

-  ******************************************************************************

-  * @file    usbd_core.h

-  * @author  MCD Application Team

-  * @version V2.0.0

-  * @date    18-February-2014

-  * @brief   Header file for usbd_core.c

-  ******************************************************************************

-  * @attention

-  *

-  * <h2><center>&copy; COPYRIGHT 2014 STMicroelectronics</center></h2>

-  *

-  * Licensed under MCD-ST Liberty SW License Agreement V2, (the "License");

-  * You may not use this file except in compliance with the License.

-  * You may obtain a copy of the License at:

-  *

-  *        http://www.st.com/software_license_agreement_liberty_v2

-  *

-  * Unless required by applicable law or agreed to in writing, software 

-  * distributed under the License is distributed on an "AS IS" BASIS, 

-  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-  * See the License for the specific language governing permissions and

-  * limitations under the License.

-  *

-  ******************************************************************************

-  */ 

-

-/* Define to prevent recursive inclusion -------------------------------------*/

-#ifndef __USBD_CORE_H

-#define __USBD_CORE_H

-

-/* Includes ------------------------------------------------------------------*/

-#include "usbd_conf.h"

-#include "usbd_def.h"

-#include "usbd_ioreq.h"

-#include "usbd_ctlreq.h"

-

-/** @addtogroup STM32_USB_OTG_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

-  * @{

-  */ 

-#define USBD_SOF          USBD_LL_SOF

-/**

-  * @}

-  */ 

-

-/** @defgroup USBD_CORE_Exported_FunctionsPrototype

-  * @{

-  */ 

-USBD_StatusTypeDef USBD_Init(USBD_HandleTypeDef *pdev, USBD_DescriptorsTypeDef *pdesc, uint8_t id);

-USBD_StatusTypeDef 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, const 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_LL_SetupStage(USBD_HandleTypeDef *pdev, uint8_t *psetup);

-USBD_StatusTypeDef USBD_LL_DataOutStage(USBD_HandleTypeDef *pdev , uint8_t epnum, uint8_t *pdata);

-USBD_StatusTypeDef USBD_LL_DataInStage(USBD_HandleTypeDef *pdev , uint8_t epnum, uint8_t *pdata);

-

-USBD_StatusTypeDef USBD_LL_Reset(USBD_HandleTypeDef  *pdev);

-USBD_StatusTypeDef USBD_LL_SetSpeed(USBD_HandleTypeDef  *pdev, USBD_SpeedTypeDef speed);

-USBD_StatusTypeDef USBD_LL_Suspend(USBD_HandleTypeDef  *pdev);

-USBD_StatusTypeDef USBD_LL_Resume(USBD_HandleTypeDef  *pdev);

-

-USBD_StatusTypeDef USBD_LL_SOF(USBD_HandleTypeDef  *pdev);

-USBD_StatusTypeDef USBD_LL_IsoINIncomplete(USBD_HandleTypeDef  *pdev, uint8_t epnum);

-USBD_StatusTypeDef USBD_LL_IsoOUTIncomplete(USBD_HandleTypeDef  *pdev, uint8_t epnum);

-

-USBD_StatusTypeDef USBD_LL_DevConnected(USBD_HandleTypeDef  *pdev);

-USBD_StatusTypeDef USBD_LL_DevDisconnected(USBD_HandleTypeDef  *pdev);

-

-/* USBD Low Level Driver */

-USBD_StatusTypeDef  USBD_LL_Init (USBD_HandleTypeDef *pdev, int high_speed);

-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);

-

-/**

-  * @}

-  */ 

-

-#endif /* __USBD_CORE_H */

-

-/**

-  * @}

-  */ 

-

-/**

-* @}

-*/ 

-

-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

-

-

-

+/**
+  ******************************************************************************
+  * @file    usbd_core.h
+  * @author  MCD Application Team
+  * @version V2.0.0
+  * @date    18-February-2014
+  * @brief   Header file for usbd_core.c
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; COPYRIGHT 2014 STMicroelectronics</center></h2>
+  *
+  * Licensed under MCD-ST Liberty SW License Agreement V2, (the "License");
+  * You may not use this file except in compliance with the License.
+  * You may obtain a copy of the License at:
+  *
+  *        http://www.st.com/software_license_agreement_liberty_v2
+  *
+  * Unless required by applicable law or agreed to in writing, software
+  * distributed under the License is distributed on an "AS IS" BASIS,
+  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  * See the License for the specific language governing permissions and
+  * limitations under the License.
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __USBD_CORE_H
+#define __USBD_CORE_H
+
+/* Includes ------------------------------------------------------------------*/
+#include "usbd_conf.h"
+#include "usbd_def.h"
+#include "usbd_ioreq.h"
+#include "usbd_ctlreq.h"
+
+/** @addtogroup STM32_USB_OTG_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
+  * @{
+  */
+#define USBD_SOF          USBD_LL_SOF
+/**
+  * @}
+  */
+
+/** @defgroup USBD_CORE_Exported_FunctionsPrototype
+  * @{
+  */
+USBD_StatusTypeDef USBD_Init(USBD_HandleTypeDef *pdev, USBD_DescriptorsTypeDef *pdesc, uint8_t id);
+USBD_StatusTypeDef 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, const 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_LL_SetupStage(USBD_HandleTypeDef *pdev, uint8_t *psetup);
+USBD_StatusTypeDef USBD_LL_DataOutStage(USBD_HandleTypeDef *pdev , uint8_t epnum, uint8_t *pdata);
+USBD_StatusTypeDef USBD_LL_DataInStage(USBD_HandleTypeDef *pdev , uint8_t epnum, uint8_t *pdata);
+
+USBD_StatusTypeDef USBD_LL_Reset(USBD_HandleTypeDef  *pdev);
+USBD_StatusTypeDef USBD_LL_SetSpeed(USBD_HandleTypeDef  *pdev, USBD_SpeedTypeDef speed);
+USBD_StatusTypeDef USBD_LL_Suspend(USBD_HandleTypeDef  *pdev);
+USBD_StatusTypeDef USBD_LL_Resume(USBD_HandleTypeDef  *pdev);
+
+USBD_StatusTypeDef USBD_LL_SOF(USBD_HandleTypeDef  *pdev);
+USBD_StatusTypeDef USBD_LL_IsoINIncomplete(USBD_HandleTypeDef  *pdev, uint8_t epnum);
+USBD_StatusTypeDef USBD_LL_IsoOUTIncomplete(USBD_HandleTypeDef  *pdev, uint8_t epnum);
+
+USBD_StatusTypeDef USBD_LL_DevConnected(USBD_HandleTypeDef  *pdev);
+USBD_StatusTypeDef USBD_LL_DevDisconnected(USBD_HandleTypeDef  *pdev);
+
+/* USBD Low Level Driver */
+USBD_StatusTypeDef  USBD_LL_Init (USBD_HandleTypeDef *pdev, int high_speed);
+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);
+
+/**
+  * @}
+  */
+
+#endif /* __USBD_CORE_H */
+
+/**
+  * @}
+  */
+
+/**
+* @}
+*/
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
+
+
diff --git a/ports/stm32/usbdev/core/inc/usbd_ctlreq.h b/ports/stm32/usbdev/core/inc/usbd_ctlreq.h
index 9edf07924..8c26884e6 100644
--- a/ports/stm32/usbdev/core/inc/usbd_ctlreq.h
+++ b/ports/stm32/usbdev/core/inc/usbd_ctlreq.h
@@ -1,106 +1,106 @@
-/**

-  ******************************************************************************

-  * @file    usbd_req.h

-  * @author  MCD Application Team

-  * @version V2.0.0

-  * @date    18-February-2014

-  * @brief   header file for the usbd_req.c file

-  ******************************************************************************

-  * @attention

-  *

-  * <h2><center>&copy; COPYRIGHT 2014 STMicroelectronics</center></h2>

-  *

-  * Licensed under MCD-ST Liberty SW License Agreement V2, (the "License");

-  * You may not use this file except in compliance with the License.

-  * You may obtain a copy of the License at:

-  *

-  *        http://www.st.com/software_license_agreement_liberty_v2

-  *

-  * Unless required by applicable law or agreed to in writing, software 

-  * distributed under the License is distributed on an "AS IS" BASIS, 

-  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-  * See the License for the specific language governing permissions and

-  * limitations under the License.

-  *

-  ******************************************************************************

-  */ 

-

-/* Define to prevent recursive inclusion -------------------------------------*/

-

-#ifndef __USB_REQUEST_H_

-#define __USB_REQUEST_H_

-

-/* Includes ------------------------------------------------------------------*/

-#include  "usbd_def.h"

-

-

-/** @addtogroup STM32_USB_OTG_DEVICE_LIBRARY

-  * @{

-  */

-  

-/** @defgroup USBD_REQ

-  * @brief header file for the usbd_ioreq.c file

-  * @{

-  */ 

-

-/** @defgroup USBD_REQ_Exported_Defines

-  * @{

-  */ 

-/**

-  * @}

-  */ 

-

-

-/** @defgroup USBD_REQ_Exported_Types

-  * @{

-  */

-/**

-  * @}

-  */ 

-

-

-

-/** @defgroup USBD_REQ_Exported_Macros

-  * @{

-  */ 

-/**

-  * @}

-  */ 

-

-/** @defgroup USBD_REQ_Exported_Variables

-  * @{

-  */ 

-/**

-  * @}

-  */ 

-

-/** @defgroup USBD_REQ_Exported_FunctionsPrototype

-  * @{

-  */ 

-

-USBD_StatusTypeDef  USBD_StdDevReq (USBD_HandleTypeDef  *pdev, USBD_SetupReqTypedef  *req);

-USBD_StatusTypeDef  USBD_StdItfReq (USBD_HandleTypeDef  *pdev, USBD_SetupReqTypedef  *req);

-USBD_StatusTypeDef  USBD_StdEPReq  (USBD_HandleTypeDef  *pdev, USBD_SetupReqTypedef  *req);

-

-

-void USBD_CtlError  (USBD_HandleTypeDef  *pdev, USBD_SetupReqTypedef *req);

-

-void USBD_ParseSetupRequest (USBD_SetupReqTypedef *req, uint8_t *pdata);

-

-void USBD_GetString         (uint8_t *desc, uint8_t *unicode, uint16_t *len);

-/**

-  * @}

-  */ 

-

-#endif /* __USB_REQUEST_H_ */

-

-/**

-  * @}

-  */ 

-

-/**

-* @}

-*/ 

-

-

-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

+/**
+  ******************************************************************************
+  * @file    usbd_req.h
+  * @author  MCD Application Team
+  * @version V2.0.0
+  * @date    18-February-2014
+  * @brief   header file for the usbd_req.c file
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; COPYRIGHT 2014 STMicroelectronics</center></h2>
+  *
+  * Licensed under MCD-ST Liberty SW License Agreement V2, (the "License");
+  * You may not use this file except in compliance with the License.
+  * You may obtain a copy of the License at:
+  *
+  *        http://www.st.com/software_license_agreement_liberty_v2
+  *
+  * Unless required by applicable law or agreed to in writing, software
+  * distributed under the License is distributed on an "AS IS" BASIS,
+  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  * See the License for the specific language governing permissions and
+  * limitations under the License.
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+
+#ifndef __USB_REQUEST_H_
+#define __USB_REQUEST_H_
+
+/* Includes ------------------------------------------------------------------*/
+#include  "usbd_def.h"
+
+
+/** @addtogroup STM32_USB_OTG_DEVICE_LIBRARY
+  * @{
+  */
+
+/** @defgroup USBD_REQ
+  * @brief header file for the usbd_ioreq.c file
+  * @{
+  */
+
+/** @defgroup USBD_REQ_Exported_Defines
+  * @{
+  */
+/**
+  * @}
+  */
+
+
+/** @defgroup USBD_REQ_Exported_Types
+  * @{
+  */
+/**
+  * @}
+  */
+
+
+
+/** @defgroup USBD_REQ_Exported_Macros
+  * @{
+  */
+/**
+  * @}
+  */
+
+/** @defgroup USBD_REQ_Exported_Variables
+  * @{
+  */
+/**
+  * @}
+  */
+
+/** @defgroup USBD_REQ_Exported_FunctionsPrototype
+  * @{
+  */
+
+USBD_StatusTypeDef  USBD_StdDevReq (USBD_HandleTypeDef  *pdev, USBD_SetupReqTypedef  *req);
+USBD_StatusTypeDef  USBD_StdItfReq (USBD_HandleTypeDef  *pdev, USBD_SetupReqTypedef  *req);
+USBD_StatusTypeDef  USBD_StdEPReq  (USBD_HandleTypeDef  *pdev, USBD_SetupReqTypedef  *req);
+
+
+void USBD_CtlError  (USBD_HandleTypeDef  *pdev, USBD_SetupReqTypedef *req);
+
+void USBD_ParseSetupRequest (USBD_SetupReqTypedef *req, uint8_t *pdata);
+
+void USBD_GetString         (uint8_t *desc, uint8_t *unicode, uint16_t *len);
+/**
+  * @}
+  */
+
+#endif /* __USB_REQUEST_H_ */
+
+/**
+  * @}
+  */
+
+/**
+* @}
+*/
+
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/ports/stm32/usbdev/core/inc/usbd_def.h b/ports/stm32/usbdev/core/inc/usbd_def.h
index 140206296..e0d1c3762 100644
--- a/ports/stm32/usbdev/core/inc/usbd_def.h
+++ b/ports/stm32/usbdev/core/inc/usbd_def.h
@@ -1,313 +1,313 @@
-/**

-  ******************************************************************************

-  * @file    usbd_def.h

-  * @author  MCD Application Team

-  * @version V2.0.0

-  * @date    18-February-2014

-  * @brief   general defines for the usb device library 

-  ******************************************************************************

-  * @attention

-  *

-  * <h2><center>&copy; COPYRIGHT 2014 STMicroelectronics</center></h2>

-  *

-  * Licensed under MCD-ST Liberty SW License Agreement V2, (the "License");

-  * You may not use this file except in compliance with the License.

-  * You may obtain a copy of the License at:

-  *

-  *        http://www.st.com/software_license_agreement_liberty_v2

-  *

-  * Unless required by applicable law or agreed to in writing, software 

-  * distributed under the License is distributed on an "AS IS" BASIS, 

-  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-  * See the License for the specific language governing permissions and

-  * limitations under the License.

-  *

-  ******************************************************************************

-  */ 

-

-/* Define to prevent recursive inclusion -------------------------------------*/

-

-#ifndef __USBD_DEF_H

-#define __USBD_DEF_H

-

-/* Includes ------------------------------------------------------------------*/

-#include "usbd_conf.h"

-

-/** @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 ((void *)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  *(*GetHSConfigDescriptor)(struct _USBD_HandleTypeDef *pdev, uint16_t *length); 

-  uint8_t  *(*GetFSConfigDescriptor)(struct _USBD_HandleTypeDef *pdev, uint16_t *length);   

-  uint8_t  *(*GetOtherSpeedConfigDescriptor)(struct _USBD_HandleTypeDef *pdev, uint16_t *length);

-  uint8_t  *(*GetDeviceQualifierDescriptor)(struct _USBD_HandleTypeDef *pdev, uint16_t *length);

-  

-} 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;

-

-struct _USBD_HandleTypeDef;

-

-/* USB Device descriptors structure */

-typedef struct

-{

-  uint8_t *(*GetDeviceDescriptor)(struct _USBD_HandleTypeDef *pdev, uint16_t *length);

-  uint8_t *(*GetStrDescriptor)(struct _USBD_HandleTypeDef *pdev, uint8_t idx, 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;

-

-/* USB Device handle structure */

-typedef struct _USBD_HandleTypeDef

-{

-  uint8_t                 id;

-  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;     

-  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;

-  const 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

-  * @{

-  */ 

-

-/**

-  * @}

-  */ 

-

-#endif /* __USBD_DEF_H */

-

-/**

-  * @}

-  */ 

-

-/**

-* @}

-*/ 

-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

+/**
+  ******************************************************************************
+  * @file    usbd_def.h
+  * @author  MCD Application Team
+  * @version V2.0.0
+  * @date    18-February-2014
+  * @brief   general defines for the usb device library
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; COPYRIGHT 2014 STMicroelectronics</center></h2>
+  *
+  * Licensed under MCD-ST Liberty SW License Agreement V2, (the "License");
+  * You may not use this file except in compliance with the License.
+  * You may obtain a copy of the License at:
+  *
+  *        http://www.st.com/software_license_agreement_liberty_v2
+  *
+  * Unless required by applicable law or agreed to in writing, software
+  * distributed under the License is distributed on an "AS IS" BASIS,
+  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  * See the License for the specific language governing permissions and
+  * limitations under the License.
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+
+#ifndef __USBD_DEF_H
+#define __USBD_DEF_H
+
+/* Includes ------------------------------------------------------------------*/
+#include "usbd_conf.h"
+
+/** @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 ((void *)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  *(*GetHSConfigDescriptor)(struct _USBD_HandleTypeDef *pdev, uint16_t *length);
+  uint8_t  *(*GetFSConfigDescriptor)(struct _USBD_HandleTypeDef *pdev, uint16_t *length);
+  uint8_t  *(*GetOtherSpeedConfigDescriptor)(struct _USBD_HandleTypeDef *pdev, uint16_t *length);
+  uint8_t  *(*GetDeviceQualifierDescriptor)(struct _USBD_HandleTypeDef *pdev, uint16_t *length);
+
+} 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;
+
+struct _USBD_HandleTypeDef;
+
+/* USB Device descriptors structure */
+typedef struct
+{
+  uint8_t *(*GetDeviceDescriptor)(struct _USBD_HandleTypeDef *pdev, uint16_t *length);
+  uint8_t *(*GetStrDescriptor)(struct _USBD_HandleTypeDef *pdev, uint8_t idx, 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;
+
+/* USB Device handle structure */
+typedef struct _USBD_HandleTypeDef
+{
+  uint8_t                 id;
+  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;
+  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;
+  const 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
+  * @{
+  */
+
+/**
+  * @}
+  */
+
+#endif /* __USBD_DEF_H */
+
+/**
+  * @}
+  */
+
+/**
+* @}
+*/
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/ports/stm32/usbdev/core/inc/usbd_ioreq.h b/ports/stm32/usbdev/core/inc/usbd_ioreq.h
index 04e01b854..c964f0ad5 100644
--- a/ports/stm32/usbdev/core/inc/usbd_ioreq.h
+++ b/ports/stm32/usbdev/core/inc/usbd_ioreq.h
@@ -1,121 +1,121 @@
-/**

-  ******************************************************************************

-  * @file    usbd_ioreq.h

-  * @author  MCD Application Team

-  * @version V2.0.0

-  * @date    18-February-2014

-  * @brief   header file for the usbd_ioreq.c file

-  ******************************************************************************

-  * @attention

-  *

-  * <h2><center>&copy; COPYRIGHT 2014 STMicroelectronics</center></h2>

-  *

-  * Licensed under MCD-ST Liberty SW License Agreement V2, (the "License");

-  * You may not use this file except in compliance with the License.

-  * You may obtain a copy of the License at:

-  *

-  *        http://www.st.com/software_license_agreement_liberty_v2

-  *

-  * Unless required by applicable law or agreed to in writing, software 

-  * distributed under the License is distributed on an "AS IS" BASIS, 

-  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-  * See the License for the specific language governing permissions and

-  * limitations under the License.

-  *

-  ******************************************************************************

-  */ 

-

-/* Define to prevent recursive inclusion -------------------------------------*/

-

-#ifndef __USBD_IOREQ_H_

-#define __USBD_IOREQ_H_

-

-/* Includes ------------------------------------------------------------------*/

-#include  "usbd_def.h"

-#include  "usbd_core.h"

-

-/** @addtogroup STM32_USB_OTG_DEVICE_LIBRARY

-  * @{

-  */

-  

-/** @defgroup USBD_IOREQ

-  * @brief header file for the usbd_ioreq.c file

-  * @{

-  */ 

-

-/** @defgroup USBD_IOREQ_Exported_Defines

-  * @{

-  */ 

-/**

-  * @}

-  */ 

-

-

-/** @defgroup USBD_IOREQ_Exported_Types

-  * @{

-  */

-

-

-/**

-  * @}

-  */ 

-

-

-

-/** @defgroup USBD_IOREQ_Exported_Macros

-  * @{

-  */ 

-

-/**

-  * @}

-  */ 

-

-/** @defgroup USBD_IOREQ_Exported_Variables

-  * @{

-  */ 

-

-/**

-  * @}

-  */ 

-

-/** @defgroup USBD_IOREQ_Exported_FunctionsPrototype

-  * @{

-  */ 

-

-USBD_StatusTypeDef  USBD_CtlSendData (USBD_HandleTypeDef  *pdev, 

-                               uint8_t *buf,

-                               uint16_t len);

-

-USBD_StatusTypeDef  USBD_CtlContinueSendData (USBD_HandleTypeDef  *pdev, 

-                               uint8_t *pbuf,

-                               uint16_t len);

-

-USBD_StatusTypeDef USBD_CtlPrepareRx (USBD_HandleTypeDef  *pdev, 

-                               uint8_t *pbuf,                                 

-                               uint16_t len);

-

-USBD_StatusTypeDef  USBD_CtlContinueRx (USBD_HandleTypeDef  *pdev, 

-                              uint8_t *pbuf,                                          

-                              uint16_t len);

-

-USBD_StatusTypeDef  USBD_CtlSendStatus (USBD_HandleTypeDef  *pdev);

-

-USBD_StatusTypeDef  USBD_CtlReceiveStatus (USBD_HandleTypeDef  *pdev);

-

-uint16_t  USBD_GetRxCount (USBD_HandleTypeDef  *pdev , 

-                           uint8_t epnum);

-

-/**

-  * @}

-  */ 

-

-#endif /* __USBD_IOREQ_H_ */

-

-/**

-  * @}

-  */ 

-

-/**

-* @}

-*/ 

-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

+/**
+  ******************************************************************************
+  * @file    usbd_ioreq.h
+  * @author  MCD Application Team
+  * @version V2.0.0
+  * @date    18-February-2014
+  * @brief   header file for the usbd_ioreq.c file
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; COPYRIGHT 2014 STMicroelectronics</center></h2>
+  *
+  * Licensed under MCD-ST Liberty SW License Agreement V2, (the "License");
+  * You may not use this file except in compliance with the License.
+  * You may obtain a copy of the License at:
+  *
+  *        http://www.st.com/software_license_agreement_liberty_v2
+  *
+  * Unless required by applicable law or agreed to in writing, software
+  * distributed under the License is distributed on an "AS IS" BASIS,
+  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  * See the License for the specific language governing permissions and
+  * limitations under the License.
+  *
+  ******************************************************************************
+  */
+
+/* Define to prevent recursive inclusion -------------------------------------*/
+
+#ifndef __USBD_IOREQ_H_
+#define __USBD_IOREQ_H_
+
+/* Includes ------------------------------------------------------------------*/
+#include  "usbd_def.h"
+#include  "usbd_core.h"
+
+/** @addtogroup STM32_USB_OTG_DEVICE_LIBRARY
+  * @{
+  */
+
+/** @defgroup USBD_IOREQ
+  * @brief header file for the usbd_ioreq.c file
+  * @{
+  */
+
+/** @defgroup USBD_IOREQ_Exported_Defines
+  * @{
+  */
+/**
+  * @}
+  */
+
+
+/** @defgroup USBD_IOREQ_Exported_Types
+  * @{
+  */
+
+
+/**
+  * @}
+  */
+
+
+
+/** @defgroup USBD_IOREQ_Exported_Macros
+  * @{
+  */
+
+/**
+  * @}
+  */
+
+/** @defgroup USBD_IOREQ_Exported_Variables
+  * @{
+  */
+
+/**
+  * @}
+  */
+
+/** @defgroup USBD_IOREQ_Exported_FunctionsPrototype
+  * @{
+  */
+
+USBD_StatusTypeDef  USBD_CtlSendData (USBD_HandleTypeDef  *pdev,
+                               uint8_t *buf,
+                               uint16_t len);
+
+USBD_StatusTypeDef  USBD_CtlContinueSendData (USBD_HandleTypeDef  *pdev,
+                               uint8_t *pbuf,
+                               uint16_t len);
+
+USBD_StatusTypeDef USBD_CtlPrepareRx (USBD_HandleTypeDef  *pdev,
+                               uint8_t *pbuf,
+                               uint16_t len);
+
+USBD_StatusTypeDef  USBD_CtlContinueRx (USBD_HandleTypeDef  *pdev,
+                              uint8_t *pbuf,
+                              uint16_t len);
+
+USBD_StatusTypeDef  USBD_CtlSendStatus (USBD_HandleTypeDef  *pdev);
+
+USBD_StatusTypeDef  USBD_CtlReceiveStatus (USBD_HandleTypeDef  *pdev);
+
+uint16_t  USBD_GetRxCount (USBD_HandleTypeDef  *pdev ,
+                           uint8_t epnum);
+
+/**
+  * @}
+  */
+
+#endif /* __USBD_IOREQ_H_ */
+
+/**
+  * @}
+  */
+
+/**
+* @}
+*/
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/ports/stm32/usbdev/core/src/usbd_core.c b/ports/stm32/usbdev/core/src/usbd_core.c
index 009703663..f235b24ee 100644
--- a/ports/stm32/usbdev/core/src/usbd_core.c
+++ b/ports/stm32/usbdev/core/src/usbd_core.c
@@ -1,552 +1,552 @@
-/**

-  ******************************************************************************

-  * @file    usbd_core.c

-  * @author  MCD Application Team

-  * @version V2.0.0

-  * @date    18-February-2014

-  * @brief   This file provides all the USBD core functions.

-  ******************************************************************************

-  * @attention

-  *

-  * <h2><center>&copy; COPYRIGHT 2014 STMicroelectronics</center></h2>

-  *

-  * Licensed under MCD-ST Liberty SW License Agreement V2, (the "License");

-  * You may not use this file except in compliance with the License.

-  * You may obtain a copy of the License at:

-  *

-  *        http://www.st.com/software_license_agreement_liberty_v2

-  *

-  * Unless required by applicable law or agreed to in writing, software 

-  * distributed under the License is distributed on an "AS IS" BASIS, 

-  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-  * See the License for the specific language governing permissions and

-  * limitations under the License.

-  *

-  ******************************************************************************

-  */ 

-

-/* Includes ------------------------------------------------------------------*/

-#include "usbd_core.h"

-

-/** @addtogroup STM32_USBD_DEVICE_LIBRARY

-* @{

-*/

-

-

-/** @defgroup USBD_CORE 

-* @brief usbd core module

-* @{

-*/ 

-

-/** @defgroup USBD_CORE_Private_TypesDefinitions

-* @{

-*/ 

-/**

-* @}

-*/ 

-

-

-/** @defgroup USBD_CORE_Private_Defines

-* @{

-*/ 

-

-/**

-* @}

-*/ 

-

-

-/** @defgroup USBD_CORE_Private_Macros

-* @{

-*/ 

-/**

-* @}

-*/ 

-

-

-

-

-/** @defgroup USBD_CORE_Private_FunctionPrototypes

-* @{

-*/ 

-

-/**

-* @}

-*/ 

-

-/** @defgroup USBD_CORE_Private_Variables

-* @{

-*/ 

-

-/**

-* @}

-*/ 

-

-/** @defgroup USBD_CORE_Private_Functions

-* @{

-*/ 

-

-/**

-* @brief  USBD_Init

-*         Initailizes the device stack and load the class driver

-* @param  pdev: device instance

-* @param  core_address: USB OTG core ID

-* @param  pdesc: Descriptor structure address

-* @param  id: Low level core index

-* @retval None

-*/

-USBD_StatusTypeDef USBD_Init(USBD_HandleTypeDef *pdev, USBD_DescriptorsTypeDef *pdesc, uint8_t id)

-{

-  /* Check whether the USB Host handle is valid */

-  if(pdev == NULL)

-  {

-    return USBD_FAIL; 

-  }

-  

-  /* Unlink previous class*/

-  if(pdev->pClass != NULL)

-  {

-    pdev->pClass = NULL;

-  }

-  

-  /* Assign USBD Descriptors */

-  if(pdesc != NULL)

-  {

-    pdev->pDesc = pdesc;

-  }

-  

-  /* Set Device initial State */

-  pdev->dev_state  = USBD_STATE_DEFAULT;

-  pdev->id = id;

-  /* Initialize low level driver */

-  USBD_LL_Init(pdev, 0);

-  

-  return USBD_OK; 

-}

-

-/**

-* @brief  USBD_DeInit 

-*         Re-Initialize th device library

-* @param  pdev: device instance

-* @retval status: status

-*/

-USBD_StatusTypeDef USBD_DeInit(USBD_HandleTypeDef *pdev)

-{

-  /* Set Default State */

-  pdev->dev_state  = USBD_STATE_DEFAULT;

-  

-  /* Free Class Resources */

-  pdev->pClass->DeInit(pdev, pdev->dev_config);  

-  

-    /* Stop the low level driver  */

-  USBD_LL_Stop(pdev); 

-  

-  /* Initialize low level driver */

-  USBD_LL_DeInit(pdev);

-  

-  return USBD_OK;

-}

-

-

-/**

-  * @brief  USBD_RegisterClass 

-  *         Link class driver to Device Core.

-  * @param  pDevice : Device Handle

-  * @param  pclass: Class handle

-  * @retval USBD Status

-  */

-USBD_StatusTypeDef  USBD_RegisterClass(USBD_HandleTypeDef *pdev, const USBD_ClassTypeDef *pclass)

-{

-  USBD_StatusTypeDef   status = USBD_OK;

-  if(pclass != 0)

-  {

-    /* link the class tgo the USB Device handle */

-    pdev->pClass = pclass;

-    status = USBD_OK;

-  }

-  else

-  {

-    status = USBD_FAIL; 

-  }

-  

-  return status;

-}

-

-/**

-  * @brief  USBD_Start 

-  *         Start the USB Device Core.

-  * @param  pdev: Device Handle

-  * @retval USBD Status

-  */

-USBD_StatusTypeDef  USBD_Start  (USBD_HandleTypeDef *pdev)

-{

-  

-  /* Start the low level driver  */

-  USBD_LL_Start(pdev); 

-  

-  return USBD_OK;  

-}

-

-/**

-  * @brief  USBD_Stop 

-  *         Stop the USB Device Core.

-  * @param  pdev: Device Handle

-  * @retval USBD Status

-  */

-USBD_StatusTypeDef  USBD_Stop   (USBD_HandleTypeDef *pdev)

-{

-  /* Free Class Resources */

-  pdev->pClass->DeInit(pdev, pdev->dev_config);  

-

-  /* Stop the low level driver  */

-  USBD_LL_Stop(pdev); 

-  

-  return USBD_OK;  

-}

-

-/**

-* @brief  USBD_RunTestMode 

-*         Launch test mode process

-* @param  pdev: device instance

-* @retval status

-*/

-USBD_StatusTypeDef  USBD_RunTestMode (USBD_HandleTypeDef  *pdev) 

-{

-  return USBD_OK;

-}

-

-

-/**

-* @brief  USBD_SetClassConfig 

-*        Configure device and start the interface

-* @param  pdev: device instance

-* @param  cfgidx: configuration index

-* @retval status

-*/

-

-USBD_StatusTypeDef USBD_SetClassConfig(USBD_HandleTypeDef  *pdev, uint8_t cfgidx)

-{

-  USBD_StatusTypeDef   ret = USBD_FAIL;

-  

-  if(pdev->pClass != NULL)

-  {

-    /* Set configuration  and Start the Class*/

-    if(pdev->pClass->Init(pdev, cfgidx) == 0)

-    {

-      ret = USBD_OK;

-    }

-  }

-  return ret; 

-}

-

-/**

-* @brief  USBD_ClrClassConfig 

-*         Clear current configuration

-* @param  pdev: device instance

-* @param  cfgidx: configuration index

-* @retval status: USBD_StatusTypeDef

-*/

-USBD_StatusTypeDef USBD_ClrClassConfig(USBD_HandleTypeDef  *pdev, uint8_t cfgidx)

-{

-  /* Clear configuration  and Deinitialize the Class process*/

-  pdev->pClass->DeInit(pdev, cfgidx);  

-  return USBD_OK;

-}

-

-

-/**

-* @brief  USBD_SetupStage 

-*         Handle the setup stage

-* @param  pdev: device instance

-* @retval status

-*/

-USBD_StatusTypeDef USBD_LL_SetupStage(USBD_HandleTypeDef *pdev, uint8_t *psetup)

-{

-

-  USBD_ParseSetupRequest(&pdev->request, psetup);

-  

-  pdev->ep0_state = USBD_EP0_SETUP;

-  pdev->ep0_data_len = pdev->request.wLength;

-  

-  switch (pdev->request.bmRequest & 0x1F) 

-  {

-  case USB_REQ_RECIPIENT_DEVICE:   

-    USBD_StdDevReq (pdev, &pdev->request);

-    break;

-    

-  case USB_REQ_RECIPIENT_INTERFACE:     

-    USBD_StdItfReq(pdev, &pdev->request);

-    break;

-    

-  case USB_REQ_RECIPIENT_ENDPOINT:        

-    USBD_StdEPReq(pdev, &pdev->request);   

-    break;

-    

-  default:           

-    USBD_LL_StallEP(pdev , pdev->request.bmRequest & 0x80);

-    break;

-  }  

-  return USBD_OK;  

-}

-

-/**

-* @brief  USBD_DataOutStage 

-*         Handle data OUT stage

-* @param  pdev: device instance

-* @param  epnum: endpoint index

-* @retval status

-*/

-USBD_StatusTypeDef USBD_LL_DataOutStage(USBD_HandleTypeDef *pdev , uint8_t epnum, uint8_t *pdata)

-{

-  USBD_EndpointTypeDef    *pep;

-  

-  if(epnum == 0) 

-  {

-    pep = &pdev->ep_out[0];

-    

-    if ( pdev->ep0_state == USBD_EP0_DATA_OUT)

-    {

-      if(pep->rem_length > pep->maxpacket)

-      {

-        pep->rem_length -=  pep->maxpacket;

-       

-        USBD_CtlContinueRx (pdev, 

-                            pdata,

-                            MIN(pep->rem_length ,pep->maxpacket));

-      }

-      else

-      {

-        if((pdev->pClass->EP0_RxReady != NULL)&&

-           (pdev->dev_state == USBD_STATE_CONFIGURED))

-        {

-          pdev->pClass->EP0_RxReady(pdev); 

-        }

-        USBD_CtlSendStatus(pdev);

-      }

-    }

-  }

-  else if((pdev->pClass->DataOut != NULL)&&

-          (pdev->dev_state == USBD_STATE_CONFIGURED))

-  {

-    pdev->pClass->DataOut(pdev, epnum); 

-  }  

-  return USBD_OK;

-}

-

-/**

-* @brief  USBD_DataInStage 

-*         Handle data in stage

-* @param  pdev: device instance

-* @param  epnum: endpoint index

-* @retval status

-*/

-USBD_StatusTypeDef USBD_LL_DataInStage(USBD_HandleTypeDef *pdev ,uint8_t epnum, uint8_t *pdata)

-{

-  USBD_EndpointTypeDef    *pep;

-    

-  if(epnum == 0) 

-  {

-    pep = &pdev->ep_in[0];

-    

-    if ( pdev->ep0_state == USBD_EP0_DATA_IN)

-    {

-      if(pep->rem_length > pep->maxpacket)

-      {

-        pep->rem_length -=  pep->maxpacket;

-        

-        USBD_CtlContinueSendData (pdev, 

-                                  pdata, 

-                                  pep->rem_length);

-      }

-      else

-      { /* last packet is MPS multiple, so send ZLP packet */

-        if((pep->total_length % pep->maxpacket == 0) &&

-           (pep->total_length >= pep->maxpacket) &&

-             (pep->total_length < pdev->ep0_data_len ))

-        {

-          

-          USBD_CtlContinueSendData(pdev , NULL, 0);

-          pdev->ep0_data_len = 0;

-        }

-        else

-        {

-          if((pdev->pClass->EP0_TxSent != NULL)&&

-             (pdev->dev_state == USBD_STATE_CONFIGURED))

-          {

-            pdev->pClass->EP0_TxSent(pdev); 

-          }          

-          USBD_CtlReceiveStatus(pdev);

-        }

-      }

-    }

-    if (pdev->dev_test_mode == 1)

-    {

-      USBD_RunTestMode(pdev); 

-      pdev->dev_test_mode = 0;

-    }

-  }

-  else if((pdev->pClass->DataIn != NULL)&& 

-          (pdev->dev_state == USBD_STATE_CONFIGURED))

-  {

-    pdev->pClass->DataIn(pdev, epnum); 

-  }  

-  return USBD_OK;

-}

-

-/**

-* @brief  USBD_LL_Reset 

-*         Handle Reset event

-* @param  pdev: device instance

-* @retval status

-*/

-

-USBD_StatusTypeDef USBD_LL_Reset(USBD_HandleTypeDef  *pdev)

-{

-  /* Open EP0 OUT */

-  USBD_LL_OpenEP(pdev,

-              0x00,

-              USBD_EP_TYPE_CTRL,

-              USB_MAX_EP0_SIZE);

-  

-  pdev->ep_out[0].maxpacket = USB_MAX_EP0_SIZE;

-  

-  /* Open EP0 IN */

-  USBD_LL_OpenEP(pdev,

-              0x80,

-              USBD_EP_TYPE_CTRL,

-              USB_MAX_EP0_SIZE);

-  

-  pdev->ep_in[0].maxpacket = USB_MAX_EP0_SIZE;

-  /* Upon Reset call usr call back */

-  pdev->dev_state = USBD_STATE_DEFAULT;

-  

-  if (pdev->pClassData) 

-    pdev->pClass->DeInit(pdev, pdev->dev_config);  

- 

-  

-  return USBD_OK;

-}

-

-

-

-

-/**

-* @brief  USBD_LL_Reset 

-*         Handle Reset event

-* @param  pdev: device instance

-* @retval status

-*/

-USBD_StatusTypeDef USBD_LL_SetSpeed(USBD_HandleTypeDef  *pdev, USBD_SpeedTypeDef speed)

-{

-  pdev->dev_speed = speed;

-  return USBD_OK;

-}

-

-/**

-* @brief  USBD_Suspend 

-*         Handle Suspend event

-* @param  pdev: device instance

-* @retval status

-*/

-

-USBD_StatusTypeDef USBD_LL_Suspend(USBD_HandleTypeDef  *pdev)

-{

-  pdev->dev_old_state =  pdev->dev_state;

-  pdev->dev_state  = USBD_STATE_SUSPENDED;

-  return USBD_OK;

-}

-

-/**

-* @brief  USBD_Resume 

-*         Handle Resume event

-* @param  pdev: device instance

-* @retval status

-*/

-

-USBD_StatusTypeDef USBD_LL_Resume(USBD_HandleTypeDef  *pdev)

-{

-  pdev->dev_state = pdev->dev_old_state;  

-  return USBD_OK;

-}

-

-/**

-* @brief  USBD_SOF 

-*         Handle SOF event

-* @param  pdev: device instance

-* @retval status

-*/

-

-USBD_StatusTypeDef USBD_LL_SOF(USBD_HandleTypeDef  *pdev)

-{

-  if(pdev->dev_state == USBD_STATE_CONFIGURED)

-  {

-    if(pdev->pClass->SOF != NULL)

-    {

-      pdev->pClass->SOF(pdev);

-    }

-  }

-  return USBD_OK;

-}

-

-/**

-* @brief  USBD_IsoINIncomplete 

-*         Handle iso in incomplete event

-* @param  pdev: device instance

-* @retval status

-*/

-USBD_StatusTypeDef USBD_LL_IsoINIncomplete(USBD_HandleTypeDef  *pdev, uint8_t epnum)

-{

-  return USBD_OK;

-}

-

-/**

-* @brief  USBD_IsoOUTIncomplete 

-*         Handle iso out incomplete event

-* @param  pdev: device instance

-* @retval status

-*/

-USBD_StatusTypeDef USBD_LL_IsoOUTIncomplete(USBD_HandleTypeDef  *pdev, uint8_t epnum)

-{

-  return USBD_OK;

-}

-

-/**

-* @brief  USBD_DevConnected 

-*         Handle device connection event

-* @param  pdev: device instance

-* @retval status

-*/

-USBD_StatusTypeDef USBD_LL_DevConnected(USBD_HandleTypeDef  *pdev)

-{

-  return USBD_OK;

-}

-

-/**

-* @brief  USBD_DevDisconnected 

-*         Handle device disconnection event

-* @param  pdev: device instance

-* @retval status

-*/

-USBD_StatusTypeDef USBD_LL_DevDisconnected(USBD_HandleTypeDef  *pdev)

-{

-  /* Free Class Resources */

-  pdev->dev_state = USBD_STATE_DEFAULT;

-  pdev->pClass->DeInit(pdev, pdev->dev_config);  

-   

-  return USBD_OK;

-}

-/**

-* @}

-*/ 

-

-

-/**

-* @}

-*/ 

-

-

-/**

-* @}

-*/ 

-

-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

-

+/**
+  ******************************************************************************
+  * @file    usbd_core.c
+  * @author  MCD Application Team
+  * @version V2.0.0
+  * @date    18-February-2014
+  * @brief   This file provides all the USBD core functions.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; COPYRIGHT 2014 STMicroelectronics</center></h2>
+  *
+  * Licensed under MCD-ST Liberty SW License Agreement V2, (the "License");
+  * You may not use this file except in compliance with the License.
+  * You may obtain a copy of the License at:
+  *
+  *        http://www.st.com/software_license_agreement_liberty_v2
+  *
+  * Unless required by applicable law or agreed to in writing, software
+  * distributed under the License is distributed on an "AS IS" BASIS,
+  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  * See the License for the specific language governing permissions and
+  * limitations under the License.
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "usbd_core.h"
+
+/** @addtogroup STM32_USBD_DEVICE_LIBRARY
+* @{
+*/
+
+
+/** @defgroup USBD_CORE
+* @brief usbd core module
+* @{
+*/
+
+/** @defgroup USBD_CORE_Private_TypesDefinitions
+* @{
+*/
+/**
+* @}
+*/
+
+
+/** @defgroup USBD_CORE_Private_Defines
+* @{
+*/
+
+/**
+* @}
+*/
+
+
+/** @defgroup USBD_CORE_Private_Macros
+* @{
+*/
+/**
+* @}
+*/
+
+
+
+
+/** @defgroup USBD_CORE_Private_FunctionPrototypes
+* @{
+*/
+
+/**
+* @}
+*/
+
+/** @defgroup USBD_CORE_Private_Variables
+* @{
+*/
+
+/**
+* @}
+*/
+
+/** @defgroup USBD_CORE_Private_Functions
+* @{
+*/
+
+/**
+* @brief  USBD_Init
+*         Initailizes the device stack and load the class driver
+* @param  pdev: device instance
+* @param  core_address: USB OTG core ID
+* @param  pdesc: Descriptor structure address
+* @param  id: Low level core index
+* @retval None
+*/
+USBD_StatusTypeDef USBD_Init(USBD_HandleTypeDef *pdev, USBD_DescriptorsTypeDef *pdesc, uint8_t id)
+{
+  /* Check whether the USB Host handle is valid */
+  if(pdev == NULL)
+  {
+    return USBD_FAIL;
+  }
+
+  /* Unlink previous class*/
+  if(pdev->pClass != NULL)
+  {
+    pdev->pClass = NULL;
+  }
+
+  /* Assign USBD Descriptors */
+  if(pdesc != NULL)
+  {
+    pdev->pDesc = pdesc;
+  }
+
+  /* Set Device initial State */
+  pdev->dev_state  = USBD_STATE_DEFAULT;
+  pdev->id = id;
+  /* Initialize low level driver */
+  USBD_LL_Init(pdev, 0);
+
+  return USBD_OK;
+}
+
+/**
+* @brief  USBD_DeInit
+*         Re-Initialize th device library
+* @param  pdev: device instance
+* @retval status: status
+*/
+USBD_StatusTypeDef USBD_DeInit(USBD_HandleTypeDef *pdev)
+{
+  /* Set Default State */
+  pdev->dev_state  = USBD_STATE_DEFAULT;
+
+  /* Free Class Resources */
+  pdev->pClass->DeInit(pdev, pdev->dev_config);
+
+    /* Stop the low level driver  */
+  USBD_LL_Stop(pdev);
+
+  /* Initialize low level driver */
+  USBD_LL_DeInit(pdev);
+
+  return USBD_OK;
+}
+
+
+/**
+  * @brief  USBD_RegisterClass
+  *         Link class driver to Device Core.
+  * @param  pDevice : Device Handle
+  * @param  pclass: Class handle
+  * @retval USBD Status
+  */
+USBD_StatusTypeDef  USBD_RegisterClass(USBD_HandleTypeDef *pdev, const USBD_ClassTypeDef *pclass)
+{
+  USBD_StatusTypeDef   status = USBD_OK;
+  if(pclass != 0)
+  {
+    /* link the class tgo the USB Device handle */
+    pdev->pClass = pclass;
+    status = USBD_OK;
+  }
+  else
+  {
+    status = USBD_FAIL;
+  }
+
+  return status;
+}
+
+/**
+  * @brief  USBD_Start
+  *         Start the USB Device Core.
+  * @param  pdev: Device Handle
+  * @retval USBD Status
+  */
+USBD_StatusTypeDef  USBD_Start  (USBD_HandleTypeDef *pdev)
+{
+
+  /* Start the low level driver  */
+  USBD_LL_Start(pdev);
+
+  return USBD_OK;
+}
+
+/**
+  * @brief  USBD_Stop
+  *         Stop the USB Device Core.
+  * @param  pdev: Device Handle
+  * @retval USBD Status
+  */
+USBD_StatusTypeDef  USBD_Stop   (USBD_HandleTypeDef *pdev)
+{
+  /* Free Class Resources */
+  pdev->pClass->DeInit(pdev, pdev->dev_config);
+
+  /* Stop the low level driver  */
+  USBD_LL_Stop(pdev);
+
+  return USBD_OK;
+}
+
+/**
+* @brief  USBD_RunTestMode
+*         Launch test mode process
+* @param  pdev: device instance
+* @retval status
+*/
+USBD_StatusTypeDef  USBD_RunTestMode (USBD_HandleTypeDef  *pdev)
+{
+  return USBD_OK;
+}
+
+
+/**
+* @brief  USBD_SetClassConfig
+*        Configure device and start the interface
+* @param  pdev: device instance
+* @param  cfgidx: configuration index
+* @retval status
+*/
+
+USBD_StatusTypeDef USBD_SetClassConfig(USBD_HandleTypeDef  *pdev, uint8_t cfgidx)
+{
+  USBD_StatusTypeDef   ret = USBD_FAIL;
+
+  if(pdev->pClass != NULL)
+  {
+    /* Set configuration  and Start the Class*/
+    if(pdev->pClass->Init(pdev, cfgidx) == 0)
+    {
+      ret = USBD_OK;
+    }
+  }
+  return ret;
+}
+
+/**
+* @brief  USBD_ClrClassConfig
+*         Clear current configuration
+* @param  pdev: device instance
+* @param  cfgidx: configuration index
+* @retval status: USBD_StatusTypeDef
+*/
+USBD_StatusTypeDef USBD_ClrClassConfig(USBD_HandleTypeDef  *pdev, uint8_t cfgidx)
+{
+  /* Clear configuration  and Deinitialize the Class process*/
+  pdev->pClass->DeInit(pdev, cfgidx);
+  return USBD_OK;
+}
+
+
+/**
+* @brief  USBD_SetupStage
+*         Handle the setup stage
+* @param  pdev: device instance
+* @retval status
+*/
+USBD_StatusTypeDef USBD_LL_SetupStage(USBD_HandleTypeDef *pdev, uint8_t *psetup)
+{
+
+  USBD_ParseSetupRequest(&pdev->request, psetup);
+
+  pdev->ep0_state = USBD_EP0_SETUP;
+  pdev->ep0_data_len = pdev->request.wLength;
+
+  switch (pdev->request.bmRequest & 0x1F)
+  {
+  case USB_REQ_RECIPIENT_DEVICE:
+    USBD_StdDevReq (pdev, &pdev->request);
+    break;
+
+  case USB_REQ_RECIPIENT_INTERFACE:
+    USBD_StdItfReq(pdev, &pdev->request);
+    break;
+
+  case USB_REQ_RECIPIENT_ENDPOINT:
+    USBD_StdEPReq(pdev, &pdev->request);
+    break;
+
+  default:
+    USBD_LL_StallEP(pdev , pdev->request.bmRequest & 0x80);
+    break;
+  }
+  return USBD_OK;
+}
+
+/**
+* @brief  USBD_DataOutStage
+*         Handle data OUT stage
+* @param  pdev: device instance
+* @param  epnum: endpoint index
+* @retval status
+*/
+USBD_StatusTypeDef USBD_LL_DataOutStage(USBD_HandleTypeDef *pdev , uint8_t epnum, uint8_t *pdata)
+{
+  USBD_EndpointTypeDef    *pep;
+
+  if(epnum == 0)
+  {
+    pep = &pdev->ep_out[0];
+
+    if ( pdev->ep0_state == USBD_EP0_DATA_OUT)
+    {
+      if(pep->rem_length > pep->maxpacket)
+      {
+        pep->rem_length -=  pep->maxpacket;
+
+        USBD_CtlContinueRx (pdev,
+                            pdata,
+                            MIN(pep->rem_length ,pep->maxpacket));
+      }
+      else
+      {
+        if((pdev->pClass->EP0_RxReady != NULL)&&
+           (pdev->dev_state == USBD_STATE_CONFIGURED))
+        {
+          pdev->pClass->EP0_RxReady(pdev);
+        }
+        USBD_CtlSendStatus(pdev);
+      }
+    }
+  }
+  else if((pdev->pClass->DataOut != NULL)&&
+          (pdev->dev_state == USBD_STATE_CONFIGURED))
+  {
+    pdev->pClass->DataOut(pdev, epnum);
+  }
+  return USBD_OK;
+}
+
+/**
+* @brief  USBD_DataInStage
+*         Handle data in stage
+* @param  pdev: device instance
+* @param  epnum: endpoint index
+* @retval status
+*/
+USBD_StatusTypeDef USBD_LL_DataInStage(USBD_HandleTypeDef *pdev ,uint8_t epnum, uint8_t *pdata)
+{
+  USBD_EndpointTypeDef    *pep;
+
+  if(epnum == 0)
+  {
+    pep = &pdev->ep_in[0];
+
+    if ( pdev->ep0_state == USBD_EP0_DATA_IN)
+    {
+      if(pep->rem_length > pep->maxpacket)
+      {
+        pep->rem_length -=  pep->maxpacket;
+
+        USBD_CtlContinueSendData (pdev,
+                                  pdata,
+                                  pep->rem_length);
+      }
+      else
+      { /* last packet is MPS multiple, so send ZLP packet */
+        if((pep->total_length % pep->maxpacket == 0) &&
+           (pep->total_length >= pep->maxpacket) &&
+             (pep->total_length < pdev->ep0_data_len ))
+        {
+
+          USBD_CtlContinueSendData(pdev , NULL, 0);
+          pdev->ep0_data_len = 0;
+        }
+        else
+        {
+          if((pdev->pClass->EP0_TxSent != NULL)&&
+             (pdev->dev_state == USBD_STATE_CONFIGURED))
+          {
+            pdev->pClass->EP0_TxSent(pdev);
+          }
+          USBD_CtlReceiveStatus(pdev);
+        }
+      }
+    }
+    if (pdev->dev_test_mode == 1)
+    {
+      USBD_RunTestMode(pdev);
+      pdev->dev_test_mode = 0;
+    }
+  }
+  else if((pdev->pClass->DataIn != NULL)&&
+          (pdev->dev_state == USBD_STATE_CONFIGURED))
+  {
+    pdev->pClass->DataIn(pdev, epnum);
+  }
+  return USBD_OK;
+}
+
+/**
+* @brief  USBD_LL_Reset
+*         Handle Reset event
+* @param  pdev: device instance
+* @retval status
+*/
+
+USBD_StatusTypeDef USBD_LL_Reset(USBD_HandleTypeDef  *pdev)
+{
+  /* Open EP0 OUT */
+  USBD_LL_OpenEP(pdev,
+              0x00,
+              USBD_EP_TYPE_CTRL,
+              USB_MAX_EP0_SIZE);
+
+  pdev->ep_out[0].maxpacket = USB_MAX_EP0_SIZE;
+
+  /* Open EP0 IN */
+  USBD_LL_OpenEP(pdev,
+              0x80,
+              USBD_EP_TYPE_CTRL,
+              USB_MAX_EP0_SIZE);
+
+  pdev->ep_in[0].maxpacket = USB_MAX_EP0_SIZE;
+  /* Upon Reset call usr call back */
+  pdev->dev_state = USBD_STATE_DEFAULT;
+
+  if (pdev->pClassData)
+    pdev->pClass->DeInit(pdev, pdev->dev_config);
+
+
+  return USBD_OK;
+}
+
+
+
+
+/**
+* @brief  USBD_LL_Reset
+*         Handle Reset event
+* @param  pdev: device instance
+* @retval status
+*/
+USBD_StatusTypeDef USBD_LL_SetSpeed(USBD_HandleTypeDef  *pdev, USBD_SpeedTypeDef speed)
+{
+  pdev->dev_speed = speed;
+  return USBD_OK;
+}
+
+/**
+* @brief  USBD_Suspend
+*         Handle Suspend event
+* @param  pdev: device instance
+* @retval status
+*/
+
+USBD_StatusTypeDef USBD_LL_Suspend(USBD_HandleTypeDef  *pdev)
+{
+  pdev->dev_old_state =  pdev->dev_state;
+  pdev->dev_state  = USBD_STATE_SUSPENDED;
+  return USBD_OK;
+}
+
+/**
+* @brief  USBD_Resume
+*         Handle Resume event
+* @param  pdev: device instance
+* @retval status
+*/
+
+USBD_StatusTypeDef USBD_LL_Resume(USBD_HandleTypeDef  *pdev)
+{
+  pdev->dev_state = pdev->dev_old_state;
+  return USBD_OK;
+}
+
+/**
+* @brief  USBD_SOF
+*         Handle SOF event
+* @param  pdev: device instance
+* @retval status
+*/
+
+USBD_StatusTypeDef USBD_LL_SOF(USBD_HandleTypeDef  *pdev)
+{
+  if(pdev->dev_state == USBD_STATE_CONFIGURED)
+  {
+    if(pdev->pClass->SOF != NULL)
+    {
+      pdev->pClass->SOF(pdev);
+    }
+  }
+  return USBD_OK;
+}
+
+/**
+* @brief  USBD_IsoINIncomplete
+*         Handle iso in incomplete event
+* @param  pdev: device instance
+* @retval status
+*/
+USBD_StatusTypeDef USBD_LL_IsoINIncomplete(USBD_HandleTypeDef  *pdev, uint8_t epnum)
+{
+  return USBD_OK;
+}
+
+/**
+* @brief  USBD_IsoOUTIncomplete
+*         Handle iso out incomplete event
+* @param  pdev: device instance
+* @retval status
+*/
+USBD_StatusTypeDef USBD_LL_IsoOUTIncomplete(USBD_HandleTypeDef  *pdev, uint8_t epnum)
+{
+  return USBD_OK;
+}
+
+/**
+* @brief  USBD_DevConnected
+*         Handle device connection event
+* @param  pdev: device instance
+* @retval status
+*/
+USBD_StatusTypeDef USBD_LL_DevConnected(USBD_HandleTypeDef  *pdev)
+{
+  return USBD_OK;
+}
+
+/**
+* @brief  USBD_DevDisconnected
+*         Handle device disconnection event
+* @param  pdev: device instance
+* @retval status
+*/
+USBD_StatusTypeDef USBD_LL_DevDisconnected(USBD_HandleTypeDef  *pdev)
+{
+  /* Free Class Resources */
+  pdev->dev_state = USBD_STATE_DEFAULT;
+  pdev->pClass->DeInit(pdev, pdev->dev_config);
+
+  return USBD_OK;
+}
+/**
+* @}
+*/
+
+
+/**
+* @}
+*/
+
+
+/**
+* @}
+*/
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
+
diff --git a/ports/stm32/usbdev/core/src/usbd_ctlreq.c b/ports/stm32/usbdev/core/src/usbd_ctlreq.c
index a68016bf4..f25f252d6 100644
--- a/ports/stm32/usbdev/core/src/usbd_ctlreq.c
+++ b/ports/stm32/usbdev/core/src/usbd_ctlreq.c
@@ -1,740 +1,740 @@
-/**

-  ******************************************************************************

-  * @file    usbd_req.c

-  * @author  MCD Application Team

-  * @version V2.0.0

-  * @date    18-February-2014 

-  * @brief   This file provides the standard USB requests following chapter 9.

-  ******************************************************************************

-  * @attention

-  *

-  * <h2><center>&copy; COPYRIGHT 2014 STMicroelectronics</center></h2>

-  *

-  * Licensed under MCD-ST Liberty SW License Agreement V2, (the "License");

-  * You may not use this file except in compliance with the License.

-  * You may obtain a copy of the License at:

-  *

-  *        http://www.st.com/software_license_agreement_liberty_v2

-  *

-  * Unless required by applicable law or agreed to in writing, software 

-  * distributed under the License is distributed on an "AS IS" BASIS, 

-  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-  * See the License for the specific language governing permissions and

-  * limitations under the License.

-  *

-  ******************************************************************************

-  */ 

-

-/* Includes ------------------------------------------------------------------*/

-#include "usbd_ctlreq.h"

-#include "usbd_ioreq.h"

-

-

-/** @addtogroup STM32_USBD_STATE_DEVICE_LIBRARY

-  * @{

-  */

-

-

-/** @defgroup USBD_REQ 

-  * @brief USB standard requests module

-  * @{

-  */ 

-

-/** @defgroup USBD_REQ_Private_TypesDefinitions

-  * @{

-  */ 

-/**

-  * @}

-  */ 

-

-

-/** @defgroup USBD_REQ_Private_Defines

-  * @{

-  */ 

-

-/**

-  * @}

-  */ 

-

-

-/** @defgroup USBD_REQ_Private_Macros

-  * @{

-  */ 

-/**

-  * @}

-  */ 

-

-

-/** @defgroup USBD_REQ_Private_Variables

-  * @{

-  */ 

-/**

-  * @}

-  */ 

-

-

-/** @defgroup USBD_REQ_Private_FunctionPrototypes

-  * @{

-  */ 

-static void USBD_GetDescriptor(USBD_HandleTypeDef *pdev , 

-                               USBD_SetupReqTypedef *req);

-

-static void USBD_SetAddress(USBD_HandleTypeDef *pdev , 

-                            USBD_SetupReqTypedef *req);

-

-static void USBD_SetConfig(USBD_HandleTypeDef *pdev , 

-                           USBD_SetupReqTypedef *req);

-

-static void USBD_GetConfig(USBD_HandleTypeDef *pdev , 

-                           USBD_SetupReqTypedef *req);

-

-static void USBD_GetStatus(USBD_HandleTypeDef *pdev , 

-                           USBD_SetupReqTypedef *req);

-

-static void USBD_SetFeature(USBD_HandleTypeDef *pdev , 

-                            USBD_SetupReqTypedef *req);

-

-static void USBD_ClrFeature(USBD_HandleTypeDef *pdev , 

-                            USBD_SetupReqTypedef *req);

-

-static uint8_t USBD_GetLen(uint8_t *buf);

-

-/**

-  * @}

-  */ 

-

-

-/** @defgroup USBD_REQ_Private_Functions

-  * @{

-  */ 

-

-

-/**

-* @brief  USBD_StdDevReq

-*         Handle standard usb device requests

-* @param  pdev: device instance

-* @param  req: usb request

-* @retval status

-*/

-USBD_StatusTypeDef  USBD_StdDevReq (USBD_HandleTypeDef *pdev , USBD_SetupReqTypedef  *req)

-{

-  USBD_StatusTypeDef ret = USBD_OK;  

-  

-  switch (req->bRequest) 

-  {

-  case USB_REQ_GET_DESCRIPTOR: 

-    

-    USBD_GetDescriptor (pdev, req) ;

-    break;

-    

-  case USB_REQ_SET_ADDRESS:                      

-    USBD_SetAddress(pdev, req);

-    break;

-    

-  case USB_REQ_SET_CONFIGURATION:                    

-    USBD_SetConfig (pdev , req);

-    break;

-    

-  case USB_REQ_GET_CONFIGURATION:                 

-    USBD_GetConfig (pdev , req);

-    break;

-    

-  case USB_REQ_GET_STATUS:                                  

-    USBD_GetStatus (pdev , req);

-    break;

-    

-    

-  case USB_REQ_SET_FEATURE:   

-    USBD_SetFeature (pdev , req);    

-    break;

-    

-  case USB_REQ_CLEAR_FEATURE:                                   

-    USBD_ClrFeature (pdev , req);

-    break;

-    

-  default:  

-    USBD_CtlError(pdev , req);

-    break;

-  }

-  

-  return ret;

-}

-

-/**

-* @brief  USBD_StdItfReq

-*         Handle standard usb interface requests

-* @param  pdev: USB OTG device instance

-* @param  req: usb request

-* @retval status

-*/

-USBD_StatusTypeDef  USBD_StdItfReq (USBD_HandleTypeDef *pdev , USBD_SetupReqTypedef  *req)

-{

-  USBD_StatusTypeDef ret = USBD_OK; 

-  

-  switch (pdev->dev_state) 

-  {

-  case USBD_STATE_CONFIGURED:

-    

-    if (LOBYTE(req->wIndex) <= USBD_MAX_NUM_INTERFACES) 

-    {

-      pdev->pClass->Setup (pdev, req); 

-      

-      if((req->wLength == 0)&& (ret == USBD_OK))

-      {

-         USBD_CtlSendStatus(pdev);

-      }

-    } 

-    else 

-    {                                               

-       USBD_CtlError(pdev , req);

-    }

-    break;

-    

-  default:

-     USBD_CtlError(pdev , req);

-    break;

-  }

-  return USBD_OK;

-}

-

-/**

-* @brief  USBD_StdEPReq

-*         Handle standard usb endpoint requests

-* @param  pdev: USB OTG device instance

-* @param  req: usb request

-* @retval status

-*/

-USBD_StatusTypeDef  USBD_StdEPReq (USBD_HandleTypeDef *pdev , USBD_SetupReqTypedef  *req)

-{

-  

-  uint8_t   ep_addr;

-  USBD_StatusTypeDef ret = USBD_OK; 

-  USBD_EndpointTypeDef   *pep;

-  ep_addr  = LOBYTE(req->wIndex);   

-  

-  switch (req->bRequest) 

-  {

-    

-  case USB_REQ_SET_FEATURE :

-    

-    switch (pdev->dev_state) 

-    {

-    case USBD_STATE_ADDRESSED:          

-      if ((ep_addr != 0x00) && (ep_addr != 0x80)) 

-      {

-        USBD_LL_StallEP(pdev , ep_addr);

-      }

-      break;	

-      

-    case USBD_STATE_CONFIGURED:   

-      if (req->wValue == USB_FEATURE_EP_HALT)

-      {

-        if ((ep_addr != 0x00) && (ep_addr != 0x80)) 

-        { 

-          USBD_LL_StallEP(pdev , ep_addr);

-          

-        }

-      }

-      pdev->pClass->Setup (pdev, req);   

-      USBD_CtlSendStatus(pdev);

-      

-      break;

-      

-    default:                         

-      USBD_CtlError(pdev , req);

-      break;    

-    }

-    break;

-    

-  case USB_REQ_CLEAR_FEATURE :

-    

-    switch (pdev->dev_state) 

-    {

-    case USBD_STATE_ADDRESSED:          

-      if ((ep_addr != 0x00) && (ep_addr != 0x80)) 

-      {

-        USBD_LL_StallEP(pdev , ep_addr);

-      }

-      break;	

-      

-    case USBD_STATE_CONFIGURED:   

-      if (req->wValue == USB_FEATURE_EP_HALT)

-      {

-        if ((ep_addr & 0x7F) != 0x00) 

-        {        

-          USBD_LL_ClearStallEP(pdev , ep_addr);

-          pdev->pClass->Setup (pdev, req);

-        }

-        USBD_CtlSendStatus(pdev);

-      }

-      break;

-      

-    default:                         

-      USBD_CtlError(pdev , req);

-      break;    

-    }

-    break;

-    

-  case USB_REQ_GET_STATUS:                  

-    switch (pdev->dev_state) 

-    {

-    case USBD_STATE_ADDRESSED:          

-      if ((ep_addr & 0x7F) != 0x00) 

-      {

-        USBD_LL_StallEP(pdev , ep_addr);

-      }

-      break;	

-      

-    case USBD_STATE_CONFIGURED:

-      pep = ((ep_addr & 0x80) == 0x80) ? &pdev->ep_in[ep_addr & 0x7F]:\

-                                         &pdev->ep_out[ep_addr & 0x7F];

-      if(USBD_LL_IsStallEP(pdev, ep_addr))

-      {

-        pep->status = 0x0001;     

-      }

-      else

-      {

-        pep->status = 0x0000;  

-      }

-      

-      USBD_CtlSendData (pdev,

-                        (uint8_t *)&pep->status,

-                        2);

-      break;

-      

-    default:                         

-      USBD_CtlError(pdev , req);

-      break;

-    }

-    break;

-    

-  default:

-    break;

-  }

-  return ret;

-}

-/**

-* @brief  USBD_GetDescriptor

-*         Handle Get Descriptor requests

-* @param  pdev: device instance

-* @param  req: usb request

-* @retval status

-*/

-static void USBD_GetDescriptor(USBD_HandleTypeDef *pdev , 

-                               USBD_SetupReqTypedef *req)

-{

-  uint16_t len;

-  uint8_t *pbuf;

-  

-    

-  switch (req->wValue >> 8)

-  {

-  case USB_DESC_TYPE_DEVICE:

-    pbuf = pdev->pDesc->GetDeviceDescriptor(pdev, &len);

-    break;

-    

-  case USB_DESC_TYPE_CONFIGURATION:     

-    if(pdev->dev_speed == USBD_SPEED_HIGH )   

-    {

-      pbuf   = (uint8_t *)pdev->pClass->GetHSConfigDescriptor(pdev, &len);

-      pbuf[1] = USB_DESC_TYPE_CONFIGURATION;

-    }

-    else

-    {

-      pbuf   = (uint8_t *)pdev->pClass->GetFSConfigDescriptor(pdev, &len);

-      pbuf[1] = USB_DESC_TYPE_CONFIGURATION;

-    }

-    break;

-    

-  case USB_DESC_TYPE_STRING:

-    pbuf = pdev->pDesc->GetStrDescriptor(pdev, req->wValue & 0xff, &len);

-    if (pbuf == NULL) {

-      USBD_CtlError(pdev, req);

-      return;

-    }

-    break;

-

-  case USB_DESC_TYPE_DEVICE_QUALIFIER:                   

-

-    if(pdev->dev_speed == USBD_SPEED_HIGH  )   

-    {

-      pbuf   = (uint8_t *)pdev->pClass->GetDeviceQualifierDescriptor(pdev, &len);

-      break;

-    }

-    else

-    {

-      USBD_CtlError(pdev , req);

-      return;

-    } 

-

-  case USB_DESC_TYPE_OTHER_SPEED_CONFIGURATION:

-    if(pdev->dev_speed == USBD_SPEED_HIGH  )   

-    {

-      pbuf   = (uint8_t *)pdev->pClass->GetOtherSpeedConfigDescriptor(pdev, &len);

-      pbuf[1] = USB_DESC_TYPE_OTHER_SPEED_CONFIGURATION;

-      break; 

-    }

-    else

-    {

-      USBD_CtlError(pdev , req);

-      return;

-    }

-

-  default: 

-     USBD_CtlError(pdev , req);

-    return;

-  }

-  

-  if((len != 0)&& (req->wLength != 0))

-  {

-    

-    len = MIN(len , req->wLength);

-    

-    USBD_CtlSendData (pdev, 

-                      pbuf,

-                      len);

-  }

-  

-}

-

-/**

-* @brief  USBD_SetAddress

-*         Set device address

-* @param  pdev: device instance

-* @param  req: usb request

-* @retval status

-*/

-static void USBD_SetAddress(USBD_HandleTypeDef *pdev , 

-                            USBD_SetupReqTypedef *req)

-{

-  uint8_t  dev_addr; 

-  

-  if ((req->wIndex == 0) && (req->wLength == 0)) 

-  {

-    dev_addr = (uint8_t)(req->wValue) & 0x7F;     

-    

-    if (pdev->dev_state == USBD_STATE_CONFIGURED) 

-    {

-      USBD_CtlError(pdev , req);

-    } 

-    else 

-    {

-      pdev->dev_address = dev_addr;

-      USBD_LL_SetUSBAddress(pdev, dev_addr);               

-      USBD_CtlSendStatus(pdev);                         

-      

-      if (dev_addr != 0) 

-      {

-        pdev->dev_state  = USBD_STATE_ADDRESSED;

-      } 

-      else 

-      {

-        pdev->dev_state  = USBD_STATE_DEFAULT; 

-      }

-    }

-  } 

-  else 

-  {

-     USBD_CtlError(pdev , req);                        

-  } 

-}

-

-/**

-* @brief  USBD_SetConfig

-*         Handle Set device configuration request

-* @param  pdev: device instance

-* @param  req: usb request

-* @retval status

-*/

-static void USBD_SetConfig(USBD_HandleTypeDef *pdev , 

-                           USBD_SetupReqTypedef *req)

-{

-  

-  uint8_t cfgidx;

-  

-  cfgidx = (uint8_t)(req->wValue);                 

-  

-  if (cfgidx > USBD_MAX_NUM_CONFIGURATION ) 

-  {            

-     USBD_CtlError(pdev , req);                              

-  } 

-  else 

-  {

-    switch (pdev->dev_state) 

-    {

-    case USBD_STATE_ADDRESSED:

-      if (cfgidx) 

-      {                                			   							   							   				

-        pdev->dev_config = cfgidx;

-        pdev->dev_state = USBD_STATE_CONFIGURED;

-        if(USBD_SetClassConfig(pdev , cfgidx) == USBD_FAIL)

-        {

-          USBD_CtlError(pdev , req);  

-          return;

-        }

-        USBD_CtlSendStatus(pdev);

-      }

-      else 

-      {

-         USBD_CtlSendStatus(pdev);

-      }

-      break;

-      

-    case USBD_STATE_CONFIGURED:

-      if (cfgidx == 0) 

-      {                           

-        pdev->dev_state = USBD_STATE_ADDRESSED;

-        pdev->dev_config = cfgidx;          

-        USBD_ClrClassConfig(pdev , cfgidx);

-        USBD_CtlSendStatus(pdev);

-        

-      } 

-      else  if (cfgidx != pdev->dev_config) 

-      {

-        /* Clear old configuration */

-        USBD_ClrClassConfig(pdev , pdev->dev_config);

-        

-        /* set new configuration */

-        pdev->dev_config = cfgidx;

-        if(USBD_SetClassConfig(pdev , cfgidx) == USBD_FAIL)

-        {

-          USBD_CtlError(pdev , req);  

-          return;

-        }

-        USBD_CtlSendStatus(pdev);

-      }

-      else

-      {

-        USBD_CtlSendStatus(pdev);

-      }

-      break;

-      

-    default:					

-       USBD_CtlError(pdev , req);                     

-      break;

-    }

-  }

-}

-

-/**

-* @brief  USBD_GetConfig

-*         Handle Get device configuration request

-* @param  pdev: device instance

-* @param  req: usb request

-* @retval status

-*/

-static void USBD_GetConfig(USBD_HandleTypeDef *pdev , 

-                           USBD_SetupReqTypedef *req)

-{

-

-  if (req->wLength != 1) 

-  {                   

-     USBD_CtlError(pdev , req);

-  }

-  else 

-  {

-    switch (pdev->dev_state )  

-    {

-    case USBD_STATE_ADDRESSED:                     

-      pdev->dev_default_config = 0;

-      USBD_CtlSendData (pdev, 

-                        (uint8_t *)&pdev->dev_default_config,

-                        1);

-      break;

-      

-    case USBD_STATE_CONFIGURED:   

-      

-      USBD_CtlSendData (pdev, 

-                        (uint8_t *)&pdev->dev_config,

-                        1);

-      break;

-      

-    default:

-       USBD_CtlError(pdev , req);

-      break;

-    }

-  }

-}

-

-/**

-* @brief  USBD_GetStatus

-*         Handle Get Status request

-* @param  pdev: device instance

-* @param  req: usb request

-* @retval status

-*/

-static void USBD_GetStatus(USBD_HandleTypeDef *pdev , 

-                           USBD_SetupReqTypedef *req)

-{

-  

-    

-  switch (pdev->dev_state) 

-  {

-  case USBD_STATE_ADDRESSED:

-  case USBD_STATE_CONFIGURED:

-    

-#if ( USBD_SELF_POWERED == 1)

-    pdev->dev_config_status = USB_CONFIG_SELF_POWERED;                                  

-#else

-    pdev->dev_config_status = 0;                                   

-#endif

-                      

-    if (pdev->dev_remote_wakeup) 

-    {

-       pdev->dev_config_status |= USB_CONFIG_REMOTE_WAKEUP;                                

-    }

-    

-    USBD_CtlSendData (pdev, 

-                      (uint8_t *)& pdev->dev_config_status,

-                      2);

-    break;

-    

-  default :

-    USBD_CtlError(pdev , req);                        

-    break;

-  }

-}

-

-

-/**

-* @brief  USBD_SetFeature

-*         Handle Set device feature request

-* @param  pdev: device instance

-* @param  req: usb request

-* @retval status

-*/

-static void USBD_SetFeature(USBD_HandleTypeDef *pdev , 

-                            USBD_SetupReqTypedef *req)

-{

-

-  if (req->wValue == USB_FEATURE_REMOTE_WAKEUP)

-  {

-    pdev->dev_remote_wakeup = 1;  

-    pdev->pClass->Setup (pdev, req);   

-    USBD_CtlSendStatus(pdev);

-  }

-

-}

-

-

-/**

-* @brief  USBD_ClrFeature

-*         Handle clear device feature request

-* @param  pdev: device instance

-* @param  req: usb request

-* @retval status

-*/

-static void USBD_ClrFeature(USBD_HandleTypeDef *pdev , 

-                            USBD_SetupReqTypedef *req)

-{

-  switch (pdev->dev_state)

-  {

-  case USBD_STATE_ADDRESSED:

-  case USBD_STATE_CONFIGURED:

-    if (req->wValue == USB_FEATURE_REMOTE_WAKEUP) 

-    {

-      pdev->dev_remote_wakeup = 0; 

-      pdev->pClass->Setup (pdev, req);   

-      USBD_CtlSendStatus(pdev);

-    }

-    break;

-    

-  default :

-     USBD_CtlError(pdev , req);

-    break;

-  }

-}

-

-/**

-* @brief  USBD_ParseSetupRequest 

-*         Copy buffer into setup structure

-* @param  pdev: device instance

-* @param  req: usb request

-* @retval None

-*/

-

-void USBD_ParseSetupRequest(USBD_SetupReqTypedef *req, uint8_t *pdata)

-{

-  req->bmRequest     = *(uint8_t *)  (pdata);

-  req->bRequest      = *(uint8_t *)  (pdata +  1);

-  req->wValue        = SWAPBYTE      (pdata +  2);

-  req->wIndex        = SWAPBYTE      (pdata +  4);

-  req->wLength       = SWAPBYTE      (pdata +  6);

-

-}

-

-/**

-* @brief  USBD_CtlError 

-*         Handle USB low level Error

-* @param  pdev: device instance

-* @param  req: usb request

-* @retval None

-*/

-

-void USBD_CtlError( USBD_HandleTypeDef *pdev ,

-                            USBD_SetupReqTypedef *req)

-{

-  USBD_LL_StallEP(pdev , 0x80);

-  USBD_LL_StallEP(pdev , 0);

-}

-

-

-/**

-  * @brief  USBD_GetString

-  *         Convert Ascii string into unicode one

-  * @param  desc : descriptor buffer

-  * @param  unicode : Formatted string buffer (unicode)

-  * @param  len : descriptor length

-  * @retval None

-  */

-void USBD_GetString(uint8_t *desc, uint8_t *unicode, uint16_t *len)

-{

-  uint8_t idx = 0;

-  

-  if (desc != NULL) 

-  {

-    *len =  USBD_GetLen(desc) * 2 + 2;    

-    unicode[idx++] = *len;

-    unicode[idx++] =  USB_DESC_TYPE_STRING;

-    

-    while (*desc != '\0') 

-    {

-      unicode[idx++] = *desc++;

-      unicode[idx++] =  0x00;

-    }

-  } 

-}

-

-/**

-  * @brief  USBD_GetLen

-  *         return the string length

-   * @param  buf : pointer to the ascii string buffer

-  * @retval string length

-  */

-static uint8_t USBD_GetLen(uint8_t *buf)

-{

-    uint8_t  len = 0;

-

-    while (*buf != '\0') 

-    {

-        len++;

-        buf++;

-    }

-

-    return len;

-}

-/**

-  * @}

-  */ 

-

-

-/**

-  * @}

-  */ 

-

-

-/**

-  * @}

-  */ 

-

-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

+/**
+  ******************************************************************************
+  * @file    usbd_req.c
+  * @author  MCD Application Team
+  * @version V2.0.0
+  * @date    18-February-2014
+  * @brief   This file provides the standard USB requests following chapter 9.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; COPYRIGHT 2014 STMicroelectronics</center></h2>
+  *
+  * Licensed under MCD-ST Liberty SW License Agreement V2, (the "License");
+  * You may not use this file except in compliance with the License.
+  * You may obtain a copy of the License at:
+  *
+  *        http://www.st.com/software_license_agreement_liberty_v2
+  *
+  * Unless required by applicable law or agreed to in writing, software
+  * distributed under the License is distributed on an "AS IS" BASIS,
+  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  * See the License for the specific language governing permissions and
+  * limitations under the License.
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "usbd_ctlreq.h"
+#include "usbd_ioreq.h"
+
+
+/** @addtogroup STM32_USBD_STATE_DEVICE_LIBRARY
+  * @{
+  */
+
+
+/** @defgroup USBD_REQ
+  * @brief USB standard requests module
+  * @{
+  */
+
+/** @defgroup USBD_REQ_Private_TypesDefinitions
+  * @{
+  */
+/**
+  * @}
+  */
+
+
+/** @defgroup USBD_REQ_Private_Defines
+  * @{
+  */
+
+/**
+  * @}
+  */
+
+
+/** @defgroup USBD_REQ_Private_Macros
+  * @{
+  */
+/**
+  * @}
+  */
+
+
+/** @defgroup USBD_REQ_Private_Variables
+  * @{
+  */
+/**
+  * @}
+  */
+
+
+/** @defgroup USBD_REQ_Private_FunctionPrototypes
+  * @{
+  */
+static void USBD_GetDescriptor(USBD_HandleTypeDef *pdev ,
+                               USBD_SetupReqTypedef *req);
+
+static void USBD_SetAddress(USBD_HandleTypeDef *pdev ,
+                            USBD_SetupReqTypedef *req);
+
+static void USBD_SetConfig(USBD_HandleTypeDef *pdev ,
+                           USBD_SetupReqTypedef *req);
+
+static void USBD_GetConfig(USBD_HandleTypeDef *pdev ,
+                           USBD_SetupReqTypedef *req);
+
+static void USBD_GetStatus(USBD_HandleTypeDef *pdev ,
+                           USBD_SetupReqTypedef *req);
+
+static void USBD_SetFeature(USBD_HandleTypeDef *pdev ,
+                            USBD_SetupReqTypedef *req);
+
+static void USBD_ClrFeature(USBD_HandleTypeDef *pdev ,
+                            USBD_SetupReqTypedef *req);
+
+static uint8_t USBD_GetLen(uint8_t *buf);
+
+/**
+  * @}
+  */
+
+
+/** @defgroup USBD_REQ_Private_Functions
+  * @{
+  */
+
+
+/**
+* @brief  USBD_StdDevReq
+*         Handle standard usb device requests
+* @param  pdev: device instance
+* @param  req: usb request
+* @retval status
+*/
+USBD_StatusTypeDef  USBD_StdDevReq (USBD_HandleTypeDef *pdev , USBD_SetupReqTypedef  *req)
+{
+  USBD_StatusTypeDef ret = USBD_OK;
+
+  switch (req->bRequest)
+  {
+  case USB_REQ_GET_DESCRIPTOR:
+
+    USBD_GetDescriptor (pdev, req) ;
+    break;
+
+  case USB_REQ_SET_ADDRESS:
+    USBD_SetAddress(pdev, req);
+    break;
+
+  case USB_REQ_SET_CONFIGURATION:
+    USBD_SetConfig (pdev , req);
+    break;
+
+  case USB_REQ_GET_CONFIGURATION:
+    USBD_GetConfig (pdev , req);
+    break;
+
+  case USB_REQ_GET_STATUS:
+    USBD_GetStatus (pdev , req);
+    break;
+
+
+  case USB_REQ_SET_FEATURE:
+    USBD_SetFeature (pdev , req);
+    break;
+
+  case USB_REQ_CLEAR_FEATURE:
+    USBD_ClrFeature (pdev , req);
+    break;
+
+  default:
+    USBD_CtlError(pdev , req);
+    break;
+  }
+
+  return ret;
+}
+
+/**
+* @brief  USBD_StdItfReq
+*         Handle standard usb interface requests
+* @param  pdev: USB OTG device instance
+* @param  req: usb request
+* @retval status
+*/
+USBD_StatusTypeDef  USBD_StdItfReq (USBD_HandleTypeDef *pdev , USBD_SetupReqTypedef  *req)
+{
+  USBD_StatusTypeDef ret = USBD_OK;
+
+  switch (pdev->dev_state)
+  {
+  case USBD_STATE_CONFIGURED:
+
+    if (LOBYTE(req->wIndex) <= USBD_MAX_NUM_INTERFACES)
+    {
+      pdev->pClass->Setup (pdev, req);
+
+      if((req->wLength == 0)&& (ret == USBD_OK))
+      {
+         USBD_CtlSendStatus(pdev);
+      }
+    }
+    else
+    {
+       USBD_CtlError(pdev , req);
+    }
+    break;
+
+  default:
+     USBD_CtlError(pdev , req);
+    break;
+  }
+  return USBD_OK;
+}
+
+/**
+* @brief  USBD_StdEPReq
+*         Handle standard usb endpoint requests
+* @param  pdev: USB OTG device instance
+* @param  req: usb request
+* @retval status
+*/
+USBD_StatusTypeDef  USBD_StdEPReq (USBD_HandleTypeDef *pdev , USBD_SetupReqTypedef  *req)
+{
+
+  uint8_t   ep_addr;
+  USBD_StatusTypeDef ret = USBD_OK;
+  USBD_EndpointTypeDef   *pep;
+  ep_addr  = LOBYTE(req->wIndex);
+
+  switch (req->bRequest)
+  {
+
+  case USB_REQ_SET_FEATURE :
+
+    switch (pdev->dev_state)
+    {
+    case USBD_STATE_ADDRESSED:
+      if ((ep_addr != 0x00) && (ep_addr != 0x80))
+      {
+        USBD_LL_StallEP(pdev , ep_addr);
+      }
+      break;
+
+    case USBD_STATE_CONFIGURED:
+      if (req->wValue == USB_FEATURE_EP_HALT)
+      {
+        if ((ep_addr != 0x00) && (ep_addr != 0x80))
+        {
+          USBD_LL_StallEP(pdev , ep_addr);
+
+        }
+      }
+      pdev->pClass->Setup (pdev, req);
+      USBD_CtlSendStatus(pdev);
+
+      break;
+
+    default:
+      USBD_CtlError(pdev , req);
+      break;
+    }
+    break;
+
+  case USB_REQ_CLEAR_FEATURE :
+
+    switch (pdev->dev_state)
+    {
+    case USBD_STATE_ADDRESSED:
+      if ((ep_addr != 0x00) && (ep_addr != 0x80))
+      {
+        USBD_LL_StallEP(pdev , ep_addr);
+      }
+      break;
+
+    case USBD_STATE_CONFIGURED:
+      if (req->wValue == USB_FEATURE_EP_HALT)
+      {
+        if ((ep_addr & 0x7F) != 0x00)
+        {
+          USBD_LL_ClearStallEP(pdev , ep_addr);
+          pdev->pClass->Setup (pdev, req);
+        }
+        USBD_CtlSendStatus(pdev);
+      }
+      break;
+
+    default:
+      USBD_CtlError(pdev , req);
+      break;
+    }
+    break;
+
+  case USB_REQ_GET_STATUS:
+    switch (pdev->dev_state)
+    {
+    case USBD_STATE_ADDRESSED:
+      if ((ep_addr & 0x7F) != 0x00)
+      {
+        USBD_LL_StallEP(pdev , ep_addr);
+      }
+      break;
+
+    case USBD_STATE_CONFIGURED:
+      pep = ((ep_addr & 0x80) == 0x80) ? &pdev->ep_in[ep_addr & 0x7F]:\
+                                         &pdev->ep_out[ep_addr & 0x7F];
+      if(USBD_LL_IsStallEP(pdev, ep_addr))
+      {
+        pep->status = 0x0001;
+      }
+      else
+      {
+        pep->status = 0x0000;
+      }
+
+      USBD_CtlSendData (pdev,
+                        (uint8_t *)&pep->status,
+                        2);
+      break;
+
+    default:
+      USBD_CtlError(pdev , req);
+      break;
+    }
+    break;
+
+  default:
+    break;
+  }
+  return ret;
+}
+/**
+* @brief  USBD_GetDescriptor
+*         Handle Get Descriptor requests
+* @param  pdev: device instance
+* @param  req: usb request
+* @retval status
+*/
+static void USBD_GetDescriptor(USBD_HandleTypeDef *pdev ,
+                               USBD_SetupReqTypedef *req)
+{
+  uint16_t len;
+  uint8_t *pbuf;
+
+
+  switch (req->wValue >> 8)
+  {
+  case USB_DESC_TYPE_DEVICE:
+    pbuf = pdev->pDesc->GetDeviceDescriptor(pdev, &len);
+    break;
+
+  case USB_DESC_TYPE_CONFIGURATION:
+    if(pdev->dev_speed == USBD_SPEED_HIGH )
+    {
+      pbuf   = (uint8_t *)pdev->pClass->GetHSConfigDescriptor(pdev, &len);
+      pbuf[1] = USB_DESC_TYPE_CONFIGURATION;
+    }
+    else
+    {
+      pbuf   = (uint8_t *)pdev->pClass->GetFSConfigDescriptor(pdev, &len);
+      pbuf[1] = USB_DESC_TYPE_CONFIGURATION;
+    }
+    break;
+
+  case USB_DESC_TYPE_STRING:
+    pbuf = pdev->pDesc->GetStrDescriptor(pdev, req->wValue & 0xff, &len);
+    if (pbuf == NULL) {
+      USBD_CtlError(pdev, req);
+      return;
+    }
+    break;
+
+  case USB_DESC_TYPE_DEVICE_QUALIFIER:
+
+    if(pdev->dev_speed == USBD_SPEED_HIGH  )
+    {
+      pbuf   = (uint8_t *)pdev->pClass->GetDeviceQualifierDescriptor(pdev, &len);
+      break;
+    }
+    else
+    {
+      USBD_CtlError(pdev , req);
+      return;
+    }
+
+  case USB_DESC_TYPE_OTHER_SPEED_CONFIGURATION:
+    if(pdev->dev_speed == USBD_SPEED_HIGH  )
+    {
+      pbuf   = (uint8_t *)pdev->pClass->GetOtherSpeedConfigDescriptor(pdev, &len);
+      pbuf[1] = USB_DESC_TYPE_OTHER_SPEED_CONFIGURATION;
+      break;
+    }
+    else
+    {
+      USBD_CtlError(pdev , req);
+      return;
+    }
+
+  default:
+     USBD_CtlError(pdev , req);
+    return;
+  }
+
+  if((len != 0)&& (req->wLength != 0))
+  {
+
+    len = MIN(len , req->wLength);
+
+    USBD_CtlSendData (pdev,
+                      pbuf,
+                      len);
+  }
+
+}
+
+/**
+* @brief  USBD_SetAddress
+*         Set device address
+* @param  pdev: device instance
+* @param  req: usb request
+* @retval status
+*/
+static void USBD_SetAddress(USBD_HandleTypeDef *pdev ,
+                            USBD_SetupReqTypedef *req)
+{
+  uint8_t  dev_addr;
+
+  if ((req->wIndex == 0) && (req->wLength == 0))
+  {
+    dev_addr = (uint8_t)(req->wValue) & 0x7F;
+
+    if (pdev->dev_state == USBD_STATE_CONFIGURED)
+    {
+      USBD_CtlError(pdev , req);
+    }
+    else
+    {
+      pdev->dev_address = dev_addr;
+      USBD_LL_SetUSBAddress(pdev, dev_addr);
+      USBD_CtlSendStatus(pdev);
+
+      if (dev_addr != 0)
+      {
+        pdev->dev_state  = USBD_STATE_ADDRESSED;
+      }
+      else
+      {
+        pdev->dev_state  = USBD_STATE_DEFAULT;
+      }
+    }
+  }
+  else
+  {
+     USBD_CtlError(pdev , req);
+  }
+}
+
+/**
+* @brief  USBD_SetConfig
+*         Handle Set device configuration request
+* @param  pdev: device instance
+* @param  req: usb request
+* @retval status
+*/
+static void USBD_SetConfig(USBD_HandleTypeDef *pdev ,
+                           USBD_SetupReqTypedef *req)
+{
+
+  uint8_t cfgidx;
+
+  cfgidx = (uint8_t)(req->wValue);
+
+  if (cfgidx > USBD_MAX_NUM_CONFIGURATION )
+  {
+     USBD_CtlError(pdev , req);
+  }
+  else
+  {
+    switch (pdev->dev_state)
+    {
+    case USBD_STATE_ADDRESSED:
+      if (cfgidx)
+      {
+        pdev->dev_config = cfgidx;
+        pdev->dev_state = USBD_STATE_CONFIGURED;
+        if(USBD_SetClassConfig(pdev , cfgidx) == USBD_FAIL)
+        {
+          USBD_CtlError(pdev , req);
+          return;
+        }
+        USBD_CtlSendStatus(pdev);
+      }
+      else
+      {
+         USBD_CtlSendStatus(pdev);
+      }
+      break;
+
+    case USBD_STATE_CONFIGURED:
+      if (cfgidx == 0)
+      {
+        pdev->dev_state = USBD_STATE_ADDRESSED;
+        pdev->dev_config = cfgidx;
+        USBD_ClrClassConfig(pdev , cfgidx);
+        USBD_CtlSendStatus(pdev);
+
+      }
+      else  if (cfgidx != pdev->dev_config)
+      {
+        /* Clear old configuration */
+        USBD_ClrClassConfig(pdev , pdev->dev_config);
+
+        /* set new configuration */
+        pdev->dev_config = cfgidx;
+        if(USBD_SetClassConfig(pdev , cfgidx) == USBD_FAIL)
+        {
+          USBD_CtlError(pdev , req);
+          return;
+        }
+        USBD_CtlSendStatus(pdev);
+      }
+      else
+      {
+        USBD_CtlSendStatus(pdev);
+      }
+      break;
+
+    default:
+       USBD_CtlError(pdev , req);
+      break;
+    }
+  }
+}
+
+/**
+* @brief  USBD_GetConfig
+*         Handle Get device configuration request
+* @param  pdev: device instance
+* @param  req: usb request
+* @retval status
+*/
+static void USBD_GetConfig(USBD_HandleTypeDef *pdev ,
+                           USBD_SetupReqTypedef *req)
+{
+
+  if (req->wLength != 1)
+  {
+     USBD_CtlError(pdev , req);
+  }
+  else
+  {
+    switch (pdev->dev_state )
+    {
+    case USBD_STATE_ADDRESSED:
+      pdev->dev_default_config = 0;
+      USBD_CtlSendData (pdev,
+                        (uint8_t *)&pdev->dev_default_config,
+                        1);
+      break;
+
+    case USBD_STATE_CONFIGURED:
+
+      USBD_CtlSendData (pdev,
+                        (uint8_t *)&pdev->dev_config,
+                        1);
+      break;
+
+    default:
+       USBD_CtlError(pdev , req);
+      break;
+    }
+  }
+}
+
+/**
+* @brief  USBD_GetStatus
+*         Handle Get Status request
+* @param  pdev: device instance
+* @param  req: usb request
+* @retval status
+*/
+static void USBD_GetStatus(USBD_HandleTypeDef *pdev ,
+                           USBD_SetupReqTypedef *req)
+{
+
+
+  switch (pdev->dev_state)
+  {
+  case USBD_STATE_ADDRESSED:
+  case USBD_STATE_CONFIGURED:
+
+#if ( USBD_SELF_POWERED == 1)
+    pdev->dev_config_status = USB_CONFIG_SELF_POWERED;
+#else
+    pdev->dev_config_status = 0;
+#endif
+
+    if (pdev->dev_remote_wakeup)
+    {
+       pdev->dev_config_status |= USB_CONFIG_REMOTE_WAKEUP;
+    }
+
+    USBD_CtlSendData (pdev,
+                      (uint8_t *)& pdev->dev_config_status,
+                      2);
+    break;
+
+  default :
+    USBD_CtlError(pdev , req);
+    break;
+  }
+}
+
+
+/**
+* @brief  USBD_SetFeature
+*         Handle Set device feature request
+* @param  pdev: device instance
+* @param  req: usb request
+* @retval status
+*/
+static void USBD_SetFeature(USBD_HandleTypeDef *pdev ,
+                            USBD_SetupReqTypedef *req)
+{
+
+  if (req->wValue == USB_FEATURE_REMOTE_WAKEUP)
+  {
+    pdev->dev_remote_wakeup = 1;
+    pdev->pClass->Setup (pdev, req);
+    USBD_CtlSendStatus(pdev);
+  }
+
+}
+
+
+/**
+* @brief  USBD_ClrFeature
+*         Handle clear device feature request
+* @param  pdev: device instance
+* @param  req: usb request
+* @retval status
+*/
+static void USBD_ClrFeature(USBD_HandleTypeDef *pdev ,
+                            USBD_SetupReqTypedef *req)
+{
+  switch (pdev->dev_state)
+  {
+  case USBD_STATE_ADDRESSED:
+  case USBD_STATE_CONFIGURED:
+    if (req->wValue == USB_FEATURE_REMOTE_WAKEUP)
+    {
+      pdev->dev_remote_wakeup = 0;
+      pdev->pClass->Setup (pdev, req);
+      USBD_CtlSendStatus(pdev);
+    }
+    break;
+
+  default :
+     USBD_CtlError(pdev , req);
+    break;
+  }
+}
+
+/**
+* @brief  USBD_ParseSetupRequest
+*         Copy buffer into setup structure
+* @param  pdev: device instance
+* @param  req: usb request
+* @retval None
+*/
+
+void USBD_ParseSetupRequest(USBD_SetupReqTypedef *req, uint8_t *pdata)
+{
+  req->bmRequest     = *(uint8_t *)  (pdata);
+  req->bRequest      = *(uint8_t *)  (pdata +  1);
+  req->wValue        = SWAPBYTE      (pdata +  2);
+  req->wIndex        = SWAPBYTE      (pdata +  4);
+  req->wLength       = SWAPBYTE      (pdata +  6);
+
+}
+
+/**
+* @brief  USBD_CtlError
+*         Handle USB low level Error
+* @param  pdev: device instance
+* @param  req: usb request
+* @retval None
+*/
+
+void USBD_CtlError( USBD_HandleTypeDef *pdev ,
+                            USBD_SetupReqTypedef *req)
+{
+  USBD_LL_StallEP(pdev , 0x80);
+  USBD_LL_StallEP(pdev , 0);
+}
+
+
+/**
+  * @brief  USBD_GetString
+  *         Convert Ascii string into unicode one
+  * @param  desc : descriptor buffer
+  * @param  unicode : Formatted string buffer (unicode)
+  * @param  len : descriptor length
+  * @retval None
+  */
+void USBD_GetString(uint8_t *desc, uint8_t *unicode, uint16_t *len)
+{
+  uint8_t idx = 0;
+
+  if (desc != NULL)
+  {
+    *len =  USBD_GetLen(desc) * 2 + 2;
+    unicode[idx++] = *len;
+    unicode[idx++] =  USB_DESC_TYPE_STRING;
+
+    while (*desc != '\0')
+    {
+      unicode[idx++] = *desc++;
+      unicode[idx++] =  0x00;
+    }
+  }
+}
+
+/**
+  * @brief  USBD_GetLen
+  *         return the string length
+   * @param  buf : pointer to the ascii string buffer
+  * @retval string length
+  */
+static uint8_t USBD_GetLen(uint8_t *buf)
+{
+    uint8_t  len = 0;
+
+    while (*buf != '\0')
+    {
+        len++;
+        buf++;
+    }
+
+    return len;
+}
+/**
+  * @}
+  */
+
+
+/**
+  * @}
+  */
+
+
+/**
+  * @}
+  */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/ports/stm32/usbdev/core/src/usbd_ioreq.c b/ports/stm32/usbdev/core/src/usbd_ioreq.c
index 9e396ba56..aab59fcef 100644
--- a/ports/stm32/usbdev/core/src/usbd_ioreq.c
+++ b/ports/stm32/usbdev/core/src/usbd_ioreq.c
@@ -1,236 +1,236 @@
-/**

-  ******************************************************************************

-  * @file    usbd_ioreq.c

-  * @author  MCD Application Team

-  * @version V2.0.0

-  * @date    18-February-2014

-  * @brief   This file provides the IO requests APIs for control endpoints.

-  ******************************************************************************

-  * @attention

-  *

-  * <h2><center>&copy; COPYRIGHT 2014 STMicroelectronics</center></h2>

-  *

-  * Licensed under MCD-ST Liberty SW License Agreement V2, (the "License");

-  * You may not use this file except in compliance with the License.

-  * You may obtain a copy of the License at:

-  *

-  *        http://www.st.com/software_license_agreement_liberty_v2

-  *

-  * Unless required by applicable law or agreed to in writing, software 

-  * distributed under the License is distributed on an "AS IS" BASIS, 

-  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-  * See the License for the specific language governing permissions and

-  * limitations under the License.

-  *

-  ******************************************************************************

-  */ 

-

-/* Includes ------------------------------------------------------------------*/

-#include "usbd_ioreq.h"

-

-/** @addtogroup STM32_USB_OTG_DEVICE_LIBRARY

-  * @{

-  */

-

-

-/** @defgroup USBD_IOREQ 

-  * @brief control I/O requests module

-  * @{

-  */ 

-

-/** @defgroup USBD_IOREQ_Private_TypesDefinitions

-  * @{

-  */ 

-/**

-  * @}

-  */ 

-

-

-/** @defgroup USBD_IOREQ_Private_Defines

-  * @{

-  */ 

-

-/**

-  * @}

-  */ 

-

-

-/** @defgroup USBD_IOREQ_Private_Macros

-  * @{

-  */ 

-/**

-  * @}

-  */ 

-

-

-/** @defgroup USBD_IOREQ_Private_Variables

-  * @{

-  */ 

-

-/**

-  * @}

-  */ 

-

-

-/** @defgroup USBD_IOREQ_Private_FunctionPrototypes

-  * @{

-  */ 

-/**

-  * @}

-  */ 

-

-

-/** @defgroup USBD_IOREQ_Private_Functions

-  * @{

-  */ 

-

-/**

-* @brief  USBD_CtlSendData

-*         send data on the ctl pipe

-* @param  pdev: device instance

-* @param  buff: pointer to data buffer

-* @param  len: length of data to be sent

-* @retval status

-*/

-USBD_StatusTypeDef  USBD_CtlSendData (USBD_HandleTypeDef  *pdev, 

-                               uint8_t *pbuf,

-                               uint16_t len)

-{

-  /* Set EP0 State */

-  pdev->ep0_state          = USBD_EP0_DATA_IN;                                      

-  pdev->ep_in[0].total_length = len;

-  pdev->ep_in[0].rem_length   = len;

- /* Start the transfer */

-  USBD_LL_Transmit (pdev, 0x00, pbuf, len);  

-  

-  return USBD_OK;

-}

-

-/**

-* @brief  USBD_CtlContinueSendData

-*         continue sending data on the ctl pipe

-* @param  pdev: device instance

-* @param  buff: pointer to data buffer

-* @param  len: length of data to be sent

-* @retval status

-*/

-USBD_StatusTypeDef  USBD_CtlContinueSendData (USBD_HandleTypeDef  *pdev, 

-                                       uint8_t *pbuf,

-                                       uint16_t len)

-{

- /* Start the next transfer */

-  USBD_LL_Transmit (pdev, 0x00, pbuf, len);   

-  

-  return USBD_OK;

-}

-

-/**

-* @brief  USBD_CtlPrepareRx

-*         receive data on the ctl pipe

-* @param  pdev: USB OTG device instance

-* @param  buff: pointer to data buffer

-* @param  len: length of data to be received

-* @retval status

-*/

-USBD_StatusTypeDef  USBD_CtlPrepareRx (USBD_HandleTypeDef  *pdev,

-                                  uint8_t *pbuf,                                  

-                                  uint16_t len)

-{

-  /* Set EP0 State */

-  pdev->ep0_state = USBD_EP0_DATA_OUT; 

-  pdev->ep_out[0].total_length = len;

-  pdev->ep_out[0].rem_length   = len;

-  /* Start the transfer */

-  USBD_LL_PrepareReceive (pdev,

-                          0,

-                          pbuf,

-                         len);

-  

-  return USBD_OK;

-}

-

-/**

-* @brief  USBD_CtlContinueRx

-*         continue receive data on the ctl pipe

-* @param  pdev: USB OTG device instance

-* @param  buff: pointer to data buffer

-* @param  len: length of data to be received

-* @retval status

-*/

-USBD_StatusTypeDef  USBD_CtlContinueRx (USBD_HandleTypeDef  *pdev, 

-                                          uint8_t *pbuf,                                          

-                                          uint16_t len)

-{

-

-  USBD_LL_PrepareReceive (pdev,

-                          0,                     

-                          pbuf,                         

-                          len);

-  return USBD_OK;

-}

-/**

-* @brief  USBD_CtlSendStatus

-*         send zero lzngth packet on the ctl pipe

-* @param  pdev: USB OTG device instance

-* @retval status

-*/

-USBD_StatusTypeDef  USBD_CtlSendStatus (USBD_HandleTypeDef  *pdev)

-{

-

-  /* Set EP0 State */

-  pdev->ep0_state = USBD_EP0_STATUS_IN;

-  

- /* Start the transfer */

-  USBD_LL_Transmit (pdev, 0x00, NULL, 0);   

-  

-  return USBD_OK;

-}

-

-/**

-* @brief  USBD_CtlReceiveStatus

-*         receive zero lzngth packet on the ctl pipe

-* @param  pdev: USB OTG device instance

-* @retval status

-*/

-USBD_StatusTypeDef  USBD_CtlReceiveStatus (USBD_HandleTypeDef  *pdev)

-{

-  /* Set EP0 State */

-  pdev->ep0_state = USBD_EP0_STATUS_OUT; 

-  

- /* Start the transfer */  

-  USBD_LL_PrepareReceive ( pdev,

-                    0,

-                    NULL,

-                    0);  

-

-  return USBD_OK;

-}

-

-

-/**

-* @brief  USBD_GetRxCount

-*         returns the received data length

-* @param  pdev: USB OTG device instance

-*         epnum: endpoint index

-* @retval Rx Data blength

-*/

-uint16_t  USBD_GetRxCount (USBD_HandleTypeDef  *pdev , uint8_t ep_addr)

-{

-  return USBD_LL_GetRxDataSize(pdev, ep_addr);

-}

-

-/**

-  * @}

-  */ 

-

-

-/**

-  * @}

-  */ 

-

-

-/**

-  * @}

-  */ 

-

-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

+/**
+  ******************************************************************************
+  * @file    usbd_ioreq.c
+  * @author  MCD Application Team
+  * @version V2.0.0
+  * @date    18-February-2014
+  * @brief   This file provides the IO requests APIs for control endpoints.
+  ******************************************************************************
+  * @attention
+  *
+  * <h2><center>&copy; COPYRIGHT 2014 STMicroelectronics</center></h2>
+  *
+  * Licensed under MCD-ST Liberty SW License Agreement V2, (the "License");
+  * You may not use this file except in compliance with the License.
+  * You may obtain a copy of the License at:
+  *
+  *        http://www.st.com/software_license_agreement_liberty_v2
+  *
+  * Unless required by applicable law or agreed to in writing, software
+  * distributed under the License is distributed on an "AS IS" BASIS,
+  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  * See the License for the specific language governing permissions and
+  * limitations under the License.
+  *
+  ******************************************************************************
+  */
+
+/* Includes ------------------------------------------------------------------*/
+#include "usbd_ioreq.h"
+
+/** @addtogroup STM32_USB_OTG_DEVICE_LIBRARY
+  * @{
+  */
+
+
+/** @defgroup USBD_IOREQ
+  * @brief control I/O requests module
+  * @{
+  */
+
+/** @defgroup USBD_IOREQ_Private_TypesDefinitions
+  * @{
+  */
+/**
+  * @}
+  */
+
+
+/** @defgroup USBD_IOREQ_Private_Defines
+  * @{
+  */
+
+/**
+  * @}
+  */
+
+
+/** @defgroup USBD_IOREQ_Private_Macros
+  * @{
+  */
+/**
+  * @}
+  */
+
+
+/** @defgroup USBD_IOREQ_Private_Variables
+  * @{
+  */
+
+/**
+  * @}
+  */
+
+
+/** @defgroup USBD_IOREQ_Private_FunctionPrototypes
+  * @{
+  */
+/**
+  * @}
+  */
+
+
+/** @defgroup USBD_IOREQ_Private_Functions
+  * @{
+  */
+
+/**
+* @brief  USBD_CtlSendData
+*         send data on the ctl pipe
+* @param  pdev: device instance
+* @param  buff: pointer to data buffer
+* @param  len: length of data to be sent
+* @retval status
+*/
+USBD_StatusTypeDef  USBD_CtlSendData (USBD_HandleTypeDef  *pdev,
+                               uint8_t *pbuf,
+                               uint16_t len)
+{
+  /* Set EP0 State */
+  pdev->ep0_state          = USBD_EP0_DATA_IN;
+  pdev->ep_in[0].total_length = len;
+  pdev->ep_in[0].rem_length   = len;
+ /* Start the transfer */
+  USBD_LL_Transmit (pdev, 0x00, pbuf, len);
+
+  return USBD_OK;
+}
+
+/**
+* @brief  USBD_CtlContinueSendData
+*         continue sending data on the ctl pipe
+* @param  pdev: device instance
+* @param  buff: pointer to data buffer
+* @param  len: length of data to be sent
+* @retval status
+*/
+USBD_StatusTypeDef  USBD_CtlContinueSendData (USBD_HandleTypeDef  *pdev,
+                                       uint8_t *pbuf,
+                                       uint16_t len)
+{
+ /* Start the next transfer */
+  USBD_LL_Transmit (pdev, 0x00, pbuf, len);
+
+  return USBD_OK;
+}
+
+/**
+* @brief  USBD_CtlPrepareRx
+*         receive data on the ctl pipe
+* @param  pdev: USB OTG device instance
+* @param  buff: pointer to data buffer
+* @param  len: length of data to be received
+* @retval status
+*/
+USBD_StatusTypeDef  USBD_CtlPrepareRx (USBD_HandleTypeDef  *pdev,
+                                  uint8_t *pbuf,
+                                  uint16_t len)
+{
+  /* Set EP0 State */
+  pdev->ep0_state = USBD_EP0_DATA_OUT;
+  pdev->ep_out[0].total_length = len;
+  pdev->ep_out[0].rem_length   = len;
+  /* Start the transfer */
+  USBD_LL_PrepareReceive (pdev,
+                          0,
+                          pbuf,
+                         len);
+
+  return USBD_OK;
+}
+
+/**
+* @brief  USBD_CtlContinueRx
+*         continue receive data on the ctl pipe
+* @param  pdev: USB OTG device instance
+* @param  buff: pointer to data buffer
+* @param  len: length of data to be received
+* @retval status
+*/
+USBD_StatusTypeDef  USBD_CtlContinueRx (USBD_HandleTypeDef  *pdev,
+                                          uint8_t *pbuf,
+                                          uint16_t len)
+{
+
+  USBD_LL_PrepareReceive (pdev,
+                          0,
+                          pbuf,
+                          len);
+  return USBD_OK;
+}
+/**
+* @brief  USBD_CtlSendStatus
+*         send zero lzngth packet on the ctl pipe
+* @param  pdev: USB OTG device instance
+* @retval status
+*/
+USBD_StatusTypeDef  USBD_CtlSendStatus (USBD_HandleTypeDef  *pdev)
+{
+
+  /* Set EP0 State */
+  pdev->ep0_state = USBD_EP0_STATUS_IN;
+
+ /* Start the transfer */
+  USBD_LL_Transmit (pdev, 0x00, NULL, 0);
+
+  return USBD_OK;
+}
+
+/**
+* @brief  USBD_CtlReceiveStatus
+*         receive zero lzngth packet on the ctl pipe
+* @param  pdev: USB OTG device instance
+* @retval status
+*/
+USBD_StatusTypeDef  USBD_CtlReceiveStatus (USBD_HandleTypeDef  *pdev)
+{
+  /* Set EP0 State */
+  pdev->ep0_state = USBD_EP0_STATUS_OUT;
+
+ /* Start the transfer */
+  USBD_LL_PrepareReceive ( pdev,
+                    0,
+                    NULL,
+                    0);
+
+  return USBD_OK;
+}
+
+
+/**
+* @brief  USBD_GetRxCount
+*         returns the received data length
+* @param  pdev: USB OTG device instance
+*         epnum: endpoint index
+* @retval Rx Data blength
+*/
+uint16_t  USBD_GetRxCount (USBD_HandleTypeDef  *pdev , uint8_t ep_addr)
+{
+  return USBD_LL_GetRxDataSize(pdev, ep_addr);
+}
+
+/**
+  * @}
+  */
+
+
+/**
+  * @}
+  */
+
+
+/**
+  * @}
+  */
+
+/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/