Code scrub for the following drivers and librarys.

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

3 files changed, 37 insertions, 113 deletions

diff --git a/edk2/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf b/edk2/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf
index 03d2bf928..5addb4911 100644
--- a/edk2/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf
+++ b/edk2/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf
@@ -1,6 +1,9 @@
 #/** @file

 #  

-#   CapsuleRuntime module provides capsule runtime services

+#  Capsule Runtime Drivers produces two UEFI capsule runtime services.

+#  (UpdateCapsule, QueryCapsuleCapabilities)

+#  It installs the Capsule Architectural Protocol (EDKII definition) to signify 

+#  the capsule runtime services are ready.

 #  

 #  Copyright (c) 2006 - 2008, Intel Corporation. <BR>

 #  All rights reserved. This program and the accompanying materials

@@ -28,7 +31,6 @@
 #

 

 [Sources.common]

-  CapsuleService.h

   CapsuleService.c

 

 [Packages]

@@ -39,22 +41,23 @@
   UefiBootServicesTableLib

   PcdLib

   DebugLib

-  UefiRuntimeLib

+  UefiRuntimeServicesTableLib

   UefiDriverEntryPoint

   CapsuleLib

+  UefiRuntimeLib

 

 [Guids]

-  gEfiCapsuleVendorGuid                         # SOMETIMES_CONSUMED

+  gEfiCapsuleVendorGuid                         # Produce variable L"CapsuleUpdateData" for capsule updated data

 

 [Protocols]

   gEfiCapsuleArchProtocolGuid                   # PROTOCOL ALWAYS_PRODUCED

 

-[FeaturePcd.common]

-  gEfiMdeModulePkgTokenSpaceGuid.PcdSupportUpdateCapsuleRest

+[FeaturePcd]

+  gEfiMdeModulePkgTokenSpaceGuid.PcdSupportUpdateCapsuleReset

 

-[FixedPcd.common]

+[FixedPcd]

   gEfiMdeModulePkgTokenSpaceGuid.PcdMaxSizeNonPopulateCapsule

   gEfiMdeModulePkgTokenSpaceGuid.PcdMaxSizePopulateCapsule

 

 [Depex]

-  gEfiVariableWriteArchProtocolGuid

+  gEfiVariableWriteArchProtocolGuid             # Depends on variable write functionality to produce capsule data variable

diff --git a/edk2/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.c b/edk2/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.c
index dbb956318..2d5411a60 100644
--- a/edk2/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.c
+++ b/edk2/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.c
@@ -1,6 +1,8 @@
 /** @file

   Capsule Runtime Drivers produces two UEFI capsule runtime services.

   (UpdateCapsule, QueryCapsuleCapabilities)

+  It installs the Capsule Architectural Protocol (EDKII definition) to signify 

+  the capsule runtime services are ready.

 

 Copyright (c) 2006 - 2008, Intel Corporation. <BR>

 All rights reserved. This program and the accompanying materials

@@ -13,7 +15,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 

 **/

 

-#include "CapsuleService.h"

+#include <Uefi.h>

+

+#include <Protocol/Capsule.h>

+#include <Guid/CapsuleVendor.h>

+

+#include <Library/DebugLib.h>

+#include <Library/PcdLib.h>

+#include <Library/CapsuleLib.h>

+#include <Library/UefiDriverEntryPoint.h>

+#include <Library/UefiBootServicesTableLib.h>

+#include <Library/UefiRuntimeServicesTableLib.h>

+#include <Library/UefiRuntimeLib.h>

 

 /**

   Passes capsules to the firmware with both virtual and physical mapping. Depending on the intended

@@ -90,7 +103,7 @@ UpdateCapsule (
     //

     // Check if the platform supports update capsule across a system reset

     //

-    if (!FeaturePcdGet(PcdSupportUpdateCapsuleRest)) {

+    if (!FeaturePcdGet(PcdSupportUpdateCapsuleReset)) {

       return EFI_UNSUPPORTED;

     }

     //

@@ -105,13 +118,13 @@ UpdateCapsule (
       // system reset. Set its value into NV storage to let pre-boot driver to pick it up 

       // after coming through a system reset.

       //

-      Status = EfiSetVariable (

-                 EFI_CAPSULE_VARIABLE_NAME,

-                 &gEfiCapsuleVendorGuid,

-                 EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_BOOTSERVICE_ACCESS,

-                 sizeof (UINTN),

-                 (VOID *) &ScatterGatherList

-                 );

+      Status = gRT->SetVariable (

+                     EFI_CAPSULE_VARIABLE_NAME,

+                     &gEfiCapsuleVendorGuid,

+                     EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_BOOTSERVICE_ACCESS,

+                     sizeof (UINTN),

+                     (VOID *) &ScatterGatherList

+                     );

       if (Status != EFI_SUCCESS) {

         return Status;

       }

@@ -219,7 +232,7 @@ QueryCapsuleCapabilities (
     //

     //Check if the platform supports update capsule across a system reset

     //

-    if (!FeaturePcdGet(PcdSupportUpdateCapsuleRest)) {

+    if (!FeaturePcdGet(PcdSupportUpdateCapsuleReset)) {

       return EFI_UNSUPPORTED;

     }

     *ResetType = EfiResetWarm;

@@ -237,7 +250,7 @@ QueryCapsuleCapabilities (
 

 /**

 

-  This code is to install UEFI capsule runtime service.

+  This code installs UEFI capsule runtime service.

 

   @param  ImageHandle    The firmware allocated handle for the EFI image.  

   @param  SystemTable    A pointer to the EFI System Table.

@@ -258,8 +271,8 @@ CapsuleServiceInitialize (
   //

   // Install capsule runtime services into UEFI runtime service tables.

   //

-  SystemTable->RuntimeServices->UpdateCapsule                    = UpdateCapsule;

-  SystemTable->RuntimeServices->QueryCapsuleCapabilities         = QueryCapsuleCapabilities;

+  gRT->UpdateCapsule                    = UpdateCapsule;

+  gRT->QueryCapsuleCapabilities         = QueryCapsuleCapabilities;

 

   //

   // Install the Capsule Architectural Protocol on a new handle

diff --git a/edk2/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.h b/edk2/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.h
deleted file mode 100644
index 17aa473cb..000000000
--- a/edk2/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/** @file

-  Include the required header files for Capsule Runtime Service drivers.

-

-Copyright (c) 2006 - 2008, Intel Corporation. <BR>

-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  _CAPSULE_RUNTIME_H_

-#define  _CAPSULE_RUNTIME_H_

-

-

-#include <Uefi.h>

-

-#include <Protocol/Capsule.h>

-#include <Guid/CapsuleVendor.h>

-

-#include <Library/UefiDriverEntryPoint.h>

-#include <Library/UefiRuntimeLib.h>

-#include <Library/DebugLib.h>

-#include <Library/PcdLib.h>

-#include <Library/UefiBootServicesTableLib.h>

-#include <Library/CapsuleLib.h>

-

-/**

-  Passes capsules to the firmware with both virtual and physical mapping. Depending on the intended

-  consumption, the firmware may process the capsule immediately. If the payload should persist

-  across a system reset, the reset value returned from EFI_QueryCapsuleCapabilities must

-  be passed into ResetSystem() and will cause the capsule to be processed by the firmware as

-  part of the reset process.

-

-  @param  CapsuleHeaderArray    Virtual pointer to an array of virtual pointers to the capsules

-                                being passed into update capsule.

-  @param  CapsuleCount          Number of pointers to EFI_CAPSULE_HEADER in

-                                CaspuleHeaderArray.

-  @param  ScatterGatherList     Physical pointer to a set of

-                                EFI_CAPSULE_BLOCK_DESCRIPTOR that describes the

-                                location in physical memory of a set of capsules.

-

-  @retval EFI_SUCCESS           Valid capsule was passed. If

-                                CAPSULE_FLAGS_PERSIT_ACROSS_RESET is not set, the

-                                capsule has been successfully processed by the firmware.

-  @retval EFI_DEVICE_ERROR      The capsule update was started, but failed due to a device error.

-  @retval EFI_INVALID_PARAMETER CapsuleCount is Zero, or CapsuleImage is not valid.

-                                For across reset capsule image, ScatterGatherList is NULL.

-  @retval EFI_UNSUPPORTED       CapsuleImage is not recognized by the firmware.

-

-**/

-EFI_STATUS

-EFIAPI

-UpdateCapsule(

-  IN EFI_CAPSULE_HEADER      **CapsuleHeaderArray,

-  IN UINTN                   CapsuleCount,

-  IN EFI_PHYSICAL_ADDRESS    ScatterGatherList OPTIONAL

-  );

-

-/**

-  Returns if the capsule can be supported via UpdateCapsule().

-

-  @param  CapsuleHeaderArray    Virtual pointer to an array of virtual pointers to the capsules

-                                being passed into update capsule.

-  @param  CapsuleCount          Number of pointers to EFI_CAPSULE_HEADER in

-                                CaspuleHeaderArray.

-  @param  MaxiumCapsuleSize     On output the maximum size that UpdateCapsule() can

-                                support as an argument to UpdateCapsule() via

-                                CapsuleHeaderArray and ScatterGatherList.

-  @param  ResetType             Returns the type of reset required for the capsule update.

-

-  @retval EFI_SUCCESS           Valid answer returned.

-  @retval EFI_UNSUPPORTED       The capsule image is not supported on this platform, and

-                                MaximumCapsuleSize and ResetType are undefined.

-  @retval EFI_INVALID_PARAMETER MaximumCapsuleSize is NULL, or ResetTyep is NULL,

-                                Or CapsuleCount is Zero, or CapsuleImage is not valid.

-

-**/

-EFI_STATUS

-EFIAPI

-QueryCapsuleCapabilities(

-  IN  EFI_CAPSULE_HEADER   **CapsuleHeaderArray,

-  IN  UINTN                CapsuleCount,

-  OUT UINT64               *MaxiumCapsuleSize,

-  OUT EFI_RESET_TYPE       *ResetType

-  );

-

-#endif

-