Finish spliting SecDispatchTableLib into two functions so it can be a BaseLib

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

2 files changed, 33 insertions, 14 deletions

diff --git a/UnixPkg/Include/Library/SecDispatchTableLib.h b/UnixPkg/Include/Library/SecDispatchTableLib.h
index 6cebb58b9b..9e220073f4 100644
--- a/UnixPkg/Include/Library/SecDispatchTableLib.h
+++ b/UnixPkg/Include/Library/SecDispatchTableLib.h
@@ -17,21 +17,40 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #ifndef __SEC_DISPATCH_TABLE_LIB_H__
 #define __SEC_DISPATCH_TABLE_LIB_H__
 
+
 /**
-  Allow an override of the Sec PPI Dispatch Table. This table contains PPIs passed
-  up from SEC to PEI. This function is responcible for allocating space for the 
-  overridden table.
+  Return the number of bytes that OverrideDispatchTable() will append to
+  the dispatch table.
+
+  @return  Size of table in bytes OverrideDispatchTable() will return
 
+**/
+UINTN
+EFIAPI
+OverrideDispatchTableExtraSize (
+  VOID
+  );
+  
+
+/**
+  Allow an override of the Sec PPI Dispatch Table. This table contains PPIs passed
+  up from SEC to PEI. 
 
-  @param  OriginalTable  SECs default PPI dispatch table
+  @param  OriginalTable         SECs default PPI dispatch table
+  @param  OriginalTableSize     Size of SECs default PPI dispatch table
+  @param  NewTable              New dispatch table
+  @param  NewTableSize          Size of of the NewTable in bytes
 
-  @return OriginalTable or override of the table
+  @return EFI_SUCCESS table was copied
 
 **/
-EFI_PEI_PPI_DESCRIPTOR *
+EFI_STATUS
 EFIAPI
 OverrideDispatchTable (
-  IN  CONST EFI_PEI_PPI_DESCRIPTOR  *OriginalTable
+  IN CONST EFI_PEI_PPI_DESCRIPTOR          *OriginalTable,
+  IN       UINTN                           OriginalTableSize,
+  IN OUT   EFI_PEI_PPI_DESCRIPTOR          *NewTable,
+  IN       UINTN                           NewTableSize
   );
 
 
diff --git a/UnixPkg/Include/Protocol/UnixThunk.h b/UnixPkg/Include/Protocol/UnixThunk.h
index 689e32fd7d..12d07f9311 100644
--- a/UnixPkg/Include/Protocol/UnixThunk.h
+++ b/UnixPkg/Include/Protocol/UnixThunk.h
@@ -373,13 +373,13 @@ typedef struct _EFI_UNIX_THUNK_PROTOCOL {
   UnixGetTimeZone                     GetTimeZone;
   UnixGetDayLight                     GetDayLight;
   UnixPoll	                          Poll;
-  UnixRead                           Read;
-  UnixWrite                          Write;
-  UnixGetenv                         Getenv;
-  UnixOpen                           Open;
-  UnixSeek                           Lseek;
-  UnixFtruncate                      FTruncate;
-  UnixClose                          Close;
+  UnixRead                            Read;
+  UnixWrite                           Write;
+  UnixGetenv                          Getenv;
+  UnixOpen                            Open;
+  UnixSeek                            Lseek;
+  UnixFtruncate                       FTruncate;
+  UnixClose                           Close;
   UnixMkdir                           MkDir;
   UnixRmDir                           RmDir;
   UnixUnLink                          UnLink;