[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC v4 24/58] cirrus: simplify mmio BAR access functions
From: |
Avi Kivity |
Subject: |
[Qemu-devel] [RFC v4 24/58] cirrus: simplify mmio BAR access functions |
Date: |
Sun, 17 Jul 2011 14:13:51 +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 | 78 +++++-------------------------------------------------
1 files changed, 8 insertions(+), 70 deletions(-)
diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c
index 0cd2aee..5ff0ec8 100644
--- a/hw/cirrus_vga.c
+++ b/hw/cirrus_vga.c
@@ -2828,12 +2828,11 @@ static void cirrus_vga_ioport_write(void *opaque,
uint32_t addr, uint32_t val)
*
***************************************/
-static uint32_t cirrus_mmio_readb(void *opaque, target_phys_addr_t addr)
+static uint64_t cirrus_mmio_read(void *opaque, target_phys_addr_t addr,
+ unsigned size)
{
CirrusVGAState *s = opaque;
- addr &= CIRRUS_PNPMMIO_SIZE - 1;
-
if (addr >= 0x100) {
return cirrus_mmio_blt_read(s, addr - 0x100);
} else {
@@ -2841,33 +2840,11 @@ static uint32_t cirrus_mmio_readb(void *opaque,
target_phys_addr_t addr)
}
}
-static uint32_t cirrus_mmio_readw(void *opaque, target_phys_addr_t addr)
-{
- uint32_t v;
-
- v = cirrus_mmio_readb(opaque, addr);
- v |= cirrus_mmio_readb(opaque, addr + 1) << 8;
- return v;
-}
-
-static uint32_t cirrus_mmio_readl(void *opaque, target_phys_addr_t addr)
-{
- uint32_t v;
-
- v = cirrus_mmio_readb(opaque, addr);
- v |= cirrus_mmio_readb(opaque, addr + 1) << 8;
- v |= cirrus_mmio_readb(opaque, addr + 2) << 16;
- v |= cirrus_mmio_readb(opaque, addr + 3) << 24;
- return v;
-}
-
-static void cirrus_mmio_writeb(void *opaque, target_phys_addr_t addr,
- uint32_t val)
+static void cirrus_mmio_write(void *opaque, target_phys_addr_t addr,
+ uint64_t val, unsigned size)
{
CirrusVGAState *s = opaque;
- addr &= CIRRUS_PNPMMIO_SIZE - 1;
-
if (addr >= 0x100) {
cirrus_mmio_blt_write(s, addr - 0x100, val);
} else {
@@ -2875,53 +2852,14 @@ static void cirrus_mmio_writeb(void *opaque,
target_phys_addr_t addr,
}
}
-static void cirrus_mmio_writew(void *opaque, target_phys_addr_t addr,
- uint32_t val)
-{
- cirrus_mmio_writeb(opaque, addr, val & 0xff);
- cirrus_mmio_writeb(opaque, addr + 1, (val >> 8) & 0xff);
-}
-
-static void cirrus_mmio_writel(void *opaque, target_phys_addr_t addr,
- uint32_t val)
-{
- cirrus_mmio_writeb(opaque, addr, val & 0xff);
- cirrus_mmio_writeb(opaque, addr + 1, (val >> 8) & 0xff);
- cirrus_mmio_writeb(opaque, addr + 2, (val >> 16) & 0xff);
- cirrus_mmio_writeb(opaque, addr + 3, (val >> 24) & 0xff);
-}
-
-
-static uint64_t cirrus_mmio_read(void *opaque, target_phys_addr_t addr,
- unsigned size)
-{
- CirrusVGAState *s = opaque;
-
- switch (size) {
- case 1: return cirrus_mmio_readb(s, addr);
- case 2: return cirrus_mmio_readw(s, addr);
- case 4: return cirrus_mmio_readl(s, addr);
- default: abort();
- }
-};
-
-static void cirrus_mmio_write(void *opaque, target_phys_addr_t addr,
- uint64_t data, unsigned size)
-{
- CirrusVGAState *s = opaque;
-
- switch (size) {
- case 1: return cirrus_mmio_writeb(s, addr, data);
- case 2: return cirrus_mmio_writew(s, addr, data);
- case 4: return cirrus_mmio_writel(s, addr, data);
- default: abort();
- }
-};
-
static MemoryRegionOps cirrus_mmio_io_ops = {
.read = cirrus_mmio_read,
.write = cirrus_mmio_write,
.endianness = DEVICE_LITTLE_ENDIAN,
+ .impl = {
+ .min_access_size = 1,
+ .max_access_size = 1,
+ },
};
/* load/save state */
--
1.7.5.3
- [Qemu-devel] [RFC v4 19/58] sysbus: add MemoryRegion based memory management API, (continued)
- [Qemu-devel] [RFC v4 19/58] sysbus: add MemoryRegion based memory management API, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 14/58] pc: grab system_memory, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 53/58] msix: convert to memory API, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 27/58] vga: simplify vga window mmio access functions, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 26/58] cirrus: simplify vga window mmio access functions, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 34/58] ac97: convert to memory API, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 16/58] pc: move global memory map out of pc_init1() and into its callers, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 09/58] memory: add backward compatibility for old portio registration, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 48/58] isa-mmio: concert to memory API, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 52/58] xen-platform: convert to memory API, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 24/58] cirrus: simplify mmio BAR access functions,
Avi Kivity <=
- [Qemu-devel] [RFC v4 46/58] pcnet: convert to memory API, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 57/58] pci: fold BAR mapping function into its caller, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 21/58] pci: add API to get a BAR's mapped address, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 41/58] ahci: convert to memory API, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 32/58] pci: allow I/O BARs to be registered with pci_register_bar_region(), Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 51/58] uhci: convert to memory API, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 49/58] sun4u: convert to memory API, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 17/58] pci: pass address space to pci bus when created, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 38/58] ide: convert to memory API, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 45/58] ne2000: convert to memory API, Avi Kivity, 2011/07/17