From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by mx.groups.io with SMTP id smtpd.web12.35359.1658192058617866335 for ; Mon, 18 Jul 2022 17:54:18 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=BH6BUVI/; spf=pass (domain: intel.com, ip: 134.134.136.100, mailfrom: guomin.jiang@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1658192058; x=1689728058; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=wPW0J65k/kOAEtszRtxEBETi/j2MrY92tmyOjlsfLjM=; b=BH6BUVI/zQ01RAM7lge0XbBFZTvFUasVO9jSiWGdxVJ2AFvfzRjKGfY0 GqQ+aQLQybhZJSXXpGJT0wj04YBqZtck7Xq8HNYbsfUa1SJ6GG2w/gN8r DLGitHdBMb/249zpwOP+lafo4RtGLXhYR1LALPosppLcJ5lxyy6ziuksx WTOFtk16JPZsuEdXiA21KIAqHd3iaRxhaZtEbpEd3LNTwIJsyy7nn1i2p IAahHoDsYZCrhDtpQPz9oAxpCdWs2/XBE1A2o+/TsojM5xmlgL+wLdrIy E8KfHDx4WxjGg2IsqJn0s8wGJrX6H5v1x52RQIBU5U3mpzxEzRMqp3fWt Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10412"; a="350319322" X-IronPort-AV: E=Sophos;i="5.92,282,1650956400"; d="scan'208";a="350319322" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Jul 2022 17:54:18 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.92,282,1650956400"; d="scan'208";a="630125389" Received: from orsmsx605.amr.corp.intel.com ([10.22.229.18]) by orsmga001.jf.intel.com with ESMTP; 18 Jul 2022 17:54:18 -0700 Received: from orsmsx610.amr.corp.intel.com (10.22.229.23) by ORSMSX605.amr.corp.intel.com (10.22.229.18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27; Mon, 18 Jul 2022 17:54:17 -0700 Received: from ORSEDG601.ED.cps.intel.com (10.7.248.6) by orsmsx610.amr.corp.intel.com (10.22.229.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.27 via Frontend Transport; Mon, 18 Jul 2022 17:54:17 -0700 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (104.47.57.168) by edgegateway.intel.com (134.134.137.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2308.27; Mon, 18 Jul 2022 17:54:17 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jTw9sRRl1ctWDFo40AbTF+0v7dtWBcdE+i4owTNsieLzC6KgP1T061tZ6pA3zqhCihRD4JfGGx0nhaWoRT5tykFeTsE+UwuUTDd1exwgwM8jvSnu2oNPoGu4wi8FMadpzoiqTrW3xFv/fOqF5sAihgvWUdVI7Kk3cqs3HsXoB1SOvn59F5hsExt8LNahAyENfmz0MbczrpvQiR2sCJpJXI1G/Y4YhuBApApyA+OCzarjsJTddEvbbS8VFpp+S7PCJS4adqV58jCSsEjzDGvKdSmG6fqo75IF8lm5y0S3P61Fe6O2wlCbsNsHbhnmjkIWY51lQlTSVrENP7LO+3vdMw== 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=rz1D5HyvxGUxw0gKreBYVEgYJ+IucoIeTeLrNu9iyMw=; b=WSUNfoTFD1hPeUD6uBVMxn1iUzurFnRhBrWBUE50IhAkmpC2b+EPV+c53o6Eu9sLPylxzqBTpDpMzHTcmWqRNuYz22Q8p0zHHFY1zBQ4co+N9LIKTMSCR0rrC1VpQhMAUnt9v1gNFilKV9q3CzQf9jd5BUCeHrVPTRsWT0v3rjvBlW/gskPAR2nOsMZesioJfkN67GrsTzXbtqBLwO3tpGlNv8WOh6hIjS1hcaYfiTgJL+2VWM0tEQStwhLjk/aZ5ukQGKelN4tTkLBv+WrjqqXErA0gxWHnSjBHD+yAONqvI77sx9OUgteCbf91T+3FkGC/rCJQ7VLX0Iw5NwXDIw== 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 BL1PR11MB5953.namprd11.prod.outlook.com (2603:10b6:208:384::12) by DM6PR11MB4058.namprd11.prod.outlook.com (2603:10b6:5:193::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5438.14; Tue, 19 Jul 2022 00:54:15 +0000 Received: from BL1PR11MB5953.namprd11.prod.outlook.com ([fe80::c8e4:df15:18b:4139]) by BL1PR11MB5953.namprd11.prod.outlook.com ([fe80::c8e4:df15:18b:4139%3]) with mapi id 15.20.5438.023; Tue, 19 Jul 2022 00:54:15 +0000 From: "Guomin Jiang" To: "Ni, Ray" , "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+s1BQgAYwUlA= Date: Tue, 19 Jul 2022 00:54:15 +0000 Message-ID: References: <20220715015106.1553-1-guomin.jiang@intel.com> <20220715015106.1553-5-guomin.jiang@intel.com> In-Reply-To: Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-version: 11.6.500.17 dlp-product: dlpe-windows dlp-reaction: no-action 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: c5674ddf-3acd-4479-5b2c-08da692133da x-ms-traffictypediagnostic: DM6PR11MB4058:EE_ x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: rqPGOFloMIRV3dMN+wFm47ZmmBo1YJmt4dE/uZSXd+fO7Ypi6+xfMEDR6D1nCDoOHwbxYIvKzzTUsNSxUVHgfpV9m4qkaT4zUfhJxmSHMYz9Z7UAascBHDyLfzweYShsdy6E8WvTbAL2O4wUnXjxSRynK3/r1h8sZAXyrc4XntgrLsj3HfujjLWtzas1qfd0oBK6Lk403r1zK9KQFodhUDp0N6p1rwMTip025PW5m+0ESKLCOIfyG/gGXuA/K/Ff24jFFmgUo6e2gdSZl2aopOgXrCQCvCPJnIB0a8iyEqvYyk0K56YsOz9K22R0zmNqQ410uWTg+PrLRirqM+7mv8kcMaJLeIIG1VBk5Ebk3eRAoxGmh4Eolys+Zrblu9pqujPW1kC61TY2NHd9/nFX3JShs3dKminykxHpHfkZ+SqC1Qh8UNVfcSO98rYJ7JYzf+RbMefUGPGAbjGFgI3AM8FDS5qg+GftUH66AbHWit7JIHjuZZ1KY/gGRctm7Wf4aKfz04NH9RGGkugkmK/Gr2+OcyaXcFFXBG/1j3VyeywZcaV82DmTfLuIPp6NZzuB5tVx/ya5tYdMZv6z29gIaxwkgiUuOGDMIjiQIDSLEWsiCeRV0rCP83nDB+cf7OtTWUC02YKDWF2zmqa7xEZdVAc3Gi/twqdNJPdQtzYicmS/hd2gfRaUKHY6WErKvZ8RTfV29Z3WMo1XjAZMVi47XiTs/rUgh04cn3fVBAlWneyqjUpyumgOsz2ag3tnD8f/7cDaA/ZKIodCzKvVjKl2EN27ixrJ96yH3EP2D4w44ME9jW6V5c31GdgsFUHtR/JCLE+ao96HlfHSVv/b1bD7jx02DtKhdEw34phiaVdUDxKlmeULfRRqC9R9yEONHSdn x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BL1PR11MB5953.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(346002)(39860400002)(396003)(376002)(136003)(366004)(316002)(122000001)(19627235002)(76116006)(66946007)(66446008)(71200400001)(66556008)(8676002)(4326008)(55016003)(110136005)(82960400001)(54906003)(64756008)(38100700002)(38070700005)(186003)(33656002)(26005)(2906002)(41300700001)(66476007)(83380400001)(30864003)(9686003)(5660300002)(8936002)(966005)(7696005)(86362001)(52536014)(53546011)(6506007)(478600001)(559001)(579004);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?E+1w1bNS+IJ+jv6TDX4A0BXHypfeoeHDkkA/xM1j0Kxm5l37Kp2/aEvnmm4R?= =?us-ascii?Q?z/u2/A9CQtn/Q3dfyGoICDhe5qbUjt+L88jw5rMHfKFO4PPzIDqPZNjr9G2c?= =?us-ascii?Q?ypYmtU8pfVStHQuWfAbR0pzUqi0ezzurPEoPe9Q3myC/E/GgxqPMerIgRtSo?= =?us-ascii?Q?jYDrn3fIOgMAwhVDOPNmdCy5nYRi8jTjSQOsfhzouGBX2PW73oPlX0fNSBHT?= =?us-ascii?Q?U7jR0RtuQCpYmTg7PuOTNRqntoZiN3MX3ocbHupavrxQHopxZkVobu7KFqxF?= =?us-ascii?Q?FsgHo4rtcmvJs/UncpBLLAjeq83xNaOrFxykrNjHCl/eCzQCtOWQCEAhuBim?= =?us-ascii?Q?mS+Js2RCXZrx5DBGlm2WgQZEm27TV8wWq1e8iIO3upZcCjgAfclqmLd1ziVE?= =?us-ascii?Q?eso+skfxtIzZ+MKNHMgDc9nFzMRLpJq6wi7ERdcWsokiQKKIeItV15MlBLS3?= =?us-ascii?Q?cS3uhvwfpuZ77s5aV5mdPyDrtxFvu3IUM+kxTxNjgSPA4AsDAmI/6zYX0MVk?= =?us-ascii?Q?SbwUzP6I+W+xv9mkmWAv36E9jgYrkm2FKunD6THwhf1gEgsddjlRITgpwl65?= =?us-ascii?Q?i3uLLRI/OJl/tt+nMRh8MSYL6cMmFhBQ94Zk8c0DveCIbF/kohIajf53gYFl?= =?us-ascii?Q?z7xJ01mdGfL5EEhdTBFo5f4jbXPFHbiXatM8bTKVjJERTJP3emYVQT46S45U?= =?us-ascii?Q?rfhCa/hG/AY5CjFwhqo4Avl6h3oYJlRN6asffA9CDiXSMdAABGHDR2BjGnCo?= =?us-ascii?Q?e+3qmj1487V5ItCuLVYgYbH2JMYA1oBVN3UUTHMU5Ps7PLfStZMCtEPIokSf?= =?us-ascii?Q?8E7yDdysL9PjRx0dRwZic2t6FfUAgpV86fwgnqKB0Q8rid60v/pm0qL3Wu6L?= =?us-ascii?Q?ROvsCo5CuAUx3bgfZeD9yyvOWXRQdgdD7i4rnaOPPq6TgP2FsNu2dr+nmglJ?= =?us-ascii?Q?Tvu1mT7kY+7i8BhEU6wUaYytbE/iZfarp4K3OIb9gRdWKWE4mmB+Jl5jui25?= =?us-ascii?Q?3aRsBbZV3MhSq2z0qZGzLox9Jqb6rmMxLlLiuqpHC8irl5WpLePAY8aauA4A?= =?us-ascii?Q?p29GPBBrGNsHliKOvyddG4USKhhb6ab8eA/DtLXdTTo9VY4Eikny0sJLYzZs?= =?us-ascii?Q?Jy4TGAfpeh50/l2h+hnE9P5qWzj/7sAPXij7Xoxl3HuK6g+IiqrwMz3D7agt?= =?us-ascii?Q?7rMaD1bmcIgBRcTUKUYdXvT1fk16t9TdkfFM0g6IW9NylLnNTo1u5gtscQpN?= =?us-ascii?Q?jagb/Mxfi0aEo5BM3x2kiEAid/FoZCkWZKxfFrLiQqqDD01a5JUTD9CVAHsR?= =?us-ascii?Q?/cuFTzEvntvf0HUY3BjxIZ1RGiqgTHNYvZCrTd3YA4gO9XKDQd/UDZh1PZW+?= =?us-ascii?Q?dCQ+4uj2jlae2xAf4PWRk3dn3ff/BveDcPxb8Z0vkFIZ9pfY6e7lNkn3cGmm?= =?us-ascii?Q?2nWeurfYdqBD9ZMQ1913xCIBeNlv84lrCU2t3LUo7Lnfq6ZgzU4sVOEI1Qpc?= =?us-ascii?Q?E50Yvx2cfMZg8WZqM8NNw3Bx6ovO2Qcz/zGKEsRfIxZbN0kwD78Wh2olTKmx?= =?us-ascii?Q?nAFBrRoJFjgPMldk9aUtRLJELSNdeU44IKzumwHB?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BL1PR11MB5953.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c5674ddf-3acd-4479-5b2c-08da692133da X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Jul 2022 00:54:15.0507 (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: DnanuzGGmRABlxH3JmbcB4PcIVdCFi0VUrBU3r6XeCVlO4lafQVyrFaDyqEBrYXsl9Vef+ZbA/irXz4SJQN83A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR11MB4058 Return-Path: guomin.jiang@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Hi Ray, I tried it yesterday It can boot normally in Win Emulator. But I encounter issues mentioned in https://bugzilla.tianocore.org/show_bug= .cgi?id=3D2639 in Unix. I think it is not related to this change. Thanks Guomin > -----Original Message----- > From: Ni, Ray > Sent: Friday, July 15, 2022 10:23 AM > To: Jiang, Guomin ; devel@edk2.groups.io > Cc: GuoMinJ ; Andrew Fish > Subject: RE: [Patch v2 04/11] EmulatorPkg: Remove All UGA Support >=20 > Guomin, > Did you try booting the Emulator Win and Linux with this change? >=20 > > -----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 > > > > From: GuoMinJ > > > > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2368 > > > > Remove All UGA Support in EmulatorPkg. > > > > 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(-) > > > > 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 > > > > -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 > > > > **/ > > > > -#ifndef __UGA_H_ > > -#define __UGA_H_ > > +#ifndef GOP_H_ > > +#define GOP_H_ > > > > #include > > > > @@ -60,8 +60,6 @@ typedef struct { > > extern EFI_DRIVER_BINDING_PROTOCOL gEmuGopDriverBinding; extern > > EFI_COMPONENT_NAME_PROTOCOL gEmuGopComponentName; > > > > -#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; > > > > // > > - // UGA Private Data knowing when to start hardware > > + // Private Data knowing when to start hardware > > // > > BOOLEAN HardwareNeedsStarting; > > > > diff --git a/EmulatorPkg/EmuGopDxe/GopScreen.c > > b/EmulatorPkg/EmuGopDxe/GopScreen.c > > index 88d95b88e162..113b496861b4 100644 > > --- a/EmulatorPkg/EmuGopDxe/GopScreen.c > > +++ b/EmulatorPkg/EmuGopDxe/GopScreen.c > > @@ -10,7 +10,7 @@ Module Name: > > > > Abstract: > > > > - 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. > > > > @@ -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); > > } > > > > // > > @@ -220,8 +220,8 @@ EmuGopBlt ( > > OriginalTPL =3D gBS->RaiseTPL (TPL_NOTIFY); > > > > // > > - // 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 > > + structure 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->Emu= GraphicsWindow, > > - (EFI_UGA_PIX= EL *)BltBuffer, > > - (EFI_UGA_BLT= _OPERATION)BltOperation, > > + BltBuffer, > > + > > + BltOperation, > > &GopBltArgs > > ); > > > > @@ -384,7 +384,7 @@ ShutdownGopEvent ( > > > > Routine Description: > > > > - This is the UGA screen's callback notification function for exit-boo= t- > services. > > + This is the screen's callback notification function for exit-boot-se= rvices. > > All we do here is call EmuGopDestructor(). > > > > Arguments: > > diff --git a/EmulatorPkg/Include/Protocol/EmuFileSystem.h > > b/EmulatorPkg/Include/Protocol/EmuFileSystem.h > > index 15de43ac022e..062508fafc9d 100644 > > --- a/EmulatorPkg/Include/Protocol/EmuFileSystem.h > > +++ b/EmulatorPkg/Include/Protocol/EmuFileSystem.h > > @@ -7,19 +7,19 @@ > > > > UEFI 2.0 can boot from any valid EFI image contained in a > SimpleFileSystem. > > > > -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 > > > > **/ > > > > -#ifndef _EMU_UGA_IO_H_ > > -#define _EMU_UGA_IO_H_ > > +#ifndef EMU_GRAPHICS_WINDOW_H_ > > +#define EMU_GRAPHICS_WINDOW_H_ > > > > #include > > #include > > #include > > -#include > > +#include > > > > #define EMU_GRAPHICS_WINDOW_PROTOCOL_GUID \ > > { 0x30FD316A, 0x6728, 0x2E41, { 0xA6, 0x90, 0x0D, 0x13, 0x33, 0xD8, > > 0xCA, 0xC1 } } @@ -29,13 +29,13 @@ typedef struct > > _EMU_GRAPHICS_WINDOW_PROTOCOL > EMU_GRAPHICS_WINDOW_PROTOCOL; typedef > > EFI_STATUS (EFIAPI *EMU_GRAPHICS_WINDOWS_CLOSE)( > > - EMU_GRAPHICS_WINDOW_PROTOCOL *Uga > > + EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsWindows > > ); > > > > 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 > > ); > > > > typedef > > EFI_STATUS > > (EFIAPI *EMU_GRAPHICS_WINDOWS_GET_KEY)( > > - EMU_GRAPHICS_WINDOW_PROTOCOL *Uga, > > + EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsWindows, > > EFI_KEY_DATA *key > > ); > > > > @@ -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 > > ); > > > > 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 > > > > **/ > > > > -#ifndef _EMU_UGA_IO_H_ > > -#define _EMU_UGA_IO_H_ > > +#ifndef EMU_GRAPHICS_WINDOW_H_ > > +#define EMU_GRAPHICS_WINDOW_H_ > > > > #include > > #include > > #include > > -#include > > +#include > > > > #define EMU_GRAPHICS_WINDOW_PROTOCOL_GUID \ > > { 0x30FD316A, 0x6728, 0x2E41, { 0xA6, 0x90, 0x0D, 0x13, 0x33, 0xD8, > > 0xCA, 0xC1 } } @@ -22,13 +22,13 @@ typedef struct > > _EMU_GRAPHICS_WINDOW_PROTOCOL > EMU_GRAPHICS_WINDOW_PROTOCOL; typedef > > EFI_STATUS (EFIAPI *EMU_GRAPHICS_WINDOWS_CLOSE)( > > - EMU_GRAPHICS_WINDOW_PROTOCOL *Uga > > + EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsWindow > > ); > > > > 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 > > ); > > > > typedef > > EFI_STATUS > > (EFIAPI *EMU_GRAPHICS_WINDOWS_GET_KEY)( > > - EMU_GRAPHICS_WINDOW_PROTOCOL *Uga, > > + EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsWindow, > > EFI_KEY_DATA *key > > ); > > > > @@ -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 > > ); > > > > 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 > > > > -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 > > > > @@ -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; > > > > // > > // 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 > > > > -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 > > > > @@ -8,7 +8,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent > > > > #include "PlatformBm.h" > > > > -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 > > }; > > > > -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/Gasket.h index 6dafc903cfce..1ffdfb334524 > > 100644 > > --- a/EmulatorPkg/Unix/Host/Gasket.h > > +++ b/EmulatorPkg/Unix/Host/Gasket.h > > @@ -1,7 +1,7 @@ > > /** @file > > > > 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.
> > > > SPDX-License-Identifier: BSD-2-Clause-Patent > > > > @@ -200,7 +200,7 @@ ReverseGasketUint64Uint64 ( > > ); > > > > // > > -// Gasket functions for EFI_EMU_UGA_IO_PROTOCOL > > +// Gasket functions for EFI_EMU_GRAPHICS_WINDOW_PROTOCOL > > // > > > > 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 > > ); > > > > 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 > > > > -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.
> > > > SPDX-License-Identifier: BSD-2-Clause-Patent @@ -106,7 +106,6 @@ > > SPDX-License-Identifier: BSD-2-Clause-Patent #include > > #include > > #include -#include > > #include > > > > #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 > > > > // > > -// Gasket functions for EFI_EMU_UGA_IO_PROTOCOL > > +// Gasket functions for EFI_EMU_GRAPHICS_WINDOW_PROTOCOL > > // > > > > 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 > > > > -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.
> > > > SPDX-License-Identifier: BSD-2-Clause-Patent @@ -700,8 +700,8 @@ > > HandleEvents ( > > > > 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); } > > > > -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; > > > > - memset (&Pixel, 0, sizeof (EFI_UGA_PIXEL)); > > + memset (&Pixel, 0, sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL)); > > > > // Truncation not an issue since X11 and EFI are both using 8 bits p= er 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 ( > > > > 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; > > > > Private =3D (GRAPHICS_IO_PRIVATE *)GraphicsIo; > > > > // > > // 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 ( > > } > > } > > > > - 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 ( > > } > > > > switch (BltOperation) { > > - case EfiUgaVideoToBltBuffer: > > - Blt =3D (EFI_UGA_PIXEL *)((UINT8 *)BltBuffer + (Args->D= estinationY > * 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 *)BltB= uffer + > (Args->DestinationY * Args->Delta) + Args- > > >DestinationX * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL)); > > + Args->Delta -=3D Args->Width * sizeof > > + (EFI_GRAPHICS_OUTPUT_BLT_PIXEL); > > for (SrcY =3D Args->SourceY; SrcY < (Args->Height + Args->Source= Y); > SrcY++) { > > for (SrcX =3D Args->SourceX; SrcX < (Args->Width + Args->Sourc= eX); > SrcX++) { > > *Blt++ =3D X11ColorToPixel (Private, XGetPixel (Private->ima= ge, SrcX, > SrcY)); > > } > > > > - Blt =3D (EFI_UGA_PIXEL *)((UINT8 *)Blt + Args->Delta); > > + Blt =3D (EFI_GRAPHICS_OUTPUT_BLT_PIXEL *)((UINT8 *)Blt + > > + Args->Delta); > > } > > > > break; > > - case EfiUgaBltBufferToVideo: > > - Blt =3D (EFI_UGA_PIXEL *)((UINT8 *)BltBuffer + (Args->S= ourceY * > 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 *)BltB= uffer + > (Args->SourceY * Args->Delta) + Args- > > >SourceX * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL)); > > + Args->Delta -=3D Args->Width * sizeof > > + (EFI_GRAPHICS_OUTPUT_BLT_PIXEL); > > for (DstY =3D Args->DestinationY; DstY < (Args->Height + Args- > >DestinationY); DstY++) { > > for (DstX =3D Args->DestinationX; DstX < (Args->Width + Args- > >DestinationX); DstX++) { > > XPutPixel (Private->image, DstX, DstY, X11PixelToColor (Priv= ate, *Blt)); > > Blt++; > > } > > > > - Blt =3D (EFI_UGA_PIXEL *)((UINT8 *)Blt + Args->Delta); > > + Blt =3D (EFI_GRAPHICS_OUTPUT_BLT_PIXEL *)((UINT8 *)Blt + > > + Args->Delta); > > } > > > > break; > > - case EfiUgaVideoToVideo: > > + case EfiBltVideoToVideo: > > Dst =3D Private->image_data + (Args->DestinationX << Private- > >pixel_shift) > > + Args->DestinationY * Private->line_bytes; > > Src =3D Private->image_data + (Args->SourceX << > > Private->pixel_shift) @@ -920,7 +920,7 @@ X11Blt ( > > } > > > > break; > > - case EfiUgaVideoFill: > > + case EfiBltVideoFill: > > Color =3D X11PixelToColor (Private, *BltBuffer); > > for (DstY =3D Args->DestinationY; DstY < (Args->Height + Args- > >DestinationY); DstY++) { > > for (DstX =3D Args->DestinationX; DstX < (Args->Width + > > Args->DestinationX); DstX++) { @@ -937,7 +937,7 @@ X11Blt ( > > // Refresh screen. > > // > > switch (BltOperation) { > > - case EfiUgaVideoToVideo: > > + case EfiBltVideoToVideo: > > XCopyArea ( > > Private->display, > > Private->win, > > @@ -960,7 +960,7 @@ X11Blt ( > > } > > > > 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->W= idth, > Args->Height); > > break; > > default: > > diff --git a/EmulatorPkg/Unix/Host/X64/Gasket.S > > b/EmulatorPkg/Unix/Host/X64/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 > > > > // > > -// Gasket functions for EFI_EMU_UGA_IO_PROTOCOL > > +// Gasket functions for EFI_EMU_GRAPHICS_WINDOW_PROTOCOL > > // > > > > ASM_GLOBAL ASM_PFX(GasketX11Size) > > diff --git a/EmulatorPkg/Win/Host/WinGopScreen.c > > b/EmulatorPkg/Win/Host/WinGopScreen.c > > index 661573d7771c..69abcfc79564 100644 > > --- a/EmulatorPkg/Win/Host/WinGopScreen.c > > +++ b/EmulatorPkg/Win/Host/WinGopScreen.c > > @@ -1,6 +1,6 @@ > > /** @file > > > > -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 > > > > 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