Update code to follow coding style. Mainly change about:

1. Remove duplicate lib
2. Refine the name for enum member.
Signed-off-by: ydong10
Reviewed-by: lgao4
Reviewed-by: gdong1
Reviewed-by: vanjeff
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12767 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc
index 3fc3bcca69aa6daa82db1604035b801b8693f724..83e43d2cc99dd3e3494a83ed1eafc06d81ad0bd0 100644 (file)
--- a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc
+++ b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc
@@ -73,7 +73,6 @@
   DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf\r
   UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf\r
   PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf\r
-  IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf\r
   PalLib|MdePkg/Library/BasePalLibNull/BasePalLibNull.inf\r
 \r
 [LibraryClasses.common.PEIM]\r

diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
index 2448eac4161dbcf7844a50d8ff98852acbb029e0..7cc71e2476e97c0a422518bd1f53864a364b02f3 100644 (file)
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
@@ -1250,7 +1250,7 @@ ParseIfrData (
         //\r
         // Numeric minimum value will be used as default value when no default is specified. \r
         //\r
-        DefaultData.Type        = DEFAULT_VALUE_FROM_DEFAULT;\r
+        DefaultData.Type        = DefaultValueFromDefault;\r
         switch (IfrOneOf->Flags & EFI_IFR_NUMERIC_SIZE) {\r
         case EFI_IFR_NUMERIC_SIZE_1:\r
           DefaultData.Value = (UINT64) IfrOneOf->data.u8.MinValue;\r
@@ -1404,13 +1404,13 @@ ParseIfrData (
         //\r
         // When flag is set, defautl value is TRUE.\r
         //\r
-        DefaultData.Type     = DEFAULT_VALUE_FROM_FLAG;\r
+        DefaultData.Type     = DefaultValueFromFlag;\r
         DefaultData.Value    = 1;\r
       } else {\r
         //\r
         // When flag is not set, defautl value is FASLE.\r
         //\r
-        DefaultData.Type     = DEFAULT_VALUE_FROM_DEFAULT;\r
+        DefaultData.Type     = DefaultValueFromDefault;\r
         DefaultData.Value    = 0;\r
       }\r
       //\r
@@ -1430,13 +1430,13 @@ ParseIfrData (
         //\r
         // When flag is set, defautl value is TRUE.\r
         //\r
-        DefaultData.Type     = DEFAULT_VALUE_FROM_FLAG;\r
+        DefaultData.Type     = DefaultValueFromFlag;\r
         DefaultData.Value    = 1;\r
       } else {\r
         //\r
         // When flag is not set, defautl value is FASLE.\r
         //\r
-        DefaultData.Type     = DEFAULT_VALUE_FROM_DEFAULT;        \r
+        DefaultData.Type     = DefaultValueFromDefault;        \r
         DefaultData.Value    = 0;\r
       }\r
       //\r
@@ -1664,7 +1664,7 @@ ParseIfrData (
         \r
         // Prepare new DefaultValue\r
         //\r
-        DefaultData.Type  = DEFAULT_VALUE_FROM_FLAG;\r
+        DefaultData.Type  = DefaultValueFromFlag;\r
         DefaultData.Value = IfrOneOfOption->Value.u64;\r
         if ((IfrOneOfOption->Flags & EFI_IFR_OPTION_DEFAULT) == EFI_IFR_OPTION_DEFAULT) {\r
           DefaultData.DefaultId = EFI_HII_DEFAULT_CLASS_STANDARD;\r
@@ -1689,7 +1689,7 @@ ParseIfrData (
         //\r
         // Prepare new DefaultValue\r
         //        \r
-        DefaultData.Type        = DEFAULT_VALUE_FROM_DEFAULT;\r
+        DefaultData.Type        = DefaultValueFromDefault;\r
         DefaultData.Value       = IfrOneOfOption->Value.u64;        \r
         for (LinkData = DefaultIdArray->Entry.ForwardLink; LinkData != &DefaultIdArray->Entry; LinkData = LinkData->ForwardLink) {\r
           DefaultDataPtr = BASE_CR (LinkData, IFR_DEFAULT_DATA, Entry); \r
@@ -1724,7 +1724,7 @@ ParseIfrData (
       //\r
       // Prepare new DefaultValue\r
       //\r
-      DefaultData.Type        = DEFAULT_VALUE_FROM_OPCODE;\r
+      DefaultData.Type        = DefaultValueFromOpcode;\r
       DefaultData.DefaultId   = VarDefaultId;\r
       DefaultData.Value       = IfrDefault->Value.u64;  \r
       \r

diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h
index ccb9263923b5be03f87cc9b4b58340d60add0d46..b0944abb1b5c7c00d79555bd695cc6a4cbfbb7e3 100644 (file)
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabase.h
@@ -84,9 +84,9 @@ typedef struct {
 // Get default value from IFR data.\r
 //\r
 typedef enum {\r
-  DEFAULT_VALUE_FROM_DEFAULT = 0,   // Get from the minimum or first one when not set default value.\r
-  DEFAULT_VALUE_FROM_FLAG,          // Get default value from the defalut flag.\r
-  DEFAULT_VALUE_FROM_OPCODE         // Get default value from default opcode, highest priority.\r
+  DefaultValueFromDefault = 0,     // Get from the minimum or first one when not set default value.\r
+  DefaultValueFromFlag,            // Get default value from the defalut flag.\r
+  DefaultValueFromOpcode           // Get default value from default opcode, highest priority.\r
 } DEFAULT_VALUE_TYPE;\r
 \r
 typedef struct {\r

diff --git a/SecurityPkg/SecurityPkg.dsc b/SecurityPkg/SecurityPkg.dsc
index 7eda01eda2d08ef8ca2c0fa10dc4f5eb5a01aad1..f089e3308824a2d845b6ff877c66b274f519efd8 100644 (file)
--- a/SecurityPkg/SecurityPkg.dsc
+++ b/SecurityPkg/SecurityPkg.dsc
@@ -65,7 +65,6 @@
 \r
 [LibraryClasses.common.UEFI_DRIVER, LibraryClasses.common.DXE_RUNTIME_DRIVER, LibraryClasses.common.DXE_SAL_DRIVER,]\r
   HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf\r
-  MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf\r
   DebugLib|MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.inf\r
 \r
 [LibraryClasses.IPF.DXE_SAL_DRIVER]\r