diff options
| author | bxing <bxing@6f19259b-4bc3-4df7-8a09-765794883524> | 2006-07-10 02:56:56 +0000 |
|---|---|---|
| committer | bxing <bxing@6f19259b-4bc3-4df7-8a09-765794883524> | 2006-07-10 02:56:56 +0000 |
| commit | 9748aecca6cad6a4a1782b415445d086af4e2bba (patch) | |
| tree | 71de495bb1a8873d07c1fa272b3746e32b831488 /MdePkg/Library/BasePciCf8Lib | |
| parent | ace425da363ca731aa174bcf1975429f9e1531ab (diff) | |
| download | edk2-platforms-9748aecca6cad6a4a1782b415445d086af4e2bba.tar.xz | |
1. Fixed a logical error in PciReadBuffer() and PciWriteBuffer()
2. Fixed GetInterruptState() on IPF to return the state of interrupts correctly
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@850 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'MdePkg/Library/BasePciCf8Lib')
| -rw-r--r-- | MdePkg/Library/BasePciCf8Lib/PciLib.c | 52 |
1 files changed, 33 insertions, 19 deletions
diff --git a/MdePkg/Library/BasePciCf8Lib/PciLib.c b/MdePkg/Library/BasePciCf8Lib/PciLib.c index 9421d8b99d..ca9b17abe2 100644 --- a/MdePkg/Library/BasePciCf8Lib/PciLib.c +++ b/MdePkg/Library/BasePciCf8Lib/PciLib.c @@ -1295,18 +1295,21 @@ PciCf8ReadBuffer ( OUT VOID *Buffer
)
{
- UINTN EndAddress;
+ UINTN ReturnValue;
- ASSERT_INVALID_PCI_ADDRESS (StartAddress, 0);
+ ASSERT_INVALID_PCI_ADDRESS (StartAddress);
ASSERT (((StartAddress & 0xFFF) + Size) <= 0x100);
if (Size == 0) {
- return 0;
+ return Size;
}
ASSERT (Buffer != NULL);
- EndAddress = StartAddress + Size;
+ //
+ // Save Size for return
+ //
+ ReturnValue = Size;
if ((StartAddress & 1) != 0) {
//
@@ -1314,44 +1317,48 @@ PciCf8ReadBuffer ( //
*(UINT8*)Buffer = PciCf8Read8 (StartAddress);
StartAddress += sizeof (UINT8);
+ Size -= sizeof (UINT8);
Buffer = (UINT8*)Buffer + 1;
}
- if ((StartAddress < EndAddress) && ((StartAddress & 2) != 0)) {
+ if (Size >= sizeof (UINT16) && (StartAddress & 2) != 0) {
//
// Read a word if StartAddress is word aligned
//
*(UINT16*)Buffer = PciCf8Read16 (StartAddress);
StartAddress += sizeof (UINT16);
+ Size -= sizeof (UINT16);
Buffer = (UINT16*)Buffer + 1;
}
- while ((EndAddress - StartAddress) >= 4) {
+ while (Size >= sizeof (UINT32)) {
//
// Read as many double words as possible
//
*(UINT32*)Buffer = PciCf8Read32 (StartAddress);
StartAddress += sizeof (UINT32);
+ Size -= sizeof (UINT32);
Buffer = (UINT32*)Buffer + 1;
}
- if ((EndAddress & 2) != 0) {
+ if (Size >= sizeof (UINT16)) {
//
// Read the last remaining word if exist
//
*(UINT16*)Buffer = PciCf8Read16 (StartAddress);
StartAddress += sizeof (UINT16);
+ Size -= sizeof (UINT16);
Buffer = (UINT16*)Buffer + 1;
}
- if ((EndAddress & 1) != 0) {
+ if (Size >= sizeof (UINT8)) {
//
// Read the last remaining byte if exist
//
*(UINT8*)Buffer = PciCf8Read8 (StartAddress);
}
- return Size;
+ return ReturnValue;
}
/**
@@ -1387,61 +1394,68 @@ PciCf8WriteBuffer ( IN VOID *Buffer
)
{
- UINTN EndAddress;
+ UINTN ReturnValue;
- ASSERT_INVALID_PCI_ADDRESS (StartAddress, 0);
+ ASSERT_INVALID_PCI_ADDRESS (StartAddress);
ASSERT (((StartAddress & 0xFFF) + Size) <= 0x100);
if (Size == 0) {
return 0;
}
- ASSERT (Buffer != 0);
+ ASSERT (Buffer != NULL);
- EndAddress = StartAddress + Size;
+ //
+ // Save Size for return
+ //
+ ReturnValue = Size;
- if ((StartAddress & 1)!= 0) {
+ if ((StartAddress & 1) != 0) {
//
// Write a byte if StartAddress is byte aligned
//
PciCf8Write8 (StartAddress, *(UINT8*)Buffer);
StartAddress += sizeof (UINT8);
+ Size -= sizeof (UINT8);
Buffer = (UINT8*)Buffer + 1;
}
- if ((StartAddress < EndAddress) && ((StartAddress & 2) != 0)) {
+ if (Size >= sizeof (UINT16) && (StartAddress & 2) != 0) {
//
// Write a word if StartAddress is word aligned
//
PciCf8Write16 (StartAddress, *(UINT16*)Buffer);
StartAddress += sizeof (UINT16);
+ Size -= sizeof (UINT16);
Buffer = (UINT16*)Buffer + 1;
}
- while ((EndAddress - StartAddress) >= 4) {
+ while (Size >= sizeof (UINT32)) {
//
// Write as many double words as possible
//
PciCf8Write32 (StartAddress, *(UINT32*)Buffer);
StartAddress += sizeof (UINT32);
+ Size -= sizeof (UINT32);
Buffer = (UINT32*)Buffer + 1;
}
- if ((EndAddress & 2) != 0) {
+ if (Size >= sizeof (UINT16)) {
//
// Write the last remaining word if exist
//
PciCf8Write16 (StartAddress, *(UINT16*)Buffer);
StartAddress += sizeof (UINT16);
+ Size -= sizeof (UINT16);
Buffer = (UINT16*)Buffer + 1;
}
- if ((EndAddress & 1) != 0) {
+ if (Size >= sizeof (UINT8)) {
//
// Write the last remaining byte if exist
//
PciCf8Write8 (StartAddress, *(UINT8*)Buffer);
}
- return Size;
+ return ReturnValue;
}
|