BaseTools: DataType - cleanup list constants

[mirror_edk2.git] / BaseTools / Source / Python / AutoGen / GenC.py

diff --git a/BaseTools/Source/Python/AutoGen/GenC.py b/BaseTools/Source/Python/AutoGen/GenC.py
index 89cf8e5b8b0c2c766cb227c2e8607032f5928c10..806983cb8b91640abec1087d6e32e2c6f00e55f7 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/GenC.py
+++ b/BaseTools/Source/Python/AutoGen/GenC.py
@@ -41,11 +41,6 @@ gItemTypeStringDatabase  = {
     TAB_PCDS_DYNAMIC_EX_HII     :   '',\r
 }\r
 \r
-## Dynamic PCD types\r
-gDynamicPcd = [TAB_PCDS_DYNAMIC, TAB_PCDS_DYNAMIC_DEFAULT, TAB_PCDS_DYNAMIC_VPD, TAB_PCDS_DYNAMIC_HII]\r
-\r
-## Dynamic-ex PCD types\r
-gDynamicExPcd = [TAB_PCDS_DYNAMIC_EX, TAB_PCDS_DYNAMIC_EX_DEFAULT, TAB_PCDS_DYNAMIC_EX_VPD, TAB_PCDS_DYNAMIC_EX_HII]\r
 \r
 ## Datum size\r
 gDatumSizeStringDatabase = {TAB_UINT8:'8',TAB_UINT16:'16',TAB_UINT32:'32',TAB_UINT64:'64','BOOLEAN':'BOOLEAN',TAB_VOID:'8'}\r
@@ -802,7 +797,7 @@ def DynExPcdTokenNumberMapping(Info, AutoGenH):
     # Even it is the Library, the PCD is saved in the ModulePcdList\r
     PcdList = Info.ModulePcdList\r
     for Pcd in PcdList:\r
-        if Pcd.Type in gDynamicExPcd:\r
+        if Pcd.Type in PCD_DYNAMIC_EX_TYPE_SET:\r
             ExTokenCNameList.append(Pcd.TokenCName)\r
             PcdExList.append(Pcd)\r
     if len(ExTokenCNameList) == 0:\r
@@ -848,7 +843,7 @@ def DynExPcdTokenNumberMapping(Info, AutoGenH):
                 if (Pcd.TokenCName, Pcd.TokenSpaceGuidCName) in GlobalData.MixedPcd[PcdItem]:\r
                     RealTokenCName = PcdItem[0]\r
                     break\r
-            if Pcd.Type in gDynamicExPcd and Pcd.TokenCName == TokenCName:\r
+            if Pcd.Type in PCD_DYNAMIC_EX_TYPE_SET and Pcd.TokenCName == TokenCName:\r
                 Index = Index + 1\r
                 if Index == 1:\r
                     AutoGenH.Append('\n#define __PCD_%s_VAL_CMP(GuidPtr)  (' % (RealTokenCName))\r
@@ -921,7 +916,7 @@ def CreateModulePcdCode(Info, AutoGenC, AutoGenH, Pcd):
     if Pcd.PcdValueFromComm:\r
         Pcd.DefaultValue = Pcd.PcdValueFromComm\r
     \r
-    if Pcd.Type in gDynamicExPcd:\r
+    if Pcd.Type in PCD_DYNAMIC_EX_TYPE_SET:\r
         TokenNumber = int(Pcd.TokenValue, 0)\r
         # Add TokenSpaceGuidValue value to PcdTokenName to discriminate the DynamicEx PCDs with \r
         # different Guids but same TokenCName\r
@@ -937,7 +932,7 @@ def CreateModulePcdCode(Info, AutoGenC, AutoGenH, Pcd):
             # will not be added into the Database unless it is used by other modules that are \r
             # included in the FDF file. \r
             # In this case, just assign an invalid token number to make it pass build.\r
-            if Pcd.Type in PCD_DYNAMIC_TYPE_LIST:\r
+            if Pcd.Type in PCD_DYNAMIC_TYPE_SET:\r
                 TokenNumber = 0\r
             else:\r
                 EdkLogger.error("build", AUTOGEN_ERROR,\r
@@ -960,14 +955,14 @@ def CreateModulePcdCode(Info, AutoGenC, AutoGenH, Pcd):
     SetModeStatusName = '_PCD_SET_MODE_' + gDatumSizeStringDatabaseH[Pcd.DatumType] + '_S_' + TokenCName if Pcd.DatumType in gDatumSizeStringDatabaseH else '_PCD_SET_MODE_' + gDatumSizeStringDatabaseH[TAB_VOID] + '_S_' + TokenCName\r
     GetModeSizeName = '_PCD_GET_MODE_SIZE' + '_' + TokenCName\r
     \r
-    if Pcd.Type in gDynamicExPcd:\r
+    if Pcd.Type in PCD_DYNAMIC_EX_TYPE_SET:\r
         if Info.IsLibrary:\r
             PcdList = Info.LibraryPcdList\r
         else:\r
             PcdList = Info.ModulePcdList\r
         PcdExCNameTest = 0\r
         for PcdModule in PcdList:\r
-            if PcdModule.Type in gDynamicExPcd and Pcd.TokenCName == PcdModule.TokenCName:\r
+            if PcdModule.Type in PCD_DYNAMIC_EX_TYPE_SET and Pcd.TokenCName == PcdModule.TokenCName:\r
                 PcdExCNameTest += 1\r
             # get out early once we found > 1...\r
             if PcdExCNameTest > 1:\r
@@ -996,10 +991,10 @@ def CreateModulePcdCode(Info, AutoGenC, AutoGenH, Pcd):
             else:\r
                 AutoGenH.Append('#define %s(Value)  LibPcdSetEx%s(&%s, %s, (Value))\n' % (SetModeName, DatumSizeLib, Pcd.TokenSpaceGuidCName, PcdTokenName))\r
                 AutoGenH.Append('#define %s(Value)  LibPcdSetEx%sS(&%s, %s, (Value))\n' % (SetModeStatusName, DatumSizeLib, Pcd.TokenSpaceGuidCName, PcdTokenName))\r
-    elif Pcd.Type in gDynamicPcd:\r
+    elif Pcd.Type in PCD_DYNAMIC_TYPE_SET:\r
         PcdCNameTest = 0\r
         for PcdModule in Info.LibraryPcdList + Info.ModulePcdList:\r
-            if PcdModule.Type in gDynamicPcd and Pcd.TokenCName == PcdModule.TokenCName:\r
+            if PcdModule.Type in PCD_DYNAMIC_TYPE_SET and Pcd.TokenCName == PcdModule.TokenCName:\r
                 PcdCNameTest += 1\r
             # get out early once we found > 1...\r
             if PcdCNameTest > 1:\r
@@ -1225,7 +1220,7 @@ def CreateLibraryPcdCode(Info, AutoGenC, AutoGenH, Pcd):
     #\r
     # Write PCDs\r
     #\r
-    if Pcd.Type in gDynamicExPcd:\r
+    if Pcd.Type in PCD_DYNAMIC_EX_TYPE_SET:\r
         TokenNumber = int(Pcd.TokenValue, 0)\r
     else:\r
         if (Pcd.TokenCName, Pcd.TokenSpaceGuidCName) not in PcdTokenNumber:\r
@@ -1237,7 +1232,7 @@ def CreateLibraryPcdCode(Info, AutoGenC, AutoGenH, Pcd):
             # will not be added into the Database unless it is used by other modules that are \r
             # included in the FDF file. \r
             # In this case, just assign an invalid token number to make it pass build.\r
-            if Pcd.Type in PCD_DYNAMIC_TYPE_LIST:\r
+            if Pcd.Type in PCD_DYNAMIC_TYPE_SET:\r
                 TokenNumber = 0\r
             else:\r
                 EdkLogger.error("build", AUTOGEN_ERROR,\r
@@ -1266,7 +1261,7 @@ def CreateLibraryPcdCode(Info, AutoGenC, AutoGenH, Pcd):
             Type = '(VOID *)'\r
         Array = '[]'\r
     PcdItemType = Pcd.Type\r
-    if PcdItemType in gDynamicExPcd:\r
+    if PcdItemType in PCD_DYNAMIC_EX_TYPE_SET:\r
         PcdExTokenName = '_PCD_TOKEN_' + TokenSpaceGuidCName + '_' + TokenCName\r
         AutoGenH.Append('\n#define %s  %dU\n' % (PcdExTokenName, TokenNumber))\r
         \r
@@ -1276,7 +1271,7 @@ def CreateLibraryPcdCode(Info, AutoGenC, AutoGenH, Pcd):
             PcdList = Info.ModulePcdList\r
         PcdExCNameTest = 0\r
         for PcdModule in PcdList:\r
-            if PcdModule.Type in gDynamicExPcd and Pcd.TokenCName == PcdModule.TokenCName:\r
+            if PcdModule.Type in PCD_DYNAMIC_EX_TYPE_SET and Pcd.TokenCName == PcdModule.TokenCName:\r
                 PcdExCNameTest += 1\r
             # get out early once we found > 1...\r
             if PcdExCNameTest > 1:\r
@@ -1307,13 +1302,13 @@ def CreateLibraryPcdCode(Info, AutoGenC, AutoGenH, Pcd):
                 AutoGenH.Append('#define %s(Value)  LibPcdSetEx%sS(&%s, %s, (Value))\n' % (SetModeStatusName, DatumSizeLib, Pcd.TokenSpaceGuidCName, PcdTokenName))\r
     else:\r
         AutoGenH.Append('#define _PCD_TOKEN_%s  %dU\n' % (TokenCName, TokenNumber))\r
-    if PcdItemType in gDynamicPcd:\r
+    if PcdItemType in PCD_DYNAMIC_TYPE_SET:\r
         PcdList = []\r
         PcdCNameList = []\r
         PcdList.extend(Info.LibraryPcdList)\r
         PcdList.extend(Info.ModulePcdList)\r
         for PcdModule in PcdList:\r
-            if PcdModule.Type in gDynamicPcd:\r
+            if PcdModule.Type in PCD_DYNAMIC_TYPE_SET:\r
                 PcdCNameList.append(PcdModule.TokenCName)\r
         if PcdCNameList.count(Pcd.TokenCName) > 1:\r
             EdkLogger.error("build", AUTOGEN_ERROR, "More than one Dynamic Pcds [%s] are different Guids but same CName.They need to be changed to DynamicEx type to avoid the confliction.\n" % (TokenCName), ExtraData="[%s]" % str(Info.MetaFile.Path))\r
@@ -1693,7 +1688,7 @@ def CreatePcdCode(Info, AutoGenC, AutoGenH):
     # Collect Token Space GUIDs used by DynamicEc PCDs\r
     TokenSpaceList = []\r
     for Pcd in Info.ModulePcdList:\r
-        if Pcd.Type in gDynamicExPcd and Pcd.TokenSpaceGuidCName not in TokenSpaceList:\r
+        if Pcd.Type in PCD_DYNAMIC_EX_TYPE_SET and Pcd.TokenSpaceGuidCName not in TokenSpaceList:\r
             TokenSpaceList += [Pcd.TokenSpaceGuidCName]\r
             \r
     SkuMgr = Info.Workspace.Platform.SkuIdMgr\r