Remove constructor from this library. This library already has SMM CPU I/O 2 in...

[mirror_edk2.git] / MdePkg / Library / SmmIoLibSmmCpuIo2 / IoLib.c

diff --git a/MdePkg/Library/SmmIoLibSmmCpuIo2/IoLib.c b/MdePkg/Library/SmmIoLibSmmCpuIo2/IoLib.c
index 53003d123df97a610378f55493738908516f239f..816592c6f5f8a0c0c6923d0fa40d9bcd68addd45 100644 (file)
--- a/MdePkg/Library/SmmIoLibSmmCpuIo2/IoLib.c
+++ b/MdePkg/Library/SmmIoLibSmmCpuIo2/IoLib.c
@@ -16,38 +16,6 @@
 \r
 #include "SmmCpuIoLibInternal.h"\r
 \r
-//\r
-// Globle varible to cache pointer to CpuIo protocol.\r
-//\r
-EFI_SMM_CPU_IO2_PROTOCOL  *mCpuIo2 = NULL;\r
-\r
-/**\r
-  The constructor function caches the pointer to CpuIo protocol.\r
-\r
-  The constructor function locates CpuIo protocol from protocol database.\r
-  It will ASSERT() if that operation fails and it will always return EFI_SUCCESS.\r
-\r
-  @param  ImageHandle   The firmware allocated handle for the EFI image.\r
-  @param  SystemTable   A pointer to the EFI System Table.\r
-\r
-  @retval EFI_SUCCESS   The constructor always returns EFI_SUCCESS.\r
-\r
-**/\r
-EFI_STATUS\r
-EFIAPI\r
-IoLibConstructor (\r
-  IN      EFI_HANDLE                ImageHandle,\r
-  IN      EFI_SYSTEM_TABLE          *SystemTable\r
-  )\r
-{\r
-  EFI_STATUS                        Status;\r
-\r
-  Status = gSmst->SmmLocateProtocol (&gEfiSmmCpuIo2ProtocolGuid, NULL, (VOID **) &mCpuIo2);\r
-  ASSERT_EFI_ERROR (Status);\r
-\r
-  return Status;\r
-}\r
-\r
 /**\r
   Reads registers in the EFI CPU I/O space.\r
 \r
@@ -72,7 +40,7 @@ IoReadWorker (
   EFI_STATUS                        Status;\r
   UINT64                            Data;\r
 \r
-  Status = mCpuIo2->Io.Read (mCpuIo2, Width, Port, 1, &Data);\r
+  Status = gSmst->SmmIo.Io.Read (&gSmst->SmmIo, Width, Port, 1, &Data);\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   return Data;\r
@@ -103,7 +71,7 @@ IoWriteWorker (
 {\r
   EFI_STATUS                        Status;\r
 \r
-  Status = mCpuIo2->Io.Write (mCpuIo2, Width, Port, 1, &Data);\r
+  Status = gSmst->SmmIo.Io.Write (&gSmst->SmmIo, Width, Port, 1, &Data);\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   return Data;\r
@@ -133,7 +101,7 @@ MmioReadWorker (
   EFI_STATUS                        Status;\r
   UINT64                            Data;\r
 \r
-  Status = mCpuIo2->Mem.Read (mCpuIo2, Width, Address, 1, &Data);\r
+  Status = gSmst->SmmIo.Mem.Read (&gSmst->SmmIo, Width, Address, 1, &Data);\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   return Data;\r
@@ -164,7 +132,7 @@ MmioWriteWorker (
 {\r
   EFI_STATUS                        Status;\r
 \r
-  Status = mCpuIo2->Mem.Write (mCpuIo2, Width, Address, 1, &Data);\r
+  Status = gSmst->SmmIo.Mem.Write (&gSmst->SmmIo, Width, Address, 1, &Data);\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   return Data;\r