MdeModulePkg has defined gZeroGuid in 'Guid/ZeroGuid.h', therefore, the
ZeroGuid defined in
\Compatibility\PiSmbiosRecordOnDataHubSmbiosRecordThunk is redundant.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Hao Wu <hao.a...@intel.com>
Reviewed-by: Liming Gao <liming....@intel.com>
Reviewed-by: Jaben Carsey <jaben.car...@intel.com>
---
.../PiSmbiosRecordOnDataHubSmbiosRecordThunk.inf | 3 ++-
.../Compatibility/PiSmbiosRecordOnDataHubSmbiosRecordThunk/Thunk.h | 3 ++-
.../PiSmbiosRecordOnDataHubSmbiosRecordThunk/Translate.c | 7 +++----
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git
a/EdkCompatibilityPkg/Compatibility/PiSmbiosRecordOnDataHubSmbiosRecordThunk/PiSmbiosRecordOnDataHubSmbiosRecordThunk.inf
b/EdkCompatibilityPkg/Compatibility/PiSmbiosRecordOnDataHubSmbiosRecordThunk/PiSmbiosRecordOnDataHubSmbiosRecordThunk.inf
index ce675fb..ad30039 100644
---
a/EdkCompatibilityPkg/Compatibility/PiSmbiosRecordOnDataHubSmbiosRecordThunk/PiSmbiosRecordOnDataHubSmbiosRecordThunk.inf
+++
b/EdkCompatibilityPkg/Compatibility/PiSmbiosRecordOnDataHubSmbiosRecordThunk/PiSmbiosRecordOnDataHubSmbiosRecordThunk.inf
@@ -3,7 +3,7 @@
# is added via EFI_DATA_HUB_PROTOCOL->LogData(), this filter will be invoked
to
# translate the datahub's record to SMBIOS record.
#
-# Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2009 - 2015, Intel Corporation. All rights reserved.<BR>
#
# This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD
License
@@ -65,6 +65,7 @@
gEfiMemorySubClassGuid ## CONSUMES
gEfiMiscSubClassGuid ## CONSUMES
gEfiCacheSubClassGuid ## CONSUMES
+ gZeroGuid ## SOMETIMES_CONSUMES ## GUID
[FeaturePcd]
gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport
diff --git
a/EdkCompatibilityPkg/Compatibility/PiSmbiosRecordOnDataHubSmbiosRecordThunk/Thunk.h
b/EdkCompatibilityPkg/Compatibility/PiSmbiosRecordOnDataHubSmbiosRecordThunk/Thunk.h
index a7e569b..98e5371 100644
---
a/EdkCompatibilityPkg/Compatibility/PiSmbiosRecordOnDataHubSmbiosRecordThunk/Thunk.h
+++
b/EdkCompatibilityPkg/Compatibility/PiSmbiosRecordOnDataHubSmbiosRecordThunk/Thunk.h
@@ -1,7 +1,7 @@
/** @file
The common header file for the thunk driver.
-Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2009 - 2015, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD
License
which accompanies this distribution. The full text of the license may be
found at
@@ -20,6 +20,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
EXPRESS OR IMPLIED.
#include <Guid/EventGroup.h>
#include <Guid/SmBios.h>
+#include <Guid/ZeroGuid.h>
#include <Protocol/DataHub.h>
#include <Guid/DataHubRecords.h>
#include <Protocol/HiiDatabase.h>
diff --git
a/EdkCompatibilityPkg/Compatibility/PiSmbiosRecordOnDataHubSmbiosRecordThunk/Translate.c
b/EdkCompatibilityPkg/Compatibility/PiSmbiosRecordOnDataHubSmbiosRecordThunk/Translate.c
index 324ee36..7d674f8 100644
---
a/EdkCompatibilityPkg/Compatibility/PiSmbiosRecordOnDataHubSmbiosRecordThunk/Translate.c
+++
b/EdkCompatibilityPkg/Compatibility/PiSmbiosRecordOnDataHubSmbiosRecordThunk/Translate.c
@@ -2,7 +2,7 @@
Translate the DataHub records via EFI_DATA_HUB_PROTOCOL to Smbios recorders
via EFI_SMBIOS_PROTOCOL.
-Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2009 - 2015, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD
License
which accompanies this distribution. The full text of the license may be
found at
@@ -15,7 +15,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
EXPRESS OR IMPLIED.
#include "Thunk.h"
-EFI_GUID ZeroGuid = { 0, 0, 0, { 0, 0, 0, 0, 0, 0, 0, 0 } };
EFI_SMBIOS_PROTOCOL *mSmbiosProtocol = NULL;
/**
@@ -83,7 +82,7 @@ SmbiosProcessDataRecord (
// Find a matching entry in the conversion table for this
// (SubClass, RecordNumber) pair
//
- for (; !CompareGuid (&(mConversionTable[Index].SubClass), &ZeroGuid);
Index++) {
+ for (; !CompareGuid (&(mConversionTable[Index].SubClass), &gZeroGuid);
Index++) {
if (CompareGuid (
&(mConversionTable[Index].SubClass),
&(RecordHeader->DataRecordGuid)
@@ -94,7 +93,7 @@ SmbiosProcessDataRecord (
}
}
- if (CompareGuid (&(mConversionTable[Index].SubClass), &ZeroGuid)) {
+ if (CompareGuid (&(mConversionTable[Index].SubClass), &gZeroGuid)) {
//
// We cannot find a matching entry in conversion table,
// this means this data record cannot be used for SMBIOS.
--
1.9.5.msysgit.0
------------------------------------------------------------------------------
Monitor 25 network devices or servers for free with OpManager!
OpManager is web-based network management software that monitors
network devices and physical & virtual servers, alerts via email & sms
for fault. Monitor 25 devices for free with no restriction. Download now
http://ad.doubleclick.net/ddm/clk/292181274;119417398;o
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/edk2-devel
