From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=59.124.61.242; helo=synology.com; envelope-from=yuchenlin@synology.com; receiver=edk2-devel@lists.01.org Received: from synology.com (synology.com [59.124.61.242]) (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 5A08721180F4F for ; Thu, 1 Nov 2018 20:24:20 -0700 (PDT) From: yuchenlin@synology.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=synology.com; s=123; t=1541129058; bh=6wNpBtD6JbaACLZw/3Z2WuD9FdgTbjv2Mic7nDQWhnI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=QQN53A0HZJ7wgWTPg8VKMiMcjdDdT5erYLdu15mMd4HgzH5V9YmlE2XE/0QUISYKK RhkuIfe2PYL/FYwHY+oJiRNBpeLAesOKLmeDXqG/Ut4m0/85W/W5UN0a8hJghCpz2C iKg9nhTM3khORH/RCLtkRqdSG3gUB4zU0kkpW3PU= To: edk2-devel@lists.01.org Cc: jordan.l.justen@intel.com, lersek@redhat.com, ard.biesheuvel@linaro.org, anthony.perard@citrix.com, julien.grall@linaro.org, phil@philjordan.eu, kraxel@redhat.com, philmd@redhat.com, yuchenlin Date: Fri, 2 Nov 2018 11:24:01 +0800 Message-Id: <20181102032402.19686-5-yuchenlin@synology.com> In-Reply-To: <20181102032402.19686-1-yuchenlin@synology.com> References: <20181102032402.19686-1-yuchenlin@synology.com> X-Synology-MCP-Status: no X-Synology-Spam-Flag: no X-Synology-Spam-Status: score=0, required 6, WHITELIST_FROM_ADDRESS 0 X-Synology-Virus-Status: no Subject: [PATCH v2 4/5] Revert "OvmfPkg: VMWare SVGA display device register definitions" X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Nov 2018 03:24:20 -0000 From: yuchenlin This reverts commit 9bcca53fe466cdff397578328d9d87d257aba493. We reverted VMWare SVGA driver. We don't need these definitions too. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: yuchenlin --- OvmfPkg/Include/IndustryStandard/VmwareSvga.h | 104 ------------------ 1 file changed, 104 deletions(-) delete mode 100644 OvmfPkg/Include/IndustryStandard/VmwareSvga.h diff --git a/OvmfPkg/Include/IndustryStandard/VmwareSvga.h b/OvmfPkg/Include/IndustryStandard/VmwareSvga.h deleted file mode 100644 index 693d44bab6..0000000000 --- a/OvmfPkg/Include/IndustryStandard/VmwareSvga.h +++ /dev/null @@ -1,104 +0,0 @@ -/** @file - - Macro and enum definitions of a subset of port numbers, register identifiers - and values required for driving the VMWare SVGA virtual display adapter, - also implemented by Qemu. - - This file's contents was extracted from file lib/vmware/svga_reg.h in commit - 329dd537456f93a806841ec8a8213aed11395def of VMWare's vmware-svga repository: - git://git.code.sf.net/p/vmware-svga/git - - - Copyright 1998-2009 VMware, Inc. All rights reserved. - Portions Copyright 2017 Phil Dennis-Jordan - - Permission is hereby granted, free of charge, to any person - obtaining a copy of this software and associated documentation - files (the "Software"), to deal in the Software without - restriction, including without limitation the rights to use, copy, - modify, merge, publish, distribute, sublicense, and/or sell copies - of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be - included in all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS - BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - SOFTWARE. - -**/ - -#ifndef _VMWARE_SVGA_H_ -#define _VMWARE_SVGA_H_ - -#include - -// -// IDs for recognising the device -// -#define VMWARE_PCI_VENDOR_ID_VMWARE 0x15AD -#define VMWARE_PCI_DEVICE_ID_VMWARE_SVGA2 0x0405 - -// -// I/O port BAR offsets for register selection and read/write. -// -// The register index is written to the 32-bit index port, followed by a 32-bit -// read or write on the value port to read or set that register's contents. -// -#define VMWARE_SVGA_INDEX_PORT 0x0 -#define VMWARE_SVGA_VALUE_PORT 0x1 - -// -// Some of the device's register indices for basic framebuffer functionality. -// -typedef enum { - VmwareSvgaRegId = 0, - VmwareSvgaRegEnable = 1, - VmwareSvgaRegWidth = 2, - VmwareSvgaRegHeight = 3, - VmwareSvgaRegMaxWidth = 4, - VmwareSvgaRegMaxHeight = 5, - - VmwareSvgaRegBitsPerPixel = 7, - - VmwareSvgaRegRedMask = 9, - VmwareSvgaRegGreenMask = 10, - VmwareSvgaRegBlueMask = 11, - VmwareSvgaRegBytesPerLine = 12, - - VmwareSvgaRegFbOffset = 14, - - VmwareSvgaRegFbSize = 16, - VmwareSvgaRegCapabilities = 17, - - VmwareSvgaRegHostBitsPerPixel = 28, -} VMWARE_SVGA_REGISTER; - -// -// Values used with VmwareSvgaRegId for sanity-checking the device and getting -// its version. -// -#define VMWARE_SVGA_MAGIC 0x900000U -#define VMWARE_SVGA_MAKE_ID(ver) (VMWARE_SVGA_MAGIC << 8 | (ver)) - -#define VMWARE_SVGA_VERSION_2 2 -#define VMWARE_SVGA_ID_2 VMWARE_SVGA_MAKE_ID (VMWARE_SVGA_VERSION_2) - -#define VMWARE_SVGA_VERSION_1 1 -#define VMWARE_SVGA_ID_1 VMWARE_SVGA_MAKE_ID (VMWARE_SVGA_VERSION_1) - -#define VMWARE_SVGA_VERSION_0 0 -#define VMWARE_SVGA_ID_0 VMWARE_SVGA_MAKE_ID (VMWARE_SVGA_VERSION_0) - -// -// One of the capability bits advertised by VmwareSvgaRegCapabilities. -// -#define VMWARE_SVGA_CAP_8BIT_EMULATION BIT8 - -#endif -- 2.18.0