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 0906A210F16C1 for ; Tue, 14 Aug 2018 18:47:17 -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:16 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.53,241,1531810800"; d="scan'208";a="81435116" Received: from shenglei-dev.ccr.corp.intel.com ([10.239.158.52]) by fmsmga001.fm.intel.com with ESMTP; 14 Aug 2018 18:47:16 -0700 From: shenglei To: edk2-devel@lists.01.org Cc: Star Zeng , Eric Dong Date: Wed, 15 Aug 2018 09:45:50 +0800 Message-Id: <20180815014609.19948-9-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 08/27] MdeModulePkg UhciPei: 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:17 -0000 The functions that are never called have been removed. They are IoMmuFreeBuffer,DelinkMemoryBlock,IsMemoryBlockEmptied ,IsTDLinkPtrQHOrTD,GetCurrentFrameNumber,GetQHHorizontalLinkPtr and GetQHHorizontalValidorInvalid. 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/Pci/UhciPei/DmaMem.c | 22 ----- MdeModulePkg/Bus/Pci/UhciPei/UhcPeim.c | 125 ------------------------- MdeModulePkg/Bus/Pci/UhciPei/UhcPeim.h | 78 --------------- 3 files changed, 225 deletions(-) diff --git a/MdeModulePkg/Bus/Pci/UhciPei/DmaMem.c b/MdeModulePkg/Bus/Pci/UhciPei/DmaMem.c index c92bee4298..f4202ba6e6 100644 --- a/MdeModulePkg/Bus/Pci/UhciPei/DmaMem.c +++ b/MdeModulePkg/Bus/Pci/UhciPei/DmaMem.c @@ -205,29 +205,7 @@ IoMmuAllocateBuffer ( return Status; } -/** - Frees memory that was allocated with AllocateBuffer(). - - @param IoMmu Pointer to IOMMU PPI. - @param Pages The number of pages to free. - @param HostAddress The base system memory address of the allocated range. - @param Mapping The mapping value returned from Map(). -**/ -VOID -IoMmuFreeBuffer ( - IN EDKII_IOMMU_PPI *IoMmu, - IN UINTN Pages, - IN VOID *HostAddress, - IN VOID *Mapping - ) -{ - if (IoMmu != NULL) { - IoMmu->SetAttribute (IoMmu, Mapping, 0); - IoMmu->Unmap (IoMmu, Mapping); - IoMmu->FreeBuffer (IoMmu, Pages, HostAddress); - } -} /** Initialize IOMMU. diff --git a/MdeModulePkg/Bus/Pci/UhciPei/UhcPeim.c b/MdeModulePkg/Bus/Pci/UhciPei/UhcPeim.c index ec2daf1649..645c946f29 100644 --- a/MdeModulePkg/Bus/Pci/UhciPei/UhcPeim.c +++ b/MdeModulePkg/Bus/Pci/UhciPei/UhcPeim.c @@ -1252,26 +1252,7 @@ IsStatusOK ( } } -/** - Get Current Frame Number. - - @param UhcDev The UHCI device. - @param FrameNumberAddr The address of frame list register. - - @retval The content of the frame list register. -**/ -UINT16 -GetCurrentFrameNumber ( - IN USB_UHC_DEV *UhcDev, - IN UINT32 FrameNumberAddr - ) -{ - // - // Gets value in the USB frame number register. - // - return (UINT16) (USBReadPortW (UhcDev, FrameNumberAddr) & 0x03FF); -} /** Set Frame List Base Address. @@ -1349,25 +1330,7 @@ SetQHHorizontalLinkPtr ( PtrQH->QueueHead.QHHorizontalPtr = (UINT32) (UINTN) PtrNext >> 4; } -/** - Get the horizontal link pointer in QH. - - @param PtrQH Place to store QH_STRUCT pointer. - @retval The horizontal link pointer in QH. - -**/ -VOID * -GetQHHorizontalLinkPtr ( - IN QH_STRUCT *PtrQH - ) -{ - // - // Restore the 28bit address to 32bit address - // (take 32bit address as an example) - // - return (VOID *) (UINTN) ((PtrQH->QueueHead.QHHorizontalPtr) << 4); -} /** Set a QH or TD horizontally to be connected with a specific QH. @@ -1470,25 +1433,7 @@ SetQHVerticalValidorInvalid ( PtrQH->QueueHead.QHVerticalTerminate = IsValid ? 0 : 1; } -/** - Get the vertical validor bit in QH. - @param PtrQH Place to store QH_STRUCT pointer. - - @retval The vertical linker is valid or not. - -**/ -BOOLEAN -GetQHHorizontalValidorInvalid ( - IN QH_STRUCT *PtrQH - ) -{ - // - // If TRUE, meaning the Horizontal Link Pointer field is valid, - // else, the field is invalid. - // - return (BOOLEAN) (!(PtrQH->QueueHead.QHHorizontalTerminate)); -} /** Allocate TD or QH Struct. @@ -2000,26 +1945,7 @@ GetTDLinkPtr ( return (VOID *) (UINTN) ((PtrTDStruct->TDData.TDLinkPtr) << 4); } -/** - Get the information about whether the Link Pointer field pointing to - a QH or a TD. - @param PtrTDStruct Place to store TD_STRUCT pointer. - - @retval whether the Link Pointer field pointing to a QH or a TD. - -**/ -BOOLEAN -IsTDLinkPtrQHOrTD ( - IN TD_STRUCT *PtrTDStruct - ) -{ - // - // Get the information about whether the Link Pointer field pointing to - // a QH or a TD. - // - return (BOOLEAN) (PtrTDStruct->TDData.TDLinkPtrQSelect); -} /** Enable/Disable short packet detection mechanism. @@ -3239,60 +3165,9 @@ InsertMemoryHeaderToList ( } } -/** - Judge the memory block in the memory header is empty or not. - - @param MemoryHeaderPtr A pointer to the memory header list. - - @retval Whether the memory block in the memory header is empty or not. - -**/ -BOOLEAN -IsMemoryBlockEmptied ( - IN MEMORY_MANAGE_HEADER *MemoryHeaderPtr - ) -{ - UINTN Index; - - for (Index = 0; Index < MemoryHeaderPtr->BitArraySizeInBytes; Index++) { - if (MemoryHeaderPtr->BitArrayPtr[Index] != 0) { - return FALSE; - } - } - - return TRUE; -} - -/** - remove a memory header from list. - @param FirstMemoryHeader A pointer to the memory header list. - @param FreeMemoryHeader A memory header to be removed into the list. -**/ -VOID -DelinkMemoryBlock ( - IN MEMORY_MANAGE_HEADER *FirstMemoryHeader, - IN MEMORY_MANAGE_HEADER *FreeMemoryHeader - ) -{ - MEMORY_MANAGE_HEADER *TempHeaderPtr; - if ((FirstMemoryHeader == NULL) || (FreeMemoryHeader == NULL)) { - return ; - } - - for (TempHeaderPtr = FirstMemoryHeader; TempHeaderPtr != NULL; TempHeaderPtr = TempHeaderPtr->Next) { - - if (TempHeaderPtr->Next == FreeMemoryHeader) { - // - // Link the before and after - // - TempHeaderPtr->Next = FreeMemoryHeader->Next; - break; - } - } -} /** Map address of request structure buffer. diff --git a/MdeModulePkg/Bus/Pci/UhciPei/UhcPeim.h b/MdeModulePkg/Bus/Pci/UhciPei/UhcPeim.h index 33d4f2f65f..01a9782d76 100644 --- a/MdeModulePkg/Bus/Pci/UhciPei/UhcPeim.h +++ b/MdeModulePkg/Bus/Pci/UhciPei/UhcPeim.h @@ -472,21 +472,6 @@ IsStatusOK ( IN UINT32 StatusRegAddr ); -/** - Get Current Frame Number. - - @param UhcDev The UHCI device. - @param FrameNumberAddr The address of frame list register. - - @retval The content of the frame list register. - -**/ -UINT16 -GetCurrentFrameNumber ( - IN USB_UHC_DEV *UhcDev, - IN UINT32 FrameNumberAddr - ); - /** Set Frame List Base Address. @@ -531,19 +516,6 @@ SetQHHorizontalLinkPtr ( IN VOID *PtrNext ); -/** - Get the horizontal link pointer in QH. - - @param PtrQH Place to store QH_STRUCT pointer. - - @retval The horizontal link pointer in QH. - -**/ -VOID * -GetQHHorizontalLinkPtr ( - IN QH_STRUCT *PtrQH - ); - /** Set a QH or TD horizontally to be connected with a specific QH. @@ -609,18 +581,6 @@ SetQHVerticalValidorInvalid ( IN BOOLEAN IsValid ); -/** - Get the vertical validor bit in QH. - - @param PtrQH Place to store QH_STRUCT pointer. - - @retval The vertical linker is valid or not. - -**/ -BOOLEAN -GetQHHorizontalValidorInvalid ( - IN QH_STRUCT *PtrQH - ); /** Allocate TD or QH Struct. @@ -805,19 +765,6 @@ GetTDLinkPtr ( IN TD_STRUCT *PtrTDStruct ); -/** - Get the information about whether the Link Pointer field pointing to - a QH or a TD. - - @param PtrTDStruct Place to store TD_STRUCT pointer. - - @retval whether the Link Pointer field pointing to a QH or a TD. - -**/ -BOOLEAN -IsTDLinkPtrQHOrTD ( - IN TD_STRUCT *PtrTDStruct - ); /** Enable/Disable short packet detection mechanism. @@ -1317,31 +1264,6 @@ InsertMemoryHeaderToList ( IN MEMORY_MANAGE_HEADER *NewMemoryHeader ); -/** - Judge the memory block in the memory header is empty or not. - - @param MemoryHeaderPtr A pointer to the memory header list. - - @retval Whether the memory block in the memory header is empty or not. - -**/ -BOOLEAN -IsMemoryBlockEmptied ( - IN MEMORY_MANAGE_HEADER *MemoryHeaderPtr - ); - -/** - remove a memory header from list. - - @param FirstMemoryHeader A pointer to the memory header list. - @param FreeMemoryHeader A memory header to be removed into the list. - -**/ -VOID -DelinkMemoryBlock ( - IN MEMORY_MANAGE_HEADER *FirstMemoryHeader, - IN MEMORY_MANAGE_HEADER *FreeMemoryHeader - ); /** Map address of request structure buffer. -- 2.18.0.windows.1