Clean up DataHubGenDxe:

1. Fix the structure assignment
2. Removed the unused DXS file.

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

diff --git a/DuetPkg/DataHubGenDxe/DataHubGen.c b/DuetPkg/DataHubGenDxe/DataHubGen.c
index 3878b74fc53ae48d5d90287ee0bb42fb9fb7c9a0..6d6770444d84ab8b8b602dae0482f29b09947219 100644 (file)
--- a/DuetPkg/DataHubGenDxe/DataHubGen.c
+++ b/DuetPkg/DataHubGenDxe/DataHubGen.c
@@ -172,7 +172,7 @@ InstallMemoryDataHub (
   DataRecord.Record.ArrayStartAddress.MemoryArrayStartAddress = LShiftU64(SmbiosTable.Type19->StartingAddress, 10);\r
   DataRecord.Record.ArrayStartAddress.MemoryArrayEndAddress = LShiftU64((UINT64) SmbiosTable.Type19->EndingAddress + 1, 10) - 1;\r
   \r
-  DataRecord.Record.ArrayStartAddress.PhysicalMemoryArrayLink.ProducerName = gEfiMemoryProducerGuid;\r
+  CopyGuid (&DataRecord.Record.ArrayStartAddress.PhysicalMemoryArrayLink.ProducerName, &gEfiMemoryProducerGuid);\r
   DataRecord.Record.ArrayStartAddress.PhysicalMemoryArrayLink.Instance = 0;\r
   DataRecord.Record.ArrayStartAddress.PhysicalMemoryArrayLink.SubInstance = EFI_SUBCLASS_INSTANCE_NON_APPLICABLE;\r
   DataRecord.Record.ArrayStartAddress.MemoryArrayPartitionWidth = (UINT16)(SmbiosTable.Type19->PartitionWidth); \r

diff --git a/DuetPkg/DataHubGenDxe/DataHubGen.dxs b/DuetPkg/DataHubGenDxe/DataHubGen.dxs
deleted file mode 100644 (file)
index 418f611..0000000
--- a/DuetPkg/DataHubGenDxe/DataHubGen.dxs
+++ /dev/null
@@ -1,39 +0,0 @@
-/*++\r
-\r
-Copyright (c) 2006 - 2007, 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
-  DataHub.dxs\r
-\r
-Abstract:\r
-\r
-  Dependency expression source file.\r
-  \r
---*/  \r
-\r
-\r
-#include "EfiDepex.h"\r
-\r
-#include EFI_PROTOCOL_DEFINITION (DataHub)\r
-#if (EFI_SPECIFICATION_VERSION >= 0x0002000A)\r
-#include EFI_PROTOCOL_DEFINITION (HiiDatabase)\r
-#else\r
-#include EFI_PROTOCOL_DEFINITION (Hii)\r
-#endif\r
-\r
-DEPENDENCY_START\r
-  EFI_DATA_HUB_PROTOCOL_GUID  AND\r
-#if (EFI_SPECIFICATION_VERSION >= 0x0002000A)\r
-  EFI_HII_DATABASE_PROTOCOL_GUID\r
-#else\r
-  EFI_HII_PROTOCOL_GUID\r
-#endif\r
-DEPENDENCY_END\r

diff --git a/DuetPkg/DataHubGenDxe/DataHubGen.inf b/DuetPkg/DataHubGenDxe/DataHubGen.inf
index 0f7803c46b7eafd0840e9cab3bbb9ce366b12851..d77202ca0c2987f75cab3c7217479ded880da15b 100644 (file)
--- a/DuetPkg/DataHubGenDxe/DataHubGen.inf
+++ b/DuetPkg/DataHubGenDxe/DataHubGen.inf
@@ -64,4 +64,5 @@
   gEfiHiiProtocolGuid\r
   \r
 [Depex]\r
-  gEfiDataHubProtocolGuid AND gEfiHiiDatabaseProtocolGuid
\ No newline at end of file
+  gEfiDataHubProtocolGuid AND gEfiHiiDatabaseProtocolGuid\r
+\r