changed the Esal call function ids all over the tree

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

EdkModulePkg/Universal/EmuVariable/RuntimeDxe/Ipf/InitVariable.c

@@ -53,7 +53,7 @@ Returns:
   SAL_RETURN_REGS ReturnVal;
 
   switch (FunctionId) {
-  case EsalGetVariable:
+  case EsalGetVariableFunctionId:
     ReturnVal.Status = GetVariable (
                         (CHAR16 *) Arg2,
                         (EFI_GUID *) Arg3,
@@ -65,7 +65,7 @@ Returns:
                         );
     return ReturnVal;
 
-  case EsalGetNextVariableName:
+  case EsalGetNextVariableNameFunctionId:
     ReturnVal.Status = GetNextVariableName (
                         (UINTN *) Arg2,
                         (CHAR16 *) Arg3,
@@ -75,7 +75,7 @@ Returns:
                         );
     return ReturnVal;
 
-  case EsalSetVariable:
+  case EsalSetVariableFunctionId:
     ReturnVal.Status = SetVariable (
                         (CHAR16 *) Arg2,
                         (EFI_GUID *) Arg3,
@@ -89,7 +89,7 @@ Returns:
                         );
     return ReturnVal;
 
-  case EsalQueryVariableInfo:
+  case EsalQueryVariableInfoFunctionId:
     ReturnVal.Status = QueryVariableInfo (
                         (UINT32) Arg2,
                         (UINT64 *) Arg3,
@@ -166,13 +166,13 @@ Returns:
     &gEfiExtendedSalVariableServicesProtocolGuid,
     mVariableModuleGlobal,
     EsalVariableCommonEntry,
-    EsalGetVariable,
+    EsalGetVariableFunctionId,
     EsalVariableCommonEntry,
-    EsalGetNextVariableName,
+    EsalGetNextVariableNameFunctionId,
     EsalVariableCommonEntry,
-    EsalSetVariable,
+    EsalSetVariableFunctionId,
     EsalVariableCommonEntry,
-    EsalQueryVariableInfo,
+    EsalQueryVariableInfoFunctionId,
     NULL
     );
 

EdkModulePkg/Universal/StatusCode/Dxe/Ipf/DxeStatusCodeIpf.c

@@ -206,7 +206,7 @@ ReportEsalServiceEntry (
 
   switch (FunctionId) {
 
-  case ReportStatusCodeService:
+  case ReportStatusCodeServiceFunctionId:
 
     DxeStatusCode = (DXE_STATUS_CODE_CONTROLLER *) Global;
 
@@ -315,7 +315,7 @@ DxeStatusCodeDriverEntry (
              &gEfiExtendedSalStatusCodeServicesProtocolGuid,
             &gDxeStatusCode,
              ReportEsalServiceEntry,
-             StatusCode,
+             StatusCodeFunctionId,
              NULL
              );
   ASSERT_EFI_ERROR (Status);

EdkModulePkg/Universal/Variable/RuntimeDxe/Ipf/InitVariable.c

@@ -53,7 +53,7 @@ Returns:
   SAL_RETURN_REGS ReturnVal;
 
   switch (FunctionId) {
-  case EsalGetVariable:
+  case EsalGetVariableFunctionId:
     ReturnVal.Status = GetVariable (
                         (CHAR16 *) Arg2,
                         (EFI_GUID *) Arg3,
@@ -65,7 +65,7 @@ Returns:
                         );
     return ReturnVal;
 
-  case EsalGetNextVariableName:
+  case EsalGetNextVariableNameFunctionId:
     ReturnVal.Status = GetNextVariableName (
                         (UINTN *) Arg2,
                         (CHAR16 *) Arg3,
@@ -75,7 +75,7 @@ Returns:
                         );
     return ReturnVal;
 
-  case EsalSetVariable:
+  case EsalSetVariableFunctionId:
     ReturnVal.Status = SetVariable (
                         (CHAR16 *) Arg2,
                         (EFI_GUID *) Arg3,
@@ -89,7 +89,7 @@ Returns:
                         );
     return ReturnVal;
 
-  case EsalQueryVariableInfo:
+  case EsalQueryVariableInfoFunctionId:
     ReturnVal.Status = QueryVariableInfo (
                         (UINT32) Arg2,
                         (UINT64 *) Arg3,
@@ -166,13 +166,13 @@ Returns:
     &gEfiExtendedSalVariableServicesProtocolGuid,
     mVariableModuleGlobal,
     EsalVariableCommonEntry,
-    EsalGetVariable,
+    EsalGetVariableFunctionId,
     EsalVariableCommonEntry,
-    EsalGetNextVariableName,
+    EsalGetNextVariableNameFunctionId,
     EsalVariableCommonEntry,
-    EsalSetVariable,
+    EsalSetVariableFunctionId,
     EsalVariableCommonEntry,
-    EsalQueryVariableInfo,
+    EsalQueryVariableInfoFunctionId,
     NULL
     );