Reviewed-by: Guomin Jiang <guomin.ji...@intel.com> > -----Original Message----- > From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Michael > Kubacki > Sent: Friday, April 10, 2020 4:05 AM > To: devel@edk2.groups.io > Cc: Bi, Dandan <dandan...@intel.com>; Wu, Hao A <hao.a...@intel.com>; > Wang, Jian J <jian.j.w...@intel.com>; Gao, Liming <liming....@intel.com>; > Ni, Ray <ray...@intel.com>; Sean Brogan <sean.bro...@microsoft.com> > Subject: [edk2-devel] [PATCH v1 3/7] MdeModulePkg/EhciPei: Use BaseLib > linked list iteration macros > > From: Michael Kubacki <michael.kuba...@microsoft.com> > > REF:https://bugzilla.tianocore.org/show_bug.cgi?id=1959 > > Replaces usage of the linked list iteration macros defined in EhcPeim.h with > the common definition in BaseLib.h. > > Cc: Dandan Bi <dandan...@intel.com> > Cc: Hao A Wu <hao.a...@intel.com> > Cc: Jian J Wang <jian.j.w...@intel.com> > Cc: Liming Gao <liming....@intel.com> > Cc: Ray Ni <ray...@intel.com> > Cc: Sean Brogan <sean.bro...@microsoft.com> > Signed-off-by: Michael Kubacki <michael.kuba...@microsoft.com> > --- > MdeModulePkg/Bus/Pci/EhciPei/EhciSched.c | 3 ++- > MdeModulePkg/Bus/Pci/EhciPei/EhciUrb.c | 5 +++-- > MdeModulePkg/Bus/Pci/EhciPei/EhcPeim.h | 15 +-------------- > 3 files changed, 6 insertions(+), 17 deletions(-) > > diff --git a/MdeModulePkg/Bus/Pci/EhciPei/EhciSched.c > b/MdeModulePkg/Bus/Pci/EhciPei/EhciSched.c > index 8eb432dfc31d..311f50198062 100644 > --- a/MdeModulePkg/Bus/Pci/EhciPei/EhciSched.c > +++ b/MdeModulePkg/Bus/Pci/EhciPei/EhciSched.c > @@ -3,6 +3,7 @@ PEIM to produce gPeiUsb2HostControllerPpiGuid based > on gPeiUsbControllerPpiGuid which is used to enable recovery function from > USB Drivers. > > Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR> > +Copyright (c) Microsoft Corporation.<BR> > > SPDX-License-Identifier: BSD-2-Clause-Patent > > @@ -323,7 +324,7 @@ EhcCheckUrbResult ( > goto ON_EXIT; > } > > - EFI_LIST_FOR_EACH (Entry, &Urb->Qh->Qtds) { > + BASE_LIST_FOR_EACH (Entry, &Urb->Qh->Qtds) { > Qtd = EFI_LIST_CONTAINER (Entry, PEI_EHC_QTD, QtdList); > QtdHw = &Qtd->QtdHw; > State = (UINT8) QtdHw->Status; > diff --git a/MdeModulePkg/Bus/Pci/EhciPei/EhciUrb.c > b/MdeModulePkg/Bus/Pci/EhciPei/EhciUrb.c > index 995ccd2463d2..df512ed6fa59 100644 > --- a/MdeModulePkg/Bus/Pci/EhciPei/EhciUrb.c > +++ b/MdeModulePkg/Bus/Pci/EhciPei/EhciUrb.c > @@ -3,6 +3,7 @@ PEIM to produce gPeiUsb2HostControllerPpiGuid based > on gPeiUsbControllerPpiGuid which is used to enable recovery function from > USB Drivers. > > Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR> > +Copyright (c) Microsoft Corporation.<BR> > > SPDX-License-Identifier: BSD-2-Clause-Patent > > @@ -290,7 +291,7 @@ EhcFreeQtds ( > EFI_LIST_ENTRY *Next; > PEI_EHC_QTD *Qtd; > > - EFI_LIST_FOR_EACH_SAFE (Entry, Next, Qtds) { > + BASE_LIST_FOR_EACH_SAFE (Entry, Next, Qtds) { > Qtd = EFI_LIST_CONTAINER (Entry, PEI_EHC_QTD, QtdList); > > RemoveEntryList (&Qtd->QtdList); > @@ -461,7 +462,7 @@ EhcCreateQtds ( > // > // OK, all the QTDs needed are created. Now, fix the NextQtd point > // > - EFI_LIST_FOR_EACH (Entry, &Qh->Qtds) { > + BASE_LIST_FOR_EACH (Entry, &Qh->Qtds) { > Qtd = EFI_LIST_CONTAINER (Entry, PEI_EHC_QTD, QtdList); > > // > diff --git a/MdeModulePkg/Bus/Pci/EhciPei/EhcPeim.h > b/MdeModulePkg/Bus/Pci/EhciPei/EhcPeim.h > index 6b69f7a656ce..962cbc458986 100644 > --- a/MdeModulePkg/Bus/Pci/EhciPei/EhcPeim.h > +++ b/MdeModulePkg/Bus/Pci/EhciPei/EhcPeim.h > @@ -2,6 +2,7 @@ > Private Header file for Usb Host Controller PEIM > > Copyright (c) 2010 - 2018, Intel Corporation. All rights reserved.<BR> > +Copyright (c) Microsoft Corporation.<BR> > > SPDX-License-Identifier: BSD-2-Clause-Patent > > @@ -60,20 +61,6 @@ typedef struct _PEI_USB2_HC_DEV PEI_USB2_HC_DEV; > // > #define EHC_SYNC_POLL_INTERVAL (6 * EHC_1_MILLISECOND) > > -// > -//Iterate through the double linked list. NOT delete safe -// > -#define EFI_LIST_FOR_EACH(Entry, ListHead) \ > - for(Entry = (ListHead)->ForwardLink; Entry != (ListHead); Entry = Entry- > >ForwardLink) > - > -// > -//Iterate through the double linked list. This is delete-safe. > -//Don't touch NextEntry > -// > -#define EFI_LIST_FOR_EACH_SAFE(Entry, NextEntry, ListHead) \ > - for(Entry = (ListHead)->ForwardLink, NextEntry = Entry->ForwardLink;\ > - Entry != (ListHead); Entry = NextEntry, NextEntry = Entry->ForwardLink) > - > #define EFI_LIST_CONTAINER(Entry, Type, Field) BASE_CR(Entry, Type, Field) > > > -- > 2.16.3.windows.1 > > >
-=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#57169): https://edk2.groups.io/g/devel/message/57169 Mute This Topic: https://groups.io/mt/72905935/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
