Use Memory Allocation Library instance for modules of type DXE_SMM_DRIVER

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

3 files changed, 9 insertions, 16 deletions

diff --git a/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.c b/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.c
index 5e7cd1850c..37ebc05934 100644
--- a/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.c
+++ b/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.c
@@ -2,7 +2,7 @@
   Report Status Code Router Driver which produces SMM Report Stataus Code Handler Protocol

   and SMM Status Code Protocol.

 

-  Copyright (c) 2009, Intel Corporation

+  Copyright (c) 2009 -2010, 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

@@ -54,9 +54,8 @@ Register (
   IN EFI_SMM_RSC_HANDLER_CALLBACK   Callback

   )

 {

-  EFI_STATUS                        Status;

-  LIST_ENTRY                        *Link;

-  SMM_RSC_HANDLER_CALLBACK_ENTRY    *CallbackEntry;

+  LIST_ENTRY                      *Link;

+  SMM_RSC_HANDLER_CALLBACK_ENTRY  *CallbackEntry;

 

   if (Callback == NULL) {

     return EFI_INVALID_PARAMETER;

@@ -72,13 +71,7 @@ Register (
     }

   }

 

-  Status = gSmst->SmmAllocatePool (

-                    EfiRuntimeServicesData,

-                    sizeof (SMM_RSC_HANDLER_CALLBACK_ENTRY),

-                    (VOID**)&CallbackEntry

-                    );

-

-  ASSERT_EFI_ERROR(Status);

+  CallbackEntry = (SMM_RSC_HANDLER_CALLBACK_ENTRY *)AllocatePool (sizeof (SMM_RSC_HANDLER_CALLBACK_ENTRY));

   ASSERT (CallbackEntry != NULL);

 

   CallbackEntry->Signature          = SMM_RSC_HANDLER_CALLBACK_ENTRY_SIGNATURE;

@@ -122,7 +115,7 @@ Unregister (
       // If the function is found in list, delete it and return.

       //

       RemoveEntryList (&CallbackEntry->Node);

-      gSmst->SmmFreePool (CallbackEntry);

+      FreePool (CallbackEntry);

       return EFI_SUCCESS;

     }

   }

diff --git a/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.h b/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.h
index d3017b4b6e..d272448e35 100644
--- a/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.h
+++ b/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.h
@@ -1,7 +1,7 @@
 /** @file

   Internal include file for Report Status Code Router Driver.

 

-  Copyright (c) 2009, Intel Corporation

+  Copyright (c) 2009 - 2010, 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

@@ -25,6 +25,7 @@
 #include <Library/PcdLib.h>

 #include <Library/UefiDriverEntryPoint.h>

 #include <Library/SmmServicesTableLib.h>

+#include <Library/MemoryAllocationLib.h>

 

 #define SMM_RSC_HANDLER_CALLBACK_ENTRY_SIGNATURE  SIGNATURE_32 ('s', 'h', 'c', 'e')

 

diff --git a/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.inf b/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.inf
index 233058974c..d3ca177c17 100644
--- a/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.inf
+++ b/MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.inf
@@ -20,7 +20,6 @@
   FILE_GUID                      = A6885402-D022-4b0e-A509-4711B90F2A39

   MODULE_TYPE                    = DXE_SMM_DRIVER

   PI_SPECIFICATION_VERSION       = 0x0001000A

-  

   ENTRY_POINT                    = GenericStatusCodeSmmEntry

 

 #

@@ -29,11 +28,10 @@
 #  VALID_ARCHITECTURES           = IA32 X64

 #

 

-[Sources.common]

+[Sources]

   ReportStatusCodeRouterSmm.c

   ReportStatusCodeRouterSmm.h

 

-

 [Packages]

   MdePkg/MdePkg.dec

   MdeModulePkg/MdeModulePkg.dec

@@ -44,6 +42,7 @@
   DebugLib

   BaseLib

   SynchronizationLib

+  MemoryAllocationLib

 

 [Protocols]

   gEfiSmmRscHandlerProtocolGuid               ## PRODUCES