diff options
| author | vanjeff <vanjeff@6f19259b-4bc3-4df7-8a09-765794883524> | 2007-04-13 02:23:10 +0000 |
|---|---|---|
| committer | vanjeff <vanjeff@6f19259b-4bc3-4df7-8a09-765794883524> | 2007-04-13 02:23:10 +0000 |
| commit | bbee9482d7a361474dd12b35bda1553a9996e130 (patch) | |
| tree | 572c0b78c134f9d79c6b32900a04819d0b9977eb /EdkModulePkg | |
| parent | ba6e17fe11a889992dae7f0393dc30bd7da022e6 (diff) | |
| download | edk2-platforms-bbee9482d7a361474dd12b35bda1553a9996e130.tar.xz | |
Fixed some issues for IA32 architecture platform build.
1. added UINTN typecast for shift.
2. updated Nt32.fpd and Unix.fpd.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2564 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'EdkModulePkg')
| -rw-r--r-- | EdkModulePkg/Bus/Pci/PciBus/Dxe/PciLib.c | 25 |
1 files changed, 6 insertions, 19 deletions
diff --git a/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciLib.c b/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciLib.c index fb6f21fe9d..1296836a30 100644 --- a/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciLib.c +++ b/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciLib.c @@ -2113,7 +2113,7 @@ ReadConfigData ( return Status;
}
- Stride = 1 << AccessWidth;
+ Stride = 1 << AccessWidth;
AccessAddress += Stride;
if (AccessAddress >= (Address + (1 << Width))) {
//
@@ -2215,9 +2215,7 @@ UpdateConfigData ( {
EFI_STATUS Status;
EFI_PCI_REGISTER_VALUE_DATA *PciRegisterData;
- UINT64 AndValue;
- UINT64 OrValue;
- UINT32 TempValue;
+ UINT64 TempValue;
//
// check register value incompatibility
@@ -2226,28 +2224,17 @@ UpdateConfigData ( if (Status == EFI_SUCCESS) {
- AndValue = (PciRegisterData->AndValue) >> ((Address & 0x3) * 8);
- OrValue = (PciRegisterData->OrValue) >> ((Address & 0x3) * 8);
-
TempValue = * (UINT32 *) Buffer;
- if (PciRegisterData->AndValue != VALUE_NOCARE) {
- TempValue &= (UINT32) AndValue;
- }
- if (PciRegisterData->OrValue != VALUE_NOCARE) {
- TempValue |= (UINT32) OrValue;
- }
-
switch (Width) {
case EfiPciWidthUint8:
- *(UINT32 *)Buffer = *(UINT32 *)Buffer & 0xffffff00 + (UINT8)TempValue;
+ * (UINT8 *) Buffer = (UINT8) TempValue;
break;
-
case EfiPciWidthUint16:
- *(UINT32 *)Buffer = *(UINT32 *)Buffer & 0xffff0000 + (UINT16)TempValue;
+ * (UINT16 *) Buffer = (UINT16) TempValue;
break;
case EfiPciWidthUint32:
- *(UINT32 *)Buffer = TempValue;
+ * (UINT32 *) Buffer = (UINT32) TempValue;
break;
default:
@@ -2340,7 +2327,7 @@ WriteConfigData ( //
UpdateConfigData (PciDeviceInfo, PCI_REGISTER_READ, AccessWidth, AccessAddress & 0xff, &Data);
- Shift = (Address - AccessAddress) * 8;
+ Shift = (UINTN) ((Address - AccessAddress) * 8);
switch (Width) {
case EfiPciWidthUint8:
Data = (* (UINT8 *) Buffer) << Shift | (Data & ~(0xff << Shift));
|