X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/afe6ae14023c7040befe73e49d00077d3425c564..cfe054474ffafddcbba0f6d3f46d3f02473fac96:/LUFA/Drivers/USB/Class/Common/MassStorage.h

diff --git a/LUFA/Drivers/USB/Class/Common/MassStorage.h b/LUFA/Drivers/USB/Class/Common/MassStorage.h
index b4ba0908f..f7e4df361 100644
--- a/LUFA/Drivers/USB/Class/Common/MassStorage.h
+++ b/LUFA/Drivers/USB/Class/Common/MassStorage.h
@@ -75,7 +75,7 @@
 			uint8_t  LUN; /**< Logical Unit number this command is issued to */
 			uint8_t  SCSICommandLength; /**< Length of the issued SCSI command within the SCSI command data array */
 			uint8_t  SCSICommandData[16]; /**< Issued SCSI command in the Command Block */
-		} CommandBlockWrapper_t;
+		} MS_CommandBlockWrapper_t;
 		
 		/** Type define for a Command Status Wrapper, used in the Mass Storage Bulk-Only Transport protocol. */
 		typedef struct
@@ -84,7 +84,7 @@
 			uint32_t Tag; /**< Unique command ID value, to associate a command block wrapper with its command status wrapper */
 			uint32_t DataTransferResidue; /**< Number of bytes of data not processed in the SCSI command */
 			uint8_t  Status; /**< Status code of the issued command - a value from the MassStorage_CommandStatusCodes_t enum */
-		} CommandStatusWrapper_t;
+		} MS_CommandStatusWrapper_t;
 		
 	/* Enums: */
 		/** Enum for the possible command status wrapper return status codes. */
@@ -94,36 +94,6 @@
 			SCSI_Command_Fail = 1, /**< Command failed to complete - host may check the exact error via a SCSI REQUEST SENSE command */
 			SCSI_Phase_Error  = 2  /**< Command failed due to being invalid in the current phase */
 		};
-		
-	/* Type Defines: */
-		/** Class state structure. An instance of this structure should be made for each Mass Storage interface
-		 *  within the user application, and passed to each of the Mass Storage class driver functions as the
-		 *  MSInterfaceInfo parameter. The contents of this structure should be set to their correct
-		 *  values when used, or ommitted to force the library to use default values.
-		 */
-		typedef struct
-		{
-			uint8_t  InterfaceNumber; /**< Interface number of the Mass Storage interface within the device */
-
-			uint8_t  DataINEndpointNumber; /**< Endpoint number of the Mass Storage interface's IN data endpoint */
-			uint16_t DataINEndpointSize; /**< Size in bytes of the Mass Storage interface's IN data endpoint */
-
-			uint8_t  DataOUTEndpointNumber; /**< Endpoint number of the Mass Storage interface's OUT data endpoint */
-			uint16_t DataOUTEndpointSize;  /**< Size in bytes of the Mass Storage interface's OUT data endpoint */
-
-			uint8_t  TotalLUNs; /**< Total number of logical drives in the Mass Storage interface */
-
-			CommandBlockWrapper_t  CommandBlock; /**< Mass Storage class command block structure, used internally
-			                                      *   by the class driver
-			                                      */
-			CommandStatusWrapper_t CommandStatus; /**< Mass Storage class command status structure, used internally
-			                                      *   by the class driver
-			                                      */
-
-			bool IsMassStoreReset; /**< Flag indicating that the host has requested that the Mass Storage interface be reset
-			                        *   and that all current Mass Storage operations should immediately abort
-									*/
-		} USB_ClassInfo_MS_t;
 	
 	/* Disable C linkage for C++ Compilers: */
 		#if defined(__cplusplus)