MdeModulePkg/NvmExpressDxe: Add SecurityStorageProtocol support

[mirror_edk2.git] / MdeModulePkg / Bus / Pci / NvmExpressDxe / NvmExpressHci.c

diff --git a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressHci.c b/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressHci.c
index e35f3c0751aa794575e9994a64b9a2c5c50c4561..f6b6288f652f1053511debe25eb52166bdb2ff66 100644 (file)
--- a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressHci.c
+++ b/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressHci.c
@@ -582,7 +582,7 @@ NvmeIdentifyController (
   ZeroMem (&Command, sizeof(EFI_NVM_EXPRESS_COMMAND));\r
   ZeroMem (&Completion, sizeof(EFI_NVM_EXPRESS_COMPLETION));\r
 \r
-  Command.Cdw0.Opcode = NVME_ADMIN_IDENTIFY_OPC;\r
+  Command.Cdw0.Opcode = NVME_ADMIN_IDENTIFY_CMD;\r
   //\r
   // According to Nvm Express 1.1 spec Figure 38, When not used, the field shall be cleared to 0h.\r
   // For the Identify command, the Namespace Identifier is only used for the Namespace data structure.\r
@@ -641,7 +641,7 @@ NvmeIdentifyNamespace (
   CommandPacket.NvmeCmd        = &Command;\r
   CommandPacket.NvmeCompletion = &Completion;\r
 \r
-  Command.Cdw0.Opcode = NVME_ADMIN_IDENTIFY_OPC;\r
+  Command.Cdw0.Opcode = NVME_ADMIN_IDENTIFY_CMD;\r
   Command.Nsid        = NamespaceId;\r
   CommandPacket.TransferBuffer = Buffer;\r
   CommandPacket.TransferLength = sizeof (NVME_ADMIN_NAMESPACE_DATA);\r
@@ -691,7 +691,7 @@ NvmeCreateIoCompletionQueue (
   CommandPacket.NvmeCmd        = &Command;\r
   CommandPacket.NvmeCompletion = &Completion;\r
 \r
-  Command.Cdw0.Opcode = NVME_ADMIN_CRIOCQ_OPC;\r
+  Command.Cdw0.Opcode = NVME_ADMIN_CRIOCQ_CMD;\r
   CommandPacket.TransferBuffer = Private->CqBufferPciAddr[1];\r
   CommandPacket.TransferLength = EFI_PAGE_SIZE;\r
   CommandPacket.CommandTimeout = NVME_GENERIC_TIMEOUT;\r
@@ -741,7 +741,7 @@ NvmeCreateIoSubmissionQueue (
   CommandPacket.NvmeCmd        = &Command;\r
   CommandPacket.NvmeCompletion = &Completion;\r
 \r
-  Command.Cdw0.Opcode = NVME_ADMIN_CRIOSQ_OPC;\r
+  Command.Cdw0.Opcode = NVME_ADMIN_CRIOSQ_CMD;\r
   CommandPacket.TransferBuffer = Private->SqBufferPciAddr[1];\r
   CommandPacket.TransferLength = EFI_PAGE_SIZE;\r
   CommandPacket.CommandTimeout = NVME_GENERIC_TIMEOUT;\r