Merge branch of PI tree to main trunk

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

1 files changed, 9 insertions, 12 deletions

diff --git a/MdeModulePkg/Core/Pei/Dependency/dependency.c b/MdeModulePkg/Core/Pei/Dependency/dependency.c
index c817a3d171..7ea840d23a 100644
--- a/MdeModulePkg/Core/Pei/Dependency/dependency.c
+++ b/MdeModulePkg/Core/Pei/Dependency/dependency.c
@@ -87,11 +87,10 @@ Returns:
 }

 

 

-EFI_STATUS

+BOOLEAN

 PeimDispatchReadiness (

   IN EFI_PEI_SERVICES   **PeiServices,

-  IN VOID               *DependencyExpression,

-  OUT BOOLEAN           *Runnable

+  IN VOID               *DependencyExpression

   )

 /*++

 

@@ -130,7 +129,6 @@ Returns:
   EVAL_STACK_ENTRY               EvalStack[MAX_GRAMMAR_SIZE];

 

   Iterator  = DependencyExpression;

-  *Runnable = FALSE;

 

   StackPtr = &EvalStack[0];

 

@@ -149,7 +147,7 @@ Returns:
         // EvalStack on the push

         //

         if (StackPtr > &EvalStack[MAX_GRAMMAR_SIZE-1]) {

-          return EFI_INVALID_PARAMETER;

+          return FALSE;

         }

 

         //

@@ -170,7 +168,7 @@ Returns:
         // did two POPs.

         //

         if (StackPtr < &EvalStack[2]) {

-          return EFI_INVALID_PARAMETER;

+          return FALSE;

         }

 

         //

@@ -208,10 +206,9 @@ Returns:
         // an error in the dependency grammar, so return EFI_INVALID_PARAMETER.

         //

         if (StackPtr != &EvalStack[0]) {

-          return EFI_INVALID_PARAMETER;

+          return FALSE;

         }

-        *Runnable = IsPpiInstalled (PeiServices, StackPtr);

-        return EFI_SUCCESS;

+        return IsPpiInstalled (PeiServices, StackPtr);

         break;

 

       case (EFI_DEP_NOT):    

@@ -222,7 +219,7 @@ Returns:
         // did a POP.

         //

         if (StackPtr < &EvalStack[1]) {

-          return EFI_INVALID_PARAMETER;

+          return FALSE;

         }

         (StackPtr-1)->Result = (BOOLEAN) !IsPpiInstalled (PeiServices, (StackPtr-1));

         (StackPtr-1)->Operator = NULL;

@@ -235,7 +232,7 @@ Returns:
         // EvalStack on the push

         //

         if (StackPtr > &EvalStack[MAX_GRAMMAR_SIZE-1]) {

-          return EFI_INVALID_PARAMETER;

+          return FALSE;

         }

         //

         // Iterator has increased by 1 after we retrieve the operand, so here we 

@@ -255,7 +252,7 @@ Returns:
         //

         // The grammar should never arrive here

         //

-        return EFI_INVALID_PARAMETER;

+        return FALSE;

         break;

     }

   }