Ensure the library builds cleanly in device mode for architectures lacking multiple...

[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 f4274ca..d641c33 100644 (file)
--- a/LUFA/Drivers/USB/Class/Common/MassStorage.h
+++ b/LUFA/Drivers/USB/Class/Common/MassStorage.h
@@ -51,9 +51,7 @@
 #define _MS_CLASS_COMMON_H_
 
        /* Includes: */
 #define _MS_CLASS_COMMON_H_
 
        /* Includes: */

-               #include "../../HighLevel/StdDescriptors.h"
-
-               #include <string.h>
+               #include "../../Core/StdDescriptors.h"

 
        /* Enable C linkage for C++ Compilers: */
                #if defined(__cplusplus)
 
        /* Enable C linkage for C++ Compilers: */
                #if defined(__cplusplus)


@@ -268,7 +266,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. */
                        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. */

-               } MS_CommandBlockWrapper_t;
+               } ATTR_PACKED MS_CommandBlockWrapper_t;

 
                /** \brief Mass Storage Class Command Status Wrapper.
                 *
 
                /** \brief Mass Storage Class Command Status Wrapper.
                 *


@@ -280,7 +278,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 \ref MS_CommandStatusCodes_t enum. */
                        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 \ref MS_CommandStatusCodes_t enum. */

-               } MS_CommandStatusWrapper_t;
+               } ATTR_PACKED MS_CommandStatusWrapper_t;

 
                /** \brief Mass Storage Class SCSI Sense Structure
                 *
 
                /** \brief Mass Storage Class SCSI Sense Structure
                 *


@@ -308,7 +306,7 @@
                        uint8_t       AdditionalSenseQualifier;
                        uint8_t       FieldReplaceableUnitCode;
                        uint8_t       SenseKeySpecific[3];
                        uint8_t       AdditionalSenseQualifier;
                        uint8_t       FieldReplaceableUnitCode;
                        uint8_t       SenseKeySpecific[3];

-               } SCSI_Request_Sense_Response_t;
+               } ATTR_PACKED SCSI_Request_Sense_Response_t;

 
                /** \brief Mass Storage Class SCSI Inquiry Structure.
                 *
 
                /** \brief Mass Storage Class SCSI Inquiry Structure.
                 *


@@ -349,7 +347,7 @@
                        uint8_t       VendorID[8];
                        uint8_t       ProductID[16];
                        uint8_t       RevisionID[4];
                        uint8_t       VendorID[8];
                        uint8_t       ProductID[16];
                        uint8_t       RevisionID[4];

-               } SCSI_Inquiry_Response_t;
+               } ATTR_PACKED SCSI_Inquiry_Response_t;

 
        /* Disable C linkage for C++ Compilers: */
                #if defined(__cplusplus)
 
        /* Disable C linkage for C++ Compilers: */
                #if defined(__cplusplus)