BaseTools: standardize GUID and pack size

[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..c6721b8828ee13e4ea7102569337e9b2caff5cef 100644 (file)
--- a/BaseTools/Source/Python/GenFds/Fv.py
+++ b/BaseTools/Source/Python/GenFds/Fv.py
@@ -26,7 +26,7 @@ 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
@@ -367,10 +367,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 +401,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