Enable MiscSubclassDriver.inf in Nt32Pkg

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

5 files changed, 32 insertions, 30 deletions

diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/CommonHeader.h b/Nt32Pkg/MiscSubClassPlatformDxe/CommonHeader.h
index 718f802edc..93d7ac19c3 100644
--- a/Nt32Pkg/MiscSubClassPlatformDxe/CommonHeader.h
+++ b/Nt32Pkg/MiscSubClassPlatformDxe/CommonHeader.h
@@ -19,12 +19,14 @@
 //

 // The package level header files this module uses

 //

-#include <PiDxe.h>

+#include <FrameworkDxe.h>

 #include <WinNtDxe.h>

 //

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

 //

-//#include <Protocol/WinNtIo.h>

+#include <Guid/DataHubRecords.h>

+#include <Protocol/DataHub.h>

+#include <Protocol/WinNtIo.h>

 //

 // The Library classes this module consumes

 //

diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.h b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.h
index c468b59fb5..801b2c3bf1 100644
--- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.h
+++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.h
@@ -1,13 +1,13 @@
 /*++

 

-Copyright (c) 2006, Intel Corporation                                                         

-All rights reserved. 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        

-http://opensource.org/licenses/bsd-license.php                                            

-                                                                                          

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     

-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             

+Copyright (c) 2006, Intel Corporation

+All rights reserved. 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

+http://opensource.org/licenses/bsd-license.php

+

+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 

 Module Name:

 

@@ -30,16 +30,12 @@ Abstract:
 

 #include <MiscDevicePath.h>

 

-//

-// Autogen string file

-//

-#include <MiscSubclassStrDefs.h>

 

 //

 // Data table entry update function.

 //

-typedef 

-EFI_STATUS 

+typedef

+EFI_STATUS

 (EFIAPI EFI_MISC_SUBCLASS_DATA_FUNCTION) (

   IN UINT16                         RecordType,

   IN UINT32                         *RecordLen,

diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.inf b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.inf
index 6d8efdedc0..5ff5fa1da8 100644
--- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.inf
+++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.inf
@@ -105,7 +105,7 @@
   BaseMemoryLib

   UefiDriverEntryPoint

   UefiLib

-  HiiLib

+  HiiLibFramework

   DebugLib

   BaseLib

 

@@ -118,7 +118,11 @@
 

 [Guids]

   gEfiWinNtMemoryGuid                           # SOMETIMES_CONSUMED

-

+  gEfiProcessorSubClassGuid                     # SOMETIMES_CONSUMED

+  gEfiMiscSubClassGuid                          # SOMETIMES_CONSUMED

+  gEfiMemoryProducerGuid                        # SOMETIMES_CONSUMED

+  gEfiMemorySubClassGuid                        # SOMETIMES_CONSUMED

+  gEfiWinNtMemoryGuid                           # SOMETIMES_CONSUMED

 

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

 #

diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemSlotDesignationData.c b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemSlotDesignationData.c
index 7610322c04..ca0e9b4ff0 100644
--- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemSlotDesignationData.c
+++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscSystemSlotDesignationData.c
@@ -1,19 +1,19 @@
 /*++

 

-Copyright (c) 2006, Intel Corporation                                                         

-All rights reserved. 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        

-http://opensource.org/licenses/bsd-license.php                                            

-                                                                                          

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     

-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             

+Copyright (c) 2006, Intel Corporation

+All rights reserved. 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

+http://opensource.org/licenses/bsd-license.php

+

+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 

 Module Name:

-  

+

     MiscSystemSlotDesignationData.c

-  

-Abstract: 

+

+Abstract:

 

   This driver parses the mMiscSubclassDataTable structure and reports

   any generated data to the DataHub.

diff --git a/Nt32Pkg/Nt32Pkg.dsc b/Nt32Pkg/Nt32Pkg.dsc
index fb9b501917..7d69125fad 100644
--- a/Nt32Pkg/Nt32Pkg.dsc
+++ b/Nt32Pkg/Nt32Pkg.dsc
@@ -305,7 +305,7 @@
 [Components.IA32]

   $(WORKSPACE)/Nt32Pkg/BootModePei/BootMode.inf

   $(WORKSPACE)/Nt32Pkg/WinNtThunkDxe/WinNtThunk.inf

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

+  $(WORKSPACE)/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.inf

   $(WORKSPACE)/Nt32Pkg/WinNtThunkPPIToProtocolPei/WinNtThunkPPIToProtocol.inf

   $(WORKSPACE)/Nt32Pkg/WinNtAutoScanPei/WinNtAutoScan.inf

   $(WORKSPACE)/Nt32Pkg/WinNtBlockIoDxe/WinNtBlockIo.inf