Clean DriverSampleDxe for ICC build.

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

diff --git a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c
index bfa89f1d01ba418dee0fb6d59d5d9948c3357e1d..64805ff83df10dc4b7880ceba95288d9487cdd0a 100644 (file)
--- a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c
+++ b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c
@@ -518,31 +518,31 @@ DriverCallback (
                       &PrivateData->Configuration\r
                       );\r
       CreateOneOfOpCode (\r
                       &PrivateData->Configuration\r
                       );\r
       CreateOneOfOpCode (\r

-        0x8001,                           // Question ID (or call it "key")\r
-        CONFIGURATION_VARSTORE_ID,        // VarStore ID\r
-        DYNAMIC_ONE_OF_VAR_OFFSET,        // Offset in Buffer Storage\r
-        STRING_TOKEN (STR_ONE_OF_PROMPT), // Question prompt text\r
-        STRING_TOKEN (STR_ONE_OF_HELP),   // Question help text\r
-        EFI_IFR_FLAG_CALLBACK,            // Question flag\r
-        EFI_IFR_NUMERIC_SIZE_1,           // Data type of Question Value\r
-        IfrOptionList,                    // Option list\r
-        2,                                // Number of options in Option list\r
-        &UpdateData                       // Container for dynamic created opcodes\r
+        0x8001,                                    // Question ID (or call it "key")\r
+        CONFIGURATION_VARSTORE_ID,                 // VarStore ID\r
+        (UINT16) DYNAMIC_ONE_OF_VAR_OFFSET,        // Offset in Buffer Storage\r
+        STRING_TOKEN (STR_ONE_OF_PROMPT),          // Question prompt text\r
+        STRING_TOKEN (STR_ONE_OF_HELP),            // Question help text\r
+        EFI_IFR_FLAG_CALLBACK,                     // Question flag\r
+        EFI_IFR_NUMERIC_SIZE_1,                    // Data type of Question Value\r
+        IfrOptionList,                             // Option list\r
+        2,                                         // Number of options in Option list\r
+        &UpdateData                                // Container for dynamic created opcodes\r

         );\r
     \r
       CreateOrderedListOpCode (\r
         );\r
     \r
       CreateOrderedListOpCode (\r

-        0x8002,                           // Question ID\r
-        CONFIGURATION_VARSTORE_ID,        // VarStore ID\r
-        DYNAMIC_ORDERED_LIST_VAR_OFFSET,  // Offset in Buffer Storage\r
-        STRING_TOKEN (STR_BOOT_OPTIONS),  // Question prompt text\r
-        STRING_TOKEN (STR_BOOT_OPTIONS),  // Question help text\r
-        EFI_IFR_FLAG_RESET_REQUIRED,      // Question flag\r
-        0,                                // Ordered list flag, e.g. EFI_IFR_UNIQUE_SET\r
-        EFI_IFR_NUMERIC_SIZE_1,           // Data type of Question value\r
-        5,                                // Maximum container\r
-        IfrOptionList,                    // Option list\r
-        2,                                // Number of options in Option list\r
-        &UpdateData                       // Container for dynamic created opcodes\r
+        0x8002,                                    // Question ID\r
+        CONFIGURATION_VARSTORE_ID,                 // VarStore ID\r
+        (UINT16) DYNAMIC_ORDERED_LIST_VAR_OFFSET,  // Offset in Buffer Storage\r
+        STRING_TOKEN (STR_BOOT_OPTIONS),           // Question prompt text\r
+        STRING_TOKEN (STR_BOOT_OPTIONS),           // Question help text\r
+        EFI_IFR_FLAG_RESET_REQUIRED,               // Question flag\r
+        0,                                         // Ordered list flag, e.g. EFI_IFR_UNIQUE_SET\r
+        EFI_IFR_NUMERIC_SIZE_1,                    // Data type of Question value\r
+        5,                                         // Maximum container\r
+        IfrOptionList,                             // Option list\r
+        2,                                         // Number of options in Option list\r
+        &UpdateData                                // Container for dynamic created opcodes\r

         );\r
     \r
       CreateGotoOpCode (\r
         );\r
     \r
       CreateGotoOpCode (\r