[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC v5 30/86] cirrus: simplify linear framebuffer access f
From: |
Avi Kivity |
Subject: |
[Qemu-devel] [RFC v5 30/86] cirrus: simplify linear framebuffer access functions |
Date: |
Wed, 20 Jul 2011 19:49:40 +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 | 74 ++++++-------------------------------------------------
1 files changed, 8 insertions(+), 66 deletions(-)
diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c
index 472f153..703708c 100644
--- a/hw/cirrus_vga.c
+++ b/hw/cirrus_vga.c
@@ -2249,7 +2249,8 @@ static void cirrus_cursor_draw_line(VGACommonState *s1,
uint8_t *d1, int scr_y)
*
***************************************/
-static uint32_t cirrus_linear_readb(void *opaque, target_phys_addr_t addr)
+static uint64_t cirrus_linear_read(void *opaque, target_phys_addr_t addr,
+ unsigned size)
{
CirrusVGAState *s = opaque;
uint32_t ret;
@@ -2277,28 +2278,8 @@ static uint32_t cirrus_linear_readb(void *opaque,
target_phys_addr_t addr)
return ret;
}
-static uint32_t cirrus_linear_readw(void *opaque, target_phys_addr_t addr)
-{
- uint32_t v;
-
- v = cirrus_linear_readb(opaque, addr);
- v |= cirrus_linear_readb(opaque, addr + 1) << 8;
- return v;
-}
-
-static uint32_t cirrus_linear_readl(void *opaque, target_phys_addr_t addr)
-{
- uint32_t v;
-
- v = cirrus_linear_readb(opaque, addr);
- v |= cirrus_linear_readb(opaque, addr + 1) << 8;
- v |= cirrus_linear_readb(opaque, addr + 2) << 16;
- v |= cirrus_linear_readb(opaque, addr + 3) << 24;
- return v;
-}
-
-static void cirrus_linear_writeb(void *opaque, target_phys_addr_t addr,
- uint32_t val)
+static void cirrus_linear_write(void *opaque, target_phys_addr_t addr,
+ uint64_t val, unsigned size)
{
CirrusVGAState *s = opaque;
unsigned mode;
@@ -2338,49 +2319,6 @@ static void cirrus_linear_writeb(void *opaque,
target_phys_addr_t addr,
}
}
-static void cirrus_linear_writew(void *opaque, target_phys_addr_t addr,
- uint32_t val)
-{
- cirrus_linear_writeb(opaque, addr, val & 0xff);
- cirrus_linear_writeb(opaque, addr + 1, (val >> 8) & 0xff);
-}
-
-static void cirrus_linear_writel(void *opaque, target_phys_addr_t addr,
- uint32_t val)
-{
- cirrus_linear_writeb(opaque, addr, val & 0xff);
- cirrus_linear_writeb(opaque, addr + 1, (val >> 8) & 0xff);
- cirrus_linear_writeb(opaque, addr + 2, (val >> 16) & 0xff);
- cirrus_linear_writeb(opaque, addr + 3, (val >> 24) & 0xff);
-}
-
-
-static uint64_t cirrus_linear_read(void *opaque, target_phys_addr_t addr,
- unsigned size)
-{
- CirrusVGAState *s = opaque;
-
- switch (size) {
- case 1: return cirrus_linear_readb(s, addr);
- case 2: return cirrus_linear_readw(s, addr);
- case 4: return cirrus_linear_readl(s, addr);
- default: abort();
- }
-}
-
-static void cirrus_linear_write(void *opaque, target_phys_addr_t addr,
- uint64_t data, unsigned size)
-{
- CirrusVGAState *s = opaque;
-
- switch (size) {
- case 1: return cirrus_linear_writeb(s, addr, data);
- case 2: return cirrus_linear_writew(s, addr, data);
- case 4: return cirrus_linear_writel(s, addr, data);
- default: abort();
- }
-}
-
/***************************************
*
* system to screen memory access
@@ -2860,6 +2798,10 @@ static const MemoryRegionOps cirrus_linear_io_ops = {
.read = cirrus_linear_read,
.write = cirrus_linear_write,
.endianness = DEVICE_LITTLE_ENDIAN,
+ .impl = {
+ .min_access_size = 1,
+ .max_access_size = 1,
+ },
};
static void cirrus_init_common(CirrusVGAState * s, int device_id, int is_pci)
--
1.7.5.3
- [Qemu-devel] [RFC v5 33/86] pci: pass I/O address space to new PCI bus, (continued)
- [Qemu-devel] [RFC v5 33/86] pci: pass I/O address space to new PCI bus, Avi Kivity, 2011/07/20
- [Qemu-devel] [RFC v5 20/86] pci: add MemoryRegion based BAR management API, Avi Kivity, 2011/07/20
- [Qemu-devel] [RFC v5 21/86] sysbus: add MemoryRegion based memory management API, Avi Kivity, 2011/07/20
- [Qemu-devel] [RFC v5 84/86] pci: add pci_address_space(), Avi Kivity, 2011/07/20
- [Qemu-devel] [RFC v5 03/86] memory: implement dirty tracking, Avi Kivity, 2011/07/20
- [Qemu-devel] [RFC v5 66/86] arm_sysctl: convert to memory API, Avi Kivity, 2011/07/20
- [Qemu-devel] [RFC v5 14/86] exec.c: initialize memory map, Avi Kivity, 2011/07/20
- [Qemu-devel] [RFC v5 78/86] sh_pci: convert to memory API, Avi Kivity, 2011/07/20
- [Qemu-devel] [RFC v5 62/86] Introduce QEMU_NEW(), Avi Kivity, 2011/07/20
- [Qemu-devel] [RFC v5 38/86] eepro100: convert to memory API, Avi Kivity, 2011/07/20
- [Qemu-devel] [RFC v5 30/86] cirrus: simplify linear framebuffer access functions,
Avi Kivity <=
- [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, 2011/07/20