Revision: 16880
http://sourceforge.net/p/edk2/code/16880
Author: jljusten
Date: 2015-02-17 00:14:58 +0000 (Tue, 17 Feb 2015)
Log Message:
-----------
OvmfPkg/QemuFwCfgAcpiPlatformDxe: Move entry point to QemuFwCfgAcpi.c
Having this entry point in QemuFwCfgAcpi.c should not cause a problem
for the other driver which supports Xen and older QEMU versions.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jordan Justen <[email protected]>
Reviewed-by: Laszlo Ersek <[email protected]>
Modified Paths:
--------------
trunk/edk2/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c
trunk/edk2/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf
Removed Paths:
-------------
trunk/edk2/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatform.c
Modified: trunk/edk2/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c
===================================================================
--- trunk/edk2/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c 2015-02-17 00:05:41 UTC
(rev 16879)
+++ trunk/edk2/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c 2015-02-17 00:14:58 UTC
(rev 16880)
@@ -683,3 +683,41 @@
return Status;
}
+
+
+/**
+ Entrypoint of QEMU fw-cfg Acpi Platform driver.
+
+ @param ImageHandle
+ @param SystemTable
+
+ @return EFI_SUCCESS
+ @return EFI_LOAD_ERROR
+ @return EFI_OUT_OF_RESOURCES
+
+**/
+EFI_STATUS
+EFIAPI
+QemuFwCfgAcpiPlatformEntryPoint (
+ IN EFI_HANDLE ImageHandle,
+ IN EFI_SYSTEM_TABLE *SystemTable
+ )
+{
+ EFI_STATUS Status;
+ EFI_ACPI_TABLE_PROTOCOL *AcpiTable;
+
+ //
+ // Find the AcpiTable protocol
+ //
+ Status = gBS->LocateProtocol (
+ &gEfiAcpiTableProtocolGuid,
+ NULL,
+ (VOID**)&AcpiTable
+ );
+ if (EFI_ERROR (Status)) {
+ return EFI_ABORTED;
+ }
+
+ Status = InstallAllQemuLinkedTables (AcpiTable);
+ return Status;
+}
Deleted: trunk/edk2/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatform.c
===================================================================
--- trunk/edk2/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatform.c 2015-02-17
00:05:41 UTC (rev 16879)
+++ trunk/edk2/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatform.c 2015-02-17
00:14:58 UTC (rev 16880)
@@ -1,52 +0,0 @@
-/** @file
- OVMF ACPI Platform Driver using QEMU's fw-cfg interface
-
- Copyright (c) 2008 - 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.
-
-**/
-
-#include "AcpiPlatform.h"
-
-/**
- Entrypoint of Acpi Platform driver.
-
- @param ImageHandle
- @param SystemTable
-
- @return EFI_SUCCESS
- @return EFI_LOAD_ERROR
- @return EFI_OUT_OF_RESOURCES
-
-**/
-EFI_STATUS
-EFIAPI
-QemuFwCfgAcpiPlatformEntryPoint (
- IN EFI_HANDLE ImageHandle,
- IN EFI_SYSTEM_TABLE *SystemTable
- )
-{
- EFI_STATUS Status;
- EFI_ACPI_TABLE_PROTOCOL *AcpiTable;
-
- //
- // Find the AcpiTable protocol
- //
- Status = gBS->LocateProtocol (
- &gEfiAcpiTableProtocolGuid,
- NULL,
- (VOID**)&AcpiTable
- );
- if (EFI_ERROR (Status)) {
- return EFI_ABORTED;
- }
-
- Status = InstallAllQemuLinkedTables (AcpiTable);
- return Status;
-}
Modified: trunk/edk2/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf
===================================================================
--- trunk/edk2/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf
2015-02-17 00:05:41 UTC (rev 16879)
+++ trunk/edk2/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf
2015-02-17 00:14:58 UTC (rev 16880)
@@ -27,7 +27,6 @@
#
[Sources]
- QemuFwCfgAcpiPlatform.c
QemuFwCfgAcpi.c
[Packages]
------------------------------------------------------------------------------
Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server
from Actuate! Instantly Supercharge Your Business Reports and Dashboards
with Interactivity, Sharing, Native Excel Exports, App Integration & more
Get technology previously reserved for billion-dollar corporations, FREE
http://pubads.g.doubleclick.net/gampad/clk?id=190641631&iu=/4140/ostg.clktrk
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
