Removed CommonHeader.h from NT32Pkg. Did not fix BDS as it will get re-written

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

3 files changed, 7 insertions, 78 deletions

diff --git a/Nt32Pkg/ResetRuntimeDxe/CommonHeader.h b/Nt32Pkg/ResetRuntimeDxe/CommonHeader.h
deleted file mode 100644
index 20a8ba90c5..0000000000
--- a/Nt32Pkg/ResetRuntimeDxe/CommonHeader.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/**@file

-  Common header file shared by all source files.

-

-  This file includes package header files, library classes and protocol, PPI & GUID definitions.

-

-  Copyright (c) 2006 - 2007, 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.

-**/

-

-#ifndef __COMMON_HEADER_H_

-#define __COMMON_HEADER_H_

-

-

-//

-// The package level header files this module uses

-//

-#include <PiDxe.h>

-#include <WinNtDxe.h>

-//

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

-//

-#include <Protocol/Reset.h>

-//

-// The Library classes this module consumes

-//

-#include <Library/DebugLib.h>

-#include <Library/UefiDriverEntryPoint.h>

-#include <Library/WinNtLib.h>

-#include <Library/UefiBootServicesTableLib.h>

-

-#endif

diff --git a/Nt32Pkg/ResetRuntimeDxe/Reset.inf b/Nt32Pkg/ResetRuntimeDxe/Reset.inf
index dd4c5ec030..d586a81e3b 100644
--- a/Nt32Pkg/ResetRuntimeDxe/Reset.inf
+++ b/Nt32Pkg/ResetRuntimeDxe/Reset.inf
@@ -14,11 +14,6 @@
 #

 #**/

 

-################################################################################

-#

-# Defines Section - statements that will be processed to create a Makefile.

-#

-################################################################################

 [Defines]

   INF_VERSION                    = 0x00010005

   BASE_NAME                      = Reset

@@ -36,50 +31,18 @@
 #  VALID_ARCHITECTURES           = IA32

 #

 

-################################################################################

-#

-# Sources Section - list of files that are required for the build to succeed.

-#

-################################################################################

-

 [Sources.common]

-  Reset.dxs

   reset.c

-  CommonHeader.h

-

-

-################################################################################

-#

-# Package Dependency Section - list of Package files that are required for

-#                              this module.

-#

-################################################################################

 

 [Packages]

   MdePkg/MdePkg.dec

 

-

-################################################################################

-#

-# Library Class Section - list of Library Classes that are required for

-#                         this module.

-#

-################################################################################

-

 [LibraryClasses]

   UefiBootServicesTableLib

   WinNtLib

   UefiDriverEntryPoint

   DebugLib

 

-

-################################################################################

-#

-# Protocol C Name Section - list of Protocol and Protocol Notify C Names

-#                           that this module uses or produces.

-#

-################################################################################

-

 [Protocols]

   gEfiResetArchProtocolGuid                     # PROTOCOL ALWAYS_PRODUCED

 

diff --git a/Nt32Pkg/ResetRuntimeDxe/reset.c b/Nt32Pkg/ResetRuntimeDxe/reset.c
index a4df52f19a..2aba432e82 100644
--- a/Nt32Pkg/ResetRuntimeDxe/reset.c
+++ b/Nt32Pkg/ResetRuntimeDxe/reset.c
@@ -19,13 +19,15 @@ Abstract:
 

 --*/

 

+#include <PiDxe.h>

+#include <WinNtDxe.h>

+#include <Protocol/Reset.h>

+#include <Library/DebugLib.h>

+#include <Library/UefiDriverEntryPoint.h>

+#include <Library/WinNtLib.h>

+#include <Library/UefiBootServicesTableLib.h>

 

 

-//

-// Include common header file for this module.

-//

-#include "CommonHeader.h"

-

 EFI_STATUS

 EFIAPI

 InitializeNtReset (