BaseTools: Replace StandardError with Expression

[mirror_edk2.git] / BaseTools / Source / Python / Eot / EotGlobalData.py

diff --git a/BaseTools/Source/Python/Eot/EotGlobalData.py b/BaseTools/Source/Python/Eot/EotGlobalData.py
index dea4206e9d487cdd818bf41ef0c7df1828d95a5d..cb6a940ab8f943d05d6a0c57cb024b7a6a344f25 100644 (file)
--- a/BaseTools/Source/Python/Eot/EotGlobalData.py
+++ b/BaseTools/Source/Python/Eot/EotGlobalData.py
@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 #\r
 \r
-from Common.Misc import sdict\r
+from collections import OrderedDict\r
 from Common.LongFilePathSupport import OpenLongFilePath as open\r
 \r
 gEFI_SOURCE = ''\r
@@ -36,11 +36,6 @@ gMACRO['EDK_SOURCE'] = gEDK_SOURCE
 gMACRO['SHELL_INF'] = gSHELL_INF\r
 gMACRO['CAPSULE_INF'] = ''\r
 \r
-gNOT_FOUND_FILES = []\r
-gSOURCE_FILES = []\r
-gINF_FILES = {}\r
-gDEC_FILES = []\r
-\r
 # Log file for unmatched variables\r
 gUN_MATCHED_LOG = 'Log_UnMatched.log'\r
 gOP_UN_MATCHED = open(gUN_MATCHED_LOG, 'w+')\r
@@ -61,10 +56,6 @@ gOP_UN_MATCHED_IN_LIBRARY_CALLING = open(gUN_MATCHED_IN_LIBRARY_CALLING_LOG, 'w+
 gDISPATCH_ORDER_LOG = 'Log_DispatchOrder.log'\r
 gOP_DISPATCH_ORDER = open(gDISPATCH_ORDER_LOG, 'w+')\r
 \r
-# Log file for source files not found\r
-gUN_FOUND_FILES = 'Log_UnFoundSourceFiles.log'\r
-gOP_UN_FOUND_FILES = open(gUN_FOUND_FILES, 'w+')\r
-\r
 # Log file for found source files\r
 gSOURCE_FILES = 'Log_SourceFiles.log'\r
 gOP_SOURCE_FILES = open(gSOURCE_FILES, 'w+')\r
@@ -72,19 +63,19 @@ gOP_SOURCE_FILES = open(gSOURCE_FILES, 'w+')
 # Dict for GUID found in DEC files\r
 gGuidDict = dict()\r
 \r
+# Dict for PROTOCOL\r
+gProtocolList = {}\r
 # Dict for PPI\r
 gPpiList = {}\r
 \r
-# Dict for PROTOCOL\r
-gProtocolList = {}\r
 \r
 # Dict for consumed PPI function calling\r
-gConsumedPpiLibrary = sdict()\r
+gConsumedPpiLibrary = OrderedDict()\r
 gConsumedPpiLibrary['EfiCommonLocateInterface'] = 0\r
 gConsumedPpiLibrary['PeiServicesLocatePpi'] = 0\r
 \r
 # Dict for produced PROTOCOL function calling\r
-gProducedProtocolLibrary = sdict()\r
+gProducedProtocolLibrary = OrderedDict()\r
 gProducedProtocolLibrary['RegisterEsalClass'] = 0\r
 gProducedProtocolLibrary['CoreInstallProtocolInterface'] = 1\r
 gProducedProtocolLibrary['CoreInstallMultipleProtocolInterfaces'] = -1\r
@@ -95,32 +86,17 @@ gProducedProtocolLibrary['LibInstallProtocolInterfaces'] = 1
 gProducedProtocolLibrary['LibReinstallProtocolInterfaces'] = 1\r
 \r
 # Dict for consumed PROTOCOL function calling\r
-gConsumedProtocolLibrary = sdict()\r
+gConsumedProtocolLibrary = OrderedDict()\r
 gConsumedProtocolLibrary['EfiHandleProtocol'] = 0\r
 gConsumedProtocolLibrary['EfiLocateProtocolHandleBuffers'] = 0\r
 gConsumedProtocolLibrary['EfiLocateProtocolInterface'] = 0\r
 gConsumedProtocolLibrary['EfiHandleProtocol'] = 1\r
 \r
 # Dict for callback PROTOCOL function callling\r
-gCallbackProtocolLibrary = sdict()\r
+gCallbackProtocolLibrary = OrderedDict()\r
 gCallbackProtocolLibrary['EfiRegisterProtocolCallback'] = 2\r
 \r
-# Dict for ARCH PROTOCOL\r
-gArchProtocols = ['gEfiBdsArchProtocolGuid',\r
-                  'gEfiCapsuleArchProtocolGuid',\r
-                  'gEfiCpuArchProtocolGuid',  #5053697e-2cbc-4819-90d9-0580deee5754\r
-                  'gEfiMetronomeArchProtocolGuid',\r
-                  'gEfiMonotonicCounterArchProtocolGuid',\r
-                  'gEfiRealTimeClockArchProtocolGuid',\r
-                  'gEfiResetArchProtocolGuid',\r
-                  'gEfiRuntimeArchProtocolGuid',\r
-                  'gEfiSecurityArchProtocolGuid',\r
-                  'gEfiStatusCodeRuntimeProtocolGuid',\r
-                  'gEfiTimerArchProtocolGuid',\r
-                  'gEfiVariableArchProtocolGuid',\r
-                  'gEfiVariableWriteArchProtocolGuid',\r
-                  'gEfiWatchdogTimerArchProtocolGuid']\r
-gArchProtocolGuids = ['665e3ff6-46cc-11d4-9a38-0090273fc14d',\r
+gArchProtocolGuids = {'665e3ff6-46cc-11d4-9a38-0090273fc14d',\r
                       '26baccb1-6f42-11d4-bce7-0080c73c8881',\r
                       '26baccb2-6f42-11d4-bce7-0080c73c8881',\r
                       '1da97072-bddc-4b30-99f1-72a0b56fff2a',\r
@@ -132,4 +108,4 @@ gArchProtocolGuids = ['665e3ff6-46cc-11d4-9a38-0090273fc14d',
                       '26baccb3-6f42-11d4-bce7-0080c73c8881',\r
                       '1e5668e2-8481-11d4-bcf1-0080c73c8881',\r
                       '6441f818-6362-4e44-b570-7dba31dd2453',\r
-                      '665e3ff5-46cc-11d4-9a38-0090273fc14d']\r
+                      '665e3ff5-46cc-11d4-9a38-0090273fc14d'}\r