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 E210B210F2016 for ; Tue, 14 Aug 2018 18:47:26 -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:26 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.53,241,1531810800"; d="scan'208";a="81435159" Received: from shenglei-dev.ccr.corp.intel.com ([10.239.158.52]) by fmsmga001.fm.intel.com with ESMTP; 14 Aug 2018 18:47:26 -0700 From: shenglei To: edk2-devel@lists.01.org Cc: Star Zeng , Eric Dong Date: Wed, 15 Aug 2018 09:45:57 +0800 Message-Id: <20180815014609.19948-16-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 15/27] MdeModulePkg UsbBusPei: 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:27 -0000 The functions that are never called have been removed. They are PeiHubSetHubFeature,IsPortConnectChange and PeiUsbClearDeviceFeature. 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: Star Zeng --- MdeModulePkg/Bus/Usb/UsbBusPei/HubPeim.c | 39 ----------- MdeModulePkg/Bus/Usb/UsbBusPei/HubPeim.h | 18 ----- MdeModulePkg/Bus/Usb/UsbBusPei/PeiUsbLib.c | 77 ---------------------- MdeModulePkg/Bus/Usb/UsbBusPei/PeiUsbLib.h | 35 ---------- 4 files changed, 169 deletions(-) diff --git a/MdeModulePkg/Bus/Usb/UsbBusPei/HubPeim.c b/MdeModulePkg/Bus/Usb/UsbBusPei/HubPeim.c index 806602511c..5607c65b13 100644 --- a/MdeModulePkg/Bus/Usb/UsbBusPei/HubPeim.c +++ b/MdeModulePkg/Bus/Usb/UsbBusPei/HubPeim.c @@ -193,46 +193,7 @@ PeiHubGetHubStatus ( ); } -/** - Set specified feature to a given hub. - - @param PeiServices General-purpose services that are available to every PEIM. - @param UsbIoPpi Indicates the PEI_USB_IO_PPI instance. - @param Value New feature value. - - @retval EFI_SUCCESS Port feature is set successfully. - @retval EFI_DEVICE_ERROR Cannot set the port feature due to a hardware error. - @retval Others Other failure occurs. - -**/ -EFI_STATUS -PeiHubSetHubFeature ( - IN EFI_PEI_SERVICES **PeiServices, - IN PEI_USB_IO_PPI *UsbIoPpi, - IN UINT8 Value - ) -{ - EFI_USB_DEVICE_REQUEST DeviceRequest; - ZeroMem (&DeviceRequest, sizeof (EFI_USB_DEVICE_REQUEST)); - - // - // Fill Device request packet - // - DeviceRequest.RequestType = USB_HUB_SET_HUB_FEATURE_REQ_TYPE; - DeviceRequest.Request = USB_HUB_SET_HUB_FEATURE; - DeviceRequest.Value = Value; - - return UsbIoPpi->UsbControlTransfer ( - PeiServices, - UsbIoPpi, - &DeviceRequest, - EfiUsbNoData, - PcdGet32 (PcdUsbTransferTimeoutValue), - NULL, - 0 - ); -} /** Clear specified feature on a given hub. diff --git a/MdeModulePkg/Bus/Usb/UsbBusPei/HubPeim.h b/MdeModulePkg/Bus/Usb/UsbBusPei/HubPeim.h index 385a14ec0d..d21057c349 100644 --- a/MdeModulePkg/Bus/Usb/UsbBusPei/HubPeim.h +++ b/MdeModulePkg/Bus/Usb/UsbBusPei/HubPeim.h @@ -145,24 +145,6 @@ PeiHubSetPortFeature ( IN UINT8 Value ); -/** - Set specified feature to a given hub. - - @param PeiServices General-purpose services that are available to every PEIM. - @param UsbIoPpi Indicates the PEI_USB_IO_PPI instance. - @param Value New feature value. - - @retval EFI_SUCCESS Port feature is set successfully. - @retval EFI_DEVICE_ERROR Cannot set the port feature due to a hardware error. - @retval Others Other failure occurs. - -**/ -EFI_STATUS -PeiHubSetHubFeature ( - IN EFI_PEI_SERVICES **PeiServices, - IN PEI_USB_IO_PPI *UsbIoPpi, - IN UINT8 Value - ); /** Get a given hub status. diff --git a/MdeModulePkg/Bus/Usb/UsbBusPei/PeiUsbLib.c b/MdeModulePkg/Bus/Usb/UsbBusPei/PeiUsbLib.c index c5e599e2f7..73a163e7a0 100644 --- a/MdeModulePkg/Bus/Usb/UsbBusPei/PeiUsbLib.c +++ b/MdeModulePkg/Bus/Usb/UsbBusPei/PeiUsbLib.c @@ -104,62 +104,7 @@ PeiUsbSetDeviceAddress ( ); } -/** - Clear a given usb feature. - - @param PeiServices General-purpose services that are available to every PEIM. - @param UsbIoPpi Indicates the PEI_USB_IO_PPI instance. - @param Recipient The recipient of ClearFeature Request, should be one of Device/Interface/Endpoint. - @param Value Request Value. - @param Target Request Index. - - @retval EFI_SUCCESS Usb feature is cleared successfully. - @retval EFI_DEVICE_ERROR Cannot clear the usb feature due to a hardware error. - @retval Others Other failure occurs. -**/ -EFI_STATUS -PeiUsbClearDeviceFeature ( - IN EFI_PEI_SERVICES **PeiServices, - IN PEI_USB_IO_PPI *UsbIoPpi, - IN EFI_USB_RECIPIENT Recipient, - IN UINT16 Value, - IN UINT16 Target - ) -{ - EFI_USB_DEVICE_REQUEST DevReq; - - ASSERT (UsbIoPpi != NULL); - - switch (Recipient) { - case EfiUsbDevice: - DevReq.RequestType = USB_DEV_CLEAR_FEATURE_REQ_TYPE_D; - break; - - case EfiUsbInterface: - DevReq.RequestType = USB_DEV_CLEAR_FEATURE_REQ_TYPE_I; - break; - - case EfiUsbEndpoint: - DevReq.RequestType = USB_DEV_CLEAR_FEATURE_REQ_TYPE_E; - break; - } - - DevReq.Request = USB_DEV_CLEAR_FEATURE; - DevReq.Value = Value; - DevReq.Index = Target; - DevReq.Length = 0; - - return UsbIoPpi->UsbControlTransfer ( - PeiServices, - UsbIoPpi, - &DevReq, - EfiUsbNoData, - PcdGet32 (PcdUsbTransferTimeoutValue), - NULL, - 0 - ); -} /** Configure a usb device to Configuration 1. @@ -244,26 +189,4 @@ PeiUsbGetDeviceSpeed ( } } -/** - 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/UsbBusPei/PeiUsbLib.h b/MdeModulePkg/Bus/Usb/UsbBusPei/PeiUsbLib.h index 35f47a35ec..e3afee6e84 100644 --- a/MdeModulePkg/Bus/Usb/UsbBusPei/PeiUsbLib.h +++ b/MdeModulePkg/Bus/Usb/UsbBusPei/PeiUsbLib.h @@ -148,28 +148,6 @@ PeiUsbSetDeviceAddress ( IN UINT16 AddressValue ); -/** - Clear a given usb feature. - - @param PeiServices General-purpose services that are available to every PEIM. - @param UsbIoPpi Indicates the PEI_USB_IO_PPI instance. - @param Recipient The recipient of ClearFeature Request, should be one of Device/Interface/Endpoint. - @param Value Request Value. - @param Target Request Index. - - @retval EFI_SUCCESS Usb feature is cleared successfully. - @retval EFI_DEVICE_ERROR Cannot clear the usb feature due to a hardware error. - @retval Others Other failure occurs. - -**/ -EFI_STATUS -PeiUsbClearDeviceFeature ( - IN EFI_PEI_SERVICES **PeiServices, - IN PEI_USB_IO_PPI *UsbIoPpi, - IN EFI_USB_RECIPIENT Recipient, - IN UINT16 Value, - IN UINT16 Target - ); /** Configure a usb device to Configuration 1. @@ -215,17 +193,4 @@ PeiUsbGetDeviceSpeed ( 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.18.0.windows.1