summaryrefslogtreecommitdiffstats
path: root/MdeModulePkg/Universal
diff options
context:
space:
mode:
authoryshang1 <yshang1@6f19259b-4bc3-4df7-8a09-765794883524>2007-09-19 06:15:43 +0000
committeryshang1 <yshang1@6f19259b-4bc3-4df7-8a09-765794883524>2007-09-19 06:15:43 +0000
commitd074a8e1a25a05cb77d9185e0e4e5a5363c80871 (patch)
tree8811da49f92d3491e988dae11941a86dcd9a8097 /MdeModulePkg/Universal
parentd940d5e59fd316b9e873eef419fe4c8c715e5ee8 (diff)
downloadedk2-d074a8e1a25a05cb77d9185e0e4e5a5363c80871.tar.gz
edk2-d074a8e1a25a05cb77d9185e0e4e5a5363c80871.tar.bz2
edk2-d074a8e1a25a05cb77d9185e0e4e5a5363c80871.zip
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
Diffstat (limited to 'MdeModulePkg/Universal')
-rw-r--r--MdeModulePkg/Universal/DevicePathDxe/DevicePathFromText.c12
-rw-r--r--MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Option.c2
2 files changed, 7 insertions, 7 deletions
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;
}