Clean up DxeCore to use report status code macros in ReportStatusCode to retire CoreR...

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

diff --git a/MdeModulePkg/Core/Dxe/Dispatcher/Dispatcher.c b/MdeModulePkg/Core/Dxe/Dispatcher/Dispatcher.c
index ba8734e1d6786f4bfe251fe5d40f5608fa5df107..0936fad997793ea15a221bf82bc0df3ad4080abd 100644 (file)
--- a/MdeModulePkg/Core/Dxe/Dispatcher/Dispatcher.c
+++ b/MdeModulePkg/Core/Dxe/Dispatcher/Dispatcher.c
@@ -492,14 +492,21 @@ CoreDispatcher (
 \r
       CoreReleaseDispatcherLock ();\r
 \r
-      CoreReportProgressCodeSpecific (\r
+ \r
+      REPORT_STATUS_CODE_WITH_EXTENDED_DATA (\r
+        EFI_PROGRESS_CODE,\r
         FixedPcdGet32(PcdStatusCodeValueDxeDriverBegin),\r
-        DriverEntry->ImageHandle\r
+        &DriverEntry->ImageHandle,\r
+        sizeof (DriverEntry->ImageHandle)\r
         );\r
+\r
       Status = CoreStartImage (DriverEntry->ImageHandle, NULL, NULL);\r
-      CoreReportProgressCodeSpecific (\r
+\r
+      REPORT_STATUS_CODE_WITH_EXTENDED_DATA (\r
+        EFI_PROGRESS_CODE,\r
         FixedPcdGet32(PcdStatusCodeValueDxeDriverEnd),\r
-        DriverEntry->ImageHandle\r
+        &DriverEntry->ImageHandle,\r
+        sizeof (DriverEntry->ImageHandle)\r
         );\r
 \r
       ReturnStatus = EFI_SUCCESS;\r

diff --git a/MdeModulePkg/Core/Dxe/DxeMain.h b/MdeModulePkg/Core/Dxe/DxeMain.h
index 64c0f9709fe499f399e0b11b23a94c6e75e63ca7..a227ce5f8e6c637df488aa6c317878ca454c5957 100644 (file)
--- a/MdeModulePkg/Core/Dxe/DxeMain.h
+++ b/MdeModulePkg/Core/Dxe/DxeMain.h
@@ -78,6 +78,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/MemoryAllocationLib.h>\r
 #include <Library/DevicePathLib.h>\r
 #include <Library/UefiBootServicesTableLib.h>\r
+#include <Library/ReportStatusCodeLib.h>\r
 \r
 #include "DebugImageInfo.h"\r
 #include "Library.h"\r

diff --git a/MdeModulePkg/Core/Dxe/DxeMain.inf b/MdeModulePkg/Core/Dxe/DxeMain.inf
index a6c8d5e3de4268fb6f0f13700693752f5bf4f837..8a99582d30c048c9ec226c5a887cbd5443b84020 100644 (file)
--- a/MdeModulePkg/Core/Dxe/DxeMain.inf
+++ b/MdeModulePkg/Core/Dxe/DxeMain.inf
@@ -89,6 +89,7 @@
   MemoryAllocationLib\r
   UefiBootServicesTableLib\r
   DevicePathLib\r
+  ReportStatusCodeLib\r
 \r
 [Guids]\r
   gEfiEventLegacyBootGuid                       # ALWAYS_CONSUMED\r

diff --git a/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c b/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
index acc675844a89d3bc41f8d3c236e14752d031f1d9..1d04e38490baba0d533d385fc7f7c20b2682810b 100644 (file)
--- a/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
+++ b/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
@@ -303,7 +303,10 @@ DxeMain (
   //\r
   // Report Status Code here for DXE_ENTRY_POINT once it is available\r
   //\r
-  CoreReportProgressCode (FixedPcdGet32(PcdStatusCodeValueDxeCoreEntry));\r
+  REPORT_STATUS_CODE (\r
+    EFI_PROGRESS_CODE,\r
+    FixedPcdGet32(PcdStatusCodeValueDxeCoreEntry)\r
+    );\r
 \r
   //\r
   // Create the aligned system table pointer structure that is used by external\r
@@ -398,7 +401,10 @@ DxeMain (
   //\r
   // Report Status code before transfer control to BDS\r
   //\r
-  CoreReportProgressCode (FixedPcdGet32 (PcdStatusCodeValueDxeCoreHandoffToBds));\r
+  REPORT_STATUS_CODE (\r
+    EFI_PROGRESS_CODE,\r
+    FixedPcdGet32 (PcdStatusCodeValueDxeCoreHandoffToBds)\r
+    );\r
 \r
   //\r
   // Display any drivers that were not dispatched because dependency expression\r
@@ -720,9 +726,10 @@ CoreExitBootServices (
   //\r
   // Report that ExitBootServices() has been called\r
   //\r
-  // We are using gEfiCallerIdGuid as the caller ID for Dxe Core\r
-  //\r
-  CoreReportProgressCode (FixedPcdGet32 (PcdStatusCodeValueBootServiceExit));\r
+  REPORT_STATUS_CODE (\r
+    EFI_PROGRESS_CODE,\r
+    FixedPcdGet32 (PcdStatusCodeValueBootServiceExit)\r
+    );\r
 \r
   //\r
   // Clear the non-runtime values of the EFI System Table\r

diff --git a/MdeModulePkg/Core/Dxe/Library.h b/MdeModulePkg/Core/Dxe/Library.h
index 6e6ad3818b85c95f402710a1d41eebbdc0746519..c68e62d81a77a29a6477a52f90a528be0ca2d754 100644 (file)
--- a/MdeModulePkg/Core/Dxe/Library.h
+++ b/MdeModulePkg/Core/Dxe/Library.h
@@ -16,38 +16,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define _DXE_LIBRARY_H_\r
 \r
 \r
-\r
-/**\r
-  Report status code of type EFI_PROGRESS_CODE by caller ID gEfiCallerIdGuid.\r
-\r
-  @param  Value              Describes the class/subclass/operation of the\r
-                             hardware or software entity that the Status Code\r
-                             relates to.\r
-\r
-**/\r
-VOID\r
-CoreReportProgressCode (\r
-  IN  EFI_STATUS_CODE_VALUE   Value\r
-  );\r
-\r
-\r
-/**\r
-  Report status code of type EFI_PROGRESS_CODE by caller ID gEfiCallerIdGuid,\r
-  with a handle as additional information.\r
-\r
-  @param  Value              Describes the class/subclass/operation of the\r
-                             hardware or software entity that the Status Code\r
-                             relates to.\r
-  @param  Handle             Additional information.\r
-\r
-**/\r
-VOID\r
-CoreReportProgressCodeSpecific (\r
-  IN  EFI_STATUS_CODE_VALUE   Value,\r
-  IN  EFI_HANDLE              Handle\r
-  );\r
-\r
-\r
 /**\r
   Raising to the task priority level of the mutual exclusion\r
   lock, and then acquires ownership of the lock.\r

diff --git a/MdeModulePkg/Core/Dxe/Library/Library.c b/MdeModulePkg/Core/Dxe/Library/Library.c
index 911fbb70b8a6f84d8fdeaeecdb42f299a7bd9d8d..5ba89fdc21534b03d3a09413327254fbebcec179 100644 (file)
--- a/MdeModulePkg/Core/Dxe/Library/Library.c
+++ b/MdeModulePkg/Core/Dxe/Library/Library.c
@@ -14,74 +14,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 #include "DxeMain.h"\r
 \r
-UINTN mErrorLevel = DEBUG_ERROR | DEBUG_LOAD;\r
-\r
-EFI_DXE_DEVICE_HANDLE_EXTENDED_DATA mStatusCodeData = {\r
-  {\r
-    sizeof (EFI_STATUS_CODE_DATA),\r
-    0,\r
-    EFI_STATUS_CODE_DXE_CORE_GUID\r
-  },\r
-  NULL\r
-};\r
-\r
-\r
-/**\r
-  Report status code of type EFI_PROGRESS_CODE by caller ID gEfiCallerIdGuid,\r
-  with a handle as additional information.\r
-\r
-  @param  Value              Describes the class/subclass/operation of the\r
-                             hardware or software entity that the Status Code\r
-                             relates to.\r
-  @param  Handle             Additional information.\r
-\r
-**/\r
-VOID\r
-CoreReportProgressCodeSpecific (\r
-  IN  EFI_STATUS_CODE_VALUE   Value,\r
-  IN  EFI_HANDLE              Handle\r
-  )\r
-{\r
-  mStatusCodeData.DataHeader.Size = sizeof (EFI_DXE_DEVICE_HANDLE_EXTENDED_DATA) - sizeof (EFI_STATUS_CODE_DATA);\r
-  mStatusCodeData.Handle          = Handle;\r
-\r
-  if ((gStatusCode != NULL) && (gStatusCode->ReportStatusCode != NULL) ) {\r
-    gStatusCode->ReportStatusCode (\r
-      EFI_PROGRESS_CODE,\r
-      Value,\r
-      0,\r
-      &gEfiCallerIdGuid,\r
-      (EFI_STATUS_CODE_DATA *) &mStatusCodeData\r
-      );\r
-  }\r
-}\r
-\r
-\r
-/**\r
-  Report status code of type EFI_PROGRESS_CODE by caller ID gEfiCallerIdGuid.\r
-\r
-  @param  Value              Describes the class/subclass/operation of the\r
-                             hardware or software entity that the Status Code\r
-                             relates to.\r
-\r
-**/\r
-VOID\r
-CoreReportProgressCode (\r
-  IN  EFI_STATUS_CODE_VALUE   Value\r
-  )\r
-{\r
-  if ((gStatusCode != NULL) && (gStatusCode->ReportStatusCode != NULL) ) {\r
-    gStatusCode->ReportStatusCode (\r
-      EFI_PROGRESS_CODE,\r
-      Value,\r
-      0,\r
-      &gEfiCallerIdGuid,\r
-      NULL\r
-      );\r
-  }\r
-}\r
-\r
-\r
 //\r
 // Lock Stuff\r
 //\r