Make MDE and EdkModule packages avoid all Intel IPF compiler warnings except waning...

[mirror_edk2.git] / EdkModulePkg / Bus / Usb / UsbBus / Dxe / usbbus.c

diff --git a/EdkModulePkg/Bus/Usb/UsbBus/Dxe/usbbus.c b/EdkModulePkg/Bus/Usb/UsbBus/Dxe/usbbus.c
index 029d9cb4255bf06bb44b1210d1f27929e333d1e4..ffca53595e2a2bb091f12928cc86a226bf1ba739 100644 (file)
--- a/EdkModulePkg/Bus/Usb/UsbBus/Dxe/usbbus.c
+++ b/EdkModulePkg/Bus/Usb/UsbBus/Dxe/usbbus.c
@@ -84,14 +84,6 @@ ReportUsbStatusCode (
   IN EFI_STATUS_CODE_VALUE         Code\r
   );\r
 \r
-//\r
-// Supported function\r
-//\r
-VOID\r
-InitializeUsbIoInstance (\r
-  IN USB_IO_CONTROLLER_DEVICE     *UsbIoController\r
-  );\r
-\r
 STATIC\r
 USB_IO_CONTROLLER_DEVICE    *\r
 CreateUsbIoControllerDevice (\r
@@ -213,7 +205,7 @@ UsbAllocateAddress (
         //\r
         // Found one, covert to address, and mark it use\r
         //\r
-        AddressPool[ByteIndex] |= (1 << BitIndex);\r
+        AddressPool[ByteIndex] = (UINT8) (AddressPool[ByteIndex] | (1 << BitIndex));\r
         return (UINT8) (ByteIndex * 8 + BitIndex);\r
       }\r
     }\r
@@ -251,7 +243,7 @@ UsbFreeAddress (
   WhichByte = (UINT8) (DevAddress / 8);\r
   WhichBit  = (UINT8) (DevAddress & 0x7);\r
 \r
-  AddressPool[WhichByte] &= (~(1 << WhichBit));\r
+  AddressPool[WhichByte] = (UINT8) (AddressPool[WhichByte] & (~(1 << WhichBit)));\r
 }\r
 \r
 EFI_STATUS\r
@@ -2277,7 +2269,7 @@ ParentPortReset (
     ResetRootPort (ParentIoDev->BusController, HubPort, RetryTimes);\r
   } else {\r
     DEBUG ((gUSBDebugLevel, "Reset from Hub, Addr 0x%x\n", ParentIoDev->DeviceAddress));\r
-    ResetHubPort (ParentController, HubPort + 1);\r
+    ResetHubPort (ParentController, (UINT8) (HubPort + 1));\r
   }\r
   //\r
   // If we only need port reset, just return\r
@@ -2580,16 +2572,13 @@ IsDeviceDisconnected (
 --*/\r
 {\r
   USB_IO_DEVICE             *ParentIoDev;\r
-  USB_IO_DEVICE             *UsbIoDev;\r
   USB_IO_CONTROLLER_DEVICE  *ParentController;\r
   UINT8                     HubPort;\r
   EFI_STATUS                Status;\r
-  EFI_USB_IO_PROTOCOL       *UsbIo;\r
   EFI_USB_PORT_STATUS       PortStatus;\r
 \r
   ParentController  = UsbIoController->Parent;\r
   ParentIoDev       = ParentController->UsbDevice;\r
-  UsbIoDev          = UsbIoController->UsbDevice;\r
   HubPort           = UsbIoController->ParentPort;\r
 \r
   if (ParentIoDev->DeviceAddress == 1) {\r
@@ -2603,10 +2592,9 @@ IsDeviceDisconnected (
       );\r
 \r
   } else {\r
-    UsbIo = &UsbIoController->UsbIo;\r
     Status = HubGetPortStatus (\r
               &ParentController->UsbIo,\r
-              HubPort + 1,\r
+              (UINT8) (HubPort + 1),\r
               (UINT32 *) &PortStatus\r
               );\r
 \r
@@ -3308,7 +3296,7 @@ UsbVirtualHcControlTransfer (
                                           TransferResult\r
                                           );\r
   } else {\r
-    IsSlowDevice = (EFI_USB_SPEED_LOW == DeviceSpeed) ? TRUE : FALSE;\r
+    IsSlowDevice = (BOOLEAN) ((EFI_USB_SPEED_LOW == DeviceSpeed) ? TRUE : FALSE);\r
     Status = UsbBusDev->UsbHCInterface->ControlTransfer (\r
                                           UsbBusDev->UsbHCInterface,\r
                                           DeviceAddress,\r
@@ -3530,7 +3518,7 @@ UsbVirtualHcAsyncInterruptTransfer (
                                           Context\r
                                           );\r
   } else {\r
-    IsSlowDevice = (EFI_USB_SPEED_LOW == DeviceSpeed) ? TRUE : FALSE;\r
+    IsSlowDevice = (BOOLEAN) ((EFI_USB_SPEED_LOW == DeviceSpeed) ? TRUE : FALSE);\r
     Status = UsbBusDev->UsbHCInterface->AsyncInterruptTransfer (\r
                                           UsbBusDev->UsbHCInterface,\r
                                           DeviceAddress,\r
@@ -3639,7 +3627,7 @@ UsbVirtualHcSyncInterruptTransfer (
                                           TransferResult\r
                                           );\r
   } else {\r
-    IsSlowDevice = (EFI_USB_SPEED_LOW == DeviceSpeed) ? TRUE : FALSE;\r
+    IsSlowDevice = (BOOLEAN) ((EFI_USB_SPEED_LOW == DeviceSpeed) ? TRUE : FALSE);\r
     Status = UsbBusDev->UsbHCInterface->SyncInterruptTransfer (\r
                                           UsbBusDev->UsbHCInterface,\r
                                           DeviceAddress,\r