X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=IntelFrameworkPkg%2FLibrary%2FDxeIoLibCpuIo%2FIoLib.c;fp=IntelFrameworkPkg%2FLibrary%2FDxeIoLibCpuIo%2FIoLib.c;h=c01555974f63f8f147901019ea2bd92c993e4476;hp=ff0e32329168f2191adb3e929d35580b22cb8271;hb=33338afebd3004e24d642e6dd7d053cda83990f1;hpb=17d2c9a3af2febc5ff4e22715014f63a5a77d9dc

diff --git a/IntelFrameworkPkg/Library/DxeIoLibCpuIo/IoLib.c b/IntelFrameworkPkg/Library/DxeIoLibCpuIo/IoLib.c
index ff0e323291..c01555974f 100644
--- a/IntelFrameworkPkg/Library/DxeIoLibCpuIo/IoLib.c
+++ b/IntelFrameworkPkg/Library/DxeIoLibCpuIo/IoLib.c
@@ -3,7 +3,7 @@
   The implementation of I/O operation for this library instance 
   are based on EFI_CPU_IO_PROTOCOL.
   
-  Copyright (c) 2006, Intel Corporation<BR>
+  Copyright (c) 2006-2010, Intel Corporation<BR>
   All rights reserved. This program and the accompanying materials
   are licensed and made available under the terms and conditions of the BSD License
   which accompanies this distribution.  The full text of the license may be found at
@@ -22,8 +22,7 @@
 //
 // Globle varible to cache pointer to CpuIo protocol.
 //
-EFI_CPU_IO_PROTOCOL              *mCpuIo = NULL;
-EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL  *mPciRootBridgeIo = NULL;
+EFI_CPU_IO_PROTOCOL  *mCpuIo = NULL;
 
 /**
   The constructor function caches the pointer to CpuIo protocol.
@@ -44,12 +43,9 @@ IoLibConstructor (
   IN      EFI_SYSTEM_TABLE          *SystemTable
   )
 {
-  EFI_STATUS                        Status;
+  EFI_STATUS  Status;
 
-  Status = gBS->LocateProtocol (&gEfiPciRootBridgeIoProtocolGuid, NULL, (VOID **) &mPciRootBridgeIo);
-  if (EFI_ERROR (Status)) {
-    Status = gBS->LocateProtocol (&gEfiCpuIoProtocolGuid, NULL, (VOID **) &mCpuIo);
-  }
+  Status = gBS->LocateProtocol (&gEfiCpuIoProtocolGuid, NULL, (VOID **) &mCpuIo);
   ASSERT_EFI_ERROR (Status);
 
   return Status;
@@ -72,18 +68,14 @@ IoLibConstructor (
 UINT64
 EFIAPI
 IoReadWorker (
-  IN      UINTN                     Port,
-  IN      EFI_CPU_IO_PROTOCOL_WIDTH Width
+  IN      UINTN                      Port,
+  IN      EFI_CPU_IO_PROTOCOL_WIDTH  Width
   )
 {
   EFI_STATUS                        Status;
   UINT64                            Data;
 
-  if (mPciRootBridgeIo != NULL) {
-    Status = mPciRootBridgeIo->Io.Read (mPciRootBridgeIo, (EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_WIDTH) Width, Port, 1, &Data);
-  } else {
-    Status = mCpuIo->Io.Read (mCpuIo, Width, Port, 1, &Data);
-  }
+  Status = mCpuIo->Io.Read (mCpuIo, Width, Port, 1, &Data);
   ASSERT_EFI_ERROR (Status);
 
   return Data;
@@ -107,18 +99,14 @@ IoReadWorker (
 UINT64
 EFIAPI
 IoWriteWorker (
-  IN      UINTN                     Port,
-  IN      EFI_CPU_IO_PROTOCOL_WIDTH Width,
-  IN      UINT64                    Data
+  IN      UINTN                      Port,
+  IN      EFI_CPU_IO_PROTOCOL_WIDTH  Width,
+  IN      UINT64                     Data
   )
 {
-  EFI_STATUS                        Status;
+  EFI_STATUS  Status;
 
-  if (mPciRootBridgeIo != NULL) {
-    Status = mPciRootBridgeIo->Io.Write (mPciRootBridgeIo, (EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_WIDTH) Width, Port, 1, &Data);
-  } else {
-    Status = mCpuIo->Io.Write (mCpuIo, Width, Port, 1, &Data);
-  }
+  Status = mCpuIo->Io.Write (mCpuIo, Width, Port, 1, &Data);
   ASSERT_EFI_ERROR (Status);
 
   return Data;
@@ -141,18 +129,14 @@ IoWriteWorker (
 UINT64
 EFIAPI
 MmioReadWorker (
-  IN      UINTN                     Address,
-  IN      EFI_CPU_IO_PROTOCOL_WIDTH Width
+  IN      UINTN                      Address,
+  IN      EFI_CPU_IO_PROTOCOL_WIDTH  Width
   )
 {
-  EFI_STATUS                        Status;
-  UINT64                            Data;
+  EFI_STATUS  Status;
+  UINT64      Data;
 
-  if (mPciRootBridgeIo != NULL) {
-    Status = mPciRootBridgeIo->Mem.Read (mPciRootBridgeIo, (EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_WIDTH) Width, Address, 1, &Data);
-  } else {
-    Status = mCpuIo->Mem.Read (mCpuIo, Width, Address, 1, &Data);
-  }
+  Status = mCpuIo->Mem.Read (mCpuIo, Width, Address, 1, &Data);
   ASSERT_EFI_ERROR (Status);
 
   return Data;
@@ -176,18 +160,14 @@ MmioReadWorker (
 UINT64
 EFIAPI
 MmioWriteWorker (
-  IN      UINTN                     Address,
-  IN      EFI_CPU_IO_PROTOCOL_WIDTH Width,
-  IN      UINT64                    Data
+  IN      UINTN                      Address,
+  IN      EFI_CPU_IO_PROTOCOL_WIDTH  Width,
+  IN      UINT64                     Data
   )
 {
-  EFI_STATUS                        Status;
+  EFI_STATUS  Status;
 
-  if (mPciRootBridgeIo != NULL) {
-    Status = mPciRootBridgeIo->Mem.Write (mPciRootBridgeIo, (EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_WIDTH) Width, Address, 1, &Data);
-  } else {
-    Status = mCpuIo->Mem.Write (mCpuIo, Width, Address, 1, &Data);
-  }
+  Status = mCpuIo->Mem.Write (mCpuIo, Width, Address, 1, &Data);
   ASSERT_EFI_ERROR (Status);
 
   return Data;