BaseTools: Cleanup unneeded code

[mirror_edk2.git] / BaseTools / Source / Python / GenFds / Fv.py

diff --git a/BaseTools/Source/Python/GenFds/Fv.py b/BaseTools/Source/Python/GenFds/Fv.py
index adb7c185b82b81e90d55a1c7c8d32cc3a5369bef..6714838f6fc927ab096e8606a877fdfcab48bd48 100644 (file)
--- a/BaseTools/Source/Python/GenFds/Fv.py
+++ b/BaseTools/Source/Python/GenFds/Fv.py
@@ -26,12 +26,11 @@ import FfsFileStatement
 from GenFdsGlobalVariable import GenFdsGlobalVariable\r
 from GenFds import GenFds\r
 from CommonDataClass.FdfClass import FvClassObject\r
-from Common.Misc import SaveFileOnChange\r
+from Common.Misc import SaveFileOnChange, PackGUID\r
 from Common.LongFilePathSupport import CopyLongFilePath\r
 from Common.LongFilePathSupport import OpenLongFilePath as open\r
 from Common.DataType import *\r
 \r
-T_CHAR_LF = '\n'\r
 FV_UI_EXT_ENTY_GUID = 'A67DF1FA-8DE8-4E98-AF09-4BDF2EFFBC7C'\r
 \r
 ## generate FV\r
@@ -112,7 +111,7 @@ class FV (FvClassObject):
             if not Flag:\r
                 self.FvInfFile.writelines("EFI_FILE_NAME = " + \\r
                                             FileName          + \\r
-                                            T_CHAR_LF)\r
+                                            TAB_LINE_BREAK)\r
 \r
         # Process Modules in FfsList\r
         for FfsFile in self.FfsList :\r
@@ -126,7 +125,7 @@ class FV (FvClassObject):
             if not Flag:\r
                 self.FvInfFile.writelines("EFI_FILE_NAME = " + \\r
                                             FileName          + \\r
-                                            T_CHAR_LF)\r
+                                            TAB_LINE_BREAK)\r
         if not Flag:\r
             SaveFileOnChange(self.InfFileName, self.FvInfFile.getvalue(), False)\r
             self.FvInfFile.close()\r
@@ -271,36 +270,36 @@ class FV (FvClassObject):
         #\r
         # Add [Options]\r
         #\r
-        self.FvInfFile.writelines("[options]" + T_CHAR_LF)\r
+        self.FvInfFile.writelines("[options]" + TAB_LINE_BREAK)\r
         if BaseAddress is not None :\r
             self.FvInfFile.writelines("EFI_BASE_ADDRESS = " + \\r
                                        BaseAddress          + \\r
-                                       T_CHAR_LF)\r
+                                       TAB_LINE_BREAK)\r
 \r
         if BlockSize is not None:\r
             self.FvInfFile.writelines("EFI_BLOCK_SIZE = " + \\r
                                       '0x%X' %BlockSize    + \\r
-                                      T_CHAR_LF)\r
+                                      TAB_LINE_BREAK)\r
             if BlockNum is not None:\r
                 self.FvInfFile.writelines("EFI_NUM_BLOCKS   = "  + \\r
                                       ' 0x%X' %BlockNum    + \\r
-                                      T_CHAR_LF)\r
+                                      TAB_LINE_BREAK)\r
         else:\r
             if self.BlockSizeList == []:\r
                 if not self._GetBlockSize():\r
                     #set default block size is 1\r
-                    self.FvInfFile.writelines("EFI_BLOCK_SIZE  = 0x1" + T_CHAR_LF)\r
+                    self.FvInfFile.writelines("EFI_BLOCK_SIZE  = 0x1" + TAB_LINE_BREAK)\r
             \r
             for BlockSize in self.BlockSizeList :\r
                 if BlockSize[0] is not None:\r
                     self.FvInfFile.writelines("EFI_BLOCK_SIZE  = "  + \\r
                                           '0x%X' %BlockSize[0]    + \\r
-                                          T_CHAR_LF)\r
+                                          TAB_LINE_BREAK)\r
 \r
                 if BlockSize[1] is not None:\r
                     self.FvInfFile.writelines("EFI_NUM_BLOCKS   = "  + \\r
                                           ' 0x%X' %BlockSize[1]    + \\r
-                                          T_CHAR_LF)\r
+                                          TAB_LINE_BREAK)\r
 \r
         if self.BsBaseAddress is not None:\r
             self.FvInfFile.writelines('EFI_BOOT_DRIVER_BASE_ADDRESS = ' + \\r
@@ -311,11 +310,11 @@ class FV (FvClassObject):
         #\r
         # Add attribute\r
         #\r
-        self.FvInfFile.writelines("[attributes]" + T_CHAR_LF)\r
+        self.FvInfFile.writelines("[attributes]" + TAB_LINE_BREAK)\r
 \r
         self.FvInfFile.writelines("EFI_ERASE_POLARITY   = "       + \\r
                                           ' %s' %ErasePloarity    + \\r
-                                          T_CHAR_LF)\r
+                                          TAB_LINE_BREAK)\r
         if not (self.FvAttributeDict is None):\r
             for FvAttribute in self.FvAttributeDict.keys() :\r
                 if FvAttribute == "FvUsedSizeEnable":\r
@@ -326,12 +325,12 @@ class FV (FvClassObject):
                                           FvAttribute       + \\r
                                           ' = '             + \\r
                                           self.FvAttributeDict[FvAttribute] + \\r
-                                          T_CHAR_LF )\r
+                                          TAB_LINE_BREAK )\r
         if self.FvAlignment is not None:\r
             self.FvInfFile.writelines("EFI_FVB2_ALIGNMENT_"     + \\r
                                        self.FvAlignment.strip() + \\r
                                        " = TRUE"                + \\r
-                                       T_CHAR_LF)\r
+                                       TAB_LINE_BREAK)\r
                                        \r
         #\r
         # Generate FV extension header file\r
@@ -367,10 +366,7 @@ class FV (FvClassObject):
                 #   FV UI name\r
                 #\r
                 Buffer += (pack('HH', (FvUiLen + 16 + 4), 0x0002)\r
-                           + pack('=LHHBBBBBBBB', int(Guid[0], 16), int(Guid[1], 16), int(Guid[2], 16),\r
-                                  int(Guid[3][-4:-2], 16), int(Guid[3][-2:], 16), int(Guid[4][-12:-10], 16),\r
-                                  int(Guid[4][-10:-8], 16), int(Guid[4][-8:-6], 16), int(Guid[4][-6:-4], 16),\r
-                                  int(Guid[4][-4:-2], 16), int(Guid[4][-2:], 16))\r
+                           + PackGUID(Guid)\r
                            + self.UiFvName)\r
 \r
             for Index in range (0, len(self.FvExtEntryType)):\r
@@ -404,20 +400,7 @@ class FV (FvClassObject):
                         Buffer += pack('B', int(ByteList[Index1], 16))\r
 \r
             Guid = self.FvNameGuid.split('-')\r
-            Buffer = pack('=LHHBBBBBBBBL', \r
-                        int(Guid[0], 16), \r
-                        int(Guid[1], 16), \r
-                        int(Guid[2], 16), \r
-                        int(Guid[3][-4:-2], 16), \r
-                        int(Guid[3][-2:], 16),  \r
-                        int(Guid[4][-12:-10], 16),\r
-                        int(Guid[4][-10:-8], 16),\r
-                        int(Guid[4][-8:-6], 16),\r
-                        int(Guid[4][-6:-4], 16),\r
-                        int(Guid[4][-4:-2], 16),\r
-                        int(Guid[4][-2:], 16),\r
-                        TotalSize\r
-                        ) + Buffer\r
+            Buffer = PackGUID(Guid) + pack('=L', TotalSize) + Buffer\r
 \r
             #\r
             # Generate FV extension header file if the total size is not zero\r
@@ -433,14 +416,14 @@ class FV (FvClassObject):
                     os.remove (self.InfFileName)\r
                 self.FvInfFile.writelines("EFI_FV_EXT_HEADER_FILE_NAME = "      + \\r
                                            FvExtHeaderFileName                  + \\r
-                                           T_CHAR_LF)\r
+                                           TAB_LINE_BREAK)\r
 \r
          \r
         #\r
         # Add [Files]\r
         #\r
-        self.FvInfFile.writelines("[files]" + T_CHAR_LF)\r
+        self.FvInfFile.writelines("[files]" + TAB_LINE_BREAK)\r
         if VtfDict and self.UiFvName in VtfDict:\r
             self.FvInfFile.writelines("EFI_FILE_NAME = "                   + \\r
                                        VtfDict[self.UiFvName]              + \\r
-                                       T_CHAR_LF)\r
+                                       TAB_LINE_BREAK)\r