fix ecc report-out issues

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

9 files changed, 17 insertions, 28 deletions

diff --git a/IntelFrameworkPkg/Include/Ppi/Smbus.h b/IntelFrameworkPkg/Include/Ppi/Smbus.h
index 49997e4..e057604 100644
--- a/IntelFrameworkPkg/Include/Ppi/Smbus.h
+++ b/IntelFrameworkPkg/Include/Ppi/Smbus.h
@@ -19,8 +19,8 @@
 

 **/

 

-#ifndef _PEI_SMBUS_PPI_H

-#define _PEI_SMBUS_PPI_H

+#ifndef _PEI_SMBUS_PPI_H_

+#define _PEI_SMBUS_PPI_H_

 

 #include <PiPei.h>

 #include <Ppi/Smbus2.h>

diff --git a/IntelFrameworkPkg/Include/Protocol/AcpiS3Save.h b/IntelFrameworkPkg/Include/Protocol/AcpiS3Save.h
index 1cc904e..182e388 100644
--- a/IntelFrameworkPkg/Include/Protocol/AcpiS3Save.h
+++ b/IntelFrameworkPkg/Include/Protocol/AcpiS3Save.h
@@ -14,8 +14,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 

 **/

 

-#ifndef _ACPI_S3_SAVE_PROTOCOL_H

-#define _ACPI_S3_SAVE_PROTOCOL_H

+#ifndef _ACPI_S3_SAVE_PROTOCOL_H_

+#define _ACPI_S3_SAVE_PROTOCOL_H_

 

 #include <PiDxe.h>

 

diff --git a/IntelFrameworkPkg/Include/Protocol/BootScriptSave.h b/IntelFrameworkPkg/Include/Protocol/BootScriptSave.h
index 75ee14e..7dd8470 100644
--- a/IntelFrameworkPkg/Include/Protocol/BootScriptSave.h
+++ b/IntelFrameworkPkg/Include/Protocol/BootScriptSave.h
@@ -16,8 +16,8 @@
 

 **/

 

-#ifndef _BOOT_SCRIPT_SAVE_PROTOCOL_H

-#define _BOOT_SCRIPT_SAVE_PROTOCOL_H

+#ifndef _BOOT_SCRIPT_SAVE_PROTOCOL_H_

+#define _BOOT_SCRIPT_SAVE_PROTOCOL_H_

 

 #include <PiDxe.h>

 //

diff --git a/IntelFrameworkPkg/Include/Protocol/LegacyBios.h b/IntelFrameworkPkg/Include/Protocol/LegacyBios.h
index 76773d3..5875be2 100644
--- a/IntelFrameworkPkg/Include/Protocol/LegacyBios.h
+++ b/IntelFrameworkPkg/Include/Protocol/LegacyBios.h
@@ -42,7 +42,7 @@
 typedef struct _EFI_LEGACY_BIOS_PROTOCOL EFI_LEGACY_BIOS_PROTOCOL;

 

 //

-/// @bug: These macros appear in no specifications and are kept for backward

+/// @bug These macros appear in no specifications and are kept for backward

 //        compatibility only.

 // Convert from 32-bit address (_Adr) to Segment:Offset 16-bit form

 //

diff --git a/IntelFrameworkPkg/Library/DxeIoLibCpuIo/DxeIoLibCpuIo.inf b/IntelFrameworkPkg/Library/DxeIoLibCpuIo/DxeIoLibCpuIo.inf
index a1ccb3f..b21f662 100644
--- a/IntelFrameworkPkg/Library/DxeIoLibCpuIo/DxeIoLibCpuIo.inf
+++ b/IntelFrameworkPkg/Library/DxeIoLibCpuIo/DxeIoLibCpuIo.inf
@@ -46,10 +46,6 @@
 

 

 [LibraryClasses]

-  BaseLib

-  DebugLib

-  UefiBootServicesTableLib

-

 

 [Protocols]

   gEfiCpuIoProtocolGuid                         # PROTOCOL ALWAYS_CONSUMED

diff --git a/IntelFrameworkPkg/Library/DxeIoLibCpuIo/IoLibMmioBuffer.c b/IntelFrameworkPkg/Library/DxeIoLibCpuIo/IoLibMmioBuffer.c
index 1a39f21..f43db07 100644
--- a/IntelFrameworkPkg/Library/DxeIoLibCpuIo/IoLibMmioBuffer.c
+++ b/IntelFrameworkPkg/Library/DxeIoLibCpuIo/IoLibMmioBuffer.c
@@ -48,7 +48,7 @@ MmioReadBuffer8 (
 

   ReturnBuffer = Buffer;

 

-  while (Length--) {

+  while (Length-- > 0) {

     *(Buffer++) = MmioRead8 (StartAddress++);

   }

 

@@ -97,7 +97,7 @@ MmioReadBuffer16 (
 

   ReturnBuffer = Buffer;

 

-  while (Length) {

+  while (Length > 0) {

     *(Buffer++) = MmioRead16 (StartAddress);

     StartAddress += sizeof (UINT16);

     Length -= sizeof (UINT16);

@@ -148,7 +148,7 @@ MmioReadBuffer32 (
 

   ReturnBuffer = Buffer;

 

-  while (Length) {

+  while (Length > 0) {

     *(Buffer++) = MmioRead32 (StartAddress);

     StartAddress += sizeof (UINT32);

     Length -= sizeof (UINT32);

@@ -199,7 +199,7 @@ MmioReadBuffer64 (
 

   ReturnBuffer = Buffer;

 

-  while (Length) {

+  while (Length > 0) {

     *(Buffer++) = MmioRead64 (StartAddress);

     StartAddress += sizeof (UINT64);

     Length -= sizeof (UINT64);

@@ -242,7 +242,7 @@ MmioWriteBuffer8 (
 

   ReturnBuffer = (UINT8 *) Buffer;

 

-  while (Length--) {

+  while (Length-- > 0) {

      MmioWrite8 (StartAddress++, *(Buffer++));

   }

 

@@ -293,7 +293,7 @@ MmioWriteBuffer16 (
 

   ReturnBuffer = (UINT16 *) Buffer;

 

-  while (Length) {

+  while (Length > 0) {

     MmioWrite16 (StartAddress, *(Buffer++));

 

     StartAddress += sizeof (UINT16);

@@ -347,7 +347,7 @@ MmioWriteBuffer32 (
 

   ReturnBuffer = (UINT32 *) Buffer;

 

-  while (Length) {

+  while (Length > 0) {

     MmioWrite32 (StartAddress, *(Buffer++));

 

     StartAddress += sizeof (UINT32);

@@ -400,7 +400,7 @@ MmioWriteBuffer64 (
 

   ReturnBuffer = (UINT64 *) Buffer;

 

-  while (Length) {

+  while (Length > 0) {

     MmioWrite64 (StartAddress, *(Buffer++));

 

     StartAddress += sizeof (UINT64);

diff --git a/IntelFrameworkPkg/Library/DxeSmmDriverEntryPoint/DxeSmmDriverEntryPoint.inf b/IntelFrameworkPkg/Library/DxeSmmDriverEntryPoint/DxeSmmDriverEntryPoint.inf
index 4b129f6..c56bb0c 100644
--- a/IntelFrameworkPkg/Library/DxeSmmDriverEntryPoint/DxeSmmDriverEntryPoint.inf
+++ b/IntelFrameworkPkg/Library/DxeSmmDriverEntryPoint/DxeSmmDriverEntryPoint.inf
@@ -41,9 +41,6 @@
 

 

 [LibraryClasses]

-  DebugLib

-  UefiBootServicesTableLib

-  DevicePathLib

 

 [Protocols]

   gEfiLoadedImageProtocolGuid                   # PROTOCOL ALWAYS_CONSUMED

diff --git a/IntelFrameworkPkg/Library/PeiSmbusLibSmbusPpi/InternalSmbusLib.h b/IntelFrameworkPkg/Library/PeiSmbusLibSmbusPpi/InternalSmbusLib.h
index 96597d7..3afa232 100644
--- a/IntelFrameworkPkg/Library/PeiSmbusLibSmbusPpi/InternalSmbusLib.h
+++ b/IntelFrameworkPkg/Library/PeiSmbusLibSmbusPpi/InternalSmbusLib.h
@@ -12,8 +12,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 

 **/

 

-#ifndef __INTERNAL_SMBUS_LIB_H

-#define __INTERNAL_SMBUS_LIB_H

+#ifndef _INTERNAL_SMBUS_LIB_H_

+#define _INTERNAL_SMBUS_LIB_H_

 

 

 #include <PiPei.h>

diff --git a/IntelFrameworkPkg/Library/PeiSmbusLibSmbusPpi/PeiSmbusLibSmbusPpi.inf b/IntelFrameworkPkg/Library/PeiSmbusLibSmbusPpi/PeiSmbusLibSmbusPpi.inf
index fb0afa7..1272405 100644
--- a/IntelFrameworkPkg/Library/PeiSmbusLibSmbusPpi/PeiSmbusLibSmbusPpi.inf
+++ b/IntelFrameworkPkg/Library/PeiSmbusLibSmbusPpi/PeiSmbusLibSmbusPpi.inf
@@ -43,10 +43,6 @@
 

 

 [LibraryClasses]

-  BaseMemoryLib

-  PeiServicesLib

-  DebugLib

-  PeiServicesTablePointerLib

 

 [Ppis]

   gEfiPeiSmbusPpiGuid                           # PPI ALWAYS_CONSUMED