Update the copyright notice format

[mirror_edk2.git] / DuetPkg / PciRootBridgeNoEnumerationDxe / PcatPciRootBridgeIo.c

diff --git a/DuetPkg/PciRootBridgeNoEnumerationDxe/PcatPciRootBridgeIo.c b/DuetPkg/PciRootBridgeNoEnumerationDxe/PcatPciRootBridgeIo.c
index abb6acbd96c85ac2534b87d246da868d67f4fac4..83ce4d0a5159624687ddc364a39b2b8188864ff6 100644 (file)
--- a/DuetPkg/PciRootBridgeNoEnumerationDxe/PcatPciRootBridgeIo.c
+++ b/DuetPkg/PciRootBridgeNoEnumerationDxe/PcatPciRootBridgeIo.c
@@ -1,7 +1,7 @@
 /*++\r
 \r
-Copyright (c) 2005 - 2007, Intel Corporation                                                         \r
-All rights reserved. This program and the accompanying materials                          \r
+Copyright (c) 2005 - 2009, Intel Corporation. All rights reserved.<BR>\r
+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
 http://opensource.org/licenses/bsd-license.php                                            \r
@@ -189,7 +189,6 @@ PcatRootBridgeIoConfiguration (
 //\r
 // Private Function Prototypes\r
 //\r
-STATIC \r
 EFI_STATUS\r
 EFIAPI\r
 PcatRootBridgeIoMemRW (\r
@@ -203,7 +202,7 @@ PcatRootBridgeIoMemRW (
 \r
 EFI_STATUS\r
 PcatRootBridgeIoConstructor (\r
-       IN EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL  *Protocol,\r
+  IN EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL  *Protocol,\r
   IN UINTN                            SegmentNumber\r
   )\r
 /*++\r
@@ -270,7 +269,7 @@ PcatRootBridgeIoPollMem (
 {\r
   EFI_STATUS  Status;\r
   UINT64      NumberOfTicks;\r
-  UINTN       Remainder;\r
+  UINT32      Remainder;\r
 \r
   if (Result == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -291,7 +290,9 @@ PcatRootBridgeIoPollMem (
     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
@@ -332,7 +333,7 @@ PcatRootBridgeIoPollIo (
 {\r
   EFI_STATUS  Status;\r
   UINT64      NumberOfTicks;\r
-  UINTN       Remainder;\r
+  UINT32       Remainder;\r
 \r
   if (Result == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -352,7 +353,9 @@ PcatRootBridgeIoPollIo (
     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
@@ -636,7 +639,7 @@ PcatRootBridgeIoMap (
   // 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
@@ -654,7 +657,7 @@ PcatRootBridgeIoMap (
     Status = gBS->AllocatePool (\r
                     EfiBootServicesData, \r
                     sizeof(MAP_INFO), \r
-                    &MapInfo\r
+                    (VOID **)&MapInfo\r
                     );\r
     if (EFI_ERROR (Status)) {\r
       *NumberOfBytes = 0;\r
@@ -704,10 +707,10 @@ PcatRootBridgeIoMap (
     }\r
 \r
 \r
-       Status =gBS->AllocatePool (\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
@@ -720,7 +723,7 @@ PcatRootBridgeIoMap (
     PrivateData = DRIVER_INSTANCE_FROM_PCI_ROOT_BRIDGE_IO_THIS(This);\r
     InsertTailList(&PrivateData->MapInfo,&MapInstance->Link);\r
     \r
-       //\r
+  //\r
     // The DeviceAddress is the address of the maped buffer below 4GB\r
     //\r
     *DeviceAddress = MapInfo->MappedHostAddress;\r
@@ -767,14 +770,14 @@ PcatRootBridgeIoUnmap (
     //\r
     MapInfo = (MAP_INFO *)Mapping;\r
 \r
-       for (Link = PrivateData->MapInfo.ForwardLink; Link != &PrivateData->MapInfo; Link = Link->ForwardLink) {\r
-       if (((MAP_INFO_INSTANCE*)Link)->Map == MapInfo)\r
-               break;\r
+  for (Link = PrivateData->MapInfo.ForwardLink; Link != &PrivateData->MapInfo; Link = Link->ForwardLink) {\r
+      if (((MAP_INFO_INSTANCE*)Link)->Map == MapInfo)\r
+        break;\r
     }\r
 \r
     if (Link == &PrivateData->MapInfo) {\r
-       return EFI_INVALID_PARAMETER;\r
-       }\r
+      return EFI_INVALID_PARAMETER;\r
+  }\r
 \r
     RemoveEntryList(Link);\r
     ((MAP_INFO_INSTANCE*)Link)->Map = NULL;\r
@@ -869,7 +872,7 @@ PcatRootBridgeIoFreeBuffer (
 {\r
 \r
   if( HostAddress == NULL ){\r
-        return EFI_INVALID_PARAMETER;\r
+     return EFI_INVALID_PARAMETER;\r
   } \r
   return gBS->FreePages ((EFI_PHYSICAL_ADDRESS)(UINTN)HostAddress, Pages);\r
 }\r
@@ -979,7 +982,6 @@ PcatRootBridgeIoConfiguration (
 // Internal function\r
 //\r
 \r
-STATIC \r
 EFI_STATUS\r
 EFIAPI\r
 PcatRootBridgeIoMemRW (\r
@@ -1015,7 +1017,7 @@ Returns:
   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