/*++\r
\r
-Copyright (c) 2005 - 2007, Intel Corporation \r
+Copyright (c) 2005 - 2008, 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
//\r
// Private Function Prototypes\r
//\r
-STATIC \r
EFI_STATUS\r
EFIAPI\r
PcatRootBridgeIoMemRW (\r
{\r
EFI_STATUS Status;\r
UINT64 NumberOfTicks;\r
- UINTN Remainder;\r
+ UINT32 Remainder;\r
\r
if (Result == NULL) {\r
return EFI_INVALID_PARAMETER;\r
return EFI_SUCCESS;\r
}\r
\r
- if ( Delay != 0 ) {\r
+ if (Delay == 0) {\r
+ return EFI_SUCCESS;\r
+ } else {\r
\r
NumberOfTicks = DivU64x32Remainder (Delay, 100, &Remainder);\r
if ( Remainder !=0 ) {\r
{\r
EFI_STATUS Status;\r
UINT64 NumberOfTicks;\r
- UINTN Remainder;\r
+ UINT32 Remainder;\r
\r
if (Result == NULL) {\r
return EFI_INVALID_PARAMETER;\r
return EFI_SUCCESS;\r
}\r
\r
- if (Delay != 0) {\r
+ if (Delay == 0) {\r
+ return EFI_SUCCESS;\r
+ } else {\r
\r
NumberOfTicks = DivU64x32Remainder (Delay, 100, &Remainder);\r
if ( Remainder !=0 ) {\r
// map the DMA transfer to a buffer below 4GB.\r
//\r
PhysicalAddress = (EFI_PHYSICAL_ADDRESS)(UINTN)HostAddress;\r
- if ((PhysicalAddress + *NumberOfBytes) > 0x100000000) {\r
+ if ((PhysicalAddress + *NumberOfBytes) > 0x100000000ULL) {\r
\r
//\r
// Common Buffer operations can not be remapped. If the common buffer\r
Status = gBS->AllocatePool (\r
EfiBootServicesData, \r
sizeof(MAP_INFO), \r
- &MapInfo\r
+ (VOID **)&MapInfo\r
);\r
if (EFI_ERROR (Status)) {\r
*NumberOfBytes = 0;\r
Status =gBS->AllocatePool (\r
EfiBootServicesData, \r
sizeof(MAP_INFO_INSTANCE), \r
- &MapInstance\r
+ (VOID **)&MapInstance\r
); \r
if (EFI_ERROR(Status)) {\r
gBS->FreePages (MapInfo->MappedHostAddress,MapInfo->NumberOfPages);\r
// Internal function\r
//\r
\r
-STATIC \r
EFI_STATUS\r
EFIAPI\r
PcatRootBridgeIoMemRW (\r
UINTN OutStride;\r
\r
\r
- Width = Width & 0x03;\r
+ Width = (EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_WIDTH) (Width & 0x03);\r
Stride = (UINTN)1 << Width;\r
InStride = InStrideFlag ? Stride : 0;\r
OutStride = OutStrideFlag ? Stride : 0;\r