[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 06/39] cirrus: simplify bitblt BAR access functio
From: |
Avi Kivity |
Subject: |
[Qemu-devel] [PATCH v4 06/39] cirrus: simplify bitblt BAR access functions |
Date: |
Mon, 8 Aug 2011 16:08:59 +0300 |
Make use of the memory API's ability to satisfy multi-byte accesses via
multiple single-byte accesses.
Reviewed-by: Richard Henderson <address@hidden>
Reviewed-by: Anthony Liguori <address@hidden>
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 4f57b92..c39acb9 100644
--- a/hw/cirrus_vga.c
+++ b/hw/cirrus_vga.c
@@ -2446,37 +2446,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;
@@ -2489,55 +2475,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,
+ },
};
static void unmap_bank(CirrusVGAState *s, unsigned bank)
--
1.7.5.3
- [Qemu-devel] [PATCH v4 08/39] vga: simplify vga window mmio access functions, (continued)
- [Qemu-devel] [PATCH v4 08/39] vga: simplify vga window mmio access functions, Avi Kivity, 2011/08/08
- [Qemu-devel] [PATCH v4 37/39] pci: fold BAR mapping function into its caller, Avi Kivity, 2011/08/08
- [Qemu-devel] [PATCH v4 32/39] xen-platform: convert to memory API, Avi Kivity, 2011/08/08
- [Qemu-devel] [PATCH v4 14/39] ac97: convert to memory API, Avi Kivity, 2011/08/08
- [Qemu-devel] [PATCH v4 36/39] pci: remove pci_register_bar(), Avi Kivity, 2011/08/08
- [Qemu-devel] [PATCH v4 33/39] msix: convert to memory API, Avi Kivity, 2011/08/08
- [Qemu-devel] [PATCH v4 04/39] vga: convert vga and its derivatives to the memory API, Avi Kivity, 2011/08/08
- [Qemu-devel] [PATCH v4 25/39] ne2000: convert to memory API, Avi Kivity, 2011/08/08
- [Qemu-devel] [PATCH v4 18/39] ide: convert to memory API, Avi Kivity, 2011/08/08
- [Qemu-devel] [PATCH v4 06/39] cirrus: simplify bitblt BAR access functions,
Avi Kivity <=
- [Qemu-devel] [PATCH v4 24/39] ppc: convert to memory API, Avi Kivity, 2011/08/08
- [Qemu-devel] [PATCH v4 20/39] virtio-pci: convert to memory API, Avi Kivity, 2011/08/08
- [Qemu-devel] [PATCH v4 38/39] pci: rename pci_register_bar_region() to pci_register_bar(), Avi Kivity, 2011/08/08
- [Qemu-devel] [PATCH v4 39/39] pci: remove support for pre memory API BARs, Avi Kivity, 2011/08/08
- [Qemu-devel] [PATCH v4 28/39] isa-mmio: convert to memory API, Avi Kivity, 2011/08/08
- [Qemu-devel] [PATCH v4 07/39] cirrus: simplify vga window mmio access functions, Avi Kivity, 2011/08/08
- Re: [Qemu-devel] [PATCH v4 00/39] Memory API, batch 2: PCI devices, Michael S. Tsirkin, 2011/08/08
- Re: [Qemu-devel] [PATCH v4 00/39] Memory API, batch 2: PCI devices, Anthony Liguori, 2011/08/08