X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=MdePkg%2FLibrary%2FPeiIoLibCpuIo%2FIoLib.c;h=066ceddbfb339b96c1476d4296bae87d4fa8bd08;hb=4efb2b4d92c902c820f866f0508667b565fbd52d;hp=1da0203b5c936c3d0cb09004448dd640599d917a;hpb=9a462b415d8c9636bfb29a2cfb141e69c3c092b7;p=mirror_edk2.git

diff --git a/MdePkg/Library/PeiIoLibCpuIo/IoLib.c b/MdePkg/Library/PeiIoLibCpuIo/IoLib.c
index 1da0203b5c..066ceddbfb 100644
--- a/MdePkg/Library/PeiIoLibCpuIo/IoLib.c
+++ b/MdePkg/Library/PeiIoLibCpuIo/IoLib.c
@@ -1,5 +1,5 @@
 /** @file
-  I/O Library.
+  I/O Library. The implementations are based on EFI_PEI_SERVICE->CpuIo interface.
 
   Copyright (c) 2006, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
@@ -10,10 +10,16 @@
   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
-  Module Name:  IoLib.c
-
 **/
 
+
+#include <PiPei.h>
+
+#include <Library/IoLib.h>
+#include <Library/DebugLib.h>
+#include <Library/BaseLib.h>
+#include <Library/PeiServicesTablePointerLib.h>
+
 /**
   Reads an 8-bit I/O port.
 
@@ -25,7 +31,7 @@
 
   @param  Port  The I/O port to read.
 
-  @return The value read.
+  @return The value read from Port.
 
 **/
 UINT8
@@ -34,10 +40,10 @@ IoRead8 (
   IN      UINTN                     Port
   )
 {
-  EFI_PEI_SERVICES                  **PeiServices;
+  CONST EFI_PEI_SERVICES            **PeiServices;
   EFI_PEI_CPU_IO_PPI                *CpuIo;
 
-  PeiServices = GetPeiServicesTablePointer ();
+  PeiServices = (CONST EFI_PEI_SERVICES  **) GetPeiServicesTablePointer ();
   CpuIo       = (*PeiServices)->CpuIo;
   ASSERT (CpuIo != NULL);
 
@@ -66,10 +72,10 @@ IoWrite8 (
   IN      UINT8                     Value
   )
 {
-  EFI_PEI_SERVICES                  **PeiServices;
+  CONST EFI_PEI_SERVICES            **PeiServices;
   EFI_PEI_CPU_IO_PPI                *CpuIo;
 
-  PeiServices = GetPeiServicesTablePointer ();
+  PeiServices = (CONST EFI_PEI_SERVICES  **) GetPeiServicesTablePointer ();
   CpuIo       = (*PeiServices)->CpuIo;
   ASSERT (CpuIo != NULL);
 
@@ -88,7 +94,7 @@ IoWrite8 (
 
   @param  Port  The I/O port to read.
 
-  @return The value read.
+  @return The value read from Port.
 
 **/
 UINT16
@@ -97,10 +103,10 @@ IoRead16 (
   IN      UINTN                     Port
   )
 {
-  EFI_PEI_SERVICES                  **PeiServices;
+  CONST EFI_PEI_SERVICES            **PeiServices;
   EFI_PEI_CPU_IO_PPI                *CpuIo;
 
-  PeiServices = GetPeiServicesTablePointer ();
+  PeiServices = (CONST EFI_PEI_SERVICES  **) GetPeiServicesTablePointer ();
   CpuIo       = (*PeiServices)->CpuIo;
   ASSERT (CpuIo != NULL);
   //
@@ -132,10 +138,10 @@ IoWrite16 (
   IN      UINT16                    Value
   )
 {
-  EFI_PEI_SERVICES                  **PeiServices;
+  CONST EFI_PEI_SERVICES            **PeiServices;
   EFI_PEI_CPU_IO_PPI                *CpuIo;
 
-  PeiServices = GetPeiServicesTablePointer ();
+  PeiServices = (CONST EFI_PEI_SERVICES  **) GetPeiServicesTablePointer ();
   CpuIo       = (*PeiServices)->CpuIo;
   ASSERT (CpuIo != NULL);
   //
@@ -157,7 +163,7 @@ IoWrite16 (
 
   @param  Port  The I/O port to read.
 
-  @return The value read.
+  @return The value read from Port.
 
 **/
 UINT32
@@ -166,10 +172,10 @@ IoRead32 (
   IN      UINTN                     Port
   )
 {
-  EFI_PEI_SERVICES                  **PeiServices;
+  CONST EFI_PEI_SERVICES            **PeiServices;
   EFI_PEI_CPU_IO_PPI                *CpuIo;
 
-  PeiServices = GetPeiServicesTablePointer ();
+  PeiServices = (CONST EFI_PEI_SERVICES  **) GetPeiServicesTablePointer ();
   CpuIo       = (*PeiServices)->CpuIo;
   ASSERT (CpuIo != NULL);
   //
@@ -201,10 +207,10 @@ IoWrite32 (
   IN      UINT32                    Value
   )
 {
-  EFI_PEI_SERVICES                  **PeiServices;
+  CONST EFI_PEI_SERVICES            **PeiServices;
   EFI_PEI_CPU_IO_PPI                *CpuIo;
 
-  PeiServices = GetPeiServicesTablePointer ();
+  PeiServices = (CONST EFI_PEI_SERVICES  **) GetPeiServicesTablePointer ();
   CpuIo       = (*PeiServices)->CpuIo;
   ASSERT (CpuIo != NULL);
   //
@@ -226,7 +232,7 @@ IoWrite32 (
 
   @param  Port  The I/O port to read.
 
-  @return The value read.
+  @return The value read from Port.
 
 **/
 UINT64
@@ -235,10 +241,10 @@ IoRead64 (
   IN      UINTN                     Port
   )
 {
-  EFI_PEI_SERVICES                  **PeiServices;
+  CONST EFI_PEI_SERVICES            **PeiServices;
   EFI_PEI_CPU_IO_PPI                *CpuIo;
 
-  PeiServices = GetPeiServicesTablePointer ();
+  PeiServices = (CONST EFI_PEI_SERVICES  **) GetPeiServicesTablePointer ();
   CpuIo       = (*PeiServices)->CpuIo;
   ASSERT (CpuIo != NULL);
   //
@@ -270,10 +276,10 @@ IoWrite64 (
   IN      UINT64                    Value
   )
 {
-  EFI_PEI_SERVICES                  **PeiServices;
+  CONST EFI_PEI_SERVICES            **PeiServices;
   EFI_PEI_CPU_IO_PPI                *CpuIo;
 
-  PeiServices = GetPeiServicesTablePointer ();
+  PeiServices = (CONST EFI_PEI_SERVICES  **) GetPeiServicesTablePointer ();
   CpuIo       = (*PeiServices)->CpuIo;
   ASSERT (CpuIo != NULL);
   //
@@ -295,7 +301,7 @@ IoWrite64 (
 
   @param  Address The MMIO register to read.
 
-  @return The value read.
+  @return The value read from Port.
 
 **/
 UINT8
@@ -304,10 +310,10 @@ MmioRead8 (
   IN      UINTN                     Address
   )
 {
-  EFI_PEI_SERVICES                  **PeiServices;
+  CONST EFI_PEI_SERVICES            **PeiServices;
   EFI_PEI_CPU_IO_PPI                *CpuIo;
 
-  PeiServices = GetPeiServicesTablePointer ();
+  PeiServices = (CONST EFI_PEI_SERVICES  **) GetPeiServicesTablePointer ();
   CpuIo       = (*PeiServices)->CpuIo;
   ASSERT (CpuIo != NULL);
 
@@ -325,7 +331,8 @@ MmioRead8 (
 
   @param  Address The MMIO register to write.
   @param  Value   The value to write to the MMIO register.
-
+  
+  @return The Value written back to Mmio register.
 **/
 UINT8
 EFIAPI
@@ -334,10 +341,10 @@ MmioWrite8 (
   IN      UINT8                     Value
   )
 {
-  EFI_PEI_SERVICES                  **PeiServices;
+  CONST EFI_PEI_SERVICES            **PeiServices;
   EFI_PEI_CPU_IO_PPI                *CpuIo;
 
-  PeiServices = GetPeiServicesTablePointer ();
+  PeiServices = (CONST EFI_PEI_SERVICES  **) GetPeiServicesTablePointer ();
   CpuIo       = (*PeiServices)->CpuIo;
   ASSERT (CpuIo != NULL);
 
@@ -356,7 +363,7 @@ MmioWrite8 (
 
   @param  Address The MMIO register to read.
 
-  @return The value read.
+  @return The value read from Address.
 
 **/
 UINT16
@@ -365,10 +372,10 @@ MmioRead16 (
   IN      UINTN                     Address
   )
 {
-  EFI_PEI_SERVICES                  **PeiServices;
+  CONST EFI_PEI_SERVICES            **PeiServices;
   EFI_PEI_CPU_IO_PPI                *CpuIo;
 
-  PeiServices = GetPeiServicesTablePointer ();
+  PeiServices = (CONST EFI_PEI_SERVICES  **) GetPeiServicesTablePointer ();
   CpuIo       = (*PeiServices)->CpuIo;
   ASSERT (CpuIo != NULL);
   //
@@ -390,6 +397,8 @@ MmioRead16 (
 
   @param  Address The MMIO register to write.
   @param  Value   The value to write to the MMIO register.
+  
+  @return The Value written back to Mmio register
 
 **/
 UINT16
@@ -399,10 +408,10 @@ MmioWrite16 (
   IN      UINT16                    Value
   )
 {
-  EFI_PEI_SERVICES                  **PeiServices;
+  CONST EFI_PEI_SERVICES            **PeiServices;
   EFI_PEI_CPU_IO_PPI                *CpuIo;
 
-  PeiServices = GetPeiServicesTablePointer ();
+  PeiServices = (CONST EFI_PEI_SERVICES  **) GetPeiServicesTablePointer ();
   CpuIo       = (*PeiServices)->CpuIo;
   ASSERT (CpuIo != NULL);
   //
@@ -424,7 +433,7 @@ MmioWrite16 (
 
   @param  Address The MMIO register to read.
 
-  @return The value read.
+  @return The value read from Address.
 
 **/
 UINT32
@@ -433,10 +442,10 @@ MmioRead32 (
   IN      UINTN                     Address
   )
 {
-  EFI_PEI_SERVICES                  **PeiServices;
+  CONST EFI_PEI_SERVICES            **PeiServices;
   EFI_PEI_CPU_IO_PPI                *CpuIo;
 
-  PeiServices = GetPeiServicesTablePointer ();
+  PeiServices = (CONST EFI_PEI_SERVICES  **) GetPeiServicesTablePointer ();
   CpuIo       = (*PeiServices)->CpuIo;
   ASSERT (CpuIo != NULL);
   //
@@ -458,6 +467,8 @@ MmioRead32 (
 
   @param  Address The MMIO register to write.
   @param  Value   The value to write to the MMIO register.
+  
+  @return The Value written back to Mmio register
 
 **/
 UINT32
@@ -467,10 +478,10 @@ MmioWrite32 (
   IN      UINT32                    Value
   )
 {
-  EFI_PEI_SERVICES                  **PeiServices;
+  CONST EFI_PEI_SERVICES            **PeiServices;
   EFI_PEI_CPU_IO_PPI                *CpuIo;
 
-  PeiServices = GetPeiServicesTablePointer ();
+  PeiServices = (CONST EFI_PEI_SERVICES  **) GetPeiServicesTablePointer ();
   CpuIo       = (*PeiServices)->CpuIo;
   ASSERT (CpuIo != NULL);
   //
@@ -492,7 +503,7 @@ MmioWrite32 (
 
   @param  Address The MMIO register to read.
 
-  @return The value read.
+  @return The value read from Address.
 
 **/
 UINT64
@@ -501,16 +512,16 @@ MmioRead64 (
   IN      UINTN                     Address
   )
 {
-  EFI_PEI_SERVICES                  **PeiServices;
+  CONST EFI_PEI_SERVICES            **PeiServices;
   EFI_PEI_CPU_IO_PPI                *CpuIo;
 
-  PeiServices = GetPeiServicesTablePointer ();
+  PeiServices = (CONST EFI_PEI_SERVICES  **) GetPeiServicesTablePointer ();
   CpuIo       = (*PeiServices)->CpuIo;
   ASSERT (CpuIo != NULL);
   //
   // Make sure Address is aligned on a 64-bit boundary.
   //
-  ASSERT ((Address & 7) == 0);
+  ASSERT ((Address & (sizeof (UINT64) - 1)) == 0);
   return CpuIo->MemRead64 (PeiServices, CpuIo, (UINT64) Address);
 
 }
@@ -527,6 +538,7 @@ MmioRead64 (
   @param  Address The MMIO register to write.
   @param  Value   The value to write to the MMIO register.
 
+  @return The Value written back to Mmio register
 **/
 UINT64
 EFIAPI
@@ -535,10 +547,10 @@ MmioWrite64 (
   IN      UINT64                    Value
   )
 {
-  EFI_PEI_SERVICES                  **PeiServices;
+  CONST EFI_PEI_SERVICES            **PeiServices;
   EFI_PEI_CPU_IO_PPI                *CpuIo;
 
-  PeiServices = GetPeiServicesTablePointer ();
+  PeiServices = (CONST EFI_PEI_SERVICES  **) GetPeiServicesTablePointer ();
   CpuIo       = (*PeiServices)->CpuIo;
   ASSERT (CpuIo != NULL);
   //