Use REPORT_STATUS_CODExxx() macros directly.

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

diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/InternalIsaIo.h b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/InternalIsaIo.h
index c261219c8769b2458c5e7a70dab3fa604b7b6bfc..054a6b9bab8125c4119bdddcc8e643a0d2fb7db1 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/InternalIsaIo.h
+++ b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/InternalIsaIo.h
@@ -1,7 +1,7 @@
 /** @file\r
   The header file for EFI_ISA_IO protocol implementation.\r
   \r
 /** @file\r
   The header file for EFI_ISA_IO protocol implementation.\r
   \r

-Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2011, 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
 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


@@ -165,18 +165,6 @@ IsaIoFlush (
   IN EFI_ISA_IO_PROTOCOL  *This\r
   );\r
 \r
   IN EFI_ISA_IO_PROTOCOL  *This\r
   );\r
 \r

-/**\r
-  report a error Status code\r
-\r
-  @param Code          The error status code.\r
-  \r
-  @return EFI_SUCCESS  Success to report status code.\r
-**/\r
-EFI_STATUS\r
-ReportErrorStatusCode (\r
-  EFI_STATUS_CODE_VALUE Code\r
-  );\r
-\r

 /**\r
   Writes I/O operation base address and count number to a 8 bit I/O Port.\r
 \r
 /**\r
   Writes I/O operation base address and count number to a 8 bit I/O Port.\r
 \r

diff --git a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaIo.c b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaIo.c
index e821f5d54637255d20ed8e85988b67f9adb9b78c..e4715383eacf4442b6df6a7c01fd1af7ba89fd05 100644 (file)
--- a/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaIo.c
+++ b/IntelFrameworkModulePkg/Bus/Isa/IsaBusDxe/IsaIo.c
@@ -1,7 +1,7 @@
 /** @file\r
   The implementation for EFI_ISA_IO_PROTOCOL. \r
   \r
 /** @file\r
   The implementation for EFI_ISA_IO_PROTOCOL. \r
   \r

-Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2011, 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
 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


@@ -80,24 +80,6 @@ EFI_ISA_DMA_REGISTERS  mDmaRegisters[8] = {
   },\r
 };\r
 \r
   },\r
 };\r
 \r

-/**\r
-  report a error Status code\r
-\r
-  @param Code          The error status code.\r
-  \r
-  @return EFI_SUCCESS  Success to report status code.\r
-**/\r
-EFI_STATUS\r
-ReportErrorStatusCode (\r
-  EFI_STATUS_CODE_VALUE Code\r
-  )\r
-{\r
-  return REPORT_STATUS_CODE (\r
-           EFI_ERROR_CODE | EFI_ERROR_MINOR,\r
-           Code\r
-           );\r
-}\r
-\r

 /**\r
   Initializes an ISA I/O Instance\r
 \r
 /**\r
   Initializes an ISA I/O Instance\r
 \r


@@ -176,7 +158,10 @@ IsaIoIoRead (
                                     );\r
 \r
   if (EFI_ERROR (Status)) {\r
                                     );\r
 \r
   if (EFI_ERROR (Status)) {\r

-    ReportErrorStatusCode (EFI_IO_BUS_LPC | EFI_IOB_EC_CONTROLLER_ERROR);\r
+    REPORT_STATUS_CODE (\r
+      EFI_ERROR_CODE | EFI_ERROR_MINOR,\r
+      EFI_IO_BUS_LPC | EFI_IOB_EC_CONTROLLER_ERROR\r
+      );\r

   }\r
 \r
   return Status;\r
   }\r
 \r
   return Status;\r


@@ -235,7 +220,10 @@ IsaIoIoWrite (
                                     );\r
 \r
   if (EFI_ERROR (Status)) {\r
                                     );\r
 \r
   if (EFI_ERROR (Status)) {\r

-    ReportErrorStatusCode (EFI_IO_BUS_LPC | EFI_IOB_EC_CONTROLLER_ERROR);\r
+    REPORT_STATUS_CODE (\r
+      EFI_ERROR_CODE | EFI_ERROR_MINOR,\r
+      EFI_IO_BUS_LPC | EFI_IOB_EC_CONTROLLER_ERROR\r
+      );\r

   }\r
 \r
   return Status;\r
   }\r
 \r
   return Status;\r


@@ -274,7 +262,10 @@ WritePort (
                                     &Value\r
                                     );\r
   if (EFI_ERROR (Status)) {\r
                                     &Value\r
                                     );\r
   if (EFI_ERROR (Status)) {\r

-    ReportErrorStatusCode (EFI_IO_BUS_LPC | EFI_IOB_EC_CONTROLLER_ERROR);\r
+    REPORT_STATUS_CODE (\r
+      EFI_ERROR_CODE | EFI_ERROR_MINOR,\r
+      EFI_IO_BUS_LPC | EFI_IOB_EC_CONTROLLER_ERROR\r
+      );\r

     return Status;\r
   }\r
 \r
     return Status;\r
   }\r
 \r


@@ -414,7 +405,10 @@ IsaIoFlush (
   Status = IsaIoDevice->PciIo->Flush (IsaIoDevice->PciIo);\r
 \r
   if (EFI_ERROR (Status)) {\r
   Status = IsaIoDevice->PciIo->Flush (IsaIoDevice->PciIo);\r
 \r
   if (EFI_ERROR (Status)) {\r

-    ReportErrorStatusCode (EFI_IO_BUS_LPC | EFI_IOB_EC_CONTROLLER_ERROR);\r
+    REPORT_STATUS_CODE (\r
+      EFI_ERROR_CODE | EFI_ERROR_MINOR,\r
+      EFI_IO_BUS_LPC | EFI_IOB_EC_CONTROLLER_ERROR\r
+      );\r

   }\r
 \r
   return Status;\r
   }\r
 \r
   return Status;\r


@@ -544,7 +538,10 @@ IsaIoMemRead (
                                      );\r
 \r
   if (EFI_ERROR (Status)) {\r
                                      );\r
 \r
   if (EFI_ERROR (Status)) {\r

-    ReportErrorStatusCode (EFI_IO_BUS_LPC | EFI_IOB_EC_CONTROLLER_ERROR);\r
+    REPORT_STATUS_CODE (\r
+      EFI_ERROR_CODE | EFI_ERROR_MINOR,\r
+      EFI_IO_BUS_LPC | EFI_IOB_EC_CONTROLLER_ERROR\r
+      );\r

   }\r
 \r
   return Status;\r
   }\r
 \r
   return Status;\r


@@ -610,7 +607,10 @@ IsaIoMemWrite (
                                      );\r
 \r
   if (EFI_ERROR (Status)) {\r
                                      );\r
 \r
   if (EFI_ERROR (Status)) {\r

-    ReportErrorStatusCode (EFI_IO_BUS_LPC | EFI_IOB_EC_CONTROLLER_ERROR);\r
+    REPORT_STATUS_CODE (\r
+      EFI_ERROR_CODE | EFI_ERROR_MINOR,\r
+      EFI_IO_BUS_LPC | EFI_IOB_EC_CONTROLLER_ERROR\r
+      );\r

   }\r
 \r
   return Status;\r
   }\r
 \r
   return Status;\r


@@ -688,7 +688,10 @@ IsaIoCopyMem (
                                  );\r
 \r
   if (EFI_ERROR (Status)) {\r
                                  );\r
 \r
   if (EFI_ERROR (Status)) {\r

-    ReportErrorStatusCode (EFI_IO_BUS_LPC | EFI_IOB_EC_CONTROLLER_ERROR);\r
+    REPORT_STATUS_CODE (\r
+      EFI_ERROR_CODE | EFI_ERROR_MINOR,\r
+      EFI_IO_BUS_LPC | EFI_IOB_EC_CONTROLLER_ERROR\r
+      );\r

   }\r
 \r
   return Status;\r
   }\r
 \r
   return Status;\r


@@ -1404,7 +1407,10 @@ IsaIoAllocateBuffer (
 \r
   Status = gBS->AllocatePages (Type, MemoryType, Pages, &PhysicalAddress);\r
   if (EFI_ERROR (Status)) {\r
 \r
   Status = gBS->AllocatePages (Type, MemoryType, Pages, &PhysicalAddress);\r
   if (EFI_ERROR (Status)) {\r

-    ReportErrorStatusCode (EFI_IO_BUS_LPC | EFI_IOB_EC_CONTROLLER_ERROR);\r
+    REPORT_STATUS_CODE (\r
+      EFI_ERROR_CODE | EFI_ERROR_MINOR,\r
+      EFI_IO_BUS_LPC | EFI_IOB_EC_CONTROLLER_ERROR\r
+      );\r

     return Status;\r
   }\r
 \r
     return Status;\r
   }\r
 \r


@@ -1447,7 +1453,10 @@ IsaIoFreeBuffer (
                   Pages\r
                   );\r
   if (EFI_ERROR (Status)) {\r
                   Pages\r
                   );\r
   if (EFI_ERROR (Status)) {\r

-    ReportErrorStatusCode (EFI_IO_BUS_LPC | EFI_IOB_EC_CONTROLLER_ERROR);\r
+    REPORT_STATUS_CODE (\r
+      EFI_ERROR_CODE | EFI_ERROR_MINOR,\r
+      EFI_IO_BUS_LPC | EFI_IOB_EC_CONTROLLER_ERROR\r
+      );\r

   }\r
 \r
   return Status;\r
   }\r
 \r
   return Status;\r