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:
@@ -457,7 +457,6 @@ Cbi0DriverBindingStop (
|
||||
EFI_STATUS Status;
|
||||
EFI_USB_ATAPI_PROTOCOL *Cbi0AtapiProtocol;
|
||||
USB_CBI_DEVICE *UsbCbiDev;
|
||||
EFI_USB_IO_PROTOCOL *UsbIo;
|
||||
|
||||
//
|
||||
// Get our context back.
|
||||
@@ -476,8 +475,6 @@ Cbi0DriverBindingStop (
|
||||
|
||||
UsbCbiDev = USB_CBI_DEVICE_FROM_THIS (Cbi0AtapiProtocol);
|
||||
|
||||
UsbIo = UsbCbiDev->UsbIo;
|
||||
|
||||
Cbi0ReportStatusCode (
|
||||
UsbCbiDev->DevicePath,
|
||||
EFI_PROGRESS_CODE,
|
||||
@@ -850,11 +847,9 @@ Cbi0MassStorageReset (
|
||||
--*/
|
||||
{
|
||||
EFI_STATUS Status;
|
||||
EFI_USB_IO_PROTOCOL *UsbIo;
|
||||
USB_CBI_DEVICE *UsbCbiDev;
|
||||
|
||||
UsbCbiDev = USB_CBI_DEVICE_FROM_THIS (This);
|
||||
UsbIo = UsbCbiDev->UsbIo;
|
||||
|
||||
if (ExtendedVerification) {
|
||||
//
|
||||
|
@@ -400,7 +400,6 @@ CBI1DriverBindingStop (
|
||||
EFI_STATUS Status;
|
||||
EFI_USB_ATAPI_PROTOCOL *CBI1AtapiProtocol;
|
||||
USB_CBI_DEVICE *UsbCbiDev;
|
||||
EFI_USB_IO_PROTOCOL *UsbIo;
|
||||
|
||||
//
|
||||
// Get our context back.
|
||||
@@ -419,8 +418,6 @@ CBI1DriverBindingStop (
|
||||
|
||||
UsbCbiDev = USB_CBI_DEVICE_FROM_THIS (CBI1AtapiProtocol);
|
||||
|
||||
UsbIo = UsbCbiDev->UsbIo;
|
||||
|
||||
Cbi1ReportStatusCode (
|
||||
UsbCbiDev->DevicePath,
|
||||
EFI_PROGRESS_CODE,
|
||||
@@ -644,7 +641,6 @@ CBI1MassStorageReset (
|
||||
--*/
|
||||
{
|
||||
UINT8 ResetCommand[12];
|
||||
EFI_STATUS Status;
|
||||
EFI_USB_IO_PROTOCOL *UsbIo;
|
||||
USB_CBI_DEVICE *UsbCbiDev;
|
||||
UINT8 EndpointAddr;
|
||||
@@ -669,12 +665,12 @@ CBI1MassStorageReset (
|
||||
ResetCommand[0] = 0x1d;
|
||||
ResetCommand[1] = 0x04;
|
||||
|
||||
Status = CBI1CommandPhase (
|
||||
UsbCbiDev,
|
||||
ResetCommand,
|
||||
12,
|
||||
&Result
|
||||
);
|
||||
CBI1CommandPhase (
|
||||
UsbCbiDev,
|
||||
ResetCommand,
|
||||
12,
|
||||
&Result
|
||||
);
|
||||
|
||||
//
|
||||
// clear bulk in endpoint stall feature
|
||||
|
@@ -467,7 +467,6 @@ USBKeyboardDriverBindingStop (
|
||||
EFI_STATUS Status;
|
||||
EFI_SIMPLE_TEXT_IN_PROTOCOL *SimpleInput;
|
||||
USB_KB_DEV *UsbKeyboardDevice;
|
||||
EFI_USB_IO_PROTOCOL *UsbIo;
|
||||
|
||||
Status = gBS->OpenProtocol (
|
||||
Controller,
|
||||
@@ -493,7 +492,6 @@ USBKeyboardDriverBindingStop (
|
||||
Controller
|
||||
);
|
||||
|
||||
UsbIo = UsbKeyboardDevice->UsbIo;
|
||||
//
|
||||
// Uninstall the Asyn Interrupt Transfer from this device
|
||||
// will disable the key data input from this device
|
||||
@@ -574,12 +572,9 @@ USBKeyboardReset (
|
||||
{
|
||||
EFI_STATUS Status;
|
||||
USB_KB_DEV *UsbKeyboardDevice;
|
||||
EFI_USB_IO_PROTOCOL *UsbIo;
|
||||
|
||||
UsbKeyboardDevice = USB_KB_DEV_FROM_THIS (This);
|
||||
|
||||
UsbIo = UsbKeyboardDevice->UsbIo;
|
||||
|
||||
KbdReportStatusCode (
|
||||
UsbKeyboardDevice->DevicePath,
|
||||
EFI_PROGRESS_CODE,
|
||||
|
@@ -210,9 +210,6 @@ InitUSBKeyboard (
|
||||
UINT8 Duration;
|
||||
EFI_STATUS Status;
|
||||
UINT32 TransferResult;
|
||||
EFI_USB_IO_PROTOCOL *UsbIo;
|
||||
|
||||
UsbIo = UsbKeyboardDevice->UsbIo;
|
||||
|
||||
KbdReportStatusCode (
|
||||
UsbKeyboardDevice->DevicePath,
|
||||
@@ -360,19 +357,16 @@ KeyboardHandler (
|
||||
UINT8 Index;
|
||||
UINT8 Index2;
|
||||
BOOLEAN Down;
|
||||
EFI_STATUS Status;
|
||||
BOOLEAN KeyRelease;
|
||||
BOOLEAN KeyPress;
|
||||
UINT8 SavedTail;
|
||||
USB_KEY UsbKey;
|
||||
UINT8 NewRepeatKey;
|
||||
UINT32 UsbStatus;
|
||||
UINT8 *DataPtr;
|
||||
|
||||
ASSERT (Context);
|
||||
|
||||
NewRepeatKey = 0;
|
||||
DataPtr = (UINT8 *) Data;
|
||||
UsbKeyboardDevice = (USB_KB_DEV *) Context;
|
||||
UsbIo = UsbKeyboardDevice->UsbIo;
|
||||
|
||||
@@ -412,15 +406,15 @@ KeyboardHandler (
|
||||
// Delete & Submit this interrupt again
|
||||
//
|
||||
|
||||
Status = UsbIo->UsbAsyncInterruptTransfer (
|
||||
UsbIo,
|
||||
UsbKeyboardDevice->IntEndpointDescriptor.EndpointAddress,
|
||||
FALSE,
|
||||
0,
|
||||
0,
|
||||
NULL,
|
||||
NULL
|
||||
);
|
||||
UsbIo->UsbAsyncInterruptTransfer (
|
||||
UsbIo,
|
||||
UsbKeyboardDevice->IntEndpointDescriptor.EndpointAddress,
|
||||
FALSE,
|
||||
0,
|
||||
0,
|
||||
NULL,
|
||||
NULL
|
||||
);
|
||||
|
||||
gBS->SetTimer (
|
||||
UsbKeyboardDevice->DelayedRecoveryEvent,
|
||||
|
@@ -443,12 +443,10 @@ USBFloppyReadBlocks (
|
||||
UINTN NumberOfBlocks;
|
||||
BOOLEAN MediaChange;
|
||||
EFI_TPL OldTpl;
|
||||
UINT32 Retry;
|
||||
|
||||
OldTpl = gBS->RaiseTPL (EFI_TPL_NOTIFY);
|
||||
Status = EFI_SUCCESS;
|
||||
MediaChange = FALSE;
|
||||
Retry = 0;
|
||||
|
||||
UsbFloppyDevice = USB_FLOPPY_DEV_FROM_THIS (This);
|
||||
|
||||
@@ -594,12 +592,10 @@ USBFloppyWriteBlocks (
|
||||
UINTN NumberOfBlocks;
|
||||
BOOLEAN MediaChange;
|
||||
EFI_TPL OldTpl;
|
||||
UINT32 Retry;
|
||||
|
||||
OldTpl = gBS->RaiseTPL (EFI_TPL_NOTIFY);
|
||||
Status = EFI_SUCCESS;
|
||||
MediaChange = FALSE;
|
||||
Retry = 0;
|
||||
|
||||
UsbFloppyDevice = USB_FLOPPY_DEV_FROM_THIS (This);
|
||||
|
||||
|
@@ -906,12 +906,9 @@ UsbMouseReset (
|
||||
--*/
|
||||
{
|
||||
USB_MOUSE_DEV *UsbMouseDevice;
|
||||
EFI_USB_IO_PROTOCOL *UsbIo;
|
||||
|
||||
UsbMouseDevice = USB_MOUSE_DEV_FROM_MOUSE_PROTOCOL (This);
|
||||
|
||||
UsbIo = UsbMouseDevice->UsbIo;
|
||||
|
||||
MouseReportStatusCode (
|
||||
UsbMouseDevice->DevicePath,
|
||||
EFI_PROGRESS_CODE,
|
||||
|
Reference in New Issue
Block a user