diff options
| author | mdkinney <mdkinney@6f19259b-4bc3-4df7-8a09-765794883524> | 2009-06-07 04:43:19 +0000 |
|---|---|---|
| committer | mdkinney <mdkinney@6f19259b-4bc3-4df7-8a09-765794883524> | 2009-06-07 04:43:19 +0000 |
| commit | f7cdf5cdd38d0b5740046c26c7ca22f3d19ecb41 (patch) | |
| tree | c2b1b96cda20ae8e8c48f3b0a7972bf49f42db2b /IntelFrameworkModulePkg/Universal | |
| parent | 2ddf8375591d190aaca9360adfa762af0e829185 (diff) | |
| download | edk2-platforms-f7cdf5cdd38d0b5740046c26c7ca22f3d19ecb41.tar.xz | |
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
Diffstat (limited to 'IntelFrameworkModulePkg/Universal')
| -rw-r--r-- | IntelFrameworkModulePkg/Universal/BdsDxe/Bds.h | 7 | ||||
| -rw-r--r-- | IntelFrameworkModulePkg/Universal/BdsDxe/BdsEntry.c | 31 |
2 files changed, 10 insertions, 28 deletions
diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/Bds.h b/IntelFrameworkModulePkg/Universal/BdsDxe/Bds.h index 0b9b19a996..d92ab8298b 100644 --- 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>
#include <Library/PlatformBdsLib.h>
-#define EFI_BDS_ARCH_PROTOCOL_INSTANCE_FROM_THIS(_this) \
- CR ((_this), \
- EFI_BDS_ARCH_PROTOCOL_INSTANCE, \
- Bds, \
- EFI_BDS_ARCH_PROTOCOL_INSTANCE_SIGNATURE \
- )
-
#pragma pack(1)
///
diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BdsEntry.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BdsEntry.c index ac37f10529..322cb59f99 100644 --- 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
/// and PlatformBdsDiagnostics in BdsPlatform.c
///
-EFI_BDS_ARCH_PROTOCOL_INSTANCE gBdsInstanceTemplate = {
- EFI_BDS_ARCH_PROTOCOL_INSTANCE_SIGNATURE,
- NULL,
- {BdsEntry},
- 0xFFFF,
- TRUE,
- 0,
- EXTENSIVE
+EFI_HANDLE gBdsHandle = NULL;
+
+EFI_BDS_ARCH_PROTOCOL gBds = {
+ BdsEntry
};
UINT16 *mBootNext = NULL;
@@ -70,11 +66,10 @@ BdsInitialize ( //
// Install protocol interface
//
- Status = gBS->InstallProtocolInterface (
- &gBdsInstanceTemplate.Handle,
- &gEfiBdsArchProtocolGuid,
- EFI_NATIVE_INTERFACE,
- &gBdsInstanceTemplate.Bds
+ Status = gBS->InstallMultipleProtocolInterfaces (
+ &gBdsHandle,
+ &gEfiBdsArchProtocolGuid, &gBds,
+ NULL
);
ASSERT_EFI_ERROR (Status);
@@ -280,7 +275,6 @@ BdsEntry ( IN EFI_BDS_ARCH_PROTOCOL *This
)
{
- EFI_BDS_ARCH_PROTOCOL_INSTANCE *PrivateData;
LIST_ENTRY DriverOptionList;
LIST_ENTRY BootOptionList;
UINTN BootNextSize;
@@ -303,15 +297,10 @@ BdsEntry ( InitializeHotkeyService ();
//
- // Get the BDS private data
- //
- PrivateData = EFI_BDS_ARCH_PROTOCOL_INSTANCE_FROM_THIS (This);
-
- //
// Do the platform init, can be customized by OEM/IBV
//
PERF_START (0, "PlatformBds", "BDS", 0);
- PlatformBdsInit (PrivateData);
+ PlatformBdsInit ();
InitializeHwErrRecSupport();
@@ -344,7 +333,7 @@ BdsEntry ( //
// Setup some platform policy here
//
- PlatformBdsPolicyBehavior (PrivateData, &DriverOptionList, &BootOptionList);
+ PlatformBdsPolicyBehavior (&DriverOptionList, &BootOptionList);
PERF_END (0, "PlatformBds", "BDS", 0);
//
|