Enable MiscSubclassDriver.inf in Nt32Pkg

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

diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/CommonHeader.h b/Nt32Pkg/MiscSubClassPlatformDxe/CommonHeader.h
index 718f802edcfe936e633fc67903b1d4719684b20d..93d7ac19c385f7ad4c143c815fb43e6f4665cf42 100644 (file)
--- a/Nt32Pkg/MiscSubClassPlatformDxe/CommonHeader.h
+++ b/Nt32Pkg/MiscSubClassPlatformDxe/CommonHeader.h
@@ -19,12 +19,14 @@
 //\r
 // The package level header files this module uses\r
 //\r
 //\r
 // The package level header files this module uses\r
 //\r

-#include <PiDxe.h>\r
+#include <FrameworkDxe.h>\r

 #include <WinNtDxe.h>\r
 //\r
 // The protocols, PPI and GUID defintions for this module\r
 //\r
 #include <WinNtDxe.h>\r
 //\r
 // The protocols, PPI and GUID defintions for this module\r
 //\r

-//#include <Protocol/WinNtIo.h>\r
+#include <Guid/DataHubRecords.h>\r
+#include <Protocol/DataHub.h>\r
+#include <Protocol/WinNtIo.h>\r

 //\r
 // The Library classes this module consumes\r
 //\r
 //\r
 // The Library classes this module consumes\r
 //\r

diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.h b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.h
index c468b59fb5c07610a825946d060893bd28bc3d6f..801b2c3bf1ea26a3ff61238aa9bb99a62ece77fd 100644 (file)
--- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.h
+++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.h
@@ -1,13 +1,13 @@
 /*++\r
 \r
 /*++\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
+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
 \r
 Module Name:\r
 \r


@@ -30,16 +30,12 @@ Abstract:
 \r
 #include <MiscDevicePath.h>\r
 \r
 \r
 #include <MiscDevicePath.h>\r
 \r

-//\r
-// Autogen string file\r
-//\r
-#include <MiscSubclassStrDefs.h>\r

 \r
 //\r
 // Data table entry update function.\r
 //\r
 \r
 //\r
 // Data table entry update function.\r
 //\r

-typedef \r
-EFI_STATUS \r
+typedef\r
+EFI_STATUS\r

 (EFIAPI EFI_MISC_SUBCLASS_DATA_FUNCTION) (\r
   IN UINT16                         RecordType,\r
   IN UINT32                         *RecordLen,\r
 (EFIAPI EFI_MISC_SUBCLASS_DATA_FUNCTION) (\r
   IN UINT16                         RecordType,\r
   IN UINT32                         *RecordLen,\r

diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.inf b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.inf
index 6d8efdedc0701cacceaff7e1a12de35f3112791b..5ff5fa1da85b710c9f57524ee5b4c8e49814ac95 100644 (file)
--- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.inf
+++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.inf
@@ -105,7 +105,7 @@
   BaseMemoryLib\r
   UefiDriverEntryPoint\r
   UefiLib\r
   BaseMemoryLib\r
   UefiDriverEntryPoint\r
   UefiLib\r

-  HiiLib\r
+  HiiLibFramework\r

   DebugLib\r
   BaseLib\r
 \r
   DebugLib\r
   BaseLib\r
 \r


@@ -118,7 +118,11 @@
 \r
 [Guids]\r
   gEfiWinNtMemoryGuid                           # SOMETIMES_CONSUMED\r
 \r
 [Guids]\r
   gEfiWinNtMemoryGuid                           # SOMETIMES_CONSUMED\r

-\r
+  gEfiProcessorSubClassGuid                     # SOMETIMES_CONSUMED\r
+  gEfiMiscSubClassGuid                          # SOMETIMES_CONSUMED\r
+  gEfiMemoryProducerGuid                        # SOMETIMES_CONSUMED\r
+  gEfiMemorySubClassGuid                        # SOMETIMES_CONSUMED\r
+  gEfiWinNtMemoryGuid                           # SOMETIMES_CONSUMED\r

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

diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemSlotDesignationData.c b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemSlotDesignationData.c
index 7610322c045da13ff51684735e5bf9ab987e2c27..ca0e9b4ff0d2821197224065501849e3a8cc2357 100644 (file)
--- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemSlotDesignationData.c
+++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemSlotDesignationData.c
@@ -1,19 +1,19 @@
 /*++\r
 \r
 /*++\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
+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
 Module Name:\r

-  \r
+\r

     MiscSystemSlotDesignationData.c\r
     MiscSystemSlotDesignationData.c\r

-  \r
-Abstract: \r
+\r
+Abstract:\r

 \r
   This driver parses the mMiscSubclassDataTable structure and reports\r
   any generated data to the DataHub.\r
 \r
   This driver parses the mMiscSubclassDataTable structure and reports\r
   any generated data to the DataHub.\r

diff --git a/Nt32Pkg/Nt32Pkg.dsc b/Nt32Pkg/Nt32Pkg.dsc
index fb9b501917c6f8da1f9aee9ad912e3648366363d..7d69125fad2a8285219ce8c0e29ace7ef956318d 100644 (file)
--- a/Nt32Pkg/Nt32Pkg.dsc
+++ b/Nt32Pkg/Nt32Pkg.dsc
@@ -305,7 +305,7 @@
 [Components.IA32]\r
   $(WORKSPACE)/Nt32Pkg/BootModePei/BootMode.inf\r
   $(WORKSPACE)/Nt32Pkg/WinNtThunkDxe/WinNtThunk.inf\r
 [Components.IA32]\r
   $(WORKSPACE)/Nt32Pkg/BootModePei/BootMode.inf\r
   $(WORKSPACE)/Nt32Pkg/WinNtThunkDxe/WinNtThunk.inf\r

-# $(WORKSPACE)/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.inf\r
+  $(WORKSPACE)/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.inf\r

   $(WORKSPACE)/Nt32Pkg/WinNtThunkPPIToProtocolPei/WinNtThunkPPIToProtocol.inf\r
   $(WORKSPACE)/Nt32Pkg/WinNtAutoScanPei/WinNtAutoScan.inf\r
   $(WORKSPACE)/Nt32Pkg/WinNtBlockIoDxe/WinNtBlockIo.inf\r
   $(WORKSPACE)/Nt32Pkg/WinNtThunkPPIToProtocolPei/WinNtThunkPPIToProtocol.inf\r
   $(WORKSPACE)/Nt32Pkg/WinNtAutoScanPei/WinNtAutoScan.inf\r
   $(WORKSPACE)/Nt32Pkg/WinNtBlockIoDxe/WinNtBlockIo.inf\r