set default value of PCD from msa file or spd file.

[mirror_edk2.git] / Tools / Source / FrameworkWizard / src / org / tianocore / frameworkwizard / platform / ui / FpdFileContents.java

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java
index e0a0137ef79988474b007c8d2c1525b5aeafa348..d942addf50adb966217dd3d720eacee22bc62e58 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java
@@ -906,6 +906,21 @@ public class FpdFileContents {
         fpdPcd.setTokenSpaceGuidCName(tsGuid);\r
         fpdPcd.setDatumType(PcdDataTypes.Enum.forString(dataType));\r
         fpdPcd.setItemType(PcdItemTypes.Enum.forString(itemType));\r
         fpdPcd.setTokenSpaceGuidCName(tsGuid);\r
         fpdPcd.setDatumType(PcdDataTypes.Enum.forString(dataType));\r
         fpdPcd.setItemType(PcdItemTypes.Enum.forString(itemType));\r

+        \r
+        if (defaultVal != null){\r
+            fpdPcd.setValue(defaultVal);\r
+        }\r
+        else {\r
+            if (dataType.equals("UINT8") || dataType.equals("UINT16") || dataType.equals("UINT32") || dataType.equals("UINT64")) {\r
+                fpdPcd.setValue("0");\r
+            }\r
+            if (dataType.equals("BOOLEAN")){\r
+                fpdPcd.setValue("false");\r
+            }\r
+            if (dataType.equals("VOID*")) {\r
+                fpdPcd.setValue("");\r
+            }\r
+        }\r

         if (dataType.equals("UINT8")){\r
             fpdPcd.setMaxDatumSize(1);\r
         }\r
         if (dataType.equals("UINT8")){\r
             fpdPcd.setMaxDatumSize(1);\r
         }\r


@@ -926,6 +941,7 @@ public class FpdFileContents {
             fpdPcd.setMaxDatumSize(maxSize);\r
         }\r
         \r
             fpdPcd.setMaxDatumSize(maxSize);\r
         }\r
         \r

+        \r

         if (itemType.equals("DYNAMIC") || itemType.equals("DYNAMIC_EX")) {\r
             ArrayList<String> al = LookupDynamicPcdBuildDefinition(cName + " " + tsGuid);\r
             //\r
         if (itemType.equals("DYNAMIC") || itemType.equals("DYNAMIC_EX")) {\r
             ArrayList<String> al = LookupDynamicPcdBuildDefinition(cName + " " + tsGuid);\r
             //\r


@@ -937,6 +953,7 @@ public class FpdFileContents {
             }\r
         }\r
         else {\r
             }\r
         }\r
         else {\r

+            /*\r

             if (defaultVal != null){\r
                 fpdPcd.setValue(defaultVal);\r
             }\r
             if (defaultVal != null){\r
                 fpdPcd.setValue(defaultVal);\r
             }\r


@@ -951,7 +968,7 @@ public class FpdFileContents {
                     fpdPcd.setValue("");\r
                 }\r
             }\r
                     fpdPcd.setValue("");\r
                 }\r
             }\r

-            /*\r
+            \r

             if (dataType.equals("UINT8")){\r
                 fpdPcd.setMaxDatumSize(1);\r
             }\r
             if (dataType.equals("UINT8")){\r
                 fpdPcd.setMaxDatumSize(1);\r
             }\r