Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update capsule header guid #66

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+11 −19
Open

Update capsule header guid #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions ...e/UEFI/EFI/RuntimeServices/MiscRuntimeServices/BlackBoxTest/MiscRuntimeServicesBBTest.inf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,6 @@

[Protocols]
gEfiTestRecoveryLibraryGuid

[Guids]
gWindowsUxCapsuleGuid
12 changes: 6 additions & 6 deletions ...I/RuntimeServices/MiscRuntimeServices/BlackBoxTest/MiscRuntimeServicesBBTestConformance.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Module Name:

--*/

#include "SctLib.h"
#include "SctLib.h"
#include "MiscRuntimeServicesBBTestMain.h"

#if (EFI_SPECIFICATION_VERSION >= 0x00020000)
Expand Down Expand Up @@ -81,7 +81,7 @@ BBTestUpdateCapsuleConformanceTest (
}

CapsuleHeaderArray[0] = (EFI_CAPSULE_HEADER *) (UINTN)AllocatedBuffer;
CapsuleHeaderArray[0]->CapsuleGuid = mEfiCapsuleHeaderGuid;
CapsuleHeaderArray[0]->CapsuleGuid = gWindowsUxCapsuleGuid;
CapsuleHeaderArray[0]->HeaderSize = sizeof(EFI_CAPSULE_HEADER);
CapsuleHeaderArray[0]->CapsuleImageSize = sizeof(EFI_CAPSULE_HEADER);
CapsuleHeaderArray[1] = NULL;
Expand Down Expand Up @@ -116,7 +116,7 @@ BBTestUpdateCapsuleConformanceTest (
//

CapsuleHeaderArray[0] = (EFI_CAPSULE_HEADER *) (UINTN)AllocatedBuffer;
CapsuleHeaderArray[0]->CapsuleGuid = mEfiCapsuleHeaderGuid;
CapsuleHeaderArray[0]->CapsuleGuid = gWindowsUxCapsuleGuid;
CapsuleHeaderArray[0]->HeaderSize = sizeof(EFI_CAPSULE_HEADER);
CapsuleHeaderArray[0]->CapsuleImageSize = sizeof(EFI_CAPSULE_HEADER);
CapsuleHeaderArray[1] = NULL;
Expand Down Expand Up @@ -150,7 +150,7 @@ BBTestUpdateCapsuleConformanceTest (
// CAPSULE_FLAGS_PERSIST_ACROSS_RESET set in its header as well.
//
CapsuleHeaderArray[0] = (EFI_CAPSULE_HEADER *) (UINTN)AllocatedBuffer;
CapsuleHeaderArray[0]->CapsuleGuid = mEfiCapsuleHeaderGuid;
CapsuleHeaderArray[0]->CapsuleGuid = gWindowsUxCapsuleGuid;
CapsuleHeaderArray[0]->HeaderSize = sizeof(EFI_CAPSULE_HEADER);
CapsuleHeaderArray[0]->CapsuleImageSize = sizeof(EFI_CAPSULE_HEADER);
CapsuleHeaderArray[1] = NULL;
Expand Down Expand Up @@ -182,7 +182,7 @@ BBTestUpdateCapsuleConformanceTest (
// CAPSULE_FLAGS_PERSIST_ACROSS_RESET set in its header as well.
//
CapsuleHeaderArray[0] = (EFI_CAPSULE_HEADER *) (UINTN)AllocatedBuffer;
CapsuleHeaderArray[0]->CapsuleGuid = mEfiCapsuleHeaderGuid;
CapsuleHeaderArray[0]->CapsuleGuid = gWindowsUxCapsuleGuid;
CapsuleHeaderArray[0]->HeaderSize = sizeof(EFI_CAPSULE_HEADER);
CapsuleHeaderArray[0]->CapsuleImageSize = sizeof(EFI_CAPSULE_HEADER);
CapsuleHeaderArray[1] = NULL;
Expand Down Expand Up @@ -268,7 +268,7 @@ BBTestQueryCapsuleCapabilitiesConformanceTest (
}

CapsuleHeaderArray[0] = (EFI_CAPSULE_HEADER *) (UINTN)AllocatedBuffer;
CapsuleHeaderArray[0]->CapsuleGuid = mEfiCapsuleHeaderGuid;
CapsuleHeaderArray[0]->CapsuleGuid = gWindowsUxCapsuleGuid;
CapsuleHeaderArray[0]->HeaderSize = sizeof(EFI_CAPSULE_HEADER);
CapsuleHeaderArray[0]->CapsuleImageSize = sizeof(EFI_CAPSULE_HEADER);
CapsuleHeaderArray[1] = NULL;
Expand Down
4 changes: 2 additions & 2 deletions .../EFI/RuntimeServices/MiscRuntimeServices/BlackBoxTest/MiscRuntimeServicesBBTestFunction.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Module Name:

--*/

#include "SctLib.h"
#include "SctLib.h"
#include "MiscRuntimeServicesBBTestMain.h"

/**
Expand Down Expand Up @@ -463,7 +463,7 @@ BBTestQueryCapsuleCapabilitiesTest (

CapsuleHeaderArray[0] = (EFI_CAPSULE_HEADER *) AllocatedBuffer;
CapsuleHeaderArray[1] = NULL;
CapsuleHeaderArray[0]->CapsuleGuid = mEfiCapsuleHeaderGuid;
CapsuleHeaderArray[0]->CapsuleGuid = gWindowsUxCapsuleGuid;
CapsuleHeaderArray[0]->CapsuleImageSize = sizeof(EFI_CAPSULE_HEADER);
CapsuleHeaderArray[0]->HeaderSize = sizeof(EFI_CAPSULE_HEADER);

Expand Down
4 changes: 0 additions & 4 deletions ...UEFI/EFI/RuntimeServices/MiscRuntimeServices/BlackBoxTest/MiscRuntimeServicesBBTestMain.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,6 @@ Module Name:
#include "SctLib.h"
#include "MiscRuntimeServicesBBTestMain.h"

#if (EFI_SPECIFICATION_VERSION >= 0x00020000)
EFI_GUID mEfiCapsuleHeaderGuid = EFI_CAPSULE_GUID;
#endif

EFI_TPL TplArray [TPL_ARRAY_SIZE] = {
TPL_APPLICATION,
TPL_CALLBACK,
Expand Down
7 changes: 0 additions & 7 deletions ...UEFI/EFI/RuntimeServices/MiscRuntimeServices/BlackBoxTest/MiscRuntimeServicesBBTestMain.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,8 @@ typedef struct _RESET_DATA {

#define TPL_ARRAY_SIZE 3

#ifndef EFI_CAPSULE_GUID
#define EFI_CAPSULE_GUID \
{ 0x3B6686BD, 0x0D76, 0x4030, {0xB7, 0x0E, 0xB5, 0x51, 0x9E, 0x2F, 0xC5, 0xA0 }}
#endif

extern EFI_TPL TplArray[TPL_ARRAY_SIZE];

extern EFI_GUID mEfiCapsuleHeaderGuid;

//
// Prototypes of Interface Test
//
Expand Down