From 9c198b406677e91274146dad8d0c723a68228d4e Mon Sep 17 00:00:00 2001
From: vanjeff <vanjeff@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Tue, 10 Apr 2007 05:09:57 +0000
Subject: Perfected MSA files.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2552 6f19259b-4bc3-4df7-8a09-765794883524
---
 EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleRuntime.msa | 3 +++
 EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleService.c   | 8 +++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'EdkModulePkg/Universal/Capsule')

diff --git a/EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleRuntime.msa b/EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleRuntime.msa
index 85298640bf..b7b946e1fa 100644
--- a/EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleRuntime.msa
+++ b/EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleRuntime.msa
@@ -64,6 +64,9 @@
   </Protocols>
   <Guids>
     <GuidCNames Usage="ALWAYS_CONSUMED">
+      <GuidCName>gEfiCapsuleGuid</GuidCName>
+    </GuidCNames>
+    <GuidCNames Usage="SOMETIMES_CONSUMED">
       <GuidCName>gEfiCapsuleVendorGuid</GuidCName>
     </GuidCNames>
   </Guids>
diff --git a/EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleService.c b/EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleService.c
index 50de4c6c9d..0e7a9d496e 100644
--- a/EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleService.c
+++ b/EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleService.c
@@ -21,9 +21,7 @@ Abstract:
 
 #include "CapsuleService.h"
 
-
-STATIC EFI_GUID mEfiCapsuleHeaderGuid = EFI_CAPSULE_GUID;
-
+extern EFI_GUID gEfiCapsuleGuid;
 
 EFI_STATUS
 EFIAPI
@@ -78,7 +76,7 @@ Returns:
     if ((CapsuleHeader->Flags & (CAPSULE_FLAGS_PERSIST_ACROSS_RESET | CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE)) == CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE) {
       return EFI_INVALID_PARAMETER;
     }
-    if (!CompareGuid (&CapsuleHeader->CapsuleGuid, &mEfiCapsuleHeaderGuid)) {
+    if (!CompareGuid (&CapsuleHeader->CapsuleGuid, &gEfiCapsuleGuid)) {
       if ((CapsuleHeader->Flags & CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE) == 0) {
         return EFI_UNSUPPORTED;
       }
@@ -206,7 +204,7 @@ Returns:
     if ((CapsuleHeader->Flags & (CAPSULE_FLAGS_PERSIST_ACROSS_RESET | CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE)) == CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE) {
       return EFI_INVALID_PARAMETER;
     }
-    if (!CompareGuid (&CapsuleHeader->CapsuleGuid, &mEfiCapsuleHeaderGuid)) {
+    if (!CompareGuid (&CapsuleHeader->CapsuleGuid, &gEfiCapsuleGuid)) {
       if ((CapsuleHeader->Flags & CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE) == 0) {
         return EFI_UNSUPPORTED;
       }
-- 
cgit v1.2.3