tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix LocateDevicePath() to return proper error status code. It was returning EFI_INVALID_PARAMETER if Device was NULL even if not handles matched the search criteria. The proper behavior is to return EFI_NOT_FOUND if not handles match the search criteria, and only return EFI_INVALID_PARAMETER if at least one match is found and Device is NULL. 

Also update function header comment block for LocateDevicePath() to match UEFI Specification.


git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11406 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
mdkinney 2011-03-16 16:17:09 +00:00
parent b3d2538857
commit a36a9b3794
1 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
MdeModulePkg/Core/Dxe/Hand/Locate.c
View File

@ -1,7 +1,7 @@
/** @file /** @file
Locate handle functions Locate handle functions
Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR> Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<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
@ -406,18 +406,19 @@ CoreGetNextLocateByProtocol (
/** /**
Locates the handle to a device on the device path that best matches the specified protocol. Locates the handle to a device on the device path that supports the specified protocol.
@param Protocol The protocol to search for. @param Protocol Specifies the protocol to search for.
@param DevicePath On input, a pointer to a pointer to the device @param DevicePath On input, a pointer to a pointer to the device path. On output, the device
path. On output, the device path pointer is path pointer is modified to point to the remaining part of the device
modified to point to the remaining part of the path.
devicepath.
@param Device A pointer to the returned device handle. @param Device A pointer to the returned device handle.
@retval EFI_SUCCESS The resulting handle was returned. @retval EFI_SUCCESS The resulting handle was returned.
@retval EFI_NOT_FOUND No handles matched the search. @retval EFI_NOT_FOUND No handles match the search.
@retval EFI_INVALID_PARAMETER One of the parameters has an invalid value. @retval EFI_INVALID_PARAMETER Protocol is NULL.
@retval EFI_INVALID_PARAMETER DevicePath is NULL.
@retval EFI_INVALID_PARAMETER A handle matched the search and Device is NULL.
**/ **/
EFI_STATUS EFI_STATUS
@ -436,6 +437,7 @@ CoreLocateDevicePath (
EFI_STATUS Status; EFI_STATUS Status;
EFI_HANDLE *Handles; EFI_HANDLE *Handles;
EFI_HANDLE Handle; EFI_HANDLE Handle;
EFI_HANDLE BestDevice;
EFI_DEVICE_PATH_PROTOCOL *SourcePath; EFI_DEVICE_PATH_PROTOCOL *SourcePath;
EFI_DEVICE_PATH_PROTOCOL *TmpDevicePath; EFI_DEVICE_PATH_PROTOCOL *TmpDevicePath;
@ -447,11 +449,7 @@ CoreLocateDevicePath (
return EFI_INVALID_PARAMETER; return EFI_INVALID_PARAMETER;
} }
if (Device == NULL) { BestDevice = NULL;
return EFI_INVALID_PARAMETER;
}
*Device = NULL;
SourcePath = *DevicePath; SourcePath = *DevicePath;
TmpDevicePath = SourcePath; TmpDevicePath = SourcePath;
while (!IsDevicePathEnd (TmpDevicePath)) { while (!IsDevicePathEnd (TmpDevicePath)) {
@ -504,7 +502,7 @@ CoreLocateDevicePath (
// //
if (Size > BestMatch) { if (Size > BestMatch) {
BestMatch = Size; BestMatch = Size;
*Device = Handle; BestDevice = Handle;
} }
} }
} }
@ -519,6 +517,11 @@ CoreLocateDevicePath (
return EFI_NOT_FOUND; return EFI_NOT_FOUND;
} }
if (Device == NULL) {
return EFI_INVALID_PARAMETER;
}
*Device = BestDevice;
// //
// Return the remaining part of the device path // Return the remaining part of the device path
// //