MdeModulePkg/AtaBus&AtaAtapiPassThru: Update ATA drivers to follow UEFI2.4 new reques...

[mirror_edk2.git] / MdeModulePkg / Bus / Ata / AtaBusDxe / AtaBus.c

diff --git a/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBus.c b/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBus.c
index 6732fd5e0d38ded84c65e23e5ad6006a16ba934f..b113b8d851b298f1eb993afa9d54c70df1300a06 100644 (file)
--- a/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBus.c
+++ b/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBus.c
@@ -90,7 +90,8 @@ ATA_DEVICE gAtaDeviceTemplate = {
   NULL,                        // ControllerNameTable\r
   {L'\0', },                   // ModelName\r
   {NULL, NULL},                // AtaTaskList\r
-  {NULL, NULL}                 // AtaSubTaskList\r
+  {NULL, NULL},                // AtaSubTaskList\r
+  FALSE                        // Abort\r
 };\r
 \r
 /**\r
@@ -172,7 +173,7 @@ ReleaseAtaResources (
        ) {\r
       DelEntry = Entry;\r
       Entry    = Entry->ForwardLink;\r
-      SubTask  = ATA_AYNS_SUB_TASK_FROM_ENTRY (DelEntry);\r
+      SubTask  = ATA_ASYN_SUB_TASK_FROM_ENTRY (DelEntry);\r
 \r
       RemoveEntryList (DelEntry);\r
       FreeAtaSubTask (SubTask);\r
@@ -187,7 +188,7 @@ ReleaseAtaResources (
        ) {\r
       DelEntry = Entry;\r
       Entry    = Entry->ForwardLink;\r
-      AtaTask     = ATA_AYNS_TASK_FROM_ENTRY (DelEntry);\r
+      AtaTask  = ATA_ASYN_TASK_FROM_ENTRY (DelEntry);\r
 \r
       RemoveEntryList (DelEntry);\r
       FreePool (AtaTask);\r
@@ -1217,6 +1218,8 @@ AtaBlockIoResetEx (
 \r
   AtaDevice = ATA_DEVICE_FROM_BLOCK_IO2 (This);\r
 \r
+  AtaTerminateNonBlockingTask (AtaDevice);\r
+\r
   Status = ResetAtaDevice (AtaDevice);\r
 \r
   if (EFI_ERROR (Status)) {\r