diff options
author | mdkinney <mdkinney@6f19259b-4bc3-4df7-8a09-765794883524> | 2010-11-29 21:58:46 +0000 |
---|---|---|
committer | mdkinney <mdkinney@6f19259b-4bc3-4df7-8a09-765794883524> | 2010-11-29 21:58:46 +0000 |
commit | e23a349aaec2ba7fd4218c6dabaf42da0aa9aa8e (patch) | |
tree | abfe8fc681a996a300c22174abd2fc6ba85f3463 /UnixPkg | |
parent | e74c3676e651f79d27afa986c5837eb1e103fe84 (diff) | |
download | edk2-e23a349aaec2ba7fd4218c6dabaf42da0aa9aa8e.zip edk2-e23a349aaec2ba7fd4218c6dabaf42da0aa9aa8e.tar.gz edk2-e23a349aaec2ba7fd4218c6dabaf42da0aa9aa8e.tar.bz2 |
Sync update to improve compiler compatibility
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11104 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'UnixPkg')
-rw-r--r-- | UnixPkg/UnixSerialIoDxe/UnixSerialIo.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/UnixPkg/UnixSerialIoDxe/UnixSerialIo.c b/UnixPkg/UnixSerialIoDxe/UnixSerialIo.c index 7afd87b..0f3ac51 100644 --- a/UnixPkg/UnixSerialIoDxe/UnixSerialIo.c +++ b/UnixPkg/UnixSerialIoDxe/UnixSerialIo.c @@ -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;
}
|