From: yuchenlin@synology.com
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 <yuchenlin@synology.com>
Subject: [PATCH v2 4/5] Revert "OvmfPkg: VMWare SVGA display device register definitions"
Date: Fri, 2 Nov 2018 11:24:01 +0800 [thread overview]
Message-ID: <20181102032402.19686-5-yuchenlin@synology.com> (raw)
In-Reply-To: <20181102032402.19686-1-yuchenlin@synology.com>
From: yuchenlin <yuchenlin@synology.com>
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 <yuchenlin@synology.com>
---
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 <phil@philjordan.eu>
-
- 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 <Base.h>
-
-//
-// 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
next prev parent reply other threads:[~2018-11-02 3:24 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-02 3:23 [PATCH v2 0/5] OvmfPkg: simply use the Bochs interface for vmsvga yuchenlin
2018-11-02 3:23 ` [PATCH v2 1/5] Revert "OvmfPkg/QemuVideoDxe: list "UnalignedIoInternal.h" in the INF file" yuchenlin
2018-11-06 10:03 ` Laszlo Ersek
2018-11-02 3:23 ` [PATCH v2 2/5] Revert "OvmfPkg/QemuVideoDxe: VMWare SVGA device support" yuchenlin
2018-11-06 10:36 ` Laszlo Ersek
2018-11-02 3:24 ` [PATCH v2 3/5] Revert "OvmfPkg/QemuVideoDxe: Helper functions for unaligned port I/O." yuchenlin
2018-11-06 10:44 ` Laszlo Ersek
2018-11-02 3:24 ` yuchenlin [this message]
2018-11-06 10:48 ` [PATCH v2 4/5] Revert "OvmfPkg: VMWare SVGA display device register definitions" Laszlo Ersek
2018-11-02 3:24 ` [PATCH v2 5/5] OvmfPkg: simply use the Bochs interface for vmsvga yuchenlin
2018-11-06 11:47 ` Laszlo Ersek
2018-11-06 13:36 ` Laszlo Ersek
2018-11-06 13:44 ` Philippe Mathieu-Daudé
2018-11-06 16:20 ` Laszlo Ersek
2018-11-07 2:37 ` yuchenlin
2018-11-12 11:19 ` Laszlo Ersek
2018-11-12 11:28 ` Philippe Mathieu-Daudé
2018-11-12 12:21 ` Laszlo Ersek
2018-11-07 2:36 ` yuchenlin
2018-11-05 22:52 ` [PATCH v2 0/5] " Laszlo Ersek
2018-11-12 14:16 ` Philippe Mathieu-Daudé
2018-11-12 15:40 ` Laszlo Ersek
2018-11-15 11:56 ` Laszlo Ersek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181102032402.19686-5-yuchenlin@synology.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox