Fix non-boolean comparison expression.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10165 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/EdkCompatibilityPkg/Compatibility/DeviceIoOnPciRootBridgeIoThunk/DeviceIoOnPciRootBridgeIoThunk.c b/EdkCompatibilityPkg/Compatibility/DeviceIoOnPciRootBridgeIoThunk/DeviceIoOnPciRootBridgeIoThunk.c
index b5ce020458cc81df86dee0e5a975a9b16e14013c..6437fcbfb57459dfacae73145a098abcf357e907 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/DeviceIoOnPciRootBridgeIoThunk/DeviceIoOnPciRootBridgeIoThunk.c
+++ b/EdkCompatibilityPkg/Compatibility/DeviceIoOnPciRootBridgeIoThunk/DeviceIoOnPciRootBridgeIoThunk.c
@@ -898,7 +898,7 @@ AppendPciDevicePath (
               return ReturnDevicePath;\r
             }\r
           }\r
-          if (ThisFunc == 0 && !(PciPtr->Hdr.HeaderType & HEADER_TYPE_MULTI_FUNCTION)) {\r
+          if (ThisFunc == 0 && ((PciPtr->Hdr.HeaderType & HEADER_TYPE_MULTI_FUNCTION) != HEADER_TYPE_MULTI_FUNCTION)) {\r
             //\r
             // Skip sub functions, this is not a multi function device\r
             //\r

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/OpcodeCreation.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/OpcodeCreation.c
index 1f3e61e47577cc666c3f1172c8df874a9402dd90..27969d2d242b187087a48ebe26ba4f4a5a56c72a 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/OpcodeCreation.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/OpcodeCreation.c
@@ -403,7 +403,7 @@ F2UCreateOneOfOpCode (
 \r
     }\r
 \r
-    if (FwOneOfOp->Flags & EFI_IFR_FLAG_RESET_REQUIRED) {\r
+    if ((FwOneOfOp->Flags & EFI_IFR_FLAG_RESET_REQUIRED) == EFI_IFR_FLAG_RESET_REQUIRED) {\r
       UOpcode.Question.Flags |= EFI_IFR_FLAG_RESET_REQUIRED;\r
     }\r
 \r
@@ -522,7 +522,7 @@ F2UCreateOrderedListOpCode (
       }\r
     }\r
 \r
-    if (FwOneOfOp->Flags & EFI_IFR_FLAG_RESET_REQUIRED) {\r
+    if ((FwOneOfOp->Flags & EFI_IFR_FLAG_RESET_REQUIRED) ==  EFI_IFR_FLAG_RESET_REQUIRED) {\r
       UOpcode.Question.Flags |= EFI_IFR_FLAG_RESET_REQUIRED;\r
     }\r
 \r

diff --git a/EdkCompatibilityPkg/Compatibility/PiSmbiosRecordOnDataHubSmbiosRecordThunk/MiscConv.c b/EdkCompatibilityPkg/Compatibility/PiSmbiosRecordOnDataHubSmbiosRecordThunk/MiscConv.c
index 3ffbbe5195ac12b241d5e882593fa7399142c1aa..1dca381ace28fc5ac33366dc2fe8ade23c613b51 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/PiSmbiosRecordOnDataHubSmbiosRecordThunk/MiscConv.c
+++ b/EdkCompatibilityPkg/Compatibility/PiSmbiosRecordOnDataHubSmbiosRecordThunk/MiscConv.c
@@ -1,7 +1,7 @@
 /** @file\r
   Routines that support Misc SubClass data records translation.\r
   \r
-Copyright (c) 2009, Intel Corporation\r
+Copyright (c) 2009 - 2010, Intel Corporation\r
 All rights reserved. This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
@@ -480,7 +480,7 @@ SmbiosFldMiscType3 (
             OFFSET_OF (SMBIOS_TABLE_TYPE3, ContainedElementCount)) \r
             = (UINT8)Ec->ChassisElementCount;\r
 \r
-  if( Ec->ChassisElementCount ) {\r
+  if(Ec->ChassisElementCount > 0) {\r
     //\r
     // Element Record Length\r
     // Current solution covers first 3 bytes; user can extend to meet its requirements.\r