Fix bundle of issue for ICC build

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

4 files changed, 10 insertions, 14 deletions

diff --git a/DuetPkg/DxeIpl/Debug.c b/DuetPkg/DxeIpl/Debug.c
index 45d3a41411..cc93174abc 100644
--- a/DuetPkg/DxeIpl/Debug.c
+++ b/DuetPkg/DxeIpl/Debug.c
@@ -57,9 +57,9 @@ PrintValue (
   UINT8  Char;

 

   for (Index = 0; Index < 8; Index++) {

-    Char = (UINT8)((Value >> ((7 - Index) * 4)) & 0x0f) + '0';

+    Char = (UINT8)(((Value >> ((7 - Index) * 4)) & 0x0f) + '0');

     if (Char > '9') {

-      Char = Char - '0' - 10 + 'A';

+      Char = (UINT8) (Char - '0' - 10 + 'A');

     }

     *mCursor = Char;

     mCursor += 2;

diff --git a/DuetPkg/DxeIpl/HobGeneration.c b/DuetPkg/DxeIpl/HobGeneration.c
index 2d7c437254..0158ea7884 100644
--- a/DuetPkg/DxeIpl/HobGeneration.c
+++ b/DuetPkg/DxeIpl/HobGeneration.c
@@ -610,13 +610,13 @@ PrepareHobBfv (
   UINTN BfvLength

   )

 {

-  UINTN BfvLengthPageSize;

+  //UINTN BfvLengthPageSize;

 

   //

   // Calculate BFV location at top of the memory region.

   // This is like a RAM Disk. Align to page boundry.

   //

-  BfvLengthPageSize = EFI_PAGES_TO_SIZE (EFI_SIZE_TO_PAGES (BfvLength));

+  //BfvLengthPageSize = EFI_PAGES_TO_SIZE (EFI_SIZE_TO_PAGES (BfvLength));

  

   gHob->Bfv.BaseAddress = (EFI_PHYSICAL_ADDRESS)(UINTN)Bfv;

   gHob->Bfv.Length = BfvLength;

diff --git a/DuetPkg/DxeIpl/LegacyTable.c b/DuetPkg/DxeIpl/LegacyTable.c
index 4b19064ee4..ba9106915e 100644
--- a/DuetPkg/DxeIpl/LegacyTable.c
+++ b/DuetPkg/DxeIpl/LegacyTable.c
@@ -401,7 +401,7 @@ PrepareFadtTable (
   if (AcpiDescription->PM_TMR_BLK.Address == 0) {

     AcpiDescription->PM_TMR_BLK.Address          = Fadt->PM_TMR_BLK;

     AcpiDescription->PM_TMR_BLK.AddressSpaceId   = ACPI_ADDRESS_ID_IO;

-    AcpiDescription->PM_TMR_BLK.RegisterBitWidth = (AcpiDescription->TMR_VAL_EXT == 0) ? 24 : 32;

+    AcpiDescription->PM_TMR_BLK.RegisterBitWidth = (UINT8) ((AcpiDescription->TMR_VAL_EXT == 0) ? 24 : 32);

   }

 

   return ;

diff --git a/DuetPkg/DxeIpl/SerialStatusCode.c b/DuetPkg/DxeIpl/SerialStatusCode.c
index 1112273373..4c5badf8f5 100644
--- a/DuetPkg/DxeIpl/SerialStatusCode.c
+++ b/DuetPkg/DxeIpl/SerialStatusCode.c
@@ -648,7 +648,7 @@ Returns:
   // Wait for the serail port to be ready.

   //

   do {

-    Data = CpuIoRead8 (gComBase + LSR_OFFSET);

+    Data = CpuIoRead8 ((UINT16) (gComBase + LSR_OFFSET));

   } while ((Data & LSR_TXRDY) == 0);

     

   CpuIoWrite8 (gComBase, Character);

@@ -674,10 +674,6 @@ Returns:
 

 --*/

 {

-  EFI_STATUS  Status;

-

-  Status = EFI_SUCCESS;

-

   for ( ; *OutputString != 0; OutputString++) {

     DebugSerialWrite (*OutputString);

   }

@@ -869,19 +865,19 @@ Returns:
   // Set communications format

   //

   OutputData = (UINT8)((DLAB << 7) | ((gBreakSet << 6) | ((gParity << 3) | ((gStop << 2) | Data))));

-  CpuIoWrite8 (gComBase + LCR_OFFSET, OutputData);

+  CpuIoWrite8 ((UINT16) (gComBase + LCR_OFFSET), OutputData);

 

   //

   // Configure baud rate

   //

-  CpuIoWrite8 (gComBase + BAUD_HIGH_OFFSET, (UINT8)(Divisor >> 8));

-  CpuIoWrite8 (gComBase + BAUD_LOW_OFFSET, (UINT8)(Divisor & 0xff));

+  CpuIoWrite8 ((UINT16) (gComBase + BAUD_HIGH_OFFSET), (UINT8)(Divisor >> 8));

+  CpuIoWrite8 ((UINT16) (gComBase + BAUD_LOW_OFFSET), (UINT8)(Divisor & 0xff));

 

   //

   // Switch back to bank 0

   //

   OutputData = (UINT8)((~DLAB<<7)|((gBreakSet<<6)|((gParity<<3)|((gStop<<2)| Data))));

-  CpuIoWrite8 (gComBase + LCR_OFFSET, OutputData);

+  CpuIoWrite8 ((UINT16) (gComBase + LCR_OFFSET), OutputData);

 

   *ReportStatusCode = SerialReportStatusCode;

 }