From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: "László Érsek" <lersek@redhat.com>,
"Alex Williamson" <alex.williamson@redhat.com>,
"Gerd Hoffmann" <kraxel@redhat.com>
Subject: [Qemu-devel] [PATCH 4/4] add ramfb-testdev
Date: Fri, 17 Nov 2017 13:04:54 +0100 [thread overview]
Message-ID: <20171117120454.13507-5-kraxel@redhat.com> (raw)
In-Reply-To: <20171117120454.13507-1-kraxel@redhat.com>
---
hw/display/ramfb-testdev.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++
hw/display/Makefile.objs | 1 +
2 files changed, 88 insertions(+)
create mode 100644 hw/display/ramfb-testdev.c
diff --git a/hw/display/ramfb-testdev.c b/hw/display/ramfb-testdev.c
new file mode 100644
index 0000000000..1310ac1288
--- /dev/null
+++ b/hw/display/ramfb-testdev.c
@@ -0,0 +1,87 @@
+#include "qemu/osdep.h"
+#include "qapi/error.h"
+#include "hw/loader.h"
+#include "hw/isa/isa.h"
+#include "hw/display/ramfb.h"
+#include "ui/console.h"
+#include "sysemu/sysemu.h"
+
+#define TYPE_RAMFB "ramfb-testdev"
+#define RAMFB(obj) OBJECT_CHECK(ISARAMFBState, (obj), TYPE_RAMFB)
+
+typedef struct ISARAMFBState {
+ ISADevice parent_obj;
+ QemuConsole *con;
+ RAMFBState *state;
+ PortioList vga_port_list;
+} ISARAMFBState;
+
+/* log vga port activity, for trouble-shooting purposes */
+static uint32_t vga_log_read(void *opaque, uint32_t addr)
+{
+ fprintf(stderr, "%s: port 0x%x\n", __func__, addr);
+ return -1;
+}
+
+static void vga_log_write(void *opaque, uint32_t addr, uint32_t val)
+{
+ fprintf(stderr, "%s: port 0x%x, value 0x%x\n", __func__, addr, val);
+}
+
+static const MemoryRegionPortio vga_portio_list[] = {
+ { 0x04, 2, 1, .read = vga_log_read, .write = vga_log_write }, /* 3b4 */
+ { 0x0a, 1, 1, .read = vga_log_read, .write = vga_log_write }, /* 3ba */
+ { 0x10, 16, 1, .read = vga_log_read, .write = vga_log_write }, /* 3c0 */
+ { 0x24, 2, 1, .read = vga_log_read, .write = vga_log_write }, /* 3d4 */
+ { 0x2a, 1, 1, .read = vga_log_read, .write = vga_log_write }, /* 3da */
+ PORTIO_END_OF_LIST(),
+};
+
+static void display_update_wrapper(void *dev)
+{
+ ISARAMFBState *ramfb = RAMFB(dev);
+
+ if (0 /* native driver active */) {
+ /* non-test device would run native display update here */;
+ } else {
+ ramfb_display_update(ramfb->con, ramfb->state);
+ }
+}
+
+static const GraphicHwOps wrapper_ops = {
+ .gfx_update = display_update_wrapper,
+};
+
+static void ramfb_realizefn(DeviceState *dev, Error **errp)
+{
+ ISARAMFBState *ramfb = RAMFB(dev);
+
+ ramfb->con = graphic_console_init(dev, 0, &wrapper_ops, dev);
+ ramfb->state = ramfb_setup(errp);
+
+ isa_register_portio_list(ISA_DEVICE(dev), &ramfb->vga_port_list,
+ 0x3b0, vga_portio_list, NULL, "vga");
+}
+
+static void ramfb_class_initfn(ObjectClass *klass, void *data)
+{
+ DeviceClass *dc = DEVICE_CLASS(klass);
+
+ set_bit(DEVICE_CATEGORY_DISPLAY, dc->categories);
+ dc->realize = ramfb_realizefn;
+ dc->desc = "ram framebuffer test device";
+}
+
+static const TypeInfo ramfb_info = {
+ .name = TYPE_RAMFB,
+ .parent = TYPE_ISA_DEVICE,
+ .instance_size = sizeof(ISARAMFBState),
+ .class_init = ramfb_class_initfn,
+};
+
+static void ramfb_register_types(void)
+{
+ type_register_static(&ramfb_info);
+}
+
+type_init(ramfb_register_types)
diff --git a/hw/display/Makefile.objs b/hw/display/Makefile.objs
index 646012478f..2c9a2e2ef6 100644
--- a/hw/display/Makefile.objs
+++ b/hw/display/Makefile.objs
@@ -1,4 +1,5 @@
common-obj-y += ramfb.o
+common-obj-$(CONFIG_VGA_ISA) += ramfb-testdev.o
common-obj-$(CONFIG_ADS7846) += ads7846.o
common-obj-$(CONFIG_VGA_CIRRUS) += cirrus_vga.o
--
2.9.3
next prev parent reply other threads:[~2017-11-17 12:05 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-17 12:04 [Qemu-devel] [PATCH 0/4] ramfb: simple boot framebuffer, no legacy vga Gerd Hoffmann
2017-11-17 12:04 ` [Qemu-devel] [PATCH 1/4] [testing] update bios, add vgabios-ramfb Gerd Hoffmann
2017-11-17 12:04 ` [Qemu-devel] [PATCH 2/4] ramfb: simple boot framebuffer living in guest ram Gerd Hoffmann
2017-11-17 12:04 ` [Qemu-devel] [PATCH 3/4] add virtio-ramfb Gerd Hoffmann
2017-11-17 12:04 ` Gerd Hoffmann [this message]
2017-11-17 16:38 ` [Qemu-devel] [PATCH 0/4] ramfb: simple boot framebuffer, no legacy vga 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-all 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=20171117120454.13507-5-kraxel@redhat.com \
--to=kraxel@redhat.com \
--cc=alex.williamson@redhat.com \
--cc=lersek@redhat.com \
--cc=qemu-devel@nongnu.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.