Remove EFI_BDS_ARCH_PROTOCOL_INSTANCE from PlatformBdsLib.h and BdsDxe module

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

diff --git a/DuetPkg/Library/DuetBdsLib/BdsPlatform.c b/DuetPkg/Library/DuetBdsLib/BdsPlatform.c
index 0347005ab241123888a890628b10be15d93aebd6..7949cedff31b1159a76aeb3b015fa28f9f26fd5b 100644 (file)
--- a/DuetPkg/Library/DuetBdsLib/BdsPlatform.c
+++ b/DuetPkg/Library/DuetBdsLib/BdsPlatform.c
@@ -349,8 +349,9 @@ Returns:
 \r
 \r
 VOID\r
+EFIAPI\r
 PlatformBdsInit (\r
-  IN EFI_BDS_ARCH_PROTOCOL_INSTANCE  *PrivateData\r
+  VOID\r
   )\r
 /*++\r
 \r
@@ -361,8 +362,6 @@ Routine Description:
 \r
 Arguments:\r
 \r
-  PrivateData  - The EFI_BDS_ARCH_PROTOCOL_INSTANCE instance\r
-\r
 Returns:\r
 \r
   None.\r
@@ -1117,8 +1116,8 @@ Returns:
 }\r
 \r
 VOID\r
+EFIAPI\r
 PlatformBdsPolicyBehavior (\r
-  IN EFI_BDS_ARCH_PROTOCOL_INSTANCE  *PrivateData,\r
   IN OUT LIST_ENTRY              *DriverOptionList,\r
   IN OUT LIST_ENTRY              *BootOptionList\r
   )\r
@@ -1132,8 +1131,6 @@ Routine Description:
   \r
 Arguments:\r
 \r
-  PrivateData      - The EFI_BDS_ARCH_PROTOCOL_INSTANCE instance\r
-  \r
   DriverOptionList - The header of the driver option link list\r
   \r
   BootOptionList   - The header of the boot option link list\r
@@ -1152,6 +1149,7 @@ Returns:
   UINTN                              Index;\r
   EFI_INPUT_KEY                      Key;\r
   EFI_TPL                            OldTpl;\r
+  EFI_BOOT_MODE                      BootMode;\r
 \r
   //\r
   // Init the time out value\r
@@ -1166,14 +1164,14 @@ Returns:
   //\r
   // Get current Boot Mode\r
   //\r
-  Status = BdsLibGetBootMode (&PrivateData->BootMode);\r
-  DEBUG ((EFI_D_ERROR, "Boot Mode:%x\n", PrivateData->BootMode));\r
+  Status = BdsLibGetBootMode (&BootMode);\r
+  DEBUG ((EFI_D_ERROR, "Boot Mode:%x\n", BootMode));\r
 \r
   //\r
   // Go the different platform policy with different boot mode\r
   // Notes: this part code can be change with the table policy\r
   //\r
-  ASSERT (PrivateData->BootMode == BOOT_WITH_FULL_CONFIGURATION);\r
+  ASSERT (BootMode == BOOT_WITH_FULL_CONFIGURATION);\r
   //\r
   // Connect platform console\r
   //\r
@@ -1287,6 +1285,7 @@ Returns:
 }\r
 \r
 VOID\r
+EFIAPI\r
 PlatformBdsBootSuccess (\r
   IN  BDS_COMMON_OPTION *Option\r
   )\r
@@ -1323,6 +1322,7 @@ Returns:
 }\r
 \r
 VOID\r
+EFIAPI\r
 PlatformBdsBootFail (\r
   IN  BDS_COMMON_OPTION  *Option,\r
   IN  EFI_STATUS         Status,\r

diff --git a/DuetPkg/Library/DuetBdsLib/BdsPlatform.h b/DuetPkg/Library/DuetBdsLib/BdsPlatform.h
index 5b38f318951fac2e575ab173d00d65a33bc187f6..173f77bc1bd2f4f195322a0680f300c37ce887a1 100644 (file)
--- a/DuetPkg/Library/DuetBdsLib/BdsPlatform.h
+++ b/DuetPkg/Library/DuetBdsLib/BdsPlatform.h
@@ -215,18 +215,6 @@ extern PLATFORM_ROOT_BRIDGE_DEVICE_PATH  gPlatformRootBridge0;
 //\r
 // Platform BDS Functions\r
 //\r
-VOID\r
-PlatformBdsInit (\r
-  IN EFI_BDS_ARCH_PROTOCOL_INSTANCE  *PrivateData\r
-  );\r
-\r
-VOID\r
-PlatformBdsPolicyBehavior (\r
-  IN EFI_BDS_ARCH_PROTOCOL_INSTANCE  *PrivateData,\r
-  IN LIST_ENTRY                  *DriverOptionList,\r
-  IN LIST_ENTRY                  *BootOptionList\r
-  );\r
-\r
 VOID\r
 PlatformBdsGetDriverOption (\r
   IN LIST_ENTRY               *BdsDriverLists\r
@@ -252,19 +240,6 @@ PlatformBdsConnectSequence (
   VOID\r
   );\r
 \r
-VOID\r
-PlatformBdsBootFail (\r
-  IN  BDS_COMMON_OPTION  *Option,\r
-  IN  EFI_STATUS         Status,\r
-  IN  CHAR16             *ExitData,\r
-  IN  UINTN              ExitDataSize\r
-  );\r
-\r
-VOID\r
-PlatformBdsBootSuccess (\r
-  IN  BDS_COMMON_OPTION *Option\r
-  );\r
-\r
 EFI_STATUS\r
 ProcessCapsules (\r
   EFI_BOOT_MODE BootMode\r