Clean up BaseIoLibIntrinsic according to review comments.

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

6 files changed, 14 insertions, 25 deletions

diff --git a/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf b/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
index 9eb960c068..e6e14c0b21 100644
--- a/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
+++ b/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
@@ -2,8 +2,8 @@
 # Component description file for Intrinsic Base Io Library

 #

 # I/O Library that uses compiler intrinsics to perform IN and OUT instructions

-#  for IA-32 and x64. It also performs direct memory access for MMIO services.

-# Copyright (c) 2007, Intel Corporation.

+#  for IA-32, x64 and IPF. It also performs direct memory access for MMIO services.

+# Copyright (c) 2007 - 2008, Intel Corporation.

 #

 #  All rights reserved. This program and the accompanying materials

 #  are licensed and made available under the terms and conditions of the BSD License

@@ -33,23 +33,21 @@
 [Sources.common]

   IoLibMmioBuffer.c

   BaseIoLibIntrinsicInternal.h

+  IoHighLevel.c

 

 [Sources.Ia32]

-  IoHighLevel.c

   IoLibGcc.c    | GCC

   IoLibMsc.c    | MSFT

   IoLibIcc.c    | INTEL

   IoLib.c

 

 [Sources.X64]

-  IoHighLevel.c

   IoLibGcc.c    | GCC

   IoLibMsc.c    | MSFT

   IoLibIcc.c    | INTEL

   IoLib.c

 

 [Sources.IPF]

-  IoHighLevel.c

   IoLibIpf.c

 

 [Packages]

diff --git a/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicInternal.h b/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicInternal.h
index 1a30d26fc4..1e9dfa7eab 100644
--- a/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicInternal.h
+++ b/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicInternal.h
@@ -3,7 +3,7 @@
 

   This file includes package header files, dependent library classes.

 

-  Copyright (c) 2007, Intel Corporation.

+  Copyright (c) 2007 - 2008, Intel Corporation.

   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

@@ -19,10 +19,8 @@
 

 #include <Base.h>

 

-

 #include <Library/IoLib.h>

 #include <Library/BaseLib.h>

 #include <Library/DebugLib.h>

-#include <Library/PcdLib.h>

 

 #endif

diff --git a/MdePkg/Library/BaseIoLibIntrinsic/IoHighLevel.c b/MdePkg/Library/BaseIoLibIntrinsic/IoHighLevel.c
index 4e5a738155..76aca8d478 100644
--- a/MdePkg/Library/BaseIoLibIntrinsic/IoHighLevel.c
+++ b/MdePkg/Library/BaseIoLibIntrinsic/IoHighLevel.c
@@ -4,7 +4,7 @@
   All assertions for bit field operations are handled bit field functions in the

   Base Library.

 

-  Copyright (c) 2006, Intel Corporation<BR>

+  Copyright (c) 2006 - 2008, 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

@@ -21,9 +21,6 @@
 

 **/

 

-//

-// Include common header file for this module.

-//

 #include "BaseIoLibIntrinsicInternal.h"

 

 /**

diff --git a/MdePkg/Library/BaseIoLibIntrinsic/IoLibIcc.c b/MdePkg/Library/BaseIoLibIntrinsic/IoLibIcc.c
index c83fe8838d..0d4ee40724 100644
--- a/MdePkg/Library/BaseIoLibIntrinsic/IoLibIcc.c
+++ b/MdePkg/Library/BaseIoLibIntrinsic/IoLibIcc.c
@@ -2,7 +2,7 @@
   I/O Library. This file has compiler specifics for ICC as there

   is no ANSI C standard for doing IO.

 

-  Copyright (c) 2006 - 2007, Intel Corporation<BR> All rights

+  Copyright (c) 2006 - 2008, 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

@@ -350,9 +350,6 @@ IoWrite16 (
     out dx, ax

   }

 

-  //

-  // Never reached return statement.

-  //

   return Value;

 }

 

diff --git a/MdePkg/Library/BaseIoLibIntrinsic/IoLibIpf.c b/MdePkg/Library/BaseIoLibIntrinsic/IoLibIpf.c
index bcd376aa63..0ab4211808 100644
--- a/MdePkg/Library/BaseIoLibIntrinsic/IoLibIpf.c
+++ b/MdePkg/Library/BaseIoLibIntrinsic/IoLibIpf.c
@@ -1,7 +1,7 @@
 /** @file

   Common I/O Library routines.

 

-  Copyright (c) 2006 - 2007, Intel Corporation<BR>

+  Copyright (c) 2006 - 2008, 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

@@ -12,10 +12,9 @@
 

 **/

 

-//

-// Include common header file for this module.

-//

+

 #include "BaseIoLibIntrinsicInternal.h"

+#include <Library/PcdLib.h>

 

 #define MAP_PORT_BASE_TO_MEM(_Port) \

     ((((_Port) & 0xfffc) << 10) | ((_Port) & 0x0fff))

diff --git a/MdePkg/Library/BaseIoLibIntrinsic/IoLibMmioBuffer.c b/MdePkg/Library/BaseIoLibIntrinsic/IoLibMmioBuffer.c
index 4a54837413..d6ff0ba011 100644
--- a/MdePkg/Library/BaseIoLibIntrinsic/IoLibMmioBuffer.c
+++ b/MdePkg/Library/BaseIoLibIntrinsic/IoLibMmioBuffer.c
@@ -1,7 +1,7 @@
 /** @file

   I/O Library MMIO Buffer Functions.

 

-  Copyright (c) 2007, Intel Corporation<BR>

+  Copyright (c) 2007 - 2008, 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

@@ -220,7 +220,7 @@ MmioReadBuffer64 (
 

 

   @param  StartAddress    Starting address for the MMIO region to be copied to.

-  @param  Length     Size in bytes of the copy.

+  @param  Length          Size in bytes of the copy.

   @param  Buffer          Pointer to a system memory buffer containing the data to write.

 

   @return Size in bytes of the copy.

@@ -266,7 +266,7 @@ MmioWriteBuffer8 (
   If Buffer is not aligned on a 16-bit boundary, then ASSERT().

 

   @param  StartAddress    Starting address for the MMIO region to be copied to.

-  @param  Length     Size in bytes of the copy.

+  @param  Length          Size in bytes of the copy.

   @param  Buffer          Pointer to a system memory buffer containing the data to write.

 

   @return Size in bytes of the copy.

@@ -320,7 +320,7 @@ MmioWriteBuffer16 (
   If Buffer is not aligned on a 32-bit boundary, then ASSERT().

 

   @param  StartAddress    Starting address for the MMIO region to be copied to.

-  @param  Length     Size in bytes of the copy.

+  @param  Length          Size in bytes of the copy.

   @param  Buffer          Pointer to a system memory buffer containing the data to write.

 

   @return Size in bytes of the copy.

@@ -373,7 +373,7 @@ MmioWriteBuffer32 (
   If Buffer is not aligned on a 64-bit boundary, then ASSERT().

 

   @param  StartAddress    Starting address for the MMIO region to be copied to.

-  @param  Length     Size in bytes of the copy.

+  @param  Length          Size in bytes of the copy.

   @param  Buffer          Pointer to a system memory buffer containing the data to write.

 

   @return Size in bytes of the copy.