3 files changed, 45 insertions, 29 deletions
diff --git a/IntelFspPkg/Include/Library/FspCommonLib.h b/IntelFspPkg/Include/Library/FspCommonLib.h
index 50e9b260bf..c97ee51de3 100644
--- a/IntelFspPkg/Include/Library/FspCommonLib.h
+++ b/IntelFspPkg/Include/Library/FspCommonLib.h
@@ -1,6 +1,6 @@
 /** @file
 
-  Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2014 - 2015, Intel Corporation. All rights reserved.<BR>
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -170,4 +170,37 @@ SetFspMeasurePoint (
   IN UINT8  Id
   );
 
+/**
+  This function gets the FSP info header pointer.
+
+  @retval FspInfoHeader   FSP info header pointer
+**/
+FSP_INFO_HEADER *
+EFIAPI
+GetFspInfoHeader (
+  VOID
+  );
+
+/**
+  This function gets FSP API calling mode
+
+  @retval API calling mode
+**/
+UINT8
+EFIAPI
+GetFspApiCallingMode (
+  VOID
+  );
+
+/**
+  This function sets FSP API calling mode
+
+  @param[in] Mode     API calling mode
+**/
+VOID
+EFIAPI
+SetFspApiCallingMode (
+  UINT8  Mode
+  );
+
 #endif
diff --git a/IntelFspPkg/Include/Library/FspPlatformLib.h b/IntelFspPkg/Include/Library/FspPlatformLib.h
index 855017880b..1132320dd2 100644
--- a/IntelFspPkg/Include/Library/FspPlatformLib.h
+++ b/IntelFspPkg/Include/Library/FspPlatformLib.h
@@ -1,6 +1,6 @@
 /** @file
 
-  Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2014 - 2015, Intel Corporation. All rights reserved.<BR>
   This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -38,6 +38,16 @@ FspMigrateTemporaryMemory (
   );
 
 /**
+  Set a new stack frame for the continuation function
+
+**/
+VOID
+EFIAPI
+FspSetNewStackFrame (
+  VOID
+  );
+
+/**
   This function transfer control to the ContinuationFunc passed in by the
   bootloader.
 
diff --git a/IntelFspPkg/Include/Library/FspReturnLib.h b/IntelFspPkg/Include/Library/FspReturnLib.h
deleted file mode 100644
index 40b69a8e53..0000000000
--- a/IntelFspPkg/Include/Library/FspReturnLib.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/** @file
-
-  Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>
-  This program and the accompanying materials
-  are licensed and made available under the terms and conditions of the BSD License
-  which accompanies this distribution.  The full text of the license may be found at
-  http://opensource.org/licenses/bsd-license.php.
-
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
-**/
-
-#ifndef _FSP_RETURN_LIB_H_
-#define _FSP_RETURN_LIB_H_
-
-/**
-  Return the control from FSP to the Caller.
-
-**/
-VOID
-EFIAPI
-AsmFspReturn (
-  VOID
-  );
-
-#endif