Update 8259 driver to use IoLib instead of the CPU I/O Protocol

Remove redundant .DXS file.  The dependency expression is in the INF file.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@6246 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/IntelFrameworkModulePkg/Universal/Legacy8259Dxe/8259.c b/IntelFrameworkModulePkg/Universal/Legacy8259Dxe/8259.c
index dc1c50ff8a080fad8ce66864b031eddb1b648e1b..8a21cd6bf5660b2c3731718bd2bcc4b882b566cc 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/Legacy8259Dxe/8259.c
+++ b/IntelFrameworkModulePkg/Universal/Legacy8259Dxe/8259.c
@@ -14,11 +14,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 #include "8259.h"\r
 \r
-//\r
-// Global for the CPU I/O Protocol that is consumed by this driver\r
-//\r
-EFI_CPU_IO_PROTOCOL       *mCpuIo;\r
-\r
 //\r
 // Global for the Legacy 8259 Protocol that is prodiced by this driver\r
 //\r
@@ -50,52 +45,6 @@ UINT16                    mLegacyModeEdgeLevel    = 0x0000;
 //\r
 // Worker Functions\r
 //\r
-VOID\r
-IoWrite8 (\r
-  IN UINT16  Port,\r
-  IN UINT8   Value\r
-  )\r
-/**\r
-\r
-  Routine Description:\r
-    Writes an I/O port using the CPU I/O Protocol\r
-\r
-  Arguments:\r
-    Register   - I/O Port to write\r
-    Value      - The 8 bit value to write to Port\r
-\r
-  Returns:\r
-    None\r
-\r
-**/\r
-{\r
-  mCpuIo->Io.Write (mCpuIo, EfiCpuIoWidthUint8, Port, 1, &Value);\r
-}\r
-\r
-UINT8\r
-IoRead8 (\r
-  IN UINT16  Port\r
-  )\r
-/**\r
-\r
-  Routine Description:\r
-    Writes an I/O port using the CPU I/O Protocol\r
-\r
-  Arguments:\r
-    Register   - I/O Port to write\r
-    Value      - The 8 bit value to write to Port\r
-\r
-  Returns:\r
-    None\r
-\r
-**/\r
-{\r
-  UINT8 Value;\r
-\r
-  mCpuIo->Io.Read (mCpuIo, EfiCpuIoWidthUint8, Port, 1, &Value);\r
-  return Value;\r
-}\r
-\r
 VOID\r
 Interrupt8259WriteMask (\r
   IN UINT16  Mask,\r
@@ -620,12 +569,6 @@ Returns:
   EFI_STATUS   Status;\r
   EFI_8259_IRQ Irq;\r
 \r
-  //\r
-  // Find the CPU I/O Protocol\r
-  //\r
-  Status = gBS->LocateProtocol (&gEfiCpuIoProtocolGuid, NULL, (VOID **) &mCpuIo);\r
-  ASSERT_EFI_ERROR (Status);\r
-\r
   //\r
   // Clear all pending interrupt\r
   //\r
@@ -652,7 +595,6 @@ Returns:
                   EFI_NATIVE_INTERFACE,\r
                   &m8259\r
                   );\r
-\r
   return Status;\r
 }\r
 \r

diff --git a/IntelFrameworkModulePkg/Universal/Legacy8259Dxe/8259.dxs b/IntelFrameworkModulePkg/Universal/Legacy8259Dxe/8259.dxs
deleted file mode 100644 (file)
index e2c3845..0000000
--- a/IntelFrameworkModulePkg/Universal/Legacy8259Dxe/8259.dxs
+++ /dev/null
@@ -1,28 +0,0 @@
-/*++\r
-\r
-Copyright (c) 2005, 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
-http://opensource.org/licenses/bsd-license.php                                            \r
-                                                                                          \r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
-\r
-Module Name:\r
-\r
-  8259.dxs\r
-\r
-Abstract:\r
-  Dependency expression source file.\r
-  \r
---*/  \r
-\r
-#include "EfiDepex.h"\r
-\r
-#include EFI_PROTOCOL_DEFINITION (CpuIo)\r
-\r
-DEPENDENCY_START\r
-  EFI_CPU_IO_PROTOCOL_GUID \r
-DEPENDENCY_END\r
-\r

diff --git a/IntelFrameworkModulePkg/Universal/Legacy8259Dxe/8259.h b/IntelFrameworkModulePkg/Universal/Legacy8259Dxe/8259.h
index 18bd37bddd8c047e7d739b1f97b3339dd057457b..f77494c946faf90ce3ea58eb60971e999b804789 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/Legacy8259Dxe/8259.h
+++ b/IntelFrameworkModulePkg/Universal/Legacy8259Dxe/8259.h
@@ -23,11 +23,11 @@ Abstract:
 \r
 #include <FrameworkDxe.h>\r
 \r
-#include <Protocol/CpuIo.h>\r
 #include <Protocol/Legacy8259.h>\r
 \r
 #include <Library/UefiBootServicesTableLib.h>\r
 #include <Library/DebugLib.h>\r
+#include <Library/IoLib.h>\r
 \r
 //\r
 // 8259 Hardware definitions\r

diff --git a/IntelFrameworkModulePkg/Universal/Legacy8259Dxe/8259.inf b/IntelFrameworkModulePkg/Universal/Legacy8259Dxe/8259.inf
index 9887bbf10bbf5ec83123c9f5b35d5f82ec5d2ff0..fbd12770952257d0b8f543c26c02b640861040d3 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/Legacy8259Dxe/8259.inf
+++ b/IntelFrameworkModulePkg/Universal/Legacy8259Dxe/8259.inf
@@ -37,6 +37,7 @@
   UefiBootServicesTableLib\r
   DebugLib\r
   UefiDriverEntryPoint\r
+  IoLib\r
 \r
 [Sources.common]\r
   8259.c\r
@@ -44,7 +45,6 @@
 \r
 [Protocols]\r
   gEfiLegacy8259ProtocolGuid\r
-  gEfiCpuIoProtocolGuid\r
 \r
 [Depex]\r
-  gEfiCpuIoProtocolGuid
\ No newline at end of file
+  TRUE
\ No newline at end of file