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

diff --git a/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf b/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
index 9eb960c068eca46e3fbe0553b40cb630027b2718..e6e14c0b21dbad301addbf87bb34323489db46e4 100644 (file)
--- a/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
+++ b/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
@@ -2,8 +2,8 @@
 # Component description file for Intrinsic Base Io Library\r
 #\r
 # I/O Library that uses compiler intrinsics to perform IN and OUT instructions\r
-#  for IA-32 and x64. It also performs direct memory access for MMIO services.\r
-# Copyright (c) 2007, Intel Corporation.\r
+#  for IA-32, x64 and IPF. It also performs direct memory access for MMIO services.\r
+# Copyright (c) 2007 - 2008, Intel Corporation.\r
 #\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
@@ -33,23 +33,21 @@
 [Sources.common]\r
   IoLibMmioBuffer.c\r
   BaseIoLibIntrinsicInternal.h\r
+  IoHighLevel.c\r
 \r
 [Sources.Ia32]\r
-  IoHighLevel.c\r
   IoLibGcc.c    | GCC\r
   IoLibMsc.c    | MSFT\r
   IoLibIcc.c    | INTEL\r
   IoLib.c\r
 \r
 [Sources.X64]\r
-  IoHighLevel.c\r
   IoLibGcc.c    | GCC\r
   IoLibMsc.c    | MSFT\r
   IoLibIcc.c    | INTEL\r
   IoLib.c\r
 \r
 [Sources.IPF]\r
-  IoHighLevel.c\r
   IoLibIpf.c\r
 \r
 [Packages]\r

diff --git a/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicInternal.h b/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicInternal.h
index 1a30d26fc4329ff5e6600d11eac035053480723d..1e9dfa7eaba3693b8105d26426e8ebb891f6745a 100644 (file)
--- a/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicInternal.h
+++ b/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicInternal.h
@@ -3,7 +3,7 @@
 \r
   This file includes package header files, dependent library classes.\r
 \r
-  Copyright (c) 2007, Intel Corporation.\r
+  Copyright (c) 2007 - 2008, 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
@@ -19,10 +19,8 @@
 \r
 #include <Base.h>\r
 \r
-\r
 #include <Library/IoLib.h>\r
 #include <Library/BaseLib.h>\r
 #include <Library/DebugLib.h>\r
-#include <Library/PcdLib.h>\r
 \r
 #endif\r

diff --git a/MdePkg/Library/BaseIoLibIntrinsic/IoHighLevel.c b/MdePkg/Library/BaseIoLibIntrinsic/IoHighLevel.c
index 4e5a738155a7e85cc8d8d60e8108f31b5d755b81..76aca8d478b7a35f1be4bcfbb9c2cc02615e07d2 100644 (file)
--- 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\r
   Base Library.\r
 \r
-  Copyright (c) 2006, Intel Corporation<BR>\r
+  Copyright (c) 2006 - 2008, Intel Corporation<BR>\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
@@ -21,9 +21,6 @@
 \r
 **/\r
 \r
-//\r
-// Include common header file for this module.\r
-//\r
 #include "BaseIoLibIntrinsicInternal.h"\r
 \r
 /**\r

diff --git a/MdePkg/Library/BaseIoLibIntrinsic/IoLibIcc.c b/MdePkg/Library/BaseIoLibIntrinsic/IoLibIcc.c
index c83fe8838de5f181a6b80681282b1cb09359fd5f..0d4ee407244aabe2fc3cdbf6579ebbc536c7d42f 100644 (file)
--- 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\r
   is no ANSI C standard for doing IO.\r
 \r
-  Copyright (c) 2006 - 2007, Intel Corporation<BR> All rights\r
+  Copyright (c) 2006 - 2008, Intel Corporation<BR> All rights\r
   reserved. This program and the accompanying materials are\r
   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
@@ -350,9 +350,6 @@ IoWrite16 (
     out dx, ax\r
   }\r
 \r
-  //\r
-  // Never reached return statement.\r
-  //\r
   return Value;\r
 }\r
 \r

diff --git a/MdePkg/Library/BaseIoLibIntrinsic/IoLibIpf.c b/MdePkg/Library/BaseIoLibIntrinsic/IoLibIpf.c
index bcd376aa630d321c84f9bf05cd4b7be772f1b4a5..0ab4211808ae9dab03c1922a3c21f371cd308ad6 100644 (file)
--- a/MdePkg/Library/BaseIoLibIntrinsic/IoLibIpf.c
+++ b/MdePkg/Library/BaseIoLibIntrinsic/IoLibIpf.c
@@ -1,7 +1,7 @@
 /** @file\r
   Common I/O Library routines.\r
 \r
-  Copyright (c) 2006 - 2007, Intel Corporation<BR>\r
+  Copyright (c) 2006 - 2008, Intel Corporation<BR>\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
@@ -12,10 +12,9 @@
 \r
 **/\r
 \r
-//\r
-// Include common header file for this module.\r
-//\r
+\r
 #include "BaseIoLibIntrinsicInternal.h"\r
+#include <Library/PcdLib.h>\r
 \r
 #define MAP_PORT_BASE_TO_MEM(_Port) \\r
     ((((_Port) & 0xfffc) << 10) | ((_Port) & 0x0fff))\r

diff --git a/MdePkg/Library/BaseIoLibIntrinsic/IoLibMmioBuffer.c b/MdePkg/Library/BaseIoLibIntrinsic/IoLibMmioBuffer.c
index 4a54837413753706ca65f91350cf4ae3458ef5dc..d6ff0ba01185f613a9e5a1308d6366b6bb914c36 100644 (file)
--- a/MdePkg/Library/BaseIoLibIntrinsic/IoLibMmioBuffer.c
+++ b/MdePkg/Library/BaseIoLibIntrinsic/IoLibMmioBuffer.c
@@ -1,7 +1,7 @@
 /** @file\r
   I/O Library MMIO Buffer Functions.\r
 \r
-  Copyright (c) 2007, Intel Corporation<BR>\r
+  Copyright (c) 2007 - 2008, Intel Corporation<BR>\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
@@ -220,7 +220,7 @@ MmioReadBuffer64 (
 \r
 \r
   @param  StartAddress    Starting address for the MMIO region to be copied to.\r
-  @param  Length     Size in bytes of the copy.\r
+  @param  Length          Size in bytes of the copy.\r
   @param  Buffer          Pointer to a system memory buffer containing the data to write.\r
 \r
   @return Size in bytes of the copy.\r
@@ -266,7 +266,7 @@ MmioWriteBuffer8 (
   If Buffer is not aligned on a 16-bit boundary, then ASSERT().\r
 \r
   @param  StartAddress    Starting address for the MMIO region to be copied to.\r
-  @param  Length     Size in bytes of the copy.\r
+  @param  Length          Size in bytes of the copy.\r
   @param  Buffer          Pointer to a system memory buffer containing the data to write.\r
 \r
   @return Size in bytes of the copy.\r
@@ -320,7 +320,7 @@ MmioWriteBuffer16 (
   If Buffer is not aligned on a 32-bit boundary, then ASSERT().\r
 \r
   @param  StartAddress    Starting address for the MMIO region to be copied to.\r
-  @param  Length     Size in bytes of the copy.\r
+  @param  Length          Size in bytes of the copy.\r
   @param  Buffer          Pointer to a system memory buffer containing the data to write.\r
 \r
   @return Size in bytes of the copy.\r
@@ -373,7 +373,7 @@ MmioWriteBuffer32 (
   If Buffer is not aligned on a 64-bit boundary, then ASSERT().\r
 \r
   @param  StartAddress    Starting address for the MMIO region to be copied to.\r
-  @param  Length     Size in bytes of the copy.\r
+  @param  Length          Size in bytes of the copy.\r
   @param  Buffer          Pointer to a system memory buffer containing the data to write.\r
 \r
   @return Size in bytes of the copy.\r