[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC v3 25/56] cirrus: simplify linear framebuffer access f
From: |
Avi Kivity |
Subject: |
[Qemu-devel] [RFC v3 25/56] cirrus: simplify linear framebuffer access functions |
Date: |
Sun, 10 Jul 2011 21:14:38 +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 615e101..3fac365 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 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 v3 49/56] uhci: convert to memory API, (continued)
- [Qemu-devel] [RFC v3 49/56] uhci: convert to memory API, Avi Kivity, 2011/07/10
- [Qemu-devel] [RFC v3 56/56] pci: rename pci_register_bar_region() to pci_register_bar(), Avi Kivity, 2011/07/10
- [Qemu-devel] [RFC v3 24/56] vga: simplify vga window mmio access functions, Avi Kivity, 2011/07/10
- [Qemu-devel] [RFC v3 48/56] ehci: convert to memory API, Avi Kivity, 2011/07/10
- [Qemu-devel] [RFC v3 51/56] msix: convert to memory API, Avi Kivity, 2011/07/10
- [Qemu-devel] [RFC v3 54/56] pci: remove pci_register_bar(), Avi Kivity, 2011/07/10
- [Qemu-devel] [RFC v3 42/56] ppc: convert to memory API, Avi Kivity, 2011/07/10
- [Qemu-devel] [RFC v3 45/56] i6300esb: convert to memory API, Avi Kivity, 2011/07/10
- [Qemu-devel] [RFC v3 32/56] e1000: convert to memory API, Avi Kivity, 2011/07/10
- [Qemu-devel] [RFC v3 46/56] isa-mmio: concert to memory API, Avi Kivity, 2011/07/10
- [Qemu-devel] [RFC v3 25/56] cirrus: simplify linear framebuffer access functions,
Avi Kivity <=
- [Qemu-devel] [RFC v3 41/56] lsi53c895a: convert to memory API, Avi Kivity, 2011/07/10
- [Qemu-devel] [RFC v3 35/56] ide: convert to memory API, Avi Kivity, 2011/07/10
- [Qemu-devel] [RFC v3 47/56] sun4u: convert to memory API, Avi Kivity, 2011/07/10
- [Qemu-devel] [RFC v3 44/56] pcnet: convert to memory API, Avi Kivity, 2011/07/10