Added new NO_DEVICE_SELF_POWER and NO_DEVICE_REMOTE_WAKEUP compile time options.

[pub/USBasp.git] / Demos / Device / LowLevel / MassStorage / Lib / SCSI.h

diff --git a/Demos/Device/LowLevel/MassStorage/Lib/SCSI.h b/Demos/Device/LowLevel/MassStorage/Lib/SCSI.h
index 5002df5..93a4942 100644 (file)
--- a/Demos/Device/LowLevel/MassStorage/Lib/SCSI.h
+++ b/Demos/Device/LowLevel/MassStorage/Lib/SCSI.h
@@ -40,9 +40,9 @@
                #include <avr/io.h>\r
                #include <avr/pgmspace.h>\r
 \r
                #include <avr/io.h>\r
                #include <avr/pgmspace.h>\r
 \r

-               #include <LUFA/Common/Common.h>              // Function Attribute, Atomic, Debug and ISR Macros\r
-               #include <LUFA/Drivers/USB/USB.h>            // USB Functionality\r
-               #include <LUFA/Drivers/Board/LEDs.h>         // LEDs driver\r
+               #include <LUFA/Common/Common.h>\r
+               #include <LUFA/Drivers/USB/USB.h>\r
+               #include <LUFA/Drivers/Board/LEDs.h>\r

 \r
                #include "MassStorage.h"\r
                #include "Descriptors.h"\r
 \r
                #include "MassStorage.h"\r
                #include "Descriptors.h"\r


@@ -58,21 +58,21 @@
                 *  \param[in] acode  New SCSI additional sense key to set the additional sense code to\r
                 *  \param[in] aqual  New SCSI additional sense key qualifier to set the additional sense qualifier code to\r
                 */\r
                 *  \param[in] acode  New SCSI additional sense key to set the additional sense code to\r
                 *  \param[in] aqual  New SCSI additional sense key qualifier to set the additional sense qualifier code to\r
                 */\r

-               #define SCSI_SET_SENSE(key, acode, aqual)  MACROS{ SenseData.SenseKey = key;              \\r
-                                                                  SenseData.AdditionalSenseCode = acode; \\r
-                                                                  SenseData.AdditionalSenseQualifier = aqual; }MACROE\r
+               #define SCSI_SET_SENSE(key, acode, aqual)  MACROS{ SenseData.SenseKey = (key);              \\r
+                                                                  SenseData.AdditionalSenseCode = (acode); \\r
+                                                                  SenseData.AdditionalSenseQualifier = (aqual); }MACROE\r

 \r
                /** Macro for the SCSI_Command_ReadWrite_10() function, to indicate that data is to be read from the storage medium. */\r
 \r
                /** Macro for the SCSI_Command_ReadWrite_10() function, to indicate that data is to be read from the storage medium. */\r

-               #define DATA_READ      true\r
+               #define DATA_READ           true\r

 \r
                /** Macro for the SCSI_Command_ReadWrite_10() function, to indicate that data is to be written to the storage medium. */\r
 \r
                /** Macro for the SCSI_Command_ReadWrite_10() function, to indicate that data is to be written to the storage medium. */\r

-               #define DATA_WRITE     false\r
+               #define DATA_WRITE          false\r

 \r
                /** Value for the DeviceType entry in the SCSI_Inquiry_Response_t enum, indicating a Block Media device. */\r
 \r
                /** Value for the DeviceType entry in the SCSI_Inquiry_Response_t enum, indicating a Block Media device. */\r

-               #define DEVICE_TYPE_BLOCK 0x00\r
+               #define DEVICE_TYPE_BLOCK   0x00\r

                \r
                /** Value for the DeviceType entry in the SCSI_Inquiry_Response_t enum, indicating a CD-ROM device. */\r
                \r
                /** Value for the DeviceType entry in the SCSI_Inquiry_Response_t enum, indicating a CD-ROM device. */\r

-               #define DEVICE_TYPE_CDROM 0x05\r
+               #define DEVICE_TYPE_CDROM   0x05\r

 \r
        /* Type Defines: */\r
                /** Type define for a SCSI response structure to a SCSI INQUIRY command. For details of the\r
 \r
        /* Type Defines: */\r
                /** Type define for a SCSI response structure to a SCSI INQUIRY command. For details of the\r


@@ -136,14 +136,14 @@
                } SCSI_Request_Sense_Response_t;\r
                \r
        /* Function Prototypes: */\r
                } SCSI_Request_Sense_Response_t;\r
                \r
        /* Function Prototypes: */\r

-               void SCSI_DecodeSCSICommand(void);\r
+               bool SCSI_DecodeSCSICommand(void);\r

                \r
                #if defined(INCLUDE_FROM_SCSI_C)\r
                \r
                #if defined(INCLUDE_FROM_SCSI_C)\r

-                       static bool SCSI_Command_Inquiry(void);\r
-                       static bool SCSI_Command_Request_Sense(void);\r
-                       static bool SCSI_Command_Read_Capacity_10(void);\r
-                       static bool SCSI_Command_Send_Diagnostic(void);\r
-                       static bool SCSI_Command_ReadWrite_10(const bool IsDataRead);\r
+                       static void SCSI_Command_Inquiry(void);\r
+                       static void SCSI_Command_Request_Sense(void);\r
+                       static void SCSI_Command_Read_Capacity_10(void);\r
+                       static void SCSI_Command_Send_Diagnostic(void);\r
+                       static void SCSI_Command_ReadWrite_10(const bool IsDataRead);\r

                #endif\r
                \r
 #endif\r
                #endif\r
                \r
 #endif\r