From d074a8e1a25a05cb77d9185e0e4e5a5363c80871 Mon Sep 17 00:00:00 2001 From: yshang1 Date: Wed, 19 Sep 2007 06:15:43 +0000 Subject: Update Mde/MdeModulePkg to support ICC build for IA32/X64. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@3892 6f19259b-4bc3-4df7-8a09-765794883524 --- MdeModulePkg/Bus/Pci/EhciDxe/UsbHcMem.c | 2 +- MdeModulePkg/Bus/Pci/UhciDxe/UsbHcMem.c | 2 +- MdeModulePkg/Core/Pei/PeiMain/PeiMain.c | 6 +++--- MdeModulePkg/Library/EdkFvbServiceLib/Ia32/Fvb.c | 3 --- MdeModulePkg/Library/EdkFvbServiceLib/X64/Fvb.c | 3 --- MdeModulePkg/Universal/DevicePathDxe/DevicePathFromText.c | 12 ++++++------ MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Option.c | 2 +- 7 files changed, 12 insertions(+), 18 deletions(-) (limited to 'MdeModulePkg') diff --git a/MdeModulePkg/Bus/Pci/EhciDxe/UsbHcMem.c b/MdeModulePkg/Bus/Pci/EhciDxe/UsbHcMem.c index 22556e7ef8..c1b0f49b31 100644 --- a/MdeModulePkg/Bus/Pci/EhciDxe/UsbHcMem.c +++ b/MdeModulePkg/Bus/Pci/EhciDxe/UsbHcMem.c @@ -233,7 +233,7 @@ UsbHcAllocMemFromBlock ( for (Count = 0; Count < Units; Count++) { ASSERT (!USB_HC_BIT_IS_SET (Block->Bits[Byte], Bit)); - Block->Bits[Byte] |= USB_HC_BIT (Bit); + Block->Bits[Byte] = (UINT8) (Block->Bits[Byte] | USB_HC_BIT (Bit)); NEXT_BIT (Byte, Bit); } diff --git a/MdeModulePkg/Bus/Pci/UhciDxe/UsbHcMem.c b/MdeModulePkg/Bus/Pci/UhciDxe/UsbHcMem.c index 7c598e2bbb..5e02a0d3b8 100644 --- a/MdeModulePkg/Bus/Pci/UhciDxe/UsbHcMem.c +++ b/MdeModulePkg/Bus/Pci/UhciDxe/UsbHcMem.c @@ -232,7 +232,7 @@ UsbHcAllocMemFromBlock ( for (Count = 0; Count < Units; Count++) { ASSERT (!USB_HC_BIT_IS_SET (Block->Bits[Byte], Bit)); - Block->Bits[Byte] |= USB_HC_BIT (Bit); + Block->Bits[Byte] = (UINT8) (Block->Bits[Byte] | (UINT8) USB_HC_BIT (Bit)); NEXT_BIT (Byte, Bit); } diff --git a/MdeModulePkg/Core/Pei/PeiMain/PeiMain.c b/MdeModulePkg/Core/Pei/PeiMain/PeiMain.c index a7944e130c..250c7cf504 100644 --- a/MdeModulePkg/Core/Pei/PeiMain/PeiMain.c +++ b/MdeModulePkg/Core/Pei/PeiMain/PeiMain.c @@ -82,7 +82,7 @@ EFI_STATUS EFIAPI PeiCore ( IN CONST EFI_SEC_PEI_HAND_OFF *SecCoreData, - IN CONST EFI_PEI_PPI_DESCRIPTOR *PpList, + IN CONST EFI_PEI_PPI_DESCRIPTOR *PpiList, IN VOID *Data ) /*++ @@ -219,8 +219,8 @@ Returns: // // If SEC provided any PPI services to PEI, install them. // - if (PpList != NULL) { - Status = PeiServicesInstallPpi (PpList); + if (PpiList != NULL) { + Status = PeiServicesInstallPpi (PpiList); ASSERT_EFI_ERROR (Status); } } diff --git a/MdeModulePkg/Library/EdkFvbServiceLib/Ia32/Fvb.c b/MdeModulePkg/Library/EdkFvbServiceLib/Ia32/Fvb.c index d59e4715f0..8c2a77e8d6 100644 --- a/MdeModulePkg/Library/EdkFvbServiceLib/Ia32/Fvb.c +++ b/MdeModulePkg/Library/EdkFvbServiceLib/Ia32/Fvb.c @@ -33,7 +33,6 @@ STATIC EFI_EVENT mSetVirtualMapChangedEvent = NULL; // STATIC FVB_ENTRY *mFvbEntry; STATIC EFI_EVENT mFvbRegistration; -STATIC BOOLEAN mEfiFvbInitialized = FALSE; STATIC UINTN mFvbCount; /** @@ -320,8 +319,6 @@ FvbLibInitialize ( ); ASSERT_EFI_ERROR (Status); - mEfiFvbInitialized = TRUE; - return EFI_SUCCESS; } diff --git a/MdeModulePkg/Library/EdkFvbServiceLib/X64/Fvb.c b/MdeModulePkg/Library/EdkFvbServiceLib/X64/Fvb.c index 0c5d7697b4..c3459656b5 100644 --- a/MdeModulePkg/Library/EdkFvbServiceLib/X64/Fvb.c +++ b/MdeModulePkg/Library/EdkFvbServiceLib/X64/Fvb.c @@ -32,7 +32,6 @@ STATIC EFI_EVENT mSetVirtualMapChangedEvent = NULL; // STATIC FVB_ENTRY *mFvbEntry; STATIC EFI_EVENT mFvbRegistration; -STATIC BOOLEAN mEfiFvbInitialized = FALSE; STATIC UINTN mFvbCount; /** @@ -319,8 +318,6 @@ FvbLibInitialize ( ); ASSERT_EFI_ERROR (Status); - mEfiFvbInitialized = TRUE; - return EFI_SUCCESS; } diff --git a/MdeModulePkg/Universal/DevicePathDxe/DevicePathFromText.c b/MdeModulePkg/Universal/DevicePathDxe/DevicePathFromText.c index 94a4a2b5b7..f18951b64f 100644 --- a/MdeModulePkg/Universal/DevicePathDxe/DevicePathFromText.c +++ b/MdeModulePkg/Universal/DevicePathDxe/DevicePathFromText.c @@ -812,7 +812,7 @@ ConvertFromTextVendor ( Vendor = (VENDOR_DEVICE_PATH *) CreateDeviceNode ( Type, SubType, - sizeof (VENDOR_DEVICE_PATH) + (UINT16) Length + (UINT16) (sizeof (VENDOR_DEVICE_PATH) + Length) ); StrToGuid (GuidStr, &Vendor->Guid); @@ -1016,7 +1016,7 @@ DevPathFromTextAcpiExp ( HIDStr = GetNextParamStr (&TextDeviceNode); CIDStr = GetNextParamStr (&TextDeviceNode); UIDSTRStr = GetNextParamStr (&TextDeviceNode); - Length = sizeof (ACPI_EXTENDED_HID_DEVICE_PATH) + (UINT16) StrLen (UIDSTRStr) + 3; + Length = (UINT16) (sizeof (ACPI_EXTENDED_HID_DEVICE_PATH) + StrLen (UIDSTRStr) + 3); AcpiExt = (ACPI_EXTENDED_HID_DEVICE_PATH_WITH_STR *) CreateDeviceNode ( ACPI_DEVICE_PATH, ACPI_EXTENDED_DP, @@ -1382,7 +1382,7 @@ DevPathFromTextSAS ( Info |= 0x0001; } else { Info |= 0x0002; - Info |= (Xtoi (DriveBayStr) << 8); + Info = (UINT16) (Info | (Xtoi (DriveBayStr) << 8)); } if (StrCmp (SASSATAStr, L"SATA") == 0) { @@ -1954,7 +1954,7 @@ DevPathFromTextiSCSI ( iSCSI = (ISCSI_DEVICE_PATH_WITH_NAME *) CreateDeviceNode ( MESSAGING_DEVICE_PATH, MSG_ISCSI_DP, - sizeof (ISCSI_DEVICE_PATH_WITH_NAME) + (UINT16) (StrLen (NameStr) * 2) + (UINT16) (sizeof (ISCSI_DEVICE_PATH_WITH_NAME) + StrLen (NameStr) * 2) ); StrCpy (iSCSI->iSCSITargetName, NameStr); @@ -2093,7 +2093,7 @@ DevPathFromTextFilePath ( File = (FILEPATH_DEVICE_PATH *) CreateDeviceNode ( MEDIA_DEVICE_PATH, MEDIA_FILEPATH_DP, - sizeof (FILEPATH_DEVICE_PATH) + (UINT16) (StrLen (TextDeviceNode) * 2) + (UINT16) (sizeof (FILEPATH_DEVICE_PATH) + StrLen (TextDeviceNode) * 2) ); StrCpy (File->PathName, TextDeviceNode); @@ -2140,7 +2140,7 @@ DevPathFromTextBBS ( Bbs = (BBS_BBS_DEVICE_PATH *) CreateDeviceNode ( BBS_DEVICE_PATH, BBS_BBS_DP, - sizeof (BBS_BBS_DEVICE_PATH) + (UINT16) (StrLen (IdStr)) + (UINT16) (sizeof (BBS_BBS_DEVICE_PATH) + StrLen (IdStr)) ); if (StrCmp (TypeStr, L"Floppy") == 0) { diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Option.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Option.c index 7326067532..4c11806f22 100644 --- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Option.c +++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Option.c @@ -249,7 +249,7 @@ TcpParseOption ( Option->Flag = 0; - TotalLen = (Tcp->HeadLen << 2) - sizeof (TCP_HEAD); + TotalLen = (UINT8) ((Tcp->HeadLen << 2) - sizeof (TCP_HEAD)); if (TotalLen <= 0) { return 0; } -- cgit v1.2.3