);\r
\r
if (EFI_ERROR (Status)) {\r
- UHCI_ERROR (("UhciReadReg: PciIo Io.Read error: %r at offset %d\n", Status, Offset));\r
+ DEBUG ((EFI_D_ERROR, "UhciReadReg: PciIo Io.Read error: %r at offset %d\n", Status, Offset));\r
\r
Data = 0xFFFF;\r
}\r
);\r
\r
if (EFI_ERROR (Status)) {\r
- UHCI_ERROR (("UhciWriteReg: PciIo Io.Write error: %r at offset %d\n", Status, Offset));\r
+ DEBUG ((EFI_D_ERROR, "UhciWriteReg: PciIo Io.Write error: %r at offset %d\n", Status, Offset));\r
}\r
}\r
\r
UINT16 Data;\r
\r
Data = UhciReadReg (PciIo, Offset);\r
- Data |= Bit;\r
+ Data = (UINT16) (Data |Bit);\r
UhciWriteReg (PciIo, Offset, Data);\r
}\r
\r
UINT16 Data;\r
\r
Data = UhciReadReg (PciIo, Offset);\r
- Data &= ~Bit;\r
+ Data = (UINT16) (Data & ~Bit);\r
UhciWriteReg (PciIo, Offset, Data);\r
}\r
\r
// is a temporary error status.\r
//\r
if (!UhciIsHcWorking (Uhc->PciIo)) {\r
- UHCI_ERROR (("UhciAckAllInterrupt: re-enable the UHCI from system error\n"));\r
- Uhc->UsbHc.SetState (&Uhc->UsbHc, EfiUsbHcStateOperational);\r
+ DEBUG ((EFI_D_ERROR, "UhciAckAllInterrupt: re-enable the UHCI from system error\n"));\r
+ Uhc->Usb2Hc.SetState (&Uhc->Usb2Hc, EfiUsbHcStateOperational);\r
}\r
}\r
\r
**/\r
EFI_STATUS\r
UhciStopHc (\r
- IN USB_HC_DEV *Uhc,\r
- IN UINTN Timeout\r
+ IN USB_HC_DEV *Uhc,\r
+ IN UINTN Timeout\r
)\r
{\r
UINT16 UsbSts;\r
UsbSts = UhciReadReg (PciIo, USBSTS_OFFSET);\r
\r
if (UsbSts & (USBSTS_HCPE | USBSTS_HSE | USBSTS_HCH)) {\r
- UHCI_ERROR (("UhciIsHcWorking: current USB state is %x\n", UsbSts));\r
+ DEBUG ((EFI_D_ERROR, "UhciIsHcWorking: current USB state is %x\n", UsbSts));\r
return FALSE;\r
}\r
\r
);\r
\r
if (EFI_ERROR (Status)) {\r
- UHCI_ERROR (("UhciSetFrameListBaseAddr: PciIo Io.Write error: %r\n", Status));\r
+ DEBUG ((EFI_D_ERROR, "UhciSetFrameListBaseAddr: PciIo Io.Write error: %r\n", Status));\r
}\r
}\r
\r