Update UC3 platform driver support to use the bitmasks defined in the header files...

[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..a9d96f4 100644 (file)
--- a/Demos/Device/LowLevel/MassStorage/Lib/SCSI.h
+++ b/Demos/Device/LowLevel/MassStorage/Lib/SCSI.h
@@ -1,13 +1,13 @@
 /*
              LUFA Library
 /*
              LUFA Library

-     Copyright (C) Dean Camera, 2010.
+     Copyright (C) Dean Camera, 2011.

 
   dean [at] fourwalledcubicle [dot] com
 
   dean [at] fourwalledcubicle [dot] com

-      www.fourwalledcubicle.com
+           www.lufa-lib.org

 */
 
 /*
 */
 
 /*

-  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)

 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted
 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted


@@ -47,7 +47,6 @@
                #include "MassStorage.h"
                #include "Descriptors.h"
                #include "DataflashManager.h"
                #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
 
        /* Macros: */
                /** Macro to set the current SCSI sense data to the given key, additional sense code and additional sense qualifier. This


@@ -80,60 +79,60 @@
                 */
                typedef struct
                {
                 */
                typedef struct
                {

-                       unsigned char DeviceType          : 5;
-                       unsigned char PeripheralQualifier : 3;
+                       unsigned DeviceType          : 5;
+                       unsigned PeripheralQualifier : 3;

 
 

-                       unsigned char Reserved            : 7;
-                       unsigned char Removable           : 1;
+                       unsigned Reserved            : 7;
+                       unsigned Removable           : 1;

 
 

-                       uint8_t       Version;
+                       uint8_t  Version;

 
 

-                       unsigned char ResponseDataFormat  : 4;
-                       unsigned char Reserved2           : 1;
-                       unsigned char NormACA             : 1;
-                       unsigned char TrmTsk              : 1;
-                       unsigned char AERC                : 1;
+                       unsigned ResponseDataFormat  : 4;
+                       unsigned Reserved2           : 1;
+                       unsigned NormACA             : 1;
+                       unsigned TrmTsk              : 1;
+                       unsigned AERC                : 1;

 
 

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

 
 

-                       unsigned char SoftReset           : 1;
-                       unsigned char CmdQue              : 1;
-                       unsigned char Reserved4           : 1;
-                       unsigned char Linked              : 1;
-                       unsigned char Sync                : 1;
-                       unsigned char WideBus16Bit        : 1;
-                       unsigned char WideBus32Bit        : 1;
-                       unsigned char RelAddr             : 1;
+                       unsigned SoftReset           : 1;
+                       unsigned CmdQue              : 1;
+                       unsigned Reserved4           : 1;
+                       unsigned Linked              : 1;
+                       unsigned Sync                : 1;
+                       unsigned WideBus16Bit        : 1;
+                       unsigned WideBus32Bit        : 1;
+                       unsigned RelAddr             : 1;

 
 

-                       uint8_t       VendorID[8];
-                       uint8_t       ProductID[16];
-                       uint8_t       RevisionID[4];
-               } SCSI_Inquiry_Response_t;
+                       uint8_t  VendorID[8];
+                       uint8_t  ProductID[16];
+                       uint8_t  RevisionID[4];
+               } 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.
                 */
                typedef struct
                {
 
                /** Type define for a SCSI sense structure to a SCSI REQUEST SENSE command. For details of the
                 *  structure contents, refer to the SCSI specifications.
                 */
                typedef struct
                {

-                       uint8_t       ResponseCode;
+                       uint8_t  ResponseCode;

 
 

-                       uint8_t       SegmentNumber;
+                       uint8_t  SegmentNumber;

 
 

-                       unsigned char SenseKey            : 4;
-                       unsigned char Reserved            : 1;
-                       unsigned char ILI                 : 1;
-                       unsigned char EOM                 : 1;
-                       unsigned char FileMark            : 1;
+                       unsigned SenseKey            : 4;
+                       unsigned Reserved            : 1;
+                       unsigned ILI                 : 1;
+                       unsigned EOM                 : 1;
+                       unsigned FileMark            : 1;

 
 

-                       uint8_t       Information[4];
-                       uint8_t       AdditionalLength;
-                       uint8_t       CmdSpecificInformation[4];
-                       uint8_t       AdditionalSenseCode;
-                       uint8_t       AdditionalSenseQualifier;
-                       uint8_t       FieldReplaceableUnitCode;
-                       uint8_t       SenseKeySpecific[3];
-               } SCSI_Request_Sense_Response_t;
+                       uint8_t  Information[4];
+                       uint8_t  AdditionalLength;
+                       uint8_t  CmdSpecificInformation[4];
+                       uint8_t  AdditionalSenseCode;
+                       uint8_t  AdditionalSenseQualifier;
+                       uint8_t  FieldReplaceableUnitCode;
+                       uint8_t  SenseKeySpecific[3];
+               } MS_SCSI_Request_Sense_Response_t;

 
        /* Function Prototypes: */
                bool SCSI_DecodeSCSICommand(void);
 
        /* 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_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
                #endif
 
 #endif