Removed cross references from PciCf8Lib and PciExpressLib class to PciLib class.

[mirror_edk2.git] / EdkModulePkg / Bus / Pci / AtapiPassThru / Dxe / AtapiPassThru.c

diff --git a/EdkModulePkg/Bus/Pci/AtapiPassThru/Dxe/AtapiPassThru.c b/EdkModulePkg/Bus/Pci/AtapiPassThru/Dxe/AtapiPassThru.c
index 1bdce40f67d0c36552ec3551a04d16f74a225202..e48cf73235f54fdf53a9ba0ffae1b6cb331c6aa0 100644 (file)
--- a/EdkModulePkg/Bus/Pci/AtapiPassThru/Dxe/AtapiPassThru.c
+++ b/EdkModulePkg/Bus/Pci/AtapiPassThru/Dxe/AtapiPassThru.c
@@ -2085,94 +2085,90 @@ AtapiPassThruCheckErrorStatus (
   )\r
 {\r
   UINT8 StatusRegister;\r
-\r
-//#ifdef EFI_DEBUG\r
-\r
   UINT8 ErrorRegister;\r
 \r
-//#endif\r
-\r
   StatusRegister = ReadPortB (\r
                     AtapiScsiPrivate->PciIo,\r
                     AtapiScsiPrivate->IoPort->Reg.Status\r
                     );\r
-  DEBUG_CODE (\r
+  \r
+  DEBUG_CODE_BEGIN ();\r
 \r
     if (StatusRegister & DWF) {\r
-    DEBUG (\r
-      (EFI_D_BLKIO,\r
-      "AtapiPassThruCheckErrorStatus()-- %02x : Error : Write Fault\n",\r
-      StatusRegister)\r
-      );\r
-  }\r
+      DEBUG (\r
+        (EFI_D_BLKIO,\r
+        "AtapiPassThruCheckErrorStatus()-- %02x : Error : Write Fault\n",\r
+        StatusRegister)\r
+        );\r
+    }\r
 \r
-  if (StatusRegister & CORR) {\r
-    DEBUG (\r
-      (EFI_D_BLKIO,\r
-      "AtapiPassThruCheckErrorStatus()-- %02x : Error : Corrected Data\n",\r
-      StatusRegister)\r
-      );\r
-  }\r
+    if (StatusRegister & CORR) {\r
+      DEBUG (\r
+        (EFI_D_BLKIO,\r
+        "AtapiPassThruCheckErrorStatus()-- %02x : Error : Corrected Data\n",\r
+        StatusRegister)\r
+        );\r
+    }\r
 \r
-  if (StatusRegister & ERR) {\r
-    ErrorRegister = ReadPortB (AtapiScsiPrivate->PciIo, AtapiScsiPrivate->IoPort->Reg1.Error);\r
+    if (StatusRegister & ERR) {\r
+      ErrorRegister = ReadPortB (AtapiScsiPrivate->PciIo, AtapiScsiPrivate->IoPort->Reg1.Error);\r
+      \r
 \r
-    if (ErrorRegister & BBK_ERR) {\r
-    DEBUG (\r
-      (EFI_D_BLKIO,\r
-      "AtapiPassThruCheckErrorStatus()-- %02x : Error : Bad Block Detected\n",\r
-      ErrorRegister)\r
-      );\r
-  }\r
+      if (ErrorRegister & BBK_ERR) {\r
+        DEBUG (\r
+          (EFI_D_BLKIO,\r
+          "AtapiPassThruCheckErrorStatus()-- %02x : Error : Bad Block Detected\n",\r
+          ErrorRegister)\r
+          );\r
+      }\r
 \r
-  if (ErrorRegister & UNC_ERR) {\r
-    DEBUG (\r
-      (EFI_D_BLKIO,\r
-      "AtapiPassThruCheckErrorStatus()-- %02x : Error : Uncorrectable Data\n",\r
-      ErrorRegister)\r
-      );\r
-  }\r
+      if (ErrorRegister & UNC_ERR) {\r
+        DEBUG (\r
+          (EFI_D_BLKIO,\r
+          "AtapiPassThruCheckErrorStatus()-- %02x : Error : Uncorrectable Data\n",\r
+          ErrorRegister)\r
+          );\r
+      }\r
 \r
-  if (ErrorRegister & MC_ERR) {\r
-    DEBUG (\r
-      (EFI_D_BLKIO,\r
-      "AtapiPassThruCheckErrorStatus()-- %02x : Error : Media Change\n",\r
-      ErrorRegister)\r
-      );\r
-  }\r
+      if (ErrorRegister & MC_ERR) {\r
+        DEBUG (\r
+          (EFI_D_BLKIO,\r
+          "AtapiPassThruCheckErrorStatus()-- %02x : Error : Media Change\n",\r
+          ErrorRegister)\r
+          );\r
+      }\r
 \r
-  if (ErrorRegister & ABRT_ERR) {\r
-    DEBUG (\r
-      (EFI_D_BLKIO,\r
-      "AtapiPassThruCheckErrorStatus()-- %02x : Error : Abort\n",\r
-      ErrorRegister)\r
-      );\r
-  }\r
+      if (ErrorRegister & ABRT_ERR) {\r
+        DEBUG (\r
+          (EFI_D_BLKIO,\r
+          "AtapiPassThruCheckErrorStatus()-- %02x : Error : Abort\n",\r
+          ErrorRegister)\r
+          );\r
+      }\r
 \r
-  if (ErrorRegister & TK0NF_ERR) {\r
-    DEBUG (\r
-      (EFI_D_BLKIO,\r
-      "AtapiPassThruCheckErrorStatus()-- %02x : Error : Track 0 Not Found\n",\r
-      ErrorRegister)\r
-      );\r
-  }\r
+      if (ErrorRegister & TK0NF_ERR) {\r
+        DEBUG (\r
+          (EFI_D_BLKIO,\r
+          "AtapiPassThruCheckErrorStatus()-- %02x : Error : Track 0 Not Found\n",\r
+          ErrorRegister)\r
+          );\r
+      }\r
 \r
-  if (ErrorRegister & AMNF_ERR) {\r
-    DEBUG (\r
-      (EFI_D_BLKIO,\r
-      "AtapiPassThruCheckErrorStatus()-- %02x : Error : Address Mark Not Found\n",\r
-      ErrorRegister)\r
-      );\r
-  }\r
+      if (ErrorRegister & AMNF_ERR) {\r
+        DEBUG (\r
+          (EFI_D_BLKIO,\r
+          "AtapiPassThruCheckErrorStatus()-- %02x : Error : Address Mark Not Found\n",\r
+          ErrorRegister)\r
+          );\r
+       }\r
+    }\r
 \r
-  }\r
-  );\r
+  DEBUG_CODE_END ();\r
 \r
   if ((StatusRegister & (ERR | DWF | CORR)) == 0) {\r
-\r
     return EFI_SUCCESS;\r
   }\r
 \r
+ \r
   return EFI_DEVICE_ERROR;\r
-\r
-}\r
+}
\ No newline at end of file