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

diff --git a/IntelFrameworkModulePkg/Include/Guid/DataHubStatusCodeRecord.h b/IntelFrameworkModulePkg/Include/Guid/DataHubStatusCodeRecord.h
new file mode 100644 (file)
index 0000000..d549648
--- /dev/null
+++ b/IntelFrameworkModulePkg/Include/Guid/DataHubStatusCodeRecord.h
@@ -0,0 +1,33 @@
+/*++\r
+\r
+Copyright (c) 2006, Intel Corporation                                                         \r
+All rights reserved. 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
+http://opensource.org/licenses/bsd-license.php                                            \r
+                                                                                          \r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+\r
+Module Name:\r
+\r
+  StatusCode.h\r
+    \r
+Abstract:\r
+\r
+  GUID used to identify Data Hub records that originate from the Tiano \r
+  ReportStatusCode API.\r
+\r
+--*/\r
+\r
+#ifndef __STATUS_CODE_H__\r
+#define __STATUS_CODE_H__\r
+\r
+#define EFI_DATA_HUB_STATUS_CODE_RECORD_GUID \\r
+  { \\r
+    0xd083e94c, 0x6560, 0x42e4, {0xb6, 0xd4, 0x2d, 0xf7, 0x5a, 0xdf, 0x6a, 0x2a } \\r
+  }\r
+\r
+extern EFI_GUID gEfiDataHubStatusCodeRecordGuid;\r
+\r
+#endif\r

diff --git a/IntelFrameworkModulePkg/Include/Guid/StatusCode.h b/IntelFrameworkModulePkg/Include/Guid/StatusCode.h
deleted file mode 100644 (file)
index 8792c04..0000000
--- a/IntelFrameworkModulePkg/Include/Guid/StatusCode.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*++\r
-\r
-Copyright (c) 2006, Intel Corporation                                                         \r
-All rights reserved. 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
-http://opensource.org/licenses/bsd-license.php                                            \r
-                                                                                          \r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
-\r
-Module Name:\r
-\r
-  StatusCode.h\r
-    \r
-Abstract:\r
-\r
-  GUID used to identify Data Hub records that originate from the Tiano \r
-  ReportStatusCode API.\r
-\r
---*/\r
-\r
-#ifndef __STATUS_CODE_H__\r
-#define __STATUS_CODE_H__\r
-\r
-#define EFI_STATUS_CODE_GUID \\r
-  { \\r
-    0xd083e94c, 0x6560, 0x42e4, {0xb6, 0xd4, 0x2d, 0xf7, 0x5a, 0xdf, 0x6a, 0x2a } \\r
-  }\r
-\r
-extern EFI_GUID gEfiStatusCodeGuid;\r
-\r
-#endif\r

diff --git a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
index 1ad3068e7756e41c1f271e1e39eebdc4007fc36e..492bf2084cbd5b010aebdb07f6934e0526c161b3 100644 (file)
--- a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
+++ b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
@@ -56,10 +56,10 @@
 ################################################################################\r
 [Guids.common]\r
   gEfiIntelFrameworkModulePkgTokenSpaceGuid = { 0xD3705011, 0xBC19, 0x4af7, { 0xBE, 0x16, 0xF6, 0x80, 0x30, 0x37, 0x8C, 0x15 }}\r
 ################################################################################\r
 [Guids.common]\r
   gEfiIntelFrameworkModulePkgTokenSpaceGuid = { 0xD3705011, 0xBC19, 0x4af7, { 0xBE, 0x16, 0xF6, 0x80, 0x30, 0x37, 0x8C, 0x15 }}\r

-  gEfiPciHotplugDeviceGuid       = { 0x0B280816, 0x52E7, 0x4E51, { 0xAA, 0x57, 0x11, 0xBD, 0x41, 0xCB, 0xEF, 0xC3 }}\r
-  gEfiPciOptionRomTableGuid      = { 0x7462660F, 0x1CBD, 0x48DA, { 0xAD, 0x11, 0x91, 0x71, 0x79, 0x13, 0x83, 0x1C }}\r
-  gEfiStatusCodeGuid             = { 0xD083E94C, 0x6560, 0x42E4, { 0xB6, 0xD4, 0x2D, 0xF7, 0x5A, 0xDF, 0x6A, 0x2A }}\r
-  gMemoryStatusCodeRecordGuid    = { 0x060CC026, 0x4C0D, 0x4DDA, { 0x8F, 0x41, 0x59, 0x5F, 0xEF, 0x00, 0xA5, 0x02 }}\r
+  gEfiPciHotplugDeviceGuid        = { 0x0B280816, 0x52E7, 0x4E51, { 0xAA, 0x57, 0x11, 0xBD, 0x41, 0xCB, 0xEF, 0xC3 }}\r
+  gEfiPciOptionRomTableGuid       = { 0x7462660F, 0x1CBD, 0x48DA, { 0xAD, 0x11, 0x91, 0x71, 0x79, 0x13, 0x83, 0x1C }}\r
+  gEfiDataHubStatusCodeRecordGuid = { 0xD083E94C, 0x6560, 0x42E4, { 0xB6, 0xD4, 0x2D, 0xF7, 0x5A, 0xDF, 0x6A, 0x2A }}\r
+  gMemoryStatusCodeRecordGuid     = { 0x060CC026, 0x4C0D, 0x4DDA, { 0x8F, 0x41, 0x59, 0x5F, 0xEF, 0x00, 0xA5, 0x02 }}\r

 \r
 \r
 ################################################################################\r
 \r
 \r
 ################################################################################\r

diff --git a/IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErr.c b/IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErr.c
index 5a762e09e9b23ef68a1b221c20a9d1341cefa061..ad610fec1710651bf6a052555b8b50860863830a 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErr.c
+++ b/IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErr.c
@@ -28,7 +28,7 @@ Abstract:
 //\r
 // The protocols, PPI and GUID defintions for this module\r
 //\r
 //\r
 // The protocols, PPI and GUID defintions for this module\r
 //\r

-#include <Guid/StatusCode.h>\r
+#include <Guid/DataHubStatusCodeRecord.h>\r

 #include <Guid/StatusCodeDataTypeId.h>\r
 #include <Protocol/DataHub.h>\r
 #include <Protocol/SimpleTextOut.h>\r
 #include <Guid/StatusCodeDataTypeId.h>\r
 #include <Protocol/DataHub.h>\r
 #include <Protocol/SimpleTextOut.h>\r


@@ -96,7 +96,7 @@ Returns:
   do {\r
     Status = DataHub->GetNextRecord (DataHub, &Mtc, &mDataHubStdErrEvent, &Record);\r
     if (!EFI_ERROR (Status)) {\r
   do {\r
     Status = DataHub->GetNextRecord (DataHub, &Mtc, &mDataHubStdErrEvent, &Record);\r
     if (!EFI_ERROR (Status)) {\r

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

         DataRecord = (DATA_HUB_STATUS_CODE_DATA_RECORD *) (((CHAR8 *) Record) + Record->HeaderSize);\r
 \r
         if (DataRecord->Data.HeaderSize > 0) {\r
         DataRecord = (DATA_HUB_STATUS_CODE_DATA_RECORD *) (((CHAR8 *) Record) + Record->HeaderSize);\r
 \r
         if (DataRecord->Data.HeaderSize > 0) {\r

diff --git a/IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErrDxe.inf b/IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErrDxe.inf
index e4dc6469bfb6be9cc65fc500f093a4de04a942f5..332762b838c9633ec6d7d5fa78357bcf5fba1315 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErrDxe.inf
+++ b/IntelFrameworkModulePkg/Universal/DataHubStdErrDxe/DataHubStdErrDxe.inf
@@ -82,7 +82,7 @@
 \r
 [Guids]\r
   gEfiStatusCodeDataTypeDebugGuid               # SOMETIMES_CONSUMED\r
 \r
 [Guids]\r
   gEfiStatusCodeDataTypeDebugGuid               # SOMETIMES_CONSUMED\r

-  gEfiStatusCodeGuid                            # SOMETIMES_CONSUMED\r
+  gEfiDataHubStatusCodeRecordGuid               # SOMETIMES_CONSUMED\r

 \r
 \r
 ################################################################################\r
 \r
 \r
 ################################################################################\r

diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DataHubStatusCodeWorker.c b/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DataHubStatusCodeWorker.c
index a5246b398cc73e4460d8093500f6245fb63a261a..70f41e9923e4e2d41a402f8e8b9d8cc980a169c1 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DataHubStatusCodeWorker.c
+++ b/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DataHubStatusCodeWorker.c
@@ -281,7 +281,7 @@ LogDataHubEventCallBack (
 \r
     mDataHubProtocol->LogData (\r
                         mDataHubProtocol,\r
 \r
     mDataHubProtocol->LogData (\r
                         mDataHubProtocol,\r

-                        &gEfiStatusCodeGuid,\r
+                        &gEfiDataHubStatusCodeRecordGuid,\r

                         &gEfiStatusCodeRuntimeProtocolGuid,\r
                         DataRecordClass,\r
                         Record,\r
                         &gEfiStatusCodeRuntimeProtocolGuid,\r
                         DataRecordClass,\r
                         Record,\r

diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.h b/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.h
index 9762313e6ef38c02fc6ff936b307d8a6c87b882b..8f92a7de6cf2edb70d0859e3829897ea92f0896e 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.h
+++ b/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.h
@@ -21,7 +21,7 @@
 //\r
 // The protocols, PPI and GUID defintions for this module\r
 //\r
 //\r
 // The protocols, PPI and GUID defintions for this module\r
 //\r

-#include <Guid/StatusCode.h>\r
+#include <Guid/DataHubStatusCodeRecord.h>\r

 #include <Protocol/DataHub.h>\r
 #include <Protocol/SerialIo.h>\r
 #include <Guid/MemoryStatusCodeRecord.h>\r
 #include <Protocol/DataHub.h>\r
 #include <Protocol/SerialIo.h>\r
 #include <Guid/MemoryStatusCodeRecord.h>\r

diff --git a/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.inf b/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.inf
index f504e586fa0d841b6ab9d635c95fd697c9a46e99..1a001a7d62183180901d2b508df1fcab43fb98db 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.inf
+++ b/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.inf
@@ -107,7 +107,7 @@
 ################################################################################\r
 \r
 [Guids]\r
 ################################################################################\r
 \r
 [Guids]\r

-  gEfiStatusCodeGuid                            # SOMETIMES_CONSUMED\r
+  gEfiDataHubStatusCodeRecordGuid               # SOMETIMES_CONSUMED\r

   gMemoryStatusCodeRecordGuid                   # SOMETIMES_CONSUMED\r
   gEfiStatusCodeSpecificDataGuid                # SOMETIMES_CONSUMED\r
   gEfiStatusCodeDataTypeDebugGuid               # PROTOCOL ALWAYS_CONSUMED\r
   gMemoryStatusCodeRecordGuid                   # SOMETIMES_CONSUMED\r
   gEfiStatusCodeSpecificDataGuid                # SOMETIMES_CONSUMED\r
   gEfiStatusCodeDataTypeDebugGuid               # PROTOCOL ALWAYS_CONSUMED\r