diff options
| author | vanjeff <vanjeff@6f19259b-4bc3-4df7-8a09-765794883524> | 2007-04-10 05:09:57 +0000 |
|---|---|---|
| committer | vanjeff <vanjeff@6f19259b-4bc3-4df7-8a09-765794883524> | 2007-04-10 05:09:57 +0000 |
| commit | 9c198b406677e91274146dad8d0c723a68228d4e (patch) | |
| tree | 34faa62a6b697faec5095c3d2338aa30f8288c7d /EdkModulePkg/Universal/Capsule | |
| parent | 26aa0c2ff5254864bb117f172dce4ed3fe2be6be (diff) | |
| download | edk2-9c198b406677e91274146dad8d0c723a68228d4e.zip edk2-9c198b406677e91274146dad8d0c723a68228d4e.tar.gz edk2-9c198b406677e91274146dad8d0c723a68228d4e.tar.bz2 | |
Perfected MSA files.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2552 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'EdkModulePkg/Universal/Capsule')
| -rw-r--r-- | EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleRuntime.msa | 3 | ||||
| -rw-r--r-- | EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleService.c | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleRuntime.msa b/EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleRuntime.msa index 8529864..b7b946e 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 50de4c6..0e7a9d4 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;
}
|