Fixed broken DFU bootloader, added XPLAIN support for bootloader start when XCK jumpe...

[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 0c4869d..8710db8 100644 (file)
--- a/Demos/Device/LowLevel/MassStorage/Lib/SCSI.h
+++ b/Demos/Device/LowLevel/MassStorage/Lib/SCSI.h
@@ -3,7 +3,7 @@
      Copyright (C) Dean Camera, 2010.
 
   dean [at] fourwalledcubicle [dot] com
-      www.fourwalledcubicle.com
+           www.lufa-lib.org
 */
 
 /*
@@ -47,7 +47,6 @@
                #include "MassStorage.h"
                #include "Descriptors.h"
                #include "DataflashManager.h"
-               #include "SCSI_Codes.h"
 
        /* Macros: */
                /** Macro to set the current SCSI sense data to the given key, additional sense code and additional sense qualifier. This
@@ -109,7 +108,7 @@
                        uint8_t       VendorID[8];
                        uint8_t       ProductID[16];
                        uint8_t       RevisionID[4];
-               } SCSI_Inquiry_Response_t;
+               } MS_SCSI_Inquiry_Response_t;
 
                /** Type define for a SCSI sense structure to a SCSI REQUEST SENSE command. For details of the
                 *  structure contents, refer to the SCSI specifications.
@@ -133,7 +132,7 @@
                        uint8_t       AdditionalSenseQualifier;
                        uint8_t       FieldReplaceableUnitCode;
                        uint8_t       SenseKeySpecific[3];
-               } SCSI_Request_Sense_Response_t;
+               } MS_SCSI_Request_Sense_Response_t;
 
        /* Function Prototypes: */
                bool SCSI_DecodeSCSICommand(void);
@@ -144,6 +143,7 @@
                        static bool SCSI_Command_Read_Capacity_10(void);
                        static bool SCSI_Command_Send_Diagnostic(void);
                        static bool SCSI_Command_ReadWrite_10(const bool IsDataRead);
+                       static bool SCSI_Command_ModeSense_6(void);
                #endif
 
 #endif