Move PackRegistryFormatGuid logic from Common.Misc to this file.
There were no other consumers of the function.
As it is one line, just replace the logic without the separate function.
v2 - change to fix the import statement
Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jaben Carsey <jaben.carsey@intel.com>
Reviewed-by: Bob Feng <bob.c.feng@intel.com>
else:\r
return 'DEFAULT'\r
\r
else:\r
return 'DEFAULT'\r
\r
-#\r
-# Pack a registry format GUID\r
-#\r
-def PackRegistryFormatGuid(Guid):\r
- return PackGUID(Guid.split('-'))\r
-\r
## Get the integer value from string like "14U" or integer like 2\r
#\r
# @param Input The object that may be either a integer value or a string\r
## Get the integer value from string like "14U" or integer like 2\r
#\r
# @param Input The object that may be either a integer value or a string\r
from CommonDataClass.FdfClass import CapsuleClassObject\r
import Common.LongFilePathOs as os\r
from io import BytesIO\r
from CommonDataClass.FdfClass import CapsuleClassObject\r
import Common.LongFilePathOs as os\r
from io import BytesIO\r
-from Common.Misc import SaveFileOnChange, PackRegistryFormatGuid\r
+from Common.Misc import SaveFileOnChange, PackGUID\r
import uuid\r
from struct import pack\r
from Common import EdkLogger\r
import uuid\r
from struct import pack\r
from Common import EdkLogger\r
#\r
# Use FMP capsule GUID: 6DCBD5ED-E82D-4C44-BDA1-7194199AD92A\r
#\r
#\r
# Use FMP capsule GUID: 6DCBD5ED-E82D-4C44-BDA1-7194199AD92A\r
#\r
- Header.write(PackRegistryFormatGuid('6DCBD5ED-E82D-4C44-BDA1-7194199AD92A'))\r
+ Header.write(PackGUID('6DCBD5ED-E82D-4C44-BDA1-7194199AD92A'.split('-')))\r
HdrSize = 0\r
if 'CAPSULE_HEADER_SIZE' in self.TokensDict:\r
Header.write(pack('=I', int(self.TokensDict['CAPSULE_HEADER_SIZE'], 16)))\r
HdrSize = 0\r
if 'CAPSULE_HEADER_SIZE' in self.TokensDict:\r
Header.write(pack('=I', int(self.TokensDict['CAPSULE_HEADER_SIZE'], 16)))\r