fixed icc build bug

[mirror_edk2.git] / MdeModulePkg / Universal / iScsi / IScsiIbft.c

diff --git a/MdeModulePkg/Universal/iScsi/IScsiIbft.c b/MdeModulePkg/Universal/iScsi/IScsiIbft.c
index e5d6324727698e4d87c34a2166e3fa58b98aa065..1a60a35394950f9ed77c559a24e87939bc0d9f61 100644 (file)
--- a/MdeModulePkg/Universal/iScsi/IScsiIbft.c
+++ b/MdeModulePkg/Universal/iScsi/IScsiIbft.c
@@ -101,7 +101,7 @@ Returns:
     // Need expand the control section if more than 2 NIC/Target sections\r
     // exist.\r
     //\r
-    Control->Header.Length += (UINT16) (NumOffset - 4) * sizeof (UINT16);\r
+    Control->Header.Length = (UINT16) (Control->Header.Length + (NumOffset - 4) * sizeof (UINT16));\r
   }\r
 }\r
 \r
@@ -191,7 +191,7 @@ Returns:
   //\r
   // Get the identifier from the handle.\r
   //\r
-  Status = gBS->HandleProtocol (Handle, &mIScsiPrivateGuid, &IScsiIdentifier);\r
+  Status = gBS->HandleProtocol (Handle, &mIScsiPrivateGuid, (VOID **) &IScsiIdentifier);\r
   if (EFI_ERROR (Status)) {\r
     ASSERT (FALSE);\r
     return ;\r
@@ -278,7 +278,7 @@ Returns:
   Status = gBS->HandleProtocol (\r
                   Controller,\r
                   &gEfiDevicePathProtocolGuid,\r
-                  &DevicePath\r
+                  (VOID **)&DevicePath\r
                   );\r
   if (EFI_ERROR (Status)) {\r
     return 0;\r
@@ -293,7 +293,7 @@ Returns:
     return 0;\r
   }\r
 \r
-  Status = gBS->HandleProtocol (PciIoHandle, &gEfiPciIoProtocolGuid, &PciIo);\r
+  Status = gBS->HandleProtocol (PciIoHandle, &gEfiPciIoProtocolGuid, (VOID **)&PciIo);\r
   if (EFI_ERROR (Status)) {\r
     return 0;\r
   }\r
@@ -333,7 +333,7 @@ Returns:
   Status = gBS->HandleProtocol (\r
                   Controller,\r
                   &gEfiSimpleNetworkProtocolGuid,\r
-                  &Snp\r
+                  (VOID **) &Snp\r
                   );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
@@ -392,7 +392,7 @@ Returns:
   SectionOffset = &Control->NIC0Offset;\r
 \r
   for (Index = 0; Index < HandleCount; Index++) {\r
-    Status = gBS->HandleProtocol (Handles[Index], &mIScsiPrivateGuid, &IScsiIdentifier);\r
+    Status = gBS->HandleProtocol (Handles[Index], &mIScsiPrivateGuid, (VOID **)&IScsiIdentifier);\r
     if (EFI_ERROR (Status)) {\r
       ASSERT (FALSE);\r
       return ;\r
@@ -552,7 +552,7 @@ Returns:
   EFI_ACPI_TABLE_VERSION                    Version;\r
   UINT32                                    Signature;\r
 \r
-  Status = gBS->LocateProtocol (&gEfiAcpiSupportProtocolGuid, NULL, &AcpiSupport);\r
+  Status = gBS->LocateProtocol (&gEfiAcpiSupportProtocolGuid, NULL, (VOID **)&AcpiSupport);\r
   if (EFI_ERROR (Status)) {\r
     return ;\r
   }\r
@@ -563,7 +563,7 @@ Returns:
     Status = AcpiSupport->GetAcpiTable (\r
                             AcpiSupport,\r
                             Index,\r
-                            &Table,\r
+                            (VOID **)&Table,\r
                             &Version,\r
                             &TableHandle\r
                             );\r
@@ -613,7 +613,7 @@ Returns:
     return ;\r
   }\r
 \r
-  Heap = (CHAR8 *) Table + IBFT_HEAP_OFFSET;\r
+  Heap = (UINT8 *) Table + IBFT_HEAP_OFFSET;\r
 \r
   //\r
   // Fill in the various section of the iSCSI Boot Firmware Table.\r