Remove EFI_BDS_ARCH_PROTOCOL_INSTANCE from PlatformBdsLib.h and BdsDxe module

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

diff --git a/IntelFrameworkModulePkg/Include/Library/PlatformBdsLib.h b/IntelFrameworkModulePkg/Include/Library/PlatformBdsLib.h
index e9e713aa49f9be627189d05d7f8d00b67db2e4ba..5a85deb5fe7ea21af0bd8550f51aa3758e2873bb 100644 (file)
--- a/IntelFrameworkModulePkg/Include/Library/PlatformBdsLib.h
+++ b/IntelFrameworkModulePkg/Include/Library/PlatformBdsLib.h
@@ -20,45 +20,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Protocol/GenericMemoryTest.h>\r
 #include <Library/GenericBdsLib.h>\r
 \r
-//\r
-// Bds AP Context data\r
-//\r
-#define EFI_BDS_ARCH_PROTOCOL_INSTANCE_SIGNATURE  SIGNATURE_32 ('B', 'd', 's', 'A')\r
-typedef struct _EFI_BDS_ARCH_PROTOCOL_INSTANCE EFI_BDS_ARCH_PROTOCOL_INSTANCE;\r
-\r
-struct _EFI_BDS_ARCH_PROTOCOL_INSTANCE {\r
-  UINTN                     Signature;\r
-  EFI_HANDLE                Handle;\r
-  EFI_BDS_ARCH_PROTOCOL     Bds;\r
-  ///\r
-  /// Save the current boot mode\r
-  ///\r
-  EFI_BOOT_MODE             BootMode;\r
-  ///\r
-  /// Set true if boot with default settings\r
-  ///\r
-  BOOLEAN                   DefaultBoot;\r
-  ///\r
-  /// The system default timeout for choose the boot option\r
-  ///\r
-  UINT16                    TimeoutDefault;\r
-  ///\r
-  /// Memory Test Level\r
-  ///\r
-  EXTENDMEM_COVERAGE_LEVEL  MemoryTestLevel;\r
-};\r
-\r
 /**\r
   Platform Bds init. Include the platform firmware vendor, revision\r
   and so crc check.\r
 \r
-  @param  PrivateData             The EFI_BDS_ARCH_PROTOCOL_INSTANCE instance\r
-\r
 **/\r
 VOID\r
 EFIAPI\r
 PlatformBdsInit (\r
-  IN EFI_BDS_ARCH_PROTOCOL_INSTANCE  *PrivateData\r
+  VOID\r
   );\r
 \r
 /**\r
@@ -66,7 +36,6 @@ PlatformBdsInit (
   is driven by boot mode. IBV/OEM can customize this code for their specific\r
   policy action.\r
 \r
-  @param  PrivateData             The EFI_BDS_ARCH_PROTOCOL_INSTANCE instance\r
   @param  DriverOptionList        The header of the driver option link list\r
   @param  BootOptionList          The header of the boot option link list\r
 \r
@@ -74,7 +43,6 @@ PlatformBdsInit (
 VOID\r
 EFIAPI\r
 PlatformBdsPolicyBehavior (\r
-  IN EFI_BDS_ARCH_PROTOCOL_INSTANCE  *PrivateData,\r
   IN LIST_ENTRY                      *DriverOptionList,\r
   IN LIST_ENTRY                      *BootOptionList\r
   );\r

diff --git a/IntelFrameworkModulePkg/Library/PlatformBdsLibNull/BdsPlatform.c b/IntelFrameworkModulePkg/Library/PlatformBdsLibNull/BdsPlatform.c
index f202c9778aebc41fbd0e8e03063a32b3c83e4ab4..855faf6ee004426e2e73b2714266d2955bdeecb7 100644 (file)
--- a/IntelFrameworkModulePkg/Library/PlatformBdsLibNull/BdsPlatform.c
+++ b/IntelFrameworkModulePkg/Library/PlatformBdsLibNull/BdsPlatform.c
@@ -21,16 +21,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   Platform Bds init. Include the platform firmware vendor, revision\r
   and so crc check.\r
 \r
-  @param  PrivateData             The EFI_BDS_ARCH_PROTOCOL_INSTANCE instance\r
-\r
 **/\r
 VOID\r
 EFIAPI\r
 PlatformBdsInit (\r
-  IN EFI_BDS_ARCH_PROTOCOL_INSTANCE  *PrivateData\r
+  VOID\r
   )\r
 {\r
-  return;\r
 }\r
 \r
 /**\r
@@ -62,7 +59,6 @@ PlatformBdsConnectSequence (
   VOID\r
   )\r
 {\r
-  return;\r
 }\r
 \r
 /**\r
@@ -77,7 +73,6 @@ PlatformBdsGetDriverOption (
   IN OUT LIST_ENTRY              *BdsDriverLists\r
   )\r
 {\r
-  return;\r
 }\r
 \r
 /**\r
@@ -94,7 +89,6 @@ PlatformBdsDiagnostics (
   IN BOOLEAN                     QuietBoot\r
   )\r
 {\r
-  return;\r
 }\r
 \r
 /**\r
@@ -102,7 +96,6 @@ PlatformBdsDiagnostics (
   is driven by boot mode. IBV/OEM can customize this code for their specific\r
   policy action.\r
 \r
-  @param  PrivateData             The EFI_BDS_ARCH_PROTOCOL_INSTANCE instance\r
   @param  DriverOptionList        The header of the driver option link list\r
   @param  BootOptionList          The header of the boot option link list\r
 \r
@@ -110,12 +103,10 @@ PlatformBdsDiagnostics (
 VOID\r
 EFIAPI\r
 PlatformBdsPolicyBehavior (\r
-  IN EFI_BDS_ARCH_PROTOCOL_INSTANCE  *PrivateData,\r
   IN LIST_ENTRY                      *DriverOptionList,\r
   IN LIST_ENTRY                      *BootOptionList\r
   )\r
 {\r
-  return ;\r
 }\r
 \r
 /**\r
@@ -133,7 +124,6 @@ PlatformBdsBootSuccess (
   IN  BDS_COMMON_OPTION *Option\r
   )\r
 {\r
-  return;\r
 }\r
 \r
 /**\r
@@ -154,7 +144,6 @@ PlatformBdsBootFail (
   IN  UINTN              ExitDataSize\r
   )\r
 {\r
-  return;\r
 }\r
 \r
 /**\r

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/Bds.h b/IntelFrameworkModulePkg/Universal/BdsDxe/Bds.h
index 0b9b19a996bd650f9ae470a640609d41e93eb98a..d92ab8298bfd69e17880c198c05ccd7daa52fb68 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/Bds.h
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/Bds.h
@@ -64,13 +64,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/GenericBdsLib.h>\r
 #include <Library/PlatformBdsLib.h>\r
 \r
-#define EFI_BDS_ARCH_PROTOCOL_INSTANCE_FROM_THIS(_this) \\r
-  CR ((_this),                                          \\r
-      EFI_BDS_ARCH_PROTOCOL_INSTANCE,                   \\r
-      Bds,                                              \\r
-      EFI_BDS_ARCH_PROTOCOL_INSTANCE_SIGNATURE          \\r
-      )\r
-\r
 #pragma pack(1)\r
 \r
 ///\r

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BdsEntry.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BdsEntry.c
index ac37f10529eb6f5e6a3b7f2a147c337b1743ce28..322cb59f99aa88255ffa8c5c84a5d68e8b2237ef 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BdsEntry.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BdsEntry.c
@@ -30,14 +30,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 /// Please refer to the library useage of BdsLibGetBootMode, BdsLibGetTimeout \r
 /// and PlatformBdsDiagnostics in BdsPlatform.c\r
 ///\r
-EFI_BDS_ARCH_PROTOCOL_INSTANCE  gBdsInstanceTemplate = {\r
-  EFI_BDS_ARCH_PROTOCOL_INSTANCE_SIGNATURE,\r
-  NULL,\r
-  {BdsEntry},\r
-  0xFFFF,\r
-  TRUE,\r
-  0,\r
-  EXTENSIVE\r
+EFI_HANDLE  gBdsHandle = NULL;\r
+\r
+EFI_BDS_ARCH_PROTOCOL  gBds = {\r
+  BdsEntry\r
 };\r
 \r
 UINT16                          *mBootNext = NULL;\r
@@ -70,11 +66,10 @@ BdsInitialize (
   //\r
   // Install protocol interface\r
   //\r
-  Status = gBS->InstallProtocolInterface (\r
-                  &gBdsInstanceTemplate.Handle,\r
-                  &gEfiBdsArchProtocolGuid,\r
-                  EFI_NATIVE_INTERFACE,\r
-                  &gBdsInstanceTemplate.Bds\r
+  Status = gBS->InstallMultipleProtocolInterfaces (\r
+                  &gBdsHandle,\r
+                  &gEfiBdsArchProtocolGuid, &gBds,\r
+                  NULL\r
                   );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
@@ -280,7 +275,6 @@ BdsEntry (
   IN EFI_BDS_ARCH_PROTOCOL  *This\r
   )\r
 {\r
-  EFI_BDS_ARCH_PROTOCOL_INSTANCE  *PrivateData;\r
   LIST_ENTRY                      DriverOptionList;\r
   LIST_ENTRY                      BootOptionList;\r
   UINTN                           BootNextSize;\r
@@ -302,16 +296,11 @@ BdsEntry (
   //\r
   InitializeHotkeyService ();\r
 \r
-  //\r
-  // Get the BDS private data\r
-  //\r
-  PrivateData = EFI_BDS_ARCH_PROTOCOL_INSTANCE_FROM_THIS (This);\r
-\r
   //\r
   // Do the platform init, can be customized by OEM/IBV\r
   //\r
   PERF_START (0, "PlatformBds", "BDS", 0);\r
-  PlatformBdsInit (PrivateData);\r
+  PlatformBdsInit ();\r
 \r
   InitializeHwErrRecSupport();\r
   \r
@@ -344,7 +333,7 @@ BdsEntry (
   //\r
   // Setup some platform policy here\r
   //\r
-  PlatformBdsPolicyBehavior (PrivateData, &DriverOptionList, &BootOptionList);\r
+  PlatformBdsPolicyBehavior (&DriverOptionList, &BootOptionList);\r
   PERF_END (0, "PlatformBds", "BDS", 0);\r
 \r
   //\r