From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mail.byosoft.com.cn (mail.byosoft.com.cn [58.240.74.242])
 by mx.groups.io with SMTP id smtpd.web10.9095.1622613336923192831
 for <devel@edk2.groups.io>;
 Tue, 01 Jun 2021 22:55:37 -0700
Authentication-Results: mx.groups.io;
 dkim=missing; spf=none, err=permanent DNS error (domain: byosoft.com.cn, ip: 58.240.74.242, mailfrom: gaoliming@byosoft.com.cn)
Received: from DESKTOPS6D0PVI ([58.246.60.130])
	(envelope-sender <gaoliming@byosoft.com.cn>)
	by 192.168.6.13 with ESMTP
	for <devel@edk2.groups.io>; Wed, 02 Jun 2021 13:55:33 +0800
X-WM-Sender: gaoliming@byosoft.com.cn
X-Originating-IP: 58.246.60.130
X-WM-AuthFlag: YES
X-WM-AuthUser: gaoliming@byosoft.com.cn
From: "gaoliming" <gaoliming@byosoft.com.cn>
To: <devel@edk2.groups.io>,
	<gaoliming@byosoft.com.cn>,
	<kuqin12@gmail.com>
Cc: "'Michael D Kinney'" <michael.d.kinney@intel.com>,
	"'Zhiguang Liu'" <zhiguang.liu@intel.com>
References: <20210527081723.1934-1-kuqin12@gmail.com> <20210527081723.1934-2-kuqin12@gmail.com> <168450F5F1A18D8C.26195@groups.io>
In-Reply-To: <168450F5F1A18D8C.26195@groups.io>
Subject: =?UTF-8?B?5Zue5aSNOiBbZWRrMi1kZXZlbF0gW1BBVENIIHYxIDEvMV0gTWRlUGtnOiBNbUNvbnRyb2w6IEZpeCBmdW5jdGlvbiBhbmQgc3RydWN0dXJlIGRlZmluaXRpb24gbWlzbWF0Y2hlcw==?=
Date: Wed, 2 Jun 2021 13:55:33 +0800
Message-ID: <004101d75773$e6cdc6e0$b46954a0$@byosoft.com.cn>
MIME-Version: 1.0
X-Mailer: Microsoft Outlook 16.0
Thread-Index: AQMIPmvY18L73rBo6C6by7yK9/OPvQJaXBtkApVqAAKoduyGMA==
Content-Type: text/plain;
	charset="gb2312"
Content-Transfer-Encoding: quoted-printable
Content-Language: zh-cn

Merge at d3ff5dbe1dfc3420e5254d290500c0b6f6282d17

> -----=D3=CA=BC=FE=D4=AD=BC=FE-----
> =B7=A2=BC=FE=C8=CB: devel@edk2.groups.io <devel@edk2.groups.io> =B4=FA=
=B1=ED gaoliming
> =B7=A2=CB=CD=CA=B1=BC=E4: 2021=C4=EA6=D4=C21=C8=D5 9:26
> =CA=D5=BC=FE=C8=CB: devel@edk2.groups.io; kuqin12@gmail.com
> =B3=AD=CB=CD: 'Michael D Kinney' <michael.d.kinney@intel.com>; 'Zhiguang=
 Liu'
> <zhiguang.liu@intel.com>
> =D6=F7=CC=E2: =BB=D8=B8=B4: [edk2-devel] [PATCH v1 1/1] MdePkg: MmContro=
l: Fix function
> and structure definition mismatches
>=20
> Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>
>=20
> > -----=D3=CA=BC=FE=D4=AD=BC=FE-----
> > =B7=A2=BC=FE=C8=CB: devel@edk2.groups.io <devel@edk2.groups.io> =B4=FA=
=
=B1=ED Kun Qin
> > =B7=A2=CB=CD=CA=B1=BC=E4: 2021=C4=EA5=D4=C227=C8=D5 16:17
> > =CA=D5=BC=FE=C8=CB: devel@edk2.groups.io
> > =B3=AD=CB=CD: Michael D Kinney <michael.d.kinney@intel.com>; Liming Ga=
o
> > <gaoliming@byosoft.com.cn>; Zhiguang Liu <zhiguang.liu@intel.com>
> > =D6=F7=CC=E2: [edk2-devel] [PATCH v1 1/1] MdePkg: MmControl: Fix funct=
ion and
> > structure definition mismatches
> >
> > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3397
> >
> > Current Ppi/MmControl.h file has structure definition of "struct
> > _PEI_MM_CONTROL_PPI". This name mismatches with its definition in PI
> > Specification v1.7 (Errata) as "struct _EFI_PEI_MM_CONTROL_PPI".
> >
> > In addition, field types "PEI_MM_ACTIVATE" and "PEI_MM_DEACTIVATE"
> > used
> > in "struct _PEI_MM_CONTROL_PPI" mismatches with the definition of
> > "EFI_PEI_MM_ACTIVATE" and "EFI_PEI_MM_DEACTIVATE" in the PI spec.
> >
> > This change fixes these mismatches by using the PI spec defined names.
> >
> > Cc: Michael D Kinney <michael.d.kinney@intel.com>
> > Cc: Liming Gao <gaoliming@byosoft.com.cn>
> > Cc: Zhiguang Liu <zhiguang.liu@intel.com>
> >
> > Fixes: 6f33f7a262314af35e2b99c849e08928ea49aa55
> > Signed-off-by: Kun Qin <kuqin12@gmail.com>
> > ---
> >  MdePkg/Include/Ppi/MmControl.h | 8 ++++----
> >  1 file changed, 4 insertions(+), 4 deletions(-)
> >
> > diff --git a/MdePkg/Include/Ppi/MmControl.h
> > b/MdePkg/Include/Ppi/MmControl.h
> > index 983ed95cd53d..17586f437b4b 100644
> > --- a/MdePkg/Include/Ppi/MmControl.h
> > +++ b/MdePkg/Include/Ppi/MmControl.h
> > @@ -69,7 +69,7 @@ EFI_STATUS
> >  **/
> >  typedef
> >  EFI_STATUS
> > -(EFIAPI *PEI_MM_DEACTIVATE) (
> > +(EFIAPI *EFI_PEI_MM_DEACTIVATE) (
> >    IN EFI_PEI_SERVICES                      **PeiServices,
> >    IN EFI_PEI_MM_CONTROL_PPI                * This,
> >    IN BOOLEAN                               Periodic OPTIONAL
> > @@ -80,9 +80,9 @@ EFI_STATUS
> >  ///  platform hardware that generates an MMI. There are often I/O por=
ts
> > that, when accessed, will
> >  ///  generate the MMI. Also, the hardware optionally supports the
> periodic
> > generation of these signals.
> >  ///
> > -struct _PEI_MM_CONTROL_PPI {
> > -  PEI_MM_ACTIVATE    Trigger;
> > -  PEI_MM_DEACTIVATE  Clear;
> > +struct _EFI_PEI_MM_CONTROL_PPI {
> > +  EFI_PEI_MM_ACTIVATE    Trigger;
> > +  EFI_PEI_MM_DEACTIVATE  Clear;
> >  };
> >
> >  extern EFI_GUID gEfiPeiMmControlPpiGuid;
> > --
> > 2.31.1.windows.1
> >
> >
> >
> >
> >
>=20
>=20
>=20
>=20
>=20
>=20
>=20