BaseTools: replace string constants used for module types

replace raw strings in the code (note: except UPT) with constants.
SUP_MODULE_BASE was 'BASE'
SUP_MODULE_SEC was 'SEC'
SUP_MODULE_PEI_CORE was 'PEI_CORE'
SUP_MODULE_PEIM was 'PEIM'
SUP_MODULE_DXE_CORE was 'DXE_CORE'
SUP_MODULE_DXE_DRIVER was 'DXE_DRIVER'
SUP_MODULE_DXE_RUNTIME_DRIVER was 'DXE_RUNTIME_DRIVER'
SUP_MODULE_DXE_SAL_DRIVER was 'DXE_SAL_DRIVER'
SUP_MODULE_DXE_SMM_DRIVER was 'DXE_SMM_DRIVER'
SUP_MODULE_UEFI_DRIVER was 'UEFI_DRIVER'
SUP_MODULE_UEFI_APPLICATION was 'UEFI_APPLICATION'
SUP_MODULE_USER_DEFINED was 'USER_DEFINED'
SUP_MODULE_SMM_CORE was 'SMM_CORE'
SUP_MODULE_MM_STANDALONE was 'MM_STANDALONE'
SUP_MODULE_MM_CORE_STANDALONE was 'MM_CORE_STANDALONE'

Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jaben Carsey <jaben.carsey@intel.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>

1 files changed, 17 insertions, 16 deletions

diff --git a/BaseTools/Source/Python/AutoGen/GenDepex.py b/BaseTools/Source/Python/AutoGen/GenDepex.py
index 9acea8f6bf..100f1250b3 100644
--- a/BaseTools/Source/Python/AutoGen/GenDepex.py
+++ b/BaseTools/Source/Python/AutoGen/GenDepex.py
@@ -24,26 +24,27 @@ from Common.Misc import SaveFileOnChange
 from Common.Misc import GuidStructureStringToGuidString

 from Common import EdkLogger as EdkLogger

 from Common.BuildVersion import gBUILD_VERSION

+from Common.DataType import *

 

 ## Regular expression for matching "DEPENDENCY_START ... DEPENDENCY_END"

 gStartClosePattern = re.compile(".*DEPENDENCY_START(.+)DEPENDENCY_END.*", re.S)

 

 ## Mapping between module type and EFI phase

 gType2Phase = {

-    "BASE"              :   None,

-    "SEC"               :   "PEI",

-    "PEI_CORE"          :   "PEI",

-    "PEIM"              :   "PEI",

-    "DXE_CORE"          :   "DXE",

-    "DXE_DRIVER"        :   "DXE",

-    "DXE_SMM_DRIVER"    :   "DXE",

-    "DXE_RUNTIME_DRIVER":   "DXE",

-    "DXE_SAL_DRIVER"    :   "DXE",

-    "UEFI_DRIVER"       :   "DXE",

-    "UEFI_APPLICATION"  :   "DXE",

-    "SMM_CORE"          :   "DXE",

-    "MM_STANDALONE"     :   "MM",

-    "MM_CORE_STANDALONE" :  "MM",

+    SUP_MODULE_BASE              :   None,

+    SUP_MODULE_SEC               :   "PEI",

+    SUP_MODULE_PEI_CORE          :   "PEI",

+    SUP_MODULE_PEIM              :   "PEI",

+    SUP_MODULE_DXE_CORE          :   "DXE",

+    SUP_MODULE_DXE_DRIVER        :   "DXE",

+    SUP_MODULE_DXE_SMM_DRIVER    :   "DXE",

+    SUP_MODULE_DXE_RUNTIME_DRIVER:   "DXE",

+    SUP_MODULE_DXE_SAL_DRIVER    :   "DXE",

+    SUP_MODULE_UEFI_DRIVER       :   "DXE",

+    SUP_MODULE_UEFI_APPLICATION  :   "DXE",

+    SUP_MODULE_SMM_CORE          :   "DXE",

+    SUP_MODULE_MM_STANDALONE     :   "MM",

+    SUP_MODULE_MM_CORE_STANDALONE :  "MM",

 }

 

 ## Convert dependency expression string into EFI internal representation

@@ -299,12 +300,12 @@ class DependencyExpression:
             NewOperand.append(Token)

 

         # don't generate depex if only TRUE operand left

-        if self.ModuleType == 'PEIM' and len(NewOperand) == 1 and NewOperand[0] == 'TRUE':

+        if self.ModuleType == SUP_MODULE_PEIM and len(NewOperand) == 1 and NewOperand[0] == 'TRUE':

             self.PostfixNotation = []

             return

 

         # don't generate depex if all operands are architecture protocols

-        if self.ModuleType in ['UEFI_DRIVER', 'DXE_DRIVER', 'DXE_RUNTIME_DRIVER', 'DXE_SAL_DRIVER', 'DXE_SMM_DRIVER', 'MM_STANDALONE'] and \

+        if self.ModuleType in [SUP_MODULE_UEFI_DRIVER, SUP_MODULE_DXE_DRIVER, SUP_MODULE_DXE_RUNTIME_DRIVER, SUP_MODULE_DXE_SAL_DRIVER, SUP_MODULE_DXE_SMM_DRIVER, SUP_MODULE_MM_STANDALONE] and \

            Op == 'AND' and \

            self.ArchProtocols == set([GuidStructureStringToGuidString(Guid) for Guid in AllOperand]):

             self.PostfixNotation = []