From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by mx.groups.io with SMTP id smtpd.web09.2079.1657851789937349439 for ; Thu, 14 Jul 2022 19:23:10 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=RI9cb61f; spf=pass (domain: intel.com, ip: 192.55.52.43, mailfrom: ray.ni@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1657851789; x=1689387789; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=fYoSBfMJrBxURT+CCoA35jHlHiGRhWxp+Ofr1TwMCG0=; b=RI9cb61fx96fu2dPIpP4fTKN4nRePcnC+ZUPY+LB8AGV0R+JC1dz97lp 2BmvYo/nR7xY67LQLJS5r0cnaFARMidpp00b4KS39Fi1v2ugQurYAm3Eo ot0iDn+Rew3eH51laztWyZ7BbzIkP/wqGIQbFp/vKDADJdWC/IXkoj9hq dv92QC0PpUnjcHdjAIoFmt9VWHW7WaYEzl8JXTgivFwDqa8r5RWBmYgcD pr4fe1Dd/uGnRkCtxdrdkddhsqRiwcBUf3q/ihucLQXd2ji6kudd169yd f05kxDBpCMTvbhGET36XN2ig3Lrkn1fYVrtkF6Hre365U/xjFgedaRzlT A==; X-IronPort-AV: E=McAfee;i="6400,9594,10408"; a="371998654" X-IronPort-AV: E=Sophos;i="5.92,272,1650956400"; d="scan'208";a="371998654" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Jul 2022 19:23:09 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.92,272,1650956400"; d="scan'208";a="571339580" Received: from fmsmsx602.amr.corp.intel.com ([10.18.126.82]) by orsmga006.jf.intel.com with ESMTP; 14 Jul 2022 19:23:09 -0700 Received: from fmsmsx609.amr.corp.intel.com (10.18.126.89) by fmsmsx602.amr.corp.intel.com (10.18.126.82) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27; Thu, 14 Jul 2022 19:23:09 -0700 Received: from FMSEDG603.ED.cps.intel.com (10.1.192.133) by fmsmsx609.amr.corp.intel.com (10.18.126.89) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27 via Frontend Transport; Thu, 14 Jul 2022 19:23:09 -0700 Received: from NAM04-DM6-obe.outbound.protection.outlook.com (104.47.73.44) by edgegateway.intel.com (192.55.55.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2308.27; Thu, 14 Jul 2022 19:23:08 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=O73dZaR6MB6OXVSUYFbMg0vtqcwMAywk44GAaBaTx2DDRq/oB234UzNXw1okGzyLViEI+fFOyMZBKpPT3tXhtA4hcicB6yfqJdhp2PaPLr9sFeokEMDuBijITqDMTdIemcph+hx3VObdrV14YiA5ucGjA6mrDa7C9Ax/iD9Cz9m5hgv3JqEgcg8EtivDRTN/n+OaT7fUXxZr6Xj2MlhkoHI2IUZKbe0yH92M3OkLe+3jBtfvyR0xnBByiRh7Bj7hZnjVTj5LfNHupqbSBzOpi7YWIaGQ5YntShP4tHwJY6SKpCbyrsOjQdurJtM9+dCfYh0I7N89YZ6yJthkn/dUoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=H6bsEFsypJq9RNFj1ZMew0rJfhtDzmtncYuHxTH/HT4=; b=B5JjnzvN9Oj9mQatBQEffDEmtn4KofgPKDqSkJHeXbjeVU/6qi2NcHLMqHkljlnnq5u6KhK+jFswRiY4vO1VKbPVo9cKANMQI9aJ9zzgq0qg7YaMOhGMfMQjEa6/snL8TLbx92DoKhMysDL0QpuEgSqh4QKhsTKqjpd1PGGGfCUu5cKJGSZZafGYC+OaidI8KZEOL2wakZaznf5xp/Eqv12PyRJC+tRYcZ6Q44kqWmizO/NjrVWq18xQbTsS9qjr0sgtFgu88GvLbr6iTXq+HqRfEyIjZ2G9Rxv8qs5gq6hXeWUMUYOsi9Sfq/PrBtGZejYhwB24iTOErJZnFV4Qag== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Received: from MWHPR11MB1631.namprd11.prod.outlook.com (2603:10b6:301:10::10) by DM5PR11MB1673.namprd11.prod.outlook.com (2603:10b6:4:c::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5438.14; Fri, 15 Jul 2022 02:23:06 +0000 Received: from MWHPR11MB1631.namprd11.prod.outlook.com ([fe80::991b:97a0:7836:5174]) by MWHPR11MB1631.namprd11.prod.outlook.com ([fe80::991b:97a0:7836:5174%10]) with mapi id 15.20.5438.014; Fri, 15 Jul 2022 02:23:06 +0000 From: "Ni, Ray" To: "Jiang, Guomin" , "devel@edk2.groups.io" CC: GuoMinJ , Andrew Fish Subject: Re: [Patch v2 04/11] EmulatorPkg: Remove All UGA Support Thread-Topic: [Patch v2 04/11] EmulatorPkg: Remove All UGA Support Thread-Index: AQHYl+1yhz2YD0JncEOyGhc/xpwA5a1+s1BQ Date: Fri, 15 Jul 2022 02:23:06 +0000 Message-ID: References: <20220715015106.1553-1-guomin.jiang@intel.com> <20220715015106.1553-5-guomin.jiang@intel.com> In-Reply-To: <20220715015106.1553-5-guomin.jiang@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 1d130269-5956-46ed-990e-08da6608f3e9 x-ms-traffictypediagnostic: DM5PR11MB1673:EE_ x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: OdgTbgYK+yfXHfPFYqKyG4KGsjIKBeOx2lRg8hWpv7xZsu0RWg11gfHTcFVNJGxeiyRBS0qQ3xMXAu3j/FK+eWbTxXhDMA512C9pv8LRLV+W2mOwSIxaOhCvjyQoSx6Gu3A/kuBoN4dmyrmdy95mr2Z9vSV723E9ALgLcMx9/6Mf3kOC0iqYtEP44rLUTi3FkxvLPmq5En903Hd1DICfe8yRdjjcVDdwjz3n0vO4GtAL6MIklE4J5mRTsP3CAMet04vLOI+NYAPMQonbkt9m3E+xo8+flRW9SUs55aANEJlng9YjnoWXEGTQvL3HrMpo8CYN2o/wf3eCEJutLA/zBVUNrauDV3xZqmqv42OzjqtVoCYOikVAkKpAbTVVQHRVCZkkTi+iM21pj66bcJaYlwzVOK4DGR97vlSBVy93+ruOKgY2ghyXCVL+lksYeWBzxPHil8axTA2SSgAOh6WhsNLLaP2eUFMB0iEnDIkUJfzXcnqNoa0Q8JnFsejlDNSttlyFqOnxpwZEtvsBWErRG8hnuexUzowYxoq+XUvIhS3lDsek/6IK/1Hb/lVwJHKYy5YROqjE+PW38Gbh+Rbl3kjOBSlUvFh5t+Wrene3XY8Go9qMRq2ouFlllYPFZOkc6aMKydRylzc9kueU7R/bNqH1cdJc7EfjI5Byw3bd5ReQ85Cz/9BTLgP8PdinAPXh+2R7jE2wG8qKad6ne6AzSbxljXCZkVtWFBuztk+JvTDrJ1Mmukbl+ooY+fAsyu5Xra762TFiOZJRaNI4t8aAlnvKLZjdTLirUZKvdK5W0jvn56B0X92WrlU1GHcc0KbVIWL1P8BqH4Vq8CYKAWqYZo3f/Lw/YizFkibhwfCdkxs= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR11MB1631.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(396003)(376002)(346002)(39860400002)(136003)(366004)(64756008)(71200400001)(966005)(478600001)(38100700002)(82960400001)(6506007)(66946007)(53546011)(7696005)(41300700001)(9686003)(33656002)(26005)(19627235002)(54906003)(66476007)(66556008)(186003)(110136005)(316002)(76116006)(55016003)(30864003)(2906002)(8936002)(4326008)(52536014)(5660300002)(8676002)(86362001)(38070700005)(83380400001)(66446008)(122000001)(579004);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?PKn9dcv3UU5saN/6/ucr3jktnMKN1gtqjU7ZgZmLRC7W76kVTsBb1h2HQyEm?= =?us-ascii?Q?m6HZDFGNZM2Rc+Ex2hHqZu+KuVJHNcxkBvNMbAhMmQpsl60lHFgvjnhDmeWc?= =?us-ascii?Q?SC4QhZnZlQcmvCaL7ki0ZWf4uZMbPwyJPTovsoTU/yzhW9msLiKOzAwJObpg?= =?us-ascii?Q?ZdmE3yhGrO3aFXOkVLlVrpaMq21ooMpuP35jyQPpxSQ1RxiFmeNRtO/DWiYP?= =?us-ascii?Q?yfzwcmYURAlXH/h4plemnkg6hUeXv7Qvddb0q/lkJtzy9+z1LbFq2r/aDuRj?= =?us-ascii?Q?p0rP5chCHDgFyppsM3vGmvpEXgS6cmGDxb8Xc51lcoa5n2xnWRBVy8BhhEE0?= =?us-ascii?Q?XMFKiicc7Fv3FGI2BkVGLI5CV83+g2ocZBK38eKxKob/ApN7Ui3ZrJNXVPY4?= =?us-ascii?Q?oDy23RU3stNA4r9Ja+3srhd4xzTEHtkn4arceURtDUoDtqvinLXe0kr2bm/p?= =?us-ascii?Q?6zuT+XKP6/Jt4SNmqrpl5ttei+Lxixyv9+uP4GhUe2NILmjA2nlcSyx2WfdP?= =?us-ascii?Q?IckjJvxslCCWpulJMl/ygR8vyIE5gkkvurhQWJIdesmYFxAh8q5L03UXG76Y?= =?us-ascii?Q?raHcT/VXnvHxxDXh3K+DWcL2I1Z9sJTYPd7hcaG6HxWmyaVXTVCOp1XINVrf?= =?us-ascii?Q?Q/1817tJJLW0vx17BY2ZHhmGnnZZiyZT5WFsRrxtGDWG6hKEbhKV9QzVYIDM?= =?us-ascii?Q?f0YvAe5t8xl9cmKMEgI/lqA86Ksp8fO4MVG9nKnYweg0FYARJcp7npKeB7Sg?= =?us-ascii?Q?0LtipQEBWBny+WvxpPmHweFWPLVLnMnY7u4YjOaCPN93X/3iOI9pwSCU/SS6?= =?us-ascii?Q?tv9HSRUTIwzToXXijDVTKuB1d3Kh58Fm24R4+F5g3Dd8c7mPZJtWIP45jmWk?= =?us-ascii?Q?uuSX6MQZhgsirLEp4eOWb5HK6V186g4SV1A7nG4oLUFZVHcMVUIgVVP8Dl0J?= =?us-ascii?Q?2DqVeKJs7p+ZrveBDGhEIfY44V+cUjRqeEoBkN3Yp2XWF6kbsYU1dQVyMmtU?= =?us-ascii?Q?BAFOlCuSBp2HH0HKOuBjnG0zH1Ob8DRBjP4PRLQsBfB4sr3U7nPR4OD9xUCu?= =?us-ascii?Q?PZOzi0tKxxonzWOKkQ9qSYqiLnT/e7+iqlHjan+iruXGUsvGcBhzxkwVL3ZF?= =?us-ascii?Q?z+iySVzBNz1BgumGnZYXVEppZXGSEfA7O96jldyOKSbRXG1m7wuN/tI0V6H9?= =?us-ascii?Q?Ob4atwfsvz16bFwNmUhp/5HUsM9XWtuHb/a73xvV/QQ2v+8z3wMUbstX+zcR?= =?us-ascii?Q?e0C/RRFzdaJzm+2tgFzLFI1o+5QZ4mm2DOr2NHOc2Xqyyg8FdhGzIvUFa1vX?= =?us-ascii?Q?jBK4pAZH5VGmKbazZzi7rP0z2nhcn6DIjZjTNA6CXhGPJT0KwMlWsT5AHF7h?= =?us-ascii?Q?fjKrw2COkwBW80a8LvaOU011jLZT+H1CMR9OBQeM4N5k7YHjAjmTy0Iyh60O?= =?us-ascii?Q?aM/J0gFVaSjl3RouNQTBT5BW2Sb7L7q+YmafYnJ0a079iIUp45ihNWGDSh3K?= =?us-ascii?Q?gL2/ze8dRTCGMsEbYwgKgV/1WvypnPkdwZbM/uJU1zqhXZU7cvKmaT68IJf0?= =?us-ascii?Q?Ry66bt+NiHFUNwS/9kM=3D?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MWHPR11MB1631.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1d130269-5956-46ed-990e-08da6608f3e9 X-MS-Exchange-CrossTenant-originalarrivaltime: 15 Jul 2022 02:23:06.4134 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 5BVBzKXUSSxO3JUnnSqGc49K5OHnO30pOpiWg8JPaK5d9lOp0640t2wY8gYYcgJ4srSVqLYGgaqAkOlVGLyqcg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR11MB1673 Return-Path: ray.ni@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Guomin, Did you try booting the Emulator Win and Linux with this change? > -----Original Message----- > From: Jiang, Guomin > Sent: Friday, July 15, 2022 9:51 AM > To: devel@edk2.groups.io > Cc: GuoMinJ ; Andrew Fish ; Ni, = Ray > Subject: [Patch v2 04/11] EmulatorPkg: Remove All UGA Support >=20 > From: GuoMinJ >=20 > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2368 >=20 > Remove All UGA Support in EmulatorPkg. >=20 > Signed-off-by: Guomin Jiang > Cc: Andrew Fish > Cc: Ray Ni > --- > EmulatorPkg/EmuGopDxe/Gop.h | 10 +-- > EmulatorPkg/EmuGopDxe/GopScreen.c | 14 ++-- > EmulatorPkg/Include/Protocol/EmuFileSystem.h | 24 +++--- > .../Include/Protocol/EmuGraphicsWindow.h | 18 ++-- > .../Library/PlatformBmLib/PlatformBm.h | 4 +- > .../Library/PlatformBmLib/PlatformBmData.c | 6 +- > EmulatorPkg/Unix/Host/Gasket.h | 12 +-- > EmulatorPkg/Unix/Host/Host.h | 3 +- > EmulatorPkg/Unix/Host/Ia32/Gasket.S | 2 +- > EmulatorPkg/Unix/Host/X11GraphicsWindow.c | 82 +++++++++---------- > EmulatorPkg/Unix/Host/X64/Gasket.S | 2 +- > EmulatorPkg/Win/Host/WinGopScreen.c | 10 +-- > 12 files changed, 92 insertions(+), 95 deletions(-) >=20 > diff --git a/EmulatorPkg/EmuGopDxe/Gop.h b/EmulatorPkg/EmuGopDxe/Gop.h > index 7f7dc4e8eb9f..59ebfda912eb 100644 > --- a/EmulatorPkg/EmuGopDxe/Gop.h > +++ b/EmulatorPkg/EmuGopDxe/Gop.h > @@ -1,13 +1,13 @@ > /*++ @file >=20 > -Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.
> +Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.
> Portions copyright (c) 2010,Apple Inc. All rights reserved.
> SPDX-License-Identifier: BSD-2-Clause-Patent >=20 > **/ >=20 > -#ifndef __UGA_H_ > -#define __UGA_H_ > +#ifndef GOP_H_ > +#define GOP_H_ >=20 > #include >=20 > @@ -60,8 +60,6 @@ typedef struct { > extern EFI_DRIVER_BINDING_PROTOCOL gEmuGopDriverBinding; > extern EFI_COMPONENT_NAME_PROTOCOL gEmuGopComponentName; >=20 > -#define EMU_UGA_CLASS_NAME L"EmuGopWindow" > - > #define GOP_PRIVATE_DATA_SIGNATURE SIGNATURE_32 ('G', 'o', 'p', 'N') > typedef struct { > UINT64 Signature; > @@ -83,7 +81,7 @@ typedef struct { > GOP_MODE_DATA *ModeData; >=20 > // > - // UGA Private Data knowing when to start hardware > + // Private Data knowing when to start hardware > // > BOOLEAN HardwareNeedsStarting; >=20 > diff --git a/EmulatorPkg/EmuGopDxe/GopScreen.c b/EmulatorPkg/EmuGopDxe/Go= pScreen.c > index 88d95b88e162..113b496861b4 100644 > --- a/EmulatorPkg/EmuGopDxe/GopScreen.c > +++ b/EmulatorPkg/EmuGopDxe/GopScreen.c > @@ -10,7 +10,7 @@ Module Name: >=20 > Abstract: >=20 > - This file produces the graphics abstration of UGA. It is called by > + This file produces the graphics abstration of GOP. It is called by > EmuGopDriver.c file which deals with the EFI 1.1 driver model. > This file just does graphics. >=20 > @@ -209,7 +209,7 @@ EmuGopBlt ( > // the number of bytes in each row can be computed. > // > if (Delta =3D=3D 0) { > - Delta =3D Width * sizeof (EFI_UGA_PIXEL); > + Delta =3D Width * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL); > } >=20 > // > @@ -220,8 +220,8 @@ EmuGopBlt ( > OriginalTPL =3D gBS->RaiseTPL (TPL_NOTIFY); >=20 > // > - // Pack UGA Draw protocol parameters to EMU_GRAPHICS_WINDOWS__BLT_ARGS= structure to adapt to > - // GopBlt() API of Unix UGA IO protocol. > + // Pack GOP protocol parameters to EMU_GRAPHICS_WINDOWS__BLT_ARGS stru= cture to adapt to > + // GopBlt() API of GOP protocol. > // > GopBltArgs.DestinationX =3D DestinationX; > GopBltArgs.DestinationY =3D DestinationY; > @@ -232,8 +232,8 @@ EmuGopBlt ( > GopBltArgs.Delta =3D Delta; > Status =3D Private->EmuGraphicsWindow->Blt ( > Private->EmuGr= aphicsWindow, > - (EFI_UGA_PIXEL= *)BltBuffer, > - (EFI_UGA_BLT_O= PERATION)BltOperation, > + BltBuffer, > + BltOperation, > &GopBltArgs > ); >=20 > @@ -384,7 +384,7 @@ ShutdownGopEvent ( >=20 > Routine Description: >=20 > - This is the UGA screen's callback notification function for exit-boot-= services. > + This is the screen's callback notification function for exit-boot-serv= ices. > All we do here is call EmuGopDestructor(). >=20 > Arguments: > diff --git a/EmulatorPkg/Include/Protocol/EmuFileSystem.h b/EmulatorPkg/I= nclude/Protocol/EmuFileSystem.h > index 15de43ac022e..062508fafc9d 100644 > --- a/EmulatorPkg/Include/Protocol/EmuFileSystem.h > +++ b/EmulatorPkg/Include/Protocol/EmuFileSystem.h > @@ -7,19 +7,19 @@ >=20 > UEFI 2.0 can boot from any valid EFI image contained in a SimpleFileSy= stem. >=20 > -Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.
> +Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.
> Portions copyright (c) 2011, Apple Inc. All rights reserved. > SPDX-License-Identifier: BSD-2-Clause-Patent >=20 > **/ >=20 > -#ifndef _EMU_UGA_IO_H_ > -#define _EMU_UGA_IO_H_ > +#ifndef EMU_GRAPHICS_WINDOW_H_ > +#define EMU_GRAPHICS_WINDOW_H_ >=20 > #include > #include > #include > -#include > +#include >=20 > #define EMU_GRAPHICS_WINDOW_PROTOCOL_GUID \ > { 0x30FD316A, 0x6728, 0x2E41, { 0xA6, 0x90, 0x0D, 0x13, 0x33, 0xD8, 0xC= A, 0xC1 } } > @@ -29,13 +29,13 @@ typedef struct _EMU_GRAPHICS_WINDOW_PROTOCOL EMU_GRAP= HICS_WINDOW_PROTOCOL; > typedef > EFI_STATUS > (EFIAPI *EMU_GRAPHICS_WINDOWS_CLOSE)( > - EMU_GRAPHICS_WINDOW_PROTOCOL *Uga > + EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsWindows > ); >=20 > typedef > EFI_STATUS > (EFIAPI *EMU_GRAPHICS_WINDOWS_SIZE)( > - EMU_GRAPHICS_WINDOW_PROTOCOL *Uga, > + EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsWindows, > UINT32 Width, > UINT32 Height > ); > @@ -43,13 +43,13 @@ EFI_STATUS > typedef > EFI_STATUS > (EFIAPI *EMU_GRAPHICS_WINDOWS_CHECK_KEY)( > - EMU_GRAPHICS_WINDOW_PROTOCOL *Uga > + EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsWindows > ); >=20 > typedef > EFI_STATUS > (EFIAPI *EMU_GRAPHICS_WINDOWS_GET_KEY)( > - EMU_GRAPHICS_WINDOW_PROTOCOL *Uga, > + EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsWindows, > EFI_KEY_DATA *key > ); >=20 > @@ -88,10 +88,10 @@ typedef struct { > typedef > EFI_STATUS > (EFIAPI *EMU_GRAPHICS_WINDOWS_BLT)( > - IN EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsWindows, > - IN EFI_UGA_PIXEL *BltBuffer OPTIONAL, > - IN EFI_UGA_BLT_OPERATION BltOperation, > - IN EMU_GRAPHICS_WINDOWS__BLT_ARGS *Args > + IN EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsWindows, > + IN EFI_GRAPHICS_OUTPUT_BLT_PIXEL *BltBuffer OPTIONAL, > + IN EFI_GRAPHICS_OUTPUT_BLT_OPERATION BltOperation, > + IN EMU_GRAPHICS_WINDOWS__BLT_ARGS *Args > ); >=20 > typedef > diff --git a/EmulatorPkg/Include/Protocol/EmuGraphicsWindow.h > b/EmulatorPkg/Include/Protocol/EmuGraphicsWindow.h > index 7c495b25eb1b..ed7b71611f90 100644 > --- a/EmulatorPkg/Include/Protocol/EmuGraphicsWindow.h > +++ b/EmulatorPkg/Include/Protocol/EmuGraphicsWindow.h > @@ -6,13 +6,13 @@ SPDX-License-Identifier: BSD-2-Clause-Patent >=20 > **/ >=20 > -#ifndef _EMU_UGA_IO_H_ > -#define _EMU_UGA_IO_H_ > +#ifndef EMU_GRAPHICS_WINDOW_H_ > +#define EMU_GRAPHICS_WINDOW_H_ >=20 > #include > #include > #include > -#include > +#include >=20 > #define EMU_GRAPHICS_WINDOW_PROTOCOL_GUID \ > { 0x30FD316A, 0x6728, 0x2E41, { 0xA6, 0x90, 0x0D, 0x13, 0x33, 0xD8, 0xC= A, 0xC1 } } > @@ -22,13 +22,13 @@ typedef struct _EMU_GRAPHICS_WINDOW_PROTOCOL EMU_GRAP= HICS_WINDOW_PROTOCOL; > typedef > EFI_STATUS > (EFIAPI *EMU_GRAPHICS_WINDOWS_CLOSE)( > - EMU_GRAPHICS_WINDOW_PROTOCOL *Uga > + EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsWindow > ); >=20 > typedef > EFI_STATUS > (EFIAPI *EMU_GRAPHICS_WINDOWS_SIZE)( > - EMU_GRAPHICS_WINDOW_PROTOCOL *Uga, > + EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsWindow, > UINT32 Width, > UINT32 Height > ); > @@ -36,13 +36,13 @@ EFI_STATUS > typedef > EFI_STATUS > (EFIAPI *EMU_GRAPHICS_WINDOWS_CHECK_KEY)( > - EMU_GRAPHICS_WINDOW_PROTOCOL *Uga > + EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsWindow > ); >=20 > typedef > EFI_STATUS > (EFIAPI *EMU_GRAPHICS_WINDOWS_GET_KEY)( > - EMU_GRAPHICS_WINDOW_PROTOCOL *Uga, > + EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsWindow, > EFI_KEY_DATA *key > ); >=20 > @@ -83,8 +83,8 @@ typedef > EFI_STATUS > (EFIAPI *EMU_GRAPHICS_WINDOWS_BLT)( > IN EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsWindows, > - IN EFI_UGA_PIXEL *BltBuffer OPTIONAL, > - IN EFI_UGA_BLT_OPERATION BltOperation, > + IN EFI_GRAPHICS_OUTPUT_BLT_PIXEL *BltBuffer OPTIONAL, > + IN EFI_GRAPHICS_OUTPUT_BLT_OPERATION BltOperation, > IN EMU_GRAPHICS_WINDOWS__BLT_ARGS *Args > ); >=20 > diff --git a/EmulatorPkg/Library/PlatformBmLib/PlatformBm.h b/EmulatorPkg= /Library/PlatformBmLib/PlatformBm.h > index b89ffd77e4de..462049e2b048 100644 > --- a/EmulatorPkg/Library/PlatformBmLib/PlatformBm.h > +++ b/EmulatorPkg/Library/PlatformBmLib/PlatformBm.h > @@ -1,6 +1,6 @@ > /*++ @file >=20 > -Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
> +Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.
> Portions copyright (c) 2011, Apple Inc. All rights reserved. > SPDX-License-Identifier: BSD-2-Clause-Patent >=20 > @@ -60,7 +60,7 @@ typedef struct { > EMU_VENDOR_DEVICE_PATH_NODE EmuBus; > EMU_VENDOR_DEVICE_PATH_NODE EmuGraphicsWindow; > EFI_DEVICE_PATH_PROTOCOL End; > -} EMU_PLATFORM_UGA_DEVICE_PATH; > +} EMU_PLATFORM_GRAPHICS_WINDOW_DEVICE_PATH; >=20 > // > // Platform BDS Functions > diff --git a/EmulatorPkg/Library/PlatformBmLib/PlatformBmData.c > b/EmulatorPkg/Library/PlatformBmLib/PlatformBmData.c > index efb03def37eb..b69c4728d1a7 100644 > --- a/EmulatorPkg/Library/PlatformBmLib/PlatformBmData.c > +++ b/EmulatorPkg/Library/PlatformBmLib/PlatformBmData.c > @@ -1,6 +1,6 @@ > /*++ @file >=20 > -Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
> +Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.
> Portions copyright (c) 2011, Apple Inc. All rights reserved. > SPDX-License-Identifier: BSD-2-Clause-Patent >=20 > @@ -8,7 +8,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent >=20 > #include "PlatformBm.h" >=20 > -EMU_PLATFORM_UGA_DEVICE_PATH gGopDevicePath =3D { > +EMU_PLATFORM_GRAPHICS_WINDOW_DEVICE_PATH gGopDevicePath =3D { > { > { > { > @@ -40,7 +40,7 @@ EMU_PLATFORM_UGA_DEVICE_PATH gGopDevicePath =3D { > gEndEntire > }; >=20 > -EMU_PLATFORM_UGA_DEVICE_PATH gGopDevicePath2 =3D { > +EMU_PLATFORM_GRAPHICS_WINDOW_DEVICE_PATH gGopDevicePath2 =3D { > { > { > { > diff --git a/EmulatorPkg/Unix/Host/Gasket.h b/EmulatorPkg/Unix/Host/Gaske= t.h > index 6dafc903cfce..1ffdfb334524 100644 > --- a/EmulatorPkg/Unix/Host/Gasket.h > +++ b/EmulatorPkg/Unix/Host/Gasket.h > @@ -1,7 +1,7 @@ > /** @file >=20 > Copyright (c) 2008 - 2011, Apple Inc. All rights reserved.
> - Copyright (c) 2011 - 2019, Intel Corporation. All rights reserved.
> + Copyright (c) 2011 - 2022, Intel Corporation. All rights reserved.
>=20 > SPDX-License-Identifier: BSD-2-Clause-Patent >=20 > @@ -200,7 +200,7 @@ ReverseGasketUint64Uint64 ( > ); >=20 > // > -// Gasket functions for EFI_EMU_UGA_IO_PROTOCOL > +// Gasket functions for EFI_EMU_GRAPHICS_WINDOW_PROTOCOL > // >=20 > EFI_STATUS > @@ -243,10 +243,10 @@ GasketX11RegisterKeyNotify ( > EFI_STATUS > EFIAPI > GasketX11Blt ( > - IN EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsWindows, > - IN EFI_UGA_PIXEL *BltBuffer OPTIONAL, > - IN EFI_UGA_BLT_OPERATION BltOperation, > - IN EMU_GRAPHICS_WINDOWS__BLT_ARGS *Args > + IN EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsWindows, > + IN EFI_GRAPHICS_OUTPUT_BLT_PIXEL *BltBuffer OPTIONAL, > + IN EFI_GRAPHICS_OUTPUT_BLT_OPERATION BltOperation, > + IN EMU_GRAPHICS_WINDOWS__BLT_ARGS *Args > ); >=20 > EFI_STATUS > diff --git a/EmulatorPkg/Unix/Host/Host.h b/EmulatorPkg/Unix/Host/Host.h > index 0c81cdfc01f5..ff30f5dce567 100644 > --- a/EmulatorPkg/Unix/Host/Host.h > +++ b/EmulatorPkg/Unix/Host/Host.h > @@ -1,6 +1,6 @@ > /*++ @file >=20 > -Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.
> +Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.
> Portions copyright (c) 2008 - 2011, Apple Inc. All rights reserved.
>=20 > SPDX-License-Identifier: BSD-2-Clause-Patent > @@ -106,7 +106,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent > #include > #include > #include > -#include > #include >=20 > #include > diff --git a/EmulatorPkg/Unix/Host/Ia32/Gasket.S b/EmulatorPkg/Unix/Host/= Ia32/Gasket.S > index 36197ff26028..6fcdd265cf30 100644 > --- a/EmulatorPkg/Unix/Host/Ia32/Gasket.S > +++ b/EmulatorPkg/Unix/Host/Ia32/Gasket.S > @@ -371,7 +371,7 @@ ASM_PFX(GasketSecEmuThunkAddress): > ret >=20 > // > -// Gasket functions for EFI_EMU_UGA_IO_PROTOCOL > +// Gasket functions for EFI_EMU_GRAPHICS_WINDOW_PROTOCOL > // >=20 > ASM_GLOBAL ASM_PFX(GasketX11Size) > diff --git a/EmulatorPkg/Unix/Host/X11GraphicsWindow.c b/EmulatorPkg/Unix= /Host/X11GraphicsWindow.c > index a30cc19dbe0a..b3880e198855 100644 > --- a/EmulatorPkg/Unix/Host/X11GraphicsWindow.c > +++ b/EmulatorPkg/Unix/Host/X11GraphicsWindow.c > @@ -1,6 +1,6 @@ > /*++ @file >=20 > -Copyright (c) 2004 - 2019, Intel Corporation. All rights reserved.
> +Copyright (c) 2004 - 2022, Intel Corporation. All rights reserved.
> Portions copyright (c) 2008 - 2011, Apple Inc. All rights reserved.
>=20 > SPDX-License-Identifier: BSD-2-Clause-Patent > @@ -700,8 +700,8 @@ HandleEvents ( >=20 > unsigned long > X11PixelToColor ( > - IN GRAPHICS_IO_PRIVATE *Drv, > - IN EFI_UGA_PIXEL pixel > + IN GRAPHICS_IO_PRIVATE *Drv, > + IN EFI_GRAPHICS_OUTPUT_BLT_PIXEL pixel > ) > { > return ((pixel.Red >> Drv->r.csize) << Drv->r.shift) > @@ -709,15 +709,15 @@ X11PixelToColor ( > | ((pixel.Blue >> Drv->b.csize) << Drv->b.shift); > } >=20 > -EFI_UGA_PIXEL > +EFI_GRAPHICS_OUTPUT_BLT_PIXEL > X11ColorToPixel ( > IN GRAPHICS_IO_PRIVATE *Drv, > IN unsigned long val > ) > { > - EFI_UGA_PIXEL Pixel; > + EFI_GRAPHICS_OUTPUT_BLT_PIXEL Pixel; >=20 > - memset (&Pixel, 0, sizeof (EFI_UGA_PIXEL)); > + memset (&Pixel, 0, sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL)); >=20 > // Truncation not an issue since X11 and EFI are both using 8 bits per= color > Pixel.Red =3D (val >> Drv->r.shift) << Drv->r.csize; > @@ -782,7 +782,7 @@ X11KeySetState ( > if ((Drv->KeyState.KeyToggleState & EFI_CAPS_LOCK_ACTIVE) =3D=3D 0) = { > // > // We could create an XKeyEvent and send a XK_Caps_Lock to > - // the UGA/GOP Window > + // the GOP Window > // > } > } > @@ -812,32 +812,32 @@ X11RegisterKeyNotify ( >=20 > EFI_STATUS > X11Blt ( > - IN EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsIo, > - IN EFI_UGA_PIXEL *BltBuffer OPTIONAL, > - IN EFI_UGA_BLT_OPERATION BltOperation, > - IN EMU_GRAPHICS_WINDOWS__BLT_ARGS *Args > + IN EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsIo, > + IN EFI_GRAPHICS_OUTPUT_BLT_PIXEL *BltBuffer OPTIONAL, > + IN EFI_GRAPHICS_OUTPUT_BLT_OPERATION BltOperation, > + IN EMU_GRAPHICS_WINDOWS__BLT_ARGS *Args > ) > { > - GRAPHICS_IO_PRIVATE *Private; > - UINTN DstY; > - UINTN SrcY; > - UINTN DstX; > - UINTN SrcX; > - UINTN Index; > - EFI_UGA_PIXEL *Blt; > - UINT8 *Dst; > - UINT8 *Src; > - UINTN Nbr; > - unsigned long Color; > - XEvent ev; > + GRAPHICS_IO_PRIVATE *Private; > + UINTN DstY; > + UINTN SrcY; > + UINTN DstX; > + UINTN SrcX; > + UINTN Index; > + EFI_GRAPHICS_OUTPUT_BLT_PIXEL *Blt; > + UINT8 *Dst; > + UINT8 *Src; > + UINTN Nbr; > + unsigned long Color; > + XEvent ev; >=20 > Private =3D (GRAPHICS_IO_PRIVATE *)GraphicsIo; >=20 > // > // Check bounds > // > - if ( (BltOperation =3D=3D EfiUgaVideoToBltBuffer) > - || (BltOperation =3D=3D EfiUgaVideoToVideo)) > + if ( (BltOperation =3D=3D EfiBltVideoToBltBuffer) > + || (BltOperation =3D=3D EfiBltVideoToVideo)) > { > // > // Source is Video. > @@ -851,9 +851,9 @@ X11Blt ( > } > } >=20 > - if ( (BltOperation =3D=3D EfiUgaBltBufferToVideo) > - || (BltOperation =3D=3D EfiUgaVideoToVideo) > - || (BltOperation =3D=3D EfiUgaVideoFill)) > + if ( (BltOperation =3D=3D EfiBltBufferToVideo) > + || (BltOperation =3D=3D EfiBltVideoToVideo) > + || (BltOperation =3D=3D EfiBltVideoFill)) > { > // > // Destination is Video > @@ -868,32 +868,32 @@ X11Blt ( > } >=20 > switch (BltOperation) { > - case EfiUgaVideoToBltBuffer: > - Blt =3D (EFI_UGA_PIXEL *)((UINT8 *)BltBuffer + (Args->Des= tinationY * Args->Delta) + Args->DestinationX * sizeof > (EFI_UGA_PIXEL)); > - Args->Delta -=3D Args->Width * sizeof (EFI_UGA_PIXEL); > + case EfiBltVideoToBltBuffer: > + Blt =3D (EFI_GRAPHICS_OUTPUT_BLT_PIXEL *)((UINT8 *)BltBuf= fer + (Args->DestinationY * Args->Delta) + Args- > >DestinationX * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL)); > + Args->Delta -=3D Args->Width * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIX= EL); > for (SrcY =3D Args->SourceY; SrcY < (Args->Height + Args->SourceY)= ; SrcY++) { > for (SrcX =3D Args->SourceX; SrcX < (Args->Width + Args->SourceX= ); SrcX++) { > *Blt++ =3D X11ColorToPixel (Private, XGetPixel (Private->image= , SrcX, SrcY)); > } >=20 > - Blt =3D (EFI_UGA_PIXEL *)((UINT8 *)Blt + Args->Delta); > + Blt =3D (EFI_GRAPHICS_OUTPUT_BLT_PIXEL *)((UINT8 *)Blt + Args->D= elta); > } >=20 > break; > - case EfiUgaBltBufferToVideo: > - Blt =3D (EFI_UGA_PIXEL *)((UINT8 *)BltBuffer + (Args->Sou= rceY * Args->Delta) + Args->SourceX * sizeof > (EFI_UGA_PIXEL)); > - Args->Delta -=3D Args->Width * sizeof (EFI_UGA_PIXEL); > + case EfiBltBufferToVideo: > + Blt =3D (EFI_GRAPHICS_OUTPUT_BLT_PIXEL *)((UINT8 *)BltBuf= fer + (Args->SourceY * Args->Delta) + Args- > >SourceX * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL)); > + Args->Delta -=3D Args->Width * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIX= EL); > for (DstY =3D Args->DestinationY; DstY < (Args->Height + Args->Des= tinationY); DstY++) { > for (DstX =3D Args->DestinationX; DstX < (Args->Width + Args->De= stinationX); DstX++) { > XPutPixel (Private->image, DstX, DstY, X11PixelToColor (Privat= e, *Blt)); > Blt++; > } >=20 > - Blt =3D (EFI_UGA_PIXEL *)((UINT8 *)Blt + Args->Delta); > + Blt =3D (EFI_GRAPHICS_OUTPUT_BLT_PIXEL *)((UINT8 *)Blt + Args->D= elta); > } >=20 > break; > - case EfiUgaVideoToVideo: > + case EfiBltVideoToVideo: > Dst =3D Private->image_data + (Args->DestinationX << Private->pixe= l_shift) > + Args->DestinationY * Private->line_bytes; > Src =3D Private->image_data + (Args->SourceX << Private->pixel_shi= ft) > @@ -920,7 +920,7 @@ X11Blt ( > } >=20 > break; > - case EfiUgaVideoFill: > + case EfiBltVideoFill: > Color =3D X11PixelToColor (Private, *BltBuffer); > for (DstY =3D Args->DestinationY; DstY < (Args->Height + Args->Des= tinationY); DstY++) { > for (DstX =3D Args->DestinationX; DstX < (Args->Width + Args->De= stinationX); DstX++) { > @@ -937,7 +937,7 @@ X11Blt ( > // Refresh screen. > // > switch (BltOperation) { > - case EfiUgaVideoToVideo: > + case EfiBltVideoToVideo: > XCopyArea ( > Private->display, > Private->win, > @@ -960,7 +960,7 @@ X11Blt ( > } >=20 > break; > - case EfiUgaVideoFill: > + case EfiBltVideoFill: > Color =3D X11PixelToColor (Private, *BltBuffer); > XSetForeground (Private->display, Private->gc, Color); > XFillRectangle ( > @@ -974,7 +974,7 @@ X11Blt ( > ); > XFlush (Private->display); > break; > - case EfiUgaBltBufferToVideo: > + case EfiBltBufferToVideo: > Redraw (Private, Args->DestinationX, Args->DestinationY, Args->Wid= th, Args->Height); > break; > default: > diff --git a/EmulatorPkg/Unix/Host/X64/Gasket.S b/EmulatorPkg/Unix/Host/X= 64/Gasket.S > index 030faa8e4c36..1b4614ab618d 100644 > --- a/EmulatorPkg/Unix/Host/X64/Gasket.S > +++ b/EmulatorPkg/Unix/Host/X64/Gasket.S > @@ -427,7 +427,7 @@ ASM_PFX(GasketSecEmuThunkAddress): > ret >=20 > // > -// Gasket functions for EFI_EMU_UGA_IO_PROTOCOL > +// Gasket functions for EFI_EMU_GRAPHICS_WINDOW_PROTOCOL > // >=20 > ASM_GLOBAL ASM_PFX(GasketX11Size) > diff --git a/EmulatorPkg/Win/Host/WinGopScreen.c b/EmulatorPkg/Win/Host/W= inGopScreen.c > index 661573d7771c..69abcfc79564 100644 > --- a/EmulatorPkg/Win/Host/WinGopScreen.c > +++ b/EmulatorPkg/Win/Host/WinGopScreen.c > @@ -1,6 +1,6 @@ > /** @file >=20 > -Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
> +Copyright (c) 2006 - 2022, Intel Corporation. All rights reserved.
> SPDX-License-Identifier: BSD-2-Clause-Patent >=20 > Module Name: > @@ -396,10 +396,10 @@ WinNtWndSize ( > // TODO: Delta - add argument and description to function comment > EFI_STATUS > WinNtWndBlt ( > - IN EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsIo, > - IN EFI_UGA_PIXEL *BltBuffer OPTIONAL, > - IN EFI_UGA_BLT_OPERATION BltOperation, > - IN EMU_GRAPHICS_WINDOWS__BLT_ARGS *Args > + IN EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsIo, > + IN EFI_GRAPHICS_OUTPUT_BLT_PIXEL *BltBuffer OPTIONAL, > + IN EFI_GRAPHICS_OUTPUT_BLT_OPERATION BltOperation, > + IN EMU_GRAPHICS_WINDOWS__BLT_ARGS *Args > ) > { > RETURN_STATUS RStatus; > -- > 2.26.2.windows.1