EFI_USB_ATAPI_PROTOCOL *BotAtapiProtocol;\r
USB_BOT_DEVICE *UsbBotDev;\r
\r
- EFI_USB_IO_PROTOCOL *UsbIo;\r
-\r
//\r
// Get our context back.\r
//\r
// After installing Usb-Atapi protocol onto this handle\r
// it will be called by upper layer drivers such as Fat\r
//\r
- UsbIo = UsbBotDev->UsbIo;\r
\r
BotReportStatusCode (\r
UsbBotDev->DevicePath,\r
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
//\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
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
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
--*/\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
);\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
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
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
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
--*/\r
;\r
\r
+EFI_STATUS\r
+EFIAPI\r
+UsbPortReset (\r
+ IN EFI_USB_IO_PROTOCOL *This\r
+ )\r
+/*++\r
+\r
+ Routine Description:\r
+ Resets and reconfigures the USB controller. This function will\r
+ work for all USB devices except USB Hub Controllers.\r
+\r
+ Arguments:\r
+ This - Indicates the calling context.\r
+\r
+ Returns:\r
+ EFI_SUCCESS\r
+ EFI_INVALID_PARAMETER\r
+ EFI_DEVICE_ERROR\r
+\r
+--*/\r
+;\r
+\r
+VOID\r
+InitializeUsbIoInstance (\r
+ IN USB_IO_CONTROLLER_DEVICE *UsbIoController\r
+ )\r
+/*++\r
+\r
+Routine Description:\r
+\r
+ Initialize the instance of UsbIo controller\r
+\r
+Arguments:\r
+\r
+ UsbIoController - A pointer to controller structure of UsbIo\r
+\r
+Returns:\r
+\r
+--*/\r
+;\r
+\r
#endif\r
IN VOID *Context OPTIONAL\r
);\r
\r
-extern\r
-EFI_STATUS\r
-EFIAPI\r
-UsbPortReset (\r
- IN EFI_USB_IO_PROTOCOL *This\r
- );\r
-\r
STATIC\r
EFI_STATUS\r
EFIAPI\r
{\r
ATAPI_PACKET_COMMAND Packet;\r
EFI_STATUS Status;\r
- EFI_USB_ATAPI_PROTOCOL *UsbAtapiInterface;\r
\r
- UsbAtapiInterface = UsbFloppyDevice->AtapiProtocol;\r
\r
//\r
// prepare command packet for the Inquiry Packet Command.\r
VOID *ptrBuffer;\r
EFI_STATUS Status;\r
UINT16 TimeOut;\r
- EFI_USB_ATAPI_PROTOCOL *UsbAtapiInterface;\r
UINT8 Index;\r
\r
- UsbAtapiInterface = UsbFloppyDevice->AtapiProtocol;\r
\r
//\r
// prepare command packet for the Inquiry Packet Command.\r
return Status;\r
}\r
\r
+STATIC\r
EFI_STATUS\r
USBFloppyReadCapacity (\r
IN USB_FLOPPY_DEV *UsbFloppyDevice\r
//\r
EFI_STATUS Status;\r
ATAPI_PACKET_COMMAND Packet;\r
- EFI_USB_ATAPI_PROTOCOL *UsbAtapiInterface;\r
\r
//\r
// used for capacity data returned from Usb Floppy\r
\r
ZeroMem (&Data, sizeof (Data));\r
\r
- UsbAtapiInterface = UsbFloppyDevice->AtapiProtocol;\r
\r
ZeroMem (&Packet, sizeof (ATAPI_PACKET_COMMAND));\r
Packet.Inquiry.opcode = READ_CAPACITY;\r
//\r
EFI_STATUS Status;\r
ATAPI_PACKET_COMMAND Packet;\r
- EFI_USB_ATAPI_PROTOCOL *UsbAtapiInterface;\r
\r
//\r
// used for capacity data returned from Usb Floppy\r
\r
ZeroMem (&FormatData, sizeof (FormatData));\r
\r
- UsbAtapiInterface = UsbFloppyDevice->AtapiProtocol;\r
\r
ZeroMem (&Packet, sizeof (ATAPI_PACKET_COMMAND));\r
Packet.ReadFormatCapacity.opcode = READ_FORMAT_CAPACITY;\r
UINT8 *Ptr;\r
BOOLEAN SenseReq;\r
ATAPI_PACKET_COMMAND Packet;\r
- EFI_USB_ATAPI_PROTOCOL *UsbAtapiInterface;\r
\r
- UsbAtapiInterface = UsbFloppyDevice->AtapiProtocol;\r
\r
*SenseCounts = 0;\r
\r
{\r
ATAPI_PACKET_COMMAND Packet;\r
EFI_STATUS Status;\r
- EFI_USB_ATAPI_PROTOCOL *UsbAtapiInterface;\r
UINT32 RetryIndex;\r
UINT32 MaximumRetryTimes;\r
\r
- UsbAtapiInterface = UsbFloppyDevice->AtapiProtocol;\r
MaximumRetryTimes = 2;\r
//\r
// fill command packet\r
VOID *ptrBuffer;\r
EFI_STATUS Status;\r
UINT16 TimeOut;\r
- EFI_USB_ATAPI_PROTOCOL *UsbAtapiInterface;\r
UINT8 Index;\r
\r
- UsbAtapiInterface = UsbFloppyDevice->AtapiProtocol;\r
\r
//\r
// prepare command packet for the Write10 Packet Command.\r
// a flag used to determine whether need to perform Read Capacity command.\r
//\r
\r
- REQUEST_SENSE_DATA *SensePtr;\r
-\r
//\r
// init\r
//\r
\r
if (!EFI_ERROR (Status)) {\r
\r
- SensePtr = UsbFloppyDevice->SenseData;\r
-\r
//\r
// No Media\r
//\r
//\r
EFI_STATUS Status;\r
ATAPI_PACKET_COMMAND Packet;\r
- EFI_USB_ATAPI_PROTOCOL *UsbAtapiInterface;\r
UFI_MODE_PARAMETER_PAGE_5 ModePage5;\r
EFI_LBA LastBlock;\r
UINT32 SectorsPerTrack;\r
UINT32 NumberOfHeads;\r
UINT32 DataBytesPerSector;\r
\r
- UsbAtapiInterface = UsbFloppyDevice->AtapiProtocol;\r
\r
ZeroMem (&ModePage5, sizeof (UFI_MODE_PARAMETER_PAGE_5));\r
\r
//\r
EFI_STATUS Status;\r
ATAPI_PACKET_COMMAND Packet;\r
- EFI_USB_ATAPI_PROTOCOL *UsbAtapiInterface;\r
UFI_MODE_PARAMETER_PAGE_1C ModePage1C;\r
\r
- UsbAtapiInterface = UsbFloppyDevice->AtapiProtocol;\r
\r
ZeroMem (&ModePage1C, sizeof (UFI_MODE_PARAMETER_PAGE_1C));\r
\r
//\r
EFI_STATUS Status;\r
ATAPI_PACKET_COMMAND Packet;\r
- EFI_USB_ATAPI_PROTOCOL *UsbAtapiInterface;\r
UFI_MODE_PARAMETER_HEADER Header;\r
UINT32 Size;\r
\r
- UsbAtapiInterface = UsbFloppyDevice->AtapiProtocol;\r
\r
Size = sizeof (UFI_MODE_PARAMETER_HEADER);\r
\r
//\r
EFI_STATUS Status;\r
ATAPI_PACKET_COMMAND Packet;\r
- EFI_USB_ATAPI_PROTOCOL *UsbAtapiInterface;\r
SCSI_MODE_PARAMETER_HEADER6 Header;\r
UINT32 Size;\r
\r
- UsbAtapiInterface = UsbFloppyDevice->AtapiProtocol;\r
\r
Size = sizeof (SCSI_MODE_PARAMETER_HEADER6);\r
\r
\r
--*/\r
\r
-EFI_STATUS\r
-ConvertBmpToGopBlt (\r
- IN VOID *BmpImage,\r
- IN UINTN BmpImageSize,\r
- IN OUT VOID **GopBlt,\r
- IN OUT UINTN *GopBltSize,\r
- OUT UINTN *PixelHeight,\r
- OUT UINTN *PixelWidth\r
- );\r
\r
EFI_STATUS\r
GetGraphicsBitMapFromFV (\r
return EFI_NOT_FOUND;\r
}\r
\r
+STATIC\r
EFI_STATUS\r
ConvertBmpToGopBlt (\r
IN VOID *BmpImage,\r
}\r
\r
Blt = NULL;\r
+ BltSize = 0;\r
Status = ConvertBmpToGopBlt (\r
ImageData,\r
ImageSize,\r
return (UINT64) VmContext.R[7];\r
}\r
\r
+STATIC\r
UINT64\r
ExecuteEbcImageEntryPoint (\r
IN EFI_HANDLE ImageHandle,\r
IN UINT8 OrData\r
)\r
{\r
- return IoWrite8 (Port, IoRead8 (Port) | OrData);\r
+ return IoWrite8 (Port, (UINT8) (IoRead8 (Port) | OrData));\r
}\r
\r
/**\r
IN UINT8 AndData\r
)\r
{\r
- return IoWrite8 (Port, IoRead8 (Port) & AndData);\r
+ return IoWrite8 (Port, (UINT8) (IoRead8 (Port) & AndData));\r
}\r
\r
/**\r
IN UINT8 OrData\r
)\r
{\r
- return IoWrite8 (Port, (IoRead8 (Port) & AndData) | OrData);\r
+ return IoWrite8 (Port, (UINT8) ((IoRead8 (Port) & AndData) | OrData));\r
}\r
\r
/**\r
IN UINT16 OrData\r
)\r
{\r
- return IoWrite16 (Port, IoRead16 (Port) | OrData);\r
+ return IoWrite16 (Port, (UINT16) (IoRead16 (Port) | OrData));\r
}\r
\r
/**\r
IN UINT16 AndData\r
)\r
{\r
- return IoWrite16 (Port, IoRead16 (Port) & AndData);\r
+ return IoWrite16 (Port, (UINT16) (IoRead16 (Port) & AndData));\r
}\r
\r
/**\r
IN UINT16 OrData\r
)\r
{\r
- return IoWrite16 (Port, (IoRead16 (Port) & AndData) | OrData);\r
+ return IoWrite16 (Port, (UINT16) ((IoRead16 (Port) & AndData) | OrData));\r
}\r
\r
/**\r
IN UINT8 OrData\r
)\r
{\r
- return MmioWrite8 (Address, MmioRead8 (Address) | OrData);\r
+ return MmioWrite8 (Address, (UINT8) (MmioRead8 (Address) | OrData));\r
}\r
\r
/**\r
IN UINT8 AndData\r
)\r
{\r
- return MmioWrite8 (Address, MmioRead8 (Address) & AndData);\r
+ return MmioWrite8 (Address, (UINT8) (MmioRead8 (Address) & AndData));\r
}\r
\r
/**\r
IN UINT8 OrData\r
)\r
{\r
- return MmioWrite8 (Address, (MmioRead8 (Address) & AndData) | OrData);\r
+ return MmioWrite8 (Address, (UINT8) ((MmioRead8 (Address) & AndData) | OrData));\r
}\r
\r
/**\r
IN UINT16 OrData\r
)\r
{\r
- return MmioWrite16 (Address, MmioRead16 (Address) | OrData);\r
+ return MmioWrite16 (Address, (UINT16) (MmioRead16 (Address) | OrData));\r
}\r
\r
/**\r
IN UINT16 AndData\r
)\r
{\r
- return MmioWrite16 (Address, MmioRead16 (Address) & AndData);\r
+ return MmioWrite16 (Address, (UINT16) (MmioRead16 (Address) & AndData));\r
}\r
\r
/**\r
IN UINT16 OrData\r
)\r
{\r
- return MmioWrite16 (Address, (MmioRead16 (Address) & AndData) | OrData);\r
+ return MmioWrite16 (Address, (UINT16) ((MmioRead16 (Address) & AndData) | OrData));\r
}\r
\r
/**\r