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

diff --git a/DuetPkg/CpuIoDxe/CpuIo.c b/DuetPkg/CpuIoDxe/CpuIo.c
index e946bd45cd95ac6ed5128d6132bf45b4ddd93153..9e5be46df8462a73f5a285c912404e8694663e92 100644 (file)
--- a/DuetPkg/CpuIoDxe/CpuIo.c
+++ b/DuetPkg/CpuIoDxe/CpuIo.c
@@ -73,7 +73,7 @@ Returns:
   UINTN DestinationStride;\r
   UINTN SourceStride;\r
 \r
-  Width             = Width & 0x03;\r
+  Width             = (EFI_CPU_IO_PROTOCOL_WIDTH) (Width & 0x03);\r
   Stride            = (UINTN)1 << Width;\r
   DestinationStride = DestinationStrideFlag ? Stride : 0;\r
   SourceStride      = SourceStrideFlag ? Stride : 0;\r
@@ -305,7 +305,7 @@ Returns:
     OutStride = 0;\r
   }\r
 \r
-  Width = Width & 0x03;\r
+  Width = (EFI_CPU_IO_PROTOCOL_WIDTH) (Width & 0x03);\r
 \r
   //\r
   // Loop for each iteration and move the data\r
@@ -398,7 +398,7 @@ Returns:
     OutStride = 0;\r
   }\r
 \r
-  Width = Width & 0x03;\r
+  Width = (EFI_CPU_IO_PROTOCOL_WIDTH) (Width & 0x03);\r
 \r
   //\r
   // Loop for each iteration and move the data\r
@@ -518,7 +518,7 @@ Returns:
     Count = 1;\r
   }\r
 \r
-  Width = Width & 0x03;\r
+  Width = (EFI_CPU_IO_PROTOCOL_WIDTH) (Width & 0x03);\r
   if (Address - 1 + ((UINTN)1 << Width) * Count > Limit) {\r
     return EFI_UNSUPPORTED;\r
   }\r

diff --git a/DuetPkg/CpuIoDxe/CpuIo.inf b/DuetPkg/CpuIoDxe/CpuIo.inf
index b8031690491b7f875d32ceeb5f9305c42f858cd2..b99e23cc41c7f0fb83b8f9457e76a314b396ec72 100644 (file)
--- a/DuetPkg/CpuIoDxe/CpuIo.inf
+++ b/DuetPkg/CpuIoDxe/CpuIo.inf
@@ -48,6 +48,7 @@
 \r
 [Sources.IA32]\r
   Ia32/CpuIoAccess.asm  | MSFT\r
+  Ia32/CpuIoAccess.asm  | INTEL\r
   Ia32/CpuIoAccessGNU.c | GCC\r
   \r
 [Sources.X64]\r

diff --git a/DuetPkg/DataHubGenDxe/DataHubGen.c b/DuetPkg/DataHubGenDxe/DataHubGen.c
index dcb42bb96b7a817b5439b321ac4c0e995b31807c..3878b74fc53ae48d5d90287ee0bb42fb9fb7c9a0 100644 (file)
--- a/DuetPkg/DataHubGenDxe/DataHubGen.c
+++ b/DuetPkg/DataHubGenDxe/DataHubGen.c
@@ -148,7 +148,6 @@ InstallMemoryDataHub (
   IN VOID                  *Smbios\r
   )\r
 {\r
-  EFI_STATUS                        Status;\r
   SMBIOS_STRUCTURE_POINTER          SmbiosTable;\r
   EFI_MEMORY_SUBCLASS_DRIVER_DATA   DataRecord;\r
 \r
@@ -178,7 +177,7 @@ InstallMemoryDataHub (
   DataRecord.Record.ArrayStartAddress.PhysicalMemoryArrayLink.SubInstance = EFI_SUBCLASS_INSTANCE_NON_APPLICABLE;\r
   DataRecord.Record.ArrayStartAddress.MemoryArrayPartitionWidth = (UINT16)(SmbiosTable.Type19->PartitionWidth); \r
 \r
-  Status = gDataHub->LogData (\r
+  gDataHub->LogData (\r
                        gDataHub,\r
                        &gEfiMemorySubClassGuid,\r
                        &gEfiMiscProducerGuid,\r
@@ -296,7 +295,7 @@ InstallMiscDataHub (
   DataRecord.Record.MiscSystemManufacturer.SystemVersion  = 0;\r
   DataRecord.Record.MiscSystemManufacturer.SystemSerialNumber  = 0;\r
 //  DataRecord.Record.MiscSystemManufacturer.SystemUuid  = {0};\r
-  DataRecord.Record.MiscSystemManufacturer.SystemWakeupType  = 0;\r
+  DataRecord.Record.MiscSystemManufacturer.SystemWakeupType  = EfiSystemWakeupTypeReserved;\r
   DataRecord.Record.MiscSystemManufacturer.SystemSKUNumber  = 0;\r
   DataRecord.Record.MiscSystemManufacturer.SystemFamily  = 0;\r
 \r
@@ -339,7 +338,7 @@ DataHubGenEntrypoint (
   Status = gBS->LocateProtocol (\r
                   &gEfiHiiDatabaseProtocolGuid,\r
                   NULL,\r
-                  &gHiiDatabase\r
+                  (VOID**)&gHiiDatabase\r
                   );\r
 \r
   if (EFI_ERROR (Status)) {\r

diff --git a/DuetPkg/DxeIpl/Debug.c b/DuetPkg/DxeIpl/Debug.c
index 45d3a414111d8fc974f06370fc7708d37e796c8e..cc93174abcdfc528203ad2d097893c2fcf710361 100644 (file)
--- a/DuetPkg/DxeIpl/Debug.c
+++ b/DuetPkg/DxeIpl/Debug.c
@@ -57,9 +57,9 @@ PrintValue (
   UINT8  Char;\r
 \r
   for (Index = 0; Index < 8; Index++) {\r
-    Char = (UINT8)((Value >> ((7 - Index) * 4)) & 0x0f) + '0';\r
+    Char = (UINT8)(((Value >> ((7 - Index) * 4)) & 0x0f) + '0');\r
     if (Char > '9') {\r
-      Char = Char - '0' - 10 + 'A';\r
+      Char = (UINT8) (Char - '0' - 10 + 'A');\r
     }\r
     *mCursor = Char;\r
     mCursor += 2;\r

diff --git a/DuetPkg/DxeIpl/HobGeneration.c b/DuetPkg/DxeIpl/HobGeneration.c
index 2d7c437254fbfa5a4556ca9600cd2a83613fda23..0158ea7884d7c0593cccf9f66358465db4e8cd30 100644 (file)
--- a/DuetPkg/DxeIpl/HobGeneration.c
+++ b/DuetPkg/DxeIpl/HobGeneration.c
@@ -610,13 +610,13 @@ PrepareHobBfv (
   UINTN BfvLength\r
   )\r
 {\r
-  UINTN BfvLengthPageSize;\r
+  //UINTN BfvLengthPageSize;\r
 \r
   //\r
   // Calculate BFV location at top of the memory region.\r
   // This is like a RAM Disk. Align to page boundry.\r
   //\r
-  BfvLengthPageSize = EFI_PAGES_TO_SIZE (EFI_SIZE_TO_PAGES (BfvLength));\r
+  //BfvLengthPageSize = EFI_PAGES_TO_SIZE (EFI_SIZE_TO_PAGES (BfvLength));\r
  \r
   gHob->Bfv.BaseAddress = (EFI_PHYSICAL_ADDRESS)(UINTN)Bfv;\r
   gHob->Bfv.Length = BfvLength;\r

diff --git a/DuetPkg/DxeIpl/LegacyTable.c b/DuetPkg/DxeIpl/LegacyTable.c
index 4b19064ee40135e523d50140b7ac18f83c6bb33d..ba9106915ead62d6332db6d5297e602c28d96565 100644 (file)
--- a/DuetPkg/DxeIpl/LegacyTable.c
+++ b/DuetPkg/DxeIpl/LegacyTable.c
@@ -401,7 +401,7 @@ PrepareFadtTable (
   if (AcpiDescription->PM_TMR_BLK.Address == 0) {\r
     AcpiDescription->PM_TMR_BLK.Address          = Fadt->PM_TMR_BLK;\r
     AcpiDescription->PM_TMR_BLK.AddressSpaceId   = ACPI_ADDRESS_ID_IO;\r
-    AcpiDescription->PM_TMR_BLK.RegisterBitWidth = (AcpiDescription->TMR_VAL_EXT == 0) ? 24 : 32;\r
+    AcpiDescription->PM_TMR_BLK.RegisterBitWidth = (UINT8) ((AcpiDescription->TMR_VAL_EXT == 0) ? 24 : 32);\r
   }\r
 \r
   return ;\r

diff --git a/DuetPkg/DxeIpl/SerialStatusCode.c b/DuetPkg/DxeIpl/SerialStatusCode.c
index 1112273373a6cf95e8e1ec5c3c55ec960c1c18fb..4c5badf8f5385a82b0a8e47f5860e9db88533f80 100644 (file)
--- a/DuetPkg/DxeIpl/SerialStatusCode.c
+++ b/DuetPkg/DxeIpl/SerialStatusCode.c
@@ -648,7 +648,7 @@ Returns:
   // Wait for the serail port to be ready.\r
   //\r
   do {\r
-    Data = CpuIoRead8 (gComBase + LSR_OFFSET);\r
+    Data = CpuIoRead8 ((UINT16) (gComBase + LSR_OFFSET));\r
   } while ((Data & LSR_TXRDY) == 0);\r
     \r
   CpuIoWrite8 (gComBase, Character);\r
@@ -674,10 +674,6 @@ Returns:
 \r
 --*/\r
 {\r
-  EFI_STATUS  Status;\r
-\r
-  Status = EFI_SUCCESS;\r
-\r
   for ( ; *OutputString != 0; OutputString++) {\r
     DebugSerialWrite (*OutputString);\r
   }\r
@@ -869,19 +865,19 @@ Returns:
   // Set communications format\r
   //\r
   OutputData = (UINT8)((DLAB << 7) | ((gBreakSet << 6) | ((gParity << 3) | ((gStop << 2) | Data))));\r
-  CpuIoWrite8 (gComBase + LCR_OFFSET, OutputData);\r
+  CpuIoWrite8 ((UINT16) (gComBase + LCR_OFFSET), OutputData);\r
 \r
   //\r
   // Configure baud rate\r
   //\r
-  CpuIoWrite8 (gComBase + BAUD_HIGH_OFFSET, (UINT8)(Divisor >> 8));\r
-  CpuIoWrite8 (gComBase + BAUD_LOW_OFFSET, (UINT8)(Divisor & 0xff));\r
+  CpuIoWrite8 ((UINT16) (gComBase + BAUD_HIGH_OFFSET), (UINT8)(Divisor >> 8));\r
+  CpuIoWrite8 ((UINT16) (gComBase + BAUD_LOW_OFFSET), (UINT8)(Divisor & 0xff));\r
 \r
   //\r
   // Switch back to bank 0\r
   //\r
   OutputData = (UINT8)((~DLAB<<7)|((gBreakSet<<6)|((gParity<<3)|((gStop<<2)| Data))));\r
-  CpuIoWrite8 (gComBase + LCR_OFFSET, OutputData);\r
+  CpuIoWrite8 ((UINT16) (gComBase + LCR_OFFSET), OutputData);\r
 \r
   *ReportStatusCode = SerialReportStatusCode;\r
 }\r

diff --git a/DuetPkg/EfiLdr/Debug.c b/DuetPkg/EfiLdr/Debug.c
index 2cc8c73a1e7ded8a127f3dc59ad017585b22635a..13d9c74c465752babd32a3d88037703f2c52e682 100644 (file)
--- a/DuetPkg/EfiLdr/Debug.c
+++ b/DuetPkg/EfiLdr/Debug.c
@@ -65,9 +65,9 @@ PrintValue (
   UINT8  Char;\r
 \r
   for (Index = 0; Index < 8; Index++) {\r
-    Char = (UINT8)((Value >> ((7 - Index) * 4)) & 0x0f) + '0';\r
+    Char = (UINT8)(((Value >> ((7 - Index) * 4)) & 0x0f) + '0');\r
     if (Char > '9') {\r
-      Char = Char - '0' - 10 + 'A';\r
+      Char = (UINT8) (Char - '0' - 10 + 'A');\r
     }\r
     *mCursor = Char;\r
     mCursor += 2;\r
@@ -76,7 +76,7 @@ PrintValue (
 \r
 VOID\r
 PrintString (\r
-  UINT8 *String\r
+  CHAR8 *String\r
   )\r
 {\r
   UINT32 Index;\r

diff --git a/DuetPkg/EfiLdr/Debug.h b/DuetPkg/EfiLdr/Debug.h
index 9939109e913b3f1f202c6ad86759ff0d0d1d1be4..ea091774cacbf0308972cd1cd0db56519c7b1f72 100644 (file)
--- a/DuetPkg/EfiLdr/Debug.h
+++ b/DuetPkg/EfiLdr/Debug.h
@@ -38,7 +38,7 @@ PrintValue64 (
 \r
 VOID \r
 PrintString (\r
-  UINT8 *String\r
+  CHAR8 *String\r
   );\r
 \r
 VOID \r

diff --git a/DuetPkg/EfiLdr/EfiLdr.h b/DuetPkg/EfiLdr/EfiLdr.h
index 58b9c220c0aa9557c946082e122c8ac32556d8db..979ed1d691f7ede88d18fd40ee15d84ffa1631d1 100644 (file)
--- a/DuetPkg/EfiLdr/EfiLdr.h
+++ b/DuetPkg/EfiLdr/EfiLdr.h
@@ -89,4 +89,4 @@ VOID
     IN EFILDRHANDOFF  *Handoff\r
     );\r
 \r
-#endif //_DUET_EFI_LOADER_H_
\ No newline at end of file
+#endif //_DUET_EFI_LOADER_H_\r

diff --git a/DuetPkg/EfiLdr/EfiLoader.c b/DuetPkg/EfiLdr/EfiLoader.c
index 88bce2f07429c3ee9edf54e5647f56282eb2b6f4..6f214d2930b200ffd16fb863aba5ae2b4fbbeb35 100644 (file)
--- a/DuetPkg/EfiLdr/EfiLoader.c
+++ b/DuetPkg/EfiLdr/EfiLoader.c
@@ -40,7 +40,7 @@ EfiLoader (
   )\r
 {\r
   BIOS_MEMORY_MAP       *BiosMemoryMap;    \r
-  EFILDR_HEADER         *EFILDRHeader;\r
+  //EFILDR_HEADER         *EFILDRHeader;\r
   EFILDR_IMAGE          *EFILDRImage;\r
   EFI_MEMORY_DESCRIPTOR EfiMemoryDescriptor[EFI_MAX_MEMORY_DESCRIPTORS];\r
   EFI_STATUS            Status;\r
@@ -78,7 +78,7 @@ EfiLoader (
   // Get information on where the image is in memory\r
   //\r
 \r
-  EFILDRHeader = (EFILDR_HEADER *)(UINTN)(EFILDR_HEADER_ADDRESS);\r
+  //EFILDRHeader = (EFILDR_HEADER *)(UINTN)(EFILDR_HEADER_ADDRESS);\r
   EFILDRImage  = (EFILDR_IMAGE *)(UINTN)(EFILDR_HEADER_ADDRESS + sizeof(EFILDR_HEADER));\r
 \r
 \r

diff --git a/DuetPkg/EfiLdr/PeLoader.c b/DuetPkg/EfiLdr/PeLoader.c
index 721befb32eaf1bc43ff34cf80361dc71479d6ded..c4cbbe34c4a1ac6196d8c098a43596037f3868cf 100644 (file)
--- a/DuetPkg/EfiLdr/PeLoader.c
+++ b/DuetPkg/EfiLdr/PeLoader.c
@@ -477,7 +477,7 @@ PrintHeader ('P');
 \r
       case EFI_IMAGE_REL_BASED_LOW:\r
         F16 = (UINT16 *) Fixup;\r
-        *F16 = *F16 + (UINT16) Adjust;\r
+        *F16 = (UINT16) (*F16 + (UINT16) Adjust);\r
         if (FixupData != NULL) {\r
           *(UINT16 *) FixupData = *F16;\r
           FixupData = FixupData + sizeof(UINT16);\r
@@ -618,19 +618,19 @@ EfiLdrPeCoffCheckImageMachineType (
 \r
   Status = EFI_UNSUPPORTED;\r
 \r
-#if EFI32\r
+#ifdef EFI32\r
   if (MachineType == EFI_IMAGE_MACHINE_IA32) {\r
     Status = EFI_SUCCESS;\r
   }\r
 #endif\r
 \r
-#if EFIX64\r
+#ifdef EFIX64\r
   if (MachineType == EFI_IMAGE_MACHINE_X64) {\r
     Status = EFI_SUCCESS;\r
   }\r
 #endif\r
 \r
-#if EFI64\r
+#ifdef EFI64\r
   if (MachineType == EFI_IMAGE_MACHINE_IA64) {\r
     Status = EFI_SUCCESS;\r
   }\r

diff --git a/DuetPkg/EfiLdr/TianoDecompress.c b/DuetPkg/EfiLdr/TianoDecompress.c
index 6e4bba7b361c79ec1eab01507465170151581456..cac99381463c54afa5421925aac5fb37a8803bef 100644 (file)
--- a/DuetPkg/EfiLdr/TianoDecompress.c
+++ b/DuetPkg/EfiLdr/TianoDecompress.c
@@ -632,7 +632,6 @@ Returns: (VOID)
     }\r
   }\r
 \r
-  return ;\r
 }\r
 \r
 EFI_STATUS\r

diff --git a/DuetPkg/FSVariable/FSVariable.c b/DuetPkg/FSVariable/FSVariable.c
index ef762eab468557f3bfeef0830418dd9efee4c6bb..3a5fcc4e5f9d9f06c3b50cb1395b0e25290f0c05 100644 (file)
--- a/DuetPkg/FSVariable/FSVariable.c
+++ b/DuetPkg/FSVariable/FSVariable.c
@@ -667,8 +667,6 @@ Returns:
 \r
     Variable.CurrPtr = GetNextVariablePtr (Variable.CurrPtr);\r
   }\r
-\r
-  return EFI_NOT_FOUND;\r
 }\r
 \r
 EFI_STATUS\r

diff --git a/DuetPkg/Library/DuetBdsLib/BdsPlatform.c b/DuetPkg/Library/DuetBdsLib/BdsPlatform.c
index bb8c9bc56328688298fc5d769bc5ca240c2f9ade..5dfa016bbdf3740cbb03264c351891bc36b7dee9 100644 (file)
--- a/DuetPkg/Library/DuetBdsLib/BdsPlatform.c
+++ b/DuetPkg/Library/DuetBdsLib/BdsPlatform.c
@@ -217,7 +217,7 @@ UpdateMemoryMap (
       Memory = MemoryDescHob.MemDesc[Index].PhysicalStart;\r
       Status = gBS->AllocatePages (\r
                       AllocateAddress,\r
-                      MemoryDescHob.MemDesc[Index].Type,\r
+                      (EFI_MEMORY_TYPE)MemoryDescHob.MemDesc[Index].Type,\r
                       (UINTN)MemoryDescHob.MemDesc[Index].NumberOfPages,\r
                       &Memory\r
                       );\r
@@ -1491,7 +1491,7 @@ Returns:
     Length--;\r
   }\r
   \r
-  return ((0xFF - CheckSum) + 1);\r
+  return (UINT8)((0xFF - CheckSum) + 1);\r
 }  \r
 \r
 EFI_STATUS\r

diff --git a/DuetPkg/PcRtc/RealTimeClock.c b/DuetPkg/PcRtc/RealTimeClock.c
index b677cc5c95556e80e2338a86f89784483128cefe..1df9945d4edbe60a654228ba3bfe4cc2e5c5f278 100644 (file)
--- a/DuetPkg/PcRtc/RealTimeClock.c
+++ b/DuetPkg/PcRtc/RealTimeClock.c
@@ -153,7 +153,7 @@ Returns:
   EFI_STATUS      Status;\r
   RTC_REGISTER_A  RegisterA;\r
   RTC_REGISTER_B  RegisterB;\r
-  RTC_REGISTER_C  RegisterC;\r
+  //RTC_REGISTER_C  RegisterC;\r
   RTC_REGISTER_D  RegisterD;\r
   UINT8           Century;\r
   EFI_TIME        Time;\r
@@ -180,7 +180,7 @@ Returns:
   //\r
   // Clear RTC flag register\r
   //\r
-  RegisterC.Data = RtcRead (RTC_ADDRESS_REGISTER_C);\r
+  //RegisterC.Data = RtcRead (RTC_ADDRESS_REGISTER_C);\r
 \r
   //\r
   // Clear RTC register D\r
@@ -270,7 +270,7 @@ Routine Description:
   EFI_STATUS      Status;\r
   RTC_REGISTER_B  RegisterB;\r
   UINT8           Century;\r
-  UINTN           BufferSize;\r
+  //UINTN           BufferSize;\r
 \r
   //\r
   // Check parameters for null pointer\r
@@ -328,7 +328,7 @@ Routine Description:
   Time->TimeZone  = Global->SavedTimeZone;\r
   Time->Daylight  = Global->Daylight;\r
 \r
-  BufferSize      = sizeof (INT16) + sizeof (UINT8);\r
+  //BufferSize      = sizeof (INT16) + sizeof (UINT8);\r
 \r
   //\r
   // Make sure all field values are in correct range\r