BaseTools: Clean up source files

1. Do not use tab characters
2. No trailing white space in one line
3. All files must end with CRLF

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

1 files changed, 98 insertions, 98 deletions

diff --git a/BaseTools/Source/Python/AutoGen/GenPcdDb.py b/BaseTools/Source/Python/AutoGen/GenPcdDb.py
index 9fcd7fcc97..c90b814e7d 100644
--- a/BaseTools/Source/Python/AutoGen/GenPcdDb.py
+++ b/BaseTools/Source/Python/AutoGen/GenPcdDb.py
@@ -182,10 +182,10 @@ typedef struct {
   //UINT32                UninitDataBaseSize;// Total size for PCD those default value with 0.

   //TABLE_OFFSET          LocalTokenNumberTableOffset;

   //TABLE_OFFSET          ExMapTableOffset;

-  //TABLE_OFFSET          GuidTableOffset;     

+  //TABLE_OFFSET          GuidTableOffset;

   //TABLE_OFFSET          StringTableOffset;

   //TABLE_OFFSET          SizeTableOffset;

-  //TABLE_OFFSET          SkuIdTableOffset; 

+  //TABLE_OFFSET          SkuIdTableOffset;

   //TABLE_OFFSET          PcdNameTableOffset;

   //UINT16                LocalTokenCount;  // LOCAL_TOKEN_NUMBER for all

   //UINT16                ExTokenCount;     // EX_TOKEN_NUMBER for DynamicEx

@@ -237,11 +237,11 @@ ${PHASE}_PCD_DATABASE_INIT g${PHASE}PcdDbInit = {
 

 ## DbItemList

 #

-#  The class holds the Pcd database items. ItemSize if not zero should match the item datum type in the C structure. 

+#  The class holds the Pcd database items. ItemSize if not zero should match the item datum type in the C structure.

 #  When the structure is changed, remember to check the ItemSize and the related  PackStr in PackData()

-#  RawDataList is the RawData that may need some kind of calculation or transformation, 

+#  RawDataList is the RawData that may need some kind of calculation or transformation,

 #  the DataList corresponds to the data that need to be written to database. If DataList is not present, then RawDataList

-#  will be written to the database. 

+#  will be written to the database.

 #

 class DbItemList:

     def __init__(self, ItemSize, DataList=None, RawDataList=None):

@@ -309,7 +309,7 @@ class DbItemList:
 

 ## DbExMapTblItemList

 #

-#  The class holds the ExMap table 

+#  The class holds the ExMap table

 #

 class DbExMapTblItemList (DbItemList):

     def __init__(self, ItemSize, DataList=None, RawDataList=None):

@@ -319,15 +319,15 @@ class DbExMapTblItemList (DbItemList):
         Buffer = ''

         PackStr = "=LHH"

         for Datas in self.RawDataList:

-            Buffer += pack(PackStr, 

+            Buffer += pack(PackStr,

                            GetIntegerValue(Datas[0]),

                            GetIntegerValue(Datas[1]),

-                           GetIntegerValue(Datas[2]))      

+                           GetIntegerValue(Datas[2]))

         return Buffer

 

 ## DbComItemList

 #

-# The DbComItemList is a special kind of DbItemList in case that the size of the List can not be computed by the 

+# The DbComItemList is a special kind of DbItemList in case that the size of the List can not be computed by the

 # ItemSize multiply the ItemCount.

 #

 class DbComItemList (DbItemList):

@@ -345,7 +345,7 @@ class DbComItemList (DbItemList):
         else:

             assert(Index < len(self.RawDataList))

             for ItemIndex in xrange(Index):

-                Offset += len(self.RawDataList[ItemIndex]) * self.ItemSize         

+                Offset += len(self.RawDataList[ItemIndex]) * self.ItemSize

 

         return Offset

 

@@ -373,12 +373,12 @@ class DbComItemList (DbItemList):
                         Buffer += pack(PackStr, GetIntegerValue(SingleData))

                 else:

                     Buffer += pack(PackStr, GetIntegerValue(Data))

-        

+

         return Buffer

 

 ## DbVariableTableItemList

 #

-#  The class holds the Variable header value table 

+#  The class holds the Variable header value table

 #

 class DbVariableTableItemList (DbComItemList):

     def __init__(self, ItemSize, DataList=None, RawDataList=None):

@@ -389,7 +389,7 @@ class DbVariableTableItemList (DbComItemList):
         Buffer = ''

         for DataList in self.RawDataList:

             for Data in DataList:

-                Buffer += pack(PackStr, 

+                Buffer += pack(PackStr,

                                GetIntegerValue(Data[0]),

                                GetIntegerValue(Data[1]),

                                GetIntegerValue(Data[2]),

@@ -402,7 +402,7 @@ class DbVariableTableItemList (DbComItemList):
 class DbStringHeadTableItemList(DbItemList):

     def __init__(self,ItemSize,DataList=None,RawDataList=None):

         DbItemList.__init__(self, ItemSize, DataList, RawDataList)

-        

+

     def GetInterOffset(self, Index):

         Offset = 0

         if self.ItemSize == 0:

@@ -435,11 +435,11 @@ class DbStringHeadTableItemList(DbItemList):
                     self.ListSize += len(Datas) * self.ItemSize

                 else:

                     self.ListSize += self.ItemSize

-        return self.ListSize 

+        return self.ListSize

 

 ## DbSkuHeadTableItemList

 #

-#  The class holds the Sku header value table 

+#  The class holds the Sku header value table

 #

 class DbSkuHeadTableItemList (DbItemList):

     def __init__(self, ItemSize, DataList=None, RawDataList=None):

@@ -449,14 +449,14 @@ class DbSkuHeadTableItemList (DbItemList):
         PackStr = "=LL"

         Buffer = ''

         for Data in self.RawDataList:

-            Buffer += pack(PackStr, 

+            Buffer += pack(PackStr,

                            GetIntegerValue(Data[0]),

                            GetIntegerValue(Data[1]))

         return Buffer

 

 ## DbSizeTableItemList

 #

-#  The class holds the size table 

+#  The class holds the size table

 #

 class DbSizeTableItemList (DbItemList):

     def __init__(self, ItemSize, DataList=None, RawDataList=None):

@@ -471,16 +471,16 @@ class DbSizeTableItemList (DbItemList):
         PackStr = "=H"

         Buffer = ''

         for Data in self.RawDataList:

-            Buffer += pack(PackStr, 

+            Buffer += pack(PackStr,

                            GetIntegerValue(Data[0]))

             for subData in Data[1]:

-                Buffer += pack(PackStr, 

+                Buffer += pack(PackStr,

                            GetIntegerValue(subData))

         return Buffer

 

 ## DbStringItemList

 #

-#  The class holds the string table 

+#  The class holds the string table

 #

 class DbStringItemList (DbComItemList):

     def __init__(self, ItemSize, DataList=None, RawDataList=None, LenList=None):

@@ -490,7 +490,7 @@ class DbStringItemList (DbComItemList):
             RawDataList = []

         if LenList is None:

             LenList = []

-             

+

         assert(len(RawDataList) == len(LenList))

         DataList = []

         # adjust DataList according to the LenList

@@ -549,7 +549,7 @@ def GetMatchedIndex(Key1, List1, Key2, List2):
             return Index

         else:

             StartPos = Index + 1

-    

+

     return -1

 

 

@@ -557,7 +557,7 @@ def GetMatchedIndex(Key1, List1, Key2, List2):
 # to List like [0x36, 0x00, 0x34, 0x00, 0x21, 0x00, 0x36, 0x00, 0x34, 0x00, 0x00, 0x00]

 #

 #   @param      StringArray A string array like {0x36, 0x00, 0x34, 0x00, 0x21, 0x00, 0x36, 0x00, 0x34, 0x00, 0x00, 0x00}

-#  

+#

 #   @retval                 A list object of integer items

 #

 def StringArrayToList(StringArray):

@@ -569,7 +569,7 @@ def StringArrayToList(StringArray):
 ## Convert TokenType String like  "PCD_DATUM_TYPE_UINT32 | PCD_TYPE_HII" to TokenType value

 #

 #   @param      TokenType  A TokenType string like "PCD_DATUM_TYPE_UINT32 | PCD_TYPE_HII"

-#  

+#

 #   @retval                A integer representation of the TokenType

 #

 def GetTokenTypeValue(TokenType):

@@ -596,7 +596,7 @@ def GetTokenTypeValue(TokenType):
 ## construct the external Pcd database using data from Dict

 #

 #   @param      Dict  A dictionary contains Pcd related tables

-#  

+#

 #   @retval     Buffer A byte stream of the Pcd database

 #

 def BuildExDataBase(Dict):

@@ -625,26 +625,26 @@ def BuildExDataBase(Dict):
     NumberOfSkuEnabledPcd = GetIntegerValue(Dict['SKU_HEAD_SIZE'])

 

     Dict['STRING_TABLE_DB_VALUE'] = [StringArrayToList(x) for x in Dict['STRING_TABLE_VALUE']]

-    

+

     StringTableValue = Dict['STRING_TABLE_DB_VALUE']

     # when calcute the offset, should use StringTableLen instead of StringTableValue, as string maxium len may be different with actual len

     StringTableLen = Dict['STRING_TABLE_LENGTH']

     DbStringTableLen = DbStringItemList(0, RawDataList = StringTableValue, LenList = StringTableLen)

 

-    

+

     PcdTokenTable = Dict['PCD_TOKENSPACE']

     PcdTokenLen = Dict['PCD_TOKENSPACE_LENGTH']

     PcdTokenTableValue = [StringArrayToList(x) for x in Dict['PCD_TOKENSPACE']]

     DbPcdTokenTable = DbStringItemList(0, RawDataList = PcdTokenTableValue, LenList = PcdTokenLen)

-    

+

     PcdCNameTable = Dict['PCD_CNAME']

     PcdCNameLen = Dict['PCD_CNAME_LENGTH']

     PcdCNameTableValue = [StringArrayToList(x) for x in Dict['PCD_CNAME']]

     DbPcdCNameTable = DbStringItemList(0, RawDataList = PcdCNameTableValue, LenList = PcdCNameLen)

-    

+

     PcdNameOffsetTable = Dict['PCD_NAME_OFFSET']

     DbPcdNameOffsetTable = DbItemList(4, RawDataList = PcdNameOffsetTable)

-    

+

     SizeTableValue = zip(Dict['SIZE_TABLE_MAXIMUM_LENGTH'], Dict['SIZE_TABLE_CURRENT_LENGTH'])

     DbSizeTableValue = DbSizeTableItemList(2, RawDataList = SizeTableValue)

     InitValueUint16 = Dict['INIT_DB_VALUE_UINT16']

@@ -663,7 +663,7 @@ def BuildExDataBase(Dict):
     DbSkuidValue = DbItemList(8, RawDataList = SkuidValue)

 

 

-    

+

     # Unit Db Items

     UnInitValueUint64 = Dict['UNINIT_GUID_DECL_UINT64']

     DbUnInitValueUint64 = DbItemList(8, RawDataList = UnInitValueUint64)

@@ -676,12 +676,12 @@ def BuildExDataBase(Dict):
     UnInitValueBoolean = Dict['UNINIT_GUID_DECL_BOOLEAN']

     DbUnInitValueBoolean = DbItemList(1, RawDataList = UnInitValueBoolean)

     PcdTokenNumberMap = Dict['PCD_ORDER_TOKEN_NUMBER_MAP']

- 

+

     DbNameTotle = ["SkuidValue",  "InitValueUint64", "VardefValueUint64", "InitValueUint32", "VardefValueUint32", "VpdHeadValue", "ExMapTable",

                "LocalTokenNumberTable", "GuidTable", "StringHeadValue",  "PcdNameOffsetTable", "VariableTable", "StringTableLen", "PcdTokenTable", "PcdCNameTable",

                "SizeTableValue", "InitValueUint16", "VardefValueUint16", "InitValueUint8", "VardefValueUint8", "InitValueBoolean",

                "VardefValueBoolean", "UnInitValueUint64", "UnInitValueUint32", "UnInitValueUint16", "UnInitValueUint8", "UnInitValueBoolean"]

- 

+

     DbTotal = [SkuidValue,  InitValueUint64, VardefValueUint64, InitValueUint32, VardefValueUint32, VpdHeadValue, ExMapTable,

                LocalTokenNumberTable, GuidTable, StringHeadValue,  PcdNameOffsetTable, VariableTable, StringTableLen, PcdTokenTable, PcdCNameTable,

                SizeTableValue, InitValueUint16, VardefValueUint16, InitValueUint8, VardefValueUint8, InitValueBoolean,

@@ -690,21 +690,21 @@ def BuildExDataBase(Dict):
                DbLocalTokenNumberTable, DbGuidTable, DbStringHeadValue,  DbPcdNameOffsetTable, DbVariableTable, DbStringTableLen, DbPcdTokenTable, DbPcdCNameTable,

                DbSizeTableValue, DbInitValueUint16, DbVardefValueUint16, DbInitValueUint8, DbVardefValueUint8, DbInitValueBoolean,

                DbVardefValueBoolean, DbUnInitValueUint64, DbUnInitValueUint32, DbUnInitValueUint16, DbUnInitValueUint8, DbUnInitValueBoolean]

-    

+

     # VardefValueBoolean is the last table in the init table items

     InitTableNum = DbNameTotle.index("VardefValueBoolean") + 1

     # The FixedHeader length of the PCD_DATABASE_INIT, from Signature to Pad

     FixedHeaderLen = 80

 

-    # Get offset of SkuId table in the database 

+    # Get offset of SkuId table in the database

     SkuIdTableOffset = FixedHeaderLen

     for DbIndex in xrange(len(DbTotal)):

         if DbTotal[DbIndex] is SkuidValue:

             break

         SkuIdTableOffset += DbItemTotal[DbIndex].GetListSize()

-    

-    

-    # Get offset of SkuValue table in the database    

+

+

+    # Get offset of SkuValue table in the database

 

     # Fix up the LocalTokenNumberTable, SkuHeader table

     for (LocalTokenNumberTableIndex, (Offset, Table)) in enumerate(LocalTokenNumberTable):

@@ -725,11 +725,11 @@ def BuildExDataBase(Dict):
         TokenTypeValue = GetTokenTypeValue(TokenTypeValue)

         LocalTokenNumberTable[LocalTokenNumberTableIndex] = DbOffset|int(TokenTypeValue)

         # if PCD_TYPE_SKU_ENABLED, then we need to fix up the SkuTable

-        

-        

-    

 

-    # resolve variable table offset 

+

+

+

+    # resolve variable table offset

     for VariableEntries in VariableTable:

         skuindex = 0

         for VariableEntryPerSku in VariableEntries:

@@ -747,7 +747,7 @@ def BuildExDataBase(Dict):
             else:

                 assert(False)

             if isinstance(VariableRefTable[0], list):

-                DbOffset += skuindex * 4   

+                DbOffset += skuindex * 4

             skuindex += 1

             if DbIndex >= InitTableNum:

                 assert(False)

@@ -775,17 +775,17 @@ def BuildExDataBase(Dict):
 

         DbTotalLength += DbItemTotal[DbIndex].GetListSize()

     if not Dict['PCD_INFO_FLAG']:

-        DbPcdNameOffset  = 0   

+        DbPcdNameOffset  = 0

     LocalTokenCount = GetIntegerValue(Dict['LOCAL_TOKEN_NUMBER'])

     ExTokenCount = GetIntegerValue(Dict['EX_TOKEN_NUMBER'])

     GuidTableCount = GetIntegerValue(Dict['GUID_TABLE_SIZE'])

     SystemSkuId = GetIntegerValue(Dict['SYSTEM_SKU_ID_VALUE'])

     Pad = 0xDA

-    

+

     UninitDataBaseSize  = 0

     for Item in (DbUnInitValueUint64, DbUnInitValueUint32, DbUnInitValueUint16, DbUnInitValueUint8, DbUnInitValueBoolean):

         UninitDataBaseSize += Item.GetListSize()

-    

+

     if (DbTotalLength - UninitDataBaseSize) % 8:

         DbTotalLength += (8 - (DbTotalLength - UninitDataBaseSize) % 8)

     # Construct the database buffer

@@ -812,7 +812,7 @@ def BuildExDataBase(Dict):
 

     Buffer += b

     b = pack('=L', ExMapTableOffset)

- 

+

     Buffer += b

     b = pack('=L', GuidTableOffset)

 

@@ -836,7 +836,7 @@ def BuildExDataBase(Dict):
 

     Buffer += b

     b = pack('=H', GuidTableCount)

- 

+

     Buffer += b

     b = pack('=B', Pad)

     Buffer += b

@@ -845,18 +845,18 @@ def BuildExDataBase(Dict):
     Buffer += b

     Buffer += b

     Buffer += b

-    

+

     Index = 0

     for Item in DbItemTotal:

         Index +=1

         b = Item.PackData()

-        Buffer += b  

+        Buffer += b

         if Index == InitTableNum:

             if len(Buffer) % 8:

                 for num in range(8 - len(Buffer) % 8):

                     b = pack('=B', Pad)

                     Buffer += b

-            break        

+            break

     return Buffer

 

 ## Create code for PCD database

@@ -1010,7 +1010,7 @@ def CreatePcdDatabasePhaseSpecificAutoGen (Platform, DynamicPcdList, Phase):
         'SYSTEM_SKU_ID'                 : '  SKU_ID             SystemSkuId;',

         'SYSTEM_SKU_ID_VALUE'           : '0U'

     }

-    

+

     SkuObj = Platform.Platform.SkuIdMgr

     Dict['SYSTEM_SKU_ID_VALUE'] = 0 if SkuObj.SkuUsageType == SkuObj.SINGLE else Platform.Platform.SkuIds[SkuObj.SystemSkuId][0]

 

@@ -1028,7 +1028,7 @@ def CreatePcdDatabasePhaseSpecificAutoGen (Platform, DynamicPcdList, Phase):
             Dict[Init+'_NUMSKUS_DECL_' + DatumType] = []

             Dict[Init+'_VALUE_' + DatumType]        = []

             Dict[Init+'_DB_VALUE_'+DatumType] = []

-            

+

     for Type in ['STRING_HEAD', 'VPD_HEAD', 'VARIABLE_HEAD']:

         Dict[Type + '_CNAME_DECL']   = []

         Dict[Type + '_GUID_DECL']    = []

@@ -1038,7 +1038,7 @@ def CreatePcdDatabasePhaseSpecificAutoGen (Platform, DynamicPcdList, Phase):
     Dict['STRING_DB_VALUE'] = []

     Dict['VPD_DB_VALUE'] = []

     Dict['VARIABLE_DB_VALUE'] = []

-    

+

     Dict['STRING_TABLE_INDEX'] = []

     Dict['STRING_TABLE_LENGTH']  = []

     Dict['STRING_TABLE_CNAME'] = []

@@ -1061,19 +1061,19 @@ def CreatePcdDatabasePhaseSpecificAutoGen (Platform, DynamicPcdList, Phase):
 

     Dict['LOCAL_TOKEN_NUMBER_DB_VALUE'] = []

     Dict['VARIABLE_DB_VALUE'] = []

-    

+

     Dict['PCD_TOKENSPACE'] = []

-    Dict['PCD_CNAME'] = [] 

+    Dict['PCD_CNAME'] = []

     Dict['PCD_TOKENSPACE_LENGTH'] = []

     Dict['PCD_CNAME_LENGTH'] = []

     Dict['PCD_TOKENSPACE_OFFSET'] = []

     Dict['PCD_CNAME_OFFSET'] = []

     Dict['PCD_TOKENSPACE_MAP'] = []

     Dict['PCD_NAME_OFFSET'] = []

-    

+

     Dict['PCD_ORDER_TOKEN_NUMBER_MAP'] = {}

     PCD_STRING_INDEX_MAP = {}

-    

+

     StringTableIndex = 0

     StringTableSize = 0

     NumberOfLocalTokens = 0

@@ -1141,8 +1141,8 @@ def CreatePcdDatabasePhaseSpecificAutoGen (Platform, DynamicPcdList, Phase):
 

         if len(Pcd.SkuInfoList) > 1:

             NumberOfSkuEnabledPcd += 1

-        

-        SkuIdIndex = 1  

+

+        SkuIdIndex = 1

         VariableHeadList = []

         for SkuName in Pcd.SkuInfoList:

             Sku = Pcd.SkuInfoList[SkuName]

@@ -1150,9 +1150,9 @@ def CreatePcdDatabasePhaseSpecificAutoGen (Platform, DynamicPcdList, Phase):
             if SkuId is None or SkuId == '':

                 continue

 

-                

+

             SkuIdIndex += 1

-    

+

             if len(Sku.VariableName) > 0:

                 VariableGuidStructure = Sku.VariableGuidValue

                 VariableGuid = GuidStructureStringToGuidValueName(VariableGuidStructure)

@@ -1203,7 +1203,7 @@ def CreatePcdDatabasePhaseSpecificAutoGen (Platform, DynamicPcdList, Phase):
                 for Index in range(Dict['STRING_TABLE_VALUE'].index(VariableNameStructure)):

                     VariableHeadStringIndex += Dict['STRING_TABLE_LENGTH'][Index]

                 VariableHeadList.append(VariableHeadStringIndex)

-                        

+

                 VariableHeadStringIndex = VariableHeadList[SkuIdIndex - 2]

                 # store VariableGuid to GuidTable and get the VariableHeadGuidIndex

 

@@ -1214,11 +1214,11 @@ def CreatePcdDatabasePhaseSpecificAutoGen (Platform, DynamicPcdList, Phase):
 

                 if "PCD_TYPE_STRING" in Pcd.TokenTypeList:

                     VariableHeadValueList.append('%dU, offsetof(%s_PCD_DATABASE, Init.%s_%s), %dU, %sU' %

-                                                 (VariableHeadStringIndex, Phase, CName, TokenSpaceGuid, 

+                                                 (VariableHeadStringIndex, Phase, CName, TokenSpaceGuid,

                                                  VariableHeadGuidIndex, Sku.VariableOffset))

                 else:

                     VariableHeadValueList.append('%dU, offsetof(%s_PCD_DATABASE, Init.%s_%s_VariableDefault_%s), %dU, %sU' %

-                                                 (VariableHeadStringIndex, Phase, CName, TokenSpaceGuid, SkuIdIndex, 

+                                                 (VariableHeadStringIndex, Phase, CName, TokenSpaceGuid, SkuIdIndex,

                                                  VariableHeadGuidIndex, Sku.VariableOffset))

                 Dict['VARDEF_CNAME_'+Pcd.DatumType].append(CName)

                 Dict['VARDEF_GUID_'+Pcd.DatumType].append(TokenSpaceGuid)

@@ -1231,7 +1231,7 @@ def CreatePcdDatabasePhaseSpecificAutoGen (Platform, DynamicPcdList, Phase):
                     # warning under linux building environment.

                     #

                     Dict['VARDEF_DB_VALUE_'+Pcd.DatumType].append(Sku.HiiDefaultValue)

-                    

+

                     if Pcd.DatumType == TAB_UINT64:

                         Dict['VARDEF_VALUE_'+Pcd.DatumType].append(Sku.HiiDefaultValue + "ULL")

                     elif Pcd.DatumType in (TAB_UINT32, TAB_UINT16, TAB_UINT8):

@@ -1264,13 +1264,13 @@ def CreatePcdDatabasePhaseSpecificAutoGen (Platform, DynamicPcdList, Phase):
                 Pcd.InitString = 'INIT'

                 VpdHeadOffsetList.append(str(Sku.VpdOffset) + 'U')

                 VpdDbOffsetList.append(Sku.VpdOffset)

-                # Also add the VOID* string of VPD PCD to SizeTable 

+                # Also add the VOID* string of VPD PCD to SizeTable

                 if Pcd.DatumType == TAB_VOID:

                     NumberOfSizeItems += 1

                     # For VPD type of PCD, its current size is equal to its MAX size.

-                    VoidStarTypeCurrSize = [str(Pcd.MaxDatumSize) + 'U']                 

+                    VoidStarTypeCurrSize = [str(Pcd.MaxDatumSize) + 'U']

                 continue

-          

+

             if Pcd.DatumType == TAB_VOID:

                 Pcd.TokenTypeList.append('PCD_TYPE_STRING')

                 Pcd.InitString = 'INIT'

@@ -1297,7 +1297,7 @@ def CreatePcdDatabasePhaseSpecificAutoGen (Platform, DynamicPcdList, Phase):
                         DefaultValueBinStructure = StringToArray(Sku.DefaultValue)

                         Size = len(Sku.DefaultValue.split(","))

                         Dict['STRING_TABLE_VALUE'].append(DefaultValueBinStructure)

-                    

+

                     StringHeadOffsetList.append(str(StringTableSize) + 'U')

                     StringDbOffsetList.append(StringTableSize)

                     if Pcd.MaxDatumSize != '':

@@ -1336,10 +1336,10 @@ def CreatePcdDatabasePhaseSpecificAutoGen (Platform, DynamicPcdList, Phase):
                     ValueList.append(Sku.DefaultValue + "U")

                 elif Pcd.DatumType == "BOOLEAN":

                     if Sku.DefaultValue in ["1", "0"]:

-                        ValueList.append(Sku.DefaultValue + "U")              

+                        ValueList.append(Sku.DefaultValue + "U")

                 else:

                     ValueList.append(Sku.DefaultValue)

-                

+

                 DbValueList.append(Sku.DefaultValue)

 

         Pcd.TokenTypeList = list(set(Pcd.TokenTypeList))

@@ -1348,8 +1348,8 @@ def CreatePcdDatabasePhaseSpecificAutoGen (Platform, DynamicPcdList, Phase):
             Dict['SIZE_TABLE_GUID'].append(TokenSpaceGuid)

             Dict['SIZE_TABLE_MAXIMUM_LENGTH'].append(str(Pcd.MaxDatumSize) + 'U')

             Dict['SIZE_TABLE_CURRENT_LENGTH'].append(VoidStarTypeCurrSize)

-        

-        

+

+

 

         if 'PCD_TYPE_HII' in Pcd.TokenTypeList:

             Dict['VARIABLE_HEAD_CNAME_DECL'].append(CName)

@@ -1382,7 +1382,7 @@ def CreatePcdDatabasePhaseSpecificAutoGen (Platform, DynamicPcdList, Phase):
             else:

                 Dict[Pcd.InitString+'_VALUE_'+Pcd.DatumType].append(', '.join(ValueList))

                 Dict[Pcd.InitString+'_DB_VALUE_'+Pcd.DatumType].append(DbValueList)

-                

+

     if Phase == 'PEI':

         NumberOfLocalTokens = NumberOfPeiLocalTokens

     if Phase == 'DXE':

@@ -1394,7 +1394,7 @@ def CreatePcdDatabasePhaseSpecificAutoGen (Platform, DynamicPcdList, Phase):
     Dict['TOKEN_TYPE']       = ['' for x in range(NumberOfLocalTokens)]

     Dict['LOCAL_TOKEN_NUMBER_DB_VALUE'] = ['' for x in range(NumberOfLocalTokens)]

     Dict['PCD_CNAME']        = ['' for x in range(NumberOfLocalTokens)]

-    Dict['PCD_TOKENSPACE_MAP'] = ['' for x in range(NumberOfLocalTokens)]  

+    Dict['PCD_TOKENSPACE_MAP'] = ['' for x in range(NumberOfLocalTokens)]

     Dict['PCD_CNAME_LENGTH'] = [0 for x in range(NumberOfLocalTokens)]

     SkuEnablePcdIndex = 0

     for Pcd in ReorderedDynPcdList:

@@ -1419,7 +1419,7 @@ def CreatePcdDatabasePhaseSpecificAutoGen (Platform, DynamicPcdList, Phase):
         EdkLogger.debug(EdkLogger.DEBUG_1, "PCD = %s.%s" % (CName, TokenSpaceGuidCName))

         EdkLogger.debug(EdkLogger.DEBUG_1, "phase = %s" % Phase)

         EdkLogger.debug(EdkLogger.DEBUG_1, "GeneratedTokenNumber = %s" % str(GeneratedTokenNumber))

-        

+

         #

         # following four Dict items hold the information for LocalTokenNumberTable

         #

@@ -1430,7 +1430,7 @@ def CreatePcdDatabasePhaseSpecificAutoGen (Platform, DynamicPcdList, Phase):
         Dict['TOKEN_CNAME'][GeneratedTokenNumber] = CName

         Dict['TOKEN_GUID'][GeneratedTokenNumber] = TokenSpaceGuid

         Dict['TOKEN_TYPE'][GeneratedTokenNumber] = ' | '.join(Pcd.TokenTypeList)

-        

+

         if Platform.Platform.PcdInfoFlag:

             TokenSpaceGuidCNameArray = StringToArray('"' + TokenSpaceGuidCName + '"' )

             if TokenSpaceGuidCNameArray not in Dict['PCD_TOKENSPACE']:

@@ -1439,10 +1439,10 @@ def CreatePcdDatabasePhaseSpecificAutoGen (Platform, DynamicPcdList, Phase):
             Dict['PCD_TOKENSPACE_MAP'][GeneratedTokenNumber] = Dict['PCD_TOKENSPACE'].index(TokenSpaceGuidCNameArray)

             CNameBinArray = StringToArray('"' + CName + '"' )

             Dict['PCD_CNAME'][GeneratedTokenNumber] = CNameBinArray

-            

+

             Dict['PCD_CNAME_LENGTH'][GeneratedTokenNumber] = len(CNameBinArray.split(","))

-        

-        

+

+

         Pcd.TokenTypeList = list(set(Pcd.TokenTypeList))

 

         # search the Offset and Table, used by LocalTokenNumberTableOffset

@@ -1468,7 +1468,7 @@ def CreatePcdDatabasePhaseSpecificAutoGen (Platform, DynamicPcdList, Phase):
             if Pcd.InitString == 'UNINIT':

                 Table =  Dict[Pcd.InitString+'_GUID_DECL_'+Pcd.DatumType]

             else:

-                Table = Dict[Pcd.InitString+'_DB_VALUE_'+Pcd.DatumType]               

+                Table = Dict[Pcd.InitString+'_DB_VALUE_'+Pcd.DatumType]

         Dict['LOCAL_TOKEN_NUMBER_DB_VALUE'][GeneratedTokenNumber] = (Offset, Table)

 

         #

@@ -1478,10 +1478,10 @@ def CreatePcdDatabasePhaseSpecificAutoGen (Platform, DynamicPcdList, Phase):
             Dict['VARDEF_HEADER'][GeneratedTokenNumber] = '_Variable_Header'

         else:

             Dict['VARDEF_HEADER'][GeneratedTokenNumber] = ''

-       

-        

+

+

         if Pcd.Type in PCD_DYNAMIC_EX_TYPE_SET:

-            

+

             if Phase == 'DXE':

                 GeneratedTokenNumber += NumberOfPeiLocalTokens

             #

@@ -1493,7 +1493,7 @@ def CreatePcdDatabasePhaseSpecificAutoGen (Platform, DynamicPcdList, Phase):
             # Therefore, 1 is added to GeneratedTokenNumber to generate a PCD Token Number before being inserted

             # to the EXMAPPING_TABLE.

             #

-            

+

 

             Dict['EXMAPPING_TABLE_EXTOKEN'].append(str(Pcd.TokenValue) + 'U')

             Dict['EXMAPPING_TABLE_LOCAL_TOKEN'].append(str(GeneratedTokenNumber + 1) + 'U')

@@ -1504,12 +1504,12 @@ def CreatePcdDatabasePhaseSpecificAutoGen (Platform, DynamicPcdList, Phase):
             TokenSpaceIndex = StringTableSize

             for i in range(Dict['PCD_TOKENSPACE_MAP'][index]):

                 TokenSpaceIndex += Dict['PCD_TOKENSPACE_LENGTH'][i]

-            Dict['PCD_TOKENSPACE_OFFSET'].append(TokenSpaceIndex)   

+            Dict['PCD_TOKENSPACE_OFFSET'].append(TokenSpaceIndex)

         for index in range(len(Dict['PCD_TOKENSPACE'])):

             StringTableSize += Dict['PCD_TOKENSPACE_LENGTH'][index]

             StringTableIndex += 1

         for index in range(len(Dict['PCD_CNAME'])):

-            Dict['PCD_CNAME_OFFSET'].append(StringTableSize)        

+            Dict['PCD_CNAME_OFFSET'].append(StringTableSize)

             Dict['PCD_NAME_OFFSET'].append(Dict['PCD_TOKENSPACE_OFFSET'][index])

             Dict['PCD_NAME_OFFSET'].append(StringTableSize)

             StringTableSize += Dict['PCD_CNAME_LENGTH'][index]

@@ -1552,15 +1552,15 @@ def CreatePcdDatabasePhaseSpecificAutoGen (Platform, DynamicPcdList, Phase):
 

     if NumberOfSizeItems != 0:

         Dict['SIZE_TABLE_SIZE'] = str(NumberOfSizeItems * 2) + 'U'

-    

-    if NumberOfSkuEnabledPcd != 0: 

+

+    if NumberOfSkuEnabledPcd != 0:

         Dict['SKU_HEAD_SIZE'] = str(NumberOfSkuEnabledPcd) + 'U'

-    

+

     for AvailableSkuNumber in SkuObj.SkuIdNumberSet:

         if AvailableSkuNumber not in Dict['SKUID_VALUE']:

             Dict['SKUID_VALUE'].append(AvailableSkuNumber)

     Dict['SKUID_VALUE'][0] = len(Dict['SKUID_VALUE']) - 1

-    

+

     AutoGenH.Append(gPcdDatabaseAutoGenH.Replace(Dict))

     if NumberOfLocalTokens == 0:

         AutoGenC.Append(gEmptyPcdDatabaseAutoGenC.Replace(Dict))

@@ -1573,11 +1573,11 @@ def CreatePcdDatabasePhaseSpecificAutoGen (Platform, DynamicPcdList, Phase):
         SizeCurLenTempList = []

         SizeMaxLenTempList = []

         ReOrderFlag = True

-  

+

         if len(Dict['SIZE_TABLE_CNAME']) == 1:

             if not (Dict['SIZE_TABLE_CNAME'][0] and Dict['SIZE_TABLE_GUID'][0]):

                 ReOrderFlag = False

-        

+

         if ReOrderFlag:

             for Count in range(len(Dict['TOKEN_CNAME'])):

                 for Count1 in range(len(Dict['SIZE_TABLE_CNAME'])):

@@ -1587,15 +1587,15 @@ def CreatePcdDatabasePhaseSpecificAutoGen (Platform, DynamicPcdList, Phase):
                         SizeGuidTempList.append(Dict['SIZE_TABLE_GUID'][Count1])

                         SizeCurLenTempList.append(Dict['SIZE_TABLE_CURRENT_LENGTH'][Count1])

                         SizeMaxLenTempList.append(Dict['SIZE_TABLE_MAXIMUM_LENGTH'][Count1])

-                        

+

             for Count in range(len(Dict['SIZE_TABLE_CNAME'])):

                 Dict['SIZE_TABLE_CNAME'][Count] = SizeCNameTempList[Count]

                 Dict['SIZE_TABLE_GUID'][Count] = SizeGuidTempList[Count]

                 Dict['SIZE_TABLE_CURRENT_LENGTH'][Count] = SizeCurLenTempList[Count]

                 Dict['SIZE_TABLE_MAXIMUM_LENGTH'][Count] = SizeMaxLenTempList[Count]

-                

+

         AutoGenC.Append(gPcdDatabaseAutoGenC.Replace(Dict))

-    

+

 

 #     print Phase

     Buffer = BuildExDataBase(Dict)