Sync update to improve compiler compatibility

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11104 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
mdkinney 2010-11-29 21:58:46 +00:00
parent e74c3676e6
commit e23a349aae
1 changed files with 10 additions and 3 deletions

View File

@ -271,6 +271,7 @@ Returns:
EFI_OPEN_PROTOCOL_INFORMATION_ENTRY *OpenInfoBuffer;
UINTN EntryCount;
UINTN Index;
BOOLEAN RemainingDevicePathContainsFlowControl;
//
// Check RemainingDevicePath validation
@ -356,6 +357,11 @@ Returns:
return Status;
}
//
// See if RemainingDevicePath has a Flow Control device path node
//
RemainingDevicePathContainsFlowControl = ContainsFlowControl (RemainingDevicePath);
for (Index = 0; Index < EntryCount; Index++) {
if ((OpenInfoBuffer[Index].Attributes & EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER) != 0) {
Status = gBS->OpenProtocol (
@ -366,9 +372,10 @@ Returns:
Handle,
EFI_OPEN_PROTOCOL_GET_PROTOCOL
);
if (!EFI_ERROR (Status) &&
(ContainsFlowControl (RemainingDevicePath) ^ ContainsFlowControl (DevicePath))) {
Status = EFI_UNSUPPORTED;
if (!EFI_ERROR (Status)) {
if (RemainingDevicePathContainsFlowControl ^ ContainsFlowControl (DevicePath)) {
Status = EFI_UNSUPPORTED;
}
}
break;
}