Commit for the 091122 release.

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

diff --git a/Demos/Device/ClassDriver/MassStorage/Lib/SCSI.h b/Demos/Device/ClassDriver/MassStorage/Lib/SCSI.h
index 3fd751d..e531db1 100644 (file)
--- a/Demos/Device/ClassDriver/MassStorage/Lib/SCSI.h
+++ b/Demos/Device/ClassDriver/MassStorage/Lib/SCSI.h
@@ -41,21 +41,20 @@
                #include <avr/pgmspace.h>\r
 \r
                #include <LUFA/Drivers/USB/USB.h>\r
                #include <avr/pgmspace.h>\r
 \r
                #include <LUFA/Drivers/USB/USB.h>\r

-               #include <LUFA/Drivers/USB/Class/Device/MassStorage.h>\r
+               #include <LUFA/Drivers/USB/Class/MassStorage.h>\r

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

-               #include "SCSI_Codes.h"\r

        \r
        /* Macros: */\r
                /** Macro to set the current SCSI sense data to the given key, additional sense code and additional sense qualifier. This\r
                 *  is for convenience, as it allows for all three sense values (returned upon request to the host to give information about\r
                 *  the last command failure) in a quick and easy manner.\r
                 *\r
        \r
        /* Macros: */\r
                /** Macro to set the current SCSI sense data to the given key, additional sense code and additional sense qualifier. This\r
                 *  is for convenience, as it allows for all three sense values (returned upon request to the host to give information about\r
                 *  the last command failure) in a quick and easy manner.\r
                 *\r

-                *  \param key    New SCSI sense key to set the sense code to\r
-                *  \param acode  New SCSI additional sense key to set the additional sense code to\r
-                *  \param aqual  New SCSI additional sense key qualifier to set the additional sense qualifier code to\r
+                *  \param[in] key    New SCSI sense key to set the sense code to\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
                 */\r
                #define SCSI_SET_SENSE(key, acode, aqual)  MACROS{ SenseData.SenseKey = key;              \\r
                                                                   SenseData.AdditionalSenseCode = acode; \\r


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

-               bool SCSI_DecodeSCSICommand(USB_ClassInfo_MS_t* MSInterfaceInfo);\r
+               bool SCSI_DecodeSCSICommand(USB_ClassInfo_MS_Device_t* MSInterfaceInfo);\r

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

-                       static bool SCSI_Command_Inquiry(USB_ClassInfo_MS_t* MSInterfaceInfo);\r
-                       static bool SCSI_Command_Request_Sense(USB_ClassInfo_MS_t* MSInterfaceInfo);\r
-                       static bool SCSI_Command_Read_Capacity_10(USB_ClassInfo_MS_t* MSInterfaceInfo);\r
-                       static bool SCSI_Command_Send_Diagnostic(USB_ClassInfo_MS_t* MSInterfaceInfo);\r
-                       static bool SCSI_Command_ReadWrite_10(USB_ClassInfo_MS_t* MSInterfaceInfo, const bool IsDataRead);\r
+                       static void SCSI_Command_Inquiry(USB_ClassInfo_MS_Device_t* MSInterfaceInfo);\r
+                       static void SCSI_Command_Request_Sense(USB_ClassInfo_MS_Device_t* MSInterfaceInfo);\r
+                       static void SCSI_Command_Read_Capacity_10(USB_ClassInfo_MS_Device_t* MSInterfaceInfo);\r
+                       static void SCSI_Command_Send_Diagnostic(USB_ClassInfo_MS_Device_t* MSInterfaceInfo);\r
+                       static void SCSI_Command_ReadWrite_10(USB_ClassInfo_MS_Device_t* MSInterfaceInfo, const bool IsDataRead);\r

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