1. Fixed tools_def.template to meet ICC build for IA32

[mirror_edk2.git] / MdeModulePkg / Bus / Usb / UsbMassStorageDxe / UsbMassBoot.c

diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c
index 80fdf470558d3626fb6e64ee5f5a4fbd8167c8d7..e9b0a2a72af92a70fc8c6be649fab0feef4f6fe0 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c
+++ b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassBoot.c
@@ -89,7 +89,7 @@ UsbBootPutUint16 (
   IN UINT16                  Data16\r
   )\r
 {\r
-  Data16 = USB_BOOT_SWAP16 (Data16);\r
+  Data16 = (UINT16) (USB_BOOT_SWAP16 (Data16));\r
   CopyMem (Buf, &Data16, sizeof (UINT16));\r
 }\r
 \r
@@ -125,7 +125,7 @@ UsbBootRequestSense (
   ZeroMem (&SenseData, sizeof (USB_BOOT_REQUEST_SENSE_DATA));\r
 \r
   SenseCmd.OpCode   = USB_BOOT_REQUEST_SENSE_OPCODE;\r
-  SenseCmd.Lun      = USB_BOOT_LUN (UsbMass->Lun);\r
+  SenseCmd.Lun      = (UINT8) (USB_BOOT_LUN (UsbMass->Lun));\r
   SenseCmd.AllocLen = sizeof (USB_BOOT_REQUEST_SENSE_DATA);\r
 \r
   Status = Transport->ExecCommand (\r
@@ -364,7 +364,7 @@ UsbBootIsUnitReady (
   ZeroMem (&TestCmd, sizeof (USB_BOOT_TEST_UNIT_READY_CMD));\r
 \r
   TestCmd.OpCode  = USB_BOOT_TEST_UNIT_READY_OPCODE;\r
-  TestCmd.Lun     = USB_BOOT_LUN (UsbMass->Lun);\r
+  TestCmd.Lun     = (UINT8) (USB_BOOT_LUN (UsbMass->Lun));\r
 \r
   return UsbBootExecCmdWithRetry (\r
            UsbMass,\r
@@ -407,7 +407,7 @@ UsbBootInquiry (
   ZeroMem (&InquiryData, sizeof (USB_BOOT_INQUIRY_DATA));\r
 \r
   InquiryCmd.OpCode   = USB_BOOT_INQUIRY_OPCODE;\r
-  InquiryCmd.Lun      = USB_BOOT_LUN (UsbMass->Lun);\r
+  InquiryCmd.Lun      = (UINT8) (USB_BOOT_LUN (UsbMass->Lun));\r
   InquiryCmd.AllocLen = sizeof (InquiryData);\r
 \r
   Status = UsbBootExecCmdWithRetry (\r
@@ -423,8 +423,8 @@ UsbBootInquiry (
     return Status;\r
   }\r
 \r
-  UsbMass->Pdt          = USB_BOOT_PDT (InquiryData.Pdt);\r
-  Media->RemovableMedia = USB_BOOT_REMOVABLE (InquiryData.Removable);\r
+  UsbMass->Pdt          = (UINT8) (USB_BOOT_PDT (InquiryData.Pdt));\r
+  Media->RemovableMedia = (BOOLEAN) (USB_BOOT_REMOVABLE (InquiryData.Removable));\r
   //\r
   // Default value 512 Bytes, in case no media present at first time\r
   //\r
@@ -466,7 +466,7 @@ UsbBootReadCapacity (
   ZeroMem (&CapacityData, sizeof (USB_BOOT_READ_CAPACITY_DATA));\r
 \r
   CapacityCmd.OpCode = USB_BOOT_READ_CAPACITY_OPCODE;\r
-  CapacityCmd.Lun    = USB_BOOT_LUN (UsbMass->Lun);\r
+  CapacityCmd.Lun    = (UINT8) (USB_BOOT_LUN (UsbMass->Lun));\r
 \r
   Status = UsbBootExecCmdWithRetry (\r
              UsbMass,\r
@@ -742,7 +742,7 @@ UsbBootReadBlocks (
     ZeroMem (&ReadCmd, sizeof (USB_BOOT_READ10_CMD));\r
 \r
     ReadCmd.OpCode  = USB_BOOT_READ10_OPCODE;\r
-    ReadCmd.Lun     = USB_BOOT_LUN (UsbMass->Lun);\r
+    ReadCmd.Lun     = (UINT8) (USB_BOOT_LUN (UsbMass->Lun));\r
     UsbBootPutUint32 (ReadCmd.Lba, Lba);\r
     UsbBootPutUint16 (ReadCmd.TransferLen, Count);\r
 \r
@@ -822,7 +822,7 @@ UsbBootWriteBlocks (
     ZeroMem (&WriteCmd, sizeof (USB_BOOT_WRITE10_CMD));\r
 \r
     WriteCmd.OpCode = USB_BOOT_WRITE10_OPCODE;\r
-    WriteCmd.Lun    = USB_BOOT_LUN (UsbMass->Lun);\r
+    WriteCmd.Lun    = (UINT8) (USB_BOOT_LUN (UsbMass->Lun));\r
     UsbBootPutUint32 (WriteCmd.Lba, Lba);\r
     UsbBootPutUint16 (WriteCmd.TransferLen, Count);\r
 \r