Fixed DFU and CDC class bootloaders on the AT90USBXXX2 series USB AVRs.

[pub/USBasp.git] / LUFA / Drivers / USB / Class / Host / MassStorage.h

diff --git a/LUFA/Drivers/USB/Class/Host/MassStorage.h b/LUFA/Drivers/USB/Class/Host/MassStorage.h
index e64e143..ff2e901 100644 (file)
--- a/LUFA/Drivers/USB/Class/Host/MassStorage.h
+++ b/LUFA/Drivers/USB/Class/Host/MassStorage.h
@@ -47,7 +47,6 @@
        /* Includes: */\r
                #include "../../USB.h"\r
                #include "../Common/MassStorage.h"\r
-               #include "../Common/SCSICodes.h"\r
                \r
        /* Enable C linkage for C++ Compilers: */\r
                #if defined(__cplusplus)\r
@@ -74,10 +73,10 @@
                                           */\r
                                struct\r
                                {\r
-                                       bool Active; /**< Indicates if the current interface instance is connected to an attached device, valid\r
-                                                     *   after \ref HID_Host_ConfigurePipes() is called and the Host state machine is in the\r
-                                                     *   Configured state\r
-                                                     */\r
+                                       bool IsActive; /**< Indicates if the current interface instance is connected to an attached device, valid\r
+                                                       *   after \ref HID_Host_ConfigurePipes() is called and the Host state machine is in the\r
+                                                       *   Configured state\r
+                                                       */\r
                                        uint8_t InterfaceNumber; /**< Interface index of the HID interface within the attached device */\r
 \r
                                        uint16_t DataINPipeSize; /**< Size in bytes of the MS interface's IN data pipe */\r
@@ -164,13 +163,13 @@
                        } SCSI_Capacity_t;\r
 \r
                /* Enums: */\r
-                       enum\r
+                       enum MSHost_EnumerationFailure_ErrorCodes_t\r
                        {\r
                                MS_ENUMERROR_NoError                    = 0, /**< Configuration Descriptor was processed successfully */\r
                                MS_ENUMERROR_InvalidConfigDescriptor    = 1, /**< The device returned an invalid Configuration Descriptor */\r
                                MS_ENUMERROR_NoMSInterfaceFound         = 2, /**< A compatible Mass Storage interface was not found in the device's Configuration Descriptor */\r
                                MS_ENUMERROR_EndpointsNotFound          = 3, /**< Compatible Mass Storage endpoints were not found in the device's interfaces */\r
-                       } MSHost_EnumerationFailure_ErrorCodes_t;\r
+                       };\r
        \r
                /* Function Prototypes: */\r
                        /** General management task for a given Mass Storage host class interface, required for the correct operation of\r
@@ -190,6 +189,8 @@
                         *  \param[in,out] MSInterfaceInfo  Pointer to a structure containing an MS Class host configuration and state\r
                         *  \param[in] ConfigDescriptorLength  Length of the attached device's Configuration Descriptor\r
                         *  \param[in] DeviceConfigDescriptor  Pointer to a buffer containing the attached device's Configuration Descriptor\r
+                        *\r
+                        *  \return A value from the \ref MSHost_EnumerationFailure_ErrorCodes_t enum\r
                         */\r
                        uint8_t MS_Host_ConfigurePipes(USB_ClassInfo_MS_Host_t* MSInterfaceInfo, uint16_t ConfigDescriptorLength,\r
                                                       uint8_t* DeviceConfigDescriptor) ATTR_NON_NULL_PTR_ARG(1, 3);\r
@@ -276,6 +277,7 @@
                         *  \param[in] LUNIndex  LUN index within the device the command is being issued to\r
                         *  \param[in] BlockAddress  Starting block address within the device to read from\r
                         *  \param[in] Blocks  Total number of blocks to read\r
+                        *  \param[in] BlockSize  Size in bytes of each block within the device\r
                         *  \param[out] BlockBuffer  Pointer to where the read data from the device should be stored\r
                         *\r
                         *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum or MS_ERROR_LOGICAL_CMD_FAILED if not ready\r
@@ -289,6 +291,7 @@
                         *  \param[in] LUNIndex  LUN index within the device the command is being issued to\r
                         *  \param[in] BlockAddress  Starting block address within the device to write to\r
                         *  \param[in] Blocks  Total number of blocks to read\r
+                        *  \param[in] BlockSize  Size in bytes of each block within the device\r
                         *  \param[in] BlockBuffer  Pointer to where the data to write should be sourced from\r
                         *\r
                         *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum or MS_ERROR_LOGICAL_CMD_FAILED if not ready\r
@@ -319,11 +322,12 @@
                        \r
                /* Function Prototypes: */\r
                        #if defined(INCLUDE_FROM_MS_CLASS_HOST_C)               \r
-                               static uint8_t DComp_NextMassStorageInterface(void* CurrentDescriptor);\r
-                               static uint8_t DComp_NextInterfaceBulkDataEndpoint(void* CurrentDescriptor);\r
+                               static uint8_t DComp_NextMSInterface(void* CurrentDescriptor);\r
+                               static uint8_t DComp_NextMSInterfaceEndpoint(void* CurrentDescriptor);\r
                                \r
                                static uint8_t MS_Host_SendCommand(USB_ClassInfo_MS_Host_t* MSInterfaceInfo,\r
-                                                                  MS_CommandBlockWrapper_t* SCSICommandBlock);\r
+                                                                  MS_CommandBlockWrapper_t* SCSICommandBlock,\r
+                                                                  void* BufferPtr);\r
                                static uint8_t MS_Host_WaitForDataReceived(USB_ClassInfo_MS_Host_t* MSInterfaceInfo);\r
                                static uint8_t MS_Host_SendReceiveData(USB_ClassInfo_MS_Host_t* MSInterfaceInfo, \r
                                                        MS_CommandBlockWrapper_t* SCSICommandBlock, void* BufferPtr);\r