Add back the trick logic on EFI_PCI_DEVICE_ENABLE in PciBus driver so that some old...

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4131 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/ata.c b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/ata.c
index 3a7271ec4723b855ad0b40f988d20fad2b49c7e6..a315953e3cf2b07efb71716b537b49fa5110ee47 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/ata.c
+++ b/IntelFrameworkModulePkg/Bus/Pci/IdeBusDxe/ata.c
@@ -191,6 +191,8 @@ ATAIdentify (
   the capacity is below 120G, 48bit addressing is not needed\r
 \r
   @retval  EFI_DEVICE_ERROR The identify data in IdeDev is incorrect\r
+  \r
+  @retval  EFI_INVALID_PARAMETER The identify data in IdeDev is NULL.\r
 \r
   @note\r
   This function must be called after DEVICE_IDENTITY command has been\r
@@ -208,7 +210,7 @@ AtaAtapi6Identify (
   EFI_IDENTIFY_DATA *Atapi6IdentifyStruct;\r
 \r
   if (IdeDev->pIdData == NULL) {\r
-    return EFI_UNSUPPORTED;\r
+    return EFI_INVALID_PARAMETER;\r
   }\r
 \r
   Atapi6IdentifyStruct = IdeDev->pIdData;\r

diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciHotPlugSupport.c b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciHotPlugSupport.c
index 8593c52689fe0b1a3da0f4e86c4155034bb90fe3..61285421112b6b05808d151b120c2b5b0a859e9d 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciHotPlugSupport.c
+++ b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciHotPlugSupport.c
@@ -275,9 +275,6 @@ Returns:
   EFI_TIMEOUT - Time out\r
 \r
 --*/\r
-// TODO:    TimeoutInMilliSeconds - add argument and description to function comment\r
-// TODO:    EFI_SUCCESS - add return value to function comment\r
-// TODO:    EFI_TIMEOUT - add return value to function comment\r
 {\r
   UINT32  Delay;\r
   UINTN   Index;\r

diff --git a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciIo.c b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciIo.c
index 63ab8e551a77c45a29b4307db17d9683bb41d584..765cf4c87afe097212e6735266ae9e3b9ffa7ce0 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciIo.c
+++ b/IntelFrameworkModulePkg/Bus/Pci/PciBusDxe/PciIo.c
@@ -1464,19 +1464,20 @@ Returns:
   // Just a trick for ENABLE attribute\r
   // EFI_PCI_DEVICE_ENABLE is not defined in UEFI spec, which is the internal usage.\r
   // So, this logic doesn't confrom to UEFI spec, which should be removed.\r
+  // But this trick logic is still kept for some binary drivers that depend on it.\r
   //\r
-  //  if ((Attributes & EFI_PCI_DEVICE_ENABLE) == EFI_PCI_DEVICE_ENABLE) {\r
-  //    Attributes &= (PciIoDevice->Supports);\r
-  //\r
-  //    //\r
-  //    // Raise the EFI_P_PC_ENABLE Status code\r
-  //    //\r
-  //    REPORT_STATUS_CODE_WITH_DEVICE_PATH (\r
-  //      EFI_PROGRESS_CODE,\r
-  //      EFI_IO_BUS_PCI | EFI_P_PC_ENABLE,\r
-  //      PciIoDevice->DevicePath\r
-  //      );\r
-  //  }\r
+  if ((Attributes & EFI_PCI_DEVICE_ENABLE) == EFI_PCI_DEVICE_ENABLE) {\r
+    Attributes &= (PciIoDevice->Supports);\r
+\r
+    //\r
+    // Raise the EFI_P_PC_ENABLE Status code\r
+    //\r
+    REPORT_STATUS_CODE_WITH_DEVICE_PATH (\r
+      EFI_PROGRESS_CODE,\r
+      EFI_IO_BUS_PCI | EFI_P_PC_ENABLE,\r
+      PciIoDevice->DevicePath\r
+      );\r
+  }\r
 \r
   //\r
   // If no attributes can be supported, then return.\r