Partially make EdkModulePkg pass intel IPF compiler with /W4 /WX switched on.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2313 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
@@ -21,6 +21,7 @@ Revision History
|
||||
|
||||
#include "uhci.h"
|
||||
|
||||
STATIC
|
||||
EFI_STATUS
|
||||
USBReadPortW (
|
||||
IN EFI_PCI_IO_PROTOCOL *PciIo,
|
||||
@@ -58,6 +59,7 @@ Returns:
|
||||
);
|
||||
}
|
||||
|
||||
STATIC
|
||||
EFI_STATUS
|
||||
USBReadPortDW (
|
||||
IN EFI_PCI_IO_PROTOCOL *PciIo,
|
||||
@@ -95,6 +97,7 @@ Returns:
|
||||
);
|
||||
}
|
||||
|
||||
STATIC
|
||||
EFI_STATUS
|
||||
USBWritePortW (
|
||||
IN EFI_PCI_IO_PROTOCOL *PciIo,
|
||||
@@ -132,6 +135,7 @@ Returns:
|
||||
);
|
||||
}
|
||||
|
||||
STATIC
|
||||
EFI_STATUS
|
||||
USBWritePortDW (
|
||||
IN EFI_PCI_IO_PROTOCOL *PciIo,
|
||||
@@ -654,13 +658,12 @@ Returns:
|
||||
--*/
|
||||
{
|
||||
UINT16 CommandContent;
|
||||
EFI_STATUS Status;
|
||||
|
||||
Status = ReadUHCCommandReg (
|
||||
HcDev->PciIo,
|
||||
(UINT32) (USBCMD),
|
||||
&CommandContent
|
||||
);
|
||||
ReadUHCCommandReg (
|
||||
HcDev->PciIo,
|
||||
(UINT32) (USBCMD),
|
||||
&CommandContent
|
||||
);
|
||||
|
||||
if ((CommandContent & USBCMD_MAXP) != USBCMD_MAXP) {
|
||||
CommandContent |= USBCMD_MAXP;
|
||||
@@ -835,6 +838,7 @@ Returns:
|
||||
//
|
||||
// functions for QH
|
||||
//
|
||||
STATIC
|
||||
EFI_STATUS
|
||||
AllocateQHStruct (
|
||||
IN USB_HC_DEV *HcDev,
|
||||
@@ -1196,6 +1200,7 @@ Returns:
|
||||
return (BOOLEAN) (!(PtrQH->QH.QHVerticalTerminate));
|
||||
}
|
||||
|
||||
STATIC
|
||||
BOOLEAN
|
||||
GetQHHorizontalValidorInvalid (
|
||||
IN QH_STRUCT *PtrQH
|
||||
@@ -1769,6 +1774,7 @@ Returns:
|
||||
return (VOID *) ((UINTN) (ptrTDStruct->TDData.TDLinkPtr << 4));
|
||||
}
|
||||
|
||||
STATIC
|
||||
BOOLEAN
|
||||
IsTDLinkPtrQHOrTD (
|
||||
IN TD_STRUCT *ptrTDStruct
|
||||
@@ -2325,6 +2331,7 @@ SetCurFrameListQHorTD (
|
||||
pCurEntry->FrameListPtrQSelect = (IsQH ? 1 : 0);
|
||||
}
|
||||
|
||||
STATIC
|
||||
BOOLEAN
|
||||
IsCurFrameListQHorTD (
|
||||
IN FRAMELIST_ENTRY *pCurEntry
|
||||
@@ -3854,7 +3861,7 @@ Returns:
|
||||
//
|
||||
for (Index = StartBytePos, Index2 = StartBitPos, Count = 0; Count < (RealAllocSize / 32); Count++) {
|
||||
|
||||
TempHeaderPtr->BitArrayPtr[Index] ^= (UINT8) (bit (Index2));
|
||||
TempHeaderPtr->BitArrayPtr[Index] = (UINT8) (TempHeaderPtr->BitArrayPtr[Index] ^ bit (Index2));
|
||||
Index2++;
|
||||
if (Index2 == 8) {
|
||||
Index += 1;
|
||||
@@ -4067,7 +4074,7 @@ Returns:
|
||||
for (TempBytePos = FoundBytePos, Index = FoundBitPos,Count = 0;
|
||||
Count < NumberOfMemoryUnit; Count ++) {
|
||||
|
||||
MemoryHeader->BitArrayPtr[TempBytePos] |= bit (Index);
|
||||
MemoryHeader->BitArrayPtr[TempBytePos] = (UINT8) (MemoryHeader->BitArrayPtr[TempBytePos] | bit (Index));
|
||||
Index++;
|
||||
if (Index == 8) {
|
||||
TempBytePos += 1;
|
||||
|
@@ -759,7 +759,7 @@ UHCIDriverBindingStart (
|
||||
return EFI_SUCCESS;
|
||||
}
|
||||
|
||||
|
||||
STATIC
|
||||
EFI_STATUS
|
||||
UnInstallUHCInterface (
|
||||
IN EFI_HANDLE Controller,
|
||||
@@ -3845,7 +3845,7 @@ UHCI2ControlTransfer (
|
||||
--*/
|
||||
{
|
||||
USB_HC_DEV *HcDev;
|
||||
BOOLEAN IsSlowDevice = (EFI_USB_SPEED_LOW == DeviceSpeed) ? TRUE : FALSE;
|
||||
BOOLEAN IsSlowDevice = (BOOLEAN) ((EFI_USB_SPEED_LOW == DeviceSpeed) ? TRUE : FALSE);
|
||||
|
||||
HcDev = USB2_HC_DEV_FROM_THIS (This);
|
||||
|
||||
@@ -4056,7 +4056,7 @@ UHCI2AsyncInterruptTransfer (
|
||||
--*/
|
||||
{
|
||||
USB_HC_DEV *HcDev;
|
||||
BOOLEAN IsSlowDevice = (EFI_USB_SPEED_LOW == DeviceSpeed) ? TRUE : FALSE;
|
||||
BOOLEAN IsSlowDevice = (BOOLEAN) ((EFI_USB_SPEED_LOW == DeviceSpeed) ? TRUE : FALSE);
|
||||
|
||||
HcDev = USB2_HC_DEV_FROM_THIS (This);
|
||||
return UHCIAsyncInterruptTransfer(
|
||||
@@ -4155,7 +4155,7 @@ UHCI2SyncInterruptTransfer (
|
||||
if(DeviceSpeed==EFI_USB_SPEED_HIGH)
|
||||
return EFI_INVALID_PARAMETER;
|
||||
|
||||
IsSlowDevice = (EFI_USB_SPEED_LOW == DeviceSpeed) ? TRUE : FALSE;
|
||||
IsSlowDevice = (BOOLEAN) ((EFI_USB_SPEED_LOW == DeviceSpeed) ? TRUE : FALSE);
|
||||
HcDev = USB2_HC_DEV_FROM_THIS (This);
|
||||
|
||||
return UHCISyncInterruptTransfer(
|
||||
@@ -4437,11 +4437,9 @@ MonitorInterruptTrans (
|
||||
UINTN DataLen;
|
||||
UINTN ActualLen;
|
||||
UINTN ErrTDPos;
|
||||
UINT32 StatusAddr;
|
||||
LIST_ENTRY *NextLink;
|
||||
|
||||
HcDev = (USB_HC_DEV *) Context;
|
||||
StatusAddr = (UINT32) (USBSTS);
|
||||
|
||||
//
|
||||
// interrupt transfer list is empty, means that no interrupt transfer
|
||||
|
Reference in New Issue
Block a user