[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC v5 27/86] cirrus: simplify bitblt BAR access functions
From: |
Avi Kivity |
Subject: |
[Qemu-devel] [RFC v5 27/86] cirrus: simplify bitblt BAR access functions |
Date: |
Wed, 20 Jul 2011 19:49:37 +0300 |
Make use of the memory API's ability to satisfy multi-byte accesses via
multiple single-byte accesses.
Signed-off-by: Avi Kivity <address@hidden>
---
hw/cirrus_vga.c | 81 +++++++++----------------------------------------------
1 files changed, 13 insertions(+), 68 deletions(-)
diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c
index 094690a..607d76a 100644
--- a/hw/cirrus_vga.c
+++ b/hw/cirrus_vga.c
@@ -2445,37 +2445,23 @@ static void cirrus_linear_write(void *opaque,
target_phys_addr_t addr,
***************************************/
-static uint32_t cirrus_linear_bitblt_readb(void *opaque, target_phys_addr_t
addr)
+static uint64_t cirrus_linear_bitblt_read(void *opaque,
+ target_phys_addr_t addr,
+ unsigned size)
{
+ CirrusVGAState *s = opaque;
uint32_t ret;
/* XXX handle bitblt */
+ (void)s;
ret = 0xff;
return ret;
}
-static uint32_t cirrus_linear_bitblt_readw(void *opaque, target_phys_addr_t
addr)
-{
- uint32_t v;
-
- v = cirrus_linear_bitblt_readb(opaque, addr);
- v |= cirrus_linear_bitblt_readb(opaque, addr + 1) << 8;
- return v;
-}
-
-static uint32_t cirrus_linear_bitblt_readl(void *opaque, target_phys_addr_t
addr)
-{
- uint32_t v;
-
- v = cirrus_linear_bitblt_readb(opaque, addr);
- v |= cirrus_linear_bitblt_readb(opaque, addr + 1) << 8;
- v |= cirrus_linear_bitblt_readb(opaque, addr + 2) << 16;
- v |= cirrus_linear_bitblt_readb(opaque, addr + 3) << 24;
- return v;
-}
-
-static void cirrus_linear_bitblt_writeb(void *opaque, target_phys_addr_t addr,
- uint32_t val)
+static void cirrus_linear_bitblt_write(void *opaque,
+ target_phys_addr_t addr,
+ uint64_t val,
+ unsigned size)
{
CirrusVGAState *s = opaque;
@@ -2488,55 +2474,14 @@ static void cirrus_linear_bitblt_writeb(void *opaque,
target_phys_addr_t addr,
}
}
-static void cirrus_linear_bitblt_writew(void *opaque, target_phys_addr_t addr,
- uint32_t val)
-{
- cirrus_linear_bitblt_writeb(opaque, addr, val & 0xff);
- cirrus_linear_bitblt_writeb(opaque, addr + 1, (val >> 8) & 0xff);
-}
-
-static void cirrus_linear_bitblt_writel(void *opaque, target_phys_addr_t addr,
- uint32_t val)
-{
- cirrus_linear_bitblt_writeb(opaque, addr, val & 0xff);
- cirrus_linear_bitblt_writeb(opaque, addr + 1, (val >> 8) & 0xff);
- cirrus_linear_bitblt_writeb(opaque, addr + 2, (val >> 16) & 0xff);
- cirrus_linear_bitblt_writeb(opaque, addr + 3, (val >> 24) & 0xff);
-}
-
-static uint64_t cirrus_linear_bitblt_read(void *opaque,
- target_phys_addr_t addr,
- unsigned size)
-{
- CirrusVGAState *s = opaque;
-
- switch (size) {
- case 1: return cirrus_linear_bitblt_readb(s, addr);
- case 2: return cirrus_linear_bitblt_readw(s, addr);
- case 4: return cirrus_linear_bitblt_readl(s, addr);
- default: abort();
- }
-};
-
-static void cirrus_linear_bitblt_write(void *opaque,
- target_phys_addr_t addr,
- uint64_t data,
- unsigned size)
-{
- CirrusVGAState *s = opaque;
-
- switch (size) {
- case 1: return cirrus_linear_bitblt_writeb(s, addr, data);
- case 2: return cirrus_linear_bitblt_writew(s, addr, data);
- case 4: return cirrus_linear_bitblt_writel(s, addr, data);
- default: abort();
- }
-};
-
static const MemoryRegionOps cirrus_linear_bitblt_io_ops = {
.read = cirrus_linear_bitblt_read,
.write = cirrus_linear_bitblt_write,
.endianness = DEVICE_LITTLE_ENDIAN,
+ .impl = {
+ .min_access_size = 1,
+ .max_access_size = 1,
+ },
};
#include "exec-memory.h"
--
1.7.5.3
- [Qemu-devel] [RFC v5 30/86] cirrus: simplify linear framebuffer access functions, (continued)
- [Qemu-devel] [RFC v5 30/86] cirrus: simplify linear framebuffer access functions, Avi Kivity, 2011/07/20
- [Qemu-devel] [RFC v5 23/86] pci: add API to get a BAR's mapped address, Avi Kivity, 2011/07/20
- [Qemu-devel] [RFC v5 36/86] ac97: convert to memory API, Avi Kivity, 2011/07/20
- [Qemu-devel] [RFC v5 76/86] stellaris_enet: convert to memory API, Avi Kivity, 2011/07/20
- [Qemu-devel] [RFC v5 72/86] onenand: convert to memory API, Avi Kivity, 2011/07/20
- [Qemu-devel] [RFC v5 32/86] exec.c: fix initialization of system I/O memory region, Avi Kivity, 2011/07/20
- [Qemu-devel] [RFC v5 60/86] pci: rename pci_register_bar_region() to pci_register_bar(), Avi Kivity, 2011/07/20
- [Qemu-devel] [RFC v5 06/86] memory: abstract address space operations, Avi Kivity, 2011/07/20
- [Qemu-devel] [RFC v5 49/86] i6300esb: convert to memory API, Avi Kivity, 2011/07/20
- [Qemu-devel] [RFC v5 85/86] vga: drop get_system_memory() from vga devices and derivatives, Avi Kivity, 2011/07/20
- [Qemu-devel] [RFC v5 27/86] cirrus: simplify bitblt BAR access functions,
Avi Kivity <=
- [Qemu-devel] [RFC v5 71/86] omap_gpmc/nseries/tusb6010: convert to memory API, Avi Kivity, 2011/07/20
- [Qemu-devel] [RFC v5 40/86] ide: convert to memory API, Avi Kivity, 2011/07/20
- [Qemu-devel] [RFC v5 08/86] memory: late initialization of ram_addr, Avi Kivity, 2011/07/20
- [Qemu-devel] [RFC v5 80/86] versatile_pci: convert to memory API, Avi Kivity, 2011/07/20
- [Qemu-devel] [RFC v5 50/86] isa-mmio: concert to memory API, Avi Kivity, 2011/07/20
- [Qemu-devel] [RFC v5 39/86] es1370: convert to memory API, Avi Kivity, 2011/07/20
- [Qemu-devel] [RFC v5 46/86] ppc: convert to memory API, Avi Kivity, 2011/07/20
- [Qemu-devel] [RFC v5 44/86] intel-hda: convert to memory API, Avi Kivity, 2011/07/20
- [Qemu-devel] [RFC v5 51/86] sun4u: convert to memory API, Avi Kivity, 2011/07/20
- [Qemu-devel] [RFC v5 75/86] ppc4xx_sdram: convert to memory API, Avi Kivity, 2011/07/20