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