Partially make EdkModulePkg pass intel IPF compiler with /W4 /WX switched on.

[mirror_edk2.git] / EdkModulePkg / Bus / Pci / Uhci / Dxe / uhci.c

diff --git a/EdkModulePkg/Bus/Pci/Uhci/Dxe/uhci.c b/EdkModulePkg/Bus/Pci/Uhci/Dxe/uhci.c
index 96c5be48ba22373e8a4d534c803cd9ee5f0600c0..3d81d2c5c375eeb0504f7dd5237f0cc08ba6743b 100644 (file)
--- a/EdkModulePkg/Bus/Pci/Uhci/Dxe/uhci.c
+++ b/EdkModulePkg/Bus/Pci/Uhci/Dxe/uhci.c
@@ -759,7 +759,7 @@ UHCIDriverBindingStart (
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
+STATIC\r
 EFI_STATUS\r
 UnInstallUHCInterface (\r
   IN  EFI_HANDLE              Controller,\r
@@ -3845,7 +3845,7 @@ UHCI2ControlTransfer (
 --*/\r
 {\r
   USB_HC_DEV *HcDev;\r
-  BOOLEAN IsSlowDevice = (EFI_USB_SPEED_LOW == DeviceSpeed) ? TRUE : FALSE;\r
+  BOOLEAN IsSlowDevice = (BOOLEAN) ((EFI_USB_SPEED_LOW == DeviceSpeed) ? TRUE : FALSE);\r
 \r
   HcDev = USB2_HC_DEV_FROM_THIS (This);\r
   \r
@@ -4056,7 +4056,7 @@ UHCI2AsyncInterruptTransfer (
 --*/  \r
 {\r
   USB_HC_DEV *HcDev;\r
-  BOOLEAN IsSlowDevice = (EFI_USB_SPEED_LOW == DeviceSpeed) ? TRUE : FALSE;\r
+  BOOLEAN IsSlowDevice = (BOOLEAN) ((EFI_USB_SPEED_LOW == DeviceSpeed) ? TRUE : FALSE);\r
    \r
   HcDev = USB2_HC_DEV_FROM_THIS (This);\r
   return UHCIAsyncInterruptTransfer(\r
@@ -4155,7 +4155,7 @@ UHCI2SyncInterruptTransfer (
   if(DeviceSpeed==EFI_USB_SPEED_HIGH)\r
        return EFI_INVALID_PARAMETER;\r
   \r
-  IsSlowDevice = (EFI_USB_SPEED_LOW == DeviceSpeed) ? TRUE : FALSE;  \r
+  IsSlowDevice = (BOOLEAN) ((EFI_USB_SPEED_LOW == DeviceSpeed) ? TRUE : FALSE);  \r
   HcDev = USB2_HC_DEV_FROM_THIS (This);\r
   \r
   return UHCISyncInterruptTransfer(\r
@@ -4437,11 +4437,9 @@ MonitorInterruptTrans (
   UINTN           DataLen;\r
   UINTN           ActualLen;\r
   UINTN           ErrTDPos;\r
-  UINT32          StatusAddr;\r
   LIST_ENTRY      *NextLink;\r
 \r
   HcDev       = (USB_HC_DEV *) Context;\r
-  StatusAddr  = (UINT32) (USBSTS);\r
 \r
   //\r
   // interrupt transfer list is empty, means that no interrupt transfer\r