MdePkg ACPI: Correct processor struct of PPTT

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

diff --git a/MdePkg/Include/IndustryStandard/Scsi.h b/MdePkg/Include/IndustryStandard/Scsi.h
index e9b87dedc019abdb799dcee1370ffdb968b06d50..0d813147c17cb33944a51df7b3db5adc15424638 100644 (file)
--- a/MdePkg/Include/IndustryStandard/Scsi.h
+++ b/MdePkg/Include/IndustryStandard/Scsi.h
@@ -1,7 +1,7 @@
 /** @file\r
   Support for SCSI-2 standard\r
 \r
-  Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2006 - 2016, 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
@@ -48,6 +48,7 @@
 #define EFI_SCSI_OP_MEDIA_REMOVAL   0x1e\r
 #define EFI_SCSI_OP_READ6           0x08\r
 #define EFI_SCSI_OP_READ10          0x28\r
+#define EFI_SCSI_OP_READ16          0x88\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
@@ -67,9 +68,11 @@
 #define EFI_SCSI_OP_VERIFY          0x2f\r
 #define EFI_SCSI_OP_WRITE6          0x0a\r
 #define EFI_SCSI_OP_WRITE10         0x2a\r
+#define EFI_SCSI_OP_WRITE16         0x8a\r
 #define EFI_SCSI_OP_WRITE_VERIFY    0x2e\r
 #define EFI_SCSI_OP_WRITE_LONG      0x3f\r
 #define EFI_SCSI_OP_WRITE_SAME      0x41\r
+#define EFI_SCSI_OP_UNMAP           0x42\r
 \r
 //\r
 // Additional commands for Sequential Access Devices\r
@@ -192,6 +195,12 @@
 //\r
 #define EFI_SCSI_TYPE_UNKNOWN       0x1F  ///< Unknown or no device type\r
 \r
+//\r
+// Page Codes for INQUIRY command\r
+//\r
+#define EFI_SCSI_PAGE_CODE_SUPPORTED_VPD    0x00\r
+#define EFI_SCSI_PAGE_CODE_BLOCK_LIMITS_VPD 0xB0\r
+\r
 #pragma pack(1)\r
 ///\r
 /// Standard INQUIRY data format\r
@@ -207,6 +216,87 @@ typedef struct {
   UINT8 Reserved_5_95[95 - 5 + 1];\r
 } EFI_SCSI_INQUIRY_DATA;\r
 \r
+///\r
+/// Supported VPD Pages VPD page\r
+///\r
+typedef struct {\r
+  UINT8 Peripheral_Type : 5;\r
+  UINT8 Peripheral_Qualifier : 3;\r
+  UINT8 PageCode;\r
+  UINT8 PageLength2;\r
+  UINT8 PageLength1;\r
+  UINT8 SupportedVpdPageList[0x100];\r
+} EFI_SCSI_SUPPORTED_VPD_PAGES_VPD_PAGE;\r
+\r
+///\r
+/// Block Limits VPD page\r
+///\r
+typedef struct {\r
+  UINT8 Peripheral_Type : 5;\r
+  UINT8 Peripheral_Qualifier : 3;\r
+  UINT8 PageCode;\r
+  UINT8 PageLength2;\r
+  UINT8 PageLength1;\r
+  UINT8 WriteSameNonZero : 1;\r
+  UINT8 Reserved_4 : 7;\r
+  UINT8 MaximumCompareAndWriteLength;\r
+  UINT8 OptimalTransferLengthGranularity2;\r
+  UINT8 OptimalTransferLengthGranularity1;\r
+  UINT8 MaximumTransferLength4;\r
+  UINT8 MaximumTransferLength3;\r
+  UINT8 MaximumTransferLength2;\r
+  UINT8 MaximumTransferLength1;\r
+  UINT8 OptimalTransferLength4;\r
+  UINT8 OptimalTransferLength3;\r
+  UINT8 OptimalTransferLength2;\r
+  UINT8 OptimalTransferLength1;\r
+  UINT8 MaximumPrefetchXdreadXdwriteTransferLength4;\r
+  UINT8 MaximumPrefetchXdreadXdwriteTransferLength3;\r
+  UINT8 MaximumPrefetchXdreadXdwriteTransferLength2;\r
+  UINT8 MaximumPrefetchXdreadXdwriteTransferLength1;\r
+  UINT8 MaximumUnmapLbaCount4;\r
+  UINT8 MaximumUnmapLbaCount3;\r
+  UINT8 MaximumUnmapLbaCount2;\r
+  UINT8 MaximumUnmapLbaCount1;\r
+  UINT8 MaximumUnmapBlockDescriptorCount4;\r
+  UINT8 MaximumUnmapBlockDescriptorCount3;\r
+  UINT8 MaximumUnmapBlockDescriptorCount2;\r
+  UINT8 MaximumUnmapBlockDescriptorCount1;\r
+  UINT8 OptimalUnmapGranularity4;\r
+  UINT8 OptimalUnmapGranularity3;\r
+  UINT8 OptimalUnmapGranularity2;\r
+  UINT8 OptimalUnmapGranularity1;\r
+  UINT8 UnmapGranularityAlignment4 : 7;\r
+  UINT8 UnmapGranularityAlignmentValid : 1;\r
+  UINT8 UnmapGranularityAlignment3;\r
+  UINT8 UnmapGranularityAlignment2;\r
+  UINT8 UnmapGranularityAlignment1;\r
+  UINT8 MaximumWriteSameLength4;\r
+  UINT8 MaximumWriteSameLength3;\r
+  UINT8 MaximumWriteSameLength2;\r
+  UINT8 MaximumWriteSameLength1;\r
+  UINT8 MaximumAtomicTransferLength4;\r
+  UINT8 MaximumAtomicTransferLength3;\r
+  UINT8 MaximumAtomicTransferLength2;\r
+  UINT8 MaximumAtomicTransferLength1;\r
+  UINT8 AtomicAlignment4;\r
+  UINT8 AtomicAlignment3;\r
+  UINT8 AtomicAlignment2;\r
+  UINT8 AtomicAlignment1;\r
+  UINT8 AtomicTransferLengthGranularity4;\r
+  UINT8 AtomicTransferLengthGranularity3;\r
+  UINT8 AtomicTransferLengthGranularity2;\r
+  UINT8 AtomicTransferLengthGranularity1;\r
+  UINT8 MaximumAtomicTransferLengthWithAtomicBoundary4;\r
+  UINT8 MaximumAtomicTransferLengthWithAtomicBoundary3;\r
+  UINT8 MaximumAtomicTransferLengthWithAtomicBoundary2;\r
+  UINT8 MaximumAtomicTransferLengthWithAtomicBoundary1;\r
+  UINT8 MaximumAtomicBoundarySize4;\r
+  UINT8 MaximumAtomicBoundarySize3;\r
+  UINT8 MaximumAtomicBoundarySize2;\r
+  UINT8 MaximumAtomicBoundarySize1;\r
+} EFI_SCSI_BLOCK_LIMITS_VPD_PAGE;\r
+\r
 ///\r
 /// Error codes 70h and 71h sense data format\r
 ///\r
@@ -261,6 +351,18 @@ typedef struct {
   UINT8 Reserved[16];  \r
 } EFI_SCSI_DISK_CAPACITY_DATA16;\r
 \r
+typedef struct {\r
+  UINT16 DataLen;\r
+  UINT16 BlkDespDataLen;\r
+  UINT8  Reserved[4];\r
+} EFI_SCSI_DISK_UNMAP_PARAM_LIST_HEADER;\r
+\r
+typedef struct {\r
+  UINT64 Lba;\r
+  UINT32 BlockNum;\r
+  UINT8  Reserved[4];\r
+} EFI_SCSI_DISK_UNMAP_BLOCK_DESP;\r
+\r
 \r
 #pragma pack()\r
 \r