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

5 files changed, 13 insertions, 107 deletions

diff --git a/Nt32Pkg/CpuRuntimeDxe/CommonHeader.h b/Nt32Pkg/CpuRuntimeDxe/CommonHeader.h
deleted file mode 100644
index 820279178..000000000
--- a/Nt32Pkg/CpuRuntimeDxe/CommonHeader.h
+++ /dev/null
@@ -1,44 +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 <FrameworkDxe.h>

-#include <WinNtDxe.h>

-

-//

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

-//

-#include <Protocol/Cpu.h>

-#include <Protocol/DataHub.h>

-#include <Protocol/HiiFramework.h>

-#include <Guid/DataHubRecords.h>

-#include <Protocol/CpuIo.h>

-#include <Protocol/WinNtIo.h>

-//

-// The Library classes this module consumes

-//

-#include <Library/DebugLib.h>

-#include <Library/HiiLibFramework.h>

-#include <Library/UefiDriverEntryPoint.h>

-#include <Library/BaseMemoryLib.h>

-#include <Library/MemoryAllocationLib.h>

-#include <Library/UefiBootServicesTableLib.h>

-

-#endif

diff --git a/Nt32Pkg/CpuRuntimeDxe/Cpu.c b/Nt32Pkg/CpuRuntimeDxe/Cpu.c
index 499ec2da8..a3317526a 100644
--- a/Nt32Pkg/CpuRuntimeDxe/Cpu.c
+++ b/Nt32Pkg/CpuRuntimeDxe/Cpu.c
@@ -22,10 +22,6 @@ Abstract:
 

 --*/

 

-//

-// Include common header file for this module.

-//

-#include "CommonHeader.h"

 

 #include "CpuDriver.h"

 

diff --git a/Nt32Pkg/CpuRuntimeDxe/Cpu.inf b/Nt32Pkg/CpuRuntimeDxe/Cpu.inf
index e659b7b1a..bb3c8537b 100644
--- a/Nt32Pkg/CpuRuntimeDxe/Cpu.inf
+++ b/Nt32Pkg/CpuRuntimeDxe/Cpu.inf
@@ -14,11 +14,6 @@
 #

 #**/

 

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

-#

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

-#

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

 [Defines]

   INF_VERSION                    = 0x00010005

   BASE_NAME                      = Cpu

@@ -36,40 +31,17 @@
 #  VALID_ARCHITECTURES           = IA32

 #

 

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

-#

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

-#

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

-

 [Sources.common]

   Cpu.dxs

   CpuIo.c

   Cpu.c

   CpuDriver.h

   Strings.uni

-  CommonHeader.h

-

-

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

-#

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

-#                              this module.

-#

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

 

 [Packages]

   MdePkg/MdePkg.dec

   IntelFrameworkPkg/IntelFrameworkPkg.dec

 

-

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

-#

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

-#                         this module.

-#

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

-

 [LibraryClasses]

   UefiBootServicesTableLib

   MemoryAllocationLib

@@ -78,27 +50,12 @@
   HiiLibFramework

   DebugLib

 

-

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

-#

-# Guid C Name Section - list of Guids that this module uses or produces.

-#

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

-

 [Guids]

   gEfiWinNtCPUSpeedGuid                         # SOMETIMES_CONSUMED

   gEfiWinNtCPUModelGuid                         # SOMETIMES_CONSUMED

   gEfiProcessorSubClassGuid                     # SOMETIMES_CONSUMED

   gEfiProcessorProducerGuid                     # SOMETIMES_CONSUMED

 

-

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

-#

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

-#                           that this module uses or produces.

-#

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

-

 [Protocols]

   gEfiWinNtIoProtocolGuid                       # PROTOCOL_NOTIFY SOMETIMES_CONSUMED

   gEfiDataHubProtocolGuid                       # PROTOCOL SOMETIMES_CONSUMED

@@ -107,12 +64,5 @@
   gEfiCpuIoProtocolGuid                         # PROTOCOL ALWAYS_PRODUCED

   gEfiCpuArchProtocolGuid                       # PROTOCOL ALWAYS_PRODUCED

 

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

-#

-# Dependency Expression Section - list of Dependency expressions that are required for

-#                              this module.

-#

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

-

 [Depex]

   gEfiDataHubProtocolGuid AND gEfiHiiProtocolGuid

diff --git a/Nt32Pkg/CpuRuntimeDxe/CpuDriver.h b/Nt32Pkg/CpuRuntimeDxe/CpuDriver.h
index 781d8c65d..15316fb68 100644
--- a/Nt32Pkg/CpuRuntimeDxe/CpuDriver.h
+++ b/Nt32Pkg/CpuRuntimeDxe/CpuDriver.h
@@ -23,11 +23,20 @@ Abstract:
 #define _CPU_ARCHITECTURAL_PROTOCOL_DRIVER_H_

 

 

+#include <FrameworkDxe.h>

+#include <Protocol/Cpu.h>

+#include <Protocol/DataHub.h>

+#include <Protocol/HiiFramework.h>

+#include <Guid/DataHubRecords.h>

+#include <Protocol/CpuIo.h>

+#include <Protocol/WinNtIo.h>

+#include <Library/DebugLib.h>

+#include <Library/HiiLibFramework.h>

+#include <Library/UefiDriverEntryPoint.h>

+#include <Library/BaseMemoryLib.h>

+#include <Library/MemoryAllocationLib.h>

+#include <Library/UefiBootServicesTableLib.h>

 

-//

-// Include common header file for this module.

-//

-#include "CommonHeader.h"

 

 extern UINT8  CpuStrings[];

 

diff --git a/Nt32Pkg/CpuRuntimeDxe/CpuIo.c b/Nt32Pkg/CpuRuntimeDxe/CpuIo.c
index a3b7c59e9..4aaa431d5 100644
--- a/Nt32Pkg/CpuRuntimeDxe/CpuIo.c
+++ b/Nt32Pkg/CpuRuntimeDxe/CpuIo.c
@@ -23,11 +23,6 @@ Abstract:
 

 --*/

 

-//

-// Include common header file for this module.

-//

-#include "CommonHeader.h"

-

 #include <CpuDriver.h>

 

 #define IA32_MAX_IO_ADDRESS   0xFFFF