Partial Commit: Remove now empty Projects\Incomplete directory and add the new AVRISP...

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