From 2104e989cf95a45b8ba03f59919727255b4c87af Mon Sep 17 00:00:00 2001 From: shenglei Date: Wed, 8 Aug 2018 15:38:33 +0800 Subject: [PATCH] MdeModulePkg UsbBotPei: Remove redundant functions The functions that are never called have been removed. They are PeiUsbSetConfiguration,PeiUsbSetDeviceAddress, IsPortConnect,IsPortConnectChange,IsPortLowSpeedDeviceAttached and PeiUsbGetDescriptor. https://bugzilla.tianocore.org/show_bug.cgi?id=1062 Cc: Star Zeng Cc: Eric Dong Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: shenglei Reviewed-by: Star Zeng --- MdeModulePkg/Bus/Usb/UsbBotPei/PeiUsbLib.c | 190 --------------------- MdeModulePkg/Bus/Usb/UsbBotPei/PeiUsbLib.h | 98 ----------- 2 files changed, 288 deletions(-) diff --git a/MdeModulePkg/Bus/Usb/UsbBotPei/PeiUsbLib.c b/MdeModulePkg/Bus/Usb/UsbBotPei/PeiUsbLib.c index 4f20c71144..cd765c40c5 100644 --- a/MdeModulePkg/Bus/Usb/UsbBotPei/PeiUsbLib.c +++ b/MdeModulePkg/Bus/Usb/UsbBotPei/PeiUsbLib.c @@ -17,92 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include "UsbPeim.h" #include "PeiUsbLib.h" -/** - Get a given usb descriptor. - - @param PeiServices General-purpose services that are available to every PEIM. - @param UsbIoPpi Indicates the PEI_USB_IO_PPI instance. - @param Value Request Value. - @param Index Request Index. - @param DescriptorLength Request descriptor Length. - @param Descriptor Request descriptor. - - - @retval EFI_SUCCESS Usb descriptor is obtained successfully. - @retval EFI_DEVICE_ERROR Cannot get the usb descriptor due to a hardware error. - @retval Others Other failure occurs. - -**/ -EFI_STATUS -PeiUsbGetDescriptor ( - IN EFI_PEI_SERVICES **PeiServices, - IN PEI_USB_IO_PPI *UsbIoPpi, - IN UINT16 Value, - IN UINT16 Index, - IN UINT16 DescriptorLength, - OUT VOID *Descriptor - ) -{ - EFI_USB_DEVICE_REQUEST DevReq; - - ASSERT (UsbIoPpi != NULL); - - DevReq.RequestType = USB_DEV_GET_DESCRIPTOR_REQ_TYPE; - DevReq.Request = USB_DEV_GET_DESCRIPTOR; - DevReq.Value = Value; - DevReq.Index = Index; - DevReq.Length = DescriptorLength; - - return UsbIoPpi->UsbControlTransfer ( - PeiServices, - UsbIoPpi, - &DevReq, - EfiUsbDataIn, - PcdGet32 (PcdUsbTransferTimeoutValue), - Descriptor, - DescriptorLength - ); -} - -/** - Set a usb device with a specified address. - - @param PeiServices General-purpose services that are available to every PEIM. - @param UsbIoPpi Indicates the PEI_USB_IO_PPI instance. - @param AddressValue The address to assign. - - @retval EFI_SUCCESS Usb device address is set successfully. - @retval EFI_DEVICE_ERROR Cannot set the usb address due to a hardware error. - @retval Others Other failure occurs. - -**/ -EFI_STATUS -PeiUsbSetDeviceAddress ( - IN EFI_PEI_SERVICES **PeiServices, - IN PEI_USB_IO_PPI *UsbIoPpi, - IN UINT16 AddressValue - ) -{ - EFI_USB_DEVICE_REQUEST DevReq; - - ASSERT (UsbIoPpi != NULL); - - DevReq.RequestType = USB_DEV_SET_ADDRESS_REQ_TYPE; - DevReq.Request = USB_DEV_SET_ADDRESS; - DevReq.Value = AddressValue; - DevReq.Index = 0; - DevReq.Length = 0; - - return UsbIoPpi->UsbControlTransfer ( - PeiServices, - UsbIoPpi, - &DevReq, - EfiUsbNoData, - PcdGet32 (PcdUsbTransferTimeoutValue), - NULL, - 0 - ); -} /** Clear a given usb feature. @@ -161,40 +75,6 @@ PeiUsbClearDeviceFeature ( ); } -/** - Configure a usb device to Configuration 1. - - @param PeiServices General-purpose services that are available to every PEIM. - @param UsbIoPpi Indicates the PEI_USB_IO_PPI instance. - - @retval EFI_SUCCESS Usb device is set to use Configuration 1 successfully. - @retval EFI_DEVICE_ERROR Cannot set the usb device due to a hardware error. - @retval Others Other failure occurs. - -**/ -EFI_STATUS -PeiUsbSetConfiguration ( - IN EFI_PEI_SERVICES **PeiServices, - IN PEI_USB_IO_PPI *UsbIoPpi - ) -{ - EFI_USB_DEVICE_REQUEST DevReq; - ZeroMem (&DevReq, sizeof (EFI_USB_DEVICE_REQUEST)); - - DevReq.RequestType = USB_DEV_SET_CONFIGURATION_REQ_TYPE; - DevReq.Request = USB_DEV_SET_CONFIGURATION; - DevReq.Value = 1; - - return UsbIoPpi->UsbControlTransfer ( - PeiServices, - UsbIoPpi, - &DevReq, - EfiUsbNoData, - PcdGet32 (PcdUsbTransferTimeoutValue), - NULL, - 0 - ); -} /** Clear Endpoint Halt. @@ -258,74 +138,4 @@ PeiUsbClearEndpointHalt ( return Status; } -/** - Judge if the port is connected with a usb device or not. - - @param PortStatus The usb port status gotten. - @retval TRUE A usb device is connected with the port. - @retval FALSE No usb device is connected with the port. - -**/ -BOOLEAN -IsPortConnect ( - IN UINT16 PortStatus - ) -{ - // - // return the bit 0 value of PortStatus - // - if ((PortStatus & USB_PORT_STAT_CONNECTION) != 0) { - return TRUE; - } else { - return FALSE; - } -} - -/** - Judge if the port is connected with a low-speed usb device or not. - - @param PortStatus The usb port status gotten. - - @retval TRUE A low-speed usb device is connected with the port. - @retval FALSE No low-speed usb device is connected with the port. - -**/ -BOOLEAN -IsPortLowSpeedDeviceAttached ( - IN UINT16 PortStatus - ) -{ - // - // return the bit 9 value of PortStatus - // - if ((PortStatus & USB_PORT_STAT_LOW_SPEED) != 0) { - return TRUE; - } else { - return FALSE; - } -} - -/** - Judge if the port is in "connection change" status or not. - - @param PortChangeStatus The usb port change status gotten. - - @retval TRUE The port is in "connection change" status. - @retval FALSE The port is NOT in "connection change" status. - -**/ -BOOLEAN -IsPortConnectChange ( - IN UINT16 PortChangeStatus - ) -{ - // - // return the bit 0 value of PortChangeStatus - // - if ((PortChangeStatus & USB_PORT_STAT_C_CONNECTION) != 0) { - return TRUE; - } else { - return FALSE; - } -} diff --git a/MdeModulePkg/Bus/Usb/UsbBotPei/PeiUsbLib.h b/MdeModulePkg/Bus/Usb/UsbBotPei/PeiUsbLib.h index 6d39b764eb..a160146cae 100644 --- a/MdeModulePkg/Bus/Usb/UsbBotPei/PeiUsbLib.h +++ b/MdeModulePkg/Bus/Usb/UsbBotPei/PeiUsbLib.h @@ -100,50 +100,6 @@ typedef enum { EfiUsbEndpoint } EFI_USB_RECIPIENT; -/** - Get a given usb descriptor. - - @param PeiServices General-purpose services that are available to every PEIM. - @param UsbIoPpi Indicates the PEI_USB_IO_PPI instance. - @param Value Request Value. - @param Index Request Index. - @param DescriptorLength Request descriptor Length. - @param Descriptor Request descriptor. - - - @retval EFI_SUCCESS Usb descriptor is obtained successfully. - @retval EFI_DEVICE_ERROR Cannot get the usb descriptor due to a hardware error. - @retval Others Other failure occurs. - -**/ -EFI_STATUS -PeiUsbGetDescriptor ( - IN EFI_PEI_SERVICES **PeiServices, - IN PEI_USB_IO_PPI *UsbIoPpi, - IN UINT16 Value, - IN UINT16 Index, - IN UINT16 DescriptorLength, - OUT VOID *Descriptor - ); - -/** - Set a usb device with a specified address. - - @param PeiServices General-purpose services that are available to every PEIM. - @param UsbIoPpi Indicates the PEI_USB_IO_PPI instance. - @param AddressValue The address to assign. - - @retval EFI_SUCCESS Usb device address is set successfully. - @retval EFI_DEVICE_ERROR Cannot set the usb address due to a hardware error. - @retval Others Other failure occurs. - -**/ -EFI_STATUS -PeiUsbSetDeviceAddress ( - IN EFI_PEI_SERVICES **PeiServices, - IN PEI_USB_IO_PPI *UsbIoPpi, - IN UINT16 AddressValue - ); /** Clear a given usb feature. @@ -168,22 +124,6 @@ PeiUsbClearDeviceFeature ( IN UINT16 Target ); -/** - Configure a usb device to Configuration 1. - - @param PeiServices General-purpose services that are available to every PEIM. - @param UsbIoPpi Indicates the PEI_USB_IO_PPI instance. - - @retval EFI_SUCCESS Usb device is set to use Configuration 1 successfully. - @retval EFI_DEVICE_ERROR Cannot set the usb device due to a hardware error. - @retval Others Other failure occurs. - -**/ -EFI_STATUS -PeiUsbSetConfiguration ( - IN EFI_PEI_SERVICES **PeiServices, - IN PEI_USB_IO_PPI *UsbIoPpi - ); /** Clear Endpoint Halt. @@ -204,45 +144,7 @@ PeiUsbClearEndpointHalt ( IN UINT8 EndpointAddress ); -/** - Judge if the port is connected with a usb device or not. - - @param PortStatus The usb port status gotten. - - @retval TRUE A usb device is connected with the port. - @retval FALSE No usb device is connected with the port. - -**/ -BOOLEAN -IsPortConnect ( - IN UINT16 PortStatus - ); - -/** - Judge if the port is connected with a low-speed usb device or not. - - @param PortStatus The usb port status gotten. - @retval TRUE A low-speed usb device is connected with the port. - @retval FALSE No low-speed usb device is connected with the port. -**/ -BOOLEAN -IsPortLowSpeedDeviceAttached ( - IN UINT16 PortStatus - ); -/** - Judge if the port is in "connection change" status or not. - - @param PortChangeStatus The usb port change status gotten. - - @retval TRUE The port is in "connection change" status. - @retval FALSE The port is NOT in "connection change" status. - -**/ -BOOLEAN -IsPortConnectChange ( - IN UINT16 PortChangeStatus - ); #endif -- 2.39.5