FmpDevicePkg/FmpDxe: Different variable for each FMP Descriptor

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1525

Cc: Sean Brogan <sean.brogan@microsoft.com>
Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
Cc: Liming Gao <liming.gao@intel.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Eric Jin <eric.jin@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

1 files changed, 7 insertions, 1 deletions

diff --git a/FmpDevicePkg/FmpDxe/FmpDxe.h b/FmpDevicePkg/FmpDxe/FmpDxe.h
index c2ffc43..06514c6 100644
--- a/FmpDevicePkg/FmpDxe/FmpDxe.h
+++ b/FmpDevicePkg/FmpDxe/FmpDxe.h
@@ -18,6 +18,7 @@
 #include <Library/BaseLib.h>

 #include <Library/BaseMemoryLib.h>

 #include <Library/UefiBootServicesTableLib.h>

+#include <Library/UefiRuntimeServicesTableLib.h>

 #include <Library/MemoryAllocationLib.h>

 #include <Library/UefiLib.h>

 #include <Library/FmpAuthenticationLib.h>

@@ -26,9 +27,9 @@
 #include <Library/CapsuleUpdatePolicyLib.h>

 #include <Protocol/FirmwareManagement.h>

 #include <Protocol/FirmwareManagementProgress.h>

+#include <Protocol/VariableLock.h>

 #include <Guid/SystemResourceTable.h>

 #include <Guid/EventGroup.h>

-#include "VariableSupport.h"

 

 #define VERSION_STRING_NOT_SUPPORTED  L"VERSION STRING NOT SUPPORTED"

 #define VERSION_STRING_NOT_AVAILABLE  L"VERSION STRING NOT AVAILABLE"

@@ -57,6 +58,11 @@ typedef struct {
   //

   BOOLEAN                                      FmpDeviceLocked;

   VOID                                         *FmpDeviceContext;

+  CHAR16                                       *VersionVariableName;

+  CHAR16                                       *LsvVariableName;

+  CHAR16                                       *LastAttemptStatusVariableName;

+  CHAR16                                       *LastAttemptVersionVariableName;

+  CHAR16                                       *FmpStateVariableName;

 } FIRMWARE_MANAGEMENT_PRIVATE_DATA;

 

 ///