Update the copyright notice format

[mirror_edk2.git] / MdePkg / Include / IndustryStandard / Scsi.h

diff --git a/MdePkg/Include/IndustryStandard/Scsi.h b/MdePkg/Include/IndustryStandard/Scsi.h
index 8b7c3d48557e6cf1607e26187900178cc2a0c13a..e9b87dedc019abdb799dcee1370ffdb968b06d50 100644 (file)
--- a/MdePkg/Include/IndustryStandard/Scsi.h
+++ b/MdePkg/Include/IndustryStandard/Scsi.h
@@ -1,8 +1,8 @@
 /** @file\r
   Support for SCSI-2 standard\r
 \r
-  Copyright (c) 2006 - 2008, Intel Corporation                                                         \r
-  All rights reserved. This program and the accompanying materials                          \r
+  Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.<BR>\r
+  This program and the accompanying materials                          \r
   are licensed and made available under the terms and conditions of the BSD License         \r
   which accompanies this distribution.  The full text of the license may be found at        \r
   http://opensource.org/licenses/bsd-license.php                                            \r
@@ -49,6 +49,7 @@
 #define EFI_SCSI_OP_READ6           0x08\r
 #define EFI_SCSI_OP_READ10          0x28\r
 #define EFI_SCSI_OP_READ_CAPACITY   0x25\r
+#define EFI_SCSI_OP_READ_CAPACITY16 0x9e\r
 #define EFI_SCSI_OP_READ_DEFECT     0x37\r
 #define EFI_SCSI_OP_READ_LONG       0x3e\r
 #define EFI_SCSI_OP_REASSIGN_BLK    0x07\r
@@ -191,6 +192,7 @@
 //\r
 #define EFI_SCSI_TYPE_UNKNOWN       0x1F  ///< Unknown or no device type\r
 \r
+#pragma pack(1)\r
 ///\r
 /// Standard INQUIRY data format\r
 ///\r
@@ -198,7 +200,7 @@ typedef struct {
   UINT8 Peripheral_Type : 5;\r
   UINT8 Peripheral_Qualifier : 3;\r
   UINT8 DeviceType_Modifier : 7;\r
-  UINT8 RMB : 1;\r
+  UINT8 Rmb : 1;\r
   UINT8 Version;\r
   UINT8 Response_Data_Format;\r
   UINT8 Addnl_Length;\r
@@ -214,7 +216,7 @@ typedef struct {
   UINT8 Segment_Number;\r
   UINT8 Sense_Key : 4;\r
   UINT8 Reserved_21 : 1;\r
-  UINT8 ILI : 1;\r
+  UINT8 Ili : 1;\r
   UINT8 Reserved_22 : 2;\r
   UINT8 Information_3_6[4];\r
   UINT8 Addnl_Sense_Length;           ///< Additional sense length (n-7)\r
@@ -225,6 +227,9 @@ typedef struct {
   UINT8 Reserved_15_17[3];\r
 } EFI_SCSI_SENSE_DATA;\r
 \r
+///\r
+/// SCSI Disk READ CAPACITY Data\r
+///\r
 typedef struct {\r
   UINT8 LastLba3;\r
   UINT8 LastLba2;\r
@@ -236,6 +241,29 @@ typedef struct {
   UINT8 BlockSize0;\r
 } EFI_SCSI_DISK_CAPACITY_DATA;\r
 \r
+typedef struct {\r
+  UINT8 LastLba7;\r
+  UINT8 LastLba6;\r
+  UINT8 LastLba5;\r
+  UINT8 LastLba4;\r
+  UINT8 LastLba3;\r
+  UINT8 LastLba2;\r
+  UINT8 LastLba1;\r
+  UINT8 LastLba0;\r
+  UINT8 BlockSize3;\r
+  UINT8 BlockSize2;\r
+  UINT8 BlockSize1;\r
+  UINT8 BlockSize0;\r
+  UINT8 Protection;\r
+  UINT8 LogicPerPhysical;\r
+  UINT8 LowestAlignLogic2;  \r
+  UINT8 LowestAlignLogic1;    \r
+  UINT8 Reserved[16];  \r
+} EFI_SCSI_DISK_CAPACITY_DATA16;\r
+\r
+\r
+#pragma pack()\r
+\r
 //\r
 // Sense Key\r
 //\r
@@ -262,7 +290,7 @@ typedef struct {
 // defined here. Please refer to SCSI standard for full value definition.\r
 //\r
 #define EFI_SCSI_ASC_NOT_READY                    (0x04)\r
-#define   EFI_SCSI_ASCQ_IN_PROGRESS                 (0x01)\r
+#define EFI_SCSI_ASCQ_IN_PROGRESS                 (0x01)\r
 \r
 #define EFI_SCSI_ASC_MEDIA_ERR1                   (0x10)\r
 #define EFI_SCSI_ASC_MEDIA_ERR2                   (0x11)\r
@@ -274,7 +302,7 @@ typedef struct {
 #define EFI_SCSI_ASC_INVALID_FIELD                (0x24)\r
 #define EFI_SCSI_ASC_WRITE_PROTECTED              (0x27)\r
 #define EFI_SCSI_ASC_MEDIA_CHANGE                 (0x28)\r
-#define EFI_SCSI_ASC_RESET                        (0x29)   ///<Power On Reset or Bus Reset occurred\r
+#define EFI_SCSI_ASC_RESET                        (0x29)   ///< Power On Reset or Bus Reset occurred\r
 #define EFI_SCSI_ASC_ILLEGAL_FIELD                (0x26)\r
 #define EFI_SCSI_ASC_NO_MEDIA                     (0x3A)\r
 #define EFI_SCSI_ASC_ILLEGAL_MODE_FOR_THIS_TRACK  (0x64)\r