moved the PeiPalCallLib from ItaniumFamilyCpuPkg to MdePkg

[mirror_edk2.git] / MdePkg / Library / UefiUsbLib / UsbDxeLib.c

diff --git a/MdePkg/Library/UefiUsbLib/UsbDxeLib.c b/MdePkg/Library/UefiUsbLib/UsbDxeLib.c
index 9da8005fc28048e3e236aef0becfdb708ea7bf14..90b0fd3ea5cc29233723f5ee269a5c5a1fd897ec 100644 (file)
--- a/MdePkg/Library/UefiUsbLib/UsbDxeLib.c
+++ b/MdePkg/Library/UefiUsbLib/UsbDxeLib.c
@@ -13,9 +13,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 **/\r
 \r
-#include <PiDxe.h>\r
-#include <Library/BaseMemoryLib.h>\r
-#include <Library/UsbLib.h>\r
+#include <UefiUsbLibInternal.h>\r
+\r
 \r
 /**\r
   Usb Get Descriptor\r
@@ -33,6 +32,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 UsbGetDescriptor (\r
   IN  EFI_USB_IO_PROTOCOL     *UsbIo,\r
   IN  UINT16                  Value,\r
@@ -84,6 +84,7 @@ UsbGetDescriptor (
 \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 UsbSetDescriptor (\r
   IN  EFI_USB_IO_PROTOCOL     *UsbIo,\r
   IN  UINT16                  Value,\r
@@ -133,6 +134,7 @@ UsbSetDescriptor (
 \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 UsbGetInterface (\r
   IN  EFI_USB_IO_PROTOCOL     *UsbIo,\r
   IN  UINT16                  Index,\r
@@ -179,6 +181,7 @@ UsbGetInterface (
 \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 UsbSetInterface (\r
   IN  EFI_USB_IO_PROTOCOL     *UsbIo,\r
   IN  UINT16                  InterfaceNo,\r
@@ -225,6 +228,7 @@ UsbSetInterface (
 \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 UsbGetConfiguration (\r
   IN  EFI_USB_IO_PROTOCOL     *UsbIo,\r
   OUT UINT8                   *ConfigValue,\r
@@ -268,6 +272,7 @@ UsbGetConfiguration (
 \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 UsbSetConfiguration (\r
   IN  EFI_USB_IO_PROTOCOL     *UsbIo,\r
   IN  UINT16                  Value,\r
@@ -313,6 +318,7 @@ UsbSetConfiguration (
 \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 UsbSetFeature (\r
   IN  EFI_USB_IO_PROTOCOL     *UsbIo,\r
   IN  UINTN       Recipient,\r
@@ -378,6 +384,7 @@ UsbSetFeature (
 \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 UsbClearFeature (\r
   IN  EFI_USB_IO_PROTOCOL     *UsbIo,\r
   IN  UINTN       Recipient,\r
@@ -443,6 +450,7 @@ UsbClearFeature (
 \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 UsbGetStatus (\r
   IN  EFI_USB_IO_PROTOCOL     *UsbIo,\r
   IN  UINTN       Recipient,\r
@@ -507,6 +515,7 @@ UsbGetStatus (
 \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 UsbClearEndpointHalt (\r
   IN  EFI_USB_IO_PROTOCOL     *UsbIo,\r
   IN  UINT8                   EndpointNo,\r
@@ -555,7 +564,7 @@ UsbClearEndpointHalt (
   Result = UsbClearFeature (\r
             UsbIo,\r
             USB_TARGET_ENDPOINT,\r
-            EfiUsbEndpointHalt,\r
+            USB_FEATURE_ENDPOINT_HALT,\r
             EndpointDescriptor.EndpointAddress,\r
             Status\r
             );\r