BaseTools: Refactor to share GUID packing function

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>

diff --git a/BaseTools/Source/Python/AutoGen/GenPcdDb.py b/BaseTools/Source/Python/AutoGen/GenPcdDb.py
index 8053202289077a130654133ba245afa5bb14e946..aee722d146a09a3faeb1351e454d9f333adddbb1 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/GenPcdDb.py
+++ b/BaseTools/Source/Python/AutoGen/GenPcdDb.py
@@ -21,6 +21,7 @@ from Common.VariableAttributes import VariableAttributes
 import copy\r
 from struct import unpack\r
 from Common.DataType import *\r
+from GenVar import PackGUID\r
 \r
 DATABASE_VERSION = 7\r
 \r
@@ -287,21 +288,7 @@ class DbItemList:
         #\r
         def PackGuid(GuidStructureValue):\r
             GuidString = GuidStructureStringToGuidString(GuidStructureValue)\r
-            Guid = GuidString.split('-')\r
-            Buffer = pack('=LHHBBBBBBBB', \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
-                        )\r
-            return Buffer\r
+            return PackGUID(GuidString.split('-'))\r
 \r
         if self.ItemSize == 8:\r
             PackStr = "=Q"\r