1. Fixed tools_def.template to meet ICC build for IA32
2. Modified some source files to meet ICC build for IA32 and IPF. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@3271 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
@@ -174,7 +174,7 @@ USBKeyboardDriverBindingSupported (
|
||||
OpenStatus = gBS->OpenProtocol (
|
||||
Controller,
|
||||
&gEfiUsbIoProtocolGuid,
|
||||
&UsbIo,
|
||||
(VOID **) &UsbIo,
|
||||
This->DriverBindingHandle,
|
||||
Controller,
|
||||
EFI_OPEN_PROTOCOL_BY_DRIVER
|
||||
@@ -244,7 +244,7 @@ USBKeyboardDriverBindingStart (
|
||||
Status = gBS->OpenProtocol (
|
||||
Controller,
|
||||
&gEfiUsbIoProtocolGuid,
|
||||
&UsbIo,
|
||||
(VOID **) &UsbIo,
|
||||
This->DriverBindingHandle,
|
||||
Controller,
|
||||
EFI_OPEN_PROTOCOL_BY_DRIVER
|
||||
@@ -500,12 +500,11 @@ USBKeyboardDriverBindingStop (
|
||||
EFI_STATUS Status;
|
||||
EFI_SIMPLE_TEXT_INPUT_PROTOCOL *SimpleInput;
|
||||
USB_KB_DEV *UsbKeyboardDevice;
|
||||
EFI_USB_IO_PROTOCOL *UsbIo;
|
||||
|
||||
Status = gBS->OpenProtocol (
|
||||
Controller,
|
||||
&gEfiSimpleTextInProtocolGuid,
|
||||
&SimpleInput,
|
||||
(VOID **) &SimpleInput,
|
||||
This->DriverBindingHandle,
|
||||
Controller,
|
||||
EFI_OPEN_PROTOCOL_BY_DRIVER
|
||||
@@ -526,7 +525,6 @@ USBKeyboardDriverBindingStop (
|
||||
Controller
|
||||
);
|
||||
|
||||
UsbIo = UsbKeyboardDevice->UsbIo;
|
||||
//
|
||||
// Uninstall the Asyn Interrupt Transfer from this device
|
||||
// will disable the key data input from this device
|
||||
@@ -605,12 +603,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,
|
||||
|
@@ -206,9 +206,6 @@ InitUSBKeyboard (
|
||||
UINT8 Duration;
|
||||
EFI_STATUS Status;
|
||||
UINT32 TransferResult;
|
||||
EFI_USB_IO_PROTOCOL *UsbIo;
|
||||
|
||||
UsbIo = UsbKeyboardDevice->UsbIo;
|
||||
|
||||
KbdReportStatusCode (
|
||||
UsbKeyboardDevice->DevicePath,
|
||||
@@ -361,19 +358,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;
|
||||
|
||||
@@ -413,7 +407,7 @@ KeyboardHandler (
|
||||
// Delete & Submit this interrupt again
|
||||
//
|
||||
|
||||
Status = UsbIo->UsbAsyncInterruptTransfer (
|
||||
UsbIo->UsbAsyncInterruptTransfer (
|
||||
UsbIo,
|
||||
UsbKeyboardDevice->IntEndpointDescriptor.EndpointAddress,
|
||||
FALSE,
|
||||
|
Reference in New Issue
Block a user