sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update all the code to consume the ConvertDevicePathToText, ConvertDevicePathNodeToText, ConvertTextToDevicePath and ConvertTextToDeviceNode APIs in DevicePathLib.

Browse Source 
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed-by: Feng Tian <feng.tian@intel.com>
Reviewed-by: Elvin Li <elvin.li@intel.com>
Reviewed-by: Eric Dong <eric.dong@intel.com>
Reviewed-by: Star Zeng <star.zeng@intel.com>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>
Reviewed-by: Guo Dong <guo.dong@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@14505 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Ruiyu Ni
2013-07-26 03:14:08 +00:00
committed by niruiyu
parent 4d0a30a494
commit 863986b3c8
59 changed files with 191 additions and 4922 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
OvmfPkg/Library/PlatformBdsLib/BdsPlatform.c
View File

@@ -1,7 +1,7 @@
/** @file
Platform BDS customizations.
Copyright (c) 2004 - 2012, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2004 - 2013, 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
@@ -209,14 +209,16 @@ Returns:
// Print Device Path
//
DevPathStr = DevicePathToStr(DevicePath);
DEBUG((
EFI_D_INFO,
"BdsPlatform.c+%d: COM%d DevPath: %s\n",
__LINE__,
gPnp16550ComPortDeviceNode.UID + 1,
DevPathStr
));
FreePool(DevPathStr);
if (DevPathStr != NULL) {
DEBUG((
EFI_D_INFO,
"BdsPlatform.c+%d: COM%d DevPath: %s\n",
__LINE__,
gPnp16550ComPortDeviceNode.UID + 1,
DevPathStr
));
FreePool(DevPathStr);
}
BdsLibUpdateConsoleVariable (VarConsoleOut, DevicePath, NULL);
BdsLibUpdateConsoleVariable (VarConsoleInp, DevicePath, NULL);
@@ -236,14 +238,16 @@ Returns:
// Print Device Path
//
DevPathStr = DevicePathToStr(DevicePath);
DEBUG((
EFI_D_INFO,
"BdsPlatform.c+%d: COM%d DevPath: %s\n",
__LINE__,
gPnp16550ComPortDeviceNode.UID + 1,
DevPathStr
));
FreePool(DevPathStr);
if (DevPathStr != NULL) {
DEBUG((
EFI_D_INFO,
"BdsPlatform.c+%d: COM%d DevPath: %s\n",
__LINE__,
gPnp16550ComPortDeviceNode.UID + 1,
DevPathStr
));
FreePool(DevPathStr);
}
BdsLibUpdateConsoleVariable (VarConsoleOut, DevicePath, NULL);
BdsLibUpdateConsoleVariable (VarConsoleInp, DevicePath, NULL);
@@ -799,12 +803,14 @@ ConnectRecursivelyIfPciMassStorage (
// Print Device Path
//
DevPathStr = DevicePathToStr (DevicePath);
DEBUG((
EFI_D_INFO,
"Found Mass Storage device: %s\n",
DevPathStr
));
FreePool(DevPathStr);
if (DevPathStr != NULL) {
DEBUG((
EFI_D_INFO,
"Found Mass Storage device: %s\n",
DevPathStr
));
FreePool(DevPathStr);
}
Status = gBS->ConnectController (Handle, NULL, NULL, TRUE);
if (EFI_ERROR (Status)) {

32
OvmfPkg/Library/PlatformBdsLib/QemuBootOrder.c
View File

@@ -1,7 +1,7 @@
/** @file
Rewrite the BootOrder NvVar based on QEMU's "bootorder" fw_cfg file.
Copyright (C) 2012, Red Hat, Inc.
Copyright (C) 2012 - 2013, Red Hat, Inc.
This program and the accompanying materials are licensed and made available
under the terms and conditions of the BSD License which accompanies this
@@ -20,7 +20,7 @@
#include <Library/UefiRuntimeServicesTableLib.h>
#include <Library/BaseLib.h>
#include <Library/PrintLib.h>
#include <Protocol/DevicePathToText.h>
#include <Library/DevicePathLib.h>
#include <Guid/GlobalVariable.h>
@@ -866,18 +866,17 @@ BOOLEAN
Match (
IN CONST CHAR16 *Translated,
IN UINTN TranslatedLength,
IN CONST EFI_DEVICE_PATH_PROTOCOL *DevicePath,
IN CONST EFI_DEVICE_PATH_TO_TEXT_PROTOCOL *DevPathToText
IN CONST EFI_DEVICE_PATH_PROTOCOL *DevicePath
)
{
CHAR16 *Converted;
BOOLEAN Result;
Converted = DevPathToText->ConvertDevicePathToText (
DevicePath,
FALSE, // DisplayOnly
FALSE // AllowShortcuts
);
Converted = ConvertDevicePathToText (
DevicePath,
FALSE, // DisplayOnly
FALSE // AllowShortcuts
);
if (Converted == NULL) {
return FALSE;
}
@@ -933,9 +932,6 @@ SetBootOrderFromQemu (
)
{
RETURN_STATUS Status;
EFI_DEVICE_PATH_TO_TEXT_PROTOCOL *DevPathToText;
FIRMWARE_CONFIG_ITEM FwCfgItem;
UINTN FwCfgSize;
CHAR8 *FwCfg;
@@ -946,15 +942,6 @@ SetBootOrderFromQemu (
UINTN TranslatedSize;
CHAR16 Translated[TRANSLATION_OUTPUT_SIZE];
Status = gBS->LocateProtocol (
&gEfiDevicePathToTextProtocolGuid,
NULL, // optional registration key
(VOID **) &DevPathToText
);
if (Status != EFI_SUCCESS) {
return Status;
}
Status = QemuFwCfgFindFile ("bootorder", &FwCfgItem, &FwCfgSize);
if (Status != RETURN_SUCCESS) {
return Status;
@@ -1019,8 +1006,7 @@ SetBootOrderFromQemu (
Match (
Translated,
TranslatedSize, // contains length, not size, in CHAR16's here
BootOption->DevicePath,
DevPathToText
BootOption->DevicePath
)
) {
//