diff options
| author | qhuang8 <qhuang8@6f19259b-4bc3-4df7-8a09-765794883524> | 2006-07-05 04:17:04 +0000 |
|---|---|---|
| committer | qhuang8 <qhuang8@6f19259b-4bc3-4df7-8a09-765794883524> | 2006-07-05 04:17:04 +0000 |
| commit | add13dc21720eff1a37fdea34c0fef190e2ad37d (patch) | |
| tree | 0d58a4edded2175903f98276e3fe67f802ab44ce /MdePkg/Library/BasePciExpressLib/PciLib.c | |
| parent | c16ade35ca4b293255fea78aaf33783501f90f9f (diff) | |
| download | edk2-platforms-add13dc21720eff1a37fdea34c0fef190e2ad37d.tar.xz | |
DebugLib:
Fix a bug in PeiDxeDebugLibReportStatusCode: it should use gReportStatusCodeDebugType so that report status code infrastructure can correctly extract debug info.
Fix functional and coding style issues in the three instances in EdkModulePkg, namely: EdkDxeDebugLibReportStatusCode, EdkUefiDebugLibStderr, EdkUefiDebugLibConout.
DevicePathLib:
Sync with MWG 0.57 and add new interface of CreateDevicePathNode(). All the function headers have been updated.
PeiServicesLib:
Adjust coding style and fix a minor comment error.
PciLib:
Adjust assert() condition to sync with MWG 0.57
BaseMemoryLib:
Adjust assert() for ScanMemXX (), ScanGuid()
Rename UefiMemoryLib to DxeMemoryLib
PrintLib:
Change the return value of all print services to exclude the NULL-terminator.
Misc:
Slightly adjust the coding style in hob.c in PeiCore module.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@757 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'MdePkg/Library/BasePciExpressLib/PciLib.c')
| -rw-r--r-- | MdePkg/Library/BasePciExpressLib/PciLib.c | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/MdePkg/Library/BasePciExpressLib/PciLib.c b/MdePkg/Library/BasePciExpressLib/PciLib.c index e027955ceb..036994aa7b 100644 --- a/MdePkg/Library/BasePciExpressLib/PciLib.c +++ b/MdePkg/Library/BasePciExpressLib/PciLib.c @@ -1174,8 +1174,7 @@ PciExpressBitFieldAndThenOr32 ( If StartAddress > 0x0FFFFFFF, then ASSERT().
If ((StartAddress & 0xFFF) + Size) > 0x1000, then ASSERT().
- If (StartAddress + Size - 1) > 0x0FFFFFFF, then ASSERT().
- If Buffer is NULL, then ASSERT().
+ If Size > 0 and Buffer is NULL, then ASSERT().
@param StartAddress Starting address that encodes the PCI Bus, Device,
Function and Register.
@@ -1197,11 +1196,11 @@ PciExpressReadBuffer ( ASSERT_INVALID_PCI_ADDRESS (StartAddress);
ASSERT (((StartAddress & 0xFFF) + Size) <= 0x1000);
- ASSERT (Buffer != NULL);
+ ASSERT ((Buffer != NULL) || (Size == 0));
EndAddress = StartAddress + Size;
- if (StartAddress < EndAddress && (StartAddress & 1)) {
+ if ((StartAddress < EndAddress) && ((StartAddress & 1) != 0)) {
//
// Read a byte if StartAddress is byte aligned
//
@@ -1210,7 +1209,7 @@ PciExpressReadBuffer ( Buffer = (UINT8*)Buffer + 1;
}
- if (StartAddress < EndAddress && (StartAddress & 2)) {
+ if ((StartAddress < EndAddress) && ((StartAddress & 2) != 0)) {
//
// Read a word if StartAddress is word aligned
//
@@ -1219,7 +1218,7 @@ PciExpressReadBuffer ( Buffer = (UINT16*)Buffer + 1;
}
- while (EndAddress - StartAddress >= 4) {
+ while ((EndAddress - StartAddress) >= 4) {
//
// Read as many double words as possible
//
@@ -1237,7 +1236,7 @@ PciExpressReadBuffer ( Buffer = (UINT16*)Buffer + 1;
}
- if (EndAddress & 1) {
+ if ((EndAddress & 1) != 0) {
//
// Read the last remaining byte if exist
//
@@ -1261,8 +1260,7 @@ PciExpressReadBuffer ( If StartAddress > 0x0FFFFFFF, then ASSERT().
If ((StartAddress & 0xFFF) + Size) > 0x1000, then ASSERT().
- If (StartAddress + Size - 1) > 0x0FFFFFFF, then ASSERT().
- If Buffer is NULL, then ASSERT().
+ If Size > 0 and Buffer is NULL, then ASSERT().
@param StartAddress Starting address that encodes the PCI Bus, Device,
Function and Register.
@@ -1284,11 +1282,11 @@ PciExpressWriteBuffer ( ASSERT_INVALID_PCI_ADDRESS (StartAddress);
ASSERT (((StartAddress & 0xFFF) + Size) <= 0x1000);
- ASSERT (Buffer != NULL);
+ ASSERT ((Buffer != NULL) || (Size == 0));
EndAddress = StartAddress + Size;
- if ((StartAddress < EndAddress) && ((StartAddress & 1)!= 0)) {
+ if ((StartAddress < EndAddress) && ((StartAddress & 1) != 0)) {
//
// Write a byte if StartAddress is byte aligned
//
@@ -1297,7 +1295,7 @@ PciExpressWriteBuffer ( Buffer = (UINT8*)Buffer + 1;
}
- if (StartAddress < EndAddress && (StartAddress & 2)) {
+ if ((StartAddress < EndAddress) && ((StartAddress & 2) != 0)) {
//
// Write a word if StartAddress is word aligned
//
@@ -1306,7 +1304,7 @@ PciExpressWriteBuffer ( Buffer = (UINT16*)Buffer + 1;
}
- while (EndAddress - StartAddress >= 4) {
+ while ((EndAddress - StartAddress) >= 4) {
//
// Write as many double words as possible
//
@@ -1315,7 +1313,7 @@ PciExpressWriteBuffer ( Buffer = (UINT32*)Buffer + 1;
}
- if (EndAddress & 2) {
+ if ((EndAddress & 2) != 0) {
//
// Write the last remaining word if exist
//
@@ -1324,7 +1322,7 @@ PciExpressWriteBuffer ( Buffer = (UINT16*)Buffer + 1;
}
- if (EndAddress & 1) {
+ if ((EndAddress & 1) != 0) {
//
// Write the last remaining byte if exist
//
|