1 files changed, 4 insertions, 6 deletions
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
index 77c6ff984f..40030be196 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
@@ -150,13 +150,11 @@ typedef struct {
 //
 #define EXPRESSION_STACK_SIZE_INCREMENT    0x100
 
+#define EFI_SPECIFICATION_MAJOR_VERSION    0x2
+#define EFI_SPECIFICATION_MINOR_VERSION    0x1
+#define EFI_SPECIFICATION_ERRATA_VERSION   0x0
+#define EFI_IFR_SPECIFICATION_VERSION  (UINT16)((EFI_SPECIFICATION_MAJOR_VERSION << 8) | (EFI_SPECIFICATION_MINOR_VERSION << 4) | EFI_SPECIFICATION_ERRATA_VERSION)
 
-#define EFI_SPECIFICATION_ERRATA_VERSION   0
-
-#define EFI_IFR_SPECIFICATION_VERSION  \
-        ((((EFI_SPECIFICATION_VERSION) >> 8) & 0xff00) | \
-         (((EFI_SPECIFICATION_VERSION) & 0xf) << 4) | \
-         ((EFI_SPECIFICATION_ERRATA_VERSION) & 0xf))
 
 #define SETUP_DRIVER_SIGNATURE SIGNATURE_32 ('F', 'B', 'D', 'V')
 typedef struct {