1) Change the file name of StatusCode.h to DataHubStatusCodeRecord.h

2) Change gEfiStatusCodeGuid to gEfiDataHubStatusCodeRecordGuid


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

7 files changed, 12 insertions, 12 deletions

diff --git a/IntelFrameworkModulePkg/Include/Guid/StatusCode.h b/IntelFrameworkModulePkg/Include/Guid/DataHubStatusCodeRecord.h
index 8792c04..d549648 100644
--- a/IntelFrameworkModulePkg/Include/Guid/StatusCode.h
+++ b/IntelFrameworkModulePkg/Include/Guid/DataHubStatusCodeRecord.h
@@ -23,11 +23,11 @@ Abstract:
 #ifndef __STATUS_CODE_H__

 #define __STATUS_CODE_H__

 

-#define EFI_STATUS_CODE_GUID \

+#define EFI_DATA_HUB_STATUS_CODE_RECORD_GUID \

   { \

     0xd083e94c, 0x6560, 0x42e4, {0xb6, 0xd4, 0x2d, 0xf7, 0x5a, 0xdf, 0x6a, 0x2a } \

   }

 

-extern EFI_GUID gEfiStatusCodeGuid;

+extern EFI_GUID gEfiDataHubStatusCodeRecordGuid;

 

 #endif

diff --git a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
index 1ad3068..492bf20 100644
--- a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
+++ b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
@@ -56,10 +56,10 @@
 ################################################################################

 [Guids.common]

   gEfiIntelFrameworkModulePkgTokenSpaceGuid = { 0xD3705011, 0xBC19, 0x4af7, { 0xBE, 0x16, 0xF6, 0x80, 0x30, 0x37, 0x8C, 0x15 }}

-  gEfiPciHotplugDeviceGuid       = { 0x0B280816, 0x52E7, 0x4E51, { 0xAA, 0x57, 0x11, 0xBD, 0x41, 0xCB, 0xEF, 0xC3 }}

-  gEfiPciOptionRomTableGuid      = { 0x7462660F, 0x1CBD, 0x48DA, { 0xAD, 0x11, 0x91, 0x71, 0x79, 0x13, 0x83, 0x1C }}

-  gEfiStatusCodeGuid             = { 0xD083E94C, 0x6560, 0x42E4, { 0xB6, 0xD4, 0x2D, 0xF7, 0x5A, 0xDF, 0x6A, 0x2A }}

-  gMemoryStatusCodeRecordGuid    = { 0x060CC026, 0x4C0D, 0x4DDA, { 0x8F, 0x41, 0x59, 0x5F, 0xEF, 0x00, 0xA5, 0x02 }}

+  gEfiPciHotplugDeviceGuid        = { 0x0B280816, 0x52E7, 0x4E51, { 0xAA, 0x57, 0x11, 0xBD, 0x41, 0xCB, 0xEF, 0xC3 }}

+  gEfiPciOptionRomTableGuid       = { 0x7462660F, 0x1CBD, 0x48DA, { 0xAD, 0x11, 0x91, 0x71, 0x79, 0x13, 0x83, 0x1C }}

+  gEfiDataHubStatusCodeRecordGuid = { 0xD083E94C, 0x6560, 0x42E4, { 0xB6, 0xD4, 0x2D, 0xF7, 0x5A, 0xDF, 0x6A, 0x2A }}

+  gMemoryStatusCodeRecordGuid     = { 0x060CC026, 0x4C0D, 0x4DDA, { 0x8F, 0x41, 0x59, 0x5F, 0xEF, 0x00, 0xA5, 0x02 }}

 

 

 ################################################################################

diff --git a/IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErr.c b/IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErr.c
index 5a762e0..ad610fe 100644
--- a/IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErr.c
+++ b/IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErr.c
@@ -28,7 +28,7 @@ Abstract:
 //

 // The protocols, PPI and GUID defintions for this module

 //

-#include <Guid/StatusCode.h>

+#include <Guid/DataHubStatusCodeRecord.h>

 #include <Guid/StatusCodeDataTypeId.h>

 #include <Protocol/DataHub.h>

 #include <Protocol/SimpleTextOut.h>

@@ -96,7 +96,7 @@ Returns:
   do {

     Status = DataHub->GetNextRecord (DataHub, &Mtc, &mDataHubStdErrEvent, &Record);

     if (!EFI_ERROR (Status)) {

-      if (CompareGuid (&Record->DataRecordGuid, &gEfiStatusCodeGuid)) {

+      if (CompareGuid (&Record->DataRecordGuid, &gEfiDataHubStatusCodeRecordGuid)) {

         DataRecord = (DATA_HUB_STATUS_CODE_DATA_RECORD *) (((CHAR8 *) Record) + Record->HeaderSize);

 

         if (DataRecord->Data.HeaderSize > 0) {

diff --git a/IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErrDxe.inf b/IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErrDxe.inf
index e4dc646..332762b 100644
--- a/IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErrDxe.inf
+++ b/IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErrDxe.inf
@@ -82,7 +82,7 @@
 

 [Guids]

   gEfiStatusCodeDataTypeDebugGuid               # SOMETIMES_CONSUMED

-  gEfiStatusCodeGuid                            # SOMETIMES_CONSUMED

+  gEfiDataHubStatusCodeRecordGuid               # SOMETIMES_CONSUMED

 

 

 ################################################################################

diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DataHubStatusCodeWorker.c b/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DataHubStatusCodeWorker.c
index a5246b3..70f41e9 100644
--- a/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DataHubStatusCodeWorker.c
+++ b/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DataHubStatusCodeWorker.c
@@ -281,7 +281,7 @@ LogDataHubEventCallBack (
 

     mDataHubProtocol->LogData (

                         mDataHubProtocol,

-                        &gEfiStatusCodeGuid,

+                        &gEfiDataHubStatusCodeRecordGuid,

                         &gEfiStatusCodeRuntimeProtocolGuid,

                         DataRecordClass,

                         Record,

diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.h b/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.h
index 9762313..8f92a7d 100644
--- a/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.h
+++ b/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.h
@@ -21,7 +21,7 @@
 //

 // The protocols, PPI and GUID defintions for this module

 //

-#include <Guid/StatusCode.h>

+#include <Guid/DataHubStatusCodeRecord.h>

 #include <Protocol/DataHub.h>

 #include <Protocol/SerialIo.h>

 #include <Guid/MemoryStatusCodeRecord.h>

diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.inf b/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.inf
index f504e58..1a001a7 100644
--- a/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.inf
+++ b/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.inf
@@ -107,7 +107,7 @@
 ################################################################################

 

 [Guids]

-  gEfiStatusCodeGuid                            # SOMETIMES_CONSUMED

+  gEfiDataHubStatusCodeRecordGuid               # SOMETIMES_CONSUMED

   gMemoryStatusCodeRecordGuid                   # SOMETIMES_CONSUMED

   gEfiStatusCodeSpecificDataGuid                # SOMETIMES_CONSUMED

   gEfiStatusCodeDataTypeDebugGuid               # PROTOCOL ALWAYS_CONSUMED