DebugLib:

[mirror_edk2.git] / MdePkg / Library / BasePciCf8Lib / PciLib.c

diff --git a/MdePkg/Library/BasePciCf8Lib/PciLib.c b/MdePkg/Library/BasePciCf8Lib/PciLib.c
index 89cf0db2b710aec98f648db17c21cf53fbb21631..a3897bfaa4314941fd7bdba099b1d8dd2718b5c5 100644 (file)
--- a/MdePkg/Library/BasePciCf8Lib/PciLib.c
+++ b/MdePkg/Library/BasePciCf8Lib/PciLib.c
@@ -1277,8 +1277,7 @@ PciCf8BitFieldAndThenOr32(
   If StartAddress > 0x0FFFFFFF, then ASSERT().\r
   If the register specified by StartAddress >= 0x100, then ASSERT().\r
   If ((StartAddress & 0xFFF) + Size) > 0x100, then ASSERT().\r
-  If (StartAddress + Size - 1)  > 0x0FFFFFFF, then ASSERT().\r
-  If Buffer is NULL, then ASSERT().\r
+  If Size > 0 and Buffer is NULL, then ASSERT().\r
 \r
   @param  StartAddress  Starting address that encodes the PCI Bus, Device,\r
                         Function and Register.\r
@@ -1300,11 +1299,11 @@ PciCf8ReadBuffer (
 \r
   ASSERT_INVALID_PCI_ADDRESS (StartAddress, 0);\r
   ASSERT (((StartAddress & 0xFFF) + Size) <= 0x100);\r
-  ASSERT (Buffer != NULL);\r
+  ASSERT ((Buffer != NULL) || (Size == 0));\r
 \r
   EndAddress = StartAddress + Size;\r
 \r
-  if (StartAddress < EndAddress && (StartAddress & 1)) {\r
+  if ((StartAddress < EndAddress) && ((StartAddress & 1) != 0)) {\r
     //\r
     // Read a byte if StartAddress is byte aligned\r
     //\r
@@ -1313,7 +1312,7 @@ PciCf8ReadBuffer (
     Buffer = (UINT8*)Buffer + 1;\r
   }\r
 \r
-  if (StartAddress < EndAddress && (StartAddress & 2)) {\r
+  if ((StartAddress < EndAddress) && ((StartAddress & 2) != 0)) {\r
     //\r
     // Read a word if StartAddress is word aligned\r
     //\r
@@ -1322,7 +1321,7 @@ PciCf8ReadBuffer (
     Buffer = (UINT16*)Buffer + 1;\r
   }\r
 \r
-  while (EndAddress - StartAddress >= 4) {\r
+  while ((EndAddress - StartAddress) >= 4) {\r
     //\r
     // Read as many double words as possible\r
     //\r
@@ -1340,7 +1339,7 @@ PciCf8ReadBuffer (
     Buffer = (UINT16*)Buffer + 1;\r
   }\r
 \r
-  if (EndAddress & 1) {\r
+  if ((EndAddress & 1) != 0) {\r
     //\r
     // Read the last remaining byte if exist\r
     //\r
@@ -1365,8 +1364,7 @@ PciCf8ReadBuffer (
   If StartAddress > 0x0FFFFFFF, then ASSERT().\r
   If the register specified by StartAddress >= 0x100, then ASSERT().\r
   If ((StartAddress & 0xFFF) + Size) > 0x100, then ASSERT().\r
-  If (StartAddress + Size - 1)  > 0x0FFFFFFF, then ASSERT().\r
-  If Buffer is NULL, then ASSERT().\r
+  If Size > 0 and Buffer is NULL, then ASSERT().\r
 \r
   @param  StartAddress  Starting address that encodes the PCI Bus, Device,\r
                         Function and Register.\r
@@ -1388,7 +1386,7 @@ PciCf8WriteBuffer (
 \r
   ASSERT_INVALID_PCI_ADDRESS (StartAddress, 0);\r
   ASSERT (((StartAddress & 0xFFF) + Size) <= 0x100);\r
-  ASSERT (Buffer != NULL);\r
+  ASSERT ((Buffer != NULL) || (Size == 0));\r
 \r
   EndAddress = StartAddress + Size;\r
 \r
@@ -1401,7 +1399,7 @@ PciCf8WriteBuffer (
     Buffer = (UINT8*)Buffer + 1;\r
   }\r
 \r
-  if (StartAddress < EndAddress && (StartAddress & 2)) {\r
+  if ((StartAddress < EndAddress) && ((StartAddress & 2) != 0)) {\r
     //\r
     // Write a word if StartAddress is word aligned\r
     //\r
@@ -1410,7 +1408,7 @@ PciCf8WriteBuffer (
     Buffer = (UINT16*)Buffer + 1;\r
   }\r
 \r
-  while (EndAddress - StartAddress >= 4) {\r
+  while ((EndAddress - StartAddress) >= 4) {\r
     //\r
     // Write as many double words as possible\r
     //\r
@@ -1419,7 +1417,7 @@ PciCf8WriteBuffer (
     Buffer = (UINT32*)Buffer + 1;\r
   }\r
 \r
-  if (EndAddress & 2) {\r
+  if ((EndAddress & 2) != 0) {\r
     //\r
     // Write the last remaining word if exist\r
     //\r
@@ -1428,7 +1426,7 @@ PciCf8WriteBuffer (
     Buffer = (UINT16*)Buffer + 1;\r
   }\r
 \r
-  if (EndAddress & 1) {\r
+  if ((EndAddress & 1) != 0) {\r
     //\r
     // Write the last remaining byte if exist\r
     //\r