Remove MIDI ClassDriver device demo's accidental inclusion of the unused ADC peripher...

[pub/USBasp.git] / Demos / Host / LowLevel / MassStorageHost / Lib / MassStoreCommands.h

diff --git a/Demos/Host/LowLevel/MassStorageHost/Lib/MassStoreCommands.h b/Demos/Host/LowLevel/MassStorageHost/Lib/MassStoreCommands.h
index aa34994..6280663 100644 (file)
--- a/Demos/Host/LowLevel/MassStorageHost/Lib/MassStoreCommands.h
+++ b/Demos/Host/LowLevel/MassStorageHost/Lib/MassStoreCommands.h
@@ -65,17 +65,11 @@
                
                /** Timeout period between the issuing of a CBW to a device, and the reception of the first packet. */
                #define COMMAND_DATA_TIMEOUT_MS             10000
                
                /** Timeout period between the issuing of a CBW to a device, and the reception of the first packet. */
                #define COMMAND_DATA_TIMEOUT_MS             10000

-
-               /** Pipe number of the Mass Storage data IN pipe. */
-               #define MASS_STORE_DATA_IN_PIPE             1
-
-               /** Pipe number of the Mass Storage data OUT pipe. */
-               #define MASS_STORE_DATA_OUT_PIPE            2

                
                /** Additional error code for Mass Storage functions when a device returns a logical command failure. */
                #define MASS_STORE_SCSI_COMMAND_FAILED      0xC0
 
                
                /** Additional error code for Mass Storage functions when a device returns a logical command failure. */
                #define MASS_STORE_SCSI_COMMAND_FAILED      0xC0
 

-       /* Type defines: */
+       /* Type Defines: */

                /** Type define for a Mass Storage class Command Block Wrapper, used to wrap SCSI
                 *  commands for transport over the USB bulk endpoints to the device.
                 */
                /** Type define for a Mass Storage class Command Block Wrapper, used to wrap SCSI
                 *  commands for transport over the USB bulk endpoints to the device.
                 */


@@ -113,7 +107,7 @@
                        uint8_t       SegmentNumber;
                        
                        unsigned char SenseKey            : 4;
                        uint8_t       SegmentNumber;
                        
                        unsigned char SenseKey            : 4;

-                       unsigned char _RESERVED1          : 1;
+                       unsigned char Reserved            : 1;

                        unsigned char ILI                 : 1;
                        unsigned char EOM                 : 1;
                        unsigned char FileMark            : 1;
                        unsigned char ILI                 : 1;
                        unsigned char EOM                 : 1;
                        unsigned char FileMark            : 1;


@@ -136,23 +130,23 @@
                        unsigned char DeviceType          : 5;
                        unsigned char PeripheralQualifier : 3;
                        
                        unsigned char DeviceType          : 5;
                        unsigned char PeripheralQualifier : 3;
                        

-                       unsigned char _RESERVED1          : 7;
+                       unsigned char Reserved            : 7;

                        unsigned char Removable           : 1;
                        
                        uint8_t      Version;
                        
                        unsigned char ResponseDataFormat  : 4;
                        unsigned char Removable           : 1;
                        
                        uint8_t      Version;
                        
                        unsigned char ResponseDataFormat  : 4;

-                       unsigned char _RESERVED2          : 1;
+                       unsigned char Reserved2           : 1;

                        unsigned char NormACA             : 1;
                        unsigned char TrmTsk              : 1;
                        unsigned char AERC                : 1;
 
                        uint8_t      AdditionalLength;
                        unsigned char NormACA             : 1;
                        unsigned char TrmTsk              : 1;
                        unsigned char AERC                : 1;
 
                        uint8_t      AdditionalLength;

-                       uint8_t      _RESERVED3[2];
+                       uint8_t      Reserved3[2];

 
                        unsigned char SoftReset           : 1;
                        unsigned char CmdQue              : 1;
 
                        unsigned char SoftReset           : 1;
                        unsigned char CmdQue              : 1;

-                       unsigned char _RESERVED4          : 1;
+                       unsigned char Reserved4           : 1;

                        unsigned char Linked              : 1;
                        unsigned char Sync                : 1;
                        unsigned char WideBus16Bit        : 1;
                        unsigned char Linked              : 1;
                        unsigned char Sync                : 1;
                        unsigned char WideBus16Bit        : 1;


@@ -185,25 +179,34 @@
        
        /* Function Prototypes: */
                #if defined(INCLUDE_FROM_MASSSTORE_COMMANDS_C)
        
        /* Function Prototypes: */
                #if defined(INCLUDE_FROM_MASSSTORE_COMMANDS_C)

-                       static uint8_t MassStore_SendCommand(CommandBlockWrapper_t* SCSICommandBlock, void* BufferPtr);
+                       static uint8_t MassStore_SendCommand(CommandBlockWrapper_t* const SCSICommandBlock,
+                                                            void* BufferPtr);

                        static uint8_t MassStore_WaitForDataReceived(void);
                        static uint8_t MassStore_WaitForDataReceived(void);

-                       static uint8_t MassStore_SendReceiveData(CommandBlockWrapper_t* SCSICommandBlock, void* BufferPtr) ATTR_NON_NULL_PTR_ARG(1);
-                       static uint8_t MassStore_GetReturnedStatus(CommandStatusWrapper_t* SCSICommandStatus) ATTR_NON_NULL_PTR_ARG(1);
+                       static uint8_t MassStore_SendReceiveData(CommandBlockWrapper_t* const SCSICommandBlock,
+                                                                void* BufferPtr) ATTR_NON_NULL_PTR_ARG(1);
+                       static uint8_t MassStore_GetReturnedStatus(CommandStatusWrapper_t* const SCSICommandStatus) ATTR_NON_NULL_PTR_ARG(1);

                #endif
                
                uint8_t MassStore_MassStorageReset(void);
                uint8_t MassStore_GetMaxLUN(uint8_t* const MaxLUNIndex);
                #endif
                
                uint8_t MassStore_MassStorageReset(void);
                uint8_t MassStore_GetMaxLUN(uint8_t* const MaxLUNIndex);

-               uint8_t MassStore_RequestSense(const uint8_t LUNIndex, SCSI_Request_Sense_Response_t* const SensePtr)
-                                              ATTR_NON_NULL_PTR_ARG(2);
-               uint8_t MassStore_Inquiry(const uint8_t LUNIndex, SCSI_Inquiry_Response_t* const InquiryPtr)
-                                              ATTR_NON_NULL_PTR_ARG(2);
-               uint8_t MassStore_ReadDeviceBlock(const uint8_t LUNIndex, const uint32_t BlockAddress,
-                                                 const uint8_t Blocks, const uint16_t BlockSize, void* BufferPtr) ATTR_NON_NULL_PTR_ARG(5);
-               uint8_t MassStore_WriteDeviceBlock(const uint8_t LUNIndex, const uint32_t BlockAddress,
-                                           const uint8_t Blocks, const uint16_t BlockSize, void* BufferPtr) ATTR_NON_NULL_PTR_ARG(5);
-               uint8_t MassStore_ReadCapacity(const uint8_t LUNIndex, SCSI_Capacity_t* const CapacityPtr)
-                                              ATTR_NON_NULL_PTR_ARG(2);
+               uint8_t MassStore_RequestSense(const uint8_t LUNIndex,
+                                              SCSI_Request_Sense_Response_t* const SensePtr) ATTR_NON_NULL_PTR_ARG(2);
+               uint8_t MassStore_Inquiry(const uint8_t LUNIndex,
+                                         SCSI_Inquiry_Response_t* const InquiryPtr) ATTR_NON_NULL_PTR_ARG(2);
+               uint8_t MassStore_ReadDeviceBlock(const uint8_t LUNIndex,
+                                                 const uint32_t BlockAddress,
+                                                 const uint8_t Blocks,
+                                                 const uint16_t BlockSize,
+                                                 void* BufferPtr) ATTR_NON_NULL_PTR_ARG(5);
+               uint8_t MassStore_WriteDeviceBlock(const uint8_t LUNIndex,
+                                                  const uint32_t BlockAddress,
+                                           const uint8_t Blocks,
+                                                  const uint16_t BlockSize,
+                                                  void* BufferPtr) ATTR_NON_NULL_PTR_ARG(5);
+               uint8_t MassStore_ReadCapacity(const uint8_t LUNIndex,
+                                              SCSI_Capacity_t* const CapacityPtr) ATTR_NON_NULL_PTR_ARG(2);

                uint8_t MassStore_TestUnitReady(const uint8_t LUNIndex);
                uint8_t MassStore_TestUnitReady(const uint8_t LUNIndex);

-               uint8_t MassStore_PreventAllowMediumRemoval(const uint8_t LUNIndex, const bool PreventRemoval);
+               uint8_t MassStore_PreventAllowMediumRemoval(const uint8_t LUNIndex,
+                                                           const bool PreventRemoval);

 
 #endif
 
 #endif