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.115; helo=mga14.intel.com; envelope-from=star.zeng@intel.com; receiver=edk2-devel@lists.01.org Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) (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 5130021B02822 for ; Fri, 10 Aug 2018 02:08:19 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Aug 2018 02:08:18 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.53,218,1531810800"; d="scan'208";a="79168841" Received: from fmsmsx106.amr.corp.intel.com ([10.18.124.204]) by fmsmga004.fm.intel.com with ESMTP; 10 Aug 2018 02:08:06 -0700 Received: from fmsmsx114.amr.corp.intel.com (10.18.116.8) by FMSMSX106.amr.corp.intel.com (10.18.124.204) with Microsoft SMTP Server (TLS) id 14.3.319.2; Fri, 10 Aug 2018 02:08:05 -0700 Received: from shsmsx101.ccr.corp.intel.com (10.239.4.153) by FMSMSX114.amr.corp.intel.com (10.18.116.8) with Microsoft SMTP Server (TLS) id 14.3.319.2; Fri, 10 Aug 2018 02:08:05 -0700 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.226]) by SHSMSX101.ccr.corp.intel.com ([169.254.1.205]) with mapi id 14.03.0319.002; Fri, 10 Aug 2018 17:08:03 +0800 From: "Zeng, Star" To: "Zhang, Shenglei" , "edk2-devel@lists.01.org" CC: "Dong, Eric" , "Zeng, Star" Thread-Topic: [PATCH 13/26] MdeModulePkg UsbBotPei: Remove redundant functions Thread-Index: AQHULvSBVQ4B7PkqCkygTDLPFuJS66S4tVjA Date: Fri, 10 Aug 2018 09:08:02 +0000 Message-ID: <0C09AFA07DD0434D9E2A0C6AEB0483103BBABED5@shsmsx102.ccr.corp.intel.com> References: <20180808084712.34696-1-shenglei.zhang@intel.com> <20180808084712.34696-14-shenglei.zhang@intel.com> In-Reply-To: <20180808084712.34696-14-shenglei.zhang@intel.com> Accept-Language: zh-CN, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [PATCH 13/26] MdeModulePkg UsbBotPei: 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: Fri, 10 Aug 2018 09:08:19 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Star Zeng -----Original Message----- From: Zhang, Shenglei=20 Sent: Wednesday, August 8, 2018 4:47 PM To: edk2-devel@lists.01.org Cc: Zeng, Star ; Dong, Eric Subject: [PATCH 13/26] 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=3D1062 Cc: Star Zeng Cc: Eric Dong Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: shenglei --- MdeModulePkg/Bus/Usb/UsbBotPei/PeiUsbLib.c | 190 --------------------- Md= eModulePkg/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, EITHE= R EXPRESS OR IMPLIED. #include "UsbPeim.h" #include "PeiUsbLib.h" =20 -/** - Get a given usb descriptor. - - @param PeiServices General-purpose services that are available t= o 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 hardwa= re 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 !=3D NULL); - - DevReq.RequestType =3D USB_DEV_GET_DESCRIPTOR_REQ_TYPE; - DevReq.Request =3D USB_DEV_GET_DESCRIPTOR; - DevReq.Value =3D Value; - DevReq.Index =3D Index; - DevReq.Length =3D 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 t= o 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 !=3D NULL); - - DevReq.RequestType =3D USB_DEV_SET_ADDRESS_REQ_TYPE; - DevReq.Request =3D USB_DEV_SET_ADDRESS; - DevReq.Value =3D AddressValue; - DevReq.Index =3D 0; - DevReq.Length =3D 0; - - return UsbIoPpi->UsbControlTransfer ( - PeiServices, - UsbIoPpi, - &DevReq, - EfiUsbNoData, - PcdGet32 (PcdUsbTransferTimeoutValue), - NULL, - 0 - ); -} =20 /** Clear a given usb feature. @@ -161,40 +75,6 @@ PeiUsbClearDeviceFeature ( ); } =20 -/** - Configure a usb device to Configuration 1. - - @param PeiServices General-purpose services that are available t= o every PEIM. - @param UsbIoPpi Indicates the PEI_USB_IO_PPI instance. - - @retval EFI_SUCCESS Usb device is set to use Configuration 1 succe= ssfully. - @retval EFI_DEVICE_ERROR Cannot set the usb device due to a hardware er= ror. - @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 =3D USB_DEV_SET_CONFIGURATION_REQ_TYPE; - DevReq.Request =3D USB_DEV_SET_CONFIGURATION; - DevReq.Value =3D 1; - - return UsbIoPpi->UsbControlTransfer ( - PeiServices, - UsbIoPpi, - &DevReq, - EfiUsbNoData, - PcdGet32 (PcdUsbTransferTimeoutValue), - NULL, - 0 - ); -} =20 /** Clear Endpoint Halt. @@ -258,74 +138,4 @@ PeiUsbClearEndpointHalt ( return Status; } =20 -/** - Judge if the port is connected with a usb device or not. - - @param PortStatus The usb port status gotten. =20 - @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) !=3D 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) !=3D 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) !=3D 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; =20 -/** - Get a given usb descriptor. - - @param PeiServices General-purpose services that are available t= o 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 hardwar= e 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 t= o 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 - ); =20 /** Clear a given usb feature. @@ -168,22 +124,6 @@ PeiUsbClearDeviceFeature ( IN UINT16 Target ); =20 -/** - Configure a usb device to Configuration 1. - - @param PeiServices General-purpose services that are available t= o every PEIM. - @param UsbIoPpi Indicates the PEI_USB_IO_PPI instance. - - @retval EFI_SUCCESS Usb device is set to use Configuration 1 succ= essfully. - @retval EFI_DEVICE_ERROR Cannot set the usb device due to a hardware e= rror. - @retval Others Other failure occurs. - -**/ -EFI_STATUS -PeiUsbSetConfiguration ( - IN EFI_PEI_SERVICES **PeiServices, - IN PEI_USB_IO_PPI *UsbIoPpi - ); =20 /** Clear Endpoint Halt. @@ -204,45 +144,7 @@ PeiUsbClearEndpointHalt ( IN UINT8 EndpointAddress ); =20 -/** - 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. =20 - @retval TRUE A low-speed usb device is connected with the port. - @retval FALSE No low-speed usb device is connected with the port. =20 -**/ -BOOLEAN -IsPortLowSpeedDeviceAttached ( - IN UINT16 PortStatus - ); =20 -/** - 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