clean up for IPF ICC tool chain.

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

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/ConfigAccess.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/ConfigAccess.c
index 66bd438469fbb55cdc8429cd29044937a56cd7bd..edbc34a3e49f4cdc2eb4575ec9fb9cdad7742887 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/ConfigAccess.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/ConfigAccess.c
@@ -229,7 +229,6 @@ UninstallDefaultConfigAccessProtocol (
 {\r
   EFI_STATUS                      Status;\r
   EFI_HII_CONFIG_ACCESS_PROTOCOL  *ConfigAccess;\r
-  CONFIG_ACCESS_PRIVATE           *ConfigAccessInstance;\r
   \r
   HiiLibDestroyHiiDriverHandle (ThunkContext->UefiHiiDriverHandle);\r
 \r
@@ -247,8 +246,6 @@ UninstallDefaultConfigAccessProtocol (
                   );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
-  ConfigAccessInstance = CONFIG_ACCESS_PRIVATE_FROM_PROTOCOL (ConfigAccess);\r
-\r
 }\r
   \r
 \r
@@ -487,7 +484,7 @@ ThunkRouteConfig (
   EFI_STATUS                                  Status;\r
   CONFIG_ACCESS_PRIVATE                       *ConfigAccess;\r
   FORMSET_STORAGE                             *BufferStorage;\r
-  UINT8                                       *Data;\r
+  VOID                                        *Data;\r
   UINTN                                       DataSize;\r
   UINTN                                       DataSize2;\r
   UINTN                                       LastModifiedByteIndex;\r

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Fonts.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Fonts.c
index 46cb76f06bef571a15902765de3c5c2ca6f33e59..27b5d95fbd798123938d432b94f9cbe3e8b39957 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Fonts.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Fonts.c
@@ -109,7 +109,7 @@ HiiGetGlyph (
       for (Ypos = 0; Ypos < EFI_GLYPH_HEIGHT; Ypos++) {\r
         for (Xpos = 0; Xpos < EFI_GLYPH_WIDTH; Xpos++) {\r
           if (CompareMem (&Blt->Image.Bitmap[Ypos * EFI_GLYPH_WIDTH + Xpos], &mSysFGColor, sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL)) == 0) {\r
-            mNarrowGlyphBuffer.GlyphCol1[Ypos] |= 1 << (EFI_GLYPH_WIDTH - 1 - Xpos);\r
+            mNarrowGlyphBuffer.GlyphCol1[Ypos] = (UINT8) (mNarrowGlyphBuffer.GlyphCol1[Ypos] | (1 << (EFI_GLYPH_WIDTH - 1 - Xpos)));\r
           }\r
         }\r
       }\r

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiHandle.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiHandle.c
index 14affde83d88a29196c91c02bb3bdc04c39a9940..88f25ef83e7ef907e8637a7f6865652ba05b98e9 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiHandle.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiHandle.c
@@ -42,7 +42,7 @@ AllocateHiiHandle (
 \r
   for (Index = 0; Index < sizeof (mHandle) * 8; Index++) {\r
     if ((mHandle[Index / 8] & (1 << (Index % 8))) == 0) {\r
-      mHandle[Index / 8] |= (1 << (Index % 8));\r
+      mHandle[Index / 8] = (UINT8) (mHandle[Index / 8] | (1 << (Index % 8)));\r
       *Handle = (FRAMEWORK_EFI_HII_HANDLE) Index;\r
       ASSERT (*Handle != 0);\r
       return EFI_SUCCESS;\r
@@ -62,5 +62,5 @@ FreeHiiHandle (
   Num = (UINT16) Handle;\r
 \r
   ASSERT ((mHandle [Num / 8] & (1 << (Num % 8))) != 0);\r
-  mHandle [Num / 8] &= (~(1 << (Num % 8)));\r
+  mHandle [Num / 8] = (UINT8) (mHandle [Num / 8] & (~(1 << (Num % 8))));\r
 }\r

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/OpcodeCreation.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/OpcodeCreation.c
index 60b2d25c710ed80e10da46a809fb1256f8a10cc3..c79ad26e988570bd7f03b66492dcb607d541b281 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/OpcodeCreation.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/OpcodeCreation.c
@@ -268,7 +268,7 @@ F2UCreateGotoOpCode (
   // We only map FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE and FRAMEWORK_EFI_IFR_FLAG_RESET_REQUIRED to \r
   // UEFI IFR Opcode flags. The rest flags are obsolete.\r
   //\r
-  UOpcode.Question.Flags  = (FwOpcode->Flags & (FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE | FRAMEWORK_EFI_IFR_FLAG_RESET_REQUIRED));\r
+  UOpcode.Question.Flags  = (UINT8) (FwOpcode->Flags & (FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE | FRAMEWORK_EFI_IFR_FLAG_RESET_REQUIRED));\r
   \r
 \r
   return AppendToUpdateBuffer ((UINT8 *) &UOpcode, sizeof(UOpcode), UefiData);\r
@@ -328,7 +328,7 @@ F2UCreateOneOfOptionOpCode (
   // #define EFI_IFR_OPTION_DEFAULT 0x10\r
   // #define EFI_IFR_OPTION_DEFAULT_MFG 0x20\r
   //\r
-  UOpcode.Flags |= (UINT8) ((FwOpcode->Flags & (FRAMEWORK_EFI_IFR_FLAG_DEFAULT | FRAMEWORK_EFI_IFR_FLAG_MANUFACTURING)) << 4);\r
+  UOpcode.Flags = (UINT8) (UOpcode.Flags  | (FwOpcode->Flags & (FRAMEWORK_EFI_IFR_FLAG_DEFAULT | FRAMEWORK_EFI_IFR_FLAG_MANUFACTURING)) << 4);\r
 \r
   switch (Width) {\r
     case 1:\r
@@ -716,7 +716,7 @@ F2UCreateCheckBoxOpCode (
   //      FRAMEWORK_EFI_IFR_FLAG_RESET_REQUIRED,\r
   // to UEFI IFR Opcode Question flags. The rest flags are obsolete.\r
   //\r
-  UOpcode.Question.Flags  = (FwOpcode->Flags & (FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE | FRAMEWORK_EFI_IFR_FLAG_RESET_REQUIRED));\r
+  UOpcode.Question.Flags  = (UINT8) (FwOpcode->Flags & (FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE | FRAMEWORK_EFI_IFR_FLAG_RESET_REQUIRED));\r
 \r
   //\r
   // We also map 2 flags:\r
@@ -724,7 +724,7 @@ F2UCreateCheckBoxOpCode (
   //      FRAMEWORK_EFI_IFR_FLAG_MANUFACTURING,\r
   // to UEFI IFR CheckBox Opcode default flags.\r
   //\r
-  UOpcode.Flags           = (FwOpcode->Flags & (FRAMEWORK_EFI_IFR_FLAG_DEFAULT | FRAMEWORK_EFI_IFR_FLAG_MANUFACTURING));\r
+  UOpcode.Flags           = (UINT8) (FwOpcode->Flags & (FRAMEWORK_EFI_IFR_FLAG_DEFAULT | FRAMEWORK_EFI_IFR_FLAG_MANUFACTURING));\r
 \r
   return AppendToUpdateBuffer ((UINT8 *) &UOpcode, sizeof(UOpcode), UefiData);\r
 }\r
@@ -830,7 +830,7 @@ F2UCreateNumericOpCode (
   UOpcode.Question.VarStoreId    = VarStoreId;\r
   UOpcode.Question.VarStoreInfo.VarOffset = FwOpcode->QuestionId;\r
 \r
-  UOpcode.Question.Flags  = (FwOpcode->Flags & (FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE | FRAMEWORK_EFI_IFR_FLAG_RESET_REQUIRED));\r
+  UOpcode.Question.Flags  = (UINT8) (FwOpcode->Flags & (FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE | FRAMEWORK_EFI_IFR_FLAG_RESET_REQUIRED));\r
 \r
   //\r
   // Framework Numeric values are all in UINT16 and displayed as decimal.\r
@@ -961,7 +961,7 @@ F2UCreateStringOpCode (
   UOpcode.Question.VarStoreId    = FRAMEWORK_RESERVED_VARSTORE_ID;\r
   UOpcode.Question.VarStoreInfo.VarOffset = FwOpcode->QuestionId;\r
 \r
-  UOpcode.Question.Flags  = (FwOpcode->Flags & (FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE | FRAMEWORK_EFI_IFR_FLAG_RESET_REQUIRED));\r
+  UOpcode.Question.Flags  = (UINT8) (FwOpcode->Flags & (FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE | FRAMEWORK_EFI_IFR_FLAG_RESET_REQUIRED));\r
 \r
   UOpcode.MinSize = FwOpcode->MinSize;\r
   UOpcode.MaxSize = FwOpcode->MaxSize;\r

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Strings.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Strings.c
index 5c499392fe272eea8e7af271a5b0dcee3d2a20d2..792b57f252ce3105b61a83f9127f3b0f51487a43 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Strings.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Strings.c
@@ -38,7 +38,7 @@ ConvertIso639ToRfc3066 (
        if (AsciiLanguage [Index] == 0) {\r
                break;\r
        } else if (AsciiLanguage [Index] >= 'A' && AsciiLanguage [Index] <= 'Z') {\r
-               AsciiLanguage [Index] = AsciiLanguage [Index] - 'A' + 'a';\r
+               AsciiLanguage [Index] = (CHAR8) (AsciiLanguage [Index] - 'A' + 'a');\r
        }\r
   }\r
 \r

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrDefault.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrDefault.c
index d89b8155e0b7d8a9d33e43e270d6cf8e34ad0392..c8262f6adbabdccb5b06a08c91a73861f61ef124 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrDefault.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrDefault.c
@@ -339,6 +339,7 @@ GetBufferTypeDefaultId (
 \r
     if (Storage->Type == EFI_HII_VARSTORE_BUFFER) {\r
       Status = GetBufferTypeDefaultIdAndStorageId (DefaultStore, Storage, FormSet, UefiDefaultsListHead);\r
+      ASSERT_EFI_ERROR (Status);\r
     }\r
 \r
     StorageLink = GetNextNode (&FormSet->StorageListHead, StorageLink);\r

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrParser.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrParser.c
index aacba8d416962310335b43db6372d3bceccea92e..32c40f8a14127b85adf59003bb607d9a6cbf30f2 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrParser.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrParser.c
@@ -509,13 +509,6 @@ ParseOpCodes (
   UINT16                  NumberOfStatement;\r
   UINT16                  NumberOfExpression;\r
   EFI_IMAGE_ID            *ImageId;\r
-  BOOLEAN                 SuppressForOption;\r
-  BOOLEAN                 InScopeOptionSuppress;\r
-  BOOLEAN                 InScopeDisable;\r
-  UINT16                  DepthOfDisable;\r
-  BOOLEAN                 OpCodeDisabled;\r
-  BOOLEAN                 SingleOpCodeExpression;\r
-  BOOLEAN                 InScopeDefault;\r
   EFI_HII_VALUE           *Value;\r
   LIST_ENTRY              *OneOfOptinMapEntryListHead;\r
   EFI_IFR_GUID_OPTIONKEY  *OptionMap;\r
@@ -525,15 +518,8 @@ ParseOpCodes (
   EFI_IFR_ONE_OF          *OneOfOpcode;\r
 \r
   mInScopeSubtitle         = FALSE;\r
-  SuppressForOption        = FALSE;\r
   mInScopeSuppress         = FALSE;\r
-  InScopeOptionSuppress    = FALSE;\r
   mInScopeGrayOut          = FALSE;\r
-  InScopeDisable           = FALSE;\r
-  DepthOfDisable           = 0;\r
-  OpCodeDisabled           = FALSE;\r
-  SingleOpCodeExpression   = FALSE;\r
-  InScopeDefault           = FALSE;\r
   CurrentDefault           = NULL;\r
   CurrentOption            = NULL;\r
 \r
@@ -580,31 +566,6 @@ ParseOpCodes (
       PushScope (Operand);\r
     }\r
 \r
-    if (OpCodeDisabled) {\r
-      //\r
-      // DisableIf Expression is evaluated to be TRUE, try to find its end.\r
-      // Here only cares the EFI_IFR_DISABLE_IF and EFI_IFR_END\r
-      //\r
-      if (Operand == EFI_IFR_DISABLE_IF_OP) {\r
-        DepthOfDisable++;\r
-      } else if (Operand == EFI_IFR_END_OP) {\r
-        Status = PopScope (&ScopeOpCode);\r
-        if (EFI_ERROR (Status)) {\r
-          return Status;\r
-        }\r
-\r
-        if (ScopeOpCode == EFI_IFR_DISABLE_IF_OP) {\r
-          if (DepthOfDisable == 0) {\r
-            InScopeDisable = FALSE;\r
-            OpCodeDisabled = FALSE;\r
-          } else {\r
-            DepthOfDisable--;\r
-          }\r
-        }\r
-      }\r
-      continue;\r
-    }\r
-\r
     if (IsExpressionOpCode (Operand)) {\r
       continue;\r
     }\r
@@ -801,13 +762,9 @@ ParseOpCodes (
         break;\r
       }\r
 \r
-      if ((Operand == EFI_IFR_ONE_OF_OP) && Scope) {\r
-        SuppressForOption = TRUE;\r
-      }\r
-\r
       if (Operand == EFI_IFR_ONE_OF_OP) {\r
         OneOfOpcode = (EFI_IFR_ONE_OF *) OpCodeData;\r
-        OneOfType   = OneOfOpcode->Flags & EFI_IFR_NUMERIC_SIZE;\r
+        OneOfType   = (UINT8) (OneOfOpcode->Flags & EFI_IFR_NUMERIC_SIZE);\r
       }\r
       break;\r
 \r
@@ -826,9 +783,6 @@ ParseOpCodes (
       CurrentStatement->HiiValue.Type = EFI_IFR_TYPE_OTHER;\r
       CurrentStatement->BufferValue = AllocateZeroPool (CurrentStatement->StorageWidth);\r
 \r
-      if (Scope) {\r
-        SuppressForOption = TRUE;\r
-      }\r
       break;\r
 \r
     case EFI_IFR_CHECKBOX_OP:\r
@@ -913,9 +867,6 @@ ParseOpCodes (
       //\r
       InsertTailList (&CurrentStatement->DefaultListHead, &CurrentDefault->Link);\r
 \r
-      if (Scope) {\r
-        InScopeDefault = TRUE;\r
-      }\r
       break;\r
 \r
     //\r
@@ -1110,32 +1061,10 @@ ParseOpCodes (
         //\r
         break;\r
 \r
-      case EFI_IFR_SUPPRESS_IF_OP:\r
-        if (SuppressForOption) {\r
-          InScopeOptionSuppress = FALSE;\r
-        } else {\r
-          mInScopeSuppress = FALSE;\r
-        }\r
-        break;\r
-\r
       case EFI_IFR_GRAY_OUT_IF_OP:\r
         mInScopeGrayOut = FALSE;\r
         break;\r
 \r
-      case EFI_IFR_DISABLE_IF_OP:\r
-        InScopeDisable = FALSE;\r
-        OpCodeDisabled = FALSE;\r
-        break;\r
-\r
-      case EFI_IFR_ONE_OF_OP:\r
-      case EFI_IFR_ORDERED_LIST_OP:\r
-        SuppressForOption = FALSE;\r
-        break;\r
-\r
-      case EFI_IFR_DEFAULT_OP:\r
-        InScopeDefault = FALSE;\r
-        break;\r
-\r
       default:\r
         if (IsExpressionOpCode (ScopeOpCode)) {\r
         }\r

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Utility.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Utility.c
index 8220c198dfda12b5d44a5a5db326d4af4feee9cc..48a133da63c6e083438418fa952af198083398fe 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Utility.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Utility.c
@@ -411,7 +411,6 @@ GetFormsetDefaultVarstoreId (
 {\r
   LIST_ENTRY             *StorageList;\r
   FORMSET_STORAGE        *Storage;\r
-  EFI_VARSTORE_ID        FirstVarStoreId;\r
 \r
   //\r
   // VarStoreId 0 is invalid in UEFI IFR.\r
@@ -436,7 +435,7 @@ GetFormsetDefaultVarstoreId (
     StorageList = GetFirstNode (&FormSet->StorageListHead);\r
     if (!IsNull (&FormSet->StorageListHead, StorageList)) {\r
       Storage = FORMSET_STORAGE_FROM_LINK (StorageList);\r
-      FirstVarStoreId = Storage->VarStoreId;\r
+      FormSet->DefaultVarStoreId = Storage->VarStoreId;\r
     }\r
     \r
   }\r