Sync the migration tool setting files with the definitions in latest UEFI 2.1 specification and the code in latest EDK II source tree.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4446 6f19259b-4bc3-4df7-8a09-765794883524

5 files changed, 27 insertions, 11 deletions

diff --git a/Tools/Conf/Migration/Guid.csv b/Tools/Conf/Migration/Guid.csv
index ba62f689e4..5816a8e060 100644
--- a/Tools/Conf/Migration/Guid.csv
+++ b/Tools/Conf/Migration/Guid.csv
@@ -1,4 +1,5 @@
 Name,R8.5 Cname,R9 Cname,Guid Value,Package

+GenericPlatformVariable,gEfiGenericVariableGuid,gEfiGenericPlatformVariableGuid,59d1c24f-50f1-401a-b101-f33e0daed443,MdeModulePkg

 Apriori,gAprioriGuid,gAprioriGuid,FC510EE7-FFDC-11D4-BD41-0080C73C8881,MdePkg

 BootObjectAuthorizationParmset,gBootObjectAuthorizationParmsetGuid,gBootObjectAuthorizationParmsetGuid,EDD35E31-07B9-11D2-83A3-00A0C91FADCF,MdePkg

 Acpi10Table,gEfiAcpi10TableGuid,gEfiAcpi10TableGuid,EB9D2D30-2D88-11D3-9A16-0090273FC14D,MdePkg

diff --git a/Tools/Conf/Migration/Library.csv b/Tools/Conf/Migration/Library.csv
index 005da7595b..958419cf37 100644
--- a/Tools/Conf/Migration/Library.csv
+++ b/Tools/Conf/Migration/Library.csv
@@ -33,6 +33,7 @@ EfiDriverLib,EfiLibAllocateRuntimeCopyPool,AllocateRuntimeCopyPool,MemoryAllocat
 EfiDriverLib,EfiLibAllocateRuntimePool,AllocateRuntimePool,MemoryAllocationLib,MdePkg

 EfiDriverLib,EfiLibAllocateRuntimeZeroPool,AllocateRuntimeZeroPool,MemoryAllocationLib,MdePkg

 EfiDriverLib,EfiLibAllocateZeroPool,AllocateZeroPool,MemoryAllocationLib,MdePkg

+EfiDriverLib,EfiLibSafeFreePool,SafeFreePool,MemoryAllocationLib,MdePkg

 EfiDriverLib,EfiCreateEventReadyToBoot,EfiCreateEventReadyToBootEx,UefiLib,MdePkg

 EfiDriverLib,EfiCreateEventLegacyBoot,EfiCreateEventLegacyBootEx,UefiLib,MdePkg

 EfiDriverLib,EfiInitializeFwVolDevicepathNode,EfiInitializeFwVolDevicepathNode,UefiLib,MdePkg

@@ -74,6 +75,7 @@ EfiCommonLib,COMMA_TYPE,COMMA_TYPE,PrintLib,MdePkg
 EfiCommonLib,DivU64x32,DivU64x64Remainder,BaseLib,MdePkg

 EfiCommonLib,EfiAsciiStrCpy,AsciiStrCpy,BaseLib,MdePkg

 EfiCommonLib,EfiAsciiStrLen,AsciiStrLen,BaseLib,MdePkg

+EfiCommonLib,EfiAsciiStrCmp,AsciiStrCmp,BaseLib,MdePkg

 EfiCommonLib,EfiCommonIoRead,n/a,n/a,MdePkg

 EfiCommonLib,EfiCommonIoWrite,n/a,n/a,MdePkg

 EfiCommonLib,EfiCommonLibCopyMem,CopyMem,BaseMemoryLib,MdePkg

@@ -88,14 +90,16 @@ EfiCommonLib,EfiDebugAssertWorker,n/a,n/a,MdePkg
 EfiCommonLib,EfiDebugVPrintWorker,n/a,n/a,MdePkg

 EfiCommonLib,EfiInitializeCommonDriverLib,n/a,n/a,MdePkg

 EfiCommonLib,EfiLibGetSystemConfigurationTable,EfiGetSystemConfigurationTable,UefiLib,MdePkg

+EfiCommonLib,EfiAsciiStrSize,AsciiStrSize,BaseLib,MdePkg

 EfiCommonLib,EfiStrCat,StrCat,BaseLib,MdePkg

 EfiCommonLib,EfiStrCmp,StrCmp,BaseLib,MdePkg

 EfiCommonLib,EfiStrCpy,StrCpy,BaseLib,MdePkg

 EfiCommonLib,EfiStrLen,StrLen,BaseLib,MdePkg

+EfiCommonLib,EfiStrnCmp,StrnCmp,BaseLib,MdePkg

 EfiCommonLib,EfiStrSize,StrSize,BaseLib,MdePkg

+EfiCommonLib,EfiStrStr,StrStr,BaseLib,MdePkg

 EfiCommonLib,EfiStrTrim,R8_EfiStrTrim,%,MdePkg

 EfiCommonLib,EfiValueToHexStr,R8_EfiValueToHexStr,%,MdePkg

-EfiCommonLib,EfiValueToString,AsciiValueToString,PrintLib,MdePkg

 EfiCommonLib,EFI_ALIGN,ALIGN_POINTER,BaseLib,MdePkg

 EfiCommonLib,GetPowerOfTwo,GetPowerOfTwo64,BaseLib,MdePkg

 EfiCommonLib,HexStringToBuf,R8_HexStringToBuf,%,MdePkg

@@ -143,6 +147,8 @@ EfiCommonLib,EFI_D_GENERIC,(DEBUG_ERROR | DEBUG_INIT | DEBUG_WARN | DEBUG_INFO |
 EfiCommonLib,EFI_D_INTRINSIC,(DEBUG_EVENT | DEBUG_POOL | DEBUG_PAGE | DEBUG_LOAD | DEBUG_BM | DEBUG_VARIABLE),DebugLib,MdePkg

 EfiCommonLib,EFI_D_RESERVED,((DEBUG_ERROR | DEBUG_INIT | DEBUG_WARN | DEBUG_INFO | DEBUG_BLKIO | DEBUG_NET | DEBUG_UNDI) | (DEBUG_EVENT | DEBUG_POOL | DEBUG_PAGE | DEBUG_LOAD | DEBUG_BM | DEBUG_VARIABLE)),DebugLib,MdePkg

 EfiCommonLib,EFI_DBUG_MASK,DEBUG_ERROR,DebugLib,MdePkg

+EfiPrintLib,VSPrint,UnicodeVSPrint,PrintLib,MdePkg

+EfiPrintLib,SPrint,UnicodeSPrint,PrintLib,MdePkg

 PeiLib,ASPrint,AsciiSPrint,PrintLib,MdePkg

 PeiLib,AvSPrint,AsciiVSPrint,PrintLib,MdePkg

 PeiLib,CompareGuid,CompareGuid,BaseMemoryLib,MdePkg

diff --git a/Tools/Conf/Migration/Macro.csv b/Tools/Conf/Migration/Macro.csv
index b9ff903b6f..71c70b5c8c 100644
--- a/Tools/Conf/Migration/Macro.csv
+++ b/Tools/Conf/Migration/Macro.csv
@@ -1,4 +1,6 @@
 R8.5 Name,R9 Name,Package

+MEDIA_FV_DP,MEDIA_PIWG_FW_VOL_DP,MdePkg

+MEDIA_FV_FILEPATH_DP,MEDIA_PIWG_FW_FILE_DP,MdePkg

 BBS_TYPE_DEV,BBS_TYPE_BEV,MdePkg

 BOOT_OBJECT_AUTHORIZATION_PARMSET_GUIDVALUE,BOOT_OBJECT_AUTHORIZATION_PARMSET_GUID,MdePkg

 CONTROLLER_DEVICE_PATH.Controller,CONTROLLER_DEVICE_PATH.ControllerNumber,MdePkg

@@ -35,13 +37,12 @@ EFI_IMAGE_MACHINE_IA64,IMAGE_FILE_MACHINE_IA64,MdePkg
 EFI_IMAGE_MACHINE_EBC,IMAGE_FILE_MACHINE_EBC,MdePkg

 EFI_IMAGE_MACHINE_X64,IMAGE_FILE_MACHINE_X64,MdePkg

 EFI_TEXT_OUTPUT_STRING,EFI_TEXT_STRING,MdePkg

-EFI_EVENT_TIMER,EVENT_TIMER,MdePkg

-EFI_EVENT_RUNTIME,EVENT_RUNTIME,MdePkg

-EFI_EVENT_RUNTIME_CONTEXT,EVENT_RUNTIME_CONTEXT  ,MdePkg

-EFI_EVENT_NOTIFY_WAIT,EVENT_NOTIFY_WAIT,MdePkg

-EFI_EVENT_NOTIFY_SIGNAL,EVENT_NOTIFY_SIGNAL,MdePkg

-EFI_EVENT_SIGNAL_EXIT_BOOT_SERVICES,EVENT_SIGNAL_EXIT_BOOT_SERVICES,MdePkg

-EFI_EVENT_SIGNAL_VIRTUAL_ADDRESS_CHANGE,EVENT_SIGNAL_VIRTUAL_ADDRESS_CHANGE,MdePkg

+EFI_EVENT_TIMER,EVT_TIMER,MdePkg

+EFI_EVENT_RUNTIME,EVT_RUNTIME,MdePkg

+EFI_EVENT_NOTIFY_WAIT,EVT_NOTIFY_WAIT,MdePkg

+EFI_EVENT_NOTIFY_SIGNAL,EVT_NOTIFY_SIGNAL,MdePkg

+EFI_EVENT_SIGNAL_EXIT_BOOT_SERVICES,EVT_SIGNAL_EXIT_BOOT_SERVICES,MdePkg

+EFI_EVENT_SIGNAL_VIRTUAL_ADDRESS_CHANGE,EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE,MdePkg

 EFI_TPL_APPLICATION,TPL_APPLICATION,MdePkg

 EFI_TPL_CALLBACK,TPL_CALLBACK,MdePkg

 EFI_TPL_NOTIFY,TPL_NOTIFY,MdePkg

diff --git a/Tools/Conf/Migration/Protocol.csv b/Tools/Conf/Migration/Protocol.csv
index 6ca3c33659..b9b73c6f97 100644
--- a/Tools/Conf/Migration/Protocol.csv
+++ b/Tools/Conf/Migration/Protocol.csv
@@ -1,4 +1,12 @@
 Name,R8.5 Cname,R9 Cname,Guid Value,Package

+FirmwareVolume2,gEfiFirmwareVolume2ProtocolGuid,gEfiFirmwareVolume2ProtocolGuid,220e73b6-6bdb-4413-8405-b974b108619a,MdePkg

+HiiConfigAccess,gEfiHiiConfigAccessProtocolGuid,gEfiHiiConfigAccessProtocolGuid,330d4706-f2a0-4e4f-a369-b66fa8d54385,MdePkg

+HiiConfigRouting,gEfiHiiConfigRoutingProtocolGuid,gEfiHiiConfigRoutingProtocolGuid,587e72d7-cc50-4f79-8209-ca291fc1a10f,MdePkg

+HiiDatabase,gEfiHiiDatabaseProtocolGuid,gEfiHiiDatabaseProtocolGuid,ef9fc172-a1b2-4693-b327-6d32fc416042,MdePkg

+HiiFont,gEfiHiiFontProtocolGuid,gEfiHiiFontProtocolGuid,e9ca4775-8657-47fc-97e7-7ed65a084324,MdePkg

+HiiImage,gEfiHiiImageProtocolGuid,gEfiHiiImageProtocolGuid,31a6406a-6bdf-4e46-b2a2-ebaa89c40920,MdePkg

+HiiString,gEfiHiiStringProtocolGuid,gEfiHiiStringProtocolGuid,0fd96974-23aa-4cdc-b9cb-98d17750322a,MdePkg

+FormBrowser2,gEfiFormBrowser2ProtocolGuid,gEfiFormBrowser2ProtocolGuid,b9d4c360-bcfb-4f9b-9298-53c136982258,MdePkg

 Bds,gEfiBdsArchProtocolGuid,gEfiBdsArchProtocolGuid,665E3FF6-46CC-11D4-9A38-0090273FC14D,MdePkg

 Cpu,gEfiCpuArchProtocolGuid,gEfiCpuArchProtocolGuid,26BACCB1-6F42-11D4-BCE7-0080C73C8881,MdePkg

 Metronome,gEfiMetronomeArchProtocolGuid,gEfiMetronomeArchProtocolGuid,26BACCB2-6F42-11D4-BCE7-0080C73C8881,MdePkg

@@ -129,7 +137,7 @@ FaultTolerantWriteLite,gEfiFaultTolerantWriteLiteProtocolGuid,gEfiFaultTolerantW
 ConsoleControl,gEfiConsoleControlProtocolGuid,gEfiConsoleControlProtocolGuid,F42F7782-012E-4C12-9956-49F94304F721,EdkModulePkg

 OEMBadging,gEfiOEMBadgingProtocolGuid,gEfiOEMBadgingProtocolGuid,170E13C0-BF1B-4218-871D-2ABDC6F887BC,EdkModulePkg

 UgaSplash,gEfiUgaSplashProtocolGuid,gEfiUgaSplashProtocolGuid,A45B3A0D-2E55-4C03-AD9C-27D4820B507E,EdkModulePkg

-AcpiS3Save,gEfiAcpiS3SaveProtocolGuid,gEfiAcpiS3SaveProtocolGuid,125F2DE1-FB85-440C-A54C-4D99358A8D38,EdkModulePkg

+AcpiS3Save,gEfiAcpiS3SaveGuid,gEfiAcpiS3SaveProtocolGuid,125F2DE1-FB85-440C-A54C-4D99358A8D38,EdkModulePkg

 PxeDhcp4,gEfiPxeDhcp4ProtocolGuid,gEfiPxeDhcp4ProtocolGuid,03C4E624-AC28-11D3-9A2D-0090293FC14D,EdkModulePkg

 PxeDhcp4Callback,gEfiPxeDhcp4CallbackProtocolGuid,gEfiPxeDhcp4CallbackProtocolGuid,C1544C01-92A4-4198-8A84-778583C23621,EdkModulePkg

 UgaIo,gEfiUgaIoProtocolGuid,gEfiUgaIoProtocolGuid,61A4D49E-6F68-4F1B-B922-A86EED0B07A2,EdkModulePkg

diff --git a/Tools/Conf/Migration/R8Lib.c b/Tools/Conf/Migration/R8Lib.c
index d0ffd26232..9ee9d72667 100644
--- a/Tools/Conf/Migration/R8Lib.c
+++ b/Tools/Conf/Migration/R8Lib.c
@@ -326,7 +326,7 @@ R8_HexStringToBuf (
   //

   // Find out how many hex characters the string has.

   //

-  for (Idx = 0, HexCnt = 0; IsHexDigit (&Digit, Str[Idx]); Idx++, HexCnt++);

+  for (Idx = 0, HexCnt = 0; R8_IsHexDigit (&Digit, Str[Idx]); Idx++, HexCnt++);

 

   if (HexCnt == 0) {

     *Len = 0;

@@ -349,7 +349,7 @@ R8_HexStringToBuf (
 

   for (Idx = 0; Idx < HexCnt; Idx++) {

 

-    IsHexDigit (&Digit, Str[HexCnt - 1 - Idx]);

+    R8_IsHexDigit (&Digit, Str[HexCnt - 1 - Idx]);

 

     //

     // For odd charaters, write the lower nibble for each buffer byte,