Make code definition alignment.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@8925 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/IntelFrameworkPkg/Include/Framework/FrameworkInternalFormRepresentation.h b/IntelFrameworkPkg/Include/Framework/FrameworkInternalFormRepresentation.h
index 7b76d981f392a5bd5d35fed11028663d3f99264b..a00b7cf1d83a61a0b57a630da88b667ae46509b2 100644 (file)
--- a/IntelFrameworkPkg/Include/Framework/FrameworkInternalFormRepresentation.h
+++ b/IntelFrameworkPkg/Include/Framework/FrameworkInternalFormRepresentation.h
@@ -28,19 +28,19 @@ typedef UINT16  STRING_REF;
 #define FRAMEWORK_EFI_IFR_FORM_OP                 0x01\r
 #define FRAMEWORK_EFI_IFR_SUBTITLE_OP             0x02\r
 #define FRAMEWORK_EFI_IFR_TEXT_OP                 0x03\r
-#define EFI_IFR_GRAPHIC_OP              0x04\r
+#define EFI_IFR_GRAPHIC_OP                        0x04\r
 #define FRAMEWORK_EFI_IFR_ONE_OF_OP               0x05\r
 #define FRAMEWORK_EFI_IFR_CHECKBOX_OP             0x06\r
 #define FRAMEWORK_EFI_IFR_NUMERIC_OP              0x07\r
 #define FRAMEWORK_EFI_IFR_PASSWORD_OP             0x08\r
 #define FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP        0x09  ///< ONEOF OPTION field\r
 #define FRAMEWORK_EFI_IFR_SUPPRESS_IF_OP          0x0A\r
-#define EFI_IFR_END_FORM_OP             0x0B\r
-#define EFI_IFR_HIDDEN_OP               0x0C\r
-#define EFI_IFR_END_FORM_SET_OP         0x0D\r
+#define EFI_IFR_END_FORM_OP                       0x0B\r
+#define EFI_IFR_HIDDEN_OP                         0x0C\r
+#define EFI_IFR_END_FORM_SET_OP                   0x0D\r
 #define FRAMEWORK_EFI_IFR_FORM_SET_OP             0x0E\r
 #define FRAMEWORK_EFI_IFR_REF_OP                  0x0F\r
-#define EFI_IFR_END_ONE_OF_OP           0x10\r
+#define EFI_IFR_END_ONE_OF_OP                     0x10\r
 #define FRAMEWORK_EFI_IFR_END_OP                  EFI_IFR_END_ONE_OF_OP\r
 #define FRAMEWORK_EFI_IFR_INCONSISTENT_IF_OP      0x11\r
 #define FRAMEWORK_EFI_IFR_EQ_ID_VAL_OP            0x12\r
@@ -49,24 +49,24 @@ typedef UINT16  STRING_REF;
 #define FRAMEWORK_EFI_IFR_AND_OP                  0x15\r
 #define FRAMEWORK_EFI_IFR_OR_OP                   0x16\r
 #define FRAMEWORK_EFI_IFR_NOT_OP                  0x17\r
-#define EFI_IFR_END_IF_OP               0x18  ///< for endif of inconsistentif, suppressif, grayoutif\r
-#define EFI_IFR_GRAYOUT_IF_OP           0x19\r
+#define EFI_IFR_END_IF_OP                         0x18  ///< for endif of inconsistentif, suppressif, grayoutif\r
+#define EFI_IFR_GRAYOUT_IF_OP                     0x19\r
 #define FRAMEWORK_EFI_IFR_DATE_OP                 0x1A\r
 #define FRAMEWORK_EFI_IFR_TIME_OP                 0x1B\r
 #define FRAMEWORK_EFI_IFR_STRING_OP               0x1C\r
-#define EFI_IFR_LABEL_OP                0x1D\r
-#define EFI_IFR_SAVE_DEFAULTS_OP        0x1E\r
-#define EFI_IFR_RESTORE_DEFAULTS_OP     0x1F\r
-#define EFI_IFR_BANNER_OP               0x20\r
-#define EFI_IFR_INVENTORY_OP            0x21\r
-#define EFI_IFR_EQ_VAR_VAL_OP           0x22\r
+#define EFI_IFR_LABEL_OP                          0x1D\r
+#define EFI_IFR_SAVE_DEFAULTS_OP                  0x1E\r
+#define EFI_IFR_RESTORE_DEFAULTS_OP               0x1F\r
+#define EFI_IFR_BANNER_OP                         0x20\r
+#define EFI_IFR_INVENTORY_OP                      0x21\r
+#define EFI_IFR_EQ_VAR_VAL_OP                     0x22\r
 #define FRAMEWORK_EFI_IFR_ORDERED_LIST_OP         0x23\r
 #define FRAMEWORK_EFI_IFR_VARSTORE_OP             0x24\r
-#define EFI_IFR_VARSTORE_SELECT_OP      0x25\r
-#define EFI_IFR_VARSTORE_SELECT_PAIR_OP 0x26\r
-#define EFI_IFR_LAST_OPCODE             EFI_IFR_VARSTORE_SELECT_PAIR_OP\r
-#define EFI_IFR_OEM_OP                  0xFE\r
-#define EFI_IFR_NV_ACCESS_COMMAND       0xFF\r
+#define EFI_IFR_VARSTORE_SELECT_OP                0x25\r
+#define EFI_IFR_VARSTORE_SELECT_PAIR_OP           0x26\r
+#define EFI_IFR_LAST_OPCODE                       EFI_IFR_VARSTORE_SELECT_PAIR_OP\r
+#define EFI_IFR_OEM_OP                            0xFE\r
+#define EFI_IFR_NV_ACCESS_COMMAND                 0xFF\r
 \r
 //\r
 // Define values for the flags fields in some VFR opcodes. These are\r

diff --git a/IntelFrameworkPkg/Include/Protocol/FrameworkFormCallback.h b/IntelFrameworkPkg/Include/Protocol/FrameworkFormCallback.h
index e26c02aa5b5f2575c3c27a83ce814dcd18d4ebe8..8cc87d9052b67904f8f346f20daba51288c50e7a 100644 (file)
--- a/IntelFrameworkPkg/Include/Protocol/FrameworkFormCallback.h
+++ b/IntelFrameworkPkg/Include/Protocol/FrameworkFormCallback.h
@@ -92,7 +92,7 @@ typedef struct {
 typedef union {\r
   EFI_IFR_DATA_ARRAY  DataArray;  ///< Primarily used by those who call back to their drivers and use HII as a repository\r
   EFI_IFR_PACKET      DataPacket; ///< Primarily used by those which do not use HII as a repository\r
-  CHAR16                        String[1];  ///< If returning an error - fill the string with null-terminated contents\r
+  CHAR16              String[1];  ///< If returning an error - fill the string with null-terminated contents\r
 } EFI_HII_CALLBACK_PACKET;\r
 \r
 typedef struct {\r