Removed IntelframeworkPkg contamination from MdeModulePkg modules.

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

3 files changed, 28 insertions, 86 deletions

diff --git a/MdeModulePkg/Universal/WatchDogTimerDxe/WatchDogTimer.c b/MdeModulePkg/Universal/WatchDogTimerDxe/WatchDogTimer.c
index ec43aec283..76289087bc 100644
--- a/MdeModulePkg/Universal/WatchDogTimerDxe/WatchDogTimer.c
+++ b/MdeModulePkg/Universal/WatchDogTimerDxe/WatchDogTimer.c
@@ -21,24 +21,6 @@ Revision History
 

 --*/

 

-//

-// The package level header files this module uses

-//

-#include <PiDxe.h>

-#include <FrameworkDxe.h>

-//

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

-//

-//

-// The Library classes this module consumes

-//

-#include <Library/DebugLib.h>

-#include <Library/UefiDriverEntryPoint.h>

-#include <Library/ReportStatusCodeLib.h>

-#include <Library/UefiBootServicesTableLib.h>

-#include <Library/UefiRuntimeServicesTableLib.h>

-#include <Protocol/WatchDogTimer.h>

-

 #include "WatchDogTimer.h"

 

 //

@@ -103,13 +85,7 @@ WatchdogTimerDriverExpires (
 

 --*/

 {

-  //

-  // Report error code before exiting

-  //

-  REPORT_STATUS_CODE (

-        EFI_ERROR_CODE | EFI_ERROR_MINOR,

-        (EFI_COMPUTING_UNIT_HOST_PROCESSOR | EFI_CU_HP_EC_TIMER_EXPIRED)

-        );

+  REPORT_STATUS_CODE (EFI_ERROR_CODE | EFI_ERROR_MINOR, PcdGet32 (PcdStatusCodeValueEfiWatchDogTimerExpired));

 

   //

   // If a notification function has been registered, then call it

@@ -123,6 +99,7 @@ WatchdogTimerDriverExpires (
   gRT->ResetSystem (EfiResetCold, EFI_TIMEOUT, 0, NULL);

 }

 

+

 EFI_STATUS

 EFIAPI

 WatchdogTimerDriverRegisterHandler (

@@ -288,10 +265,6 @@ Returns:
 {

   EFI_STATUS  Status;

 

-  REPORT_STATUS_CODE (

-        EFI_PROGRESS_CODE,

-        (EFI_COMPUTING_UNIT_HOST_PROCESSOR | EFI_SW_PC_INIT_BEGIN)

-        );

   //

   // Make sure the Watchdog Timer Architectural Protocol is not already installed in the system

   //

@@ -320,10 +293,5 @@ Returns:
                   );

   ASSERT_EFI_ERROR (Status);

 

-  REPORT_STATUS_CODE (

-        EFI_PROGRESS_CODE,

-        (EFI_COMPUTING_UNIT_HOST_PROCESSOR | EFI_SW_PC_INIT_END)

-        );

-

   return Status;

 }

diff --git a/MdeModulePkg/Universal/WatchDogTimerDxe/WatchDogTimer.h b/MdeModulePkg/Universal/WatchDogTimerDxe/WatchDogTimer.h
index bb1936b90e..2c8c33a8cb 100644
--- a/MdeModulePkg/Universal/WatchDogTimerDxe/WatchDogTimer.h
+++ b/MdeModulePkg/Universal/WatchDogTimerDxe/WatchDogTimer.h
@@ -24,6 +24,20 @@ Revision History
 #ifndef _WATCHDOG_TIMER_H_

 #define _WATCHDOG_TIMER_H_

 

+

+//

+// The package level header files this module uses

+//

+#include <PiDxe.h>

+#include <Library/DebugLib.h>

+#include <Library/UefiDriverEntryPoint.h>

+#include <Library/ReportStatusCodeLib.h>

+#include <Library/UefiBootServicesTableLib.h>

+#include <Library/UefiRuntimeServicesTableLib.h>

+#include <Library/PcdLib.h>

+#include <Protocol/WatchDogTimer.h>

+

+

 //

 // Function Prototypes

 //

@@ -32,31 +46,27 @@ EFIAPI
 WatchdogTimerDriverRegisterHandler (

   IN EFI_WATCHDOG_TIMER_ARCH_PROTOCOL  *This,

   IN EFI_WATCHDOG_TIMER_NOTIFY         NotifyFunction

-  )

-;

+  );

 

 EFI_STATUS

 EFIAPI

 WatchdogTimerDriverSetTimerPeriod (

   IN EFI_WATCHDOG_TIMER_ARCH_PROTOCOL  *This,

   IN UINT64                            TimerPeriod

-  )

-;

+  );

 

 EFI_STATUS

 EFIAPI

 WatchdogTimerDriverGetTimerPeriod (

   IN EFI_WATCHDOG_TIMER_ARCH_PROTOCOL  *This,

   IN UINT64                            *TimerPeriod

-  )

-;

+  );

 

 EFI_STATUS

 EFIAPI

 WatchdogTimerDriverInitialize (

   IN EFI_HANDLE        ImageHandle,

   IN EFI_SYSTEM_TABLE  *SystemTable

-  )

-;

+  );

 

 #endif

diff --git a/MdeModulePkg/Universal/WatchDogTimerDxe/WatchDogTimer.inf b/MdeModulePkg/Universal/WatchDogTimerDxe/WatchDogTimer.inf
index 7c3984d488..5c9f3dfa4b 100644
--- a/MdeModulePkg/Universal/WatchDogTimerDxe/WatchDogTimer.inf
+++ b/MdeModulePkg/Universal/WatchDogTimerDxe/WatchDogTimer.inf
@@ -14,11 +14,6 @@
 #

 #**/

 

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

-#

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

-#

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

 [Defines]

   INF_VERSION                    = 0x00010005

   BASE_NAME                      = WatchDogTimer

@@ -36,35 +31,13 @@
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC

 #

 

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

-#

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

-#

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

+[Packages]

+  MdePkg/MdePkg.dec

 

 [Sources.common]

   WatchDogTimer.h

   WatchDogTimer.c

 

-

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

-#

-# 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]

   UefiRuntimeServicesTableLib

   UefiBootServicesTableLib

@@ -72,22 +45,13 @@
   UefiDriverEntryPoint

   DebugLib

 

-

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

-#

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

-#                           that this module uses or produces.

-#

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

-

 [Protocols]

   gEfiWatchdogTimerArchProtocolGuid             # PROTOCOL ALWAYS_PRODUCED

 

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

-#

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

-#                              this module.

-#

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

+[PcdsFixedAtBuild.common]

+  PcdStatusCodeValueEfiWatchDogTimerExpired|gEfiMdePkgTokenSpaceGuid

+

 [depex]

-  gEfiTimerArchProtocolGuid
\ No newline at end of file
+  gEfiTimerArchProtocolGuid

+  

+  
\ No newline at end of file