From a6d5e5f7f31202966f48cd6f32a98f02c9eabbc3 Mon Sep 17 00:00:00 2001 From: klu2 Date: Tue, 11 Nov 2008 15:44:41 +0000 Subject: [PATCH] 1, Add for all source that use device path utility macros 2, Add DevicePathLib library class to module's INF that use device path utility macros git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@6458 6f19259b-4bc3-4df7-8a09-765794883524 --- .../Library/DxeSmmDriverEntryPoint/DriverEntryPoint.c | 6 +++--- .../DxeSmmDriverEntryPoint/DxeSmmDriverEntryPoint.inf | 2 +- .../Library/FrameworkUefiLib/FrameworkUefiLib.h | 1 + .../Library/FrameworkUefiLib/FrameworkUefiLib.inf | 3 ++- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/IntelFrameworkPkg/Library/DxeSmmDriverEntryPoint/DriverEntryPoint.c b/IntelFrameworkPkg/Library/DxeSmmDriverEntryPoint/DriverEntryPoint.c index f0a0f6b973..f77bce1610 100644 --- a/IntelFrameworkPkg/Library/DxeSmmDriverEntryPoint/DriverEntryPoint.c +++ b/IntelFrameworkPkg/Library/DxeSmmDriverEntryPoint/DriverEntryPoint.c @@ -24,7 +24,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include #include #include - +#include /** This function returns the size, in bytes, @@ -52,8 +52,8 @@ SmmGetDevicePathSize ( // Search for the end of the device path structure // Start = DevicePath; - while (!EfiIsDevicePathEnd (DevicePath)) { - DevicePath = EfiNextDevicePathNode (DevicePath); + while (!IsDevicePathEnd (DevicePath)) { + DevicePath = NextDevicePathNode (DevicePath); } // diff --git a/IntelFrameworkPkg/Library/DxeSmmDriverEntryPoint/DxeSmmDriverEntryPoint.inf b/IntelFrameworkPkg/Library/DxeSmmDriverEntryPoint/DxeSmmDriverEntryPoint.inf index 8ce94b11cc..5e3f803cf0 100644 --- a/IntelFrameworkPkg/Library/DxeSmmDriverEntryPoint/DxeSmmDriverEntryPoint.inf +++ b/IntelFrameworkPkg/Library/DxeSmmDriverEntryPoint/DxeSmmDriverEntryPoint.inf @@ -43,7 +43,7 @@ [LibraryClasses] DebugLib UefiBootServicesTableLib - + DevicePathLib [Protocols] gEfiLoadedImageProtocolGuid # PROTOCOL ALWAYS_CONSUMED diff --git a/IntelFrameworkPkg/Library/FrameworkUefiLib/FrameworkUefiLib.h b/IntelFrameworkPkg/Library/FrameworkUefiLib/FrameworkUefiLib.h index 630e892cb4..0d8365a556 100644 --- a/IntelFrameworkPkg/Library/FrameworkUefiLib/FrameworkUefiLib.h +++ b/IntelFrameworkPkg/Library/FrameworkUefiLib/FrameworkUefiLib.h @@ -38,5 +38,6 @@ #include #include #include +#include #endif diff --git a/IntelFrameworkPkg/Library/FrameworkUefiLib/FrameworkUefiLib.inf b/IntelFrameworkPkg/Library/FrameworkUefiLib/FrameworkUefiLib.inf index 8192558492..058fa05ede 100644 --- a/IntelFrameworkPkg/Library/FrameworkUefiLib/FrameworkUefiLib.inf +++ b/IntelFrameworkPkg/Library/FrameworkUefiLib/FrameworkUefiLib.inf @@ -55,7 +55,8 @@ BaseMemoryLib BaseLib UefiBootServicesTableLib - + DevicePathLib + [Protocols] gEfiDriverBindingProtocolGuid # ALWAYS_CONSUMED gEfiComponentNameProtocolGuid # SOMETIMES_CONSUMED