From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.88; helo=mga01.intel.com; envelope-from=shenglei.zhang@intel.com; receiver=edk2-devel@lists.01.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 9255D210F2016 for ; Tue, 14 Aug 2018 18:47:25 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 14 Aug 2018 18:47:25 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.53,241,1531810800"; d="scan'208";a="81435152" Received: from shenglei-dev.ccr.corp.intel.com ([10.239.158.52]) by fmsmga001.fm.intel.com with ESMTP; 14 Aug 2018 18:47:24 -0700 From: shenglei To: edk2-devel@lists.01.org Cc: Star Zeng , Eric Dong Date: Wed, 15 Aug 2018 09:45:56 +0800 Message-Id: <20180815014609.19948-15-shenglei.zhang@intel.com> X-Mailer: git-send-email 2.18.0.windows.1 In-Reply-To: <20180815014609.19948-1-shenglei.zhang@intel.com> References: <20180815014609.19948-1-shenglei.zhang@intel.com> Subject: [PATCH v2 14/27] MdeModulePkg UsbBusDxe: Remove redundant functions X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Aug 2018 01:47:25 -0000 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 Cc: Eric Dong Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: shenglei Reviewed-by: Ruiyu Ni Reviewed-by: Laszlo Ersek Reviewed-by: Star Zeng --- MdeModulePkg/Bus/Usb/UsbBusDxe/UsbHub.c | 68 --------- MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c | 146 -------------------- MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.h | 114 --------------- 3 files changed, 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 @@ -317,74 +317,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. 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. -- 2.18.0.windows.1