summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorshenglei <shenglei.zhang@intel.com>2018-08-08 15:39:50 +0800
committerStar Zeng <star.zeng@intel.com>2018-08-21 16:29:02 +0800
commit880cc3ebefa8bb126991c65dd2be916dab30d382 (patch)
tree29eb2951ee87e6eb0327d3d0ba655c89ed4afd97
parent2104e989cf95a45b8ba03f59919727255b4c87af (diff)
downloadedk2-880cc3ebefa8bb126991c65dd2be916dab30d382.tar.gz
edk2-880cc3ebefa8bb126991c65dd2be916dab30d382.tar.bz2
edk2-880cc3ebefa8bb126991c65dd2be916dab30d382.zip
MdeModulePkg UsbBusDxe: Remove redundant functions
The functions that are never called have been removed. They are UsbHubCtrlSetHubFeature,UsbHubCtrlResetTT,UsbHcReset, UsbHcAsyncIsochronousTransfer,UsbHcGetState,UsbHcSetState and UsbHcIsochronousTransfer. https://bugzilla.tianocore.org/show_bug.cgi?id=1062 Cc: Star Zeng <star.zeng@intel.com> Cc: Eric Dong <eric.dong@intel.com> Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: shenglei <shenglei.zhang@intel.com> Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com> Reviewed-by: Laszlo Ersek <lersek@redhat.com> Reviewed-by: Star Zeng <star.zeng@intel.com>
-rw-r--r--MdeModulePkg/Bus/Usb/UsbBusDxe/UsbHub.c68
-rw-r--r--MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c146
-rw-r--r--MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.h114
3 files changed, 0 insertions, 328 deletions
diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbHub.c b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbHub.c
index 2ce5726e63..fdb3276a82 100644
--- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbHub.c
+++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbHub.c
@@ -318,74 +318,6 @@ UsbHubCtrlGetPortStatus (
/**
- Usb hub control transfer to reset the TT (Transaction Transaltor).
-
- @param HubDev The hub device.
- @param Port The port of the hub.
-
- @retval EFI_SUCCESS The TT of the hub is reset.
- @retval Others Failed to reset the port.
-
-**/
-EFI_STATUS
-UsbHubCtrlResetTT (
- IN USB_DEVICE *HubDev,
- IN UINT8 Port
- )
-{
- EFI_STATUS Status;
-
- Status = UsbCtrlRequest (
- HubDev,
- EfiUsbNoData,
- USB_REQ_TYPE_CLASS,
- USB_HUB_TARGET_HUB,
- USB_HUB_REQ_RESET_TT,
- 0,
- (UINT16) (Port + 1),
- NULL,
- 0
- );
-
- return Status;
-}
-
-
-/**
- Usb hub control transfer to set the hub feature.
-
- @param HubDev The hub device.
- @param Feature The feature to set.
-
- @retval EFI_SUCESS The feature is set for the hub.
- @retval Others Failed to set the feature.
-
-**/
-EFI_STATUS
-UsbHubCtrlSetHubFeature (
- IN USB_DEVICE *HubDev,
- IN UINT8 Feature
- )
-{
- EFI_STATUS Status;
-
- Status = UsbCtrlRequest (
- HubDev,
- EfiUsbNoData,
- USB_REQ_TYPE_CLASS,
- USB_HUB_TARGET_HUB,
- USB_HUB_REQ_SET_FEATURE,
- Feature,
- 0,
- NULL,
- 0
- );
-
- return Status;
-}
-
-
-/**
Usb hub control transfer to set the port feature.
@param HubDev The Usb hub device.
diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c
index e9b5fefb9a..e405edfd4a 100644
--- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c
+++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c
@@ -90,90 +90,12 @@ UsbHcGetCapability (
}
-/**
- Reset the host controller.
- @param UsbBus The usb bus driver.
- @param Attributes The reset type, only global reset is used by this driver.
- @retval EFI_SUCCESS The reset operation succeeded.
- @retval EFI_INVALID_PARAMETER Attributes is not valid.
- @retval EFI_UNSUPPOURTED The type of reset specified by Attributes is
- not currently supported by the host controller.
- @retval EFI_DEVICE_ERROR Host controller isn't halted to reset.
-**/
-EFI_STATUS
-UsbHcReset (
- IN USB_BUS *UsbBus,
- IN UINT16 Attributes
- )
-{
- EFI_STATUS Status;
- if (UsbBus->Usb2Hc != NULL) {
- Status = UsbBus->Usb2Hc->Reset (UsbBus->Usb2Hc, Attributes);
- } else {
- Status = UsbBus->UsbHc->Reset (UsbBus->UsbHc, Attributes);
- }
- return Status;
-}
-/**
- Get the current operation state of the host controller.
-
- @param UsbBus The USB bus driver.
- @param State The host controller operation state.
-
- @retval EFI_SUCCESS The operation state is returned in State.
- @retval Others Failed to get the host controller state.
-
-**/
-EFI_STATUS
-UsbHcGetState (
- IN USB_BUS *UsbBus,
- OUT EFI_USB_HC_STATE *State
- )
-{
- EFI_STATUS Status;
-
- if (UsbBus->Usb2Hc != NULL) {
- Status = UsbBus->Usb2Hc->GetState (UsbBus->Usb2Hc, State);
- } else {
- Status = UsbBus->UsbHc->GetState (UsbBus->UsbHc, State);
- }
-
- return Status;
-}
-
-
-/**
- Set the host controller operation state.
-
- @param UsbBus The USB bus driver.
- @param State The state to set.
-
- @retval EFI_SUCCESS The host controller is now working at State.
- @retval Others Failed to set operation state.
-
-**/
-EFI_STATUS
-UsbHcSetState (
- IN USB_BUS *UsbBus,
- IN EFI_USB_HC_STATE State
- )
-{
- EFI_STATUS Status;
-
- if (UsbBus->Usb2Hc != NULL) {
- Status = UsbBus->Usb2Hc->SetState (UsbBus->Usb2Hc, State);
- } else {
- Status = UsbBus->UsbHc->SetState (UsbBus->UsbHc, State);
- }
-
- return Status;
-}
/**
@@ -563,78 +485,10 @@ UsbHcSyncInterruptTransfer (
}
-/**
- Execute a synchronous Isochronous USB transfer.
-
- @param UsbBus The USB bus driver.
- @param DevAddr The target device address.
- @param EpAddr The target endpoint address, with direction encoded in
- bit 7.
- @param DevSpeed The device's speed.
- @param MaxPacket The endpoint's max packet size.
- @param BufferNum The number of data buffer.
- @param Data Array of pointers to data buffer.
- @param DataLength The length of data buffer.
- @param Translator The transaction translator for low/full speed device.
- @param UsbResult The result of USB execution.
-
- @retval EFI_UNSUPPORTED The isochronous transfer isn't supported now.
-
-**/
-EFI_STATUS
-UsbHcIsochronousTransfer (
- IN USB_BUS *UsbBus,
- IN UINT8 DevAddr,
- IN UINT8 EpAddr,
- IN UINT8 DevSpeed,
- IN UINTN MaxPacket,
- IN UINT8 BufferNum,
- IN OUT VOID *Data[EFI_USB_MAX_ISO_BUFFER_NUM],
- IN UINTN DataLength,
- IN EFI_USB2_HC_TRANSACTION_TRANSLATOR *Translator,
- OUT UINT32 *UsbResult
- )
-{
- return EFI_UNSUPPORTED;
-}
-/**
- Queue an asynchronous isochronous transfer.
- @param UsbBus The USB bus driver.
- @param DevAddr The target device address.
- @param EpAddr The target endpoint address, with direction encoded in
- bit 7.
- @param DevSpeed The device's speed.
- @param MaxPacket The endpoint's max packet size.
- @param BufferNum The number of data buffer.
- @param Data Array of pointers to data buffer.
- @param DataLength The length of data buffer.
- @param Translator The transaction translator for low/full speed device.
- @param Callback The function to call when data is transferred.
- @param Context The context to the callback function.
-
- @retval EFI_UNSUPPORTED The asynchronous isochronous transfer isn't supported.
-**/
-EFI_STATUS
-UsbHcAsyncIsochronousTransfer (
- IN USB_BUS *UsbBus,
- IN UINT8 DevAddr,
- IN UINT8 EpAddr,
- IN UINT8 DevSpeed,
- IN UINTN MaxPacket,
- IN UINT8 BufferNum,
- IN OUT VOID *Data[EFI_USB_MAX_ISO_BUFFER_NUM],
- IN UINTN DataLength,
- IN EFI_USB2_HC_TRANSACTION_TRANSLATOR *Translator,
- IN EFI_ASYNC_USB_TRANSFER_CALLBACK Callback,
- IN VOID *Context
- )
-{
- return EFI_UNSUPPORTED;
-}
/**
diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.h b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.h
index 26709caa36..ef19e77c40 100644
--- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.h
+++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.h
@@ -36,55 +36,6 @@ UsbHcGetCapability (
OUT UINT8 *Is64BitCapable
);
-/**
- Reset the host controller.
-
- @param UsbBus The usb bus driver.
- @param Attributes The reset type, only global reset is used by this driver.
-
- @retval EFI_SUCCESS The reset operation succeeded.
- @retval EFI_INVALID_PARAMETER Attributes is not valid.
- @retval EFI_UNSUPPOURTED The type of reset specified by Attributes is
- not currently supported by the host controller.
- @retval EFI_DEVICE_ERROR Host controller isn't halted to reset.
-**/
-EFI_STATUS
-UsbHcReset (
- IN USB_BUS *UsbBus,
- IN UINT16 Attributes
- );
-
-/**
- Get the current operation state of the host controller.
-
- @param UsbBus The USB bus driver.
- @param State The host controller operation state.
-
- @retval EFI_SUCCESS The operation state is returned in State.
- @retval Others Failed to get the host controller state.
-
-**/
-EFI_STATUS
-UsbHcGetState (
- IN USB_BUS *UsbBus,
- OUT EFI_USB_HC_STATE *State
- );
-
-/**
- Set the host controller operation state.
-
- @param UsbBus The USB bus driver.
- @param State The state to set.
-
- @retval EFI_SUCCESS The host controller is now working at State.
- @retval Others Failed to set operation state.
-
-**/
-EFI_STATUS
-UsbHcSetState (
- IN USB_BUS *UsbBus,
- IN EFI_USB_HC_STATE State
- );
/**
Get the root hub port state.
@@ -286,71 +237,6 @@ UsbHcSyncInterruptTransfer (
OUT UINT32 *UsbResult
);
-/**
- Execute a synchronous Isochronous USB transfer.
-
- @param UsbBus The USB bus driver.
- @param DevAddr The target device address.
- @param EpAddr The target endpoint address, with direction encoded in
- bit 7.
- @param DevSpeed The device's speed.
- @param MaxPacket The endpoint's max packet size.
- @param BufferNum The number of data buffer.
- @param Data Array of pointers to data buffer.
- @param DataLength The length of data buffer.
- @param Translator The transaction translator for low/full speed device.
- @param UsbResult The result of USB execution.
-
- @retval EFI_UNSUPPORTED The isochronous transfer isn't supported now.
-
-**/
-EFI_STATUS
-UsbHcIsochronousTransfer (
- IN USB_BUS *UsbBus,
- IN UINT8 DevAddr,
- IN UINT8 EpAddr,
- IN UINT8 DevSpeed,
- IN UINTN MaxPacket,
- IN UINT8 BufferNum,
- IN OUT VOID *Data[EFI_USB_MAX_ISO_BUFFER_NUM],
- IN UINTN DataLength,
- IN EFI_USB2_HC_TRANSACTION_TRANSLATOR *Translator,
- OUT UINT32 *UsbResult
- );
-
-/**
- Queue an asynchronous isochronous transfer.
-
- @param UsbBus The USB bus driver.
- @param DevAddr The target device address.
- @param EpAddr The target endpoint address, with direction encoded in
- bit 7.
- @param DevSpeed The device's speed.
- @param MaxPacket The endpoint's max packet size.
- @param BufferNum The number of data buffer.
- @param Data Array of pointers to data buffer.
- @param DataLength The length of data buffer.
- @param Translator The transaction translator for low/full speed device.
- @param Callback The function to call when data is transferred.
- @param Context The context to the callback function.
-
- @retval EFI_UNSUPPORTED The asynchronous isochronous transfer isn't supported.
-
-**/
-EFI_STATUS
-UsbHcAsyncIsochronousTransfer (
- IN USB_BUS *UsbBus,
- IN UINT8 DevAddr,
- IN UINT8 EpAddr,
- IN UINT8 DevSpeed,
- IN UINTN MaxPacket,
- IN UINT8 BufferNum,
- IN OUT VOID *Data[EFI_USB_MAX_ISO_BUFFER_NUM],
- IN UINTN DataLength,
- IN EFI_USB2_HC_TRANSACTION_TRANSLATOR *Translator,
- IN EFI_ASYNC_USB_TRANSFER_CALLBACK Callback,
- IN VOID *Context
- );
/**
Open the USB host controller protocol BY_CHILD.