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

ShellPkg: Rename some functions in Dp to avoid build errors.

Browse Source 
There are other libraries with similarly named functions that could be linked with the Shell

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Samer El-Haj-Mahmoud <samer.el-haj-mahmoud@hpe.com>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>
Reviewed-by: Qiu Shumin <shumin.qiu@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18456 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Samer El-Haj-Mahmoud
2015-09-15 04:54:06 +00:00
committed by shenshushi
parent f70f52f5ed
commit 2c55a81a0a
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ShellPkg/Library/UefiDpLib/DpInternal.h
View File

@ -7,6 +7,7 @@
DpUtilities.c, DpTrace.c, and DpProfile.c are included here. DpUtilities.c, DpTrace.c, and DpProfile.c are included here.
Copyright (c) 2009 - 2013, Intel Corporation. All rights reserved. Copyright (c) 2009 - 2013, Intel Corporation. All rights reserved.
(C) Copyright 2015 Hewlett Packard Enterprise Development LP<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -96,7 +97,7 @@ IsPhase(
**/ **/
VOID VOID
GetShortPdbFileName ( DpGetShortPdbFileName (
IN CHAR8 *PdbFileName, IN CHAR8 *PdbFileName,
OUT CHAR16 *UnicodeBuffer OUT CHAR16 *UnicodeBuffer
); );
@ -118,7 +119,7 @@ GetShortPdbFileName (
**/ **/
VOID VOID
GetNameFromHandle ( DpGetNameFromHandle (
IN EFI_HANDLE Handle IN EFI_HANDLE Handle
); );

5
ShellPkg/Library/UefiDpLib/DpTrace.c
View File

@ -2,6 +2,7 @@
Trace reporting for the Dp utility. Trace reporting for the Dp utility.
Copyright (c) 2009 - 2013, Intel Corporation. All rights reserved. Copyright (c) 2009 - 2013, Intel Corporation. All rights reserved.
(C) Copyright 2015 Hewlett Packard Enterprise Development LP<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -216,7 +217,7 @@ DumpAllTrace(
// See if the Handle is in the HandleBuffer // See if the Handle is in the HandleBuffer
for (TIndex = 0; TIndex < (Size / sizeof(HandleBuffer[0])); TIndex++) { for (TIndex = 0; TIndex < (Size / sizeof(HandleBuffer[0])); TIndex++) {
if (Measurement.Handle == HandleBuffer[TIndex]) { if (Measurement.Handle == HandleBuffer[TIndex]) {
GetNameFromHandle (HandleBuffer[TIndex]); DpGetNameFromHandle (HandleBuffer[TIndex]);
break; break;
} }
} }
@ -582,7 +583,7 @@ ProcessHandles(
// See if the Handle is in the HandleBuffer // See if the Handle is in the HandleBuffer
for (Index = 0; Index < (Size / sizeof(HandleBuffer[0])); Index++) { for (Index = 0; Index < (Size / sizeof(HandleBuffer[0])); Index++) {
if (Measurement.Handle == HandleBuffer[Index]) { if (Measurement.Handle == HandleBuffer[Index]) {
GetNameFromHandle (HandleBuffer[Index]); // Name is put into mGaugeString DpGetNameFromHandle (HandleBuffer[Index]); // Name is put into mGaugeString
break; break;
} }
} }

7
ShellPkg/Library/UefiDpLib/DpUtilities.c
View File

@ -2,6 +2,7 @@
Utility functions used by the Dp application. Utility functions used by the Dp application.
Copyright (c) 2009 - 2015, Intel Corporation. All rights reserved. Copyright (c) 2009 - 2015, Intel Corporation. All rights reserved.
(C) Copyright 2015 Hewlett Packard Enterprise Development LP<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -131,7 +132,7 @@ IsPhase(
**/ **/
VOID VOID
GetShortPdbFileName ( DpGetShortPdbFileName (
IN CHAR8 *PdbFileName, IN CHAR8 *PdbFileName,
OUT CHAR16 *UnicodeBuffer OUT CHAR16 *UnicodeBuffer
) )
@ -188,7 +189,7 @@ GetShortPdbFileName (
**/ **/
VOID VOID
GetNameFromHandle ( DpGetNameFromHandle (
IN EFI_HANDLE Handle IN EFI_HANDLE Handle
) )
{ {
@ -236,7 +237,7 @@ GetNameFromHandle (
PdbFileName = PeCoffLoaderGetPdbPointer (Image->ImageBase); PdbFileName = PeCoffLoaderGetPdbPointer (Image->ImageBase);
if (PdbFileName != NULL) { if (PdbFileName != NULL) {
GetShortPdbFileName (PdbFileName, mGaugeString); DpGetShortPdbFileName (PdbFileName, mGaugeString);
return; return;
} }
} }